Merge branch 'dev'

PathOfBuildingCommunity · Dec 5, 2023 · da5291c · da5291c
2 parents 73e3088 + 0d190b9
commit da5291c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua
@@ -624,7 +624,7 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData)
 			end
 		end
 	end
-	self.build.spec:ImportFromNodeList(charData.classId, charData.ascendancyClass, charPassiveData.hashes, charPassiveData.skill_overrides, charPassiveData.mastery_effects or {}, latestTreeVersion .. (charData.league:match("Ruthless") and "_ruthless" or ""))
+	self.build.spec:ImportFromNodeList(charData.classId, charData.ascendancyClass, 0, charPassiveData.hashes, charPassiveData.skill_overrides, charPassiveData.mastery_effects or {}, latestTreeVersion .. (charData.league:match("Ruthless") and "_ruthless" or ""))
 	self.build.spec:AddUndoState()
 	self.build.characterLevel = charData.level
 	self.build.characterLevelAutoMode = false

diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua
@@ -1414,7 +1414,7 @@ function calcs.buildDefenceEstimations(env, actor)
 				if destType ~= damageType then
 					dotShiftTable[destType] = modDB:Sum("BASE", nil, damageType.."DamageTakenAs"..destType, isElemental[damageType] and "ElementalDamageTakenAs"..destType or nil)
 					dotDestinationTotal = dotDestinationTotal + dotShiftTable[destType]
-					shiftTable[destType] = dotShiftTable[destType] + modDB:Sum("BASE", nil, damageType.."DamageFromHitsTakenAs"..destType, isElemental[damageType] and "ElementalDamageFromHitsTakenAs"..destType or nil)
+					shiftTable[destType] = dotShiftTable[destType] + modDB:Sum("BASE", nil, damageType.."DamageTakenFromHitsAs"..destType, isElemental[damageType] and "ElementalDamageTakenFromHitsAs"..destType or nil)
 					destTotal = destTotal + shiftTable[destType]
 				end
 			end

diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua
@@ -1022,18 +1022,18 @@ function main:OpenUpdatePopup()
 		end
 	end
 	local controls = { }
-	controls.changeLog = new("TextListControl", nil, 0, 20, 780, 192, nil, changeList)
-	controls.update = new("ButtonControl", nil, -45, 220, 80, 20, "Update", function()
+	controls.changeLog = new("TextListControl", nil, 0, 20, 780, 542, nil, changeList)
+	controls.update = new("ButtonControl", nil, -45, 570, 80, 20, "Update", function()
 		self:ClosePopup()
 		local ret = self:CallMode("CanExit", "UPDATE")
 		if ret == nil or ret == true then
 			launch:ApplyUpdate(launch.updateAvailable)
 		end
 	end)
-	controls.cancel = new("ButtonControl", nil, 45, 220, 80, 20, "Cancel", function()
+	controls.cancel = new("ButtonControl", nil, 45, 570, 80, 20, "Cancel", function()
 		self:ClosePopup()
 	end)
-	self:OpenPopup(800, 250, "Update Available", controls)
+	self:OpenPopup(800, 600, "Update Available", controls)
 end
 
 function main:OpenAboutPopup(helpSectionIndex)