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

Bottleneck Micro AI: bug fix for units in front of bottleneck

Browse source 
Previously, units so far in front of the bottleneck that they could not get behind it in one move were left stranded. Now they are moved toward it.
This commit is contained in:
mattsc 2019-12-16 08:45:47 -08:00
parent 116a6671cd
commit 09cffab77b
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
data/ai/micro_ais/cas/ca_bottleneck_move.lua
View file

@ -114,7 +114,7 @@ local function bottleneck_create_positioning_map(max_value, data)
return map
end
local function bottleneck_get_rating(unit, x, y, has_leadership, is_healer, data)
local function bottleneck_get_rating(unit, x, y, has_leadership, is_healer, on_my_territory, data)
-- Calculate rating of a unit @unit at coordinates (@x,@y).
-- Don't want to extract @is_healer and @has_leadership inside this function, as it is very slow.
-- Thus they are provided as parameters from the calling function.
@ -159,13 +159,20 @@ local function bottleneck_get_rating(unit, x, y, has_leadership, is_healer, data
-- If this did not produce a positive rating, we add a
-- distance-based rating, to get units to the bottleneck in the first place
if (rating <= 0) and BD_is_my_territory:get(x, y) then
if (rating <= 0) then
local combined_dist = 0
BD_def_map:iter(function(x_def, y_def, v)
combined_dist = combined_dist + M.distance_between(x, y, x_def, y_def)
end)
combined_dist = combined_dist / BD_def_map:size()
rating = 1000 - combined_dist * 10.
if BD_is_my_territory:get(x, y) then
rating = 1000 - combined_dist * 10.
elseif (not on_my_territory) then
-- If the unit is itself on enemy territory, we also give an (even smaller) distance-based rating
-- in order to make it move toward own territory if it cannot get there on the current move
rating = 10 - combined_dist / 100.
end
end
-- Now add the unit specific rating.
@ -301,15 +308,18 @@ function ca_bottleneck_move:evaluation(cfg, data)
-- Is this a healer or leadership unit?
local is_healer = (unit.__cfg.usage == "healer")
local has_leadership = AH.has_ability(unit, "leadership")
local on_my_territory = BD_is_my_territory:get(unit.x, unit.y)
local rating = bottleneck_get_rating(unit, unit.x, unit.y, has_leadership, is_healer, data)
local rating = bottleneck_get_rating(unit, unit.x, unit.y, has_leadership, is_healer, on_my_territory, data)
current_rating_map:insert(unit.x, unit.y, rating)
-- A unit that cannot move any more, (or at least cannot move out of the way)
-- must be considered to have a very high rating (it's in the best position
-- it can possibly achieve)
local best_move_away = bottleneck_move_out_of_way(unit, data)
if (not best_move_away) then current_rating_map:insert(unit.x, unit.y, 20000) end
-- it can possibly achieve), but only if it is in own territory
if on_my_territory then
local best_move_away = bottleneck_move_out_of_way(unit, data)
if (not best_move_away) then current_rating_map:insert(unit.x, unit.y, 20000) end
end
end
local enemies = AH.get_attackable_enemies()
@ -347,10 +357,11 @@ function ca_bottleneck_move:evaluation(cfg, data)
for _,unit in ipairs(units) do
local is_healer = (unit.__cfg.usage == "healer")
local has_leadership = AH.has_ability(unit, "leadership")
local on_my_territory = BD_is_my_territory:get(unit.x, unit.y)
local reach = wesnoth.find_reach(unit)
for _,loc in ipairs(reach) do
local rating = bottleneck_get_rating(unit, loc[1], loc[2], has_leadership, is_healer, data)
local rating = bottleneck_get_rating(unit, loc[1], loc[2], has_leadership, is_healer, on_my_territory, data)
-- A move is only considered if it improves the overall rating,
-- that is, its rating must be higher than: