Skip to content

Commit d0e1e81

Browse files
committed
1 parent a3d1562 commit d0e1e81

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

src/Classes/CalcBreakdownControl.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
466466
elseif tag.type == "MultiplierThreshold" or tag.type == "StatThreshold" then
467467
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))
468468
elseif tag.type == "SkillName" then
469-
desc = "Skill: "..(tag.skillNameList and table.concat(tag.skillNameList, "/") or tag.skillName)
469+
desc = "Skill: "..(tag.skillNameList and table.concat(tag.skillNameList, " / ") or tag.skillName)
470470
elseif tag.type == "SkillId" then
471471
desc = "Skill: "..build.data.skills[tag.skillId].name
472472
elseif tag.type == "SkillType" then
@@ -503,7 +503,7 @@ function CalcBreakdownClass:FormatModName(modName)
503503
end
504504

505505
function CalcBreakdownClass:FormatVarNameOrList(var, varList)
506-
return var and self:FormatModName(var) or table.concat(varList, "/")
506+
return var and self:FormatModName(var) or self:FormatModName(table.concat(varList, " / "))
507507
end
508508

509509
function CalcBreakdownClass:FormatModBase(mod, base)

src/Modules/CalcPerform.lua.rej

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua (rejected hunks)
2+
@@ -322,7 +322,7 @@ local function doActorAttribsConditions(env, actor)
3+
modDB:NewMod("Damage", "MORE", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "FrenzyCharge" })
4+
modDB:NewMod("PhysicalDamageReduction", "BASE", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "EnduranceCharge" })
5+
modDB:NewMod("ElementalDamageReduction", "BASE", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", var = "EnduranceCharge" })
6+
- modDB:NewMod("Damage", "INC", m_floor(4 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", varList = { "PowerCharge", "FrenzyCharge", "EnduranceCharge" }})
7+
+ modDB:NewMod("Damage", "INC", m_floor(5 * shrineEffectMod), "Resonating Shrine", { type = "Multiplier", varList = { "PowerCharge", "FrenzyCharge", "EnduranceCharge" }})
8+
end
9+
if modDB:Flag(nil, "LesserAccelerationShrine") and not modDB:Flag(nil, "AccelerationShrine") then
10+
modDB:NewMod("ActionSpeed", "INC", m_floor(10 * shrineEffectMod), "Lesser Acceleration Shrine")

0 commit comments

Comments
 (0)