Skip to content

Commit 5cb2331

Browse files
committed
Fix warden import crash
1 parent 7b10380 commit 5cb2331

1 file changed

Lines changed: 31 additions & 28 deletions

File tree

src/Classes/PassiveTree.lua

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -106,33 +106,6 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
106106
self.internalAscendNameMap = {}
107107
self.classNotables = {}
108108

109-
for classId, class in pairs(self.classes) do
110-
if versionNum >= 3.10 then
111-
-- Migrate to old format
112-
class.classes = class.ascendancies
113-
end
114-
class.classes[0] = { name = "None" }
115-
self.classNameMap[class.name] = classId
116-
for ascendClassId, ascendClass in pairs(class.classes) do
117-
self.ascendNameMap[ascendClass.id or ascendClass.name] = {
118-
classId = classId,
119-
class = class,
120-
ascendClassId = ascendClassId,
121-
ascendClass = ascendClass,
122-
flavourText = ascendClass.flavourText,
123-
flavourTextRect = ascendClass.flavourTextRect,
124-
}
125-
if ascendClass.internalId then
126-
self.internalAscendNameMap[ascendClass.internalId] = {
127-
classId = classId,
128-
class = class,
129-
ascendClassId = ascendClassId,
130-
ascendClass = ascendClass
131-
}
132-
end
133-
end
134-
end
135-
136109
-- hide legacy alternate ascendancies that are no longer obtainable
137110
if self.alternate_ascendancies then
138111
local legacyAlternateAscendancyIds = {
@@ -178,7 +151,37 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
178151
self.alternate_ascendancies = nil
179152
end
180153
end
181-
154+
155+
for classId, class in pairs(self.classes) do
156+
if versionNum >= 3.10 then
157+
-- Migrate to old format
158+
class.classes = class.ascendancies
159+
end
160+
class.classes[0] = { name = "None" }
161+
self.classNameMap[class.name] = classId
162+
for ascendClassId, ascendClass in pairs(class.classes) do
163+
local entry = {
164+
classId = classId,
165+
class = class,
166+
ascendClassId = ascendClassId,
167+
ascendClass = ascendClass,
168+
flavourText = ascendClass.flavourText,
169+
flavourTextRect = ascendClass.flavourTextRect,
170+
}
171+
if ascendClass.id then
172+
self.ascendNameMap[ascendClass.id] = entry
173+
end
174+
self.ascendNameMap[ascendClass.name] = entry
175+
if ascendClass.internalId then
176+
self.internalAscendNameMap[ascendClass.internalId] = {
177+
classId = classId,
178+
class = class,
179+
ascendClassId = ascendClassId,
180+
ascendClass = ascendClass
181+
}
182+
end
183+
end
184+
end
182185
if self.alternate_ascendancies then
183186
self.secondaryAscendNameMap = { }
184187
local alternate_ascendancies_class = {

0 commit comments

Comments
 (0)