Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions fix_ascendancy_positions.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def __sub__(self, other: Point2D) -> Point2D:
"Trickster": Point2D(10200, -3700),
"Saboteur": Point2D(10200, -2200),
"Ascendant": Point2D(-7800, 7200),
"Reliquarian": Point2D(-7800, 8900),
"Warden": Point2D(8250, 8350),
"Primalist": Point2D(7200, 9400),
"Warlock": Point2D(9300, 7300),
Expand All @@ -52,6 +53,7 @@ def __sub__(self, other: Point2D) -> Point2D:
"KingInTheMists": Point2D(3750, 12000),
"Olroth": Point2D(5250, 12000),
"Oshabi": Point2D(6750, 12000),
"Necromantic": Point2D(8250, 12000),
}
EXTRA_NODES = {
"Necromancer": [{"Node": {"name": "Nine Lives", "icon": "Art/2DArt/SkillIcons/passives/Ascendants/Int.png", "isNotable": True, "skill" : 27602},
Expand Down
2 changes: 1 addition & 1 deletion src/Classes/ImportTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ function ImportTabClass:BuildCharacterList(league)
elseif (charClass == "Juggernaut" or charClass == "Berserker" or charClass == "Chieftain" or
charClass == "Antiquarian" or charClass == "Behemoth" or charClass == "Ancestral Commander") then
classColor = colorCodes["MARAUDER"]
elseif (charClass == "Ascendant" or charClass == "Scavenger") then
elseif (charClass == "Ascendant" or charClass == "Reliquarian" or charClass == "Scavenger") then
classColor = colorCodes["SCION"]
end
end
Expand Down
4 changes: 2 additions & 2 deletions src/Classes/PassiveTree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,9 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
end
else
node.type = "Normal"
if (node.ascendancyName == "Ascendant" and not node.isMultipleChoiceOption and not node.dn:find("Dexterity")
if ((node.ascendancyName == "Ascendant" and not node.isMultipleChoiceOption and not node.dn:find("Dexterity")
and not node.dn:find("Intelligence") and not node.dn:find("Strength") and not node.dn:find("Passive"))
or (node.isMultipleChoiceOption and node.ascendancyName) then
or (node.isMultipleChoiceOption and node.ascendancyName)) and node.ascendancyName ~= "Reliquarian" then
local className = self.ascendNameMap[node.ascendancyName].class.name
self.ascendancyMap[node.dn:lower()] = node
if not self.classNotables[className] then
Expand Down
167 changes: 121 additions & 46 deletions src/Data/ModCache.lua

Large diffs are not rendered by default.

22 changes: 21 additions & 1 deletion src/GameVersions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ liveTargetVersion = "3_0"
---@type string[]
treeVersionList = { "2_6", "3_6", "3_7", "3_8", "3_9", "3_10", "3_11", "3_12", "3_13", "3_14", "3_15", "3_16", "3_17", "3_18", "3_19", "3_20", "3_21",
"3_22_ruthless", "3_22", "3_23_ruthless", "3_23", "3_24_ruthless", "3_24", "3_25_ruthless", "3_25_ruthless_alternate", "3_25_alternate", "3_25",
"3_26_ruthless", "3_26_ruthless_alternate", "3_26_alternate", "3_26", "3_27_ruthless", "3_27_ruthless_alternate", "3_27_alternate", "3_27" }
"3_26_ruthless", "3_26_ruthless_alternate", "3_26_alternate", "3_26", "3_27_ruthless", "3_27_ruthless_alternate", "3_27_alternate", "3_27", "3_28_ruthless", "3_28_ruthless_alternate", "3_28_alternate", "3_28" }
--- Always points to the latest skill tree version.
latestTreeVersion = treeVersionList[#treeVersionList]
---Tree version where multiple skill trees per build were introduced to PoBC.
Expand Down Expand Up @@ -192,6 +192,26 @@ treeVersions = {
num = 3.27,
url = "https://www.pathofexile.com/passive-skill-tree/3.27.0/",
},
["3_28_ruthless"] = {
display = "3.28 (ruthless)",
num = 3.28,
url = "https://www.pathofexile.com/passive-skill-tree/ruthless/",
},
["3_28_ruthless_alternate"] = {
display = "3.28 (ruthless alternate)",
num = 3.28,
url = "https://www.pathofexile.com/passive-skill-tree/ruthless-alternate/",
},
["3_28_alternate"] = {
display = "3.28 (alternate)",
num = 3.28,
url = "https://www.pathofexile.com/passive-skill-tree/alternate/",
},
["3_28"] = {
display = "3.28",
num = 3.28,
url = "https://www.pathofexile.com/passive-skill-tree/3.28.0/",
},
}

---Mapping PoEPlanner.com version when importing trees from there (https://cdn.poeplanner.com/json/versions.json)
Expand Down
Binary file added src/TreeData/3_28/ascendancy-3.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/background-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/bloodline-3.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/frame-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/group-background-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/jewel-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/jewel-radius.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/line-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/mastery-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/mastery-active-effect-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/mastery-active-selected-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/mastery-connected-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/mastery-disabled-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/skills-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/TreeData/3_28/skills-disabled-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading