Skip to content

Commit ed88758

Browse files
author
LocalIdentity
committed
Merge branch 'dev'
2 parents 161fe66 + 0fecd73 commit ed88758

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2539
-1010
lines changed

CHANGELOG.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,60 @@
11
# Changelog
22

3+
## [v2.56.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.56.0) (2025/08/11)
4+
5+
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.55.5...v2.56.0)
6+
7+
8+
## What's Changed
9+
### New to Path of Building
10+
- Add support for average Lightning Tendrils DPS [\#8930](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8930) ([LocalIdentity](https://github.com/LocalIdentity))
11+
- Show DPS comparison for Flask slots when hovering over Unique item list [\#8871](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8871) ([Blitz54](https://github.com/Blitz54))
12+
- Add Undo support to Tattoo/Runegraft overrides [\#8926](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8926) ([Blitz54](https://github.com/Blitz54))
13+
- Add total minimum weight parameter to Timeless Jewel finder [\#8787](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8787) ([tserdar](https://github.com/tserdar))
14+
- Add Beastcrafts to Item crafter [\#8904](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8904) ([brendan-corrigan](https://github.com/brendan-corrigan))
15+
- Add support for Defiance of Destiny Gain before enemy hit [\#7650](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7650) ([Regisle](https://github.com/Regisle))
16+
- Add support for duration of Ailments Retaliation mastery [\#8916](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8916) ([LocalIdentity](https://github.com/LocalIdentity))
17+
- Add support for Ancestral Commander Ancestral Spirit Minion buffs [\#8938](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8938) ([LocalIdentity](https://github.com/LocalIdentity))
18+
- Add support for Chieftain's Ramako, Sun's Light notable (Ruthless version) [\#8808](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8808) ([kisiex](https://github.com/kisiex))
19+
### Fixed Crashes
20+
- Fix crash when using "Add modifier" button on Tinctures [\#8905](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8905) ([brendan-corrigan](https://github.com/brendan-corrigan))
21+
### User Interface
22+
- Add text after red mods to show that PoB does not currently handle them [\#8925](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8925) ([LocalIdentity](https://github.com/LocalIdentity))
23+
- Display distance in Units in graphic for AoE breakdown [\#8845](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8845) ([Blitz54](https://github.com/Blitz54))
24+
- Tooltip text "tattoo" or "runegraft" based on node type [\#8922](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8922) ([Blitz54](https://github.com/Blitz54))
25+
### Fixed Calculations
26+
- Use harmonic mean for dual wield attack speed calc instead of average [\#8900](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8900) ([Tntmister](https://github.com/Tntmister))
27+
- Fix tincture quality effect multiplier rounding issue [\#8874](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8874) ([NL908](https://github.com/NL908))
28+
- Fix rounding of scaled mods being incorrect in some cases [\#8862](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8862) ([Wires77](https://github.com/Wires77))
29+
- Fix Temporal Chains double counting towards Brand Ticks [\#8915](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8915) ([LocalIdentity](https://github.com/LocalIdentity))
30+
- Fix Poison Conc of Bouncing not counting Chains towards DPS [\#8924](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8924) ([LocalIdentity](https://github.com/LocalIdentity))
31+
- Fix Glacial Hammer of Shattering missing crit chance every 3rd use [\#8931](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8931) ([LocalIdentity](https://github.com/LocalIdentity))
32+
- Fix Absolution/Dominating Blow of Inspiring FullDPS when using config [\#8945](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8945) ([LocalIdentity](https://github.com/LocalIdentity))
33+
### Fixed Behaviours
34+
- Fix Mine Aura effect scaling Curses used with High-Impact Mine [\#8883](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8883) ([LocalIdentity](https://github.com/LocalIdentity))
35+
- Fix Ancestral Bond disabling Generals Cry damage [\#8877](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8877) ([LocalIdentity](https://github.com/LocalIdentity))
36+
- Fix Hand of Phrecia disabling Mine Auras [\#8876](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8876) ([LocalIdentity](https://github.com/LocalIdentity))
37+
- Fix Light of Meaning double counting starting nodes on Ascendant [\#8875](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8875) ([LocalIdentity](https://github.com/LocalIdentity))
38+
- Fix Kaladra's Touch not copying influence from other ring [\#8888](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8888) ([LocalIdentity](https://github.com/LocalIdentity))
39+
- Fix Howlcrack causing inf DPS with Generals Cry [\#8889](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8889) ([Paliak](https://github.com/Paliak))
40+
- Fix issue where Rage Support was affecting Herald of Purity [\#8907](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8907) ([Wires77](https://github.com/Wires77))
41+
- Fix Volatility applying to Minion Spell skills [\#8912](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8912) ([LocalIdentity](https://github.com/LocalIdentity))
42+
- Fix Influence not appearing correctly in PoB Trader [\#8913](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8913) ([t1nky](https://github.com/t1nky))
43+
- Fix enemy Ailment Immunity not working with Rune of Treachery [\#8917](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8917) ([LocalIdentity](https://github.com/LocalIdentity))
44+
- Fix Shepherd of Souls applying twice with 2 Yaomac's Accord equipped [\#8918](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8918) ([LocalIdentity](https://github.com/LocalIdentity))
45+
- Fix node tooltip when using Untuitive Leap or Impossible Escape [\#8921](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8921) ([Kojoley](https://github.com/Kojoley))
46+
- Fix Ancestral Vision not working correctly with The Arkhon's Tools [\#8946](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8946) ([LocalIdentity](https://github.com/LocalIdentity))
47+
- Fix Ascendant/Gladiator Block Chance when using Necromantic Aegis [\#8944](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8944) ([LocalIdentity](https://github.com/LocalIdentity))
48+
### Accuracy Improvements
49+
- Fix Betrayal's Sting and Unique Talisman's missing catalyst scaling [\#8882](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8882) ([LocalIdentity](https://github.com/LocalIdentity))
50+
- Fix Devouring Diadem in unique list using suffix veiled mods [\#8878](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8878) ([LocalIdentity](https://github.com/LocalIdentity))
51+
- Add Catalyst tags to Whispers of Infinity [\#8843](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8843) ([linusalpsten](https://github.com/linusalpsten))
52+
- Update Cinderswallow and support new mods [\#8886](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8886) ([LocalIdentity](https://github.com/LocalIdentity))
53+
### Fixed Bugs
54+
- Fix importing characters with names that contain foreign letters [\#8935](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/8935) ([poyushih](https://github.com/poyushih))
55+
56+
57+
358
## [v2.55.5](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.55.5) (2025/07/18)
459

560
[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.55.4...v2.55.5)

changelog.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,59 @@
1+
VERSION[2.56.0][2025/08/11]
2+
3+
--- New to Path of Building ---
4+
* Add support for average Lightning Tendrils DPS (LocalIdentity)
5+
* Show DPS comparison for Flask slots when hovering over Unique item list (Blitz54)
6+
* Add Undo support to Tattoo/Runegraft overrides (Blitz54)
7+
* Add total minimum weight parameter to Timeless Jewel finder (tserdar)
8+
* Add Beastcrafts to Item crafter (brendan-corrigan)
9+
* Add support for Defiance of Destiny Gain before enemy hit (Regisle)
10+
* Add support for duration of Ailments Retaliation mastery (LocalIdentity)
11+
* Add support for Ancestral Commander Ancestral Spirit Minion buffs (LocalIdentity)
12+
* Add support for Chieftain's Ramako, Sun's Light notable (Ruthless version) (kisiex)
13+
14+
--- Fixed Crashes ---
15+
* Fix crash when using "Add modifier" button on Tinctures (brendan-corrigan)
16+
17+
--- User Interface ---
18+
* Add text after red mods to show that PoB does not currently handle them (LocalIdentity)
19+
* Display distance in Units in graphic for AoE breakdown (Blitz54)
20+
* Tooltip text "tattoo" or "runegraft" based on node type (Blitz54)
21+
22+
--- Fixed Calculations ---
23+
* Use harmonic mean for dual wield attack speed calc instead of average (Tntmister)
24+
* Fix tincture quality effect multiplier rounding issue (NL908)
25+
* Fix rounding of scaled mods being incorrect in some cases (Wires77)
26+
* Fix Temporal Chains double counting towards Brand Ticks (LocalIdentity)
27+
* Fix Poison Conc of Bouncing not counting Chains towards DPS (LocalIdentity)
28+
* Fix Glacial Hammer of Shattering missing crit chance every 3rd use (LocalIdentity)
29+
* Fix Absolution/Dominating Blow of Inspiring FullDPS when using config (LocalIdentity)
30+
31+
--- Fixed Behaviours ---
32+
* Fix Mine Aura effect scaling Curses used with High-Impact Mine (LocalIdentity)
33+
* Fix Ancestral Bond disabling Generals Cry damage (LocalIdentity)
34+
* Fix Hand of Phrecia disabling Mine Auras (LocalIdentity)
35+
* Fix Light of Meaning double counting starting nodes on Ascendant (LocalIdentity)
36+
* Fix Kaladra's Touch not copying influence from other ring (LocalIdentity)
37+
* Fix Howlcrack causing inf DPS with Generals Cry (Paliak)
38+
* Fix issue where Rage Support was affecting Herald of Purity (Wires77)
39+
* Fix Volatility applying to Minion Spell skills (LocalIdentity)
40+
* Fix Influence not appearing correctly in PoB Trader (t1nky)
41+
* Fix enemy Ailment Immunity not working with Rune of Treachery (LocalIdentity)
42+
* Fix Shepherd of Souls applying twice with 2 Yaomac's Accord equipped (LocalIdentity)
43+
* Fix node tooltip when using Untuitive Leap or Impossible Escape (Kojoley)
44+
* Fix Ancestral Vision not working correctly with The Arkhon's Tools (LocalIdentity)
45+
* Fix Ascendant/Gladiator Block Chance when using Necromantic Aegis (LocalIdentity)
46+
47+
--- Accuracy Improvements ---
48+
* Fix Betrayal's Sting and Unique Talisman's missing catalyst scaling (LocalIdentity)
49+
* Fix Devouring Diadem in unique list using suffix veiled mods (LocalIdentity)
50+
* Add Catalyst tags to Whispers of Infinity (linusalpsten)
51+
* Update Cinderswallow and support new mods (LocalIdentity)
52+
53+
--- Fixed Bugs ---
54+
* Fix importing characters with names that contain foreign letters (poyushih)
55+
56+
157
VERSION[2.55.5][2025/07/18]
258
--- New to Path of Building ---
359
* Add support for Replica Dragonfang's Flight variants (linusalpsten)

manifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<PoBVersion>
3-
<Version number="2.55.5" />
3+
<Version number="2.56.0" />
44
<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
55
<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime/" />
66
<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />

src/Assets/range_guide.png

216 KB
Loading

src/Classes/GemSelectControl.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,9 @@ function GemSelectClass:AddCommonGemInfo(gemInstance, grantedEffect, addReq, mer
719719
if launch.devModeAlt then
720720
line = line .. " ^1" .. lineMap[line]
721721
end
722-
self.tooltip:AddLine(16, colorCodes.UNSUPPORTED .. line)
722+
local line = colorCodes.UNSUPPORTED .. line
723+
line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
724+
self.tooltip:AddLine(16, line)
723725
end
724726
end
725727
end

src/Classes/ImportTab.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ function ImportTabClass:DownloadPassiveTree()
597597
local sessionID = #self.controls.sessionInput.buf == 32 and self.controls.sessionInput.buf or (main.gameAccounts[accountName] and main.gameAccounts[accountName].sessionID)
598598
local charSelect = self.controls.charSelect
599599
local charData = charSelect.list[charSelect.selIndex].char
600-
launch:DownloadPage(realm.hostName.."character-window/get-passive-skills?accountName="..accountName:gsub("#", "%%23").."&character="..charData.name.."&realm="..realm.realmCode, function(response, errMsg)
600+
launch:DownloadPage(realm.hostName.."character-window/get-passive-skills?accountName="..accountName:gsub("#", "%%23").."&character="..urlEncode(charData.name).."&realm="..realm.realmCode, function(response, errMsg)
601601
self.charImportMode = "SELECTCHAR"
602602
if errMsg then
603603
self.charImportStatus = colorCodes.NEGATIVE.."Error importing character data, try again ("..errMsg:gsub("\n"," ")..")"
@@ -619,7 +619,7 @@ function ImportTabClass:DownloadItems()
619619
local sessionID = #self.controls.sessionInput.buf == 32 and self.controls.sessionInput.buf or (main.gameAccounts[accountName] and main.gameAccounts[accountName].sessionID)
620620
local charSelect = self.controls.charSelect
621621
local charData = charSelect.list[charSelect.selIndex].char
622-
launch:DownloadPage(realm.hostName.."character-window/get-items?accountName="..accountName:gsub("#", "%%23").."&character="..charData.name.."&realm="..realm.realmCode, function(response, errMsg)
622+
launch:DownloadPage(realm.hostName.."character-window/get-items?accountName="..accountName:gsub("#", "%%23").."&character="..urlEncode(charData.name).."&realm="..realm.realmCode, function(response, errMsg)
623623
self.charImportMode = "SELECTCHAR"
624624
if errMsg then
625625
self.charImportStatus = colorCodes.NEGATIVE.."Error importing character data, try again ("..errMsg:gsub("\n"," ")..")"

src/Classes/Item.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,8 @@ function ItemClass:GetPrimarySlot()
12621262
return "Ring 1"
12631263
elseif self.type == "Flask" then
12641264
return "Flask 1"
1265+
elseif self.type == "Tincture" then
1266+
return "Flask 1"
12651267
else
12661268
return self.type
12671269
end

src/Classes/ItemDBControl.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ local ItemDBClass = newClass("ItemDBControl", "ListControl", function(self, anch
2626
self.leaguesAndTypesLoaded = false
2727
self.leagueList = { "Any league", "No league" }
2828
self.typeList = { "Any type", "Armour", "Jewellery", "One Handed Melee", "Two Handed Melee" }
29-
self.slotList = { "Any slot", "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring", "Belt", "Jewel" }
29+
self.slotList = { "Any slot", "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring", "Belt", "Jewel", "Flask" }
3030
local baseY = dbType == "RARE" and -22 or -62
3131
self.controls.slot = new("DropDownControl", {"BOTTOMLEFT",self,"TOPLEFT"}, {0, baseY, 179, 18}, self.slotList, function(index, value)
3232
self.listBuildFlag = true

src/Classes/ItemsTab.lua

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,13 @@ holding Shift will put it in the second.]])
762762
if node.sd[1] then
763763
tooltip:AddLine(16, "")
764764
for i, line in ipairs(node.sd) do
765-
tooltip:AddLine(16, ((node.mods[i].extra or not node.mods[i].list) and colorCodes.UNSUPPORTED or colorCodes.MAGIC)..line)
765+
if line ~= " " and (node.mods[i].extra or not node.mods[i].list) then
766+
local line = colorCodes.UNSUPPORTED .. line
767+
line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
768+
tooltip:AddLine(16, line)
769+
else
770+
tooltip:AddLine(16, colorCodes.MAGIC..line)
771+
end
766772
end
767773
end
768774

@@ -2691,24 +2697,44 @@ function ItemsTabClass:AddCustomModifierToDisplayItem()
26912697
return a.defaultOrder < b.defaultOrder
26922698
end
26932699
end)
2700+
elseif sourceId == "BEASTCRAFT" then
2701+
for i, mod in pairs(self.build.data.beastCraft) do
2702+
t_insert(modList, {
2703+
label = table.concat(mod, "/") .. " (" .. mod.type .. ")",
2704+
mod = mod,
2705+
affixType = mod.type,
2706+
type = "custom",
2707+
defaultOrder = i,
2708+
})
2709+
end
2710+
table.sort(modList, function(a, b)
2711+
if a.affixType ~= b.affixType then
2712+
return a.affixType == "Prefix" and b.affixType == "Suffix"
2713+
else
2714+
return a.defaultOrder < b.defaultOrder
2715+
end
2716+
end)
26942717
end
26952718
end
2696-
if self.displayItem.type ~= "Jewel" then
2697-
t_insert(sourceList, { label = "Crafting Bench", sourceId = "MASTER" })
2698-
end
2699-
if self.displayItem.type ~= "Jewel" and self.displayItem.type ~= "Flask" then
2700-
t_insert(sourceList, { label = "Essence", sourceId = "ESSENCE" })
2701-
t_insert(sourceList, { label = "Veiled", sourceId = "VEILED"})
2702-
end
2703-
if self.displayItem.type == "Helmet" or self.displayItem.type == "Body Armour" or self.displayItem.type == "Gloves" or self.displayItem.type == "Boots" then
2704-
t_insert(sourceList, { label = "Necropolis", sourceId = "NECROPOLIS"})
2705-
end
2706-
if not self.displayItem.clusterJewel and self.displayItem.type ~= "Flask" then
2707-
t_insert(sourceList, { label = "Delve", sourceId = "DELVE"})
2708-
end
2709-
if not self.displayItem.crafted then
2710-
t_insert(sourceList, { label = "Prefix", sourceId = "PREFIX" })
2711-
t_insert(sourceList, { label = "Suffix", sourceId = "SUFFIX" })
2719+
if self.displayItem.type ~= "Tincture" then
2720+
if self.displayItem.type ~= "Jewel" then
2721+
t_insert(sourceList, { label = "Crafting Bench", sourceId = "MASTER" })
2722+
end
2723+
if self.displayItem.type ~= "Jewel" and self.displayItem.type ~= "Flask" then
2724+
t_insert(sourceList, { label = "Essence", sourceId = "ESSENCE" })
2725+
t_insert(sourceList, { label = "Veiled", sourceId = "VEILED"})
2726+
t_insert(sourceList, { label = "Beastcraft", sourceId = "BEASTCRAFT" })
2727+
end
2728+
if self.displayItem.type == "Helmet" or self.displayItem.type == "Body Armour" or self.displayItem.type == "Gloves" or self.displayItem.type == "Boots" then
2729+
t_insert(sourceList, { label = "Necropolis", sourceId = "NECROPOLIS"})
2730+
end
2731+
if not self.displayItem.clusterJewel and self.displayItem.type ~= "Flask" then
2732+
t_insert(sourceList, { label = "Delve", sourceId = "DELVE"})
2733+
end
2734+
if not self.displayItem.crafted then
2735+
t_insert(sourceList, { label = "Prefix", sourceId = "PREFIX" })
2736+
t_insert(sourceList, { label = "Suffix", sourceId = "SUFFIX" })
2737+
end
27122738
end
27132739
t_insert(sourceList, { label = "Custom", sourceId = "CUSTOM" })
27142740
buildMods(sourceList[1].sourceId)
@@ -3318,7 +3344,13 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
33183344
main:StatColor(flaskData.chargesMax, base.flask.chargesMax), flaskData.chargesMax
33193345
))
33203346
for _, modLine in pairs(item.buffModLines) do
3321-
tooltip:AddLine(16, (modLine.extra and colorCodes.UNSUPPORTED or colorCodes.MAGIC) .. modLine.line)
3347+
if modLine.extra then
3348+
local line = colorCodes.UNSUPPORTED..modLine.line
3349+
line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
3350+
tooltip:AddLine(16, line)
3351+
else
3352+
tooltip:AddLine(16, colorCodes.MAGIC..modLine.line)
3353+
end
33223354
end
33233355
elseif base.tincture then
33243356
-- Tincture-specific info
@@ -3331,7 +3363,13 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
33313363
tooltip:AddLine(16, s_format("^x7F7F7FInflicts Mana Burn every %s%.2f ^x7F7F7FSeconds", main:StatColor(tinctureData.manaBurn, base.tincture.manaBurn), tinctureData.manaBurn))
33323364
tooltip:AddLine(16, s_format("^x7F7F7F%s%.2f ^x7F7F7FSecond Cooldown When Deactivated", main:StatColor(tinctureData.cooldown, base.tincture.cooldown), tinctureData.cooldown))
33333365
for _, modLine in pairs(item.buffModLines) do
3334-
tooltip:AddLine(16, (modLine.extra and colorCodes.UNSUPPORTED or colorCodes.MAGIC) .. modLine.line)
3366+
if modLine.extra then
3367+
local line = colorCodes.UNSUPPORTED..modLine.line
3368+
line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
3369+
tooltip:AddLine(16, line)
3370+
else
3371+
tooltip:AddLine(16, colorCodes.MAGIC..modLine.line)
3372+
end
33353373
end
33363374
elseif item.type == "Jewel" then
33373375
-- Jewel-specific info

src/Classes/ModList.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function ModListClass:ReplaceModInternal(mod)
4646
end
4747

4848
function ModListClass:MergeMod(mod)
49-
if mod.type == "BASE" or mod.type == "INC" then
49+
if mod.type == "BASE" or mod.type == "INC" or mod.type == "MORE" then
5050
for i = 1, #self do
5151
if modLib.compareModParams(self[i], mod) then
5252
self[i] = copyTable(self[i], true)

0 commit comments

Comments
 (0)