Release 1.4.127

- Various bug fixes
2019-01-06 22:17:54 +13:00
parent 13bf802e6f
commit fcdc48e10b
10 changed files with 35 additions and 37 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.4.127 - 2019/01/06
+ * Fixed error when showing tooltip for Abyssal Cry
+ * Fixed error when Gruthkul's Pelt is used in builds that contain spells
+ * Fixed error when opening builds containing certain Spectres
+
 ### 1.4.126 - 2019/01/04
 * Fixed mana cost multipliers on support gems not applying

--- a/Data/3_0/StatDescriptions/skill_stat_descriptions.lua
+++ b/Data/3_0/StatDescriptions/skill_stat_descriptions.lua
--- a/Data/3_0/StatDescriptions/stat_descriptions.lua
+++ b/Data/3_0/StatDescriptions/stat_descriptions.lua
--- a/Export/skills.lua
+++ b/Export/skills.lua
@@ -161,37 +161,25 @@ directiveTable.skill = function(state, args, out)
 		level.level = levelRow.Level
 		table.insert(skill.levels, level)
 		level.extra.levelRequirement = levelRow.LevelRequirement
-		if not granted.IsSupport then
--			addLevelMod('skill("levelRequirement", {val})', levelRow.LevelRequirement, true)
-		else
--			addLevelMod("nil", levelRow.LevelRequirement, true)
-		end
 		if levelRow.ManaCost and levelRow.ManaCost ~= 0 then
-			--addLevelMod('skill("manaCost", {val})', levelRow.ManaCost)
 			level.extra.manaCost = levelRow.ManaCost
 		end
 		if levelRow.ManaMultiplier ~= 100 then
-			--addLevelMod('mod("ManaCost", "MORE", {val})', levelRow.ManaMultiplier - 100)
 			level.extra.manaMultiplier = levelRow.ManaMultiplier - 100
 		end
 		if levelRow.DamageEffectiveness ~= 0 then
-			--addLevelMod('skill("damageEffectiveness", {val})', levelRow.DamageEffectiveness / 100 + 1)
 			level.extra.damageEffectiveness = levelRow.DamageEffectiveness / 100 + 1
 		end
 		if levelRow.CriticalStrikeChance ~= 0 then
-			--addLevelMod('skill("CritChance", {val})', levelRow.CriticalStrikeChance / 100)
 			level.extra.critChance = levelRow.CriticalStrikeChance / 100
 		end
 		if levelRow.DamageMultiplier and levelRow.DamageMultiplier ~= 0 then
-			--addLevelMod('skill("baseMultiplier", {val})', levelRow.DamageMultiplier / 10000 + 1)
 			level.extra.baseMultiplier = levelRow.DamageMultiplier / 10000 + 1
 		end
 		if levelRow.ManaReservationOverride ~= 0 then
-			--addLevelMod('skill("manaCostOverride", {val})', levelRow.ManaReservationOverride)
 			level.extra.manaCostOverride = levelRow.ManaReservationOverride
 		end
 		if levelRow.Cooldown and levelRow.Cooldown ~= 0 then
-			--addLevelMod('skill("cooldown", {val})', levelRow.Cooldown / 1000)
 			level.extra.cooldown = levelRow.Cooldown / 1000
 		end
 		for i, statKey in ipairs(levelRow.StatsKeys) do
--- a/Export/statdesc.lua
+++ b/Export/statdesc.lua
@@ -44,7 +44,7 @@ function processStatFile(name)
 							if statLimit == "#" then
 								limit[1] = "#"
 								limit[2] = "#"
-							elseif statLimit:match("^%d+$") then
+							elseif statLimit:match("^%-?%d+$") then
 								limit[1] = tonumber(statLimit)
 								limit[2] = tonumber(statLimit)
 							else
--- a/Modules/CalcActiveSkill.lua
+++ b/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
--- a/Modules/CalcTools.lua
+++ b/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
--- a/Modules/Calcs.lua
+++ b/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
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+VERSION[1.4.127][2019/01/06]
+ * Fixed error when showing tooltip for Abyssal Cry
+ * Fixed error when Gruthkul's Pelt is used in builds that contain spells
+ * Fixed error when opening builds containing certain Spectres
 VERSION[1.4.126][2019/01/04]
 * Fixed mana cost multipliers on support gems not applying
 VERSION[1.4.125][2019/01/04]
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.4.126"/>
+	<Version number="1.4.127"/>
 	<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
 	<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
 	<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
 	<File sha1="74cd89091c4db01f0673217a5bd0927f232391e2" name="Launch.lua" part="program"/>
 	<File sha1="72b9bea1871e94a643e4471fd84bbedbc7810336" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="4bffd70746e14e2f1a4cd7d03e380d11204c55ee" name="changelog.txt" part="program"/>
