Skip to content

Commit fd180ab

Browse files
vaisestvaisest
committed
Fix trade hash generation
1 parent 18b8585 commit fd180ab

9 files changed

Lines changed: 275 additions & 236 deletions

File tree

‎src/Data/ModCharm.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ return {
1414
["FlaskExtraCharges4__"] = { type = "Suffix", affix = "of the Bountiful", "(47-54)% increased Charges", statOrder = { 1008 }, level = 47, group = "FlaskIncreasedMaxCharges", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [1366840608] = { "(47-54)% increased Charges" }, } },
1515
["FlaskExtraCharges5"] = { type = "Suffix", affix = "of the Abundant", "(55-62)% increased Charges", statOrder = { 1008 }, level = 62, group = "FlaskIncreasedMaxCharges", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [1366840608] = { "(55-62)% increased Charges" }, } },
1616
["FlaskExtraCharges6"] = { type = "Suffix", affix = "of the Ample", "(63-70)% increased Charges", statOrder = { 1008 }, level = 81, group = "FlaskIncreasedMaxCharges", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [1366840608] = { "(63-70)% increased Charges" }, } },
17-
["FlaskChargesUsed1"] = { type = "Suffix", affix = "of the Apprentice", "(15-17)% reduced Charges per use", statOrder = { 1006 }, level = 1, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(15-17)% reduced Charges per use" }, } },
18-
["FlaskChargesUsed2"] = { type = "Suffix", affix = "of the Practitioner", "(18-20)% reduced Charges per use", statOrder = { 1006 }, level = 14, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(18-20)% reduced Charges per use" }, } },
19-
["FlaskChargesUsed3__"] = { type = "Suffix", affix = "of the Mixologist", "(21-23)% reduced Charges per use", statOrder = { 1006 }, level = 34, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(21-23)% reduced Charges per use" }, } },
20-
["FlaskChargesUsed4__"] = { type = "Suffix", affix = "of the Distiller", "(24-26)% reduced Charges per use", statOrder = { 1006 }, level = 49, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(24-26)% reduced Charges per use" }, } },
21-
["FlaskChargesUsed5"] = { type = "Suffix", affix = "of the Brewer", "(27-29)% reduced Charges per use", statOrder = { 1006 }, level = 64, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(27-29)% reduced Charges per use" }, } },
22-
["FlaskChargesUsed6"] = { type = "Suffix", affix = "of the Chemist", "(30-32)% reduced Charges per use", statOrder = { 1006 }, level = 83, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(30-32)% reduced Charges per use" }, } },
17+
["FlaskChargesUsed1"] = { type = "Suffix", affix = "of the Apprentice", "(15-17)% reduced Charges per use", statOrder = { 1006 }, level = 1, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(15-17)% reduced Charges per use" }, } },
18+
["FlaskChargesUsed2"] = { type = "Suffix", affix = "of the Practitioner", "(18-20)% reduced Charges per use", statOrder = { 1006 }, level = 14, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(18-20)% reduced Charges per use" }, } },
19+
["FlaskChargesUsed3__"] = { type = "Suffix", affix = "of the Mixologist", "(21-23)% reduced Charges per use", statOrder = { 1006 }, level = 34, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(21-23)% reduced Charges per use" }, } },
20+
["FlaskChargesUsed4__"] = { type = "Suffix", affix = "of the Distiller", "(24-26)% reduced Charges per use", statOrder = { 1006 }, level = 49, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(24-26)% reduced Charges per use" }, } },
21+
["FlaskChargesUsed5"] = { type = "Suffix", affix = "of the Brewer", "(27-29)% reduced Charges per use", statOrder = { 1006 }, level = 64, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(27-29)% reduced Charges per use" }, } },
22+
["FlaskChargesUsed6"] = { type = "Suffix", affix = "of the Chemist", "(30-32)% reduced Charges per use", statOrder = { 1006 }, level = 83, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(30-32)% reduced Charges per use" }, } },
2323
["FlaskChanceRechargeOnKill1"] = { type = "Suffix", affix = "of the Medic", "(21-25)% Chance to gain a Charge when you kill an enemy", statOrder = { 1004 }, level = 8, group = "FlaskChanceRechargeOnKill", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [828533480] = { "(21-25)% Chance to gain a Charge when you kill an enemy" }, } },
2424
["FlaskChanceRechargeOnKill2"] = { type = "Suffix", affix = "of the Doctor", "(26-30)% Chance to gain a Charge when you kill an enemy", statOrder = { 1004 }, level = 26, group = "FlaskChanceRechargeOnKill", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [828533480] = { "(26-30)% Chance to gain a Charge when you kill an enemy" }, } },
2525
["FlaskChanceRechargeOnKill3"] = { type = "Suffix", affix = "of the Surgeon", "(31-35)% Chance to gain a Charge when you kill an enemy", statOrder = { 1004 }, level = 45, group = "FlaskChanceRechargeOnKill", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [828533480] = { "(31-35)% Chance to gain a Charge when you kill an enemy" }, } },

‎src/Data/ModCorrupted.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ return {
7171
["CorruptionLifeFlaskChargeGeneration1"] = { type = "Corrupted", affix = "", "Life Flasks gain (0.08-0.17) charges per Second", statOrder = { 6451 }, level = 1, group = "LifeFlaskChargeGeneration", weightKey = { "amulet", "default", }, weightVal = { 1, 0 }, modTags = { }, tradeHashes = { [1102738251] = { "Life Flasks gain (0.08-0.17) charges per Second" }, } },
7272
["CorruptionManaFlaskChargeGeneration1"] = { type = "Corrupted", affix = "", "Mana Flasks gain (0.08-0.17) charges per Second", statOrder = { 6452 }, level = 1, group = "ManaFlaskChargeGeneration", weightKey = { "amulet", "default", }, weightVal = { 1, 0 }, modTags = { }, tradeHashes = { [2200293569] = { "Mana Flasks gain (0.08-0.17) charges per Second" }, } },
7373
["CorruptionCharmChargeGeneration1"] = { type = "Corrupted", affix = "", "Charms gain (0.08-0.17) charges per Second", statOrder = { 6448 }, level = 1, group = "CharmChargeGeneration", weightKey = { "amulet", "default", }, weightVal = { 1, 0 }, modTags = { }, tradeHashes = { [185580205] = { "Charms gain (0.08-0.17) charges per Second" }, } },
74-
["CorruptionLocalIncreasedPhysicalDamagePercent1"] = { type = "Corrupted", affix = "", "(15-25)% increased Physical Damage", statOrder = { 821 }, level = 1, group = "LocalPhysicalDamagePercent", weightKey = { "weapon", "default", }, weightVal = { 1, 0 }, modTags = { "physical_damage", "damage", "physical", "attack" }, tradeHashes = { [1805374733] = { "(15-25)% increased Physical Damage" }, } },
74+
["CorruptionLocalIncreasedPhysicalDamagePercent1"] = { type = "Corrupted", affix = "", "(15-25)% increased Physical Damage", statOrder = { 821 }, level = 1, group = "LocalPhysicalDamagePercent", weightKey = { "weapon", "default", }, weightVal = { 1, 0 }, modTags = { "physical_damage", "damage", "physical", "attack" }, tradeHashes = { [1509134228] = { "(15-25)% increased Physical Damage" }, } },
7575
["CorruptionSpellDamageOnWeapon1"] = { type = "Corrupted", affix = "", "(20-30)% increased Spell Damage", statOrder = { 853 }, level = 1, group = "WeaponSpellDamage", weightKey = { "wand", "focus", "default", }, weightVal = { 1, 1, 0 }, modTags = { "caster_damage", "damage", "caster" }, tradeHashes = { [2974417149] = { "(20-30)% increased Spell Damage" }, } },
7676
["CorruptionSpellDamageOnTwoHandWeapon1"] = { type = "Corrupted", affix = "", "(40-60)% increased Spell Damage", statOrder = { 853 }, level = 1, group = "WeaponSpellDamage", weightKey = { "staff", "default", }, weightVal = { 1, 0 }, modTags = { "caster_damage", "damage", "caster" }, tradeHashes = { [2974417149] = { "(40-60)% increased Spell Damage" }, } },
7777
["CorruptionLocalIncreasedSpiritPercent1"] = { type = "Corrupted", affix = "", "(15-25)% increased Spirit", statOrder = { 842 }, level = 1, group = "LocalIncreasedSpiritPercent", weightKey = { "sceptre", "default", }, weightVal = { 1, 0 }, modTags = { }, tradeHashes = { [3984865854] = { "(15-25)% increased Spirit" }, } },
@@ -95,7 +95,7 @@ return {
9595
["CorruptionWeaponElementalDamage1"] = { type = "Corrupted", affix = "", "(20-30)% increased Elemental Damage with Attacks", statOrder = { 859 }, level = 1, group = "IncreasedWeaponElementalDamagePercent", weightKey = { "bow", "one_hand_weapon", "default", }, weightVal = { 1, 1, 0 }, modTags = { "elemental_damage", "damage", "elemental", "attack" }, tradeHashes = { [387439868] = { "(20-30)% increased Elemental Damage with Attacks" }, } },
9696
["CorruptionWeaponElementalDamageTwoHand1"] = { type = "Corrupted", affix = "", "(40-50)% increased Elemental Damage with Attacks", statOrder = { 859 }, level = 1, group = "IncreasedWeaponElementalDamagePercent", weightKey = { "bow", "two_hand_weapon", "default", }, weightVal = { 0, 1, 0 }, modTags = { "elemental_damage", "damage", "elemental", "attack" }, tradeHashes = { [387439868] = { "(40-50)% increased Elemental Damage with Attacks" }, } },
9797
["CorruptionAdditionalArrows1"] = { type = "Corrupted", affix = "", "Bow Attacks fire an additional Arrow", statOrder = { 945 }, level = 1, group = "AdditionalArrows", weightKey = { "bow", "default", }, weightVal = { 1, 0 }, modTags = { "attack" }, tradeHashes = { [3885405204] = { "Bow Attacks fire an additional Arrow" }, } },
98-
["CorruptionAdditionalAmmo1"] = { type = "Corrupted", affix = "", "Loads an additional bolt", statOrder = { 943 }, level = 1, group = "AdditionalAmmo", weightKey = { "crossbow", "default", }, weightVal = { 1, 0 }, modTags = { "attack" }, tradeHashes = { [1039380318] = { "Loads an additional bolt" }, } },
98+
["CorruptionAdditionalAmmo1"] = { type = "Corrupted", affix = "", "Loads an additional bolt", statOrder = { 943 }, level = 1, group = "AdditionalAmmo", weightKey = { "crossbow", "default", }, weightVal = { 1, 0 }, modTags = { "attack" }, tradeHashes = { [1967051901] = { "Loads an additional bolt" }, } },
9999
["CorruptionIgniteChanceIncrease1"] = { type = "Corrupted", affix = "", "(20-30)% increased Flammability Magnitude", statOrder = { 988 }, level = 1, group = "IgniteChanceIncrease", weightKey = { "wand", "staff", "default", }, weightVal = { 1, 1, 0 }, modTags = { }, tradeHashes = { [2968503605] = { "(20-30)% increased Flammability Magnitude" }, } },
100100
["CorruptionFreezeDamageIncrease1"] = { type = "Corrupted", affix = "", "(20-30)% increased Freeze Buildup", statOrder = { 990 }, level = 1, group = "FreezeDamageIncrease", weightKey = { "wand", "staff", "default", }, weightVal = { 1, 1, 0 }, modTags = { }, tradeHashes = { [473429811] = { "(20-30)% increased Freeze Buildup" }, } },
101101
["CorruptionShockChanceIncrease1"] = { type = "Corrupted", affix = "", "(20-30)% increased chance to Shock", statOrder = { 992 }, level = 1, group = "ShockChanceIncrease", weightKey = { "wand", "staff", "default", }, weightVal = { 1, 1, 0 }, modTags = { }, tradeHashes = { [293638271] = { "(20-30)% increased chance to Shock" }, } },

‎src/Data/ModFlask.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ return {
1414
["FlaskExtraCharges4__"] = { type = "Suffix", affix = "of the Bountiful", "(47-54)% increased Charges", statOrder = { 1008 }, level = 47, group = "FlaskIncreasedMaxCharges", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [1366840608] = { "(47-54)% increased Charges" }, } },
1515
["FlaskExtraCharges5"] = { type = "Suffix", affix = "of the Abundant", "(55-62)% increased Charges", statOrder = { 1008 }, level = 62, group = "FlaskIncreasedMaxCharges", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [1366840608] = { "(55-62)% increased Charges" }, } },
1616
["FlaskExtraCharges6"] = { type = "Suffix", affix = "of the Ample", "(63-70)% increased Charges", statOrder = { 1008 }, level = 81, group = "FlaskIncreasedMaxCharges", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [1366840608] = { "(63-70)% increased Charges" }, } },
17-
["FlaskChargesUsed1"] = { type = "Suffix", affix = "of the Apprentice", "(15-17)% reduced Charges per use", statOrder = { 1006 }, level = 1, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(15-17)% reduced Charges per use" }, } },
18-
["FlaskChargesUsed2"] = { type = "Suffix", affix = "of the Practitioner", "(18-20)% reduced Charges per use", statOrder = { 1006 }, level = 14, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(18-20)% reduced Charges per use" }, } },
19-
["FlaskChargesUsed3__"] = { type = "Suffix", affix = "of the Mixologist", "(21-23)% reduced Charges per use", statOrder = { 1006 }, level = 34, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(21-23)% reduced Charges per use" }, } },
20-
["FlaskChargesUsed4__"] = { type = "Suffix", affix = "of the Distiller", "(24-26)% reduced Charges per use", statOrder = { 1006 }, level = 49, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(24-26)% reduced Charges per use" }, } },
21-
["FlaskChargesUsed5"] = { type = "Suffix", affix = "of the Brewer", "(27-29)% reduced Charges per use", statOrder = { 1006 }, level = 64, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(27-29)% reduced Charges per use" }, } },
22-
["FlaskChargesUsed6"] = { type = "Suffix", affix = "of the Chemist", "(30-32)% reduced Charges per use", statOrder = { 1006 }, level = 83, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [3139816101] = { "(30-32)% reduced Charges per use" }, } },
17+
["FlaskChargesUsed1"] = { type = "Suffix", affix = "of the Apprentice", "(15-17)% reduced Charges per use", statOrder = { 1006 }, level = 1, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(15-17)% reduced Charges per use" }, } },
18+
["FlaskChargesUsed2"] = { type = "Suffix", affix = "of the Practitioner", "(18-20)% reduced Charges per use", statOrder = { 1006 }, level = 14, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(18-20)% reduced Charges per use" }, } },
19+
["FlaskChargesUsed3__"] = { type = "Suffix", affix = "of the Mixologist", "(21-23)% reduced Charges per use", statOrder = { 1006 }, level = 34, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(21-23)% reduced Charges per use" }, } },
20+
["FlaskChargesUsed4__"] = { type = "Suffix", affix = "of the Distiller", "(24-26)% reduced Charges per use", statOrder = { 1006 }, level = 49, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(24-26)% reduced Charges per use" }, } },
21+
["FlaskChargesUsed5"] = { type = "Suffix", affix = "of the Brewer", "(27-29)% reduced Charges per use", statOrder = { 1006 }, level = 64, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(27-29)% reduced Charges per use" }, } },
22+
["FlaskChargesUsed6"] = { type = "Suffix", affix = "of the Chemist", "(30-32)% reduced Charges per use", statOrder = { 1006 }, level = 83, group = "FlaskChargesUsed", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [388617051] = { "(30-32)% reduced Charges per use" }, } },
2323
["FlaskChanceRechargeOnKill1"] = { type = "Suffix", affix = "of the Medic", "(21-25)% Chance to gain a Charge when you kill an enemy", statOrder = { 1004 }, level = 8, group = "FlaskChanceRechargeOnKill", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [828533480] = { "(21-25)% Chance to gain a Charge when you kill an enemy" }, } },
2424
["FlaskChanceRechargeOnKill2"] = { type = "Suffix", affix = "of the Doctor", "(26-30)% Chance to gain a Charge when you kill an enemy", statOrder = { 1004 }, level = 26, group = "FlaskChanceRechargeOnKill", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [828533480] = { "(26-30)% Chance to gain a Charge when you kill an enemy" }, } },
2525
["FlaskChanceRechargeOnKill3"] = { type = "Suffix", affix = "of the Surgeon", "(31-35)% Chance to gain a Charge when you kill an enemy", statOrder = { 1004 }, level = 45, group = "FlaskChanceRechargeOnKill", weightKey = { "default", }, weightVal = { 1 }, modTags = { "flask" }, tradeHashes = { [828533480] = { "(31-35)% Chance to gain a Charge when you kill an enemy" }, } },

0 commit comments

Comments
 (0)