Skip to content

Commit 12da634

Browse files
LocalIdentityLocalIdentity
andauthored
Fix Resonating Shrine inc damage calculation (#9249)
* Fix Resonating Shrine inc damage calculation With the multiple multiplier arguments it was multiplying the charge counts instead of adding them Also changed the display of varList in the breakdown so now it is neater with space between the variables * Fix inc damage base value --------- Co-authored-by: LocalIdentity <[email protected]>
1 parent 516983a commit 12da634

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Classes/CalcBreakdownControl.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
457457
elseif tag.type == "MultiplierThreshold" or tag.type == "StatThreshold" then
458458
desc = "If "..self:FormatVarNameOrList(tag.var or tag.stat, tag.varList or tag.statList)..(tag.upper and " <= " or " >= ")..(tag.thresholdPercent and tag.thresholdPercent.."% " or "")..(tag.threshold or self:FormatModName(tag.thresholdVar or tag.thresholdStat))
459459
elseif tag.type == "SkillName" then
460-
desc = "Skill: "..(tag.skillNameList and table.concat(tag.skillNameList, "/") or tag.skillName)
460+
desc = "Skill: "..(tag.skillNameList and table.concat(tag.skillNameList, " / ") or tag.skillName)
461461
elseif tag.type == "SkillId" then
462462
desc = "Skill: "..build.data.skills[tag.skillId].name
463463
elseif tag.type == "SkillType" then
@@ -494,7 +494,7 @@ function CalcBreakdownClass:FormatModName(modName)
494494
end
495495

496496
function CalcBreakdownClass:FormatVarNameOrList(var, varList)
497-
return var and self:FormatModName(var) or table.concat(varList, "/")
497+
return var and self:FormatModName(var) or self:FormatModName(table.concat(varList, " / "))
498498
end
499499

500500
function CalcBreakdownClass:FormatModBase(mod, base)

src/Modules/CalcPerform.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ local function doActorAttribsConditions(env, actor)
322322
modDB:NewMod("Damage", "MORE", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "FrenzyCharge" })
323323
modDB:NewMod("PhysicalDamageReduction", "BASE", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "EnduranceCharge" })
324324
modDB:NewMod("ElementalDamageReduction", "BASE", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "EnduranceCharge" })
325-
modDB:NewMod("Damage", "INC", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "PowerCharge" }, { type = "Multiplier", var = "FrenzyCharge" }, { type = "Multiplier", var = "EnduranceCharge" })
325+
modDB:NewMod("Damage", "INC", m_floor(5 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", varList = { "PowerCharge", "FrenzyCharge", "EnduranceCharge" }})
326326
end
327327
if modDB:Flag(nil, "LesserAccelerationShrine") and not modDB:Flag(nil, "AccelerationShrine") then
328328
modDB:NewMod("ActionSpeed", "INC", m_floor(10 * shrineEffectMod), "Lesser Acceleration Shrine")

0 commit comments

Comments
 (0)