Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Data/Skills/sup_int.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4638,6 +4638,12 @@ skills["SupportSummonGhostOnKill"] = {
},
["damage_+%_for_non_minions"] = {
-- mod("Damage", "INC", nil, 0, 0, {type = "Actor"})
},
["phantasm_minimum_added_physical_damage_to_grant"] = {
mod("PhysicalMin", "BASE", nil, ModFlag.Spell, 0, { type = "PerStat", stat = "ActivePhantasmLimit" }, { type = "GlobalEffect", effectType = "Buff", effectName = "Phantasmal Might", effectCond = "PhantasmalMight" })
},
["phantasm_maximum_added_physical_damage_to_grant"] = {
mod("PhysicalMax", "BASE", nil, ModFlag.Spell, 0, { type = "PerStat", stat = "ActivePhantasmLimit" }, { type = "GlobalEffect", effectType = "Buff", effectName = "Phantasmal Might", effectCond = "PhantasmalMight" })
}
},
baseMods = {
Expand Down
6 changes: 6 additions & 0 deletions Export/Skills/sup_int.txt
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,12 @@ local skills, mod, flag, skill = ...
},
["damage_+%_for_non_minions"] = {
-- mod("Damage", "INC", nil, 0, 0, {type = "Actor"})
},
["phantasm_minimum_added_physical_damage_to_grant"] = {
mod("PhysicalMin", "BASE", nil, ModFlag.Spell, 0, { type = "PerStat", stat = "ActivePhantasmLimit" }, { type = "GlobalEffect", effectType = "Buff", effectName = "Phantasmal Might", effectCond = "PhantasmalMight" })
},
["phantasm_maximum_added_physical_damage_to_grant"] = {
mod("PhysicalMax", "BASE", nil, ModFlag.Spell, 0, { type = "PerStat", stat = "ActivePhantasmLimit" }, { type = "GlobalEffect", effectType = "Buff", effectName = "Phantasmal Might", effectCond = "PhantasmalMight" })
}
},
#mods
Expand Down
7 changes: 5 additions & 2 deletions Modules/CalcPerform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,9 @@ local function doActorMisc(env, actor)
modDB:NewMod("Speed", "INC", 20, "Her Embrace")
modDB:NewMod("MovementSpeed", "INC", 20, "Her Embrace")
end
if modDB:Flag(nil, "Condition:PhantasmalMight") then
modDB.multipliers["BuffOnSelf"] = (modDB.multipliers["BuffOnSelf"] or 0) + output.ActivePhantasmLimit - 1 -- slight hack to not double count the initial buff
end
if modDB:Flag(nil, "Elusive") then
local effect = 1 + modDB:Sum("INC", nil, "ElusiveEffect", "BuffEffectOnSelf") / 100
condList["Elusive"] = true
Expand Down Expand Up @@ -790,8 +793,8 @@ function calcs.perform(env)
elseif activeSkill.activeEffect.grantedEffect.name == "Summon Raging Spirit" then
local limit = env.player.mainSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "ActiveRagingSpiritLimit")
output.ActiveRagingSpiritLimit = m_max(limit, output.ActiveRagingSpiritLimit or 0)
elseif activeSkill.activeEffect.grantedEffect.name == "Summoned Phantasm" then
local limit = env.player.mainSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "ActivePhantasmLimit")
elseif activeSkill.minionList and activeSkill.minionList[1] == "SummonedPhantasm" then
local limit = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "ActivePhantasmLimit")
output.ActivePhantasmLimit = m_max(limit, output.ActivePhantasmLimit or 0)
elseif activeSkill.activeEffect.grantedEffect.name == "Raise Spectre" then
local limit = env.player.mainSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "ActiveSpectreLimit")
Expand Down
2 changes: 2 additions & 0 deletions Modules/ModParser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2189,6 +2189,8 @@ local specialModList = {
mod("Dummy", "DUMMY", 1, { type = "Condition", var = "HitRecentlyWithWeapon" }), -- Make the Configuration option appear
},
["summoned skeleton warriors wield a copy of this weapon while in your main hand"] = { }, -- just make the mod blue, handled in CalcSetup
["each summoned phantasm grants you phantasmal might"] = { flag("Condition:PhantasmalMight") },

-- Projectiles
["skills chain %+(%d) times"] = function(num) return { mod("ChainCountMax", "BASE", num) } end,
["skills chain an additional time while at maximum frenzy charges"] = { mod("ChainCountMax", "BASE", 1, { type = "StatThreshold", stat = "FrenzyCharges", thresholdStat = "FrenzyChargesMax" }) },
Expand Down