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

Generic recruit engine: replace slow location filters

Browse source
This commit is contained in:
mattsc 2018-11-06 09:38:33 -08:00
parent 0c57ae16e4
commit e379cf7333
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
data/ai/lua/generic_recruit_engine.lua
View file

@ -27,6 +27,7 @@ return {
local AH = wesnoth.require "ai/lua/ai_helper.lua"
local M = wesnoth.map
local LS = wesnoth.require "location_set"
local recruit_data = {}
@ -848,31 +849,31 @@ return {
end
end
local locsx, locsy = AH.split_location_list_to_strings(data.castle.locs)
-- get a list of all unowned villages within fastest_unit_speed
-- get a list of all unowned and enemy-owned villages within fastest_unit_speed
-- this may have false positives (villages that can't be reached due to difficult/impassible terrain)
local exclude_x, exclude_y = "0", "0"
local exclude_map = LS.create()
if data.castle.assigned_villages_x and data.castle.assigned_villages_x[1] then
exclude_x = table.concat(data.castle.assigned_villages_x, ",")
exclude_y = table.concat(data.castle.assigned_villages_y, ",")
for i,x in ipairs(data.castle.assigned_villages_x) do
exclude_map:insert(x, data.castle.assigned_villages_y[i])
end
end
local all_villages = wesnoth.get_villages()
local villages = {}
for _,v in ipairs(all_villages) do
local owner = wesnoth.get_village_owner(v[1], v[2])
if ((not owner) or wesnoth.is_enemy(owner, wesnoth.current.side))
and (not exclude_map:get(v[1], v[2]))
then
for _,loc in ipairs(data.castle.locs) do
local dist = M.distance_between(v[1], v[2], loc[1], loc[2])
if (dist <= fastest_unit_speed) then
table.insert(villages, v)
break
end
end
end
end
local villages = wesnoth.get_villages {
{ "and", {
{ "filter_owner", {
{ "enemy_of", { side = wesnoth.current.side } }
} },
{ "or", { owner_side = 0 } }
}},
{ "and", {
radius = fastest_unit_speed,
x = locsx, y = locsy
}},
{ "not", {
x = exclude_x,
y = exclude_y
}}
}
local hex, target, shortest_distance = {}, {}, AH.no_path
@ -908,14 +909,16 @@ return {
local width,height,border = wesnoth.get_map_size()
for i,v in ipairs(villages) do
local close_castle_hexes = wesnoth.get_locations {
x = locsx, y = locsy,
{ "and", {
x = v[1], y = v[2],
radius = fastest_unit_speed
}},
{ "not", { { "filter", {} } } }
}
local close_castle_hexes = {}
for _,loc in ipairs(data.castle.locs) do
local dist = M.distance_between(v[1], v[2], loc[1], loc[2])
if (dist <= fastest_unit_speed) then
if (not wesnoth.get_unit(loc[1], loc[2])) then
table.insert(close_castle_hexes, loc)
end
end
end
for u,unit in ipairs(test_units) do
test_units[u].x = v[1]
test_units[u].y = v[2]