Skip to content

Commit ab89ee7

Browse files
committed
add support for Items Implicits Cannot Be Changed
1 parent 31d6bc5 commit ab89ee7

File tree

4 files changed

+27
-8
lines changed

4 files changed

+27
-8
lines changed

src/Classes/Item.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,10 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
739739
end
740740

741741
local lineLower = line:lower()
742-
if lineLower == "this item can be anointed by cassia" then
742+
743+
if lineLower == "implicit modifiers cannot be changed" then
744+
self.implicitsCannotBeChanged = true
745+
elseif lineLower == "this item can be anointed by cassia" then
743746
self.canBeAnointed = true
744747
elseif lineLower == "can have a second enchantment modifier" then
745748
self.canHaveTwoEnchants = true

src/Classes/ItemsTab.lua

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,10 @@ holding Shift will put it in the second.]])
492492
self:AddImplicitToDisplayItem()
493493
end)
494494
self.controls.displayItemAddImplicit.shown = function()
495-
return self.displayItem and self.displayItem.type ~= "Tincture" and (self.displayItem.corruptible or ((self.displayItem.type ~= "Flask" or self.displayItem.type ~= "Jewel") and (self.displayItem.rarity == "NORMAL" or self.displayItem.rarity == "MAGIC" or self.displayItem.rarity == "RARE")))
495+
return self.displayItem and
496+
self.displayItem.type ~= "Tincture" and (self.displayItem.corruptible or ((self.displayItem.type ~= "Flask" and self.displayItem.type ~= "Jewel") and
497+
(self.displayItem.rarity == "NORMAL" or self.displayItem.rarity == "MAGIC" or self.displayItem.rarity == "RARE"))) and
498+
not self.displayItem.implicitsCannotBeChanged
496499
end
497500

