0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth

Browse source
This commit is contained in:
Charles Dang 2015-05-20 14:24:17 +11:00
commit 320f58cdde
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/ai/lua/battle_calcs.lua
View file

@ -67,6 +67,9 @@ function battle_calcs.unit_attack_info(unit, cache)
end
end
-- 'number' key is apparently not included in attack table if its value is zero
a.number = a.number or 0
table.insert(unit_info.attacks, a)
end

4
data/ai/micro_ais/micro_ai_wml_tag.lua
View file

@ -50,6 +50,10 @@ function wesnoth.wml_actions.micro_ai(cfg)
-- Check that the required common keys are all present and set correctly
if (not cfg.ai_type) then H.wml_error("[micro_ai] is missing required ai_type= key") end
if (not cfg.side) then H.wml_error("[micro_ai] is missing required side= key") end
if (not wesnoth.sides[cfg.side]) then
wesnoth.message("Warning", "[micro_ai] uses side=" .. cfg.side .. ": side does not exist")
return
end
if (not cfg.action) then H.wml_error("[micro_ai] is missing required action= key") end
if (cfg.action ~= 'add') and (cfg.action ~= 'delete') and (cfg.action ~= 'change') then