diff --git a/Classes/ModDB.lua b/Classes/ModDB.lua
index 9bcb531e..f72b800d 100644
--- a/Classes/ModDB.lua
+++ b/Classes/ModDB.lua
@@ -229,7 +229,7 @@ function ModDBClass:Sum(modType, cfg, arg1, arg2, arg3, arg4, arg5, arg6, arg7,
break
end
elseif tag.type == "StatThreshold" then
- if (self.stats[tag.stat] or (skillStats and skillStats[tag.stat]) or 0) < tag.threshold then
+ if (self.actor.output[tag.stat] or (skillStats and skillStats[tag.stat]) or 0) < tag.threshold then
value = nullValue
break
end
diff --git a/Classes/ModList.lua b/Classes/ModList.lua
index 57a5bb0c..432fdb02 100644
--- a/Classes/ModList.lua
+++ b/Classes/ModList.lua
@@ -20,7 +20,6 @@ local ModListClass = common.NewClass("ModList", function(self)
self.actor = { output = { } }
self.multipliers = { }
self.conditions = { }
- self.stats = { }
end)
function ModListClass:AddMod(mod)
@@ -204,7 +203,7 @@ function ModListClass:Sum(modType, cfg, arg1, arg2, arg3, arg4, arg5, arg6, arg7
break
end
elseif tag.type == "StatThreshold" then
- if (self.stats[tag.stat] or (skillStats and skillStats[tag.stat]) or 0) < tag.threshold then
+ if (self.actor.output[tag.stat] or (skillStats and skillStats[tag.stat]) or 0) < tag.threshold then
value = nullValue
break
end
diff --git a/Modules/CalcActiveSkill.lua b/Modules/CalcActiveSkill.lua
index 86e189e9..6b46c0c2 100644
--- a/Modules/CalcActiveSkill.lua
+++ b/Modules/CalcActiveSkill.lua
@@ -31,7 +31,7 @@ local function mergeLevelMod(modList, mod, value)
end
-- Merge gem modifiers with given mod list
-local function mergeGemMods(modList, gem)
+function calcs.mergeGemMods(modList, gem)
modList:AddList(gem.data.baseMods)
if gem.quality > 0 then
for i = 1, #gem.data.qualityMods do
@@ -361,7 +361,7 @@ function calcs.buildActiveSkillModList(env, actor, activeSkill)
-- Add support gem modifiers to skill mod list
for _, gem in pairs(activeSkill.gemList) do
if gem.data.support then
- mergeGemMods(skillModList, gem)
+ calcs.mergeGemMods(skillModList, gem)
end
end
@@ -375,7 +375,7 @@ function calcs.buildActiveSkillModList(env, actor, activeSkill)
end
-- Add active gem modifiers
- mergeGemMods(skillModList, activeGem)
+ calcs.mergeGemMods(skillModList, activeGem)
-- Add extra modifiers
for _, value in ipairs(env.modDB:Sum("LIST", activeSkill.skillCfg, "ExtraSkillMod")) do
diff --git a/Modules/CalcPerform.lua b/Modules/CalcPerform.lua
index 228cbd57..3553814f 100644
--- a/Modules/CalcPerform.lua
+++ b/Modules/CalcPerform.lua
@@ -606,7 +606,7 @@ function calcs.perform(env)
modList = common.New("ModList")
}
local gemModList = common.New("ModList")
- mergeGemMods(gemModList, {
+ calcs.mergeGemMods(gemModList, {
level = value.level,
quality = 0,
data = data.gems[value.name],
diff --git a/Modules/Data.lua b/Modules/Data.lua
index 1d3ac6a3..e1e8eb35 100644
--- a/Modules/Data.lua
+++ b/Modules/Data.lua
@@ -209,7 +209,7 @@ end
local missing = { }
for _, minion in pairs(data.minions) do
for _, skillId in ipairs(minion.skillList) do
- if not data.skills[skillId] and not missing[skillId] then
+ if not data.skills[skillId] and not missing[skillId] and launch.devMode then
ConPrintf("'%s' missing skill '%s'", minion.name, skillId)
missing[skillId] = true
end
diff --git a/manifest.xml b/manifest.xml
index 4de64df0..691b81e8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -27,8 +27,8 @@
-
-
+
+
@@ -45,17 +45,17 @@
-
+
-
+
-
+