Skip to content

Commit ab70053

Browse files
LocalIdentityLocalIdentity
LocalIdentity
and
LocalIdentity
authored
Fix Stat descriptions on gem tooltips and crit node on tree (#909)
The `table_only` entries in the stat description files are not needed afaik and they cause issues with the order of stats With them removed we can revert the fix in StatDescriber, as that also causes issues for stats that have multiple entries Fixes the tree export for `Critical Damage Bonus against Enemies that are on Full Life` as that previously had a `table_only` value as the first stat description which was causing an issue Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent c692de7 commit ab70053

File tree

282 files changed

+161
-10596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+161
-10596
lines changed

‎src/Data/ModCache.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ c["100% increased Block chance against Projectiles"]={{[1]={flags=0,keywordFlags
10381038
c["100% increased Chance to be afflicted by Ailments when Hit"]={{}," Chance to be afflicted by Ailments when Hit "}
10391039
c["100% increased Chance to be afflicted by Ailments when Hit 20% increased Movement Speed while affected by an Ailment"]={{[1]={[1]={type="Condition",varList={[1]="Bleeding",[2]="Poisoned",[3]="Ignited",[4]="Chilled",[5]="Frozen",[6]="Shocked",[7]="Electrocuted"}},flags=0,keywordFlags=0,name="MovementSpeed",type="INC",value=100}}," Chance to be afflicted by Ailments when Hit 20% increased "}
10401040
c["100% increased Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamage",type="INC",value=100}},nil}
1041+
c["100% increased Critical Damage Bonus against Enemies that are on Full Life"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="FullLife"},flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=100}},nil}
10411042
c["100% increased Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=100}},nil}
10421043
c["100% increased Critical Hit Chance against Enemies on Full Life"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="FullLife"},flags=0,keywordFlags=0,name="CritChance",type="INC",value=100}},nil}
10431044
c["100% increased Culling Strike Threshold"]={{}," Culling Strike Threshold "}
@@ -2162,6 +2163,7 @@ c["40% increased Chill Duration on Enemies"]={{[1]={flags=0,keywordFlags=0,name=
21622163
c["40% increased Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamage",type="INC",value=40}},nil}
21632164
c["40% increased Cooldown Recovery Rate"]={{[1]={flags=0,keywordFlags=0,name="CooldownRecovery",type="INC",value=40}},nil}
21642165
c["40% increased Critical Damage Bonus"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=40}},nil}
2166+
c["40% increased Critical Damage Bonus against Enemies that are on Full Life"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="FullLife"},flags=0,keywordFlags=0,name="CritMultiplier",type="INC",value=40}},nil}
21652167
c["40% increased Critical Damage Bonus with One Handed Melee Weapons"]={{[1]={flags=21474836484,keywordFlags=0,name="CritMultiplier",type="INC",value=40}},nil}
21662168
c["40% increased Critical Damage Bonus with Spears"]={{[1]={flags=268435460,keywordFlags=0,name="CritMultiplier",type="INC",value=40}},nil}
21672169
c["40% increased Critical Hit Chance"]={{[1]={flags=0,keywordFlags=0,name="CritChance",type="INC",value=40}},nil}
@@ -3613,8 +3615,6 @@ c["Converts all Energy Shield to Mana"]={{[1]={flags=0,keywordFlags=0,name="Ener
36133615
c["Converts all Evasion Rating to Armour"]={{[1]={flags=0,keywordFlags=0,name="IronReflexes",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="EvasionConvertToArmour",type="BASE",value=100}},nil}
36143616
c["Corrupted Blood cannot be inflicted on you"]={{[1]={flags=0,keywordFlags=0,name="CorruptedBloodImmune",type="FLAG",value=true}},nil}
36153617
c["Creates Consecrated Ground on use"]={{},nil}
3616-
c["Critical Damage Bonus vs full life enemies 100%"]={nil,"Critical Damage Bonus vs full life enemies 100% "}
3617-
c["Critical Damage Bonus vs full life enemies 40%"]={nil,"Critical Damage Bonus vs full life enemies 40% "}
36183618
c["Critical Hits Ignore Enemy Monster Lightning Resistance"]={{[1]={[1]={type="Condition",var="CriticalStrike"},flags=0,keywordFlags=0,name="IgnoreLightningResistance",type="FLAG",value=true}},nil}
36193619
c["Critical Hits Poison the enemy"]={nil,"Critical Hits Poison the enemy "}
36203620
c["Critical Hits cannot Extract Impale"]={nil,"Critical Hits cannot Extract Impale "}

‎src/Data/ModScalability.lua‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7351,7 +7351,6 @@ return {
73517351
["Cremation can have up to # additional Geysers at a time"] = { { isScalable = true } },
73527352
["Crimson Assault"] = { },
73537353
["Crimson Dance"] = { },
7354-
["Critical Damage Bonus vs full life enemies #%"] = { { isScalable = true } },
73557354
["Critical Hit Chance is #% for Hits with this Weapon"] = { { isScalable = true } },
73567355
["Critical Hit Chance is increased by Lightning Resistance"] = { },
73577356
["Critical Hit Chance is increased by Overcapped Lightning Resistance"] = { },
@@ -7538,7 +7537,6 @@ return {
75387537
["Deals # to # Physical Damage"] = { { isScalable = true }, { isScalable = true } },
75397538
["Deals #% of current Mana as Chaos Damage to you when Effect ends"] = { { isScalable = true } },
75407539
["Deals base Chaos Damage equal to #% of your Current Mana"] = { { isScalable = true } },
7541-
["Death delay at 0 Life #s"] = { { isScalable = true, formats = { "milliseconds_to_seconds" } } },
75427540
["Debilitate Enemies for # Seconds when you Suppress their Spell Damage"] = { { isScalable = true, formats = { "milliseconds_to_seconds_2dp_if_required" } } },
75437541
["Debilitate Enemies for 1 second on Hit"] = { },
75447542
["Debilitate nearby Enemies for # Seconds when Effect ends"] = { { isScalable = true } },
@@ -9066,7 +9064,6 @@ return {
90669064
["Ignite on Enemies you Kill Spreads to other Enemies within # metres"] = { { isScalable = false, formats = { "divide_by_ten_1dp_if_required" } } },
90679065
["Ignited Enemies Burn #% slower"] = { { isScalable = true } },
90689066
["Ignited Enemies Killed by your Hits are destroyed"] = { },
9069-
["Ignites enemies within #m radius as though dealing # Fire damage"] = { { isScalable = true, formats = { "divide_by_ten_1dp_if_required" } }, { isScalable = true } },
90709067
["Ignites you cause are reflected back to you"] = { },
90719068
["Ignites you inflict deal Damage #% faster"] = { { isScalable = true } },
90729069
["Ignites you inflict spread to other Enemies that stay within # metre for 2 seconds"] = { { isScalable = true, formats = { "divide_by_ten_1dp_if_required" } } },
@@ -9727,7 +9724,6 @@ return {
97279724
["Maximum Critical Hit Chance is 50%"] = { },
97289725
["Maximum Energy Shield is zero"] = { },
97299726
["Maximum Life of Summoned Elemental Golems is Doubled"] = { },
9730-
["Maximum Life taken as Fire damage per second #%"] = { { isScalable = true, formats = { "per_minute_to_per_second" } } },
97319727
["Maximum Mana is replaced by Maximum Infernal Flame\nGain Infernal Flame instead of spending Mana for Skill costs"] = { },
97329728
["Maximum Physical Damage Reduction is 50%"] = { },
97339729
["Maximum Power Charges is 0"] = { },
@@ -10235,9 +10231,6 @@ return {
1023510231
["Monsters' Melee Attacks apply random Hexes on Hit"] = { },
1023610232
["Monsters' Projectiles always Pierce"] = { },
1023710233
["Monsters' skills Chain # additional times"] = { { isScalable = true } },
10238-
["More Elemental Ailment buildup while Unbound #%"] = { { isScalable = true } },
10239-
["More Elemental Ailment chance while Unbound #%"] = { { isScalable = true } },
10240-
["More Elemental Damage while Unbound #%"] = { { isScalable = true } },
1024110234
["Movement Attack Skills have #% increased Attack Speed"] = { { isScalable = true } },
1024210235
["Movement Attack Skills have #% reduced Attack Speed"] = { { isScalable = true, formats = { "negate" } } },
1024310236
["Movement Skills Cost no Mana"] = { },
@@ -12615,7 +12608,6 @@ return {
1261512608
["Unattached Brands gain #% increased Brand Attachment Range per second, up to 100%"] = { { isScalable = true } },
1261612609
["Unattached Brands gain #% reduced Brand Attachment Range per second"] = { { isScalable = true, formats = { "negate" } } },
1261712610
["Unblockable"] = { },
12618-
["Unbound Fury gain interval per Ailment 0.2s"] = { },
1261912611
["Undead Minions count as Demons"] = { },
1262012612
["Undead Minions have #% increased Reservation"] = { { isScalable = true } },
1262112613
["Undead Minions have #% reduced Reservation"] = { { isScalable = true, formats = { "negate" } } },

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/add_buff_to_target.lua‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@ return {
2424
},
2525
[2]={
2626
[1]={
27-
[1]={
28-
[1]={
29-
k="milliseconds_to_seconds_2dp_if_required",
30-
v=1
31-
},
32-
limit={
33-
[1]={
34-
[1]="#",
35-
[2]="#"
36-
}
37-
},
38-
text="Regeneration duration {0}s"
39-
}
4027
},
4128
stats={
4229
[1]="skill_effect_duration"

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/advancing_strike.lua‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@ return {
99
},
1010
[2]={
1111
[1]={
12-
[1]={
13-
[1]={
14-
k="divide_by_ten_1dp_if_required",
15-
v=1
16-
},
17-
limit={
18-
[1]={
19-
[1]="#",
20-
[2]="#"
21-
}
22-
},
23-
text="Explosion radius {0}m"
24-
}
2512
},
2613
stats={
2714
[1]="active_skill_area_of_effect_radius"
@@ -106,15 +93,6 @@ return {
10693
[4]={
10794
[1]={
10895
[1]={
109-
limit={
110-
[1]={
111-
[1]="#",
112-
[2]="#"
113-
}
114-
},
115-
text="Additional Physical Attack Damage from Blood Loss {0}%"
116-
},
117-
[2]={
11896
limit={
11997
[1]={
12098
[1]="#",
@@ -131,19 +109,6 @@ return {
131109
[5]={
132110
[1]={
133111
[1]={
134-
limit={
135-
[1]={
136-
[1]="#",
137-
[2]="#"
138-
},
139-
[2]={
140-
[1]="#",
141-
[2]="#"
142-
}
143-
},
144-
text="More area of effect per {1} Blood Loss Consumed {0}% (max 500%)"
145-
},
146-
[2]={
147112
limit={
148113
[1]={
149114
[1]="#",

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/ailment_bearer.lua‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@ return {
3737
},
3838
[2]={
3939
[1]={
40-
[1]={
41-
[1]={
42-
k="milliseconds_to_seconds_2dp_if_required",
43-
v=1
44-
},
45-
limit={
46-
[1]={
47-
[1]="#",
48-
[2]="#"
49-
}
50-
},
51-
text="Unbound duration {0}s"
52-
}
5340
},
5441
stats={
5542
[1]="skill_effect_duration"

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/alchemist_boon.lua‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ return {
55
[1]={
66
[1]={
77
[1]={
8-
limit={
9-
[1]={
10-
[1]="#",
11-
[2]="#"
12-
}
13-
},
14-
text="Flask recovery granted to Allies {0}%"
15-
},
16-
[2]={
178
limit={
189
[1]={
1910
[1]="#",
@@ -30,19 +21,6 @@ return {
3021
[2]={
3122
[1]={
3223
[1]={
33-
[1]={
34-
k="per_minute_to_per_second_2dp_if_required",
35-
v=1
36-
},
37-
limit={
38-
[1]={
39-
[1]="#",
40-
[2]="#"
41-
}
42-
},
43-
text="Flask charges per second {0}"
44-
},
45-
[2]={
4624
[1]={
4725
k="per_minute_to_per_second_2dp_if_required",
4826
v=1

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/archmage.lua‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,13 @@ return {
4040
},
4141
[3]={
4242
[1]={
43-
[1]={
44-
limit={
45-
[1]={
46-
[1]="#",
47-
[2]="#"
48-
}
49-
},
50-
text="Non-Channelling Spell additional Mana cost {0}"
51-
}
5243
},
5344
stats={
5445
[1]="archmage_non_channelled_spell_mana_cost_+"
5546
}
5647
},
5748
[4]={
5849
[1]={
59-
[1]={
60-
limit={
61-
[1]={
62-
[1]="#",
63-
[2]="#"
64-
}
65-
},
66-
text="Non-Channelling Spell damage Gained as Lightning {0}%"
67-
}
6850
},
6951
stats={
7052
[1]="archmage_all_damage_%_to_gain_as_lightning_to_grant_to_non_channelling_spells"

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/armour_explosion.lua‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@
44
return {
55
[1]={
66
[1]={
7-
[1]={
8-
[1]={
9-
k="divide_by_ten_1dp_if_required",
10-
v=1
11-
},
12-
limit={
13-
[1]={
14-
[1]="#",
15-
[2]="#"
16-
}
17-
},
18-
text="Explosion radius {0}m"
19-
}
207
},
218
stats={
229
[1]="active_skill_area_of_effect_radius"

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/artillery_ballista_projectile.lua‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@ return {
3737
},
3838
[2]={
3939
[1]={
40-
[1]={
41-
[1]={
42-
k="divide_by_ten_1dp_if_required",
43-
v=1
44-
},
45-
limit={
46-
[1]={
47-
[1]="#",
48-
[2]="#"
49-
}
50-
},
51-
text="Bolt explosion radius {0}m"
52-
}
5340
},
5441
stats={
5542
[1]="active_skill_secondary_area_of_effect_radius"

‎src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/attrition.lua‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ return {
55
[1]={
66
[1]={
77
[1]={
8-
limit={
9-
[1]={
10-
[1]="#",
11-
[2]="#"
12-
}
13-
},
14-
text="Culling Strike time in Presence requirement {0}s"
15-
},
16-
[2]={
178
limit={
189
[1]={
1910
[1]="#",
@@ -30,19 +21,6 @@ return {
3021
[2]={
3122
[1]={
3223
[1]={
33-
limit={
34-
[1]={
35-
[1]=1,
36-
[2]="#"
37-
},
38-
[2]={
39-
[1]=1,
40-
[2]="#"
41-
}
42-
},
43-
text="Hit damage for every 2 seconds in Presence (max) {0}% ({1}%)"
44-
},
45-
[2]={
4624
limit={
4725
[1]={
4826
[1]=1,

0 commit comments

Comments
 (0)