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
15 changes: 15 additions & 0 deletions spec/System/TestSkills_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,21 @@ describe("TestSkills", function()
assert.True(preAdrenalineMaxStages < build.calcsTab.mainEnv.player.activeSkillList[1].skillModList:Sum("BASE", nil, "Multiplier:BlightMaxStages"))
end)

it("calculates added resistance from heralds even when using scornful herald", function()
build.skillsTab:PasteSocketGroup("Cyclone 20/0 1\n")
build.skillsTab:PasteSocketGroup("Herald of Thunder 20/0 1\nScornful Herald 20/0 1\n")
build.itemsTab:CreateDisplayItemFromRaw([[Circle of Regret
Topaz Ring
{tags:resistance}+(50-60)% to Lightning Resistance while affected by Herald of Thunder
]])
build.itemsTab:AddDisplayItem()

runCallback("OnFrame")

assert.are.equals(0, build.calcsTab.mainEnv.player.modDB:Sum("BASE", nil, "LightningMin"))
assert.are.equals(-5, build.calcsTab.mainEnv.player.modDB:Sum("BASE", nil, "LightningResist"))
end)

it("calculates Wintertide Brand average damage for attached brands and Wintertide's End", function()
local function getAverageDamageMultiplier()
for _, mod in ipairs(build.calcsTab.mainEnv.player.mainSkill.skillModList) do
Expand Down
3 changes: 2 additions & 1 deletion src/Data/Skills/sup_int.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5968,7 +5968,8 @@ skills["SupportScornfulHerald"] = {
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["herald_no_buff_effect"] = {
flag("DisableBuff", { type = "SkillType", skillType = SkillType.Herald }),
mod("BuffEffect", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Herald }),
value = -100,
},
},
qualityStats = {
Expand Down
3 changes: 2 additions & 1 deletion src/Export/Skills/sup_int.txt
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,8 @@ local skills, mod, flag, skill = ...
#skill SupportScornfulHerald
statMap = {
["herald_no_buff_effect"] = {
flag("DisableBuff", { type = "SkillType", skillType = SkillType.Herald }),
mod("BuffEffect", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Herald }),
value = -100,
},
},
#mods
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CalcPerform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2263,7 +2263,7 @@ function calcs.perform(env, skipEHP)
-- Also nothing :/
elseif buff.type == "GlobalDB" then
modDB:AddList(buff.modList) -- Allows a skill mod to affect other skills through modDB
elseif buff.type == "Buff" and not skillModList:Flag(skillCfg, "DisableBuff") then
elseif buff.type == "Buff" then
if env.mode_buffs and (not activeSkill.skillFlags.totem or buff.allowTotemBuff) then
local skillCfg = buff.activeSkillBuff and skillCfg
local modStore = buff.activeSkillBuff and skillModList or modDB
Expand Down
Loading