data updates, new mods issues fixed

data_trade/helmet_enchantment_mods.txt

@@ -33,7 +33,6 @@ Arc has +#% chance to Shock
 #% increased Barrage Attack Speed
 #% increased Barrage Damage
 # additional Barrage Projectile
-# additional Barrage Projectiles
 #% increased Bear Trap Cooldown Recovery Speed
 #% increased Bear Trap Damage
 #% increased Blade Vortex Spell Damage
@@ -53,6 +52,9 @@ Blink Arrow and Blink Arrow Clones have #% increased Attack Speed
 Blink Arrow and Blink Arrow Clones have #% increased Damage
 Blood Rage grants additional #% increased Attack Speed
 Blood Rage grants additional #% chance to gain a Frenzy Charge on Kill
+#% increased Unearth cast speed
+Unearth Creates Corpses with +# Level
+#% increased Unearth damage
 Bone Offering grants an additional +#% Block Chance
 #% increased Bone Offering Duration
 #% increased Burning Arrow Damage
@@ -68,7 +70,7 @@ Burning Arrow has +#% chance to Ignite
 #% increased Blade Flurry Area of Effect
 #% increased Charged Dash Damage
 #% chance to Dodge Attacks if you have finished Channelling Charged Dash Recently
-#% Area of Effect of Charged Dash's final Damage Area
++# Radius of Charged Dash's final Damage Area
 #% reduced Clarity Mana Reservation
 #% increased Cleave Attack Speed
 #% increased Cleave Damage
@@ -85,6 +87,9 @@ Burning Arrow has +#% chance to Ignite
 Converted Enemies have #% increased Damage
 #% increased Convocation Cooldown Recovery Speed
 #% increased Convocation Buff Effect
+#% increased Corpse Cremation cast speed
+#% increased Corpse Cremation damage
+Cremation can have up to # additional Geyser at a time
 #% increased Cyclone Attack Speed
 #% increased Cyclone Damage
 #% increased Dark Pact Cast Speed
@@ -191,7 +196,7 @@ Frostbolt has +#% chance to Freeze
 #% increased Frostbite Curse Effect
 #% increased Frostbite Duration
 #% increased Glacial Cascade Damage
-#% of Glacial Cascade Physical Damage converted to Cold Damage
+#% of Glacial Cascade Physical Damage Converted to Cold Damage
 #% increased Glacial Cascade Area of Effect
 #% increased Glacial Hammer Damage
 Glacial Hammer has +#% chance to Freeze
@@ -303,7 +308,7 @@ Zombies deal #% increased Damage
 #% increased Reckoning Cooldown Recovery Speed
 #% increased Reckoning Damage
 #% increased Rejuvenation Totem Aura Effect
-#% of Rejuvenation Totem Life Regeneration added as Mana Regeneration
+Gain #% of Rejuvenation Totem Life Regeneration as extra Mana Regeneration
 #% increased Righteous Fire Damage
 #% increased Righteous Fire Area of Effect
 Righteous Fire grants #% increased Spell Damage
@@ -388,6 +393,9 @@ Tempest Shield chains an additional # times
 #% increased Viper Strike Damage
 #% increased Viper Strike Duration
 #% reduced Vitality Mana Reservation
+#% increased Volatile Dead cast speed
+#% increased Volatile Dead damage
+Volatile Dead destroys up to # additional Corpses
 #% increased Vortex Damage
 #% increased Vortex Duration
 #% increased Vortex Area of Effect

data_trade/item_corrupted_mods.txt

@@ -1,11 +1,11 @@
 
 Adds # to # Chaos Damage to Attacks
-#% increased Area of Effect of Area Skills
+#% increased Area of Effect
 Adds an additional Arrow
 Enemies can have # additional Curse
 Arrows Pierce an additional Target
 Can have up to # additional Trap placed at a time
-Grants level # Anger Skill
+Grants Level # Anger Skill
 #% increased Attack Speed
 #% chance to Avoid being Shocked
 #% Chance to Block
@@ -18,43 +18,43 @@ Enemies Cannot Leech Life From You
 #% additional Chance to receive a Critical Strike
 #% chance to Dodge Attacks
 #% chance to Cause Monsters to Flee
-#% increased Chaos Damage per equipped Corrupted Item
+#% increased Chaos Damage for each Equipped Corrupted Item
 +#% to Chaos Resistance
-Grants level # Clarity Skill
+Grants Level # Clarity Skill
 #% of Cold Damage Leeched as Life
-Grants level # Conductivity Skill
-Grants level # Assassin's Mark Skill
+Grants Level # Conductivity Skill
+Grants Level # Assassin's Mark Skill
 Culling Strike
