]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - builtin/game/statbars.lua
Merge pull request #35 from arydevy/patch-1
[dragonfireclient.git] / builtin / game / statbars.lua
index 1b83dd4ac6a66dea3d4af56211da72080dcedd1c..db5087a16eede511fc45dee999bfdac936c2c3fd 100644 (file)
 -- cache setting
 local enable_damage = core.settings:get_bool("enable_damage")
 
-local health_bar_definition =
-{
+local health_bar_definition = {
        hud_elem_type = "statbar",
-       position = { x=0.5, y=1 },
+       position = {x = 0.5, y = 1},
        text = "heart.png",
+       text2 = "heart_gone.png",
        number = core.PLAYER_MAX_HP_DEFAULT,
+       item = core.PLAYER_MAX_HP_DEFAULT,
        direction = 0,
-       size = { x=24, y=24 },
-       offset = { x=(-10*24)-25, y=-(48+24+16)},
+       size = {x = 24, y = 24},
+       offset = {x = (-10 * 24) - 25, y = -(48 + 24 + 16)},
 }
 
-local breath_bar_definition =
-{
+local breath_bar_definition = {
        hud_elem_type = "statbar",
-       position = { x=0.5, y=1 },
+       position = {x = 0.5, y = 1},
        text = "bubble.png",
-       number = 20,
+       text2 = "bubble_gone.png",
+       number = core.PLAYER_MAX_BREATH_DEFAULT,
+       item = core.PLAYER_MAX_BREATH_DEFAULT * 2,
        direction = 0,
-       size = { x=24, y=24 },
-       offset = {x=25,y=-(48+24+16)},
+       size = {x = 24, y = 24},
+       offset = {x = 25, y= -(48 + 24 + 16)},
 }
 
 local hud_ids = {}
 
-local function initialize_builtin_statbars(player)
-
-       if not player:is_player() then
-               return
-       end
+local function scaleToDefault(player, field)
+       -- Scale "hp" or "breath" to the default dimensions
+       local current = player["get_" .. field](player)
+       local nominal = core["PLAYER_MAX_" .. field:upper() .. "_DEFAULT"]
+       local max_display = math.max(nominal,
+               math.max(player:get_properties()[field .. "_max"], current))
+       return current / max_display * nominal
+end
 
+local function update_builtin_statbars(player)
        local name = player:get_player_name()
 
        if name == "" then
                return
        end
 
+       local flags = player:hud_get_flags()
        if not hud_ids[name] then
                hud_ids[name] = {}
                -- flags are not transmitted to client on connect, we need to make sure
                -- our current flags are transmitted by sending them actively
-               player:hud_set_flags(player:hud_get_flags())
+               player:hud_set_flags(flags)
        end
        local hud = hud_ids[name]
 
-       if player:hud_get_flags().healthbar and enable_damage then
-               if hud.id_healthbar == nil then
-                       local hp = player:get_hp()
-                       local max_display_hp = math.max(core.PLAYER_MAX_HP_DEFAULT,
-                               math.max(player:get_properties().hp_max, hp))
-                       -- Limit width of health bar: Scale to the default maximal HP
-                       health_bar_definition.number =
-                               hp / max_display_hp * core.PLAYER_MAX_HP_DEFAULT
-                       hud.id_healthbar  = player:hud_add(health_bar_definition)
+       local immortal = player:get_armor_groups().immortal == 1
+
+       if flags.healthbar and enable_damage and not immortal then
+               local number = scaleToDefault(player, "hp")
+               if hud.id_healthbar == nil then
+                       local hud_def = table.copy(health_bar_definition)
+                       hud_def.number = number
+                       hud.id_healthbar = player:hud_add(hud_def)
+               else
+                       player:hud_change(hud.id_healthbar, "number", number)
                end
-       else
-               if hud.id_healthbar ~= nil then
-                       player:hud_remove(hud.id_healthbar)
-                       hud.id_healthbar = nil
+       elseif hud.id_healthbar then
+               player:hud_remove(hud.id_healthbar)
+               hud.id_healthbar = nil
+       end
+
+       local show_breathbar = flags.breathbar and enable_damage and not immortal
+
+       local breath     = player:get_breath()
+       local breath_max = player:get_properties().breath_max
+       if show_breathbar and breath <= breath_max then
+               local number = 2 * scaleToDefault(player, "breath")
+               if not hud.id_breathbar and breath < breath_max then
+                       local hud_def = table.copy(breath_bar_definition)
+                       hud_def.number = number
+                       hud.id_breathbar = player:hud_add(hud_def)
+               elseif hud.id_breathbar then
+                       player:hud_change(hud.id_breathbar, "number", number)
                end
        end
 
-       if player:get_breath() < core.PLAYER_MAX_BREATH then
-               if player:hud_get_flags().breathbar and enable_damage then
-                       if hud.id_breathbar == nil then
-                               hud.id_breathbar = player:hud_add(breath_bar_definition)
+       if hud.id_breathbar and (not show_breathbar or breath == breath_max) then
+               core.after(1, function(player_name, breath_bar)
+                       local player = core.get_player_by_name(player_name)
+                       if player then
+                               player:hud_remove(breath_bar)
                        end
-               else
-                       if hud.id_breathbar ~= nil then
-                               player:hud_remove(hud.id_breathbar)
-                               hud.id_breathbar = nil
-                       end
-               end
-       elseif hud.id_breathbar ~= nil then
-               player:hud_remove(hud.id_breathbar)
+               end, name, hud.id_breathbar)
                hud.id_breathbar = nil
        end
 end
 
 local function cleanup_builtin_statbars(player)
-
-       if not player:is_player() then
-               return
-       end
-
        local name = player:get_player_name()
 
        if name == "" then
@@ -99,70 +109,64 @@ local function player_event_handler(player,eventname)
 
        local name = player:get_player_name()
 
-       if name == "" then
+       if name == "" or not hud_ids[name] then
                return
        end
 
        if eventname == "health_changed" then
-               initialize_builtin_statbars(player)
-
-               if hud_ids[name].id_healthbar ~= nil then
-                       local hp = player:get_hp()
-                       local max_display_hp = math.max(core.PLAYER_MAX_HP_DEFAULT,
-                               math.max(player:get_properties().hp_max, hp))
-                       -- Limit width of health bar: Scale to the default maximal HP
-                       local hp_count = hp / max_display_hp * core.PLAYER_MAX_HP_DEFAULT
-                       player:hud_change(hud_ids[name].id_healthbar, "number", hp_count)
+               update_builtin_statbars(player)
+
+               if hud_ids[name].id_healthbar then
                        return true
                end
        end
 
        if eventname == "breath_changed" then
-               initialize_builtin_statbars(player)
+               update_builtin_statbars(player)
 
-               if hud_ids[name].id_breathbar ~= nil then
-                       player:hud_change(hud_ids[name].id_breathbar, "number", player:get_breath() * 2)
+               if hud_ids[name].id_breathbar then
                        return true
                end
        end
 
-       if eventname == "hud_changed" then
-               initialize_builtin_statbars(player)
+       if eventname == "hud_changed" or eventname == "properties_changed" then
+               update_builtin_statbars(player)
                return true
        end
 
        return false
 end
 
-function core.hud_replace_builtin(name, definition)
+function core.hud_replace_builtin(hud_name, definition)
 
-       if definition == nil or
-               type(definition) ~= "table" or
-               definition.hud_elem_type ~= "statbar" then
+       if type(definition) ~= "table" or
+                       definition.hud_elem_type ~= "statbar" then
                return false
        end
 
-       if name == "health" then
+       if hud_name == "health" then
                health_bar_definition = definition
 
-               for name,ids in pairs(hud_ids) do
+               for name, ids in pairs(hud_ids) do
                        local player = core.get_player_by_name(name)
-                       if  player and hud_ids[name].id_healthbar then
-                               player:hud_remove(hud_ids[name].id_healthbar)
-                               initialize_builtin_statbars(player)
+                       if player and ids.id_healthbar then
+                               player:hud_remove(ids.id_healthbar)
+                               ids.id_healthbar = nil
+                               update_builtin_statbars(player)
                        end
                end
                return true
        end
 
-       if name == "breath" then
+       if hud_name == "breath" then
                breath_bar_definition = definition
 
-               for name,ids in pairs(hud_ids) do
+               for name, ids in pairs(hud_ids) do
                        local player = core.get_player_by_name(name)
-                       if  player and hud_ids[name].id_breathbar then
-                               player:hud_remove(hud_ids[name].id_breathbar)
-                               initialize_builtin_statbars(player)
+                       if player and ids.id_breathbar then
+                               player:hud_remove(ids.id_breathbar)
+                               ids.id_breathbar = nil
+                               update_builtin_statbars(player)
                        end
                end
                return true
@@ -171,6 +175,10 @@ function core.hud_replace_builtin(name, definition)
        return false
 end
 
-core.register_on_joinplayer(initialize_builtin_statbars)
+-- Append "update_builtin_statbars" as late as possible
+-- This ensures that the HUD is hidden when the flags are updated in this callback
+core.register_on_mods_loaded(function()
+       core.register_on_joinplayer(update_builtin_statbars)
+end)
 core.register_on_leaveplayer(cleanup_builtin_statbars)
 core.register_playerevent(player_event_handler)