Release 1.4.127

- Various bug fixes

Modules/CalcActiveSkill.lua

@@ -52,7 +52,6 @@ end
 function calcs.mergeSkillInstanceMods(env, modList, skillEffect)
 	calcLib.validateGemLevel(skillEffect)
 	local grantedEffect = skillEffect.grantedEffect
-	skillEffect.grantedEffectLevel = grantedEffect.levels[skillEffect.level]
 	modList:AddList(grantedEffect.baseMods)
 	local stats = calcLib.buildSkillInstanceStats(skillEffect, grantedEffect)
 	for stat, statValue in pairs(stats) do
@@ -154,6 +153,8 @@ function calcs.buildActiveSkillModList(env, actor, activeSkill)
 	local skillFlags = activeSkill.skillFlags
 	local activeEffect = activeSkill.activeEffect
 	local activeGrantedEffect = activeEffect.grantedEffect
+	calcLib.validateGemLevel(activeEffect)
+	activeEffect.grantedEffectLevel = activeGrantedEffect.levels[activeEffect.level]
 
 	-- Set mode flags
 	if env.mode_buffs then
@@ -371,7 +372,7 @@ function calcs.buildActiveSkillModList(env, actor, activeSkill)
 	for _, skillEffect in pairs(activeSkill.effectList) do
 		if skillEffect.grantedEffect.support then
 			calcs.mergeSkillInstanceMods(env, skillModList, skillEffect)
-			local level = skillEffect.grantedEffectLevel
+			local level = skillEffect.grantedEffect.levels[skillEffect.level]
 			if level.manaMultiplier then
 				skillModList:NewMod("ManaCost", "MORE", level.manaMultiplier, skillEffect.grantedEffect.modSource)
 			end

Modules/CalcTools.lua

@@ -162,8 +162,8 @@ function calcLib.buildSkillInstanceStats(skillInstance, grantedEffect)
 			local nextLevel = m_min(skillInstance.level + 1, #grantedEffect.levels)
 			local nextReq = grantedEffect.levels[nextLevel].levelRequirement
 			local prevReq = grantedEffect.levels[nextLevel - 1].levelRequirement
-			local nextStat = grantedEffect.level[nextLevel][index]
-			local prevStat = grantedEffect.level[nextLevel - 1][index]
+			local nextStat = grantedEffect.levels[nextLevel][index]
+			local prevStat = grantedEffect.levels[nextLevel - 1][index]
 			statValue = round(prevStat + (nextStat - prevStat) * (skillInstance.actorLevel - prevReq) / (nextReq - prevReq))
 		else
 			-- Static value

Modules/Calcs.lua

@@ -241,16 +241,16 @@ function calcs.buildOutput(build, mode)
 				end
 			end
 		end
-		ConPrintf("=== Cond ===")
-		ConPrintTable(env.conditionsUsed)
-		ConPrintf("=== Mult ===")
-		ConPrintTable(env.multipliersUsed)
-		ConPrintf("=== Minion Cond ===")
-		ConPrintTable(env.minionConditionsUsed)
-		ConPrintf("=== Enemy Cond ===")
-		ConPrintTable(env.enemyConditionsUsed)
-		ConPrintf("=== Enemy Mult ===")
-		ConPrintTable(env.enemyMultipliersUsed)
+--		ConPrintf("=== Cond ===")
+--		ConPrintTable(env.conditionsUsed)
+--		ConPrintf("=== Mult ===")
+--		ConPrintTable(env.multipliersUsed)
+--		ConPrintf("=== Minion Cond ===")
+--		ConPrintTable(env.minionConditionsUsed)
+--		ConPrintf("=== Enemy Cond ===")
+--		ConPrintTable(env.enemyConditionsUsed)
+--		ConPrintf("=== Enemy Mult ===")
+--		ConPrintTable(env.enemyMultipliersUsed)
 	elseif mode == "CALCS" then
 		local buffList = { }
 		local combatList = { }
@@ -387,7 +387,7 @@ function calcs.buildOutput(build, mode)
 			output.Minion.CurseList = output.CurseList
 		end
 
-		--infoDump(env)
+		infoDump(env)
 	end
 
 	return env