minetest-mods/monoidal_effects
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix discrepancy in HUD display

Browse Source
This commit is contained in:
raymoo 2016-01-28 00:59:25 -08:00
parent 2f3bd90204
commit 593ce17fab
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
init.lua
View File

@ -82,10 +82,14 @@ local function calculate_monoid_value(p_name, m_name)
local eff_type = rec.effect_type local eff_type = rec.effect_type
local type_def = types[eff_type] local type_def = types[eff_type]
if type_def ~= nil then if rec.dynamic then
if type_def.values[m_name] ~= nil then p_m_effects[k] = rec.values[m_name]
p_m_effects[k] = type_def.values[m_name] elseif type_def ~= nil and type_def.values[m_name] ~= nil then
end p_m_effects[k] = type_def.values[m_name]
else
p_m_effects[k] = nil
minetest.log("error",
"Unknown effect type " .. eff_type)
end end
end end
@ -208,7 +212,7 @@ local function mk_hud(uid, disp_name, dur, offset, icon)
text_def = { hud_elem_type = "text", text_def = { hud_elem_type = "text",
position = { x = 1, y = 0.3 }, position = { x = 1, y = 0.3 },
name = "effect_" .. uid, name = "effect_" .. uid,
text = disp_name .. " (" .. dur .. "s)", text = disp_name .. " (" .. dur .. " s)",
scale = { x = 170, y = 20 }, scale = { x = 170, y = 20 },
alignment = { x = -1, y = 0 }, alignment = { x = -1, y = 0 },
direction = 1, direction = 1,
@ -366,6 +370,14 @@ monoidal_effects.apply_effect = function(effect_type, dur, player_name, values)
local dyn = type_def.dynamic local dyn = type_def.dynamic
local eff_values
if dyn and values ~= nil then
eff_values = values
else
eff_values = type_def.values
end
local players = {[player_name] = "true"} local players = {[player_name] = "true"}
local tags = type_def.tags local tags = type_def.tags
@ -373,7 +385,7 @@ monoidal_effects.apply_effect = function(effect_type, dur, player_name, values)
local t_monoids = type_def.monoids local t_monoids = type_def.monoids
local record = local record =
effectset.record(dyn, effect_type, players, tags, t_monoids, dur, values) effectset.record(dyn, effect_type, players, tags, t_monoids, dur, eff_values)
local p_cache = monoid_cache[player_name] local p_cache = monoid_cache[player_name]
@ -382,14 +394,6 @@ monoidal_effects.apply_effect = function(effect_type, dur, player_name, values)
monoid_cache[player_name] = p_cache monoid_cache[player_name] = p_cache
end end
local eff_values
if (dyn) then
eff_values = values
else
eff_values = type_def.values
end
local player = minetest.get_player_by_name(player_name) local player = minetest.get_player_by_name(player_name)
if (player ~= nil) then if (player ~= nil) then