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

ai_helper.get_attackable_enemies: add optional parameter 'avoid_map'

Browse source
This commit is contained in:
mattsc 2019-11-28 11:58:13 -08:00
parent 891ca93710
commit f5990b7e95
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/ai/lua/ai_helper.lua
View file

@ -1155,6 +1155,7 @@ function ai_helper.get_attackable_enemies(filter, side, cfg)
-- - enemies of the side defined in @side, -- - enemies of the side defined in @side,
-- - not petrified -- - not petrified
-- - and visible to the side defined in @cfg.viewing_side. -- - and visible to the side defined in @cfg.viewing_side.
-- - have at least one adjacent hex that is not inside an area to avoid
-- For speed reasons, this is done separately, rather than calling ai_helper.get_visible_units(). -- For speed reasons, this is done separately, rather than calling ai_helper.get_visible_units().
-- --
-- Optional parameters: -- Optional parameters:
@ -1164,6 +1165,8 @@ function ai_helper.get_attackable_enemies(filter, side, cfg)
-- @side: side number, if side other than current side is to be considered -- @side: side number, if side other than current side is to be considered
-- @cfg: table with optional configuration parameters: -- @cfg: table with optional configuration parameters:
-- viewing_side: see comments at beginning of this file. Defaults to @side. -- viewing_side: see comments at beginning of this file. Defaults to @side.
-- avoid_map: if given, an enemy is included only if it does not have at least one
-- adjacent hex outside of avoid_map
side = side or wesnoth.current.side side = side or wesnoth.current.side
local viewing_side = cfg and cfg.viewing_side or side local viewing_side = cfg and cfg.viewing_side or side
@ -1181,7 +1184,19 @@ function ai_helper.get_attackable_enemies(filter, side, cfg)
and (not unit.status.petrified) and (not unit.status.petrified)
and unit:matches(filter_plus_vision) and unit:matches(filter_plus_vision)
then then
table.insert(enemies, unit) local is_avoided = false
if cfg and cfg.avoid_map then
is_avoided = true
for xa,ya in H.adjacent_tiles(unit.x, unit.y) do
if (not cfg.avoid_map:get(xa, ya)) then
is_avoided = false
break
end
end
end
if (not is_avoided) then
table.insert(enemies, unit)
end
end end
end end