498501
-- Section: Influence dropdowns
@@ -2419,8 +2422,13 @@ function ItemsTabClass:CorruptDisplayItem(modType)
24192422
currentModType = "ScourgeUpside"
24202423
buildImplicitList("ScourgeUpside")
24212424
buildImplicitList("ScourgeDownside")
2422-
controls.implicit3Label.shown = true
2425+
controls.implicit.shown = true
2426+
controls.implicitLabel.shown = true
2427+
controls.implicit2.shown = true
2428+
controls.implicit2Label.shown = true
24232429
controls.implicit3.shown = true
2430+
controls.implicit3Label.shown = true
2431+
controls.implicitCannotBeChangedLabel.shown = false
24242432
main.popups[1].height = 147
24252433
controls.close.y = 117
24262434
controls.save.y = 117
@@ -2436,10 +2444,15 @@ function ItemsTabClass:CorruptDisplayItem(modType)
24362444
buildList(controls.implicit4, controls.implicit3, "ScourgeDownside")
24372445
else
24382446
currentModType = value
2447+
controls.implicit.shown = not self.displayItem.implicitsCannotBeChanged
2448+
controls.implicitLabel.shown = not self.displayItem.implicitsCannotBeChanged
2449+
controls.implicit2.shown = not self.displayItem.implicitsCannotBeChanged
2450+
controls.implicit2Label.shown = not self.displayItem.implicitsCannotBeChanged
24392451
controls.implicit3Label.shown = false
24402452
controls.implicit3.shown = false
24412453
controls.implicit4Label.shown = false
24422454
controls.implicit4.shown = false
2455+
controls.implicitCannotBeChangedLabel.shown = self.displayItem.implicitsCannotBeChanged
24432456
controls.implicit2.y = 65
24442457
main.popups[1].height = 129
24452458
controls.close.y = 99
@@ -2466,6 +2479,8 @@ function ItemsTabClass:CorruptDisplayItem(modType)
24662479
self:AddModComparisonTooltip(tooltip, value.mod)
24672480
end
24682481
end
2482+
controls.implicit.shown = not self.displayItem.implicitsCannotBeChanged
2483+
controls.implicitLabel.shown = not self.displayItem.implicitsCannotBeChanged
24692484
controls.implicit2Label = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, 75, 65, 0, 16, "^7Implicit #2:")
24702485
controls.implicit2 = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, 80, 65, 440, 18, nil, function()
24712486
buildList(controls.implicit, controls.implicit2, currentModType)
@@ -2479,6 +2494,8 @@ function ItemsTabClass:CorruptDisplayItem(modType)
24792494
self:AddModComparisonTooltip(tooltip, value.mod)
24802495
end
24812496
end
2497+
controls.implicit2.shown = not self.displayItem.implicitsCannotBeChanged
2498+
controls.implicit2Label.shown = not self.displayItem.implicitsCannotBeChanged
24822499
controls.implicit3Label = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, 75, 85, 0, 16, "^7Implicit #3:")
24832500
controls.implicit3 = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, 80, 65, 440, 18, nil, function()
24842501
buildList(controls.implicit4, controls.implicit3, "ScourgeDownside")
@@ -2509,6 +2526,8 @@ function ItemsTabClass:CorruptDisplayItem(modType)
25092526
end
25102527
controls.implicit4Label.shown = false
25112528
controls.implicit4.shown = false
2529+
controls.implicitCannotBeChangedLabel = new("LabelControl", {"TOPLEFT",nil,"TOPLEFT"}, 20, 45, 0, 20, "^7This Items Implicits Cannot Be Changed")
2530+
controls.implicitCannotBeChangedLabel.shown = self.displayItem.implicitsCannotBeChanged
25122531
buildList(controls.implicit, controls.implicit2, currentModType)
25132532
buildList(controls.implicit2, controls.implicit, currentModType)
25142533
controls.save = new("ButtonControl", nil, -45, 99, 80, 20, modType, function()

src/Data/ModCache.lua

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8786,11 +8786,7 @@ c["Impales you inflict last 2 additional Hits while using Pride"]={{[1]={[1]={ty
87868786
c["Implicit Modifier magnitudes are doubled"]={nil,"Implicit Modifier magnitudes are doubled "}
87878787
c["Implicit Modifier magnitudes are tripled"]={nil,"Implicit Modifier magnitudes are tripled "}
87888788
c["Implicit Modifier magnitudes are tripled Corrupted"]={nil,"Implicit Modifier magnitudes are tripled Corrupted "}
8789-
c["Implicit Modifiers Cannot Be Changed"]={nil,"Implicit Modifiers Cannot Be Changed "}
8790-
c["Implicit Modifiers Cannot Be Changed 100% increased Explicit Modifier magnitudes"]={nil,"Implicit Modifiers Cannot Be Changed 100% increased Explicit Modifier magnitudes "}
8791-
c["Implicit Modifiers Cannot Be Changed 25% increased Prefix Modifier magnitudes"]={nil,"Implicit Modifiers Cannot Be Changed 25% increased Prefix Modifier magnitudes "}
8792-
c["Implicit Modifiers Cannot Be Changed 25% increased Suffix Modifier magnitudes"]={nil,"Implicit Modifiers Cannot Be Changed 25% increased Suffix Modifier magnitudes "}
8793-
c["Implicit Modifiers Cannot Be Changed Has Elder, Shaper and all Conqueror Influences"]={nil,"Implicit Modifiers Cannot Be Changed Has Elder, Shaper and all Conqueror Influences "}
8789+
c["Implicit Modifiers Cannot Be Changed"]={{},nil}
87948790
c["Increases and Reductions to Armour also apply to Energy"]={nil,"Increases and Reductions to Armour also apply to Energy "}
87958791
c["Increases and Reductions to Armour also apply to Energy Shield Recharge Rate at 20% of their value"]={{[1]={flags=0,keywordFlags=0,name="ArmourAppliesToEnergyShieldRecharge",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="ImprovedArmourAppliesToEnergyShieldRecharge",type="MAX",value=20}},nil}
87968792
c["Increases and Reductions to Cast Speed also Apply to Trap Throwing Speed"]={{[1]={flags=0,keywordFlags=0,name="CastSpeedAppliesToTrapThrowingSpeed",type="FLAG",value=true}},nil}

src/Modules/ModParser.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5088,6 +5088,7 @@ local specialModList = {
50885088
["can have a second enchantment modifier"] = { },
50895089
["can have (%d+) additional enchantment modifiers"] = { },
50905090
["this item can be anointed by cassia"] = { },
5091+
["implicit modifiers cannot be changed"] = { },
50915092
["has a crucible passive skill tree"] = { },
50925093
["has a two handed sword crucible passive skill tree"] = { },
50935094
["has a crucible passive skill tree with only support passive skills"] = { },

0 commit comments

Comments
 (0)