Add Trader support for corrupted enchants, jewels, flasks and runes (#164)

* Flasks, jewels and charms mostly working

* Remove exclusive mods and essences from ModItem.lua

* WIP start splitting out unique modifers.

* Add corrupted mods, there seems to be an issue regarding 0 weight values not being used.

* Add runes and special corrupted enchants

* Add runes and special corrupted enchants

* Revert "Merge branch 'update-trade-2' of https://github.com/QuickStick123/PathOfBuilding-PoE2 into update-trade-2"

This reverts commit de88478, reversing
changes made to 5626812.

* Add the ability to include runes and corrrupted mods.

* Readd sign as it missing was breaking stuff.

* Remove claw and WIP on removing 0 mods from stuff it shouldn't be on.

* Fix 0 mods not being handled correctly.

* Fix missing crossbow and premature exit for trade

* Disable if not a rune slot

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: QuickStick123

src/Classes/TradeQuery.lua

@@ -16,7 +16,7 @@ local m_min = math.min
 local m_ceil = math.ceil
 local s_format = string.format
 
-local baseSlots = { "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring 1", "Ring 2", "Belt", "Flask 1", "Flask 2", "Flask 3", "Flask 4", "Flask 5" }
+local baseSlots = { "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring 1", "Ring 2", "Belt", "Charm 1", "Charm 2", "Charm 3", "Flask 1", "Flask 2" }
 
 local TradeQueryClass = newClass("TradeQuery", function(self, itemsTab)
 	self.itemsTab = itemsTab

src/Classes/TradeQueryGenerator.lua

@@ -3,103 +3,103 @@
 
 return {
 	["Soul Core of Tacati"] = {
-		weapon = { "15% chance to Poison on Hit", statOrder = { 6867 }, },
-		armour = { "+7% to Chaos Resistance", statOrder = { 953 }, },
+		weapon = { type = "Rune", "15% chance to Poison on Hit", statOrder = { 6867 }, },
+		armour = { type = "Rune", "+7% to Chaos Resistance", statOrder = { 953 }, },
 	},
 	["Soul Core of Opiloti"] = {
-		weapon = { "15% chance to cause Bleeding on Hit", statOrder = { 2156 }, },
-		armour = { "10% increased Charm Charges gained", statOrder = { 5066 }, },
+		weapon = { type = "Rune", "15% chance to cause Bleeding on Hit", statOrder = { 2156 }, },
+		armour = { type = "Rune", "10% increased Charm Charges gained", statOrder = { 5066 }, },
 	},
 	["Soul Core of Jiquani"] = {
-		weapon = { "Recover 2% of Life on Kill", statOrder = { 1443 }, },
-		armour = { "2% increased maximum Life", statOrder = { 872 }, },
+		weapon = { type = "Rune", "Recover 2% of Life on Kill", statOrder = { 1443 }, },
+		armour = { type = "Rune", "2% increased maximum Life", statOrder = { 872 }, },
 	},
 	["Soul Core of Zalatl"] = {
-		weapon = { "Recover 2% of Mana on Kill", statOrder = { 1445 }, },
-		armour = { "2% increased maximum Mana", statOrder = { 874 }, },
+		weapon = { type = "Rune", "Recover 2% of Mana on Kill", statOrder = { 1445 }, },
+		armour = { type = "Rune", "2% increased maximum Mana", statOrder = { 874 }, },
 	},
 	["Soul Core of Citaqualotl"] = {
-		weapon = { "30% increased Elemental Damage with Attacks", statOrder = { 860 }, },
-		armour = { "+5% to all Elemental Resistances", statOrder = { 949 }, },
+		weapon = { type = "Rune", "30% increased Elemental Damage with Attacks", statOrder = { 860 }, },
+		armour = { type = "Rune", "+5% to all Elemental Resistances", statOrder = { 949 }, },
 	},
 	["Soul Core of Puhuarte"] = {
-		weapon = { "30% increased chance to Ignite", statOrder = { 978 }, },
-		armour = { "+1% to Maximum Fire Resistance", statOrder = { 945 }, },
+		weapon = { type = "Rune", "30% increased chance to Ignite", statOrder = { 978 }, },
+		armour = { type = "Rune", "+1% to Maximum Fire Resistance", statOrder = { 945 }, },
 	},
 	["Soul Core of Tzamoto"] = {
-		weapon = { "20% increased Freeze Buildup", statOrder = { 980 }, },
-		armour = { "+1% to Maximum Cold Resistance", statOrder = { 946 }, },
+		weapon = { type = "Rune", "20% increased Freeze Buildup", statOrder = { 980 }, },
+		armour = { type = "Rune", "+1% to Maximum Cold Resistance", statOrder = { 946 }, },
 	},
 	["Soul Core of Xopec"] = {
-		weapon = { "30% increased chance to Shock", statOrder = { 982 }, },
-		armour = { "+1% to Maximum Lightning Resistance", statOrder = { 947 }, },
+		weapon = { type = "Rune", "30% increased chance to Shock", statOrder = { 982 }, },
+		armour = { type = "Rune", "+1% to Maximum Lightning Resistance", statOrder = { 947 }, },
 	},
 	["Soul Core of Azcapa"] = {
-		weapon = { "+15 to Spirit", statOrder = { 876 }, },
-		armour = { "10% increased Rarity of Items found", statOrder = { 911 }, },
+		weapon = { type = "Rune", "+15 to Spirit", statOrder = { 876 }, },
+		armour = { type = "Rune", "10% increased Rarity of Items found", statOrder = { 911 }, },
 	},
 	["Soul Core of Topotante"] = {
-		weapon = { "Attacks with this Weapon Penetrate 15% Elemental Resistances", statOrder = { 3369 }, },
-		armour = { "15% increased Elemental Ailment Threshold", statOrder = { 4150 }, },
+		weapon = { type = "Rune", "Attacks with this Weapon Penetrate 15% Elemental Resistances", statOrder = { 3369 }, },
+		armour = { type = "Rune", "15% increased Elemental Ailment Threshold", statOrder = { 4150 }, },
 	},
 	["Soul Core of Quipolatl"] = {
-		weapon = { "5% increased Attack Speed", statOrder = { 914 }, },
-		armour = { "10% reduced Slowing Potency of Debuffs on You", statOrder = { 4506 }, },
+		weapon = { type = "Rune", "5% increased Attack Speed", statOrder = { 914 }, },
+		armour = { type = "Rune", "10% reduced Slowing Potency of Debuffs on You", statOrder = { 4506 }, },
 	},
 	["Soul Core of Ticaba"] = {
-		weapon = { "+12% to Critical Damage Bonus", statOrder = { 913 }, },
-		armour = { "Hits against you have 10% reduced Critical Damage Bonus", statOrder = { 942 }, },
+		weapon = { type = "Rune", "+12% to Critical Damage Bonus", statOrder = { 913 }, },
+		armour = { type = "Rune", "Hits against you have 10% reduced Critical Damage Bonus", statOrder = { 942 }, },
 	},
 	["Soul Core of Atmohua"] = {
-		weapon = { "Convert 20% of Requirements to Strength", statOrder = { 6872 }, },
-		armour = { "Convert 20% of Requirements to Strength", statOrder = { 6872 }, },
+		weapon = { type = "Rune", "Convert 20% of Requirements to Strength", statOrder = { 6872 }, },
+		armour = { type = "Rune", "Convert 20% of Requirements to Strength", statOrder = { 6872 }, },
 	},
 	["Soul Core of Cholotl"] = {
-		weapon = { "Convert 20% of Requirements to Dexterity", statOrder = { 6870 }, },
-		armour = { "Convert 20% of Requirements to Dexterity", statOrder = { 6870 }, },
+		weapon = { type = "Rune", "Convert 20% of Requirements to Dexterity", statOrder = { 6870 }, },
+		armour = { type = "Rune", "Convert 20% of Requirements to Dexterity", statOrder = { 6870 }, },
 	},
 	["Soul Core of Zantipi"] = {
-		weapon = { "Convert 20% of Requirements to Intelligence", statOrder = { 6871 }, },
-		armour = { "Convert 20% of Requirements to Intelligence", statOrder = { 6871 }, },
+		weapon = { type = "Rune", "Convert 20% of Requirements to Intelligence", statOrder = { 6871 }, },
+		armour = { type = "Rune", "Convert 20% of Requirements to Intelligence", statOrder = { 6871 }, },
 	},
 	["Desert Rune"] = {
-		weapon = { "Adds 7 to 11 Fire Damage", statOrder = { 824 }, },
-		armour = { "+12% to Fire Resistance", statOrder = { 950 }, },
+		weapon = { type = "Rune", "Adds 7 to 11 Fire Damage", statOrder = { 824 }, },
+		armour = { type = "Rune", "+12% to Fire Resistance", statOrder = { 950 }, },
 	},
 	["Glacial Rune"] = {
-		weapon = { "Adds 6 to 10 Cold Damage", statOrder = { 825 }, },
-		armour = { "+12% to Cold Resistance", statOrder = { 951 }, },
+		weapon = { type = "Rune", "Adds 6 to 10 Cold Damage", statOrder = { 825 }, },
+		armour = { type = "Rune", "+12% to Cold Resistance", statOrder = { 951 }, },
 	},
 	["Storm Rune"] = {
-		weapon = { "Adds 1 to 20 Lightning Damage", statOrder = { 826 }, },
-		armour = { "+12% to Lightning Resistance", statOrder = { 952 }, },
+		weapon = { type = "Rune", "Adds 1 to 20 Lightning Damage", statOrder = { 826 }, },
+		armour = { type = "Rune", "+12% to Lightning Resistance", statOrder = { 952 }, },
 	},
 	["Iron Rune"] = {
-		weapon = { "20% increased Physical Damage", statOrder = { 822 }, },
-		armour = { "20% increased Armour, Evasion and Energy Shield", statOrder = { 1370 }, },
+		weapon = { type = "Rune", "20% increased Physical Damage", statOrder = { 822 }, },
+		armour = { type = "Rune", "20% increased Armour, Evasion and Energy Shield", statOrder = { 1370 }, },
 	},
 	["Body Rune"] = {
-		weapon = { "Leeches 3% of Physical Damage as Life", statOrder = { 961 }, },
-		armour = { "+25 to maximum Life", statOrder = { 871 }, },
+		weapon = { type = "Rune", "Leeches 3% of Physical Damage as Life", statOrder = { 961 }, },
+		armour = { type = "Rune", "+25 to maximum Life", statOrder = { 871 }, },
 	},
 	["Mind Rune"] = {
-		weapon = { "Leeches 2% of Physical Damage as Mana", statOrder = { 967 }, },
-		armour = { "+20 to maximum Mana", statOrder = { 873 }, },
+		weapon = { type = "Rune", "Leeches 2% of Physical Damage as Mana", statOrder = { 967 }, },
+		armour = { type = "Rune", "+20 to maximum Mana", statOrder = { 873 }, },
 	},
 	["Rebirth Rune"] = {
-		weapon = { "Gain 20 Life per Enemy Killed", statOrder = { 964 }, },
-		armour = { "Regenerate 0.3% of Life per second", statOrder = { 1627 }, },
+		weapon = { type = "Rune", "Gain 20 Life per Enemy Killed", statOrder = { 964 }, },
+		armour = { type = "Rune", "Regenerate 0.3% of Life per second", statOrder = { 1627 }, },
 	},
 	["Inspiration Rune"] = {
-		weapon = { "Gain 10 Mana per Enemy Killed", statOrder = { 969 }, },
-		armour = { "15% increased Mana Regeneration Rate", statOrder = { 965 }, },
+		weapon = { type = "Rune", "Gain 10 Mana per Enemy Killed", statOrder = { 969 }, },
+		armour = { type = "Rune", "15% increased Mana Regeneration Rate", statOrder = { 965 }, },
 	},
 	["Stone Rune"] = {
-		weapon = { "Causes 25% increased Stun Buildup", statOrder = { 974 }, },
-		armour = { "+40 to Stun Threshold", statOrder = { 984 }, },
+		weapon = { type = "Rune", "Causes 25% increased Stun Buildup", statOrder = { 974 }, },
+		armour = { type = "Rune", "+40 to Stun Threshold", statOrder = { 984 }, },
 	},
 	["Vision Rune"] = {
-		weapon = { "+100 to Accuracy Rating", statOrder = { 827 }, },
-		armour = { "10% increased Life and Mana Recovery from Flasks", statOrder = { 5906 }, },
+		weapon = { type = "Rune", "+100 to Accuracy Rating", statOrder = { 827 }, },
+		armour = { type = "Rune", "10% increased Life and Mana Recovery from Flasks", statOrder = { 5906 }, },
 	},
 }