Skip to content

Commit 7b632e4

Browse files
committed
i'm getting a massive error and i have no clue wht's causing it
1 parent 4550413 commit 7b632e4

File tree

3 files changed

+15
-446
lines changed

3 files changed

+15
-446
lines changed

src/famistudio/METADATA/lvlset_A_metadata.json5

Lines changed: 0 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -289,75 +289,6 @@
289289
originalArtistText: "KEVIN MACLEOD",
290290
vsSystemEnabled: false
291291
},
292-
{
293-
fmsSongName: "retray",
294-
lowerText: "GOLDEN HAZE",
295-
originalArtistText: "DETIOUSMUSIC",
296-
},
297-
{
298-
fmsSongName: "infernoplex",
299-
lowerText: "INFERNOPLEX",
300-
originalArtistText: "DIMRAIN47",
301-
},
302-
303-
{
304-
fmsSongName: "The Challenge",
305-
upperText: "THE",
306-
lowerText: "CHALLENGE",
307-
originalArtistText: "ROBTOP",
308-
},
309-
{
310-
fmsSongName: "atthespeedoflight",
311-
upperText: "AT THE SPEED",
312-
lowerText: "OF LIGHT",
313-
originalArtistText: "DIMRAIN47",
314-
},
315-
{
316-
fmsSongName: "atthespeedoflight2",
317-
upperText: "AT THE SPEED",
318-
lowerText: "OF LIGHT PT 2",
319-
originalArtistText: "DIMRAIN47",
320-
},
321-
{
322-
fmsSongName: "midnight",
323-
lowerText: "MIDNIGHT",
324-
originalArtistText: "CORNANDBEANS",
325-
},
326-
{
327-
fmsSongName: "haunted woods",
328-
lowerText: "HAUNTED WOODS",
329-
originalArtistText: "WATERFLAME",
330-
},
331-
{
332-
fmsSongName: "just right",
333-
lowerText: "JUST RIGHT",
334-
originalArtistText: "DAN HARRISON B",
335-
vsSystemEnabled: false
336-
},
337-
{
338-
fmsSongName: "Ground to Space",
339-
upperText: "GROUND TO",
340-
lowerText: "SPACE",
341-
originalArtistText: "SEAGLOWINGPRO",
342-
},
343-
{
344-
fmsSongName: "rainbow tylenol",
345-
upperText: "RAINBOW",
346-
lowerText: "TYLENOL",
347-
originalArtistText: "KITSUNE2",
348-
},
349-
{
350-
fmsSongName: "stalemate greif cut",
351-
upperText: "STALEMATE",
352-
lowerText: "GREIF CUT",
353-
originalArtistText: "KAYOSZX",
354-
},
355-
{
356-
fmsSongName: "Extraordinary Excitement",
357-
upperText: "EXTRAORDINARY",
358-
lowerText: "EXCITEMENT",
359-
originalArtistText: "SEAGLOWINGPRO",
360-
},
361292
],
362293
SFX: [
363294
{
@@ -369,15 +300,6 @@
369300
durationPAL: 460
370301
}
371302
},
372-
{
373-
text: "CLICK",
374-
nsfData: {
375-
trackLabel: "Click SFX",
376-
trackAuthor: "UserSniper",
377-
durationNTSC: 50,
378-
durationPAL: 40
379-
}
380-
},
381303
{
382304
text: "LEVEL COMPLETE",
383305
nsfData: {
@@ -396,33 +318,6 @@
396318
durationPAL: 700
397319
}
398320
},
399-
{
400-
text: "CHEST OPEN",
401-
nsfData: {
402-
trackLabel: "Chest Open SFX",
403-
trackAuthor: "UserSniper",
404-
durationNTSC: 100,
405-
durationPAL: 120
406-
}
407-
},
408-
{
409-
text: "ORBS",
410-
nsfData: {
411-
trackLabel: "Orbs SFX",
412-
trackAuthor: "UserSniper",
413-
durationNTSC: 683,
414-
durationPAL: 820
415-
}
416-
},
417-
{
418-
text: "DIAMONDS",
419-
nsfData: {
420-
trackLabel: "Diamonds SFX",
421-
trackAuthor: "UserSniper",
422-
durationNTSC: 683,
423-
durationPAL: 820
424-
}
425-
},
426321
{
427322
text: "EXIT LEVEL",
428323
nsfData: {
@@ -441,15 +336,6 @@
441336
durationPAL: 920
442337
}
443338
},
444-
{
445-
text: "INVALID",
446-
nsfData: {
447-
trackLabel: "Invalid SFX",
448-
trackAuthor: "UserSniper",
449-
durationNTSC: 633,
450-
durationPAL: 640
451-
}
452-
},
453339
{
454340
text: "ACHIEVEMENT GET",
455341
nsfData: {
@@ -460,31 +346,5 @@
460346
}
461347
}
462348
],
463-
PCM: [
464-
{
465-
segment: "PCM_BANK",
466-
path: "MUSIC/PCM/SSDPCM2-geometryDash.pcm",
467-
sampleRateNTSC: 4,
468-
sampleRatePAL: 3,
469-
nsfData: {
470-
trackLabel: "Geometry Dash Voice Clip",
471-
trackAuthor: "VA: MDK",
472-
durationNTSC: 1150,
473-
durationPAL: 1100
474-
}
475-
},
476-
{
477-
segment: "PCM_BANK_B",
478-
path: "MUSIC/PCM/SSDPCM2-fire.pcm",
479-
sampleRateNTSC: 10,
480-
sampleRatePAL: 8,
481-
nsfData: {
482-
trackLabel: "FIRE IN THE HOLE! Voice Clip",
483-
trackAuthor: "VA: Joe",
484-
durationNTSC: 1650,
485-
durationPAL: 1650
486-
}
487-
}
488-
],
489349
dpcmAligner: "dpcm"
490350
}

