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

Fast Micro AI: enable support of the default attacks aspect

Browse source 
Attackers and targets can now also be selected through the default
attacks aspect. [filter] and [filter_second] inside the [micro_ai] tag
have priority though, if either of them is given.
This commit is contained in:
mattsc 2015-09-06 14:12:41 -07:00
parent f06030b0f5
commit 10ee2f65d4
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
data/ai/micro_ais/cas/ca_fast_combat.lua
View file

@ -9,10 +9,25 @@ function ca_fast_combat:evaluation(ai, cfg, self)
self.data.move_cache = { turn = wesnoth.current.turn }
self.data.gamedata = FAU.gamedata_setup()
local filter_own = cfg.filter
local filter_enemy = cfg.filter_second
if (not filter_own) and (not filter_enemy) then
local ai_tag = H.get_child(wesnoth.sides[wesnoth.current.side].__cfg, 'ai')
for aspect in H.child_range(ai_tag, 'aspect') do
if (aspect.id == 'attacks') then
local facet = H.get_child(aspect, 'facet')
if facet then
filter_own = H.get_child(facet, 'filter_own')
filter_enemy = H.get_child(facet, 'filter_enemy')
end
end
end
end
if (not self.data.fast_combat_units) or (not self.data.fast_combat_units[1]) then
self.data.fast_combat_units = wesnoth.get_units {
side = wesnoth.current.side,
{ "and", cfg.filter }
{ "and", filter_own }
}
if (not self.data.fast_combat_units[1]) then return 0 end
@ -26,11 +41,11 @@ function ca_fast_combat:evaluation(ai, cfg, self)
local excluded_enemies_map = LS.create()
-- Exclude enemies not matching [filter_second]
if (cfg.filter_second) then
-- Exclude enemies not matching [filter_enemy]
if filter_enemy then
local excluded_enemies = wesnoth.get_units {
{ "filter_side", { { "enemy_of", { side = wesnoth.current.side } } } },
{ "not", cfg.filter_second }
{ "not", filter_enemy }
}
for _,e in ipairs(excluded_enemies) do