Skip to content

Commit 886b9a0

Browse files
author
LocalIdentity
committed
Export 0.2.0F
Fix gem select crash Updates belts to use new implicit for charm slots Adds some new flags for skills Update ModCache and QueryMods
1 parent a5fa50f commit 886b9a0

37 files changed

+16940
-16544
lines changed

‎src/Classes/GemSelectControl.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
638638
self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Hit Chance: ^7%.2f%%", grantedEffectLevel.critChance))
639639
end
640640
if gemInstance.gemData.weaponRequirements then
641-
self.tooltip:AddLine(16, "^x7F7F7F Requires: ^7" .. gemInstance.gemData.weaponTypesString)
641+
self.tooltip:AddLine(16, "^x7F7F7F Requires: ^7" .. gemInstance.gemData.weaponRequirements)
642642
end
643643
end
644644
if addReq and displayInstance.quality > 0 then

‎src/Data/Bases/belt.lua‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,96 +4,97 @@ local itemBases = ...
44

55
itemBases["Golden Obi"] = {
66
type = "Belt",
7+
charmLimit = 0,
78
tags = { demigods = true, not_for_sale = true, default = true, belt = true, },
8-
implicit = "(20-30)% increased Rarity of Items found",
9+
implicit = "(20-30)% increased Rarity of Items found\nHas (1-3) Charm Slots",
910
implicitModTypes = { { "drop" }, },
1011
req = { },
1112
}
1213
itemBases["Rawhide Belt"] = {
1314
type = "Belt",
14-
charmLimit = 1,
15+
charmLimit = 0,
1516
tags = { belt = true, default = true, },
16-
implicit = "(20-30)% increased Life Recovery from Flasks",
17+
implicit = "(20-30)% increased Life Recovery from Flasks\nHas (1-3) Charm Slots",
1718
implicitModTypes = { { "flask", "resource", "life" }, },
1819
req = { },
1920
}
2021
itemBases["Linen Belt"] = {
2122
type = "Belt",
22-
charmLimit = 1,
23+
charmLimit = 0,
2324
tags = { belt = true, default = true, },
24-
implicit = "(20-30)% increased Mana Recovery from Flasks",
25+
implicit = "(20-30)% increased Mana Recovery from Flasks\nHas (1-3) Charm Slots",
2526
implicitModTypes = { { "flask", "resource", "mana" }, },
2627
req = { },
2728
}
2829
itemBases["Wide Belt"] = {
2930
type = "Belt",
30-
charmLimit = 1,
31+
charmLimit = 0,
3132
tags = { belt = true, default = true, },
32-
implicit = "(20-30)% increased Flask Charges gained",
33+
implicit = "(20-30)% increased Flask Charges gained\nHas (1-3) Charm Slots",
3334
implicitModTypes = { { "flask" }, },
3435
req = { level = 14, },
3536
}
3637
itemBases["Long Belt"] = {
3738
type = "Belt",
38-
charmLimit = 1,
39+
charmLimit = 0,
3940
tags = { belt = true, default = true, },
40-
implicit = "(15-20)% increased Charm Effect Duration",
41+
implicit = "(15-20)% increased Charm Effect Duration\nHas (1-3) Charm Slots",
4142
implicitModTypes = { { }, },
4243
req = { level = 20, },
4344
}
4445
itemBases["Plate Belt"] = {
4546
type = "Belt",
46-
charmLimit = 1,
47+
charmLimit = 0,
4748
tags = { belt = true, default = true, },
48-
implicit = "+(100-140) to Armour",
49+
implicit = "+(100-140) to Armour\nHas (1-3) Charm Slots",
4950
implicitModTypes = { { "armour", "defences" }, },
5051
req = { level = 24, },
5152
}
5253
itemBases["Ornate Belt"] = {
5354
type = "Belt",
54-
charmLimit = 1,
55+
charmLimit = 0,
5556
tags = { belt = true, default = true, },
56-
implicit = "(10-15)% reduced Charm Charges used",
57+
implicit = "(10-15)% reduced Charm Charges used\nHas (1-3) Charm Slots",
5758
implicitModTypes = { { }, },
5859
req = { level = 31, },
5960
}
6061
itemBases["Mail Belt"] = {
6162
type = "Belt",
62-
charmLimit = 1,
63+
charmLimit = 0,
6364
tags = { belt = true, default = true, },
64-
implicit = "(10-15)% reduced Flask Charges used",
65+
implicit = "(10-15)% reduced Flask Charges used\nHas (1-3) Charm Slots",
6566
implicitModTypes = { { "flask" }, },
6667
req = { level = 40, },
6768
}
6869
itemBases["Double Belt"] = {
6970
type = "Belt",
70-
charmLimit = 1,
71+
charmLimit = 0,
7172
tags = { belt = true, default = true, },
72-
implicit = "(20-30)% increased Charm Charges gained",
73+
implicit = "(20-30)% increased Charm Charges gained\nHas (1-3) Charm Slots",
7374
implicitModTypes = { { }, },
7475
req = { level = 44, },
7576
}
7677
itemBases["Heavy Belt"] = {
7778
type = "Belt",
78-
charmLimit = 1,
79+
charmLimit = 0,
7980
tags = { belt = true, default = true, },
80-
implicit = "(20-30)% increased Stun Threshold",
81+
implicit = "(20-30)% increased Stun Threshold\nHas (1-3) Charm Slots",
8182
implicitModTypes = { { }, },
8283
req = { level = 50, },
8384
}
8485
itemBases["Utility Belt"] = {
8586
type = "Belt",
86-
charmLimit = 1,
87+
charmLimit = 0,
8788
tags = { belt = true, default = true, },
88-
implicit = "20% of Flask Recovery applied Instantly",
89+
implicit = "20% of Flask Recovery applied Instantly\nHas (1-3) Charm Slots",
8990
implicitModTypes = { { }, },
9091
req = { level = 55, },
9192
}
9293
itemBases["Fine Belt"] = {
9394
type = "Belt",
94-
charmLimit = 1,
95+
charmLimit = 0,
9596
tags = { belt = true, default = true, },
96-
implicit = "Flasks gain 0.17 charges per Second",
97+
implicit = "Flasks gain 0.17 charges per Second\nHas (1-3) Charm Slots",
9798
implicitModTypes = { { }, },
9899
req = { level = 62, },
99100
}

