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

Guardian and Patrol MAI: check if unit exists even for Behavior CAs

Browse source 
This works around a bug which causes BCAs not to be removed when a
scenario is reloaded from a middle-of-scenario save.
This commit is contained in:
mattsc 2013-06-27 13:27:29 -07:00
parent 1e02ffc77b
commit d92d96fd07
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
data/ai/micro_ais/ais/mai_guardian_engine.lua
View file

@ -11,8 +11,8 @@ return {
function engine:mai_guardian_coward_eval(cfg)
local unit = wesnoth.get_units{ id = cfg.id }[1]
-- Don't need to check if unit exists as this is a sticky CA
if unit.moves > 0 then
-- Check if unit exists as sticky BCAs are not always removed successfully
if unit and (unit.moves > 0) then
return 300000
else
return 0
@ -114,12 +114,15 @@ return {
function engine:mai_guardian_return_eval(cfg)
local unit = wesnoth.get_units { id = cfg.id }[1]
-- Don't need to check if unit exists as this is a sticky CA
if (unit.x ~= cfg.return_x) or (unit.y ~= cfg.return_y) then
return 100010
else
return 99990
-- Check if unit exists as sticky BCAs are not always removed successfully
if unit then
if ((unit.x ~= cfg.return_x) or (unit.y ~= cfg.return_y)) then
return 100010
else
return 99990
end
end
return 0
end
function engine:mai_guardian_return_exec(cfg)
@ -150,8 +153,8 @@ return {
function engine:mai_guardian_zone_eval(cfg)
local unit = wesnoth.get_units { id = cfg.id }[1]
-- Don't need to check if unit exists as this is a sticky CA
if (unit.moves > 0) then
-- Check if unit exists as sticky BCAs are not always removed successfully
if unit and (unit.moves > 0) then
return 100010
end
end
@ -291,8 +294,8 @@ return {
function engine:mai_guardian_stationed_eval(cfg)
local unit = wesnoth.get_units { id = cfg.id }[1]
-- Don't need to check if unit exists as this is a sticky CA
if (unit.moves > 0) then
-- Check if unit exists as sticky BCAs are not always removed successfully
if unit and (unit.moves > 0) then
return 100010
else
return 0

4
data/ai/micro_ais/ais/mai_patrol_engine.lua
View file

@ -9,8 +9,8 @@ return {
function engine:mai_patrol_eval(cfg)
local patrol = wesnoth.get_units({ id = cfg.id })[1]
-- Don't need to check if unit exists as this is a sticky CA
if (patrol.moves > 0) then return 300000 end
-- Check if unit exists as sticky BCAs are not always removed successfully
if patrol and (patrol.moves > 0) then return 300000 end
return 0
end