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

Goto Micro AI: fix checks of avoid_enemies key

Browse source 
Numerical values are sometimes transferred from WML to Lua using the string type. This applies, for example, to very small numbers, such as 0.0000000000001. This needs to be taken into account when checking whether avoid_enemies is a number.
This commit is contained in:
mattsc 2021-02-28 10:11:49 -08:00
parent 9b6008be54
commit 768c5f8315
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/ai/micro_ais/cas/ca_goto.lua
View file

@ -87,11 +87,12 @@ end
function ca_goto:execution(cfg, data)
local units, locs = GO_units, GO_locs
local enemy_map, enemy_attack_map
local enemy_map, enemy_attack_map, avoid_enemies
if cfg.avoid_enemies then
if (type(cfg.avoid_enemies) ~= 'number') then
avoid_enemies = tonumber(cfg.avoid_enemies)
if (not avoid_enemies) then
H.wml_error("Goto AI avoid_enemies= requires a number as argument")
elseif (cfg.avoid_enemies <= 0) then
elseif (avoid_enemies <= 0) then
H.wml_error("Goto AI avoid_enemies= argument must be >0")
end
@ -138,10 +139,10 @@ function ca_goto:execution(cfg, data)
end
else -- Otherwise find the best path to take
local path, cost
if cfg.avoid_enemies then
if avoid_enemies then
path, cost = wesnoth.find_path(unit, loc[1], loc[2],
function(x, y, current_cost)
return custom_cost(x, y, unit, enemy_map, enemy_attack_map, cfg.avoid_enemies)
return custom_cost(x, y, unit, enemy_map, enemy_attack_map, avoid_enemies)
end
)
else