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

AI: ensure all CAs respect passive_leader aspect

Browse source 
Most of the former Experimental AI CAs did already (or don't use the leader in the first place), but not quite all of them.
This commit is contained in:
mattsc 2019-12-04 06:54:33 -08:00
parent 1e01df84ff
commit 64e969af11
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/ai/lua/retreat.lua
View file

@ -50,7 +50,9 @@ function retreat_functions.retreat_injured_units(units, avoid_map)
-- Split units into those that regenerate and those that do not -- Split units into those that regenerate and those that do not
local regen, regen_amounts, non_regen = {}, {}, {} local regen, regen_amounts, non_regen = {}, {}, {}
for i,u in ipairs(units) do for i,u in ipairs(units) do
if u.hitpoints < retreat_functions.min_hp(u) then if (u.hitpoints < retreat_functions.min_hp(u))
and ((not u.canrecruit) or (not ai.aspects.passive_leader))
then
if u:ability('regenerate') then if u:ability('regenerate') then
-- Find the best regeneration ability and use it to estimate hp regained by regeneration -- Find the best regeneration ability and use it to estimate hp regained by regeneration
local abilities = wml.get_child(u.__cfg, "abilities") local abilities = wml.get_child(u.__cfg, "abilities")

6
data/ai/micro_ais/cas/ca_healer_move.lua
View file

@ -19,8 +19,10 @@ function ca_healer_move:evaluation(cfg, data)
local healers, healers_noMP = {}, {} local healers, healers_noMP = {}, {}
for _,healer in ipairs(all_healers) do for _,healer in ipairs(all_healers) do
-- For the purpose of this evaluation, guardians count as units without moves -- For the purpose of this evaluation, guardians count as units without moves, as do passive leaders
if (healer.moves > 0) and (not healer.status.guardian) then if (healer.moves > 0) and (not healer.status.guardian)
and ((not healer.canrecruit) or (not ai.aspects.passive_leader))
then
table.insert(healers, healer) table.insert(healers, healer)
else else
table.insert(healers_noMP, healer) table.insert(healers_noMP, healer)