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

ExpAI grab villages CA: fix enemy distance rating under fog

Browse source 
ai_helper.get_closest_enemy() returns math.huge for the enemy distance if no enemy is visible to the AI. This fixes #4157.
This commit is contained in:
mattsc 2019-07-10 08:07:11 -07:00
parent 6e27a3ffbd
commit e148d25d2a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/ai/lua/ca_grab_villages.lua
View file

@ -64,7 +64,8 @@ function ca_grab_villages:evaluation(cfg, data)
if wesnoth.is_enemy(owner, wesnoth.current.side) then village_rating = village_rating + 20000 end if wesnoth.is_enemy(owner, wesnoth.current.side) then village_rating = village_rating + 20000 end
end end
local _, enemy_distance_from_village = AH.get_closest_enemy(v) local village_closest_enemy, enemy_distance_from_village = AH.get_closest_enemy(v)
if (not village_closest_enemy) then enemy_distance_from_village = 0 end
-- Now we go on to the unit-dependent rating -- Now we go on to the unit-dependent rating
local best_unit_rating = - math.huge local best_unit_rating = - math.huge
@ -96,7 +97,8 @@ function ca_grab_villages:evaluation(cfg, data)
end end
-- Prefer not backtracking and moving more distant units to capture villages -- Prefer not backtracking and moving more distant units to capture villages
local _, enemy_distance_from_unit = AH.get_closest_enemy({u.x, u.y}) local unit_closest_enemy, enemy_distance_from_unit = AH.get_closest_enemy({u.x, u.y})
if (not unit_closest_enemy) then enemy_distance_from_unit = 0 end
rating = rating - (enemy_distance_from_village + enemy_distance_from_unit)/5 rating = rating - (enemy_distance_from_village + enemy_distance_from_unit)/5
if (rating > best_unit_rating) then if (rating > best_unit_rating) then