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

Micro AIs: use [filter] and [filter_second] for SUFs

Browse source 
Rename Standard Unit Filters in order to be consistent with other WML.
This commit is contained in:
mattsc 2013-05-01 10:16:19 -07:00
parent f1527dd8a0
commit f7aa38bca4
5 changed files with 67 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
data/ai/micro_ais/ais/mai_animals_engine.lua
View file

@ -195,11 +195,11 @@ return {
----- Beginning of Wolves AI -----
function animals:wolves_eval(cfg)
local wolves = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves > 0', { "and", cfg.predators }
formula = '$this_unit.moves > 0', { "and", cfg.filter }
}
local prey = wesnoth.get_units {
{ "filter_side", {{"enemy_of", {side = wesnoth.current.side} }} },
{ "and", cfg.prey }
{ "and", cfg.filter_second }
}
if wolves[1] and prey[1] then
@ -211,11 +211,11 @@ return {
function animals:wolves_exec(cfg)
local wolves = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves > 0', { "and", cfg.predators }
formula = '$this_unit.moves > 0', { "and", cfg.filter }
}
local prey = wesnoth.get_units {
{ "filter_side", {{"enemy_of", {side = wesnoth.current.side} }} },
{ "and", cfg.prey }
{ "and", cfg.filter_second }
}
--print('#wolves, prey', #wolves, #prey)
@ -295,7 +295,7 @@ return {
function animals:wolves_wander_eval(cfg)
-- When there's no prey left, the wolves wander and regroup
local wolves = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves > 0', { "and", cfg.predators }
formula = '$this_unit.moves > 0', { "and", cfg.filter }
}
if wolves[1] then
@ -307,7 +307,7 @@ return {
function animals:wolves_wander_exec(cfg)
local wolves = wesnoth.get_units { side = wesnoth.current.side,
formula = '$this_unit.moves > 0', { "and", cfg.predators }
formula = '$this_unit.moves > 0', { "and", cfg.filter }
}
-- Number of wolves that can reach each hex
@ -811,7 +811,7 @@ return {
function animals:big_eval(cfg)
local units = wesnoth.get_units {
side = wesnoth.current.side,
{ "and" , cfg.big_animals },
{ "and" , cfg.filter },
formula = '$this_unit.moves > 0'
}
@ -826,7 +826,7 @@ return {
local units = wesnoth.get_units {
side = wesnoth.current.side,
{ "and" , cfg.big_animals },
{ "and" , cfg.filter },
formula = '$this_unit.moves > 0'
}
local avoid = LS.of_pairs(wesnoth.get_locations { radius = 1,
@ -1077,29 +1077,29 @@ return {
{ "filter_side", {{"enemy_of", {side = wesnoth.current.side} }} },
{ "filter_location",
{ radius = (cfg.attention_distance or 8),
{ "filter", { side = wesnoth.current.side, {"and", cfg.herd} } } }
{ "filter", { side = wesnoth.current.side, {"and", cfg.filter_second} } } }
}
}
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders},
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter},
formula = '$this_unit.moves > 0'
}
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd} }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second} }
if enemies[1] and dogs[1] and sheep[1] then return 300000 end
return 0
end
function animals:herding_attack_close_enemy_exec(cfg)
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders},
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter},
formula = '$this_unit.moves > 0' }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd} }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second} }
-- We start with enemies within attack_distance (default: 4) hexes, which will be attacked
local enemies = wesnoth.get_units {
{ "filter_side", {{"enemy_of", {side = wesnoth.current.side} }} },
{ "filter_location",
{ radius = (cfg.attack_distance or 4),
{ "filter", { side = wesnoth.current.side, {"and", cfg.herd} } } }
{ "filter", { side = wesnoth.current.side, {"and", cfg.filter_second} } } }
}
}
@ -1146,7 +1146,7 @@ return {
{ "filter_side", {{"enemy_of", {side = wesnoth.current.side} }} },
{ "filter_location",
{ radius = (cfg.attention_distance or 8),
{ "filter", { side = wesnoth.current.side, {"and", cfg.herd} } } }
{ "filter", { side = wesnoth.current.side, {"and", cfg.filter_second} } } }
}
}
@ -1194,7 +1194,7 @@ return {
function animals:sheep_runs_enemy_eval(cfg)
-- Sheep runs from any enemy within attention_distance hexes (after the dogs have moved in)
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd},
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second},
formula = '$this_unit.moves > 0',
{ "filter_location",
{
@ -1210,7 +1210,7 @@ return {
end
function animals:sheep_runs_enemy_exec(cfg)
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd},
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second},
formula = '$this_unit.moves > 0',
{ "filter_location",
{
@ -1242,9 +1242,9 @@ return {
function animals:sheep_runs_dog_eval(cfg)
-- Any sheep with moves left next to a dog runs aways
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd},
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second},
formula = '$this_unit.moves > 0',
{ "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.herders} } }
{ "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.filter} } }
}
if sheep[1] then return 290000 end
@ -1253,12 +1253,12 @@ return {
function animals:sheep_runs_dog_exec(cfg)
-- simply get the first sheep
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd},
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second},
formula = '$this_unit.moves > 0',
{ "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.herders} } }
{ "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.filter} } }
}[1]
-- and the first dog it is adjacent to
local dog = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders},
local dog = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter},
{ "filter_adjacent", { x = sheep.x, y = sheep.y } }
}[1]
@ -1279,10 +1279,10 @@ return {
-- If dogs have moves left, and there is a sheep with moves left outside the
-- herding area, chase it back
-- We'll do a bunch of nested if's, to speed things up
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders}, formula = '$this_unit.moves > 0' }
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter}, formula = '$this_unit.moves > 0' }
if dogs[1] then
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd},
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.herders} } } } }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second},
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.filter} } } } }
}
if sheep[1] then
local herding_area = self:herding_area(cfg)
@ -1298,9 +1298,9 @@ return {
end
function animals:herd_sheep_exec(cfg)
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders}, formula = '$this_unit.moves > 0' }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd},
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.herders} } } } }
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter}, formula = '$this_unit.moves > 0' }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second},
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.filter} } } } }
}
local herding_area = self:herding_area(cfg)
local sheep_to_herd = {}
@ -1362,21 +1362,21 @@ return {
function animals:sheep_move_eval(cfg)
-- If nothing else is to be done, the sheep do a random move
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd}, formula = '$this_unit.moves > 0' }
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second}, formula = '$this_unit.moves > 0' }
if sheep[1] then return 270000 end
return 0
end
function animals:sheep_move_exec(cfg)
-- We simply move the first sheep first
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herd}, formula = '$this_unit.moves > 0' }[1]
local sheep = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter_second}, formula = '$this_unit.moves > 0' }[1]
local reach_map = AH.get_reachable_unocc(sheep)
-- Exclude those that are next to a dog
reach_map:iter( function(x, y, v)
for xa, ya in H.adjacent_tiles(x, y) do
local dog = wesnoth.get_unit(xa, ya)
if dog and (wesnoth.match_unit(dog, cfg.herders)) then
if dog and (wesnoth.match_unit(dog, cfg.filter)) then
reach_map:remove(x, y)
end
end
@ -1393,7 +1393,7 @@ return {
-- If this move remains within herding area or dogs have no moves left, or sheep doesn't move
-- make it a full move, otherwise partial move
local herding_area = self:herding_area(cfg)
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders}, formula = '$this_unit.moves > 0' }
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter}, formula = '$this_unit.moves > 0' }
if herding_area:get(x, y) or (not dogs[1]) or ((x == sheep.x) and (y == sheep.y)) then
AH.movefull_stopunit(ai, sheep, x, y)
else
@ -1403,9 +1403,9 @@ return {
function animals:dog_move_eval(cfg)
-- As a final step, any dog not adjacent to a sheep moves within herding_perimeter
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders},
local dogs = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter},
formula = '$this_unit.moves > 0',
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.herd} } } } }
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.filter_second} } } } }
}
if dogs[1] then return 260000 end
return 0
@ -1413,9 +1413,9 @@ return {
function animals:dog_move_exec(cfg)
-- We simply move the first dog first
local dog = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.herders},
local dog = wesnoth.get_units { side = wesnoth.current.side, {"and", cfg.filter},
formula = '$this_unit.moves > 0',
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.herd} } } } }
{ "not", { { "filter_adjacent", { side = wesnoth.current.side, {"and", cfg.filter_second} } } } }
}[1]
local herding_perimeter = LS.of_pairs(wesnoth.get_locations(cfg.herding_perimeter))

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

