Skip to content

Commit 0550a68

Browse files
author
LocalIdentity
committed
Change tree version
1 parent 4929636 commit 0550a68

File tree

80 files changed

+20
-51
lines changed

Some content is hidden

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

80 files changed

+20
-51
lines changed

src/Classes/PassiveTree.lua

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,10 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
8181
end
8282

8383
self.size = m_min(self.max_x - self.min_x, self.max_y - self.min_y) * self.scaleImage * 1.1
84-
85-
if versionNum >= 3.10 then
86-
-- Migrate to old format
87-
for i = 0, 6 do
88-
self.classes[i] = self.classes[i + 1]
89-
self.classes[i + 1] = nil
90-
end
84+
85+
for i = 0, 6 do
86+
self.classes[i] = self.classes[i + 1]
87+
self.classes[i + 1] = nil
9188
end
9289

9390
-- Build maps of class name -> class table
@@ -96,10 +93,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
9693
self.classNotables = { }
9794

9895
for classId, class in pairs(self.classes) do
99-
if versionNum >= 3.10 then
100-
-- Migrate to old format
101-
class.classes = class.ascendancies
102-
end
96+
class.classes = class.ascendancies
10397
class.classes[0] = { name = "None" }
10498
self.classNameMap[class.name] = classId
10599
for ascendClassId, ascendClass in pairs(class.classes) do
@@ -187,20 +181,17 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
187181
data.size = artWidth
188182
data.rsq = data.size * data.size
189183
end
190-
191-
if versionNum >= 3.10 then
192-
-- Migrate groups to old format
193-
for _, group in pairs(self.groups) do
194-
group.n = group.nodes
195-
group.oo = { }
196-
for _, orbit in ipairs(group.orbits) do
197-
group.oo[orbit] = true
198-
end
184+
185+
for _, group in pairs(self.groups) do
186+
group.n = group.nodes
187+
group.oo = { }
188+
for _, orbit in ipairs(group.orbits) do
189+
group.oo[orbit] = true
199190
end
191+
end
200192

201193
-- Go away
202194
self.nodes.root = nil
203-
end
204195

205196
ConPrintf("Processing tree...")
206197
self.ascendancyMap = { }

src/Export/Scripts/passivetree.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ local use4kIfPossible = false
252252
local idPassiveTree = 'Default'
253253
-- Find a way to get version
254254
local basePath = GetWorkDir() .. "/../TreeData/"
255-
local version = "4_0"
255+
local version = "0_1"
256256
local path = basePath .. version .. "/"
257257
local fileTree = path .. "tree.lua"
258258

src/GameVersions.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
-- Game versions
22
---Default target version for unknown builds and builds created before 3.0.0.
3-
legacyTargetVersion = "3_0"
3+
legacyTargetVersion = "0_0"
44
---Default target for new builds and target to convert legacy builds to.
5-
liveTargetVersion = "4_0"
5+
liveTargetVersion = "0_1"
66

77
-- Skill tree versions
88
---Added for convenient indexing of skill tree versions.
99
---@type string[]
10-
treeVersionList = { "4_0" }
10+
treeVersionList = { "0_1" }
1111
--- Always points to the latest skill tree version.
1212
latestTreeVersion = treeVersionList[#treeVersionList]
1313
---Tree version where multiple skill trees per build were introduced to PoBC.
1414
defaultTreeVersion = treeVersionList[1]
1515
---Display, comparison and export data for all supported skill tree versions.
1616
---@type table<string, {display: string, num: number, url: string}>
1717
treeVersions = {
18-
["4_0"] = {
19-
display = "POE 2",
20-
num = 4.0,
18+
["0_1"] = {
19+
display = "0_1",
20+
num = 0.1,
2121
},
2222
}

src/Modules/Data.lua

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -479,29 +479,7 @@ data.setJewelRadiiGlobally = function(treeVersion)
479479
end
480480

481481
data.jewelRadii = {
482-
["3_15"] = {
483-
{ inner = 0, outer = 800, col = "^xBB6600", label = "Small" },
484-
{ inner = 0, outer = 1200, col = "^x66FFCC", label = "Medium" },
485-
{ inner = 0, outer = 1500, col = "^x2222CC", label = "Large" },
486-
487-
{ inner = 850, outer = 1100, col = "^xD35400", label = "Variable" },
488-
{ inner = 1150, outer = 1400, col = "^x66FFCC", label = "Variable" },
489-
{ inner = 1450, outer = 1700, col = "^x2222CC", label = "Variable" },
490-
{ inner = 1750, outer = 2000, col = "^xC100FF", label = "Variable" },
491-
{ inner = 1750, outer = 2000, col = "^xC100FF", label = "Variable" },
492-
},
493-
["3_16"] = {
494-
{ inner = 0, outer = 960, col = "^xBB6600", label = "Small" },
495-
{ inner = 0, outer = 1440, col = "^x66FFCC", label = "Medium" },
496-
{ inner = 0, outer = 1800, col = "^x2222CC", label = "Large" },
497-
498-
{ inner = 960, outer = 1320, col = "^xD35400", label = "Variable" },
499-
{ inner = 1320, outer = 1680, col = "^x66FFCC", label = "Variable" },
500-
{ inner = 1680, outer = 2040, col = "^x2222CC", label = "Variable" },
501-
{ inner = 2040, outer = 2400, col = "^xC100FF", label = "Variable" },
502-
{ inner = 2400, outer = 2880, col = "^x0B9300", label = "Variable" },
503-
},
504-
["4_0"] = {
482+
["0_1"] = {
505483
{ inner = 0, outer = 1000, col = "^xBB6600", label = "Small" },
506484
{ inner = 0, outer = 1150, col = "^x66FFCC", label = "Medium" },
507485
{ inner = 0, outer = 1300, col = "^x2222CC", label = "Large" },

0 commit comments

Comments
 (0)