Skip to content

Commit

Permalink
Update bandit rewards and Fellshrine Reward (#7682)
Browse files Browse the repository at this point in the history
* FIX: update bandit rewards and Fellshrine Reward

* FIX: The Way forward should count as Act 2
  • Loading branch information
Paliak authored Jul 14, 2024
1 parent ff55c77 commit e2090ed
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 28 deletions.
50 changes: 37 additions & 13 deletions src/Modules/Build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -742,28 +742,52 @@ function buildMode:Init(dbFileName, buildName, buildXML, convertBuild)
self.abortSave = false
end

local acts = {
[1] = { level = 1, questPoints = 0 },
[2] = { level = 12, questPoints = 2 },
[3] = { level = 22, questPoints = 3 },
[4] = { level = 32, questPoints = 5 },
[5] = { level = 40, questPoints = 6 },
[6] = { level = 44, questPoints = 8 },
[7] = { level = 50, questPoints = 11 },
[8] = { level = 54, questPoints = 14 },
[9] = { level = 60, questPoints = 17 },
[10] = { level = 64, questPoints = 19 },
[11] = { level = 67, questPoints = 22 },
local acts = {
-- https://www.poewiki.net/wiki/Passive_skill
[1] = { level = 1, questPoints = 0 },
-- Act 1 : The Dweller of the Deep
-- Act 1 : The Marooned Mariner
[2] = { level = 12, questPoints = 2 },
-- Act 1,2 : The Way Forward (Reward after reaching Act 2)
-- Act 2 : Through Sacred Ground (Fellshrine Reward 3.25)
[3] = { level = 22, questPoints = 4 },
-- Act 3 : Victario's Secrets
-- Act 3 : Piety's Pets
[4] = { level = 32, questPoints = 6 },
-- Act 4 : An Indomitable Spirit
[5] = { level = 40, questPoints = 7 },
-- Act 5 : In Service to Science
-- Act 5 : Kitava's Torments
[6] = { level = 44, questPoints = 9 },
-- Act 6 : The Father of War
-- Act 6 : The Puppet Mistress
-- Act 6 : The Cloven One
[7] = { level = 50, questPoints = 12 },
-- Act 7 : The Master of a Million Faces
-- Act 7 : Queen of Despair
-- Act 7 : Kishara's Star
[8] = { level = 54, questPoints = 15 },
-- Act 8 : Love is Dead
-- Act 8 : Reflection of Terror
-- Act 8 : The Gemling Legion
[9] = { level = 60, questPoints = 18 },
-- Act 9 : Queen of the Sands
-- Act 9 : The Ruler of Highgate
[10] = { level = 64, questPoints = 20 },
-- Act 10 : Vilenta's Vengeance
-- Act 10 : An End to Hunger (+2)
[11] = { level = 67, questPoints = 23 },
}

local function actExtra(act, extra)
-- Act 2 : Deal With The Bandits (+1 if the player kills all bandits)
return act > 2 and extra or 0
end

function buildMode:EstimatePlayerProgress()
local PointsUsed, AscUsed, SecondaryAscUsed = self.spec:CountAllocNodes()
local extra = self.calcsTab.mainOutput and self.calcsTab.mainOutput.ExtraPoints or 0
local usedMax, ascMax, secondaryAscMax, level, act = 99 + 22 + extra, 8, 8, 1, 0
local usedMax, ascMax, secondaryAscMax, level, act = 99 + 23 + extra, 8, 8, 1, 0

-- Find estimated act and level based on points used
repeat
Expand Down
14 changes: 3 additions & 11 deletions src/Modules/CalcSetup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -510,21 +510,13 @@ function calcs.initEnv(build, mode, override, specEnv)

-- Add bandit mods
if env.configInput.bandit == "Alira" then
modDB:NewMod("ManaRegen", "BASE", 5, "Bandit")
modDB:NewMod("CritMultiplier", "BASE", 20, "Bandit")
modDB:NewMod("ElementalResist", "BASE", 15, "Bandit")
elseif env.configInput.bandit == "Kraityn" then
modDB:NewMod("Speed", "INC", 6, "Bandit")
for _, ailment in ipairs(env.data.elementalAilmentTypeList) do
modDB:NewMod("Avoid"..ailment, "BASE", 10, "Bandit")
end
modDB:NewMod("MovementSpeed", "INC", 6, "Bandit")
modDB:NewMod("MovementSpeed", "INC", 8, "Bandit")
elseif env.configInput.bandit == "Oak" then
modDB:NewMod("LifeRegenPercent", "BASE", 1, "Bandit")
modDB:NewMod("PhysicalDamageReduction", "BASE", 2, "Bandit")
modDB:NewMod("PhysicalDamage", "INC", 20, "Bandit")
modDB:NewMod("Life", "BASE", 40, "Bandit")
else
modDB:NewMod("ExtraPoints", "BASE", 2, "Bandit")
modDB:NewMod("ExtraPoints", "BASE", 1, "Bandit")
end

-- Add Pantheon mods
Expand Down
8 changes: 4 additions & 4 deletions src/Modules/ConfigOptions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ end

local function banditTooltip(tooltip, mode, index, value)
local banditBenefits = {
["None"] = "Grants 2 Passive Skill Points",
["Oak"] = "Regenerate 1% of Life per second\n2% additional Physical Damage Reduction\n20% increased Physical Damage",
["Kraityn"] = "6% increased Attack and Cast Speed\n10% chance to Avoid Elemental Ailments\n6% increased Movement Speed",
["Alira"] = "Regenerate 5 Mana per second\n+20% to Critical Strike Multiplier\n+15% to all Elemental Resistances",
["None"] = "Grants 1 Passive Skill Point",
["Oak"] = "+40 to Maximum Life",
["Kraityn"] = "8% increased Movement Speed",
["Alira"] = "+15% to all Elemental Resistances",
}
local applyModes = { BODY = true, HOVER = true }
tooltip:Clear()
Expand Down

0 comments on commit e2090ed

Please sign in to comment.