From 0a3ebbe8ba53a8adfb9e941c560b1f25eadd6ac1 Mon Sep 17 00:00:00 2001 From: QuickStick <31533893+QuickStick123@users.noreply.github.com> Date: Sun, 9 Apr 2023 22:49:48 +1000 Subject: [PATCH 1/2] Update Tomb Fist --- src/Data/Uniques/gloves.lua | 38 +++++++++++++++++++++++++++---------- src/Modules/ModParser.lua | 1 + 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua index 25c7053668..9ef6aaf384 100644 --- a/src/Data/Uniques/gloves.lua +++ b/src/Data/Uniques/gloves.lua @@ -541,17 +541,35 @@ Tombfist Steelscale Gauntlets League: Abyss Source: Drops from unique{Amanamu, Liege of the Lightless} or unique{Ulaman, Sovereign of the Well} -Variant: Pre 3.6.0 One Abyssal Socket -Variant: Pre 3.6.0 Two Abyssal Sockets -Variant: Current One Abyssal Socket -Variant: Current Two Abyssal Sockets -Requires Level: 36, 29 Str, 29 Int -{variant:1,3}Has 1 Abyssal Socket -{variant:2,4}Has 2 Abyssal Sockets +Has Alt Variant: true +Has Alt Variant Two: true +Has Alt Variant Three: true +Selected Variant: 3 +Selected Alt Variant: 5 +Selected Alt Variant Two: 6 +Selected Alt Variant Three: 9 +Variant: Pre 3.6.0 +Variant: Pre 3.21.0 +Variant: Current +Variant: One Abyssal Socket +Variant: Two Abyssal Socket +Variant: Murderous: Intimidate +Variant: Murderous: Fortify +Variant: Murderous: Rage +Variant: Searching: Maim +Variant: Searching: Blind +Variant: Searching: Onslaught +{variant:5}Has 1 Abyssal Socket +{variant:4}Has 2 Abyssal Sockets {variant:1,2}(6-10)% increased Attack Speed -(4-6)% increased maximum Life -With a Murderous Eye Jewel Socketed, Intimidate Enemies for 4 seconds on Hit with Attacks -With a Searching Eye Jewel Socketed, Maim Enemies for 4 seconds on Hit with Attacks +{variant:3}(5-10)% increased Attack Speed +{variant:1,2}(4-6)% increased maximum Life +{variant:6}With a Murderous Eye Jewel Socketed, Intimidate Enemies for 4 seconds on Hit with Attacks +{variant:7}With a Murderous Eye Jewel Socketed, Melee Hits have 25% chance to Fortify +{variant:8}With a Murderous Eye Jewel Socketed, Melee Attacks grant 1 Rage on Hit, no more than once every second +{variant:9}With a Searching Eye Jewel Socketed, Maim Enemies for 4 seconds on Hit with Attacks +{variant:10}With a Searching Eye Jewel Socketed, Blind Enemies for 4 seconds on Hit with Attacks +{variant:11}With a Searching Eye Jewel Socketed, Attacks have 25% chance to grant Onslaught On Kill ]],[[ Vaal Caress Bronzescale Gauntlets diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index d901539b17..06ef8ce855 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -4038,6 +4038,7 @@ local specialModList = { flag("Condition:CanGainRage"), } end, ["when you lose temporal chains you gain maximum rage"] = { flag("Condition:CanGainRage") }, + ["with a murderous eye jewel socketed, melee attacks grant (%d+) rage on hit, no more than once every second"] = { flag("Condition:CanGainRage", { type = "Condition", var = "HaveMurderousEyeJewelIn{SlotName}" }) }, ["your critical strike multiplier is (%d+)%%"] = function(num) return { mod("CritMultiplier", "OVERRIDE", num) } end, ["base critical strike chance for attacks with weapons is ([%d%.]+)%%"] = function(num) return { mod("WeaponBaseCritChance", "OVERRIDE", num) } end, ["base critical strike chance of spells is the critical strike chance of y?o?u?r? ?main hand weapon"] = { flag("BaseCritFromMainHand", nil, ModFlag.Spell) }, -- old wordings From 98f9c56abcf077ca94c3e464b3de6dde40f76405 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 12 Apr 2023 07:18:00 +1000 Subject: [PATCH 2/2] Add parsing for mods and fix variant --- src/Data/Uniques/gloves.lua | 4 ++-- src/Modules/ModParser.lua | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua index 9ef6aaf384..cc78c4ea18 100644 --- a/src/Data/Uniques/gloves.lua +++ b/src/Data/Uniques/gloves.lua @@ -559,8 +559,8 @@ Variant: Murderous: Rage Variant: Searching: Maim Variant: Searching: Blind Variant: Searching: Onslaught -{variant:5}Has 1 Abyssal Socket -{variant:4}Has 2 Abyssal Sockets +{variant:4}Has 1 Abyssal Socket +{variant:5}Has 2 Abyssal Sockets {variant:1,2}(6-10)% increased Attack Speed {variant:3}(5-10)% increased Attack Speed {variant:1,2}(4-6)% increased maximum Life diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 06ef8ce855..5a37c124ff 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -3214,6 +3214,8 @@ local specialModList = { mod("Speed", "INC", num, nil, ModFlag.Attack, { type = "Condition", var = "KilledRecently" }), } end, ["gain adrenaline for 1 second when you change stance"] = { flag("Condition:Adrenaline", { type = "Condition", var = "StanceChangeLastSecond" }) }, + ["with a searching eye jewel socketed, maim enemies for (%d) seconds on hit with attacks"] = { mod("EnemyModifier", "LIST", { mod = flag("Condition:Maimed", nil, ModFlag.Attack) }, { type = "Condition", var = "HaveSearchingEyeJewelIn{SlotName}" }) }, + ["with a searching eye jewel socketed, blind enemies for (%d) seconds on hit with attacks"] = { mod("EnemyModifier", "LIST", { mod = flag("Condition:Blinded", nil, ModFlag.Attack) }, { type = "Condition", var = "HaveSearchingEyeJewelIn{SlotName}" }) }, -- Traps, Mines and Totems ["traps and mines deal (%d+)%-(%d+) additional physical damage"] = function(_, min, max) return { mod("PhysicalMin", "BASE", tonumber(min), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)), mod("PhysicalMax", "BASE", tonumber(max), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end, ["traps and mines deal (%d+) to (%d+) additional physical damage"] = function(_, min, max) return { mod("PhysicalMin", "BASE", tonumber(min), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)), mod("PhysicalMax", "BASE", tonumber(max), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end,