@ -9,7 +9,7 @@ return {
function lurkers:lurker_attack_eval(cfg)
-- If any lurker has moves left, we return score just above standard combat CA
local units = wesnoth.get_units { side = wesnoth.current.side,
{ "and", cfg.lurkers }, formula = '$this_unit.moves > 0'
{ "and", cfg.filter }, formula = '$this_unit.moves > 0'
}
local eval = 0
@ -22,7 +22,7 @@ return {
function lurkers:lurker_attack_exec(cfg)
-- We simply pick the first of the lurkers, they have no strategy
local me = wesnoth.get_units { side = wesnoth.current.side,
{ "and", cfg.lurkers }, formula = '$this_unit.moves > 0'
{ "and", cfg.filter }, formula = '$this_unit.moves > 0'
}[1]
--print("me at:" .. me.x .. "," .. me.y)

8
data/ai/micro_ais/ais/micro_ais_wml_tags.lua
View file

@ -278,7 +278,7 @@ function wesnoth.wml_actions.micro_ai(cfg)
if (cfg.action ~= "delete") then
-- Required keys
cfg = cfg.__parsed
local required_keys = {"lurkers", "attack_terrain"}
local required_keys = {"filter", "attack_terrain"}
local optional_keys = {"stationary", "wander_terrain"}
for k, v in pairs(required_keys) do
@ -498,13 +498,13 @@ function wesnoth.wml_actions.micro_ai(cfg)
required_keys["hunter_unit"] = { "id", "home_x", "home_y" }
optional_keys["hunter_unit"] = { "hunting_ground", "rest_turns", "show_messages" }
required_keys["wolves"] = { "predators", "prey" }
required_keys["wolves"] = { "filter", "filter_second" }
optional_keys["wolves"] = { "avoid_type" }
required_keys["wolves_multipacks"] = {}
optional_keys["wolves_multipacks"] = { "type", "pack_size", "show_pack_number" }
required_keys["big_animals"] = { "big_animals"}
required_keys["big_animals"] = { "filter"}
optional_keys["big_animals"] = { "avoid_unit", "goal_terrain", "wander_terrain" }
required_keys["forest_animals"] = {}
@ -515,7 +515,7 @@ function wesnoth.wml_actions.micro_ai(cfg)
required_keys["swarm"] = {}
optional_keys["swarm"] = { "scatter_distance", "vision_distance", "enemy_distance" }
required_keys["herding"] = { "herding_perimeter", "herd", "herders", "herd_x", "herd_y" }
required_keys["herding"] = { "herding_perimeter", "filter", "filter_second", "herd_x", "herd_y" }
optional_keys["herding"] = { "attention_distance", "attack_distance" }
if (cfg.action~='delete') then

38
data/ai/micro_ais/scenarios/animals.cfg
View file

@ -257,9 +257,9 @@
action=add
animal_type=big_animals
[big_animals]
[filter]
type=Ghast
[/big_animals]
[/filter]
[avoid_unit]
type=Yeti,Giant Spider,Ghast,Footpad
[/avoid_unit]
@ -278,9 +278,9 @@
action=add
animal_type=big_animals
[big_animals]
[filter]
type=Giant Spider
[/big_animals]
[/filter]
[avoid_unit]
type=Yeti,Giant Spider,Ghast,Footpad
[/avoid_unit]
@ -299,9 +299,9 @@
action=add
animal_type=big_animals
[big_animals]
[filter]
type=Yeti
[/big_animals]
[/filter]
[avoid_unit]
type=Yeti,Giant Spider,Ghast,Footpad
[/avoid_unit]
@ -320,12 +320,12 @@
action=add
animal_type=wolves
[predators]
[filter]
type=Wolf
[/predators]
[prey]
[/filter]
[filter_second]
type=Vampire Bat
[/prey]
[/filter_second]
avoid_type=Yeti,Giant Spider,Ghast,Footpad
[/micro_ai]
@ -336,12 +336,12 @@
action=add
animal_type=herding
[herd]
type=Troll Whelp
[/herd]
[herders]
[filter]
type=Footpad
[/herders]
[/filter]
[filter_second]
type=Troll Whelp
[/filter_second]
herd_x,herd_y=32,28
[herding_perimeter]
terrain=Rb
@ -426,12 +426,12 @@ Translation: Those Ogres are mean! We better stay away from them and their youn
action=change
animal_type=wolves
[predators]
[filter]
type=Wolf
[/predators]
[prey]
[/filter]
[filter_second]
type=Vampire Bat
[/prey]
[/filter_second]
avoid_type=Yeti,Giant Spider,Ghast,Footpad,Ogre,Young Ogre
[/micro_ai]
[/event]

12
data/ai/micro_ais/scenarios/lurkers.cfg
View file

@ -323,9 +323,9 @@
ai_type=lurkers
action=add
[lurkers]
[filter]
type=Saurian Skirmisher
[/lurkers]
[/filter]
[attack_terrain]
terrain=S*
[/attack_terrain]
@ -337,9 +337,9 @@
ai_type=lurkers
action=add
[lurkers]
[filter]
type=Saurian Skirmisher
[/lurkers]
[/filter]
[attack_terrain]
terrain=S*
[/attack_terrain]
@ -350,9 +350,9 @@
ai_type=lurkers
action=add
[lurkers]
[filter]
type=Naga Fighter
[/lurkers]
[/filter]
[attack_terrain]
terrain=W*,S*
[/attack_terrain]