+	<File sha1="529253438614dcb9918d0ac8e79259063833a6fd" name="changelog.txt" part="program"/>
 	<File sha1="b093a2709f30c1f83ce5ba9df88c80f22c1beb4a" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="16fc5eaa04cc14b2022f6705a12717935454dab0" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="a1c463f3329010e551700693296e998c8c2acd59" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -55,18 +55,18 @@
 	<File sha1="ce4835c384c834da0de47b0302b1e774c8300c6b" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="b0deb992c84cf2a24ec87ca1f256029653d9c256" name="Modules/Build.lua" part="program"/>
 	<File sha1="bcda0c5148b9e40274acd13702896cc430c89eba" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="44bbf26a2cd5454f05087f00e84558bb5d4dd1ae" name="Modules/CalcActiveSkill.lua" part="program"/>
+	<File sha1="9e023e711aaea97aa281dcf5ef12d5944e10a1b0" name="Modules/CalcActiveSkill.lua" part="program"/>
 	<File sha1="48f73482c0b79c6ccfb4c053b03181da047da362" name="Modules/CalcBreakdown.lua" part="program"/>
 	<File sha1="f08ee16af3c136348fe98bc97b5b7f2d2c1f79e4" name="Modules/CalcDefence-2_6.lua" part="program"/>
 	<File sha1="e9cb6d7bc02a53af9b783761c63d2546c75a6189" name="Modules/CalcDefence-3_0.lua" part="program"/>
 	<File sha1="5094a7c53f3991dbc33cea86e1e5fc0658e7a08d" name="Modules/CalcOffence-2_6.lua" part="program"/>
 	<File sha1="3b8fb748bd68da7ddcedfd18214f7d263f40a98d" name="Modules/CalcOffence-3_0.lua" part="program"/>
 	<File sha1="f708a1a31843906c284548f113a82d66cc60945e" name="Modules/CalcPerform.lua" part="program"/>
-	<File sha1="960521151c944e9e064b6058654cbfa6f32680b4" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="602057f90cbc7152a65472a2293c7bc2cad15fb2" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="32da2a949a5fe0ab10d54078a96caff0dccb5f3f" name="Modules/CalcSections-2_6.lua" part="program"/>
 	<File sha1="f4757b7b290dc6e2f3e4c2b47f618cdd6184e893" name="Modules/CalcSections-3_0.lua" part="program"/>
 	<File sha1="747894c9de721769c7583ce173fae4914175e507" name="Modules/CalcSetup.lua" part="program"/>
-	<File sha1="aaaa996752d391ae8394ca798b90209b429b6794" name="Modules/CalcTools.lua" part="program"/>
+	<File sha1="d63cf884b273fbbee81a6274581011519f73c529" name="Modules/CalcTools.lua" part="program"/>
 	<File sha1="3fd4ec579d4b6cb23a5a18aaffbf713712fb05a9" name="Modules/Common.lua" part="program"/>
 	<File sha1="a03119645c5eb7fda2c91ebd4ebc6869c05a1b30" name="Modules/ConfigOptions.lua" part="program"/>
 	<File sha1="45959b8e64bd8b75c2b4019555589b745d0ac68a" name="Modules/Data.lua" part="program"/>
@@ -204,8 +204,8 @@
 	<File sha1="188c8c98c64e30ab81551959cd7a596ecaea475f" name="Data/3_0/StatDescriptions/minion_spell_skill_stat_descriptions.lua" part="program"/>
 	<File sha1="3cadebaf29037f2fbf744d8b24680aa7b2a3ca17" name="Data/3_0/StatDescriptions/monster_stat_descriptions.lua" part="program"/>
 	<File sha1="f064d9e9762cdadf23a628a1c3c7e168e33ab5f3" name="Data/3_0/StatDescriptions/offering_skill_stat_descriptions.lua" part="program"/>
-	<File sha1="81fd76fb2bdada05549dfcc10c5c34b3adb1cba5" name="Data/3_0/StatDescriptions/skill_stat_descriptions.lua" part="program"/>
-	<File sha1="3d853bc46c92bda6f1c6c00b77dc6660964d180e" name="Data/3_0/StatDescriptions/stat_descriptions.lua" part="program"/>
+	<File sha1="cc6eef51c4cd4a60d390eb258db85220bd2f018d" name="Data/3_0/StatDescriptions/skill_stat_descriptions.lua" part="program"/>
+	<File sha1="ce05bebd8ce62ceee8c2b52d8860575ab8472a64" name="Data/3_0/StatDescriptions/stat_descriptions.lua" part="program"/>
 	<File sha1="07d2c6f3f605a30a2765c8a9e87c44c8d0da5c84" name="Data/3_0/StatDescriptions/variable_duration_skill_stat_descriptions.lua" part="program"/>
 	<File platform="win32" sha1="7e5a3242c9a4296dc8377feb4c9d824f3f0a3cc1" name="Path of Building.exe" part="runtime"/>
 	<File platform="win32" sha1="7a973d3c0b5121e6aad0dcb9323be5b432fc63e7" name="lua51.dll" part="runtime"/>