diff --git a/.gitattributes b/.gitattributes index f8db65f0..144bc4f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,4 @@ *.gif -text *.wad -text *.wav -text -*.mus -text *.mid -text -*.midi -text diff --git a/musics/README b/musics/README index 39f0abf6..50168c9d 100644 --- a/musics/README +++ b/musics/README @@ -1,21 +1,18 @@ -This directory contains the background music heard during play. The -files are in General MIDI (.mid) format, but are renamed to .mus because -of the limitations of the deutex tool. +This directory contains the background music heard during play. In general, most files are per-level music files: - * d_eXmY.mus - Freedoom: Phase 1 music for cXmY. - * d_mapXY.mus - Freedoom: Phase 2 music for mapXY. - * d_dmXY.mus - FreeDM music for level XY. + * d_eXmY.mid - Freedoom: Phase 1 music for cXmY. + * d_mapXY.mid - Freedoom: Phase 2 music for mapXY. + * d_dmXY.mid - FreeDM music for level XY. There are a few other MIDI files: - * d_intro.mus / d_introa.mus - Freedoom: Phase 1 title music - * d_inter.mus - Freedoom: Phase 1 intermission music - * d_bunny.mus - Freedoom: Phase 1 Chapter 3 end music - * d_victor.mus - Freedoom: Phase 1 victory screen music - - * d_dm2ttl.mus - Freedoom: Phase 2 / FreeDM title music - * d_dm2int.mus - Freedoom: Phase 2 / FreeDM intermission music - * d_read_m.mus - Freedoom: Phase 2 / FreeDM text screen music + * d_intro.mid / d_introa.mid - Freedoom: Phase 1 title music + * d_inter.mid - Freedoom: Phase 1 intermission music + * d_bunny.mid - Freedoom: Phase 1 Chapter 3 end music + * d_victor.mid - Freedoom: Phase 1 victory screen music + * d_dm2ttl.mid - Freedoom: Phase 2 / FreeDM title music + * d_dm2int.mid - Freedoom: Phase 2 / FreeDM intermission music + * d_read_m.mid - Freedoom: Phase 2 / FreeDM text screen music diff --git a/musics/d_bunny.mus b/musics/d_bunny.mid similarity index 100% rename from musics/d_bunny.mus rename to musics/d_bunny.mid diff --git a/musics/d_c1m1.mus b/musics/d_c1m1.mid similarity index 100% rename from musics/d_c1m1.mus rename to musics/d_c1m1.mid diff --git a/musics/d_c1m2.mus b/musics/d_c1m2.mid similarity index 100% rename from musics/d_c1m2.mus rename to musics/d_c1m2.mid diff --git a/musics/d_c1m3.mus b/musics/d_c1m3.mid similarity index 100% rename from musics/d_c1m3.mus rename to musics/d_c1m3.mid diff --git a/musics/d_c1m4.mus b/musics/d_c1m4.mid similarity index 100% rename from musics/d_c1m4.mus rename to musics/d_c1m4.mid diff --git a/musics/d_c1m5.mus b/musics/d_c1m5.mid similarity index 100% rename from musics/d_c1m5.mus rename to musics/d_c1m5.mid diff --git a/musics/d_c1m6.mus b/musics/d_c1m6.mid similarity index 100% rename from musics/d_c1m6.mus rename to musics/d_c1m6.mid diff --git a/musics/d_c1m7.mus b/musics/d_c1m7.mid similarity index 100% rename from musics/d_c1m7.mus rename to musics/d_c1m7.mid diff --git a/musics/d_c1m8.mus b/musics/d_c1m8.mid similarity index 100% rename from musics/d_c1m8.mus rename to musics/d_c1m8.mid diff --git a/musics/d_c1m9.mus b/musics/d_c1m9.mid similarity index 100% rename from musics/d_c1m9.mus rename to musics/d_c1m9.mid diff --git a/musics/d_c2m1.mus b/musics/d_c2m1.mid similarity index 100% rename from musics/d_c2m1.mus rename to musics/d_c2m1.mid diff --git a/musics/d_c2m2.mus b/musics/d_c2m2.mid similarity index 100% rename from musics/d_c2m2.mus rename to musics/d_c2m2.mid diff --git a/musics/d_c2m3.mus b/musics/d_c2m3.mid similarity index 100% rename from musics/d_c2m3.mus rename to musics/d_c2m3.mid diff --git a/musics/d_c2m4.mus b/musics/d_c2m4.mid similarity index 100% rename from musics/d_c2m4.mus rename to musics/d_c2m4.mid diff --git a/musics/d_c2m5.mus b/musics/d_c2m5.mid similarity index 100% rename from musics/d_c2m5.mus rename to musics/d_c2m5.mid diff --git a/musics/d_c2m6.mus b/musics/d_c2m6.mid similarity index 100% rename from musics/d_c2m6.mus rename to musics/d_c2m6.mid diff --git a/musics/d_c2m7.mus b/musics/d_c2m7.mid similarity index 100% rename from musics/d_c2m7.mus rename to musics/d_c2m7.mid diff --git a/musics/d_c2m8.mus b/musics/d_c2m8.mid similarity index 100% rename from musics/d_c2m8.mus rename to musics/d_c2m8.mid diff --git a/musics/d_c2m9.mus b/musics/d_c2m9.mid similarity index 100% rename from musics/d_c2m9.mus rename to musics/d_c2m9.mid diff --git a/musics/d_c3m1.mus b/musics/d_c3m1.mid similarity index 100% rename from musics/d_c3m1.mus rename to musics/d_c3m1.mid diff --git a/musics/d_c3m2.mus b/musics/d_c3m2.mid similarity index 100% rename from musics/d_c3m2.mus rename to musics/d_c3m2.mid diff --git a/musics/d_c3m3.mus b/musics/d_c3m3.mid similarity index 100% rename from musics/d_c3m3.mus rename to musics/d_c3m3.mid diff --git a/musics/d_c3m4.mus b/musics/d_c3m4.mid similarity index 100% rename from musics/d_c3m4.mus rename to musics/d_c3m4.mid diff --git a/musics/d_c3m5.mus b/musics/d_c3m5.mid similarity index 100% rename from musics/d_c3m5.mus rename to musics/d_c3m5.mid diff --git a/musics/d_c3m6.mus b/musics/d_c3m6.mid similarity index 100% rename from musics/d_c3m6.mus rename to musics/d_c3m6.mid diff --git a/musics/d_c3m7.mus b/musics/d_c3m7.mid similarity index 100% rename from musics/d_c3m7.mus rename to musics/d_c3m7.mid diff --git a/musics/d_c3m8.mus b/musics/d_c3m8.mid similarity index 100% rename from musics/d_c3m8.mus rename to musics/d_c3m8.mid diff --git a/musics/d_c3m9.mus b/musics/d_c3m9.mid similarity index 100% rename from musics/d_c3m9.mus rename to musics/d_c3m9.mid diff --git a/musics/d_dm01.mus b/musics/d_dm01.mid similarity index 100% rename from musics/d_dm01.mus rename to musics/d_dm01.mid diff --git a/musics/d_dm02.mus b/musics/d_dm02.mid similarity index 100% rename from musics/d_dm02.mus rename to musics/d_dm02.mid diff --git a/musics/d_dm03.mus b/musics/d_dm03.mid similarity index 100% rename from musics/d_dm03.mus rename to musics/d_dm03.mid diff --git a/musics/d_dm04.mus b/musics/d_dm04.mid similarity index 100% rename from musics/d_dm04.mus rename to musics/d_dm04.mid diff --git a/musics/d_dm05.mus b/musics/d_dm05.mid similarity index 100% rename from musics/d_dm05.mus rename to musics/d_dm05.mid diff --git a/musics/d_dm06.mus b/musics/d_dm06.mid similarity index 100% rename from musics/d_dm06.mus rename to musics/d_dm06.mid diff --git a/musics/d_dm07.mus b/musics/d_dm07.mid similarity index 100% rename from musics/d_dm07.mus rename to musics/d_dm07.mid diff --git a/musics/d_dm08.mus b/musics/d_dm08.mid similarity index 100% rename from musics/d_dm08.mus rename to musics/d_dm08.mid diff --git a/musics/d_dm09.mus b/musics/d_dm09.mid similarity index 100% rename from musics/d_dm09.mus rename to musics/d_dm09.mid diff --git a/musics/d_dm10.mus b/musics/d_dm10.mid similarity index 100% rename from musics/d_dm10.mus rename to musics/d_dm10.mid diff --git a/musics/d_dm11.mus b/musics/d_dm11.mid similarity index 100% rename from musics/d_dm11.mus rename to musics/d_dm11.mid diff --git a/musics/d_dm12.mus b/musics/d_dm12.mid similarity index 100% rename from musics/d_dm12.mus rename to musics/d_dm12.mid diff --git a/musics/d_dm13.mus b/musics/d_dm13.mid similarity index 100% rename from musics/d_dm13.mus rename to musics/d_dm13.mid diff --git a/musics/d_dm14.mus b/musics/d_dm14.mid similarity index 100% rename from musics/d_dm14.mus rename to musics/d_dm14.mid diff --git a/musics/d_dm15.mus b/musics/d_dm15.mid similarity index 100% rename from musics/d_dm15.mus rename to musics/d_dm15.mid diff --git a/musics/d_dm16.mus b/musics/d_dm16.mid similarity index 100% rename from musics/d_dm16.mus rename to musics/d_dm16.mid diff --git a/musics/d_dm17.mus b/musics/d_dm17.mid similarity index 100% rename from musics/d_dm17.mus rename to musics/d_dm17.mid diff --git a/musics/d_dm18.mus b/musics/d_dm18.mid similarity index 100% rename from musics/d_dm18.mus rename to musics/d_dm18.mid diff --git a/musics/d_dm19.mus b/musics/d_dm19.mid similarity index 100% rename from musics/d_dm19.mus rename to musics/d_dm19.mid diff --git a/musics/d_dm20.mus b/musics/d_dm20.mid similarity index 100% rename from musics/d_dm20.mus rename to musics/d_dm20.mid diff --git a/musics/d_dm21.mus b/musics/d_dm21.mid similarity index 100% rename from musics/d_dm21.mus rename to musics/d_dm21.mid diff --git a/musics/d_dm22.mus b/musics/d_dm22.mid similarity index 100% rename from musics/d_dm22.mus rename to musics/d_dm22.mid diff --git a/musics/d_dm23.mus b/musics/d_dm23.mid similarity index 100% rename from musics/d_dm23.mus rename to musics/d_dm23.mid diff --git a/musics/d_dm24.mus b/musics/d_dm24.mid similarity index 100% rename from musics/d_dm24.mus rename to musics/d_dm24.mid diff --git a/musics/d_dm25.mus b/musics/d_dm25.mid similarity index 100% rename from musics/d_dm25.mus rename to musics/d_dm25.mid diff --git a/musics/d_dm26.mus b/musics/d_dm26.mid similarity index 100% rename from musics/d_dm26.mus rename to musics/d_dm26.mid diff --git a/musics/d_dm27.mus b/musics/d_dm27.mid similarity index 100% rename from musics/d_dm27.mus rename to musics/d_dm27.mid diff --git a/musics/d_dm28.mus b/musics/d_dm28.mid similarity index 100% rename from musics/d_dm28.mus rename to musics/d_dm28.mid diff --git a/musics/d_dm29.mus b/musics/d_dm29.mid similarity index 100% rename from musics/d_dm29.mus rename to musics/d_dm29.mid diff --git a/musics/d_dm2int.mus b/musics/d_dm2int.mid similarity index 100% rename from musics/d_dm2int.mus rename to musics/d_dm2int.mid diff --git a/musics/d_dm2ttl.mus b/musics/d_dm2ttl.mid similarity index 100% rename from musics/d_dm2ttl.mus rename to musics/d_dm2ttl.mid diff --git a/musics/d_dm30.mus b/musics/d_dm30.mid similarity index 100% rename from musics/d_dm30.mus rename to musics/d_dm30.mid diff --git a/musics/d_dm31.mus b/musics/d_dm31.mid similarity index 100% rename from musics/d_dm31.mus rename to musics/d_dm31.mid diff --git a/musics/d_dm32.mus b/musics/d_dm32.mid similarity index 100% rename from musics/d_dm32.mus rename to musics/d_dm32.mid diff --git a/musics/d_inter.mus b/musics/d_inter.mid similarity index 100% rename from musics/d_inter.mus rename to musics/d_inter.mid diff --git a/musics/d_intro.mus b/musics/d_intro.mid similarity index 100% rename from musics/d_intro.mus rename to musics/d_intro.mid diff --git a/musics/d_introa.mus b/musics/d_introa.mid similarity index 100% rename from musics/d_introa.mus rename to musics/d_introa.mid diff --git a/musics/d_map01.mus b/musics/d_map01.mid similarity index 100% rename from musics/d_map01.mus rename to musics/d_map01.mid diff --git a/musics/d_map02.mus b/musics/d_map02.mid similarity index 100% rename from musics/d_map02.mus rename to musics/d_map02.mid diff --git a/musics/d_map03.mus b/musics/d_map03.mid similarity index 100% rename from musics/d_map03.mus rename to musics/d_map03.mid diff --git a/musics/d_map04.mus b/musics/d_map04.mid similarity index 100% rename from musics/d_map04.mus rename to musics/d_map04.mid diff --git a/musics/d_map05.mus b/musics/d_map05.mid similarity index 100% rename from musics/d_map05.mus rename to musics/d_map05.mid diff --git a/musics/d_map06.mus b/musics/d_map06.mid similarity index 100% rename from musics/d_map06.mus rename to musics/d_map06.mid diff --git a/musics/d_map07.mus b/musics/d_map07.mid similarity index 100% rename from musics/d_map07.mus rename to musics/d_map07.mid diff --git a/musics/d_map08.mus b/musics/d_map08.mid similarity index 100% rename from musics/d_map08.mus rename to musics/d_map08.mid diff --git a/musics/d_map09.mus b/musics/d_map09.mid similarity index 100% rename from musics/d_map09.mus rename to musics/d_map09.mid diff --git a/musics/d_map10.mus b/musics/d_map10.mid similarity index 100% rename from musics/d_map10.mus rename to musics/d_map10.mid diff --git a/musics/d_map11.mus b/musics/d_map11.mid similarity index 100% rename from musics/d_map11.mus rename to musics/d_map11.mid diff --git a/musics/d_map12.mus b/musics/d_map12.mid similarity index 100% rename from musics/d_map12.mus rename to musics/d_map12.mid diff --git a/musics/d_map13.mus b/musics/d_map13.mid similarity index 100% rename from musics/d_map13.mus rename to musics/d_map13.mid diff --git a/musics/d_map14.mus b/musics/d_map14.mid similarity index 100% rename from musics/d_map14.mus rename to musics/d_map14.mid diff --git a/musics/d_map15.mus b/musics/d_map15.mid similarity index 100% rename from musics/d_map15.mus rename to musics/d_map15.mid diff --git a/musics/d_map16.mus b/musics/d_map16.mid similarity index 100% rename from musics/d_map16.mus rename to musics/d_map16.mid diff --git a/musics/d_map17.mus b/musics/d_map17.mid similarity index 100% rename from musics/d_map17.mus rename to musics/d_map17.mid diff --git a/musics/d_map18.mus b/musics/d_map18.mid similarity index 100% rename from musics/d_map18.mus rename to musics/d_map18.mid diff --git a/musics/d_map19.mus b/musics/d_map19.mid similarity index 100% rename from musics/d_map19.mus rename to musics/d_map19.mid diff --git a/musics/d_map20.mus b/musics/d_map20.mid similarity index 100% rename from musics/d_map20.mus rename to musics/d_map20.mid diff --git a/musics/d_map21.mus b/musics/d_map21.mid similarity index 100% rename from musics/d_map21.mus rename to musics/d_map21.mid diff --git a/musics/d_map22.mus b/musics/d_map22.mid similarity index 100% rename from musics/d_map22.mus rename to musics/d_map22.mid diff --git a/musics/d_map23.mus b/musics/d_map23.mid similarity index 100% rename from musics/d_map23.mus rename to musics/d_map23.mid diff --git a/musics/d_map24.mus b/musics/d_map24.mid similarity index 100% rename from musics/d_map24.mus rename to musics/d_map24.mid diff --git a/musics/d_map25.mus b/musics/d_map25.mid similarity index 100% rename from musics/d_map25.mus rename to musics/d_map25.mid diff --git a/musics/d_map26.mus b/musics/d_map26.mid similarity index 100% rename from musics/d_map26.mus rename to musics/d_map26.mid diff --git a/musics/d_map27.mus b/musics/d_map27.mid similarity index 100% rename from musics/d_map27.mus rename to musics/d_map27.mid diff --git a/musics/d_map28.mus b/musics/d_map28.mid similarity index 100% rename from musics/d_map28.mus rename to musics/d_map28.mid diff --git a/musics/d_map29.mus b/musics/d_map29.mid similarity index 100% rename from musics/d_map29.mus rename to musics/d_map29.mid diff --git a/musics/d_map30.mus b/musics/d_map30.mid similarity index 100% rename from musics/d_map30.mus rename to musics/d_map30.mid diff --git a/musics/d_map31.mus b/musics/d_map31.mid similarity index 100% rename from musics/d_map31.mus rename to musics/d_map31.mid diff --git a/musics/d_map32.mus b/musics/d_map32.mid similarity index 100% rename from musics/d_map32.mus rename to musics/d_map32.mid diff --git a/musics/d_read_m.mus b/musics/d_read_m.mid similarity index 100% rename from musics/d_read_m.mus rename to musics/d_read_m.mid diff --git a/musics/d_victor.mus b/musics/d_victor.mid similarity index 100% rename from musics/d_victor.mus rename to musics/d_victor.mid diff --git a/musics/dummy.mus b/musics/dummy.mid similarity index 100% rename from musics/dummy.mus rename to musics/dummy.mid diff --git a/scripts/music-duplicates.py b/scripts/music-duplicates.py index 0c4c435b..1e13e116 100755 --- a/scripts/music-duplicates.py +++ b/scripts/music-duplicates.py @@ -19,7 +19,7 @@ def get_music_tracks(): to a list of game tracks that use that MIDI.""" result = {} musics_path = os.path.join(os.path.dirname(sys.argv[0]), '../musics') - for mus in glob('%s/*.mus' % musics_path): + for mus in glob('%s/*.mid' % musics_path): with open(mus) as f: contents = f.read() m = hashlib.sha1() @@ -67,7 +67,7 @@ def print_report(title, tracks): return print(title) for track in sorted(tracks): - print('\t%s' % track.replace('.mus', '').upper()) + print('\t%s' % track.replace('.mid', '').upper()) print('') missing_tracks = set(find_missing_tracks(get_music_tracks()))