Skip to content

Commit 035bb18

Browse files
author
LocalIdentity
committed
Make the mod work properly
1 parent 731564c commit 035bb18

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/Data/Skills/act_str.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15211,9 +15211,11 @@ skills["WolfPounceMarkPlayer"] = {
1521115211
},
1521215212
statMap = {
1521315213
["skill_wolf_mark_damage_taken_+%_per_nearby_enemy"] = {
15214-
mod("DamageTaken", "INC", nil, 0, 0, { type = "Multiplier", var = "MinionPresenceCount" }, { type = "GlobalEffect", effectType = "Curse" }),
15214+
mod("DamageTaken", "INC", nil, 0, 0, { type = "Multiplier", var = "MinionPresenceCount", actor = "player", limitVar = "PredatorsMarkLimit", limitTotal = true }, { type = "GlobalEffect", effectType = "Curse" }),
15215+
},
15216+
["skill_wolf_mark_damage_taken_+%_cap"] = {
15217+
mod("Multiplier:PredatorsMarkLimit", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }),
1521515218
},
15216-
["skill_wolf_mark_damage_taken_+%_cap"] = {},
1521715219
},
1521815220
constantStats = {
1521915221
{ "base_skill_effect_duration", 8000 },

src/Export/Skills/act_str.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,9 +886,11 @@ end,
886886
#flags duration
887887
statMap = {
888888
["skill_wolf_mark_damage_taken_+%_per_nearby_enemy"] = {
889-
mod("DamageTaken", "INC", nil, 0, 0, { type = "Multiplier", var = "MinionPresenceCount" }, { type = "GlobalEffect", effectType = "Curse" }),
889+
mod("DamageTaken", "INC", nil, 0, 0, { type = "Multiplier", var = "MinionPresenceCount", actor = "player", limitVar = "PredatorsMarkLimit", limitTotal = true }, { type = "GlobalEffect", effectType = "Curse" }),
890+
},
891+
["skill_wolf_mark_damage_taken_+%_cap"] = {
892+
mod("Multiplier:PredatorsMarkLimit", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }),
890893
},
891-
["skill_wolf_mark_damage_taken_+%_cap"] = {},
892894
},
893895
#mods
894896
#skillEnd

src/Modules/CalcPerform.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,12 +1130,6 @@ function calcs.perform(env, skipEHP)
11301130
modDB.multipliers["BrandsAttachedToEnemy"] = m_max(actual, modDB.multipliers["BrandsAttachedToEnemy"] or 0)
11311131
enemyDB.multipliers["BrandsAttached"] = m_max(actual, enemyDB.multipliers["BrandsAttached"] or 0)
11321132
end
1133-
if activeSkill.activeEffect.grantedEffect.name == "Predator's Mark" then
1134-
local minionCount = modDB.multipliers["MinionPresenceCount"] or 0
1135-
if minionCount > 0 then
1136-
enemyDB.multipliers["MinionPresenceCount"] = m_max(m_min(minionCount, 15), enemyDB.multipliers["MinionPresenceCount"] or 0)
1137-
end
1138-
end
11391133
if skillFlags.totem then
11401134
local override = env.player.mainSkill.skillModList:Override(env.player.mainSkill.skillCfg, "ActiveTotemLimit", "ActiveBallistaLimit" )
11411135
local limit = override or env.player.mainSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "ActiveTotemLimit", "ActiveBallistaLimit" )

src/Modules/Calcs.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,8 @@ function calcs.buildOutput(build, mode)
598598
elseif tag.type == "Multiplier" or tag.type == "MultiplierThreshold" then
599599
if not tag.actor then
600600
addVarTag(env.enemyMultipliersUsed, tag, mod)
601+
elseif tag.actor == "enemy" or tag.actor == "player" then
602+
addVarTag(env.multipliersUsed, tag, mod)
601603
end
602604
end
603605
end

0 commit comments

Comments
 (0)