-Curse Enemies with level # Elemental Weakness on Hit
-Curse Enemies with level # Temporal Chains on Hit
-Curse Enemies with level # Vulnerability on Hit
+Curse Enemies with Level # Elemental Weakness on Hit
+Curse Enemies with Level # Temporal Chains on Hit
+Curse Enemies with Level # Vulnerability on Hit
 #% of Physical Damage Converted to Cold Damage
 #% of Physical Damage Converted to Fire Damage
 #% of Physical Damage Converted to Lightning Damage
 -# Physical Damage taken from Attacks
 #% of Damage is taken from Mana before Life
 #% increased Damage while Dead
-Grants level # Determination Skill
-Grants level # Discipline Skill
+Grants Level # Determination Skill
+Grants Level # Discipline Skill
 #% additional Block Chance while Dual Wielding
-Grants level # Elemental Weakness Skill
+Grants Level # Elemental Weakness Skill
 #% of Fire Damage Leeched as Life
 #% increased Quantity of Fish Caught
 #% increased Rarity of Fish Caught
-Grants level # Flammability Skill
-Grants level # Frostbite Skill
+Grants Level # Flammability Skill
+Grants Level # Frostbite Skill
 +# to Level of Socketed Gems
 #% increased Projectile Speed
-Grants level # Grace Skill
-Grants level # Haste Skill
-Grants level # Hatred Skill
+Grants Level # Grace Skill
+Grants Level # Haste Skill
+Grants Level # Hatred Skill
 #% increased Endurance, Frenzy and Power Charge Duration
 #% increased Skill Effect Duration
-#% increased Life Leeched per second per equipped Corrupted Item
+#% increased Life Leeched per second for each Equipped Corrupted Item
 #% of Lightning Damage Leeched as Life
 Adds # to # Chaos Damage
 +# to Weapon range
-#% increased Mana Leeched per second per equipped Corrupted Item
+#% increased Mana Leeched per second for each Equipped Corrupted Item
 +# Mana gained for each Enemy hit by your Attacks
 #% of Damage taken gained as Mana over 4 seconds when Hit
 +# to Maximum Frenzy Charges
@@ -63,11 +63,11 @@ Adds # to # Chaos Damage
 +#% to all maximum Resistances
 Minions deal #% increased Damage
 #% increased Movement Speed
-Grants level # Projectile Weakness Skill
-Grants level # Purity of Ice Skill
-Grants level # Purity of Fire Skill
-Grants level # Purity of Lightning Skill
-Grants level # Purity of Elements Skill
+Grants Level # Projectile Weakness Skill
+Grants Level # Purity of Ice Skill
+Grants Level # Purity of Fire Skill
+Grants Level # Purity of Lightning Skill
+Grants Level # Purity of Elements Skill
 #% reduced Character Size
 #% reduced Chill Duration on You
 #% reduced Freeze Duration on You
@@ -77,23 +77,23 @@ You cannot be Cursed with Silence
 Socketed Skill Gems get a #% Mana Multiplier
 +# to Level of Socketed Vaal Gems
 #% Chance to Block Spells
-Socketed Gems are supported by level # Additional Accuracy
-Socketed Gems are Supported by level # Added Fire Damage
-Socketed Gems are Supported by level # Increased Area of Effect
-Socketed Gems are supported by level # Cast On Crit
-Socketed Gems are supported by level # Cast when Stunned
-Socketed Gems are supported by level # Increased Critical Damage
-Socketed Gems are Supported by level # Elemental Proliferation
+Socketed Gems are supported by Level # Additional Accuracy
+Socketed Gems are Supported by Level # Added Fire Damage
+Socketed Gems are Supported by Level # Increased Area of Effect
+Socketed Gems are supported by Level # Cast On Critical Strike
+Socketed Gems are supported by Level # Cast when Stunned
+Socketed Gems are supported by Level # Increased Critical Damage
+Socketed Gems are Supported by Level # Elemental Proliferation
 Socketed Gems are Supported by Level # Faster Casting
-Socketed Gems are supported by level # Fork
-Socketed Gems are supported by level # Life Leech
-Socketed Gems are supported by level # Melee Splash
-Socketed Gems are supported by level # Multistrike
-Socketed Gems are supported by level # Stun
-Socketed Gems are supported by level # Weapon Elemental Damage
-Grants level # Temporal Chains Skill
+Socketed Gems are supported by Level # Fork
+Socketed Gems are supported by Level # Life Leech
+Socketed Gems are supported by Level # Melee Splash
+Socketed Gems are supported by Level # Multistrike
+Socketed Gems are supported by Level # Stun
+Socketed Gems are supported by Level # Elemental Damage with Attacks
+Grants Level # Temporal Chains Skill
 #% increased Vaal Skill Damage
