mirror of Walter-Sparrow / lunar-tear
Wizard: accept un-split revision-0 asset tree
+17
-11
+17
-11
server/cmd/wizard/main.go
+17
-11
server/cmd/wizard/main.go
···
124
124
{"assets/release/20240404193219.bin.e", false},
125
125
}
126
126
127
-
// platformAssets holds the per-platform rev-0 layout. At least one full set
128
-
// must be present; users may have only Android or only iOS extracted.
129
-
var platformAssets = [][]assetCheck{
127
+
// assetTrees lists every rev-0 layout the CDN accepts. At least one full set
128
+
// must be present; users may have only the un-split shared tree, only Android,
129
+
// only iOS, or any combination.
130
+
var assetTrees = [][]assetCheck{
131
+
{
132
+
{"assets/revisions/0/list.bin", false},
133
+
{"assets/revisions/0/assetbundle", true},
134
+
{"assets/revisions/0/resources", true},
135
+
},
130
136
{
131
137
{"assets/revisions/0/android/list.bin", false},
132
138
{"assets/revisions/0/android/assetbundle", true},
···
161
167
}
162
168
}
163
169
164
-
var platformMissing [][]string
165
-
anyPlatformOK := false
166
-
for _, group := range platformAssets {
170
+
var treeMissing [][]string
171
+
anyTreeOK := false
172
+
for _, group := range assetTrees {
167
173
var groupMissing []string
168
174
for _, a := range group {
169
175
if m, ok := checkAsset(a); !ok {
···
171
177
}
172
178
}
173
179
if len(groupMissing) == 0 {
174
-
anyPlatformOK = true
180
+
anyTreeOK = true
175
181
}
176
-
platformMissing = append(platformMissing, groupMissing)
182
+
treeMissing = append(treeMissing, groupMissing)
177
183
}
178
-
if !anyPlatformOK {
179
-
for _, gm := range platformMissing {
184
+
if !anyTreeOK {
185
+
for _, gm := range treeMissing {
180
186
missing = append(missing, gm...)
181
187
}
182
188
}
···
200
206
b.WriteString("\n")
201
207
b.WriteString(dimStyle.Render(" Place the extracted game assets under server/assets/ and try again."))
202
208
b.WriteString("\n")
203
-
b.WriteString(dimStyle.Render(" At least one of assets/revisions/0/android/ or assets/revisions/0/ios/ must be fully present."))
209
+
b.WriteString(dimStyle.Render(" At least one of assets/revisions/0/, assets/revisions/0/android/, or assets/revisions/0/ios/ must be fully present."))
204
210
b.WriteString("\n")
205
211
b.WriteString(dimStyle.Render(" Get them from ") + hlStyle.Render("#resources") + dimStyle.Render(" on Discord: ") + hlStyle.Hyperlink("https://discord.com/invite/MZAf5aVkJG").Render("https://discord.com/invite/MZAf5aVkJG"))
206
212
b.WriteString("\n")