Skip to content

[pob1-port] Fix Consecrated Ground not reducing curse effect #2467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
github-actions wants to merge 1 commit into from
Closed

[pob1-port] Fix Consecrated Ground not reducing curse effect #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions spec/System/TestDefence_spec.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff a/spec/System/TestDefence_spec.lua b/spec/System/TestDefence_spec.lua (rejected hunks)
@@ -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"
29 changes: 29 additions & 0 deletions src/Modules/CalcPerform.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua (rejected hunks)
@@ -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") -- Moved to L3087
modDB:NewMod("Accuracy", "INC", m_floor(modDB:Sum("INC", nil, "ConsecratedGroundAlsoAccuracy") * effect), "Consecrated Ground")
end
if modDB:Flag(nil, "Condition:PhantasmalMight") then
@@ -3084,15 +3083,12 @@ function calcs.perform(env, skipEHP)
end
end

- -- Consecrated Ground grants 50% reduced Effect of Curses on you
- -- Moved curse reduction here so it properly affects curse effect on player
- 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
-
-- 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]