Skip to content

Commit 57552c7

Browse files
LocalIdentityLocalIdentity
andauthored
Fix Kaladra's Touch not copying influence from other ring (#8888)
Kalandra's Touch now copies the influence from the other ring Also realised that this has always been slightly broken as it was not using the correct names for the conqueror mods Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 5ca6591 commit 57552c7

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

src/Modules/CalcSetup.lua

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -989,17 +989,6 @@ function calcs.initEnv(build, mode, override, specEnv)
989989
end
990990
end
991991
elseif item.name:match("Kalandra's Touch") then
992-
-- Reset mult counters since they don't work for kalandra
993-
for mult, property in pairs({["CorruptedItem"] = "corrupted", ["ShaperItem"] = "shaper", ["ElderItem"] = "elder", ["WarlordItem"] = "warlord", ["HunterItem"] = "hunter", ["CrusaderItem"] = "crusader", ["RedeemerItem"] = "redeemer"}) do
994-
if item[property] then
995-
env.itemModDB.multipliers[mult] = (env.itemModDB.multipliers[mult] or 0) - 1
996-
else
997-
env.itemModDB.multipliers["Non"..mult] = (env.itemModDB.multipliers["Non"..mult] or 0) + 1
998-
end
999-
end
1000-
if item.shaper or item.elder then
1001-
env.itemModDB.multipliers.ShaperOrElderItem = (env.itemModDB.multipliers.ShaperOrElderItem or 0) - 1
1002-
end
1003992
local otherRing = items[(slotName == "Ring 1" and "Ring 2") or (slotName == "Ring 2" and "Ring 1")]
1004993
if otherRing and not otherRing.name:match("Kalandra's Touch") then
1005994
for _, mod in ipairs(otherRing.modList or otherRing.slotModList[slot.slotNum] or {}) do
@@ -1017,7 +1006,7 @@ function calcs.initEnv(build, mode, override, specEnv)
10171006
::skip_mod::
10181007
end
10191008
-- Adjust multipliers based on other ring
1020-
for mult, property in pairs({["CorruptedItem"] = "corrupted", ["ShaperItem"] = "shaper", ["ElderItem"] = "elder", ["WarlordItem"] = "warlord", ["HunterItem"] = "hunter", ["CrusaderItem"] = "crusader", ["RedeemerItem"] = "redeemer"}) do
1009+
for mult, property in pairs({["CorruptedItem"] = "corrupted", ["ShaperItem"] = "shaper", ["ElderItem"] = "elder", ["WarlordItem"] = "adjudicator", ["HunterItem"] = "basilisk", ["CrusaderItem"] = "crusader", ["RedeemerItem"] = "eyrie"}) do
10211010
if otherRing[property] then
10221011
env.itemModDB.multipliers[mult] = (env.itemModDB.multipliers[mult] or 0) + 1
10231012
env.itemModDB.multipliers["Non"..mult] = (env.itemModDB.multipliers["Non"..mult] or 0) - 1

0 commit comments

Comments
 (0)