Skip to content

Commit 60ffbf7

Browse files
vaisestvaisest
committed
Fix weight generation for radius jewels again
1 parent 4f7a7f6 commit 60ffbf7

6 files changed

Lines changed: 1971 additions & 48 deletions

File tree

‎src/Classes/TradeHelpers.lua‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ function M.formatDatabaseText(text)
153153
-- (123-124) -> #
154154
text = text:gsub("%(%d+%-%d+%)", "#")
155155
text = text:gsub("%d+", "#")
156-
-- remove radius jewel text. the same description is used for regular and
157-
-- radius jewels in the exports
158-
text = text:gsub("^Notable Passive Skills in Radius also grant ", "")
159-
text = text:gsub("^Small Passive Skills in Radius also grant ", "")
160156
return text
161157
end
162158

@@ -230,7 +226,7 @@ function M.findTradeHash(item, modLine, modType, isDesecrated)
230226
end
231227
end
232228
-- most implicit and explicit applicable to the type
233-
elseif modType ~= "implicit" or modType ~= "explicit" then
229+
elseif modType == "implicit" or modType == "explicit" then
234230
for _, dbMod in pairs(item.affixes) do
235231
local tradeHashMaybe = findStat(dbMod)
236232
if tradeHashMaybe then

‎src/Data/ModItemExclusive.lua‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -163,29 +163,29 @@ return {
163163
["CrossbowImplicitAdditionalBallistaTotem1"] = { affix = "", "+1 to maximum number of Summoned Ballista Totems", statOrder = { 4058 }, level = 1, group = "AdditionalBallistaTotem", weightKey = { }, weightVal = { }, modTags = { }, tradeHashes = { [1823942939] = { "+1 to maximum number of Summoned Ballista Totems" }, } },
164164
["TrapImplicitCooldownRecovery1"] = { affix = "", "(20-30)% increased Cooldown Recovery Rate for throwing Traps", statOrder = { 3044 }, level = 1, group = "TrapCooldownRecovery", weightKey = { }, weightVal = { }, modTags = { }, tradeHashes = { [3417757416] = { "(20-30)% increased Cooldown Recovery Rate for throwing Traps" }, } },
165165
["BucklerImplicitStunThreshold1"] = { affix = "", "+16 to Stun Threshold", statOrder = { 994 }, level = 1, group = "StunThreshold", weightKey = { }, weightVal = { }, modTags = { }, tradeHashes = { [915769802] = { "+16 to Stun Threshold" }, } },
166-
["UniqueJewelRadiusMana"] = { affix = "", "1% increased maximum Mana", statOrder = { 872 }, level = 1, group = "MaximumManaIncreasePercent", weightKey = { }, weightVal = { }, modTags = { "resource", "mana" }, nodeType = 1, tradeHashes = { [1247628870] = { "1% increased maximum Mana" }, } },
167-
["UniqueJewelRadiusLife"] = { affix = "", "1% increased maximum Life", statOrder = { 870 }, level = 1, group = "MaximumLifeIncreasePercent", weightKey = { }, weightVal = { }, modTags = { "resource", "life" }, nodeType = 1, tradeHashes = { [1809641701] = { "1% increased maximum Life" }, } },
168-
["UniqueJewelRadiusIncreasedLife"] = { affix = "", "+8 to maximum Life", statOrder = { 869 }, level = 1, group = "IncreasedLife", weightKey = { }, weightVal = { }, modTags = { "resource", "life" }, nodeType = 1, tradeHashes = { [1316656343] = { "+8 to maximum Life" }, } },
169-
["UniqueJewelRadiusIncreasedMana"] = { affix = "", "+8 to maximum Mana", statOrder = { 871 }, level = 1, group = "IncreasedMana", weightKey = { }, weightVal = { }, modTags = { "resource", "mana" }, nodeType = 1, tradeHashes = { [1294464552] = { "+8 to maximum Mana" }, } },
170-
["UniqueJewelRadiusIgniteDurationOnSelf"] = { affix = "", "(4-6)% reduced Ignite Duration on you", statOrder = { 996 }, level = 1, group = "ReducedIgniteDurationOnSelf", weightKey = { }, weightVal = { }, modTags = { "elemental", "fire", "ailment" }, nodeType = 1, tradeHashes = { [3474941090] = { "(4-6)% reduced Ignite Duration on you" }, } },
171-
["UniqueJewelRadiusFreezeDurationOnSelf"] = { affix = "", "(4-6)% reduced Freeze Duration on you", statOrder = { 998 }, level = 1, group = "ReducedFreezeDuration", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "ailment" }, nodeType = 1, tradeHashes = { [860443350] = { "(4-6)% reduced Freeze Duration on you" }, } },
172-
["UniqueJewelRadiusShockDurationOnSelf"] = { affix = "", "(4-6)% reduced Shock duration on you", statOrder = { 999 }, level = 1, group = "ReducedShockDuration", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "ailment" }, nodeType = 1, tradeHashes = { [1627878766] = { "(4-6)% reduced Shock duration on you" }, } },
173-
["UniqueJewelRadiusFireResistance"] = { affix = "", "+(2-4)% to Fire Resistance", statOrder = { 958 }, level = 1, group = "FireResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "fire", "resistance" }, nodeType = 1, tradeHashes = { [2948688907] = { "+(2-4)% to Fire Resistance" }, } },
174-
["UniqueJewelRadiusColdResistance"] = { affix = "", "+(2-4)% to Cold Resistance", statOrder = { 959 }, level = 1, group = "ColdResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "resistance" }, nodeType = 1, tradeHashes = { [2884937919] = { "+(2-4)% to Cold Resistance" }, } },
175-
["UniqueJewelRadiusLightningResistance"] = { affix = "", "+(2-4)% to Lightning Resistance", statOrder = { 960 }, level = 1, group = "LightningResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "resistance" }, nodeType = 1, tradeHashes = { [3994876825] = { "+(2-4)% to Lightning Resistance" }, } },
176-
["UniqueJewelRadiusChaosResistance"] = { affix = "", "+(2-3)% to Chaos Resistance", statOrder = { 961 }, level = 1, group = "ChaosResistance", weightKey = { }, weightVal = { }, modTags = { "chaos", "resistance" }, nodeType = 1, tradeHashes = { [2264240911] = { "+(2-3)% to Chaos Resistance" }, } },
177-
["UniqueJewelRadiusMaxFireResistance"] = { affix = "", "+1% to Maximum Fire Resistance", statOrder = { 953 }, level = 1, group = "MaximumFireResist", weightKey = { }, weightVal = { }, modTags = { "elemental", "fire", "resistance" }, nodeType = 2, tradeHashes = { [4151994709] = { "+1% to Maximum Fire Resistance" }, } },
178-
["UniqueJewelRadiusMaxColdResistance"] = { affix = "", "+1% to Maximum Cold Resistance", statOrder = { 954 }, level = 1, group = "MaximumColdResist", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "resistance" }, nodeType = 2, tradeHashes = { [1862508014] = { "+1% to Maximum Cold Resistance" }, } },
179-
["UniqueJewelRadiusMaxLightningResistance"] = { affix = "", "+1% to Maximum Lightning Resistance", statOrder = { 955 }, level = 1, group = "MaximumLightningResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "resistance" }, nodeType = 2, tradeHashes = { [2217513089] = { "+1% to Maximum Lightning Resistance" }, } },
180-
["UniqueJewelRadiusMaxChaosResistance"] = { affix = "", "+1% to Maximum Chaos Resistance", statOrder = { 956 }, level = 1, group = "MaximumChaosResistance", weightKey = { }, weightVal = { }, modTags = { "chaos", "resistance" }, nodeType = 2, tradeHashes = { [1731760476] = { "+1% to Maximum Chaos Resistance" }, } },
181-
["UniqueJewelRadiusPercentStrenth"] = { affix = "", "(2-3)% increased Strength", statOrder = { 1080 }, level = 1, group = "PercentageStrength", weightKey = { }, weightVal = { }, modTags = { "attribute" }, nodeType = 2, tradeHashes = { [1842384813] = { "(2-3)% increased Strength" }, } },
182-
["UniqueJewelRadiusPercentIntelligence"] = { affix = "", "(2-3)% increased Intelligence", statOrder = { 1082 }, level = 1, group = "PercentageIntelligence", weightKey = { }, weightVal = { }, modTags = { "attribute" }, nodeType = 2, tradeHashes = { [40618390] = { "(2-3)% increased Intelligence" }, } },
183-
["UniqueJewelRadiusPercentDexterity"] = { affix = "", "(2-3)% increased Dexterity", statOrder = { 1081 }, level = 1, group = "PercentageDexterity", weightKey = { }, weightVal = { }, modTags = { "attribute" }, nodeType = 2, tradeHashes = { [2717786748] = { "(2-3)% increased Dexterity" }, } },
184-
["UniqueJewelRadiusSpirit"] = { affix = "", "+(8-12) to Spirit", statOrder = { 873 }, level = 1, group = "JewelSpirit", weightKey = { }, weightVal = { }, modTags = { }, nodeType = 2, tradeHashes = { [3991877392] = { "+(8-12) to Spirit" }, } },
185-
["UniqueJewelRadiusDamageAsFire"] = { affix = "", "Gain (2-4)% of Damage as Extra Fire Damage", statOrder = { 847 }, level = 1, group = "DamageGainedAsFire", weightKey = { }, weightVal = { }, modTags = { "elemental_damage", "damage", "elemental", "fire" }, nodeType = 2, tradeHashes = { [338620903] = { "Gain (2-4)% of Damage as Extra Fire Damage" }, } },
186-
["UniqueJewelRadiusDamageAsCold"] = { affix = "", "Gain (2-4)% of Damage as Extra Cold Damage", statOrder = { 849 }, level = 1, group = "DamageGainedAsCold", weightKey = { }, weightVal = { }, modTags = { "elemental_damage", "damage", "elemental", "cold" }, nodeType = 2, tradeHashes = { [833138896] = { "Gain (2-4)% of Damage as Extra Cold Damage" }, } },
187-
["UniqueJewelRadiusDamageAsLightning"] = { affix = "", "Gain (2-4)% of Damage as Extra Lightning Damage", statOrder = { 851 }, level = 1, group = "DamageGainedAsLightning", weightKey = { }, weightVal = { }, modTags = { "elemental_damage", "damage", "elemental", "lightning" }, nodeType = 2, tradeHashes = { [852470634] = { "Gain (2-4)% of Damage as Extra Lightning Damage" }, } },
188-
["UniqueJewelRadiusDamageAsChaos"] = { affix = "", "Gain (2-4)% of Damage as Extra Chaos Damage", statOrder = { 1602 }, level = 1, group = "DamageGainedAsChaos", weightKey = { }, weightVal = { }, modTags = { "chaos_damage", "damage", "chaos" }, nodeType = 2, tradeHashes = { [2603051299] = { "Gain (2-4)% of Damage as Extra Chaos Damage" }, } },
166+
["UniqueJewelRadiusMana"] = { affix = "", "1% increased maximum Mana", statOrder = { 872 }, level = 1, group = "MaximumManaIncreasePercent", weightKey = { }, weightVal = { }, modTags = { "resource", "mana" }, nodeType = 1, tradeHashes = { [1247628870] = { "Small Passive Skills in Radius also grant 1% increased maximum Mana" }, } },
167+
["UniqueJewelRadiusLife"] = { affix = "", "1% increased maximum Life", statOrder = { 870 }, level = 1, group = "MaximumLifeIncreasePercent", weightKey = { }, weightVal = { }, modTags = { "resource", "life" }, nodeType = 1, tradeHashes = { [1809641701] = { "Small Passive Skills in Radius also grant 1% increased maximum Life" }, } },
168+
["UniqueJewelRadiusIncreasedLife"] = { affix = "", "+8 to maximum Life", statOrder = { 869 }, level = 1, group = "IncreasedLife", weightKey = { }, weightVal = { }, modTags = { "resource", "life" }, nodeType = 1, tradeHashes = { [1316656343] = { "Small Passive Skills in Radius also grant +8 to maximum Life" }, } },
169+
["UniqueJewelRadiusIncreasedMana"] = { affix = "", "+8 to maximum Mana", statOrder = { 871 }, level = 1, group = "IncreasedMana", weightKey = { }, weightVal = { }, modTags = { "resource", "mana" }, nodeType = 1, tradeHashes = { [1294464552] = { "Small Passive Skills in Radius also grant +8 to maximum Mana" }, } },
170+
["UniqueJewelRadiusIgniteDurationOnSelf"] = { affix = "", "(4-6)% reduced Ignite Duration on you", statOrder = { 996 }, level = 1, group = "ReducedIgniteDurationOnSelf", weightKey = { }, weightVal = { }, modTags = { "elemental", "fire", "ailment" }, nodeType = 1, tradeHashes = { [3474941090] = { "Small Passive Skills in Radius also grant (4-6)% reduced Ignite Duration on you" }, } },
171+
["UniqueJewelRadiusFreezeDurationOnSelf"] = { affix = "", "(4-6)% reduced Freeze Duration on you", statOrder = { 998 }, level = 1, group = "ReducedFreezeDuration", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "ailment" }, nodeType = 1, tradeHashes = { [860443350] = { "Small Passive Skills in Radius also grant (4-6)% reduced Freeze Duration on you" }, } },
172+
["UniqueJewelRadiusShockDurationOnSelf"] = { affix = "", "(4-6)% reduced Shock duration on you", statOrder = { 999 }, level = 1, group = "ReducedShockDuration", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "ailment" }, nodeType = 1, tradeHashes = { [1627878766] = { "Small Passive Skills in Radius also grant (4-6)% reduced Shock duration on you" }, } },
173+
["UniqueJewelRadiusFireResistance"] = { affix = "", "+(2-4)% to Fire Resistance", statOrder = { 958 }, level = 1, group = "FireResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "fire", "resistance" }, nodeType = 1, tradeHashes = { [2948688907] = { "Small Passive Skills in Radius also grant +(2-4)% to Fire Resistance" }, } },
174+
["UniqueJewelRadiusColdResistance"] = { affix = "", "+(2-4)% to Cold Resistance", statOrder = { 959 }, level = 1, group = "ColdResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "resistance" }, nodeType = 1, tradeHashes = { [2884937919] = { "Small Passive Skills in Radius also grant +(2-4)% to Cold Resistance" }, } },
175+
["UniqueJewelRadiusLightningResistance"] = { affix = "", "+(2-4)% to Lightning Resistance", statOrder = { 960 }, level = 1, group = "LightningResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "resistance" }, nodeType = 1, tradeHashes = { [3994876825] = { "Small Passive Skills in Radius also grant +(2-4)% to Lightning Resistance" }, } },
176+
["UniqueJewelRadiusChaosResistance"] = { affix = "", "+(2-3)% to Chaos Resistance", statOrder = { 961 }, level = 1, group = "ChaosResistance", weightKey = { }, weightVal = { }, modTags = { "chaos", "resistance" }, nodeType = 1, tradeHashes = { [2264240911] = { "Small Passive Skills in Radius also grant +(2-3)% to Chaos Resistance" }, } },
177+
["UniqueJewelRadiusMaxFireResistance"] = { affix = "", "+1% to Maximum Fire Resistance", statOrder = { 953 }, level = 1, group = "MaximumFireResist", weightKey = { }, weightVal = { }, modTags = { "elemental", "fire", "resistance" }, nodeType = 2, tradeHashes = { [4151994709] = { "Notable Passive Skills in Radius also grant +1% to Maximum Fire Resistance" }, } },
178+
["UniqueJewelRadiusMaxColdResistance"] = { affix = "", "+1% to Maximum Cold Resistance", statOrder = { 954 }, level = 1, group = "MaximumColdResist", weightKey = { }, weightVal = { }, modTags = { "elemental", "cold", "resistance" }, nodeType = 2, tradeHashes = { [1862508014] = { "Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance" }, } },
179+
["UniqueJewelRadiusMaxLightningResistance"] = { affix = "", "+1% to Maximum Lightning Resistance", statOrder = { 955 }, level = 1, group = "MaximumLightningResistance", weightKey = { }, weightVal = { }, modTags = { "elemental", "lightning", "resistance" }, nodeType = 2, tradeHashes = { [2217513089] = { "Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance" }, } },
180+
["UniqueJewelRadiusMaxChaosResistance"] = { affix = "", "+1% to Maximum Chaos Resistance", statOrder = { 956 }, level = 1, group = "MaximumChaosResistance", weightKey = { }, weightVal = { }, modTags = { "chaos", "resistance" }, nodeType = 2, tradeHashes = { [1731760476] = { "Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance" }, } },
181+
["UniqueJewelRadiusPercentStrenth"] = { affix = "", "(2-3)% increased Strength", statOrder = { 1080 }, level = 1, group = "PercentageStrength", weightKey = { }, weightVal = { }, modTags = { "attribute" }, nodeType = 2, tradeHashes = { [1842384813] = { "Notable Passive Skills in Radius also grant (2-3)% increased Strength" }, } },
182+
["UniqueJewelRadiusPercentIntelligence"] = { affix = "", "(2-3)% increased Intelligence", statOrder = { 1082 }, level = 1, group = "PercentageIntelligence", weightKey = { }, weightVal = { }, modTags = { "attribute" }, nodeType = 2, tradeHashes = { [40618390] = { "Notable Passive Skills in Radius also grant (2-3)% increased Intelligence" }, } },
183+
["UniqueJewelRadiusPercentDexterity"] = { affix = "", "(2-3)% increased Dexterity", statOrder = { 1081 }, level = 1, group = "PercentageDexterity", weightKey = { }, weightVal = { }, modTags = { "attribute" }, nodeType = 2, tradeHashes = { [2717786748] = { "Notable Passive Skills in Radius also grant (2-3)% increased Dexterity" }, } },
184+
["UniqueJewelRadiusSpirit"] = { affix = "", "+(8-12) to Spirit", statOrder = { 873 }, level = 1, group = "JewelSpirit", weightKey = { }, weightVal = { }, modTags = { }, nodeType = 2, tradeHashes = { [3991877392] = { "Notable Passive Skills in Radius also grant +(8-12) to Spirit" }, } },
185+
["UniqueJewelRadiusDamageAsFire"] = { affix = "", "Gain (2-4)% of Damage as Extra Fire Damage", statOrder = { 847 }, level = 1, group = "DamageGainedAsFire", weightKey = { }, weightVal = { }, modTags = { "elemental_damage", "damage", "elemental", "fire" }, nodeType = 2, tradeHashes = { [338620903] = { "Notable Passive Skills in Radius also grant Gain (2-4)% of Damage as Extra Fire Damage" }, } },
186+
["UniqueJewelRadiusDamageAsCold"] = { affix = "", "Gain (2-4)% of Damage as Extra Cold Damage", statOrder = { 849 }, level = 1, group = "DamageGainedAsCold", weightKey = { }, weightVal = { }, modTags = { "elemental_damage", "damage", "elemental", "cold" }, nodeType = 2, tradeHashes = { [833138896] = { "Notable Passive Skills in Radius also grant Gain (2-4)% of Damage as Extra Cold Damage" }, } },
187+
["UniqueJewelRadiusDamageAsLightning"] = { affix = "", "Gain (2-4)% of Damage as Extra Lightning Damage", statOrder = { 851 }, level = 1, group = "DamageGainedAsLightning", weightKey = { }, weightVal = { }, modTags = { "elemental_damage", "damage", "elemental", "lightning" }, nodeType = 2, tradeHashes = { [852470634] = { "Notable Passive Skills in Radius also grant Gain (2-4)% of Damage as Extra Lightning Damage" }, } },
188+
["UniqueJewelRadiusDamageAsChaos"] = { affix = "", "Gain (2-4)% of Damage as Extra Chaos Damage", statOrder = { 1602 }, level = 1, group = "DamageGainedAsChaos", weightKey = { }, weightVal = { }, modTags = { "chaos_damage", "damage", "chaos" }, nodeType = 2, tradeHashes = { [2603051299] = { "Notable Passive Skills in Radius also grant Gain (2-4)% of Damage as Extra Chaos Damage" }, } },
189189
["UniqueStrength1"] = { affix = "", "+(30-50) to Strength", statOrder = { 947 }, level = 1, group = "Strength", weightKey = { }, weightVal = { }, modTags = { "attribute" }, tradeHashes = { [4080418644] = { "+(30-50) to Strength" }, } },
190190
["UniqueStrength2"] = { affix = "", "+(10-20) to Strength", statOrder = { 947 }, level = 1, group = "Strength", weightKey = { }, weightVal = { }, modTags = { "attribute" }, tradeHashes = { [4080418644] = { "+(10-20) to Strength" }, } },
191191
["UniqueStrength3"] = { affix = "", "+(10-15) to Strength", statOrder = { 947 }, level = 1, group = "Strength", weightKey = { }, weightVal = { }, modTags = { "attribute" }, tradeHashes = { [4080418644] = { "+(10-15) to Strength" }, } },

0 commit comments

Comments
 (0)