Skip to content

Commit e63f5a8

Browse files
author
LocalIdentity
committed
Fix PR
Removed changes from exporting using the wrong game version Also fix issue with Charged Dash of Projection
1 parent f987cad commit e63f5a8

6 files changed

Lines changed: 24 additions & 22 deletions

File tree

src/Data/Skills/act_dex.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4037,10 +4037,10 @@ skills["ChargedDash"] = {
40374037
},
40384038
},
40394039
preDamageFunc = function(activeSkill, output)
4040-
if activeSkill.skillPart == 3 then
4041-
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
4042-
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
4043-
end
4040+
if activeSkill.skillPart == 3 then
4041+
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
4042+
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
4043+
end
40444044
end,
40454045
statMap = {
40464046
["base_skill_show_average_damage_instead_of_dps"] = {
@@ -4164,10 +4164,10 @@ skills["ChargedDashAltX"] = {
41644164
},
41654165
},
41664166
preDamageFunc = function(activeSkill, output)
4167-
if activeSkill.skillPart == 3 then
4168-
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
4169-
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashofProjection", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
4170-
end
4167+
if activeSkill.skillPart == 3 then
4168+
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
4169+
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashAltX", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
4170+
end
41714171
end,
41724172
statMap = {
41734173
["base_skill_show_average_damage_instead_of_dps"] = {

src/Data/Skills/act_int.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8567,7 +8567,7 @@ skills["FrostblinkAltX"] = {
85678567
baseEffectiveness = 1.6200000047684,
85688568
incrementalEffectiveness = 0.047499999403954,
85698569
description = "Teleport to a location, damaging enemies in an area at both ends of the teleport. Deals higher damage to chilled enemies, then removes chill from them. Cannot be supported by Unleash.",
8570-
skillTypes = { [SkillType.Spell] = true, [SkillType.Movement] = true, [SkillType.Triggerable] = true, [SkillType.Cold] = true, [SkillType.Travel] = true, [SkillType.Area] = true, [SkillType.Triggerable] = true, [SkillType.Damage] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.DynamicCooldown] = true, },
8570+
skillTypes = { [SkillType.Spell] = true, [SkillType.Movement] = true, [SkillType.Triggerable] = true, [SkillType.Cold] = true, [SkillType.Travel] = true, [SkillType.Area] = true, [SkillType.Triggerable] = true, [SkillType.Damage] = true, [SkillType.Totemable] = true, [SkillType.Trappable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.DynamicCooldown] = true, [SkillType.AreaSpell] = true, },
85718571
statDescriptionScope = "skill_stat_descriptions",
85728572
castTime = 0.85,
85738573
statMap = {
@@ -15597,6 +15597,7 @@ skills["RaiseZombieAltY"] = {
1559715597
"infinite_minion_duration",
1559815598
"quality_display_raise_zombie_is_gem",
1559915599
"raise_zombie_does_not_use_corpses",
15600+
"dont_replace_minion_if_level_changed",
1560015601
},
1560115602
levels = {
1560215603
[1] = { 1, levelRequirement = 1, statInterpolation = { 1, }, cost = { Mana = 6, }, },

src/Data/Skills/other.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2508,6 +2508,7 @@ skills["MistyReflection"] = {
25082508
"skill_cannot_be_knocked_back",
25092509
"skill_cannot_be_stunned",
25102510
"spell_cast_time_cannot_be_modified",
2511+
"disable_skill_repeats",
25112512
},
25122513
notMinionStat = {
25132514
"base_cooldown_speed_+%",

src/Data/Skills/spectre.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7953,7 +7953,7 @@ skills["AzmeriBasiliskShoulderMortar"] = {
79537953
{ "projectile_spread_radius", 8 },
79547954
{ "projectile_minimum_range", 15 },
79557955
{ "skill_physical_damage_%_to_convert_to_chaos", 60 },
7956-
{ "base_poison_duration_+%", 100 },
7956+
{ "active_skill_poison_duration_+%_final", 100 },
79577957
{ "base_chance_to_poison_on_hit_%", 60 },
79587958
},
79597959
stats = {
@@ -8034,7 +8034,7 @@ skills["AzmeriBasiliskDecapitateRightToLeft"] = {
80348034
},
80358035
constantStats = {
80368036
{ "skill_physical_damage_%_to_convert_to_chaos", 40 },
8037-
{ "base_poison_duration_+%", 50 },
8037+
{ "active_skill_poison_duration_+%_final", 50 },
80388038
{ "base_poison_damage_+%", 0 },
80398039
{ "base_chance_to_poison_on_hit_%", 40 },
80408040
},
@@ -8141,7 +8141,7 @@ skills["AzmeriBasiliskDualProjectileImpact"] = {
81418141
},
81428142
constantStats = {
81438143
{ "skill_physical_damage_%_to_convert_to_chaos", 40 },
8144-
{ "base_poison_duration_+%", 50 },
8144+
{ "active_skill_poison_duration_+%_final", 50 },
81458145
{ "base_chance_to_poison_on_hit_%", 60 },
81468146
},
81478147
stats = {
@@ -8197,7 +8197,7 @@ skills["AzmeriBasiliskShoulderMortar2"] = {
81978197
{ "projectile_spread_radius", 13 },
81988198
{ "projectile_minimum_range", 15 },
81998199
{ "skill_physical_damage_%_to_convert_to_chaos", 60 },
8200-
{ "base_poison_duration_+%", 100 },
8200+
{ "active_skill_poison_duration_+%_final", 100 },
82018201
{ "base_chance_to_poison_on_hit_%", 60 },
82028202
},
82038203
stats = {

src/Data/Skills/sup_str.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4409,7 +4409,7 @@ skills["TriggeredSupportPyre"] = {
44094409
name = "Call the Pyre",
44104410
baseTypeName = "Call the Pyre",
44114411
color = 1,
4412-
description = "Calls forth pillars of ashen flame. These pillars deal Fire damage in an area, and cover Enemies they hit in Ash.",
4412+
description = "Calls forth pillars of ashen flame. These pillars deal Fire damage in an area, and cover Enemies they hit in Ash. Requires a Melee Weapon or Unarmed.",
44134413
skillTypes = { [SkillType.Fire] = true, [SkillType.Area] = true, [SkillType.Attack] = true, [SkillType.Cooldown] = true, [SkillType.Triggerable] = true, [SkillType.Triggered] = true, [SkillType.InbuiltTrigger] = true, [SkillType.SkillGrantedBySupport] = true, },
44144414
weaponTypes = {
44154415
["Claw"] = true,

src/Export/Skills/act_dex.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -687,10 +687,10 @@ local skills, mod, flag, skill = ...
687687
},
688688
},
689689
preDamageFunc = function(activeSkill, output)
690-
if activeSkill.skillPart == 3 then
691-
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
692-
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
693-
end
690+
if activeSkill.skillPart == 3 then
691+
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
692+
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
693+
end
694694
end,
695695
statMap = {
696696
["base_skill_show_average_damage_instead_of_dps"] = {
@@ -729,10 +729,10 @@ local skills, mod, flag, skill = ...
729729
},
730730
},
731731
preDamageFunc = function(activeSkill, output)
732-
if activeSkill.skillPart == 3 then
733-
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
734-
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashofProjection", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
735-
end
732+
if activeSkill.skillPart == 3 then
733+
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
734+
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashAltX", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
735+
end
736736
end,
737737
statMap = {
738738
["base_skill_show_average_damage_instead_of_dps"] = {

0 commit comments

Comments
 (0)