From 47b4eafdf3793856811ed0c62d2efc18f0e94c87 Mon Sep 17 00:00:00 2001
From: Hachem_Muche <Hachem_Muche@stanfordalumni.org>
Date: Thu, 29 Jun 2017 12:27:55 -0700
Subject: [PATCH] Fixed a bug in improved_tactical AI when activating draining
sustains out of combat
---
game/engines/default/engine/ai/talented.lua | 3 ++-
game/modules/tome/ai/improved_tactical.lua | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/game/engines/default/engine/ai/talented.lua b/game/engines/default/engine/ai/talented.lua
index 7a72747f7a..6dbcde9be4 100644
--- a/game/engines/default/engine/ai/talented.lua
+++ b/game/engines/default/engine/ai/talented.lua
@@ -78,7 +78,8 @@ end)
--- Randomly use a talent, trying alternate talents if one fails (up to 5 total)
-- @param t_filter <optional> = filter passed to self:aiGetAvailableTalents to restrict talent choices
-- @param t_list, <optional, default self.talents> list of talent id's to pick from, passed to self:aiGetAvailableTalents
--- @return talent id used or false, table of remaining available talents
+-- @return talent id used or false
+-- @return table of remaining available talents
newAI("improved_talented", function(self, t_filter, t_list)
local log_detail = config.settings.log_detail_ai or 0
-- Find available talents
diff --git a/game/modules/tome/ai/improved_tactical.lua b/game/modules/tome/ai/improved_tactical.lua
index 6f1cc92392..d135963ae2 100644
--- a/game/modules/tome/ai/improved_tactical.lua
+++ b/game/modules/tome/ai/improved_tactical.lua
@@ -576,9 +576,10 @@ newAI("use_improved_tactical", function(self, t_filter, t_list)
end
-- These checks replace those performed in aiCheckSustainedTalent for simpler AIs
-- don't turn on sustains that cannot be sustained indefinitely
+ -- active draining sustains may eventually be deactivated (std tactical evaluation)
if t.mode == "sustained" and t._may_drain_resources and not is_active then
local res_def, r_invert
- for i, res in ipairs(t._may_drain_resources) do
+ for res, _ in pairs(t._may_drain_resources) do
res_def = self.resources_def[res]; r_invert = res_def.invert_values and -1 or 1
if ((self[res_def.regen_prop] or 0) - (util.getval(t[res_def.drain_prop], self, t) or 0)*r_invert)*r_invert <= 0 then
t_avail = false break
--
GitLab