From 410176d356a941f02566bb7ce97d65853f17dd31 Mon Sep 17 00:00:00 2001 From: Peechey <92683202+Peechey@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:48:41 -0600 Subject: [PATCH 1/3] temp fix for new ascendancy on import (#6915) --- src/Classes/ImportTab.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua index 6c3706ceeb..4f18d10195 100644 --- 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 From 673e028fed2614feac78ab6d5ac49b9e04783b86 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Wed, 6 Dec 2023 06:49:13 +1100 Subject: [PATCH 2/3] Fix Phys Damage taken As not contributing to eHP (#6916) Co-authored-by: LocalIdentity --- src/Modules/CalcDefence.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index e5b4a252d4..5559877dc7 100644 --- 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 From 0d190b96e684385f5d6208c83f357b2eedf5a69d Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 6 Dec 2023 06:57:47 +1100 Subject: [PATCH 3/3] Update UI Height --- src/Modules/Main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua index e833f7ca54..5ea403022e 100644 --- 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)