upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 17:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[heal_unit]: Turn on floating text with animate=yes

Browse Source 
I also moved the animation to be played *before* healing, which is the same
order as in C++ code. In the previous order, the animation isn't played for
some reason.

Fixes #2295.
This commit is contained in:
Jyrki Vesterinen 2017-12-18 23:28:45 +02:00
parent d80d47eb8a
commit f064f50f1b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
data/lua/wml/heal_unit.lua
View File

@ -27,15 +27,27 @@ function wesnoth.wml_actions.heal_unit(cfg)
local heal_amount_set = false
for i,u in ipairs(who) do
local heal_amount = u.max_hitpoints - u.hitpoints
local new_hitpoints
if heal_full then
u.hitpoints = u.max_hitpoints
new_hitpoints = u.max_hitpoints
else
heal_amount = tonumber(cfg.amount) or heal_amount
local new_hitpoints = math.max(1, math.min(u.max_hitpoints, u.hitpoints + heal_amount))
new_hitpoints = math.max(1, math.min(u.max_hitpoints, u.hitpoints + heal_amount))
heal_amount = new_hitpoints - u.hitpoints
u.hitpoints = new_hitpoints
end
if cfg.animate then
local animator = wesnoth.create_animator()
animator:add(u, 'healed', 'hit',
{value = heal_amount, text = heal_amount, color = {0, 255, 0}})
if #healers > 0 then
animator:add(healers[1], 'healing', 'hit', {value = heal_amount})
end
animator:run()
end
u.hitpoints = new_hitpoints
if moves_full then
u.moves = u.max_moves
else
@ -57,14 +69,5 @@ function wesnoth.wml_actions.heal_unit(cfg)
heal_amount_set = true
wesnoth.set_variable("heal_amount", heal_amount)
end
if cfg.animate then
local animator = wesnoth.create_animator()
animator:add(u, 'healed', 'hit', {value = heal_amount})
if #healers > 0 then
animator:add(healers[1], 'healing', 'hit', {value = heal_amount})
end
animator:run()
end
end
end