Skip to content

Commit 9cc9118

Browse files
LocalIdentityLocalIdentity
andauthored
Fix display of some stats in gem tooltip (#1304)
GGG added a new variant in the stat description files that is meant to be used only for gem quality tooltips. We were not handling it properly before so if the same stat existed on the gem, the display for the stat was broken too. e.g. Arc showed "Chains an additional time" instead of "Chains 9 times" Now properly handled in the stat export and in stat describer Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 6fcde03 commit 9cc9118

28 files changed

Lines changed: 293 additions & 16 deletions

src/Classes/GemSelectControl.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
651651
if grantedEffectLevel.baseMultiplier then
652652
self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Damage: ^7%g%% of base", grantedEffectLevel.baseMultiplier * 100))
653653
end
654-
else
654+
elseif not grantedEffect.hidden then
655655
if grantedEffect.castTime > 0 then
656656
self.tooltip:AddLine(16, string.format("^x7F7F7FCast Time: ^7%.2f sec", grantedEffect.castTime))
657657
else

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/ancestral_cry_projectile.lua

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,38 @@ return {
6969
[6]={
7070
[1]={
7171
[1]={
72+
["gem_quality"]=true,
7273
limit={
74+
[1]={
75+
[1]=1,
76+
[2]=1
77+
},
78+
[2]={
79+
[1]="#",
80+
[2]="#"
81+
},
82+
[3]={
83+
[1]=0,
84+
[2]=0
85+
}
7386
},
7487
text="Fires {0:+d} Molten Projectile"
7588
},
7689
[2]={
90+
["gem_quality"]=true,
7791
limit={
92+
[1]={
93+
[1]="#",
94+
[2]="#"
95+
},
96+
[2]={
97+
[1]="#",
98+
[2]="#"
99+
},
100+
[3]={
101+
[1]=0,
102+
[2]=0
103+
}
78104
},
79105
text="Fires {0:+d} Molten Projectiles"
80106
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/ancestral_cry_statset_0.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,12 @@ return {
114114
[9]={
115115
[1]={
116116
[1]={
117+
["gem_quality"]=true,
117118
limit={
119+
[1]={
120+
[1]="#",
121+
[2]="#"
122+
}
118123
},
119124
text="{0:+d}% increased Warcry duration per Endurance Charge consumed"
120125
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/ball_lightning_statset_2.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ return {
99
k="divide_by_ten_1dp_if_required",
1010
v=1
1111
},
12+
["gem_quality"]=true,
1213
limit={
14+
[1]={
15+
[1]=10,
16+
[2]=10
17+
}
1318
},
1419
text="{0:+d} metre to Ignited Ground radius"
1520
},
@@ -18,7 +23,12 @@ return {
1823
k="divide_by_ten_1dp_if_required",
1924
v=1
2025
},
26+
["gem_quality"]=true,
2127
limit={
28+
[1]={
29+
[1]="#",
30+
[2]="#"
31+
}
2232
},
2333
text="{0:+d} metres to Ignited Ground radius"
2434
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/bone_cone.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,12 @@ return {
134134
[4]={
135135
[1]={
136136
[1]={
137+
["gem_quality"]=true,
137138
limit={
139+
[1]={
140+
[1]="#",
141+
[2]="#"
142+
}
138143
},
139144
text="Minions have {0}% increased Movement Speed"
140145
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/burst_shot_incendiary.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,12 @@ return {
6868
[7]={
6969
[1]={
7070
[1]={
71+
["gem_quality"]=true,
7172
limit={
73+
[1]={
74+
[1]="#",
75+
[2]="#"
76+
}
7277
},
7378
text="{0:+d}% increased Ignite duration for each Fragment in a single hit"
7479
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/create_mirage.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ return {
3838
k="milliseconds_to_seconds_2dp_if_required",
3939
v=1
4040
},
41+
["gem_quality"]=true,
4142
limit={
43+
[1]={
44+
[1]="#",
45+
[2]="#"
46+
}
4247
},
4348
text="{0:+d} seconds to Mirage duration"
4449
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/dark_effigy_projectile.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ return {
1414
k="divide_by_ten_1dp_if_required",
1515
v=1
1616
},
17+
["gem_quality"]=true,
1718
limit={
19+
[1]={
20+
[1]=10,
21+
[2]=10
22+
}
1823
},
1924
text="{0:+d} metre to Impact radius"
2025
},
@@ -23,7 +28,12 @@ return {
2328
k="divide_by_ten_1dp_if_required",
2429
v=1
2530
},
31+
["gem_quality"]=true,
2632
limit={
33+
[1]={
34+
[1]="#",
35+
[2]="#"
36+
}
2737
},
2838
text="{0:+d} metres to Impact radius"
2939
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/feast_of_flesh.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,22 @@ return {
9696
[4]={
9797
[1]={
9898
[1]={
99+
["gem_quality"]=true,
99100
limit={
101+
[1]={
102+
[1]=1,
103+
[2]=1
104+
}
100105
},
101106
text="Consumes {0:+d} Corpse"
102107
},
103108
[2]={
109+
["gem_quality"]=true,
104110
limit={
111+
[1]={
112+
[1]="#",
113+
[2]="#"
114+
}
105115
},
106116
text="Consumes {0:+d} Corpses"
107117
},

src/Data/StatDescriptions/Specific_Skill_Stat_Descriptions/foresight.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ return {
2929
k="milliseconds_to_seconds_2dp_if_required",
3030
v=1
3131
},
32+
["gem_quality"]=true,
3233
limit={
34+
[1]={
35+
[1]="#",
36+
[2]="#"
37+
}
3338
},
3439
text="{0:+d} seconds to Beyond Sight duration"
3540
},

0 commit comments

Comments
 (0)