diff --git a/Classes/Item.lua b/Classes/Item.lua index 15b49f42e..a8a4080fe 100644 --- a/Classes/Item.lua +++ b/Classes/Item.lua @@ -215,10 +215,14 @@ function ItemClass:ParseRaw(raw) self.requirements.level = tonumber(specVal) elseif specName == "Has Alt Variant" then self.hasAltVariant = true + elseif specName == "Has Third Variant" then + self.has3rdVariant = true elseif specName == "Selected Variant" then self.variant = tonumber(specVal) elseif specName == "Selected Alt Variant" then self.variantAlt = tonumber(specVal) + elseif specName == "Selected Third Variant" then + self.variant3rd = tonumber(specVal) elseif specName == "League" then self.league = specVal elseif specName == "Crafted" then @@ -385,6 +389,9 @@ function ItemClass:ParseRaw(raw) if self.hasAltVariant then self.variantAlt = m_min(#self.variantList, self.variantAlt or self.defaultVariant or #self.variantList) end + if self.has3rdVariant then + self.variant3rd = m_min(#self.variantList, self.variant3rd or self.defaultVariant or #self.variantList) + end end if not self.quality then self:NormaliseQuality() @@ -458,6 +465,10 @@ function ItemClass:BuildRaw() t_insert(rawLines, "Has Alt Variant: true") t_insert(rawLines, "Selected Alt Variant: "..self.variantAlt) end + if self.has3rdVariant then + t_insert(rawLines, "Has Third Variant: true") + t_insert(rawLines, "Selected Third Variant: "..self.variant3rd) + end end if self.quality then t_insert(rawLines, "Quality: "..self.quality) @@ -581,6 +592,7 @@ function ItemClass:CheckModLineVariant(modLine) return not modLine.variantList or modLine.variantList[self.variant] or (self.hasAltVariant and modLine.variantList[self.variantAlt]) + or (self.has3rdVariant and modLine.variantList[self.variant3rd]) end -- Return the name of the slot this item is equipped in diff --git a/Classes/ItemsTab.lua b/Classes/ItemsTab.lua index 867e2b584..9e140679d 100644 --- a/Classes/ItemsTab.lua +++ b/Classes/ItemsTab.lua @@ -264,6 +264,16 @@ If there's 2 slots an item can go in, holding Shift will put it in the second.]] self.controls.displayItemAltVariant.shown = function() return self.displayItem.hasAltVariant end + + self.controls.displayItem3rdVariant = common.New("DropDownControl", {"LEFT",self.controls.displayItemAltVariant,"RIGHT"}, 8, 0, 224, 20, nil, function(index, value) + self.displayItem.variant3rd = index + self.displayItem:BuildAndParseRaw() + self:UpdateDisplayItemTooltip() + self:UpdateDisplayItemRangeLines() + end) + self.controls.displayItem3rdVariant.shown = function() + return self.displayItem.has3rdVariant + end -- Section: Sockets and Links self.controls.displayItemSectionSockets = new("Control", {"TOPLEFT",self.controls.displayItemSectionVariant,"BOTTOMLEFT"}, 0, 0, 0, function() @@ -549,6 +559,10 @@ function ItemsTabClass:Load(xml, dbFileName) item.hasAltVariant = true item.variantAlt = tonumber(node.attrib.variantAlt) end + if node.attrib.variant3rd then + item.has3rdVariant = true + item.variant3rd = tonumber(node.attrib.variant3rd) + end for _, child in ipairs(node) do if type(child) == "string" then item:ParseRaw(child) @@ -995,6 +1009,9 @@ function ItemsTabClass:SetDisplayItem(item) self.controls.displayItemAltVariant.list = item.variantList self.controls.displayItemAltVariant.selIndex = item.variantAlt end + if item.has3rdVariant then + self.controls.displayItem3rdVariant.list = item.variantList + end self:UpdateSocketControls() if item.crafted then self:UpdateAffixControls() diff --git a/Data/Uniques/jewel.lua b/Data/Uniques/jewel.lua index a67554200..4737e1d54 100644 --- a/Data/Uniques/jewel.lua +++ b/Data/Uniques/jewel.lua @@ -478,114 +478,183 @@ Watcher's Eye Prismatic Jewel Source: Drops from unique{The Elder} Has Alt Variant: true +Has Third Variant: true +Selected Third Variant: 1 +Variant: None Variant: Anger: Fire Leech Variant: Anger: Fire Pen +Variant: Anger: Crit Multi +Variant: Anger: Inc. Fire Variant: Anger: Physical Add Fire Variant: Anger: Physical Convert Fire Variant: Clarity: Dmg. Mana before Life +Variant: Clarity: Dmg. gain as Mana Variant: Clarity: Mana Add Energy Shield -Variant: Clarity: Recover Mana +Variant: Clarity: Mana Recovery +Variant: Clarity: Recover Mana on Skill Variant: Clarity: Mana Cost +Variant: Determination: Additional Armour Variant: Determination: Block Variant: Determination: Phys Dmg Reduct Variant: Determination: Red. Crit Dmg +Variant: Determination: Red. Reflected Phys Variant: Determination: Vuln. Immune Variant: Discipline: Spell Block Variant: Discipline: Energy Shield on Hit +Variant: Discipline: Energy Shield Recovery Variant: Discipline: Energy Shield Regen Variant: Discipline: Faster Rchrg. Start Variant: Grace: Additional Evade +Variant: Grace: Blind when Hit Variant: Grace: Dodge Chance Variant: Grace: Movement Speed Variant: Grace: Enfeeble Immune Variant: Haste: Spell Dodge Chance +Variant: Haste: Movement Skill Cooldown +Variant: Haste: Debuffs Exire Faster Variant: Haste: Onslaught on Kill Variant: Haste: Phasing Variant: Haste: Temp. Chains Immune Variant: Hatred: Added Cold Damage Variant: Hatred: Crit Chance Variant: Hatred: Cold Pen +Variant: Hatred: Inc. Cold Dmg Variant: Hatred: Physical Convert Cold +Variant: Malevolence: Skill Duration +Variant: Malevolence: Chaos DoT Mult. +Variant: Malevolence: Cold DoT Mult. +Variant: Malevolence: Inc. Recovery Rate +Variant: Malevolence: Poison Immune +Variant: Malevolence: Bleeding Immune +Variant: Malevolence: Faster Ailment Damage +Variant: Purity of Elements: Chaos Resistance +Variant: Purity of Elements: Red. Reflected Ele. Variant: Purity of Elements: Phys as Cold Variant: Purity of Elements: Phys as Fire Variant: Purity of Elements: Phys as Light Variant: Purity of Elements: EW Immune Variant: Purity of Fire: Ignite Immune +Variant: Purity of Fire: Red. Reflected Fire Variant: Purity of Fire: Phys as Fire Variant: Purity of Fire: Bur.Gr Immune Variant: Purity of Fire: Flamm. Immune Variant: Purity of Ice: Freeze Immune +Variant: Purity of Ice: Red. Reflected Cold Variant: Purity of Ice: Phys as Cold Variant: Purity of Ice: Chl.Gr Immune Variant: Purity of Ice: Frostbite Immune Variant: Purity of Lightning: Shock Immune Variant: Purity of Lightning: Phys as Light +Variant: Purity of Lightning: Red. Reflected Light Variant: Purity of Lightning: Cond. Immune Variant: Purity of Lightning: Shk.Gr Immune Variant: Vitality: Life Leech Variant: Vitality: Life Regen Variant: Vitality: Life on Hit +Variant: Vitality: Life from Flasks Variant: Vitality: Life Recovery +Variant: Wrath: Crit Chance +Variant: Wrath: Inc. Light Damage Variant: Wrath: Light Leech Variant: Wrath: Light Pen Variant: Wrath: Phys Add Light Variant: Wrath: Phys Convert Light +Variant: Zealotry: Resistance Pen +Variant: Zealotry: Inc. Cast Speed +Variant: Zealotry: Consecrated Ground Lingers +Variant: Zealotry: Inc. Dmg. Cons. Gr +Variant: Zealotry: Arcane Surge +Variant: Zealotry: ES Leech +Variant: Zealotry: Inc. Crit Limited to: 1 (4–6)% increased maximum Energy Shield (4–6)% increased maximum Life (4–6)% increased maximum Mana -{variant:1}(1-1.5)% of Fire Damage Leeched as Life while affected by Anger -{variant:2}Damage Penetrates (10-15)% Fire Resistance while affected by Anger -{variant:3}Gain (15-25)% of Physical Damage as Extra Fire Damage while affected by Anger -{variant:4}(25-40)% of Physical Damage Converted to Fire Damage while affected by Anger -{variant:5}(6-10)% of Damage taken from Mana before Life while affected by Clarity -{variant:6}Gain (12-18)% of Maximum Mana as Extra Maximum Energy Shield while affected by Clarity -{variant:7}(10-15)% chance to Recover 10% of Maximum Mana when you use a Skill while affected by Clarity -{variant:8}-(10-5) to Total Mana Cost of Skills while affected by Clarity -{variant:9}(5-8)% chance to Block while affected by Determination -{variant:10}(5-8)% additional Physical Damage Reduction while affected by Determination -{variant:11}You take (60-40)% reduced Extra Damage from Critical Strikes while affected by Determination -{variant:12}Unaffected by Vulnerability while affected by Determination -{variant:13}(5-8)% chance to Block Spells while affected by Discipline -{variant:14}(20-30) Energy Shield gained for each Enemy Hit while affected by Discipline -{variant:15}(1.5-2.5)% of Maximum Energy Shield Regenerated per Second while affected by Discipline -{variant:16}(30-40)% faster start of Energy Shield Recharge while affected by Discipline -{variant:17}+(5-8)% chance to Evade Attacks while affected by Grace -{variant:18}(6-10)% chance to Dodge Attacks while affected by Grace -{variant:19}(10-15)% increased Movement Speed while affected by Grace -{variant:20}Unaffected by Enfeeble while affected by Grace -{variant:21}(5-8)% chance to Dodge Spells while affected by Haste -{variant:22}You gain Onslaught for 4 seconds on Kill while affected by Haste -{variant:23}You have Phasing while affected by Haste -{variant:24}Unaffected by Temporal Chains while affected by Haste -{variant:25}Adds (58-70) to (88-104) Cold Damage while affected by Hatred -{variant:26}+(1.2-1.8)% to Critical Strike Chance while affected by Hatred -{variant:27}Damage Penetrates (10-15)% Cold Resistance while affected by Hatred -{variant:28}(25-40)% of Physical Damage Converted to Cold Damage while affected by Hatred -{variant:29}(8-12)% of Physical Damage taken as Cold Damage while affected by Purity of Elements -{variant:30}(8-12)% of Physical Damage taken as Fire Damage while affected by Purity of Elements -{variant:31}(8-12)% of Physical Damage taken as Lightning Damage while affected by Purity of Elements -{variant:32}Unaffected by Elemental Weakness while affected by Purity of Elements -{variant:33}Immune to Ignite while affected by Purity of Fire -{variant:34}(6-10)% of Physical Damage taken as Fire Damage while affected by Purity of Fire -{variant:35}Unaffected by Burning Ground while affected by Purity of Fire -{variant:36}Unaffected by Flammability while affected by Purity of Fire -{variant:37}Immune to Freeze while affected by Purity of Ice -{variant:38}(6-10)% of Physical Damage taken as Cold Damage while affected by Purity of Ice -{variant:39}Unaffected by Chilled Ground while affected by Purity of Ice -{variant:40}Unaffected by Frostbite while affected by Purity of Ice -{variant:41}Immune to Shock while affected by Purity of Lightning -{variant:42}(6-10)% of Physical Damage taken as Lightning Damage while affected by Purity of Lightning -{variant:43}Unaffected by Conductivity while affected by Purity of Lightning -{variant:44}Unaffected by Shocked Ground while affected by Purity of Lightning -{variant:45}(1-1.5)% of Damage leeched as Life while affected by Vitality -{variant:46}(100-140) Life Regenerated per Second while affected by Vitality -{variant:47}(20-30) Life gained for each Enemy Hit while affected by Vitality -{variant:48}(20-30)% increased Life Recovery Rate while affected by Vitality -{variant:49}(1-1.5)% of Lightning Damage is Leeched as Mana while affected by Wrath -{variant:50}Damage Penetrates (10-15)% Lightning Resistance while affected by Wrath -{variant:51}Gain (15-25)% of Physical Damage as Extra Lightning Damage while affected by Wrath -{variant:52}(25-40)% of Physical Damage Converted to Lightning Damage while affected by Wrath +{variant:2}(1-1.5)% of Fire Damage Leeched as Life while affected by Anger +{variant:3}Damage Penetrates (10-15)% Fire Resistance while affected by Anger +{variant:4}+(30-50)% to Critical Strike Multiplier while affected by Anger +{variant:5}(40-60)% increased Fire Damage while affected by Anger +{variant:6}Gain (15-25)% of Physical Damage as Extra Fire Damage while affected by Anger +{variant:7}(25-40)% of Physical Damage Converted to Fire Damage while affected by Anger +{variant:8}(6-10)% of Damage taken from Mana before Life while affected by Clarity +{variant:9}(15-20)% of Damage taken gained as Mana over 4 seconds when Hit while affected by Clarity +{variant:10}Gain (12-18)% of Maximum Mana as Extra Maximum Energy Shield while affected by Clarity +{variant:11}(20-30)% increased Mana Recovery Rate while affected by Clarity +{variant:12}(10-15)% chance to Recover 10% of Maximum Mana when you use a Skill while affected by Clarity +{variant:13}-(10-5) to Total Mana Cost of Skills while affected by Clarity +{variant:14}+(600-1000) to Armour while affected by Determination +{variant:15}(5-8)% chance to Block while affected by Determination +{variant:16}(5-8)% additional Physical Damage Reduction while affected by Determination +{variant:17}You take (60-40)% reduced Extra Damage from Critical Strikes while affected by Determination +{variant:18}(50-40)% reduced Reflected Physical Damage taken while affected by Determination +{variant:19}Unaffected by Vulnerability while affected by Determination +{variant:20}(5-8)% chance to Block Spells while affected by Discipline +{variant:21}+(20-30) Energy Shield gained for each Enemy Hit while affected by Discipline +{variant:22}(20-30)% increased Energy Shield Recovery Rate while affected by Discipline +{variant:23}(1.5-2.5)% of Maximum Energy Shield Regenerated per Second while affected by Discipline +{variant:24}(30-40)% faster start of Energy Shield Recharge while affected by Discipline +{variant:25}+(5-8)% chance to Evade Attacks while affected by Grace +{variant:26}(30-50)% chance to Blind Enemies which Hit you while affected by Grace +{variant:27}(6-10)% chance to Dodge Attacks while affected by Grace +{variant:28}(10-15)% increased Movement Speed while affected by Grace +{variant:29}Unaffected by Enfeeble while affected by Grace +{variant:30}(5-8)% chance to Dodge Spells while affected by Haste +{variant:31}(30-50)% increased cooldown recovery speed of Movement Skills used while affected by Haste +{variant:32}Debuffs on you expire (20-15)% faster while affected by Haste +{variant:33}You gain Onslaught for 4 seconds on Kill while affected by Haste +{variant:34}You have Phasing while affected by Haste +{variant:35}Unaffected by Temporal Chains while affected by Haste +{variant:36}Adds (58-70) to (88-104) Cold Damage while affected by Hatred +{variant:37}+(1.2-1.8)% to Critical Strike Chance while affected by Hatred +{variant:38}Damage Penetrates (10-15)% Cold Resistance while affected by Hatred +{variant:39}(40-60)% increased Cold Damage while affected by Hatred +{variant:40}(25-40)% of Physical Damage Converted to Cold Damage while affected by Hatred +{variant:41}(20–30)% increased Skill Effect Duration while affected by Malevolence +{variant:42}+(18–22)% to Non-Ailment Chaos Damage over Time Multiplier while affected by Malevolence +{variant:43}+(18–22)% to Cold Damage over Time Multiplier while affected by Malevolence +{variant:44}(15–20)% increased Recovery rate of Life and Energy Shield while affected by Malevolence +{variant:45}Unaffected by Poison while affected by Malevolence +{variant:46}Unaffected by Bleeding while affected by Malevolence +{variant:47}Damaging Ailments you inflict deal Damage (10–15)% faster while affected by Malevolence +{variant:48}+(30-50)% to Chaos Resistance while affected by Purity of Elements +{variant:49}(50-40)% reduced Reflected Elemental Damage taken while affected by Purity of Elements +{variant:50}(8-12)% of Physical Damage from Hits taken as Cold Damage while affected by Purity of Elements +{variant:51}(8-12)% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Elements +{variant:52}(8-12)% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Elements +{variant:53}Unaffected by Elemental Weakness while affected by Purity of Elements +{variant:54}Immune to Ignite while affected by Purity of Fire +{variant:55}(50-40)% reduced Reflected Fire Damage taken while affected by Purity of Fire +{variant:56}(6-10)% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Fire +{variant:57}Unaffected by Burning Ground while affected by Purity of Fire +{variant:58}Unaffected by Flammability while affected by Purity of Fire +{variant:59}Immune to Freeze while affected by Purity of Ice +{variant:60}(50-40)% reduced Reflected Cold Damage taken while affected by Purity of Ice +{variant:61}(6-10)% of Physical Damage from Hits taken as Cold Damage while affected by Purity of Ice +{variant:62}Unaffected by Chilled Ground while affected by Purity of Ice +{variant:63}Unaffected by Frostbite while affected by Purity of Ice +{variant:64}Immune to Shock while affected by Purity of Lightning +{variant:65}(50-40)% reduced Reflected Lightning Damage taken while affected by Purity of Lightning +{variant:66}(6-10)% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Lightning +{variant:67}Unaffected by Conductivity while affected by Purity of Lightning +{variant:68}Unaffected by Shocked Ground while affected by Purity of Lightning +{variant:69}(1-1.5)% of Damage leeched as Life while affected by Vitality +{variant:70}(100-140) Life Regenerated per Second while affected by Vitality +{variant:71}+(20-30) Life gained for each Enemy Hit while affected by Vitality +{variant:72}(50-70)% increased Life Recovery from Flasks while affected by Vitality +{variant:73}(20-30)% increased Life Recovery Rate while affected by Vitality +{variant:74}(70-100)% increased Critical Strike Chance while affected by Wrath +{variant:75}(40-60)% increased Lightning Damage while affected by Wrath +{variant:76}(1-1.5)% of Lightning Damage is Leeched as Mana while affected by Wrath +{variant:77}Damage Penetrates (10-15)% Lightning Resistance while affected by Wrath +{variant:78}Gain (15-25)% of Physical Damage as Extra Lightning Damage while affected by Wrath +{variant:79}(25-40)% of Physical Damage Converted to Lightning Damage while affected by Wrath +{variant:80}Critical Strikes Penetrate (8–10)% of Enemy Elemental Resistances while affected by Zealotry +{variant:81}(10–15)% increased Cast Speed while affected by Zealotry +{variant:82}Effects of Consecrated Ground you create while affected by Zealotry Linger for 2 seconds +{variant:83}Consecrated Ground you create while affected by Zealotry causes enemies to take (8–10)% increased Damage +{variant:84}Gain Arcane Surge for 4 seconds when you create Consecrated Ground while affected by Zealotry +{variant:85}30% increased Maximum total Recovery per second from Energy Shield Leech while affected by Zealotry +{variant:86}(100–120)% increased Critical Strike Chance against Enemies on Consecrated Ground while affected by Zealotry ]], -- Jewel: Threshold [[