Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for spark maximum hits mode #7690

Merged
merged 4 commits into from
Jul 21, 2024
Merged

Add support for spark maximum hits mode #7690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34a2136
add support for spark maximum hits mode
Nerotox Jul 16, 2024
ffc8827
revert auto-gen frostbolt change
Nerotox Jul 16, 2024
7302bd2
fix calc issue with DPS Multiplier output
Nerotox Jul 16, 2024
6ea0640
fix output calc
Nerotox Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14975,6 +14975,21 @@ skills["Spark"] = {
skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Lightning] = true, [SkillType.CanRapidFire] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 0.65,
parts = {
{
name = "1 Hit",
},
{
name = "Maximum Hits",
},
},
preDamageFunc = function(activeSkill, output)
local skillData = activeSkill.skillData
if activeSkill.skillPart == 2 then
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * math.floor( output.Duration / 0.66 )
output.SkillDPSMultiplier = skillData.dpsMultiplier
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could never be 1, since we set skillData.dpsMultiplier right above it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

end
end,
baseFlags = {
spell = true,
projectile = true,
Expand Down Expand Up @@ -15048,6 +15063,21 @@ skills["SparkAltX"] = {
skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Lightning] = true, [SkillType.CanRapidFire] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 0.75,
parts = {
{
name = "1 Hit",
},
{
name = "Maximum Hits",
},
},
preDamageFunc = function(activeSkill, output)
local skillData = activeSkill.skillData
if activeSkill.skillPart == 2 then
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * math.floor( output.Duration / 0.66 )
output.SkillDPSMultiplier = skillData.dpsMultiplier
end
end,
baseFlags = {
spell = true,
projectile = true,
Expand Down Expand Up @@ -15123,6 +15153,21 @@ skills["SparkAltY"] = {
skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Damage] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Lightning] = true, [SkillType.CanRapidFire] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 0.65,
parts = {
{
name = "1 Hit",
},
{
name = "Maximum Hits",
},
},
preDamageFunc = function(activeSkill, output)
local skillData = activeSkill.skillData
if activeSkill.skillPart == 2 then
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * math.floor( output.Duration / 0.66 )
output.SkillDPSMultiplier = skillData.dpsMultiplier
end
end,
baseFlags = {
spell = true,
projectile = true,
Expand Down
45 changes: 45 additions & 0 deletions src/Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3372,14 +3372,59 @@ local skills, mod, flag, skill = ...

#skill Spark
#flags spell projectile duration
parts = {
{
name = "1 Hit",
},
{
name = "Maximum Hits",
},
},
preDamageFunc = function(activeSkill, output)
local skillData = activeSkill.skillData
if activeSkill.skillPart == 2 then
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * math.floor( output.Duration / 0.66 )
output.SkillDPSMultiplier = skillData.dpsMultiplier
end
end,
#mods

#skill SparkAltX
#flags spell projectile duration
parts = {
{
name = "1 Hit",
},
{
name = "Maximum Hits",
},
},
preDamageFunc = function(activeSkill, output)
local skillData = activeSkill.skillData
if activeSkill.skillPart == 2 then
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * math.floor( output.Duration / 0.66 )
output.SkillDPSMultiplier = skillData.dpsMultiplier
end
end,
#mods

#skill SparkAltY
#flags spell projectile duration
parts = {
{
name = "1 Hit",
},
{
name = "Maximum Hits",
},
},
preDamageFunc = function(activeSkill, output)
local skillData = activeSkill.skillData
if activeSkill.skillPart == 2 then
skillData.dpsMultiplier = ( skillData.dpsMultiplier or 1 ) * math.floor( output.Duration / 0.66 )
output.SkillDPSMultiplier = skillData.dpsMultiplier
end
end,
#mods

#skill VaalSparkSpiralNova
Expand Down
Loading