Skip to content

Commit dc92ed3

Browse files
LocalIdentityLocalIdentity
andauthored
Fix crash when checking the breakdown for a number of skill (#7116)
I didn't realise that "Skill:..." used the internal skill name instead of the one we display to players Fixes tooltips for: * Cyclone of Tumult * Eye of Winter of Finality * Eye of Winter of Transience * Frost Bomb of Forthcoming * Infernal Blow of Immolation Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent a0d7682 commit dc92ed3

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

src/Data/Skills/act_dex.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4189,7 +4189,7 @@ skills["CycloneAltX"] = {
41894189
else -- unarmed
41904190
range = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRange") + 10 * activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRangeMetre")
41914191
end
4192-
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneofTumult")
4192+
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneAltX")
41934193
end,
41944194
statMap = {
41954195
["cyclone_max_number_of_stages"] = {

src/Data/Skills/act_int.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5164,7 +5164,7 @@ skills["EyeOfWinterAltX"] = {
51645164
statDescriptionScope = "skill_stat_descriptions",
51655165
castTime = 0.8,
51665166
preDamageFunc = function(activeSkill, output)
5167-
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterofFinality", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
5167+
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterAltX", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
51685168
end,
51695169
statMap = {
51705170
["freezing_pulse_damage_+%_final_at_long_range"] = {
@@ -5254,7 +5254,7 @@ skills["EyeOfWinterAltY"] = {
52545254
statDescriptionScope = "skill_stat_descriptions",
52555255
castTime = 0.8,
52565256
preDamageFunc = function(activeSkill, output)
5257-
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterofTransience", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
5257+
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterAltY", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
52585258
end,
52595259
statMap = {
52605260
["freezing_pulse_damage_+%_final_at_long_range"] = {
@@ -7406,7 +7406,7 @@ skills["FrostBombAltY"] = {
74067406
castTime = 0.5,
74077407
preDamageFunc = function(activeSkill, output)
74087408
local duration = math.floor(activeSkill.skillData.duration * output.DurationMod * 10)
7409-
activeSkill.skillModList:NewMod("Multiplier:100msFrostBombDuration", "BASE", duration, "Skill:FrostBombofForthcoming")
7409+
activeSkill.skillModList:NewMod("Multiplier:100msFrostBombDuration", "BASE", duration, "Skill:FrostBombAltY")
74107410
end,
74117411
statMap = {
74127412
["active_skill_hit_damage_+%_final_per_100ms_duration"] = {

src/Data/Skills/act_str.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6358,7 +6358,7 @@ skills["InfernalBlowAltX"] = {
63586358
preDamageFunc = function(activeSkill, output)
63596359
local effect = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "DebuffEffect")
63606360
if activeSkill.skillPart == 2 or activeSkill.skillPart == 3 then
6361-
activeSkill.skillModList:NewMod("Damage", "MORE", effect, "Skill:InfernalBlowofImmolation", 0, { type = "Multiplier", var = "DebuffStack", base = -100 + effect })
6361+
activeSkill.skillModList:NewMod("Damage", "MORE", effect, "Skill:InfernalBlowAltX", 0, { type = "Multiplier", var = "DebuffStack", base = -100 + effect })
63626362
end
63636363
if activeSkill.skillPart == 3 then
63646364
activeSkill.skillData.dpsMultiplier = 1 / 6

src/Export/Skills/act_dex.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ local skills, mod, flag, skill = ...
803803
else -- unarmed
804804
range = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRange") + 10 * activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "UnarmedRangeMetre")
805805
end
806-
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneofTumult")
806+
activeSkill.skillModList:NewMod("Multiplier:AdditionalMeleeRange", "BASE", range, "Skill:CycloneAltX")
807807
end,
808808
statMap = {
809809
["cyclone_max_number_of_stages"] = {

src/Export/Skills/act_int.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ local skills, mod, flag, skill = ...
10381038
#skill EyeOfWinterAltX
10391039
#flags spell projectile
10401040
preDamageFunc = function(activeSkill, output)
1041-
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterofFinality", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
1041+
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterAltX", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
10421042
end,
10431043
statMap = {
10441044
["freezing_pulse_damage_+%_final_at_long_range"] = {
@@ -1056,7 +1056,7 @@ local skills, mod, flag, skill = ...
10561056
#skill EyeOfWinterAltY
10571057
#flags spell projectile
10581058
preDamageFunc = function(activeSkill, output)
1059-
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterofTransience", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
1059+
activeSkill.skillModList:NewMod("Damage", "MORE", activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "EyeOfWinterRamp"), "Skill:EyeOfWinterAltY", { type = "DistanceRamp", ramp = {{0,0},{60*output.ProjectileSpeedMod,1}} })
10601060
end,
10611061
statMap = {
10621062
["freezing_pulse_damage_+%_final_at_long_range"] = {
@@ -1553,7 +1553,7 @@ local skills, mod, flag, skill = ...
15531553
#flags spell area duration
15541554
preDamageFunc = function(activeSkill, output)
15551555
local duration = math.floor(activeSkill.skillData.duration * output.DurationMod * 10)
1556-
activeSkill.skillModList:NewMod("Multiplier:100msFrostBombDuration", "BASE", duration, "Skill:FrostBombofForthcoming")
1556+
activeSkill.skillModList:NewMod("Multiplier:100msFrostBombDuration", "BASE", duration, "Skill:FrostBombAltY")
15571557
end,
15581558
statMap = {
15591559
["active_skill_hit_damage_+%_final_per_100ms_duration"] = {

src/Export/Skills/act_str.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ local skills, mod, flag, skill = ...
11361136
preDamageFunc = function(activeSkill, output)
11371137
local effect = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "DebuffEffect")
11381138
if activeSkill.skillPart == 2 or activeSkill.skillPart == 3 then
1139-
activeSkill.skillModList:NewMod("Damage", "MORE", effect, "Skill:InfernalBlowofImmolation", 0, { type = "Multiplier", var = "DebuffStack", base = -100 + effect })
1139+
activeSkill.skillModList:NewMod("Damage", "MORE", effect, "Skill:InfernalBlowAltX", 0, { type = "Multiplier", var = "DebuffStack", base = -100 + effect })
11401140
end
11411141
if activeSkill.skillPart == 3 then
11421142
activeSkill.skillData.dpsMultiplier = 1 / 6

src/Modules/CalcPerform.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ function calcs.perform(env, fullDPSSkipEHP)
10731073
-- Need to calc the duration here as the AoE mod is calculated before Duration in CalcOffence and won't work
10741074
local full_duration = calcSkillDuration(activeSkill.skillModList, activeSkill.skillCfg, activeSkill.skillData, env, enemyDB)
10751075
local durationMulti = m_floor(full_duration * 10)
1076-
activeSkill.skillModList:NewMod("Multiplier:100msEarthquakeDuration", "BASE", durationMulti, "Skill:EarthquakeofAmplification")
1076+
activeSkill.skillModList:NewMod("Multiplier:100msEarthquakeDuration", "BASE", durationMulti, "Skill:EarthquakeAltX")
10771077
end
10781078
if activeSkill.skillData.supportBonechill and (activeSkill.skillTypes[SkillType.ChillingArea] or activeSkill.skillTypes[SkillType.NonHitChill] or not activeSkill.skillModList:Flag(nil, "CannotChill")) then
10791079
output.HasBonechill = true

0 commit comments

Comments
 (0)