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
2 changes: 1 addition & 1 deletion src/Classes/ModStore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
mult = target:GetMultiplier(tag.var, cfg)
end
local threshold = tag.threshold or thresholdTarget:GetMultiplier(tag.thresholdVar, cfg)
if (tag.upper and mult > threshold) or (not tag.upper and mult < threshold) then
if (tag.upper and mult > threshold) or (tag.equals and mult ~= threshold) or (not (tag.upper and tag.exact) and mult < threshold) then
return
end
elseif tag.type == "PerStat" then
Expand Down
15 changes: 15 additions & 0 deletions src/Data/Skills/sup_str.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6606,6 +6606,11 @@ skills["SupportUhtredAuguryPlayer"] = {
label = "Uhtred's Augury",
incrementalEffectiveness = 0.054999999701977,
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["supported_active_skill_gem_level_+_if_two_other_supports"] = {
mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "MultiplierThreshold", var = "SupportCount", threshold = 3, equals = true }),
},
},
baseFlags = {
},
constantStats = {
Expand Down Expand Up @@ -6638,6 +6643,11 @@ skills["SupportUhtredExodusPlayer"] = {
label = "Uhtred's Exodus",
incrementalEffectiveness = 0.054999999701977,
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["supported_active_skill_gem_level_+_if_no_other_supports"] = {
mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "MultiplierThreshold", var = "SupportCount", threshold = 1, equals = true }),
},
},
baseFlags = {
},
constantStats = {
Expand Down Expand Up @@ -6670,6 +6680,11 @@ skills["SupportUhtredOmenPlayer"] = {
label = "Uhtred's Omen",
incrementalEffectiveness = 0.054999999701977,
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["supported_active_skill_gem_level_+_if_one_other_support"] = {
mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "MultiplierThreshold", var = "SupportCount", threshold = 2, equals = true }),
},
},
baseFlags = {
},
constantStats = {
Expand Down
15 changes: 15 additions & 0 deletions src/Export/Skills/sup_str.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1537,16 +1537,31 @@ statMap = {

#skill SupportUhtredAuguryPlayer
#set SupportUhtredAuguryPlayer
statMap = {
["supported_active_skill_gem_level_+_if_two_other_supports"] = {
mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "MultiplierThreshold", var = "SupportCount", threshold = 3, equals = true }),
},
},
#mods
#skillEnd

#skill SupportUhtredExodusPlayer
#set SupportUhtredExodusPlayer
statMap = {
["supported_active_skill_gem_level_+_if_no_other_supports"] = {
mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "MultiplierThreshold", var = "SupportCount", threshold = 1, equals = true }),
},
},
#mods
#skillEnd

#skill SupportUhtredOmenPlayer
#set SupportUhtredOmenPlayer
statMap = {
["supported_active_skill_gem_level_+_if_one_other_support"] = {
mod("SupportedGemProperty", "LIST", { keyword = "grants_active_skill", key = "level", value = nil }, 0, 0, { type = "MultiplierThreshold", var = "SupportCount", threshold = 2, equals = true }),
},
},
#mods
#skillEnd

Expand Down
1 change: 1 addition & 0 deletions src/Modules/CalcActiveSkill.lua
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
activeSkill.triggeredBy = skillEffect
end
end
skillModList:NewMod("Multiplier:SupportCount", "BASE", 1, "Support Count")
if level.PvPDamageMultiplier then
skillModList:NewMod("PvpDamageMultiplier", "MORE", level.PvPDamageMultiplier, skillEffect.grantedEffect.modSource)
end
Expand Down