Skip to content

[pob2-port] Add gem quality breakdown and break down quality in tooltips #10366

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
github-actions wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[pob2-port] Add gem quality breakdown and break down quality in tooltips #10366

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
10 changes: 10 additions & 0 deletions src/Classes/GemTooltip.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff a/src/Classes/GemTooltip.lua b/src/Classes/GemTooltip.lua (rejected hunks)
@@ -116,7 +116,7 @@ local function addGrantedEffectInfo(tooltip, build, gemInstance, grantedEffect,
local gemQuality = gemInstance.quality
if gemQuality > 0
then
- tooltip:AddLine(fontSizeBig, colorCodes.GEMINFO .. " Quality: ^7" .. colorCodes.MAGIC .. gemQuality .. "%", "FONTIN SC")
+ tooltip:AddLine(fontSizeBig, colorCodes.GEMINFO .. " Quality: ^7" .. colorCodes.MAGIC .. "+".. gemQuality .. "%", "FONTIN SC")
end
if totalGlobalQuality > 0 then
tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. " +" .. totalGlobalQuality .. "% Quality from Global Modifiers", "FONTIN SC")
2 changes: 1 addition & 1 deletion src/Modules/CalcActiveSkill.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)

for _, gemProperty in ipairs((activeSkill.activeEffect.gemPropertyInfo or {})) do
local value = gemProperty.value
skillModList:NewMod("GemItem".. value.key:gsub("^%l", string.upper), "BASE", value.value, gemProperty.mod.source, #gemProperty.mod > 0 and gemProperty.mod[1] or nil)
skillModList:NewMod("GemGlobal" .. value.key:gsub("^%l", string.upper), "BASE", value.value, gemProperty.mod.source, #gemProperty.mod > 0 and gemProperty.mod[1] or nil)
end

-- Add active gem modifiers
Expand Down
12 changes: 12 additions & 0 deletions src/Modules/CalcActiveSkill.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua (rejected hunks)
@@ -787,6 +787,10 @@ function calcs.buildActiveSkillModList(env, activeSkill)
local gemMaxLevel = supportGrantedInheritedLevel or (activeSkill.activeEffect.srcInstance and activeSkill.activeEffect.srcInstance.level) or activeSkill.activeEffect.level
local gemMaxLevelSource = supportGrantedInheritedLevel and "Inherited Max Level" or "Max Level"
skillModList:NewMod("GemLevel", "BASE", gemMaxLevel, gemMaxLevelSource)
+ local gemBaseQuality = (activeSkill.activeEffect.srcInstance and activeSkill.activeEffect.srcInstance.quality) or activeSkill.activeEffect.quality
+ if gemBaseQuality then
+ skillModList:NewMod("GemQuality", "BASE", gemBaseQuality, "Gem Quality")
+ end
if activeSkill.activeEffect.srcInstance and activeSkill.activeEffect.srcInstance.corrupted and not (activeSkill.activeEffect.srcInstance.fromItem or activeSkill.activeEffect.srcInstance.fromTree or activeSkill.activeEffect.grantedEffect.fromItem or activeSkill.activeEffect.grantedEffect.fromTree) then
skillModList:NewMod("GemCorruptionLevel", "BASE", activeSkill.activeEffect.srcInstance.corruptLevel, "Corruption")
activeSkill.skillCfg.skillCond["GemCorrupted"] = true
10 changes: 10 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,10 @@
diff a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua (rejected hunks)
@@ -3695,7 +3695,7 @@ function calcs.perform(env, skipEHP)
t_insert(env.player.breakdown.GemQuality, s_format("+ %d ^8(quality from supports)", totalSupportQuality))
end
if totalGlobalQuality > 0 then
- t_insert(env.player.breakdown.GemQuality, s_format("+ %d ^8(quality from items and tree)", totalGlobalQuality))
+ t_insert(env.player.breakdown.GemQuality, s_format("+ %d ^8(quality from global modifiers)", totalGlobalQuality))
end
t_insert(env.player.breakdown.GemQuality, s_format("= %d", output.GemQuality))
end
11 changes: 11 additions & 0 deletions src/Modules/CalcSections.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff a/src/Modules/CalcSections.lua b/src/Modules/CalcSections.lua (rejected hunks)
@@ -698,7 +698,8 @@ return {
} }
} },
{ 1, "SkillTypeStats", 1, colorCodes.OFFENCE, {{ defaultCollapsed = false, label = "Skill type-specific Stats", data = {
- { label = "Gem Level", notFlag = "thorns", haveOutput = "GemHasLevel", { format = "{0:output:GemLevel}", { breakdown = "GemLevel" }, { modName = { "GemLevel" }, cfg = "skill" }, { modName = { "GemSupportLevel" }, cfg = "skill", notSkillData = "inheritsGemLevel" }, { modName = { "GemItemLevel" }, cfg = "skill", notSkillData = "inheritsGemLevel" }, { modName = { "GemCorruptionLevel" }, cfg = "skill", notSkillData = "inheritsGemLevel" } }, },
+ { label = "Gem Level", notFlag = "thorns", haveOutput = "GemHasLevel", { format = "{0:output:GemLevel}", { breakdown = "GemLevel" }, { modName = { "GemLevel" }, cfg = "skill" }, { modName = { "GemSupportLevel" }, cfg = "skill", notSkillData = "inheritsGemLevel" }, { modName = { "GemGlobalLevel" }, cfg = "skill", notSkillData = "inheritsGemLevel" }, { modName = { "GemCorruptionLevel" }, cfg = "skill", notSkillData = "inheritsGemLevel" } }, },
+ { label = "Gem Quality", notFlag = "thorns", haveOutput = "GemQuality", { format = "{0:output:GemQuality}%", { breakdown = "GemQuality" }, { modName = { "GemQuality" }, cfg = "skill" }, { modName = { "GemSupportQuality" }, cfg = "skill" }, { modName = { "GemGlobalQuality" }, cfg = "skill" } }, },
{ label = "Spirit Cost", color = colorCodes.SPIRIT, haveOutput = "SpiritHasCost", { format = "{0:output:SpiritCost}", { breakdown = "SpiritCost" }, { modName = { "SpiritCost", "Cost", "SpiritCostNoMult" }, cfg = "skill" }, }, },
{ label = "Spirit % Cost", color = colorCodes.SPIRIT, haveOutput = "SpiritPercentHasCost", { format = "{0:output:SpiritPercentCost}", { breakdown = "SpiritPercentCost" }, { modName = { "SpiritCost", "Cost", "SpiritCostNoMult" }, cfg = "skill" }, }, },
{ label = "Mana Cost", color = colorCodes.MANA, haveOutput = "ManaHasCost", { format = "{0:output:ManaCost}", { breakdown = "ManaCost" }, { modName = { "ManaCost", "Cost", "ManaCostNoMult" }, cfg = "skill" }, }, },