Skip to content

Fix Spellslinger gaining generic damage instead of Spell damage #9352

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

Merged
merged 1 commit into from
Nov 25, 2025
Merged

Fix Spellslinger gaining generic damage instead of Spell damage #9352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@ skills["BladeBlastAltY"] = {
castTime = 0.65,
statMap = {
["gain_%_of_base_dagger_damage_as_added_spell_damage"] = {
skill("gainPercentBaseDaggerDamage", nil),
skill("gainPercentBaseDaggerDamageToSpells", nil),
},
},
baseFlags = {
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16772,7 +16772,7 @@ skills["SupportSpellslinger"] = {
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["gain_%_of_base_wand_damage_as_added_spell_damage"] = {
skill("gainPercentBaseWandDamage", nil),
skill("gainPercentBaseWandDamageToSpells", nil),
},
["support_spellslinger_damage_+%_final"] = {
mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment)),
Expand Down
2 changes: 1 addition & 1 deletion src/Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ local skills, mod, flag, skill = ...
#flags spell area
statMap = {
["gain_%_of_base_dagger_damage_as_added_spell_damage"] = {
skill("gainPercentBaseDaggerDamage", nil),
skill("gainPercentBaseDaggerDamageToSpells", nil),
},
},
#mods
Expand Down
2 changes: 1 addition & 1 deletion src/Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3642,7 +3642,7 @@ local skills, mod, flag, skill = ...
#skill SupportSpellslinger
statMap = {
["gain_%_of_base_wand_damage_as_added_spell_damage"] = {
skill("gainPercentBaseWandDamage", nil),
skill("gainPercentBaseWandDamageToSpells", nil),
},
["support_spellslinger_damage_+%_final"] = {
mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment)),
Expand Down
32 changes: 16 additions & 16 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,41 +843,41 @@ function calcs.offence(env, actor, activeSkill)
end
end
end
if skillData.gainPercentBaseWandDamage then
local mult = skillData.gainPercentBaseWandDamage / 100
if skillData.gainPercentBaseWandDamageToSpells then
local mult = skillData.gainPercentBaseWandDamageToSpells / 100
if actor.weaponData1.type == "Wand" and actor.weaponData2.type == "Wand" then
for _, damageType in ipairs(dmgTypeList) do
skillModList:NewMod(damageType.."Min", "BASE", ((actor.weaponData1[damageType.."Min"] or 0) + (actor.weaponData2[damageType.."Min"] or 0)) / 2 * mult, "Spellslinger")
skillModList:NewMod(damageType.."Max", "BASE", ((actor.weaponData1[damageType.."Max"] or 0) + (actor.weaponData2[damageType.."Max"] or 0)) / 2 * mult, "Spellslinger")
skillModList:NewMod(damageType.."Min", "BASE", m_floor(((actor.weaponData1[damageType.."Min"] or 0) + (actor.weaponData2[damageType.."Min"] or 0)) / 2 * mult), "Spellslinger", ModFlag.Spell)
skillModList:NewMod(damageType.."Max", "BASE", m_floor(((actor.weaponData1[damageType.."Max"] or 0) + (actor.weaponData2[damageType.."Max"] or 0)) / 2 * mult), "Spellslinger", ModFlag.Spell)
end
elseif actor.weaponData1.type == "Wand" then
for _, damageType in ipairs(dmgTypeList) do
skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData1[damageType.."Min"] or 0) * mult, "Spellslinger")
skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData1[damageType.."Max"] or 0) * mult, "Spellslinger")
skillModList:NewMod(damageType.."Min", "BASE", m_floor((actor.weaponData1[damageType.."Min"] or 0) * mult), "Spellslinger", ModFlag.Spell)
skillModList:NewMod(damageType.."Max", "BASE", m_floor((actor.weaponData1[damageType.."Max"] or 0) * mult), "Spellslinger", ModFlag.Spell)
end
elseif actor.weaponData2.type == "Wand" then
for _, damageType in ipairs(dmgTypeList) do
skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData2[damageType.."Min"] or 0) * mult, "Spellslinger")
skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData2[damageType.."Max"] or 0) * mult, "Spellslinger")
skillModList:NewMod(damageType.."Min", "BASE", m_floor((actor.weaponData2[damageType.."Min"] or 0) * mult), "Spellslinger", ModFlag.Spell)
skillModList:NewMod(damageType.."Max", "BASE", m_floor((actor.weaponData2[damageType.."Max"] or 0) * mult), "Spellslinger", ModFlag.Spell)
end
end
end
if skillData.gainPercentBaseDaggerDamage then
local mult = skillData.gainPercentBaseDaggerDamage / 100
if skillData.gainPercentBaseDaggerDamageToSpells then
local mult = skillData.gainPercentBaseDaggerDamageToSpells / 100
if actor.weaponData1.type == "Dagger" and actor.weaponData2.type == "Dagger" then
for _, damageType in ipairs(dmgTypeList) do
skillModList:NewMod(damageType.."Min", "BASE", ((actor.weaponData1[damageType.."Min"] or 0) + (actor.weaponData2[damageType.."Min"] or 0)) / 2 * mult, "Blade Blast of Dagger Detonation")
skillModList:NewMod(damageType.."Max", "BASE", ((actor.weaponData1[damageType.."Max"] or 0) + (actor.weaponData2[damageType.."Max"] or 0)) / 2 * mult, "Blade Blast of Dagger Detonation")
skillModList:NewMod(damageType.."Min", "BASE", m_floor(((actor.weaponData1[damageType.."Min"] or 0) + (actor.weaponData2[damageType.."Min"] or 0)) / 2 * mult), "Blade Blast of Dagger Detonation", ModFlag.Spell)
skillModList:NewMod(damageType.."Max", "BASE", m_floor(((actor.weaponData1[damageType.."Max"] or 0) + (actor.weaponData2[damageType.."Max"] or 0)) / 2 * mult), "Blade Blast of Dagger Detonation", ModFlag.Spell)
end
elseif actor.weaponData1.type == "Dagger" then
for _, damageType in ipairs(dmgTypeList) do
skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData1[damageType.."Min"] or 0) * mult, "Blade Blast of Dagger Detonation")
skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData1[damageType.."Max"] or 0) * mult, "Blade Blast of Dagger Detonation")
skillModList:NewMod(damageType.."Min", "BASE", m_floor((actor.weaponData1[damageType.."Min"] or 0) * mult), "Blade Blast of Dagger Detonation", ModFlag.Spell)
skillModList:NewMod(damageType.."Max", "BASE", m_floor((actor.weaponData1[damageType.."Max"] or 0) * mult), "Blade Blast of Dagger Detonation", ModFlag.Spell)
end
elseif actor.weaponData2.type == "Dagger" then
for _, damageType in ipairs(dmgTypeList) do
skillModList:NewMod(damageType.."Min", "BASE", (actor.weaponData2[damageType.."Min"] or 0) * mult, "Blade Blast of Dagger Detonation")
skillModList:NewMod(damageType.."Max", "BASE", (actor.weaponData2[damageType.."Max"] or 0) * mult, "Blade Blast of Dagger Detonation")
skillModList:NewMod(damageType.."Min", "BASE", m_floor((actor.weaponData2[damageType.."Min"] or 0) * mult), "Blade Blast of Dagger Detonation", ModFlag.Spell)
skillModList:NewMod(damageType.."Max", "BASE", m_floor((actor.weaponData2[damageType.."Max"] or 0) * mult), "Blade Blast of Dagger Detonation", ModFlag.Spell)
end
end
end
Expand Down