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

AI castle switch: bug fix for units on keep check

Browse source
This commit is contained in:
mattsc 2019-12-05 07:09:35 -08:00
parent ab2c3bfcc2
commit 18b5d5159e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/ai/lua/ca_castle_switch.lua
View file

@ -170,7 +170,7 @@ function ca_castle_switch:evaluation(cfg, data, filter_own)
end end
-- if we're on a keep, wait until there are no movable units on the castle before moving off -- if we're on a keep, wait until there are no movable non-leader units on the castle before moving off
local leader_score = 195000 local leader_score = 195000
if wesnoth.get_terrain_info(wesnoth.get_terrain(leader.x, leader.y)).keep then if wesnoth.get_terrain_info(wesnoth.get_terrain(leader.x, leader.y)).keep then
local castle = AH.get_locations_no_borders { local castle = AH.get_locations_no_borders {
@ -182,9 +182,7 @@ function ca_castle_switch:evaluation(cfg, data, filter_own)
local should_wait = false local should_wait = false
for i,loc in ipairs(castle) do for i,loc in ipairs(castle) do
local unit = wesnoth.units.get(loc[1], loc[2]) local unit = wesnoth.units.get(loc[1], loc[2])
if (not AH.is_visible_unit(wesnoth.current.side, unit)) then if unit and (unit.side == wesnoth.current.side) and (not unit.canrecruit) and (unit.moves > 0) then
should_wait = false
elseif unit.moves > 0 then
should_wait = true should_wait = true
break break
end end