From f468faa05979c8ed5d7ea4b2c67fde73c53b4532 Mon Sep 17 00:00:00 2001 From: QuickStick <31533893+QuickStick123@users.noreply.github.com> Date: Sun, 14 Aug 2022 11:06:59 +1000 Subject: [PATCH] [Kalandra] Update batch 4 of uniques. (#4757) * update uniques * added movement on throwing a trap. Co-authored-by: LocalIdentity --- src/Data/Uniques/body.lua | 22 +++++++++++++++------- src/Data/Uniques/boots.lua | 10 ++++++---- src/Data/Uniques/bow.lua | 12 +++++++----- src/Data/Uniques/claw.lua | 11 +++++++---- src/Data/Uniques/gloves.lua | 8 ++++++-- src/Data/Uniques/ring.lua | 24 ++++++++++++++++-------- src/Data/Uniques/shield.lua | 15 ++++++++++----- src/Modules/ModParser.lua | 9 +++++++-- 8 files changed, 74 insertions(+), 37 deletions(-) diff --git a/src/Data/Uniques/body.lua b/src/Data/Uniques/body.lua index b868918d91..3caed4dfdc 100644 --- a/src/Data/Uniques/body.lua +++ b/src/Data/Uniques/body.lua @@ -518,11 +518,16 @@ Implicits: 0 ]],[[ Dialla's Malefaction Sage's Robe +Variant: Pre 3.19.0 +Variant: Current Implicits: 0 Gems can be Socketed in this Item ignoring Socket Colour -Gems Socketed in Red Sockets have +1 to Level -Gems Socketed in Green Sockets have +10% to Quality -Gems Socketed in Blue Sockets gain 25% increased Experience +{variant:1}Gems Socketed in Red Sockets have +1 to Level +{variant:2}Gems Socketed in Red Sockets have +2 to Level +{variant:1}Gems Socketed in Green Sockets have +10% to Quality +{variant:2}Gems Socketed in Green Sockets have +30% to Quality +{variant:1}Gems Socketed in Blue Sockets gain 25% increased Experience +{variant:2}Gems Socketed in Blue Sockets gain 100% increased Experience Has no Attribute Requirements ]],[[ Doedre's Skin @@ -745,19 +750,22 @@ Full Dragonscale Variant: Pre 2.6.0 Variant: Pre 3.5.0 Variant: Pre 3.16.0 +Variant: Pre 3.19.0 Variant: Current Implicits: 0 {variant:1,2,3}(160-200)% increased Armour and Evasion -{variant:4}(180-220)% increased Armour and Evasion +{variant:4,5}(180-220)% increased Armour and Evasion {variant:1,2}+(40-60) to maximum Life -{variant:3,4}+(60-90) to maximum Life -(0.4-0.6)% of Physical Attack Damage Leeched as Life +{variant:3,4,5}+(60-90) to maximum Life +{variant:1,2,3,4}(0.4-0.6)% of Physical Attack Damage Leeched as Life +{variant:5}2% of Physical Attack Damage Leeched as Life You lose all Endurance Charges when Hit You gain an Endurance Charge on Kill {variant:1}You gain Onslaught for 1 seconds per Endurance Charge when Hit {variant:2}You gain Onslaught for 2 seconds per Endurance Charge when Hit -{variant:3,4}You gain Onslaught for 5 seconds per Endurance Charge when Hit +{variant:3,4,5}You gain Onslaught for 5 seconds per Endurance Charge when Hit {variant:3,4}(60-100)% increased Onslaught Effect +{variant:5}100% increased Onslaught Effect ]],[[ Farrul's Fur Triumphant Lamellar diff --git a/src/Data/Uniques/boots.lua b/src/Data/Uniques/boots.lua index 089e57d332..3d593af7a2 100644 --- a/src/Data/Uniques/boots.lua +++ b/src/Data/Uniques/boots.lua @@ -209,15 +209,17 @@ Gore Footprints Deerstalker Deerskin Boots Variant: Pre 2.6.0 +Variant: Pre 3.19.0 Variant: Current Requires Level 22, 42 Dex -Socketed Gems are Supported by level 11 Trap +{variant:1,2}Socketed Gems are Supported by level 11 Trap +{variant:3}Socketed Gems are Supported by level 15 Trap (160-200)% increased Evasion Rating -+(35-45) to maximum Life +{variant:1,2}+(35-45) to maximum Life (14-18)% increased Trap Throwing Speed -{variant:2}15% increased Movement Speed +{variant:2,3}15% increased Movement Speed {variant:1}30% increased Movement Speed for 9 seconds on Throwing a Trap -{variant:2}15% increased Movement Speed for 9 seconds on Throwing a Trap +{variant:2,3}15% increased Movement Speed for 9 seconds on Throwing a Trap ]],[[ Doryani's Delusion Slink Boots diff --git a/src/Data/Uniques/bow.lua b/src/Data/Uniques/bow.lua index 16ae2869b1..454fe5a918 100644 --- a/src/Data/Uniques/bow.lua +++ b/src/Data/Uniques/bow.lua @@ -150,17 +150,19 @@ Variant: Pre 2.2.0 Variant: Pre 3.0.0 Variant: Pre 3.10.0 Variant: Pre 3.17.0 +Variant: Pre 3.19.0 Variant: Current Requires Level 32, 107 Dex Implicits: 1 -{variant:2,3,4,5,6}(30-50)% increased Critical Strike Chance +{variant:2,3,4,5,6,7}(30-50)% increased Critical Strike Chance {variant:1,2,3,4,5}(100-125)% increased Physical Damage -{variant:6}(90-105)% increased Physical Damage +{variant:6,7}(90-105)% increased Physical Damage 10% increased Attack Speed {variant:1,2,4}+100% to Global Critical Strike Multiplier {variant:3}+150% to Global Critical Strike Multiplier -{variant:5,6}+50% to Global Critical Strike Multiplier -Adds an additional Arrow +{variant:5,6,7}+50% to Global Critical Strike Multiplier +{variant:1,2,3,4,5,6}Adds an additional Arrow +{variant:7}Bow Attacks fire 2 additional Arrows ]],[[ Death's Opus Death Bow @@ -181,7 +183,7 @@ Adds (10-20) to (30-35) Physical Damage {variant:1,2,4}+100% to Global Critical Strike Multiplier {variant:3}+150% to Global Critical Strike Multiplier {variant:5,6}+50% to Global Critical Strike Multiplier -2 additional Arrows +Bow Attacks fire 2 additional Arrows ]],[[ Doomfletch Royal Bow diff --git a/src/Data/Uniques/claw.lua b/src/Data/Uniques/claw.lua index c085dcba06..5c7bd57de8 100644 --- a/src/Data/Uniques/claw.lua +++ b/src/Data/Uniques/claw.lua @@ -105,17 +105,20 @@ Cybil's Paw Thresher Claw Variant: Pre 2.0.0 Variant: Pre 2.6.0 +Variant: Pre 3.19.0 Variant: Current Requires Level 37, 53 Dex, 77 Int Implicits: 3 {variant:1}+15 Life gained for each Enemy hit by Attacks {variant:2}+21 Life gained for each Enemy hit by Attacks -{variant:3}+25 Life gained for each Enemy hit by Attacks -(8-12)% increased Cast Speed +{variant:3,4}+25 Life gained for each Enemy hit by Attacks +{variant:1,2,3}(8-12)% increased Cast Speed +{variant:4}(15-20)% increased Cast Speed +(30-40) to maximum Mana -+(5-8) Life gained for each Enemy hit by your Spells +{variant:1,2,3}+(5-8) Life gained for each Enemy hit by your Spells +{variant:4}+(15-20) Life gained for each Enemy hit by your Spells {variant:1}6% increased Spell Damage per 5% Block Chance -{variant:2,3}8% increased Spell Damage per 5% Block Chance +{variant:2,3,4}8% increased Spell Damage per 5% Block Chance ]],[[ Essentia Sanguis Eye Gouger diff --git a/src/Data/Uniques/gloves.lua b/src/Data/Uniques/gloves.lua index f7c9de4c55..48b905f0f4 100644 --- a/src/Data/Uniques/gloves.lua +++ b/src/Data/Uniques/gloves.lua @@ -323,12 +323,16 @@ Socketed Projectile Spells have 80% less Skill Effect Duration ]],[[ Demon Stitcher Satin Gloves +Variant: Pre 3.19.0 +Variant: Current League: Delve Requires Level 41, 60 Int (15-20)% increased Cast Speed -+(50-70) to maximum Energy Shield +{variant:1}+(50-70) to maximum Energy Shield +{variant:2}+(100-120) to maximum Energy Shield +(50-70) to maximum Life -Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell +{variant:1}Sacrifice 5% of Life to gain that much Energy Shield when you Cast a Spell +{variant:2}Sacrifice (5-25)% of Life to gain that much Energy Shield when you Cast a Spell ]],[[ Doedre's Tenure Velvet Gloves diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua index 98bf9da2cb..a6156ef15a 100644 --- a/src/Data/Uniques/ring.lua +++ b/src/Data/Uniques/ring.lua @@ -352,26 +352,34 @@ Death Rush Amethyst Ring League: Onslaught Variant: Pre 2.6.0 +Variant: Pre 3.19.0 Variant: Current Requires Level 46 Implicits: 1 {tags:chaos,jewellery_resistance}+(17-23)% to Chaos Resistance -{tags:attack}+(300-350) to Accuracy Rating -{tags:jewellery_defense}{variant:1}+(60-80) to Armour -{tags:jewellery_defense}{variant:2}+(260-300) to Armour +{variant:1,2}{tags:attack}+(300-350) to Accuracy Rating +{variant:1}{tags:jewellery_defense}+(60-80) to Armour +{variant:2}{tags:jewellery_defense}}+(260-300) to Armour {variant:2}{tags:life}+(40-50) to maximum Life -{tags:chaos,jewellery_resistance}+(15-20)% to Chaos Resistance -{tags:attack,life,physical}(0.6-0.8)% of Physical Attack Damage Leeched as Life +{variant:1,2}{tags:chaos,jewellery_resistance}+(15-20)% to Chaos Resistance +{variant:1,2}{tags:attack,life,physical}(0.6-0.8)% of Physical Attack Damage Leeched as Life {variant:1}You gain Onslaught for 2 seconds on Kill {variant:2}You gain Onslaught for 4 seconds on Kill +{variant:3}Recover 5% of Life on Kill +{variant:3}Gain Adrenaline for 3 seconds on kill ]],[[ Doedre's Damning Paua Ring +Variant: Pre 3.19.0 +Variant: Current Implicits: 1 {tags:mana}+(20-30) to maximum Mana -{tags:jewellery_attribute}+(5-10) to Intelligence -{tags:jewellery_resistance}+5% to all Elemental Resistances -{tags:mana}+5 Mana Gained on Kill +{variant:1}{tags:jewellery_attribute}+(5-10) to Intelligence +{variant:2}{tags:jewellery_attribute}+(5-20) to Intelligence +{variant:1}{tags:jewellery_resistance}+5% to all Elemental Resistances +{variant:2}{tags:jewellery_resistance}+(5-20)% to all Elemental Resistances +{variant:1}{tags:mana}+5 Mana Gained on Kill +{variant:2}{tags:mana}+(5-20) Mana gained on Kill {tags:caster}Enemies can have 1 additional Curse ]],[[ Replica Doedre's Damning diff --git a/src/Data/Uniques/shield.lua b/src/Data/Uniques/shield.lua index c1f8dd5acc..fb73206265 100644 --- a/src/Data/Uniques/shield.lua +++ b/src/Data/Uniques/shield.lua @@ -663,20 +663,25 @@ Daresso's Courage Baroque Round Shield Variant: Pre 2.6.0 Variant: Pre 3.4.0 +Variant: Pre 3.19.0 Variant: Current Implicits: 1 120% increased Block Recovery -{variant:1,2}36% chance to Block Spell Damage while on Low Life -{variant:3}+30% chance to Block Spell Damage while on Low Life -20% increased Global Physical Damage -(100-120)% increased Armour and Evasion +{variant:1,2}+36% chance to Block Spell Damage while on Low Life +{variant:3,4}+30% chance to Block Spell Damage while on Low Life +{variant:1,2,3}20% increased Global Physical Damage +{variant:1,2,3}(100-120)% increased Armour and Evasion +{variant:4}(200-250)% increased Armour and Evasion {variant:1}+(10-20)% to Fire Resistance {variant:1}+(10-20)% to Cold Resistance {variant:1}+(10-20)% to Lightning Resistance {variant:2,3}+(10-20)% to all Elemental Resistances -+(3-6)% Chance to Block +{variant:4}+(20-30)% to all Elemental Resistances +{variant:1,2,3}+(3-6)% Chance to Block {variant:2,3}+20% Chance to Block Attack Damage if you have Blocked Spell Damage Recently +{variant:4}+100% Chance to Block Attack Damage if you have Blocked Spell Damage Recently {variant:2,3}+20% chance to Block Spell Damage if you have Blocked Attack Damage Recently +{variant:4}+100% chance to Block Spell Damage if you have Blocked Attack Damage Recently ]],[[ The Deep One's Hide Studded Round Shield diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 1c8d09fe58..e54e654ef4 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -658,10 +658,11 @@ local modNameList = { ["charge recovery"] = "FlaskChargeRecovery", ["impales you inflict last"] = "ImpaleStacksMax", -- Buffs - ["phasing"] = "Condition:Phasing", + ["adrenaline"] = "Condition:Adrenaline", + ["elusive"] = "Condition:CanBeElusive", ["onslaught"] = "Condition:Onslaught", + ["phasing"] = "Condition:Phasing", ["unholy might"] = "Condition:UnholyMight", - ["elusive"] = "Condition:CanBeElusive", } -- List of modifier flags @@ -995,6 +996,7 @@ local preFlagList = { local modTagList = { ["on enemies"] = { }, ["while active"] = { }, + ["for (%d+) seconds"] = { }, [" on critical strike"] = { tag = { type = "Condition", var = "CriticalStrike" } }, ["from critical strikes"] = { tag = { type = "Condition", var = "CriticalStrike" } }, ["with critical strikes"] = { tag = { type = "Condition", var = "CriticalStrike" } }, @@ -1331,6 +1333,7 @@ local modTagList = { ["if you haven't killed recently"] = { tag = { type = "Condition", var = "KilledRecently", neg = true } }, ["if you or your totems have killed recently"] = { tag = { type = "Condition", varList = { "KilledRecently","TotemsKilledRecently" } } }, ["if you[' ]h?a?ve thrown a trap or mine recently"] = { tag = { type = "Condition", var = "TrapOrMineThrownRecently" } }, + ["on throwing a trap"] = { tag = { type = "Condition", var = "TrapOrMineThrownRecently" } }, ["if you[' ]h?a?ve killed a maimed enemy recently"] = { tagList = { { type = "Condition", var = "KilledRecently" }, { type = "ActorCondition", actor = "enemy", var = "Maimed" } } }, ["if you[' ]h?a?ve killed a cursed enemy recently"] = { tagList = { { type = "Condition", var = "KilledRecently" }, { type = "ActorCondition", actor = "enemy", var = "Cursed" } } }, ["if you[' ]h?a?ve killed a bleeding enemy recently"] = { tagList = { { type = "Condition", var = "KilledRecently" }, { type = "ActorCondition", actor = "enemy", var = "Bleeding" } } }, @@ -2557,6 +2560,7 @@ local specialModList = { ["onslaught"] = { flag("Condition:Onslaught") }, ["unholy might"] = { flag("Condition:UnholyMight") }, ["elusive"] = { flag("Condition:CanBeElusive") }, + ["adrenaline"] = { flag("Condition:Adrenaline") }, ["your aura buffs do not affect allies"] = { flag("SelfAurasCannotAffectAllies") }, ["auras from your skills can only affect you"] = { flag("SelfAurasOnlyAffectYou") }, ["aura buffs from skills have (%d+)%% increased effect on you for each herald affecting you"] = function(num) return { mod("SkillAuraEffectOnSelf", "INC", num, { type = "Multiplier", var = "Herald"}) } end, @@ -3706,6 +3710,7 @@ local regenTypes = { local flagTypes = { ["phasing"] = "Condition:Phasing", ["onslaught"] = "Condition:Onslaught", + ["adrenaline"] = "Condition:Adrenaline", ["elusive"] = "Condition:CanBeElusive", ["fortify"] = "Condition:Fortified", ["fortified"] = "Condition:Fortified",