-Grants level # Vitality Skill
-Grants level # Vulnerability Skill
+Grants Level # Vitality Skill
+Grants Level # Vulnerability Skill
 #% increased Elemental Damage with Attack Skills
-Grants level # Wrath Skill
+Grants Level # Wrath Skill

resources/Updates_Trade.txt

@@ -1,5 +1,11 @@
 The following is a list of what has been updated, starting with 1.1.0
 
+2.6.2
+================================================================================================
+Added the new mods available on poe.trade.
+Fixed some issues with those new mods (abyss jewels/elder/shaper items).
+Updated data files (enchantments/corruptions/uniques.
+
 2.6.1
 ================================================================================================
 Added parsing for the new bases (elder/shaper items and abyss jewels/Stygian Vise belt).

resources/VersionTrade.txt

@@ -1,2 +1,2 @@
-TradeReleaseVersion := "v2.6.1"
+TradeReleaseVersion := "v2.6.2"
 TradeAHKVersionRequired := "1.1.26.00"

resources/ahk/POE-ItemInfo.ahk

@@ -7880,6 +7880,10 @@ GetNegativeAffixOffset(Item)
 		; And corrupted items
 		NegativeAffixOffset := NegativeAffixOffset + 1
 	}
+	If (Item.IsElderBase or Item.IsShaperBase)		
+	{
+		NegativeAffixOffset := NegativeAffixOffset + 1
+	}
 	If (Item.IsMirrored)
 	{
 		; And mirrored items

resources/ahk/TradeMacro.ahk

@@ -2448,6 +2448,15 @@ TradeFunc_GetItemsPoeTradeMods(_item, isMap = false) {
 		If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
 			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["implicit"], _item.mods[k])
 		}
+		If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
+			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["shaped"], _item.mods[k])
+		}
+		If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
+			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["elder"], _item.mods[k])
+		}
+		If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
+			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["abyss jewels"], _item.mods[k])
+		}
 		If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
 			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["unique explicit"], _item.mods[k])
 		}
@@ -2485,6 +2494,9 @@ TradeFunc_GetItemsPoeTradeUniqueMods(_item) {
 		If (StrLen(_item.mods[k]["param"]) < 1) {
 			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["[pseudo] mods"], _item.mods[k])
 		}
+		If (StrLen(_item.mods[k]["param"]) < 1 and not isMap) {
+			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["abyss jewels"], _item.mods[k])
+		}
 		If (StrLen(_item.mods[k]["param"]) < 1) {
 			_item.mods[k]["param"] := TradeFunc_FindInModGroup(mods["map mods"], _item.mods[k])
 		}
@@ -2497,19 +2509,23 @@ TradeFunc_GetItemsPoeTradeUniqueMods(_item) {
 }
 
 ; find mod in modgroup and return its name
-TradeFunc_FindInModGroup(modgroup, needle) {
+TradeFunc_FindInModGroup(modgroup, needle, simpleRange = true, recurse = true) {
 	matches := []
 	editedNeedle := ""
 
 	For j, mod in modgroup {
 		s  := Trim(RegExReplace(mod, "i)\(pseudo\)|\(total\)|\(crafted\)|\(implicit\)|\(explicit\)|\(enchant\)|\(prophecy\)|\(leaguestone\)", ""))
-		s  := RegExReplace(s, "# ?to ? #", "#")
+		If (simpleRange) {
+			s  := RegExReplace(s, "# ?to ? #", "#")
+		}
 		s  := TradeUtils.CleanUp(s)
 		ss := TradeUtils.CleanUp(needle.name)
 		st := TradeUtils.CleanUp(needle.name_orig)
 
-		; matches "1 to" in for example "adds 1 to (20-40) lightning damage"
-		ss := RegExReplace(ss, "\d+ ?to ?#", "#")
+		If (simpleRange) {
+			; matches "1 to" in for example "adds 1 to (20-40) lightning damage"
+			ss := RegExReplace(ss, "\d+ ?to ?#", "#")
+		}		
 		;ss := RegExReplace(ss, "Monsters' skills Chain # additional times", "Monsters' skills Chain 2 additional times")
 		;ss := RegExReplace(ss, "Has # socket", "Has 1 socket")
 		editedNeedle := ss
@@ -2537,8 +2553,12 @@ TradeFunc_FindInModGroup(modgroup, needle) {
 			}
 		}
 	}
-
-	Return ""
+
+	If (not matches[1] and recurse = true) {
+		TradeFunc_FindInModGroup(modgroup, needle, false, false)
+	} Else {
+		Return ""
+	}
 }
 
 TradeFunc_GetCorruption(_item) {