Skip to content

Convert positive late flat skill costs with their resource #10262

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

Open
LocalIdentity wants to merge 1 commit into
base: dev
Choose a base branch
from
+76 −0
Open

Convert positive late flat skill costs with their resource #10262

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
60 changes: 60 additions & 0 deletions spec/System/TestSkills_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,46 @@ describe("TestSkills", function()
assert.equals(18, build.calcsTab.mainOutput.LifeCost)
end)

it("converts and rounds flat mana cost separately from base cost", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")
build.configTab.input.customMods = "Skills Cost Life instead of 15% of Mana Cost\n+4 to Total Mana Cost"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.equals(3, build.calcsTab.mainOutput.LifeCost)
assert.equals(13, build.calcsTab.mainOutput.ManaCost)
end)

it("moves flat mana cost when all costs are converted", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")
build.configTab.input.customMods = "Skills Cost Life instead of Mana\n+4 to Total Mana Cost"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.equals(16, build.calcsTab.mainOutput.LifeCost)
assert.equals(0, build.calcsTab.mainOutput.ManaCost)
end)

it("does not move reduced flat mana cost to life", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")
build.configTab.input.customMods = "Skills Cost Life instead of Mana\nNon-Channelling Skills have -7 to Total Mana Cost"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.equals(12, build.calcsTab.mainOutput.LifeCost)
assert.equals(0, build.calcsTab.mainOutput.ManaCost)
end)

it("does not partially convert reduced flat mana cost to life", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")
build.configTab.input.customMods = "Skills Cost Life instead of 15% of Mana Cost\nNon-Channelling Skills have -7 to Total Mana Cost"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.equals(2, build.calcsTab.mainOutput.LifeCost)
assert.equals(4, build.calcsTab.mainOutput.ManaCost)
end)

it("Test flat cost is added after cost efficiency for energy shield costs", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")

Expand All @@ -392,6 +432,26 @@ describe("TestSkills", function()
-- 12 / 1.5 + 10 = 18
assert.equals(18, build.calcsTab.mainOutput.ESCost)
end)

it("moves flat mana cost to energy shield with the base cost", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")
build.configTab.input.customMods = "Skills Cost Energy Shield instead of Mana or Life\n+4 to Total Mana Cost"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.equals(16, build.calcsTab.mainOutput.ESCost)
assert.equals(0, build.calcsTab.mainOutput.ManaCost)
end)

it("does not move reduced flat mana cost to energy shield", function()
build.skillsTab:PasteSocketGroup("Hydrosphere 1/0 1\n")
build.configTab.input.customMods = "Skills Cost Energy Shield instead of Mana or Life\nNon-Channelling Skills have -7 to Total Mana Cost"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.equals(12, build.calcsTab.mainOutput.ESCost)
assert.equals(0, build.calcsTab.mainOutput.ManaCost)
end)
it("Test mana cost efficiency with support gems", function()
-- Test interaction between cost efficiency and cost multipliers
build.skillsTab:PasteSocketGroup("Contagion 6/0 1\nMagnified Area I 1/0 1")
Expand Down
16 changes: 16 additions & 0 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,6 +1707,11 @@ function calcs.offence(env, actor, activeSkill)
if val.type == "Life" then
local manaType = resource:gsub("Life", "Mana")
if skillModList:Flag(skillCfg, "CostLifeInsteadOfMana") then -- Blood Magic / Lifetap
if val.upfront then
local manaTotalCost = skillModList:Sum("BASE", skillCfg, manaType.."Cost")
val.totalCost = val.totalCost + m_max(0, manaTotalCost)
costs[manaType].totalCost = costs[manaType].totalCost - manaTotalCost
end
val.baseCost = val.baseCost + costs[manaType].baseCost
val.baseCostNoMult = val.baseCostNoMult + costs[manaType].baseCostNoMult
val.finalBaseCost = val.finalBaseCost + costs[manaType].finalBaseCost
Expand All @@ -1717,11 +1722,22 @@ function calcs.offence(env, actor, activeSkill)
elseif (additionalLifeCost > 0 or hybridLifeCost > 0) and not skillModList:Flag(skillCfg, "CostESInsteadOfManaOrLife") then
val.baseCost = costs[manaType].baseCost
val.finalBaseCost = val.finalBaseCost + round(costs[manaType].finalBaseCost * (hybridLifeCost + additionalLifeCost))
if val.upfront and hybridLifeCost > 0 then
-- Only positive flat mana cost is converted, and it is rounded separately from base cost.
val.totalCost = val.totalCost + round(m_max(0, skillModList:Sum("BASE", skillCfg, manaType.."Cost")) * hybridLifeCost)
end
end
elseif val.type == "ES" then
local manaType = resource:gsub("ES", "Mana")
local lifeType = resource:gsub("ES", "Life")
if skillModList:Flag(skillCfg, "CostESInsteadOfManaOrLife") then -- Whispers of Infinity
if val.upfront then
local manaTotalCost = skillModList:Sum("BASE", skillCfg, manaType.."Cost")
local lifeTotalCost = skillModList:Sum("BASE", skillCfg, lifeType.."Cost")
val.totalCost = val.totalCost + m_max(0, manaTotalCost) + m_max(0, lifeTotalCost)
costs[manaType].totalCost = costs[manaType].totalCost - manaTotalCost
costs[lifeType].totalCost = costs[lifeType].totalCost - lifeTotalCost
end
val.baseCost = val.baseCost + costs[manaType].baseCost+ costs[lifeType].baseCost
val.baseCostNoMult = val.baseCostNoMult + costs[manaType].baseCostNoMult + costs[lifeType].baseCostNoMult
val.finalBaseCost = val.finalBaseCost + costs[manaType].finalBaseCost + costs[lifeType].finalBaseCost
Expand Down
Loading