Merge remote-tracking branch 'origin/dev'

Classes/CalcBreakdownControl.lua

@@ -395,6 +395,8 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 					else
 						desc = baseVal.." per "..tag.div.." "..self:FormatModName(tag.stat)
 					end
+				elseif tag.type == "StatThreshold" then
+					desc = "If "..self:FormatModName(tag.stat).." >= "..tag.threshold
 				elseif tag.type == "SkillName" then
 					desc = "Skill: "..tag.skillName
 				elseif tag.type == "SkillId" then

Classes/ConfigTab.lua

@@ -36,7 +36,7 @@ local varList = {
 	{ var = "igniteMode", type = "list", label = "Ignite calculation mode:", tooltip = "Controls how the base damage for ignite is calculated:\nAverage Damage: Ignite is based on the average damage dealt, factoring in crits and non-crits.\nCrit Damage: Ignite is based on crit damage only.", list = {{val="AVERAGE",label="Average Damage"},{val="CRIT",label="Crit Damage"}} },
 	{ section = "Skill Options", col = 2 },
 	{ label = "Detonate Dead:", ifSkill = "Detonate Dead" },
-	{ var = "detonateDeadCorpseLife", type = "number", label = "Corpse Life:", ifSkillList = { "Detonate Dead", "Vaal Detonate Dead" }, tooltip = "Sets the maximum life of the corpse that is being detonated.\nFor reference, a level 70 monster has "..data.monsterLifeTable[70].." base life, and a level 80 monster has "..data.monsterLifeTable[80]..".", apply = function(val, modList, enemyModList)
+	{ var = "detonateDeadCorpseLife", type = "number", label = "Corpse Life:", ifSkillList = { "Detonate Dead", "Vaal Detonate Dead" }, tooltip = "Sets the maximum life of the corpse that is being detonated.\nFor reference, a level 70 monster has "..data["3_0"].monsterLifeTable[70].." base life, and a level 80 monster has "..data["3_0"].monsterLifeTable[80]..".", apply = function(val, modList, enemyModList)
 		modList:NewMod("SkillData", "LIST", { key = "corpseLife", value = val }, "Config", { type = "SkillName", skillName = "Detonate Dead" })
 	end },
 	{ label = "Ice Nova:", ifSkill = "Ice Nova" },
@@ -304,24 +304,13 @@ local varList = {
 	end },
 	{ var = "buffConflux", type = "list", label = "Conflux Buff:", ifNode = 51391, list = {{val=0,label="None"},{val="CHILLING",label="Chilling"},{val="SHOCKING",label="Shocking"},{val="IGNITING",label="Igniting"},{val="ALL",label="Chill + Shock + Ignite"}}, apply = function(val, modList, enemyModList)
 		if val == "CHILLING" or val == "ALL" then
-			modList:NewMod("PhysicalCanChill", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("LightningCanChill", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("FireCanChill", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("ChaosCanChill", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
+			modList:NewMod("Condition:ChillingConflux", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
 		end
 		if val == "SHOCKING" or val == "ALL" then
-			modList:NewMod("EnemyShockChance", "BASE", 100, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("PhysicalCanShock", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("ColdCanShock", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("FireCanShock", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("ChaosCanShock", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
+			modList:NewMod("Condition:ShockingConflux", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
 		end
 		if val == "IGNITING" or val == "ALL" then
-			modList:NewMod("EnemyIgniteChance", "BASE", 100, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("PhysicalCanIgnite", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("LightningCanIgnite", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("ColdCanIgnite", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
-			modList:NewMod("ChaosCanIgnite", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
+			modList:NewMod("Condition:IgnitingConflux", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
 		end
 	end },
 	{ var = "buffBastionOfHope", type = "check", label = "Is Bastion of Hope active?", ifNode = 39728, apply = function(val, modList, enemyModList)
@@ -482,7 +471,7 @@ local ConfigTabClass = common.NewClass("ConfigTab", "UndoHandler", "ControlHost"
 
 	self.sectionList = { }
 	self.varControls = { }
-
+	
 	self:BuildModList()
 
 	local lastSection

Classes/ItemsTab.lua

@@ -234,7 +234,7 @@ If there's 2 slots an item can go in, holding Shift will put it in the second.]]
 	self.controls.removeDisplayItem = common.New("ButtonControl", {"LEFT",self.controls.editDisplayItem,"RIGHT"}, 8, 0, 60, 20, "Cancel", function()
 		self:SetDisplayItem()
 	end)
-	self.controls.displayItemVariant = common.New("DropDownControl", {"LEFT",self.controls.removeDisplayItem,"RIGHT"}, 8, 0, 200, 20, nil, function(index, value)
+	self.controls.displayItemVariant = common.New("DropDownControl", {"LEFT",self.controls.removeDisplayItem,"RIGHT"}, 8, 0, 214, 20, nil, function(index, value)
 		self.displayItem.variant = index
 		itemLib.buildItemModList(self.displayItem)
 		self:UpdateDisplayItemTooltip()

Classes/PassiveTree.lua

@@ -229,6 +229,9 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 		node.mods = { }
 		node.modKey = ""
 		local i = 1
+		if node.passivePointsGranted > 0 then
+			t_insert(node.sd, "Grants "..node.passivePointsGranted.." Passive Skill Point"..(node.passivePointsGranted > 1 and "s" or ""))
+		end
 		while node.sd[i] do
 			if node.sd[i]:match("\n") then
 				local line = node.sd[i]
@@ -292,9 +295,6 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
 				end
 			end
 		end
-		if node.passivePointsGranted > 0 then
-			node.modList:NewMod("ExtraPoints", "BASE", node.passivePointsGranted, "Tree"..node.id)
-		end
 		if node.type == "keystone" then
 			node.keystoneMod = modLib.createMod("Keystone", "LIST", node.dn, "Tree"..node.id)
 		end

Classes/PassiveTreeView.lua

@@ -28,6 +28,8 @@ local PassiveTreeViewClass = common.NewClass("PassiveTreeView", function(self)
 	self.zoomY = 0
 
 	self.searchStr = ""
+	self.searchStrCached = ""
+	self.searchStrResults = {}
 	self.showStatDifferences = true
 end)
 
@@ -330,6 +332,14 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 		build.calcsTab:BuildPower()
 	end
 
+	-- Update cached node data
+	if self.searchStrCached ~= self.searchStr then
+		self.searchStrCached = self.searchStr
+		for nodeId, node in pairs(spec.nodes) do
+			self.searchStrResults[nodeId] = #self.searchStr > 0 and self:DoesNodeMatchSearchStr(node)
+		end
+	end
+
 	-- Draw the nodes
 	for nodeId, node in pairs(spec.nodes) do
 		-- Determine the base and overlay images for this node based on type and state
@@ -440,7 +450,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 			self:DrawAsset(tree.assets[overlay], scrX, scrY, scale)
 			SetDrawColor(1, 1, 1)
 		end
-		if #self.searchStr > 0 and self:DoesNodeMatchSearchStr(node) then
+		if self.searchStrResults[nodeId] then
 			-- Node matches the search string, show the highlight circle
 			SetDrawLayer(nil, 30)
 			SetDrawColor(1, 0, 0)

Data/Misc.lua → Data/2_6/Misc.lua

@@ -1,3 +1,4 @@
+local data = ...
 -- From DefaultMonsterStats.dat
 data.monsterEvasionTable = { 36, 42, 49, 56, 64, 72, 80, 89, 98, 108, 118, 128, 140, 151, 164, 177, 190, 204, 219, 235, 251, 268, 286, 305, 325, 345, 367, 389, 412, 437, 463, 489, 517, 546, 577, 609, 642, 676, 713, 750, 790, 831, 873, 918, 964, 1013, 1063, 1116, 1170, 1227, 1287, 1349, 1413, 1480, 1550, 1623, 1698, 1777, 1859, 1944, 2033, 2125, 2221, 2321, 2425, 2533, 2645, 2761, 2883, 3009, 3140, 3276, 3418, 3565, 3717, 3876, 4041, 4213, 4391, 4576, 4768, 4967, 5174, 5389, 5613, 5845, 6085, 6335, 6595, 6864, 7144, 7434, 7735, 8048, 8372, 8709, 9058, 9420, 9796, 10186, }
 data.monsterAccuracyTable = { 18, 19, 20, 21, 23, 24, 25, 27, 28, 30, 31, 33, 35, 36, 38, 40, 42, 44, 46, 49, 51, 54, 56, 59, 62, 65, 68, 71, 74, 78, 81, 85, 89, 93, 97, 101, 106, 111, 116, 121, 126, 132, 137, 143, 149, 156, 162, 169, 177, 184, 192, 200, 208, 217, 226, 236, 245, 255, 266, 277, 288, 300, 312, 325, 338, 352, 366, 381, 396, 412, 428, 445, 463, 481, 500, 520, 540, 562, 584, 607, 630, 655, 680, 707, 734, 762, 792, 822, 854, 887, 921, 956, 992, 1030, 1069, 1110, 1152, 1196, 1241, 1288, }

Data/3_0/Misc.lua

@@ -0,0 +1,9 @@
+local data = ...
+-- From DefaultMonsterStats.dat
+data.monsterEvasionTable = { 36, 42, 49, 56, 64, 72, 80, 89, 98, 108, 118, 128, 140, 151, 164, 177, 190, 204, 219, 235, 251, 268, 286, 305, 325, 345, 367, 389, 412, 437, 463, 489, 517, 546, 577, 609, 642, 676, 713, 750, 790, 831, 873, 918, 964, 1013, 1063, 1116, 1170, 1227, 1287, 1349, 1413, 1480, 1550, 1623, 1698, 1777, 1859, 1944, 2033, 2125, 2221, 2321, 2425, 2533, 2645, 2761, 2883, 3009, 3140, 3276, 3418, 3565, 3717, 3876, 4041, 4213, 4391, 4576, 4768, 4967, 5174, 5389, 5613, 5845, 6085, 6335, 6595, 6864, 7144, 7434, 7735, 8048, 8372, 8709, 9058, 9420, 9796, 10186, }
+data.monsterAccuracyTable = { 18, 19, 20, 21, 23, 24, 25, 27, 28, 30, 31, 33, 35, 36, 38, 40, 42, 44, 46, 49, 51, 54, 56, 59, 62, 65, 68, 71, 74, 78, 81, 85, 89, 93, 97, 101, 106, 111, 116, 121, 126, 132, 137, 143, 149, 156, 162, 169, 177, 184, 192, 200, 208, 217, 226, 236, 245, 255, 266, 277, 288, 300, 312, 325, 338, 352, 366, 381, 396, 412, 428, 445, 463, 481, 500, 520, 540, 562, 584, 607, 630, 655, 680, 707, 734, 762, 792, 822, 854, 887, 921, 956, 992, 1030, 1069, 1110, 1152, 1196, 1241, 1288, }
+data.monsterLifeTable = { 15, 18, 21, 25, 29, 33, 38, 43, 49, 55, 61, 68, 76, 85, 94, 104, 114, 126, 138, 152, 166, 182, 199, 217, 236, 257, 280, 304, 331, 359, 389, 422, 456, 494, 534, 577, 624, 673, 726, 783, 844, 910, 980, 1055, 1135, 1221, 1313, 1411, 1516, 1629, 1749, 1878, 2015, 2162, 2319, 2486, 2665, 2857, 3061, 3279, 3512, 3760, 4025, 4308, 4610, 4932, 5276, 5642, 6033, 6449, 6894, 7367, 7872, 8410, 8984, 9595, 10246, 10940, 11679, 12466, 13304, 14198, 15149, 16161, 17240, 18388, 19610, 20911, 22296, 23770, 25338, 27007, 28784, 30673, 32684, 34823, 37098, 39519, 42093, 44831, }
+data.monsterAllyLifeTable = { 15, 17, 20, 23, 26, 30, 33, 37, 41, 46, 50, 55, 60, 66, 71, 77, 84, 91, 98, 105, 113, 122, 131, 140, 150, 161, 171, 183, 195, 208, 222, 236, 251, 266, 283, 300, 318, 337, 357, 379, 401, 424, 448, 474, 501, 529, 559, 590, 622, 656, 692, 730, 769, 810, 853, 899, 946, 996, 1048, 1102, 1159, 1219, 1281, 1346, 1415, 1486, 1561, 1640, 1722, 1807, 1897, 1991, 2089, 2192, 2299, 2411, 2528, 2651, 2779, 2913, 3053, 3199, 3352, 3511, 3678, 3853, 4035, 4225, 4424, 4631, 4848, 5074, 5310, 5557, 5815, 6084, 6364, 6658, 6964, 7283, }
+data.monsterDamageTable = { 5, 6, 6, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20, 21, 23, 24, 26, 28, 30, 32, 34, 36, 39, 41, 44, 47, 50, 53, 56, 59, 63, 67, 71, 75, 80, 84, 89, 94, 100, 106, 112, 118, 125, 131, 139, 147, 155, 163, 172, 181, 191, 202, 212, 224, 236, 248, 262, 275, 290, 305, 321, 338, 355, 374, 393, 413, 434, 456, 480, 504, 530, 556, 584, 614, 645, 677, 711, 746, 783, 822, 862, 905, 949, 996, 1045, 1096, 1149, 1205, 1264, 1325, 1390, 1457, 1527, 1601, 1678, 1758, }
+-- From MonsterVarieties.dat combined with SkillTotemVariations.dat
+data.totemLifeMult = { [1] = 1.47, [2] = 1.47, [3] = 1.47, [4] = 1.47, [5] = 1.47, [6] = 2.1, [7] = 1.47, [8] = 1.47, [9] = 1.47, [10] = 1.47, [11] = 1.47, [12] = 1.47, [13] = 2.25, [15] = 2.25, }

Data/3_0/Skills/act_dex.lua

@@ -3665,7 +3665,7 @@ skills["ProjectileWeakness"] = {
 	},
 	baseMods = {
 		skill("castTime", 0.5), 
-		--"projectiles_always_pierce_you" = 1
+		flag("AlwaysPierceSelf", { type = "GlobalEffect", effectType = "Curse" }), --"projectiles_always_pierce_you" = 1
 		--"chance_to_be_knocked_back_%" = 25
 		--"base_deal_no_damage" = ?
 		skill("debuff", true), 

Data/Global.lua

@@ -52,6 +52,7 @@ ModFlag.Melee =		 0x00000100
 ModFlag.Area =		 0x00000200
 ModFlag.Projectile = 0x00000400
 ModFlag.SourceMask = 0x00000600
+ModFlag.Ailment =	 0x00000800
 -- Weapon types
 ModFlag.Axe =		 0x00001000
 ModFlag.Bow =		 0x00002000

Data/New.lua

@@ -70,21 +70,35 @@ With at least 40 Intelligence in Radius, Spark fires 2 additional Projectiles
 With at least 40 Intelligence in Radius, Spark fires Projectiles in a Nova
 25% reduced Spark Duration
 ]],[[
-Straight and True
-Viridian Jewel
+Inya's Epiphany
+Arcanist Slippers
 Unreleased: true
-Limited to: 2
-Radius: Medium
-(6-10)% increased Projectile Damage
-With at least 40 Dexterity in Radius, Split Arrow fires Projectiles in Parallel
+Requires Level 61
++63 to maximum Life
+25% increased Movement Speed
+5% increased Intelligence
+5% increased Damage per Power Charge
+25% chance that if you would gain Power Charges, you instead gain
+up to your maximum number of Power Charges
 ]],[[
-Choking Ash
-Viridian Jewel
+Volkuur's Guidance
+Zealot Gloves
 Unreleased: true
-Limited to: 2
-Radius: Medium
-(10-15)% increased Fire Damage
-Can have up to 1 additional Trap placed at a time
-With at least 40 Dexterity in Radius, Fire Trap throws an additional Trap
+Requires Level 43
+Adds 17 to 28 Cold Damage to Spells and Attacks
++67 to maximum Life
++37% to Cold Resistance
+50% less Poison Duration
+Cold Damage can Poison
+Cold Skills have 20% chance to Poison on Hit
+]],[[
+The Coming Calamity
+Destroyer Regalia
+Requires Level 53
+Unreleased: true
+86% increased Energy Shield
+35% chance to avoid being Stunned for each Herald Skill affecting you
+Mana Reservation of Herald Skills is always 45%
++2 to Level of Socketed Herald Gems
 ]],
 }

Data/Uniques/amulet.lua

@@ -77,10 +77,14 @@ Requires Level 32
 ]],[[
 Bisco's Collar
 Gold Amulet
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 Requires Level 30
 (12-20)% increased Rarity of Items found
-150% increased Rarity of Items Dropped by Slain Magic Enemies
-100% increased Quantity of Items Dropped by Slain Normal Enemies
+{variant:1}150% increased Rarity of Items Dropped by Slain Magic Enemies
+{variant:2}(100-150)% increased Rarity of Items Dropped by Slain Magic Enemies
+{variant:1}100% increased Quantity of Items Dropped by Slain Normal Enemies
+{variant:2}(50-100)% increased Quantity of Items Dropped by Slain Normal Enemies
 ]],[[
 Blightwell
 Clutching Talisman
@@ -107,6 +111,7 @@ Corrupted
 ]],[[
 Bloodgrip
 Coral Amulet
+Variant: Pre 3.0.0
 Requires Level 55
 (2-4) Life Regenerated per second
 Adds 10 to 20 Physical Damage to Attacks
@@ -115,6 +120,17 @@ Adds 10 to 20 Physical Damage to Attacks
 100% increased Life Recovery from Flasks
 Moving while Bleeding doesn't cause you to take extra Damage
 ]],[[
+Bloodgrip
+Marble Amulet
+Variant: Current
+Requires Level 55
+(1.2-1.6)% of Life Regenerated per second
+Adds 10 to 20 Physical Damage to Attacks
++(60-70) to maximum Life
+(8-12) Life Regenerated per second
+100% increased Life Recovery from Flasks
+Moving while Bleeding doesn't cause you to take extra Damage
+]],[[
 Carnage Heart
 Onyx Amulet
 Variant: Pre 2.6.0
@@ -305,8 +321,8 @@ Corrupted
 ]],[[
 Rashkaldor's Patience
 Jade Amulet
-Variant: {2_6}Current
-Variant: 3.0.0 Beta
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 Requires Level 61
 +(20-30) to Dexterity
 +(40-80) to maximum Life
@@ -347,8 +363,8 @@ Nearby Allies gain 40% increased Mana Regeneration Rate
 ]],[[
 Sidhebreath
 Paua Amulet
-Variant: {2_6}Current
-Variant: 3.0.0 Beta
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 (20-30)% increased Mana Regeneration Rate
 +25% to Cold Resistance
 0.2% of Physical Attack Damage Leeched as Mana
@@ -416,26 +432,29 @@ Requires Level 16
 ]],[[
 Voice of the Storm
 Lapis Amulet
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 League: Breach
 Requires Level 40
 +(20-30) to Intelligence
 +(10-15) to all Attributes
 (10-20)% increased maximum Mana
-Critical Strike Chance is increased by Uncapped Lightning Resistance
+{variant:1}Critical Strike Chance is increased by Uncapped Lightning Resistance
+{variant:2}Critical Strike Chance is increased by Lightning Resistance
 Cast Level 12 Lightning Bolt when you deal a Critical Strike
 ]],[[
 Choir of the Storm
 Lapis Amulet
-Variant: {2_6}Current
-Variant: 3.0.0 Beta
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 League: Breach
 Requires Level 69
 +(20-30) to Intelligence
 (10-20)% increased maximum Mana
--30% to Lightning Resistance
-Critical Strike Chance is increased by Uncapped Lightning Resistance
-{variant:1}Critical Strikes deal 50% increased Lightning Damage
-{variant:2}50% increased Lightning Damage
+{variant:1}-30% to Lightning Resistance
+{variant:1}Critical Strike Chance is increased by Uncapped Lightning Resistance
+{variant:2}Critical Strike Chance is increased by Lightning Resistance
+Critical Strikes deal 50% increased Lightning Damage
 Cast Level 20 Lightning Bolt when you deal a Critical Strike
 ]],[[
 Voll's Devotion

Data/Uniques/axe.lua

@@ -45,13 +45,16 @@ Adds (10-15) to (25-30) Physical Damage
 ]],[[
 Jack, the Axe
 Vaal Hatchet
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 Requires Level 65, 140 Str, 86 Dex
 (90-110)% increased Physical Damage
 Adds (11-14) to (18-23) Physical Damage
 (10-15)% increased Attack Speed
 2% of Physical Attack Damage Leeched as Life
 50% reduced Life Leeched per second
-Causes Bleeding on Hit
+{variant:1}Causes Bleeding on Hit
+{variant:2}25% chance to cause Bleeding on Hit
 ]],[[
 Moonbender's Wing
 Tomahawk
@@ -78,13 +81,16 @@ Cannot be Chilled while you have Onslaught
 ]],[[
 Rigwald's Savagery
 Royal Axe
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 League: Talisman Standard, Talisman Hardcore
 Requires Level 67, 167 Str, 57 Dex
 Adds (50-70) to (135-165) Physical Damage
 40% increased Physical Weapon Damage while Dual Wielding
 (10-15)% increased Attack Speed
 35% increased Attack Speed with Swords
-Causes Bleeding on Hit
+{variant:1}Causes Bleeding on Hit
+{variant:2}25% chance to cause Bleeding on Hit
 ]],[[
 The Screaming Eagle
 Jade Hatchet
@@ -115,25 +121,29 @@ Your Physical Damage can Chill
 [[
 Atziri's Disfavour
 Vaal Axe
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 Requires Level 75, 158 Str, 76 Dex
 +2 to Level of Socketed Support Gems
 Adds (220-235) to (270-290) Physical Damage
 (12-16)% increased Attack Speed
-Causes Bleeding on Hit
+{variant:1}Causes Bleeding on Hit
+{variant:2}25% chance to cause Bleeding on Hit
 +2 to Weapon range
 ]],[[
 The Blood Reaper
 Headsman Axe
-Variant: {2_6}Current
-Variant: 3.0.0 Beta
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 Requires Level 45, 99 Str, 57 Dex
 {variant:1}(100-120)% increased Physical Damage
 {variant:2}(180–200)% increased Physical Damage
 +100 to maximum Life
 10.0 Life Regenerated per second
 1% of Physical Attack Damage Leeched as Life
 50% increased Mana Cost of Skills
-Causes Bleeding on Hit
+{variant:1}Causes Bleeding on Hit
+{variant:2}50% chance to cause Bleeding on Hit
 ]],[[
 The Cauteriser
 Woodsplitter
@@ -225,20 +235,26 @@ Hits can't be Evaded
 ]],[[
 Uul-Netol's Kiss
 Labrys
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 League: Breach
 Requires Level 49, 122 Str, 53 Dex
 (140-170)% increased Physical Damage
 15% reduced Attack Speed
 25% chance to Curse Enemies with level 10 Vulnerability on Hit
-Attacks Cause Bleeding when Hitting Cursed Enemies
+{variant:1}Attacks Cause Bleeding when Hitting Cursed Enemies
+{variant:2}Attacks have 25% chance to cause Bleeding when Hitting Cursed Enemies
 ]],[[
 Uul-Netol's Embrace
 Vaal Axe
+Variant: {2_6}Pre 3.0.0
+Variant: Current
 League: Breach
 Requires Level 64, 158 Str, 76 Dex
 (280-320)% increased Physical Damage
 (30-25)% reduced Attack Speed
-Attacks Cause Bleeding when Hitting Cursed Enemies
+{variant:1}Attacks Cause Bleeding when Hitting Cursed Enemies
+{variant:2}Attacks have 25% chance to cause Bleeding when Hitting Cursed Enemies
 Attack with level 20 Bone Nova when you Kill a Bleeding Enemy
 ]],[[
 Wideswing