Skip to content

Adding DPS calculation for Firestorm and similar skills #1747

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

Open
MrHB212 wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Adding DPS calculation for Firestorm and similar skills #1747

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
c21374f
Firestorm, Volcano
MrHB212 Jan 23, 2026
8dbc77c
icestorm, thunderstorm
MrHB212 Jan 23, 2026
fa89ecb
rain of arrows
MrHB212 Jan 23, 2026
36cee61
Update CalcOffence.lua
MrHB212 Jan 24, 2026
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
19 changes: 8 additions & 11 deletions src/Data/Gems.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16501,11 +16501,10 @@ return {
wyvern = true,
area = true,
projectile = true,
sustained = true,
channelling = true,
},
gemType = "Attack",
tagString = "Shapeshift, Wyvern, AoE, Projectile, Sustained, Channelling",
tagString = "Shapeshift, Wyvern, AoE, Projectile, Channelling",
weaponRequirements = "Talisman",
reqStr = 50,
reqDex = 0,
Expand Down Expand Up @@ -16887,22 +16886,21 @@ return {
grantedEffectId = "WolfLunarBlessingPlayer",
additionalGrantedEffectId1 = "WolfLunarBlessingBeamAttackPlayer",
tags = {
warcry = true,
buff = true,
strength = true,
intelligence = true,
grants_active_skill = true,
attack = true,
shapeshift = true,
buff = true,
wolf = true,
area = true,
melee = true,
trigger = true,
cold = true,
duration = true,
},
gemType = "Warcry",
tagString = "Attack, Shapeshift, Buff, Werewolf, AoE, Melee, Trigger, Cold, Duration",
gemType = "Buff",
tagString = "Attack, Shapeshift, Werewolf, AoE, Melee, Trigger, Cold, Duration",
weaponRequirements = "Talisman",
reqStr = 50,
reqDex = 0,
Expand Down Expand Up @@ -17044,7 +17042,7 @@ return {
chaining = true,
},
gemType = "Support",
gemFamily = "Dominus' Grasp",
gemFamily = "Piety's Mercy",
tagString = "Lineage, Projectile, Chaining",
reqStr = 0,
reqDex = 100,
Expand Down Expand Up @@ -18186,13 +18184,11 @@ return {
spell = true,
persistent = true,
area = true,
sustained = true,
physical = true,
duration = true,
plant = true,
},
gemType = "Buff",
tagString = "Spell, Persistent, AoE, Sustained, Physical, Duration, Plant",
tagString = "Spell, Persistent, AoE, Physical, Plant",
reqStr = 50,
reqDex = 0,
reqInt = 50,
Expand Down Expand Up @@ -18563,11 +18559,12 @@ return {
grants_active_skill = true,
buff = true,
persistent = true,
trigger = true,
invocation = true,
meta = true,
},
gemType = "Buff",
tagString = "Persistent, Invocation, Meta",
tagString = "Persistent, Trigger, Invocation, Meta",
weaponRequirements = "Talisman",
reqStr = 50,
reqDex = 0,
Expand Down
16 changes: 12 additions & 4 deletions src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ skills["BloodhoundsMarkPlayer"] = {
name = "Bloodhound's Mark",
baseTypeName = "Bloodhound's Mark",
color = 2,
description = "Mark a target, making them suffer Heavy Stun build up from Blood Loss. If they suffer enough Blood Loss while Marked, the Mark will Activate, Consuming itself and releasing an explosion of blood when they are killed or Heavy Stunned. The Mark's duration does not expire while the Marked target is suffering Blood Loss.",
description = "Mark a target, making them suffer Heavy Stun build up from Blood Loss. If they suffer enough Blood Loss while Marked, the Mark will Activate, Consming itself and releasing an explosion of blood when they are killed or Heavy Stunned. The Mark's duration does not expire while the Marked target is suffering Blood Loss.",
Copy link
Contributor

@Nightblade Nightblade Jan 24, 2026

Choose a reason for hiding this comment

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

"Consming" ?

Copy link
Contributor Author

@MrHB212 MrHB212 Jan 24, 2026

Choose a reason for hiding this comment

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

Tbh i have no clue. I have just exported the skills.

Copy link
Contributor

@Nightblade Nightblade Jan 24, 2026

Choose a reason for hiding this comment

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

Ah ok, GGG pls!

skillTypes = { [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Unleashable] = true, [SkillType.Duration] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Mark] = true, [SkillType.Limit] = true, [SkillType.Physical] = true, [SkillType.UsableWhileMounted] = true, [SkillType.Cooldown] = true, },
castTime = 0.5,
qualityStats = {
Expand Down Expand Up @@ -5002,7 +5002,7 @@ skills["SupportMirageArcherPlayer"] = {
skills["MirageArcherSpawnPlayer"] = {
name = "",
hidden = true,
skillTypes = { [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, [SkillType.Buff] = true, [SkillType.Duration] = true, [SkillType.AttackInPlace] = true, [SkillType.Cooldown] = true, [SkillType.Proxy] = true, },
skillTypes = { [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, [SkillType.Buff] = true, [SkillType.Duration] = true, [SkillType.AttackInPlace] = true, [SkillType.Cooldown] = true, },
weaponTypes = {
["Bow"] = true,
["Crossbow"] = true,
Expand Down Expand Up @@ -6109,6 +6109,14 @@ skills["RainOfArrowsPlayer"] = {
["rain_of_arrows_projectile_count_multiplier_per_frenzy_charge"] = {
mod("ProjectileNumber", "MORE", nil, 0, 0, { type = "Multiplier", var = "RemovableFrenzyCharge" }),
},
["rain_of_arrows_delay_per_arrow"] = {
skill("hitTimeOverride", nil),
div = 1000,
},
["rain_hit_delay_ms"] = {
skill("maxHitRatePerEnemy", nil),
div = 1000,
},
},
baseFlags = {
attack = true,
Expand Down Expand Up @@ -6690,7 +6698,7 @@ skills["ShatteringSpitePlayer"] = {
baseTypeName = "Shattering Spite",
fromItem = true,
color = 2,
description = "Stamp your spear, destroying all Bloodstone Lances on each enemy in your Presence to cause a damaging explosion around that enemy. Each explosion gains new benefits when reaching higher thresholds of Bloodstone Lances removed from an enemy, causing them to deal more damage, have increased area of effect, and Leech Life from enemies caught in the blast.",
description = "Stamp your spear, destroying all Bloodstone Lances on each enemy in your Presence to cause a damaging explosion around that enemy. Each explosion is independently larger and more damaging for each Bloodstone Lance on from the enemy it originates from.",
skillTypes = { [SkillType.Area] = true, [SkillType.Attack] = true, [SkillType.Physical] = true, [SkillType.Lightning] = true, [SkillType.Fire] = true, [SkillType.Damage] = true, [SkillType.Spear] = true, },
weaponTypes = {
["Spear"] = true,
Expand Down Expand Up @@ -10130,7 +10138,7 @@ skills["VoltaicMarkPlayer"] = {
name = "Voltaic Mark",
baseTypeName = "Voltaic Mark",
color = 2,
description = "Mark a target, making them more susceptible to being Electrocuted. When the Marked target is Electrocuted, the Mark Activates, granting a Buff which gives extra Lightning damage and Consuming the Mark. Marking another target while you have the Buff will remove the Buff.",
description = "Mark a target, making them more susceptible to being Electrocuted. When the Marked target is Electrocuted, the Mark Activates, granting a Buff which gives extra Lightning damage and Consming the Mark. Marking another target while you have the Buff will remove the Buff.",
skillTypes = { [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Unleashable] = true, [SkillType.Duration] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Mark] = true, [SkillType.Lightning] = true, [SkillType.Limit] = true, [SkillType.UsableWhileMounted] = true, [SkillType.Cooldown] = true, [SkillType.Buff] = true, },
castTime = 0.5,
qualityStats = {
Expand Down
52 changes: 46 additions & 6 deletions src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@ skills["BoneCagePlayer"] = {
baseTypeName = "Bone Cage",
color = 3,
description = "Raise a ring of bone spikes around you. The spikes are destroyed when enemies touch them, damaging and Pinning those enemies. Raising a new ring of spikes destroys the previous one.",
skillTypes = { [SkillType.Spell] = true, [SkillType.Duration] = true, [SkillType.Area] = true, [SkillType.Physical] = true, [SkillType.Unleashable] = true, [SkillType.Nova] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Damage] = true, [SkillType.Triggerable] = true, [SkillType.Cascadable] = true, [SkillType.Necrotic] = true, [SkillType.Totemable] = true, },
skillTypes = { [SkillType.Spell] = true, [SkillType.Duration] = true, [SkillType.Area] = true, [SkillType.Physical] = true, [SkillType.Unleashable] = true, [SkillType.Nova] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Damage] = true, [SkillType.Triggerable] = true, [SkillType.Cascadable] = true, [SkillType.Necrotic] = true, },
castTime = 1,
qualityStats = {
{ "active_skill_pins_as_though_dealt_damage_+%_final", 2.5 },
Expand Down Expand Up @@ -5791,7 +5791,7 @@ skills["EmberFusilladePlayer"] = {
baseTypeName = "Ember Fusillade",
color = 3,
description = "Conjure a blazing Ember that hovers above you. After a short duration, the Ember launches at an enemy, dealing Fire damage in an area on impact and prioritising the last enemy targeted. Recasting this spell resets the duration for all active Embers. Multiple Embers fired in the same Fusillade will attempt to target different enemies. Consumes a Lightning Infusion if possible to cause the entire Fusillade to create beams that Chain to enemies.",
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Fire] = true, [SkillType.Projectile] = true, [SkillType.Duration] = true, [SkillType.Unleashable] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Area] = true, [SkillType.AreaSpell] = true, [SkillType.Triggerable] = true, [SkillType.Totemable] = true, },
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Fire] = true, [SkillType.Projectile] = true, [SkillType.Duration] = true, [SkillType.Unleashable] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Area] = true, [SkillType.AreaSpell] = true, [SkillType.Triggerable] = true, },
castTime = 0.4,
qualityStats = {
{ "ember_fusillade_damage_+%_final_per_ember_fired", 0.1 },
Expand Down Expand Up @@ -7603,6 +7603,16 @@ skills["FirestormPlayer"] = {
incrementalEffectiveness = 0.12999999523163,
damageIncrementalEffectiveness = 0.008899999782443,
statDescriptionScope = "firestorm_statset_0",
statMap = {
["fire_storm_fireball_delay_ms"] = {
skill("hitTimeOverride", nil),
div = 1000,
},
["rain_hit_delay_ms"] = {
skill("maxHitRatePerEnemy", nil),
div = 1000,
},
},
baseFlags = {
spell = true,
area = true,
Expand Down Expand Up @@ -7687,6 +7697,16 @@ skills["FirestormPlayer"] = {
incrementalEffectiveness = 0.12999999523163,
damageIncrementalEffectiveness = 0.008899999782443,
statDescriptionScope = "firestorm_statset_1",
statMap = {
["fire_storm_fireball_delay_ms"] = {
skill("hitTimeOverride", nil),
div = 1000,
},
["rain_hit_delay_ms"] = {
skill("maxHitRatePerEnemy", nil),
div = 1000,
},
},
baseFlags = {
spell = true,
area = true,
Expand Down Expand Up @@ -7776,6 +7796,16 @@ skills["FirestormPlayer"] = {
incrementalEffectiveness = 0.12999999523163,
damageIncrementalEffectiveness = 0.008899999782443,
statDescriptionScope = "firestorm_statset_2",
statMap = {
["fire_storm_fireball_delay_ms"] = {
skill("hitTimeOverride", nil),
div = 1000,
},
["rain_hit_delay_ms"] = {
skill("maxHitRatePerEnemy", nil),
div = 1000,
},
},
baseFlags = {
spell = true,
area = true,
Expand Down Expand Up @@ -8087,7 +8117,7 @@ skills["FlameblastPlayer"] = {
baseTypeName = "Flameblast",
color = 3,
description = "Channel to build destructive energy around you. Releasing the energy causes a devastating explosion that is larger and more intense the longer you Channelled for.",
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Totemable] = true, [SkillType.Fire] = true, [SkillType.Channel] = true, [SkillType.AreaSpell] = true, [SkillType.Nova] = true, [SkillType.UsableWhileMoving] = true, [SkillType.GainsStages] = true, [SkillType.Cooldown] = true, },
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Totemable] = true, [SkillType.Fire] = true, [SkillType.Channel] = true, [SkillType.AreaSpell] = true, [SkillType.Nova] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Cascadable] = true, [SkillType.GainsStages] = true, [SkillType.Cooldown] = true, },
castTime = 0.25,
qualityStats = {
{ "active_skill_cast_speed_+%_final", 1 },
Expand Down Expand Up @@ -8481,7 +8511,7 @@ skills["FreezingMarkPlayer"] = {
name = "Freezing Mark",
baseTypeName = "Freezing Mark",
color = 3,
description = "Mark a target, making them more susceptible to being Frozen. When the Marked target is Frozen, the Mark Activates, granting you a Buff which gives extra Cold damage and Consuming the Mark. Marking another target while you have the Buff will remove the Buff.",
description = "Mark a target, making them more susceptible to being Frozen. When the Marked target is Frozen, the Mark Activates, granting you a Buff which gives extra Cold damage and Consming the Mark. Marking another target while you have the Buff will remove the Buff.",
skillTypes = { [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Unleashable] = true, [SkillType.Duration] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Mark] = true, [SkillType.Cold] = true, [SkillType.Limit] = true, [SkillType.UsableWhileMounted] = true, [SkillType.Cooldown] = true, [SkillType.Buff] = true, },
castTime = 0.5,
qualityStats = {
Expand Down Expand Up @@ -8888,7 +8918,7 @@ skills["FrostDartsPlayer"] = {
baseTypeName = "Frost Darts",
color = 3,
description = "Conjures a number of icy Projectiles that launch towards the target. Projectiles that Hit a Chilled or Frozen target create chunks of ice that deal additional damage on impacting the ground. Consumes a Cold Infusion if possible to cause each Projectile to lodge into the enemy then explode.",
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Cold] = true, [SkillType.Projectile] = true, [SkillType.Unleashable] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Triggerable] = true, [SkillType.Area] = true, [SkillType.Totemable] = true, },
skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Cold] = true, [SkillType.Projectile] = true, [SkillType.Unleashable] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Triggerable] = true, [SkillType.Area] = true, },
castTime = 0.8,
qualityStats = {
{ "spell_skills_fire_2_additional_projectiles_final_chance_%", 0.5 },
Expand Down Expand Up @@ -12950,6 +12980,10 @@ skills["IcestormPlayer"] = {
skill("hitTimeOverride", nil),
div = 1000,
},
["rain_hit_delay_ms"] = {
skill("maxHitRatePerEnemy", nil),
div = 1000,
},
},
baseFlags = {
spell = true,
Expand Down Expand Up @@ -13032,6 +13066,12 @@ skills["IcestormPlayer"] = {
incrementalEffectiveness = 0.12999999523163,
damageIncrementalEffectiveness = 0.0082000000402331,
statDescriptionScope = "icestorm",
statMap = {
["rain_hit_delay_ms"] = {
skill("maxHitRatePerEnemy", nil),
div = 1000,
},
},
baseFlags = {
spell = true,
area = true,
Expand Down Expand Up @@ -16499,7 +16539,7 @@ skills["ReapPlayer"] = {
stats = {
"spell_minimum_base_physical_damage",
"spell_maximum_base_physical_damage",
"active_skill_life_gained_on_cull",
"life_gained_on_cull",
"is_area_damage",
"active_skill_show_cull_range",
"kill_enemy_on_hit_if_under_10%_life",
Expand Down
Loading