src/famistudio/export.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,17 @@ def processMetadata(metadata : dict) -> dict:
188188
sfxSizeArrayList = [f'\tsizeof(sfxSoundTestString{i:02X}),' if i != None else '\t0,' for i in sfxIdxList]
189189

190190
# Get PCM data
191-
pcmlist = [i for i in metadata['PCM'] if set(['segment', 'path', 'sampleRateNTSC', 'sampleRatePAL']).issubset(set(i.keys()))]
192-
bankIncludesList = [f"\t.byte <.bank(pcmData{i})" for i in range(len(pcmlist))]
193-
sampleRateNTSCList = [f"\t.byte {i['sampleRateNTSC']}" for i in pcmlist]
194-
sampleRatePALList = [f"\t.byte {i['sampleRatePAL']}" for i in pcmlist]
195-
pcmHeaderList = ['', '; PCM includes']
196-
for idx, i in enumerate(pcmlist):
197-
pcmHeaderList += [f'.segment "{i["segment"]}"', f'\tpcmData{idx}:', f'\t\t.incbin "{i["path"]}"']
191+
#pcmlist = [i for i in metadata['PCM'] if set(['segment', 'path', 'sampleRateNTSC', 'sampleRatePAL']).issubset(set(i.keys()))]
192+
#bankIncludesList = [f"\t.byte <.bank(pcmData{i})" for i in range(len(pcmlist))]
193+
#sampleRateNTSCList = [f"\t.byte {i['sampleRateNTSC']}" for i in pcmlist]
194+
#sampleRatePALList = [f"\t.byte {i['sampleRatePAL']}" for i in pcmlist]
195+
#pcmHeaderList = ['', '; PCM includes']
196+
#for idx, i in enumerate(pcmlist):
197+
# pcmHeaderList += [f'.segment "{i["segment"]}"', f'\tpcmData{idx}:', f'\t\t.incbin "{i["path"]}"']
198198

199199
# Get NSF metadata
200-
nsfMetaList = [i.get('nsfData') for i in (songlist + metadata['SFX'] + metadata['PCM']) if 'nsfData' in i.keys()]
200+
nsfMetaList = [i.get('nsfData') for i in (songlist + metadata['SFX']) if 'nsfData' in i.keys()]
201+
# + metadata['PCM']
201202
# For now, don't warn people of missing NSF metadata, but do warn about incomplete data
202203
trackLabelList = [i.get('trackLabel') for i in nsfMetaList]
203204
trackAuthorList = [processNSFTrackAuthorMetadata(i.get('trackAuthor')) for i in nsfMetaList]
@@ -229,12 +230,12 @@ def processMetadata(metadata : dict) -> dict:
229230
'durationPALList': durationPALList,
230231
'durationFadeList': durationFadeList
231232
},
232-
'pcmMetadata': {
233-
'bankTable': bankIncludesList,
234-
'sampleRateNTSC': sampleRateNTSCList,
235-
'sampleRatePAL': sampleRatePALList,
236-
'headerData': pcmHeaderList
237-
},
233+
# 'pcmMetadata': {
234+
# 'bankTable': bankIncludesList,
235+
# 'sampleRateNTSC': sampleRateNTSCList,
236+
# 'sampleRatePAL': sampleRatePALList,
237+
# 'headerData': pcmHeaderList
238+
# },
238239
'dpcmAlignerName': metadata['dpcmAligner'],
239240
'songModule': metadata['songModule'],
240241
'extendedMetadata': extMeta

0 commit comments

Comments
 (0)