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
19 changes: 19 additions & 0 deletions spec/System/TestDefence_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,25 @@ describe("TestDefence", function()
return build.calcsTab.calcs.reducePoolsByDamage(nil, takenDamages, build.calcsTab.calcsEnv.player)
end

it("applies Consecrated Ground curse reduction to the player and minion", function()
build.skillsTab:PasteSocketGroup("Raise Zombie 20/0 1")
build.configTab.input.conditionOnConsecratedGround = true
build.configTab.input.playerCursedWithElementalWeakness = 20
build.configTab:BuildModList()
runCallback("OnFrame")

assert.are.equals(50, build.calcsTab.mainOutput.CurseEffectOnSelf)
assert.are.equals(50, build.calcsTab.mainEnv.minion.output.CurseEffectOnSelf)
local fireResistOnConsecratedGround = build.calcsTab.mainOutput.FireResist

newBuild()
build.configTab.input.playerCursedWithElementalWeakness = 20
build.configTab:BuildModList()
runCallback("OnFrame")

assert.is_true(fireResistOnConsecratedGround > build.calcsTab.mainOutput.FireResist)
end)

-- boring part
it("no armour max hits", function()
build.configTab.input.enemyIsBoss = "None"
Expand Down
5 changes: 4 additions & 1 deletion src/Modules/CalcPerform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,6 @@ local function doActorMisc(env, actor)
if modDB:Flag(nil, "Condition:OnConsecratedGround") then
local effect = 1 + modDB:Sum("INC", nil, "ConsecratedGroundEffect") / 100
modDB:NewMod("LifeRegenPercent", "BASE", 5 * effect, "Consecrated Ground")
modDB:NewMod("CurseEffectOnSelf", "INC", -50 * effect, "Consecrated Ground")
modDB:NewMod("Accuracy", "INC", m_floor(modDB:Sum("INC", nil, "ConsecratedGroundAlsoAccuracy") * effect), "Consecrated Ground")
end
if modDB:Flag(nil, "Condition:PhantasmalMight") then
Expand Down Expand Up @@ -3086,6 +3085,10 @@ function calcs.perform(env, skipEHP)

-- Check for extra curses
for dest, modDB in pairs({[curses] = modDB, [minionCurses] = env.minion and env.minion.modDB}) do
if env.mode_combat and modDB:Flag(nil, "Condition:OnConsecratedGround") then
local effect = 1 + modDB:Sum("INC", nil, "ConsecratedGroundEffect") / 100
modDB:NewMod("CurseEffectOnSelf", "INC", -50 * effect, "Consecrated Ground")
end
for _, value in ipairs(modDB:List(nil, "ExtraCurse")) do
local gemModList = new("ModList")
local grantedEffect = env.data.skills[value.skillId]
Expand Down
Loading