‎src/Data/Bases/flask.lua‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ itemBases["Thawing Charm"] = {
88
tags = { flask = true, utility_flask = true, default = true, },
99
implicit = "Used when you become Frozen",
1010
implicitModTypes = { { }, },
11-
charm = { duration = 3, chargesUsed = 80, chargesMax = 80, buff = { "Immune to Freeze" }, },
11+
charm = { duration = 3, chargesUsed = 40, chargesMax = 40, buff = { "Immune to Freeze" }, },
1212
req = { level = 12, },
1313
}
1414
itemBases["Staunching Charm"] = {
@@ -17,7 +17,7 @@ itemBases["Staunching Charm"] = {
1717
tags = { flask = true, utility_flask = true, default = true, },
1818
implicit = "Used when you start Bleeding",
1919
implicitModTypes = { { }, },
20-
charm = { duration = 3, chargesUsed = 60, chargesMax = 80, buff = { "You are Immune to Bleeding" }, },
20+
charm = { duration = 3, chargesUsed = 30, chargesMax = 40, buff = { "You are Immune to Bleeding" }, },
2121
req = { level = 18, },
2222
}
2323
itemBases["Antidote Charm"] = {
@@ -26,7 +26,7 @@ itemBases["Antidote Charm"] = {
2626
tags = { flask = true, utility_flask = true, default = true, },
2727
implicit = "Used when you become Poisoned",
2828
implicitModTypes = { { }, },
29-
charm = { duration = 3, chargesUsed = 40, chargesMax = 80, buff = { "Immune to Poison" }, },
29+
charm = { duration = 3, chargesUsed = 20, chargesMax = 40, buff = { "Immune to Poison" }, },
3030
req = { level = 24, },
3131
}
3232
itemBases["Dousing Charm"] = {
@@ -35,7 +35,7 @@ itemBases["Dousing Charm"] = {
3535
tags = { flask = true, utility_flask = true, default = true, },
3636
implicit = "Used when you become Ignited",
3737
implicitModTypes = { { }, },
38-
charm = { duration = 3, chargesUsed = 60, chargesMax = 80, buff = { "Immune to Ignite" }, },
38+
charm = { duration = 3, chargesUsed = 30, chargesMax = 40, buff = { "Immune to Ignite" }, },
3939
req = { level = 32, },
4040
}
4141
itemBases["Grounding Charm"] = {
@@ -44,7 +44,7 @@ itemBases["Grounding Charm"] = {
4444
tags = { flask = true, utility_flask = true, default = true, },
4545
implicit = "Used when you become Shocked",
4646
implicitModTypes = { { }, },
47-
charm = { duration = 3, chargesUsed = 50, chargesMax = 80, buff = { "Immune to Shock" }, },
47+
charm = { duration = 3, chargesUsed = 30, chargesMax = 40, buff = { "Immune to Shock" }, },
4848
req = { level = 32, },
4949
}
5050
itemBases["Stone Charm"] = {
@@ -53,7 +53,7 @@ itemBases["Stone Charm"] = {
5353
tags = { flask = true, utility_flask = true, default = true, },
5454
implicit = "Used when you become Stunned",
5555
implicitModTypes = { { }, },
56-
charm = { duration = 2.5, chargesUsed = 40, chargesMax = 80, buff = { "Cannot be Stunned" }, },
56+
charm = { duration = 3, chargesUsed = 20, chargesMax = 40, buff = { "Cannot be Stunned" }, },
5757
req = { level = 8, },
5858
}
5959
itemBases["Silver Charm"] = {
@@ -62,7 +62,7 @@ itemBases["Silver Charm"] = {
6262
tags = { flask = true, utility_flask = true, default = true, },
6363
implicit = "Used when you are affected by a Slow",
6464
implicitModTypes = { { }, },
65-
charm = { duration = 3, chargesUsed = 40, chargesMax = 80, buff = { "Your speed is unaffected by Slows" }, },
65+
charm = { duration = 3, chargesUsed = 20, chargesMax = 40, buff = { "Your speed is unaffected by Slows" }, },
6666
req = { level = 10, },
6767
}
6868
itemBases["Ruby Charm"] = {
@@ -71,7 +71,7 @@ itemBases["Ruby Charm"] = {
7171
tags = { flask = true, utility_flask = true, default = true, },
7272
implicit = "Used when you take Fire damage from a Hit",
7373
implicitModTypes = { { }, },
74-
charm = { duration = 4, chargesUsed = 40, chargesMax = 80, buff = { "+25% to Fire Resistance" }, },
74+
charm = { duration = 4, chargesUsed = 20, chargesMax = 40, buff = { "+25% to Fire Resistance" }, },
7575
req = { level = 5, },
7676
}
7777
itemBases["Sapphire Charm"] = {
@@ -80,7 +80,7 @@ itemBases["Sapphire Charm"] = {
8080
tags = { flask = true, utility_flask = true, default = true, },
8181
implicit = "Used when you take Cold damage from a Hit",
8282
implicitModTypes = { { }, },
83-
charm = { duration = 4, chargesUsed = 40, chargesMax = 80, buff = { "+25% to Cold Resistance" }, },
83+
charm = { duration = 4, chargesUsed = 20, chargesMax = 40, buff = { "+25% to Cold Resistance" }, },
8484
req = { level = 5, },
8585
}
8686
itemBases["Topaz Charm"] = {
@@ -89,7 +89,7 @@ itemBases["Topaz Charm"] = {
8989
tags = { flask = true, utility_flask = true, default = true, },
9090
implicit = "Used when you take Lightning damage from a Hit",
9191
implicitModTypes = { { }, },
92-
charm = { duration = 4, chargesUsed = 40, chargesMax = 80, buff = { "+25% to Lightning Resistance" }, },
92+
charm = { duration = 4, chargesUsed = 20, chargesMax = 40, buff = { "+25% to Lightning Resistance" }, },
9393
req = { level = 5, },
9494
}
9595
itemBases["Amethyst Charm"] = {
@@ -98,7 +98,7 @@ itemBases["Amethyst Charm"] = {
9898
tags = { flask = true, utility_flask = true, default = true, },
9999
implicit = "Used when you take Chaos damage from a Hit",
100100
implicitModTypes = { { }, },
101-
charm = { duration = 4, chargesUsed = 60, chargesMax = 80, buff = { "+18% to Chaos Resistance" }, },
101+
charm = { duration = 4, chargesUsed = 30, chargesMax = 40, buff = { "+18% to Chaos Resistance" }, },
102102
req = { level = 40, },
103103
}
104104
itemBases["Golden Charm"] = {

‎src/Data/Bases/soulcore.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ itemBases["Greater Rune of Tithing"] = {
472472
hidden = true,
473473
tags = { default = true, },
474474
implicitModTypes = { },
475-
implicit = "Martial Weapons: Meta Skills gain 10% increased Energy\nArmour: 1 to 10 Lightning Thorns damage",
475+
implicit = "Martial Weapons: Meta Skills gain 10% increased Energy\nArmour: 1 to 100 Lightning Thorns damage",
476476
req = { level = 65, },
477477
}
478478
itemBases["Greater Rune of Alacrity"] = {

‎src/Data/Gems.lua‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,9 +1312,10 @@ return {
13121312
projectile = true,
13131313
sustained = true,
13141314
lightning = true,
1315+
chaining = true,
13151316
},
13161317
gemType = "Spell",
1317-
tagString = "AoE, Projectile, Sustained, Lightning",
1318+
tagString = "AoE, Projectile, Sustained, Lightning, Chaining",
13181319
reqStr = 0,
13191320
reqDex = 0,
13201321
reqInt = 100,
@@ -8549,9 +8550,10 @@ return {
85498550
lightning = true,
85508551
cold = true,
85518552
fire = true,
8553+
duration = true,
85528554
},
85538555
gemType = "Buff",
8554-
tagString = "Persistent, Physical, Lightning, Cold, Fire",
8556+
tagString = "Persistent, Physical, Lightning, Cold, Fire, Duration",
85558557
weaponRequirements = "Crossbow",
85568558
reqStr = 50,
85578559
reqDex = 50,

‎src/Data/Misc.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ data.gameConstants = {
4040
["PartyUniqueBonusPerAdditionalPlayer"] = 1,
4141
["LightStunMinimumChance"] = 20,
4242
["LightStunRatioScale"] = 92,
43-
["LightStunMinimumChancePlayer"] = 11,
44-
["LightStunRatioScalePlayer"] = 110,
43+
["LightStunMinimumChancePlayer"] = 12,
44+
["LightStunRatioScalePlayer"] = 146,
4545
["HeavyStunDamageScale"] = 0.87,
4646
["HeavyStunThresholdModifier"] = 500,
4747
["HeavyStunModifierDuration"] = 16.5,

0 commit comments

Comments
 (0)