diff --git a/resources/data/accessories/amulets.json b/resources/data/accessories/amulets.json index e39f3330964e67ab43f179f33e8726840f0c3610..830b56e636ca7fc2a5c6ee30d4ef63c7a7e7c65b 100644 --- a/resources/data/accessories/amulets.json +++ b/resources/data/accessories/amulets.json @@ -79,6 +79,22 @@ "ImplicitValue": [10, 16], "DropLevel": 20 }, + { + "Type": "Accessory", + "Class": "Amulet", + "Name": "Simplex Amulet", + "ImplicitType": "-1 Prefix and Suffix, 25% Increased Explicit Modifier Magnitudes", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Amulet", + "Name": "Astrolabe Amulet", + "ImplicitType": "Has Elder, Shaper, and All Conqueror Influences", + "ImplicitValue": [], + "DropLevel": 69 + }, { "Type": "Accessory", "Class": "Amulet", @@ -87,6 +103,14 @@ "ImplicitValue": [1.2, 1.6], "DropLevel": 74 }, + { + "Type": "Accessory", + "Class": "Amulet", + "Name": "Seaglass Amulet", + "ImplicitType": "% Faster Start of Energy Shield Recharge", + "ImplicitValue": [10, 15], + "DropLevel": 24 + }, { "Type": "Accessory", "Class": "Amulet", diff --git a/resources/data/accessories/belts.json b/resources/data/accessories/belts.json index b70e8fde2a9e949347e0eef99ae60c9d42394be3..808cd2d27d322622c8e7c7db4f65355ea5258b8a 100644 --- a/resources/data/accessories/belts.json +++ b/resources/data/accessories/belts.json @@ -55,6 +55,22 @@ "ImplicitValue": [20, 30], "DropLevel": 16 }, + { + "Type": "Accessory", + "Class": "Belt", + "Name": "Micro-Distillery Belt", + "ImplicitType": "Can't Use Flaks in Fifth Slot, Other Flasks have 20% Increased Effect", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Belt", + "Name": "Mechalarm Belt", + "ImplicitType": "Trigger Level 20 Summon Taunting Contraption When You Use a Flask", + "ImplicitValue": [], + "DropLevel": 16 + }, { "Type": "Accessory", "Class": "Belt", diff --git a/resources/data/accessories/rings.json b/resources/data/accessories/rings.json index 2e5f10172ba9e68460f520696bf1f1bec08dea2b..72a2f860be2ba07503a18d673640483c9ff6a01c 100644 --- a/resources/data/accessories/rings.json +++ b/resources/data/accessories/rings.json @@ -91,16 +91,120 @@ "Type": "Accessory", "Class": "Ring", "Name": "Two-Stone Ring", - "ImplicitType": "+ to Two all Elemental Resistances", + "ImplicitType": "+ to Two Elemental Resistances", "ImplicitValue": [12, 16], "DropLevel": 20 }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Cogwork Ring", + "ImplicitType": "-1 Prefix Modifier, +1 Suffix Modifier, 25% Increased Suffix Magnitudes", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Composite Ring", + "ImplicitType": "+3 Prefix Modifier, -3 Suffix Modifier", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Dusk Ring", + "ImplicitType": "Left Slot: 15% Reduced Skill Effect Duration, Right Slot: 15% Increased Skill Effect Duration", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Geodesic Ring", + "ImplicitType": "+1 Prefix Modifier, -1 Suffix Modifier, 25% increased Prefix Magnitudes", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Gloam Ring", + "ImplicitType": "Left Slot: Minions Take 15% Reduced Damage, Right Slot: Minions Take 15% Increased Damage", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Helical Ring", + "ImplicitType": "-2 Prefix Modifier, +1 Suffix Modifier, 50% increased Suffix Magnitudes", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Manifold Ring", + "ImplicitType": "+1 Prefix Modifier, -2 Suffix Modifier, 50% increased Prefix Magnitudes", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Nameless Ring", + "ImplicitType": "50% Increased Elemental Ailment Duration, 50% Reduced Effect of Curses", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Penumbra Ring", + "ImplicitType": "Left Slot: 30% Reduced Effect of Curses, Right Slot: 30% Increased of Curses", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Ratcheting Ring", + "ImplicitType": "-3 Prefix Modifier, +3 Suffix Modifier", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Shadowed Ring", + "ImplicitType": "25% of One Element Taken as Another Element", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Tenebrous Ring", + "ImplicitType": "Left Slot: 30% Reduced Duration of Ailments, Right Slot: 30% Increased Duration of Ailments", + "ImplicitValue": [], + "DropLevel": 24 + }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Bone Ring", + "ImplicitType": "Minions Have % To All Elemental Resistances", + "ImplicitValue": [10, 15], + "DropLevel": 24 + }, { "Type": "Accessory", "Class": "Ring", "Name": "Amethyst Ring", "ImplicitType": "+ Chaos Resistance", - "ImplicitValue": [9, 13], + "ImplicitValue": [17, 23], "DropLevel": 30 }, { @@ -119,6 +223,14 @@ "ImplicitValue": [8, 10], "DropLevel": 80 }, + { + "Type": "Accessory", + "Class": "Ring", + "Name": "Iolite Ring", + "ImplicitType": "Increased Chaos Damage", + "ImplicitValue": [17, 23], + "DropLevel": 80 + }, { "Type": "Accessory", "Class": "Ring", diff --git a/resources/data/accessories/talismans.json b/resources/data/accessories/talismans.json index 416c681f1235693897618d048b336f4f4704acef..a23bb2fdc0273a7ab083d4a7ca3dc430dbb8e029 100644 --- a/resources/data/accessories/talismans.json +++ b/resources/data/accessories/talismans.json @@ -3,7 +3,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Ashscale Talisman", - "ImplicitType": "Increased Fire Damage", + "ImplicitType": "% Increased Fire Damage", "ImplicitValue": [20, 30], "DropLevel": 1 }, @@ -11,7 +11,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Avian Twins Talisman", - "ImplicitType": "Element Damage Taken to Other Element", + "ImplicitType": "% Element Damage Taken to Other Element", "ImplicitValue": [50], "DropLevel": 1 }, @@ -27,7 +27,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Bonespire Talisman", - "ImplicitType": "Increased Maximum Mana", + "ImplicitType": "% Increased Maximum Mana", "ImplicitValue": [20, 30], "DropLevel": 1 }, @@ -35,7 +35,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Breakrib Talisman", - "ImplicitType": "Increased Global Physical Damage", + "ImplicitType": "% Increased Global Physical Damage", "ImplicitValue": [20, 30], "DropLevel": 1 }, @@ -43,7 +43,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Chrysalis Talisman", - "ImplicitType": "Increased Spell Damage", + "ImplicitType": "% Increased Spell Damage", "ImplicitValue": [20, 30], "DropLevel": 1 }, @@ -51,7 +51,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Clutching Talisman", - "ImplicitType": "Increased Global Defenses", + "ImplicitType": "% Increased Global Defenses", "ImplicitValue": [15, 25], "DropLevel": 1 }, @@ -59,7 +59,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Deadhand Talisman", - "ImplicitType": "Increased Chaos Damage", + "ImplicitType": "% Increased Chaos Damage", "ImplicitValue": [19, 31], "DropLevel": 1 }, @@ -67,7 +67,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Deep One Talisman", - "ImplicitType": "Increased Cold Damage", + "ImplicitType": "% Increased Cold Damage", "ImplicitValue": [20, 30], "DropLevel": 1 }, @@ -75,23 +75,15 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Fangjaw Talisman", - "ImplicitType": "Increased Max Life", + "ImplicitType": "% Increased Max Life", "ImplicitValue": [8, 12], "DropLevel": 1 }, - { - "Type": "Accessory", - "Class": "Talisman", - "Name": "Greatwolf Talisman", - "ImplicitType": "Random Talisman Implicit Modifiers", - "ImplicitValue": [2], - "DropLevel": 1 - }, { "Type": "Accessory", "Class": "Talisman", "Name": "Hexclaw Talisman", - "ImplicitType": "Increased Global Critical Strike Chance", + "ImplicitType": "% Increased Global Critical Strike Chance", "ImplicitValue": [40, 50], "DropLevel": 1 }, @@ -107,7 +99,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Lone Antler Talisman", - "ImplicitType": "Increased Lightning Damage", + "ImplicitType": "% Increased Lightning Damage", "ImplicitValue": [20, 30], "DropLevel": 1 }, @@ -115,7 +107,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Longtooth Talisman", - "ImplicitType": "Additional Damage Reduction", + "ImplicitType": "% Additional Damage Reduction", "ImplicitValue": [4, 6], "DropLevel": 1 }, @@ -123,7 +115,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Mandible Talisman", - "ImplicitType": "Increased Attack and Cast Speed", + "ImplicitType": "% Increased Attack and Cast Speed", "ImplicitValue": [6, 10], "DropLevel": 1 }, @@ -131,7 +123,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Monkey Paw Talisman", - "ImplicitType": "Chance to Gain Charge on Kill", + "ImplicitType": "% Chance to Gain Charge on Kill", "ImplicitValue": [10], "DropLevel": 1 }, @@ -139,7 +131,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Monkey Twins Talisman", - "ImplicitType": "Increased Area of Effect", + "ImplicitType": "% Increased Area of Effect", "ImplicitValue": [5, 8], "DropLevel": 1 }, @@ -155,7 +147,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Rot Head Talisman", - "ImplicitType": "Increased Fish Bite Sensitivity", + "ImplicitType": "% Increased Fish Bite Sensitivity", "ImplicitValue": [30, 40], "DropLevel": 1 }, @@ -163,7 +155,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Rotfeather Talisman", - "ImplicitType": "Increased Damage", + "ImplicitType": "% Increased Damage", "ImplicitValue": [25, 35], "DropLevel": 1 }, @@ -179,7 +171,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Splitnewt Talisman", - "ImplicitType": "Chance to Inflict Ailment", + "ImplicitType": "% Chance to Inflict Ailment", "ImplicitValue": [4, 6], "DropLevel": 1 }, @@ -195,7 +187,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Three Rat Talisman", - "ImplicitType": "Increased Attributes", + "ImplicitType": "% Increased Attributes", "ImplicitValue": [12, 16], "DropLevel": 1 }, @@ -211,7 +203,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Wereclaw Talisman", - "ImplicitType": "Global Critical Strike Multiplier", + "ImplicitType": "% Global Critical Strike Multiplier", "ImplicitValue": [24, 36], "DropLevel": 1 }, @@ -219,7 +211,7 @@ "Type": "Accessory", "Class": "Talisman", "Name": "Writhing Talisman", - "ImplicitType": "Increased Attack Damage", + "ImplicitType": "% Increased Attack Damage", "ImplicitValue": [20, 30], "DropLevel": 1 } diff --git a/resources/data/hand/quivers.json b/resources/data/hand/quivers.json index 5484e1c5e5099eb3993ce1fd6decf9e153aae1ff..784f52f21de9575e7a6c3e95339302f7327cf1f4 100644 --- a/resources/data/hand/quivers.json +++ b/resources/data/hand/quivers.json @@ -72,19 +72,19 @@ { "Type": "Weapon", "Class": "Quiver", - "Name": "Ornate Quiver", + "Name": "Spike-Point Arrow Quiver", "Damage": [], - "ImplicitType": "Has 1 Socket", - "ImplicitValue": [], + "ImplicitType": "Increased Global Critical Strike Chance", + "ImplicitValue": [20, 30], "DropLevel": 45, "MaxLevel": true }, { "Type": "Weapon", "Class": "Quiver", - "Name": "Spike-Point Arrow Quiver", + "Name": "Artillery Quiver", "Damage": [], - "ImplicitType": "Increased Global Critical Strike Chance", + "ImplicitType": "% Increased Totem Placement Speed", "ImplicitValue": [20, 30], "DropLevel": 45, "MaxLevel": true diff --git a/resources/parsers/currency.py b/resources/parsers/currency.py index 4c1919d4b7382088a5785b748bac2a8d0ed96903..44e1b68cffca9c6bda85eef261abedd404b2e7b7 100644 --- a/resources/parsers/currency.py +++ b/resources/parsers/currency.py @@ -306,6 +306,7 @@ class CurrencyParser: "Sulphur Blowtorch", "Winged Sole", "Rogue's Marker", + "Thief's Trinket", ], ) diff --git a/resources/parsers/other.py b/resources/parsers/other.py index 917bc00d715fc72aeaa6579f1d36b14ff9a2b067..2b1ab28dc4c2b6b3d6d88c574c5d8388acec504d 100644 --- a/resources/parsers/other.py +++ b/resources/parsers/other.py @@ -463,13 +463,31 @@ class FinalParser: self.template.hidden_item( description="Hide remaining gear that has not yet been parsed.", class_text=[ + # Weapons. + "One Hand Maces", + "Two Hand Maces", + "One Hand Axes", + "Two Hand Axes", + "Daggers", + "Claws", + "One Hand Swords", + "Two Hand Swords", + "Bows", + "Quivers", + "Sceptres", + "Wands", + "Staves", + "Shields", + # Armor. "Helmets", "Body Armours", "Gloves", "Boots", + # Accessories. "Ring", "Belt", "Amulet", + "Talisman", ], )