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

ai_helper: deprecate has_weapon_special()

Browse source
This commit is contained in:
mattsc 2019-12-19 07:09:13 -08:00
parent 705b576c2a
commit a90964fd41
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/ai/lua/ai_helper.lua
View file

@ -1287,6 +1287,9 @@ end
function ai_helper.has_weapon_special(unit, special)
-- Returns true/false depending on whether @unit has a weapon with special @special
-- Also returns the number of the first weapon with this special
wesnoth.deprecated_message('ai_helper.has_weapon_special', 3, '1.17.0', "Use unit:find_attack() instead, noting that the argument needs to be a filter, such as { special_id = 'poison' }.")
for weapon_number,att in ipairs(unit.attacks) do
for _,sp in ipairs(att.specials) do
if (sp[1] == special) then

2
data/ai/lua/battle_calcs.lua
View file

@ -1019,7 +1019,7 @@ function battle_calcs.attack_combo_stats(tmp_attackers, tmp_dsts, defender, cach
-- If attacker has attack with 'slow' special, it should always go first
-- Almost, bonus should not be quite as high as a really high CTK
-- This isn't quite true in reality, but can be refined later
if AH.has_weapon_special(attacker, "slow") then
if attacker:find_attack { special_id = "slow" } then
rating = rating + defender.cost / 2.
end

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

@ -16,7 +16,7 @@ function ca_spread_poison:evaluation(cfg, data, filter_own)
local poisoners = {}
for _,unit in ipairs(attacks_aspect.own) do
if (unit.attacks_left > 0) and (#unit.attacks > 0) and AH.has_weapon_special(unit, "poison")
if (unit.attacks_left > 0) and (#unit.attacks > 0) and unit:find_attack { special_id = "poison" }
and (not unit.canrecruit) and unit:matches(filter_own)
then
table.insert(poisoners, unit)
@ -61,7 +61,7 @@ function ca_spread_poison:evaluation(cfg, data, filter_own)
local about_to_level = defender.max_experience - defender.experience <= (attacker.level * 2 * wesnoth.game_config.combat_experience)
if (not cant_poison) and (healing == 0) and (not about_to_level) then
local _, poison_weapon = AH.has_weapon_special(attacker, "poison")
local _, poison_weapon = attacker:find_attack { special_id = "poison" }
local dst = { a.dst.x, a.dst.y }
local att_stats, def_stats = BC.simulate_combat_loc(attacker, dst, defender, poison_weapon)
local _, defender_rating, attacker_rating = BC.attack_rating(attacker, defender, dst, { att_stats = att_stats, def_stats = def_stats })
@ -102,7 +102,7 @@ end
function ca_spread_poison:execution(cfg, data)
local attacker = wesnoth.units.get(SP_attack.src.x, SP_attack.src.y)
-- If several attacks have poison, this will always find the last one
local is_poisoner, poison_weapon = AH.has_weapon_special(attacker, "poison")
local is_poisoner, poison_weapon = attacker:find_attack { special_id = "poison" }
if AH.print_exec() then AH.print_ts(' Executing spread_poison CA') end
if AH.show_messages() then wesnoth.wml_actions.message { speaker = attacker.id, message = 'Poison attack' } end