From bd34dd9acaac306091279e9bdfc8368161fa169b Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 1 Jun 2016 13:15:26 -0400 Subject: [PATCH] Fix duplicate mapping entries. Some of the tracks found in the IWADs are included multiple times, meaning that they have the same SHA1 hash. In these cases it is not necessary to have multiple files; only a single file and a single SHA1. --- doom2-music.cfg | 38 +++++++++++------------------- strife-music.cfg | 60 +++++++++++++++++++----------------------------- tnt-music.cfg | 33 +++++++++----------------- 3 files changed, 48 insertions(+), 83 deletions(-) diff --git a/doom2-music.cfg b/doom2-music.cfg index 3b3f8f9..2871f74 100644 --- a/doom2-music.cfg +++ b/doom2-music.cfg @@ -1,41 +1,29 @@ # Config file for Doom 2 high quality MIDI pack. -# SHA1 hash = filename -79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = doom2-music/d_runnin.flac # MAP01 -868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stalks.flac # MAP02 -19237754d2eb85f41d846b34660dd52dd1a83ffd = doom2-music/d_countd.flac # MAP03 +# SHA1 hash = filename # Levels +79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = doom2-music/d_runnin.flac # MAP01,15 +868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stalks.flac # MAP02,11,17 +19237754d2eb85f41d846b34660dd52dd1a83ffd = doom2-music/d_countd.flac # MAP03,21 00abff3b61b25a6855d2413ac26894ec7c559dfb = doom2-music/d_betwee.flac # MAP04 -954636c7ee09edf5d98f20000cfbb54d07d52204 = doom2-music/d_doom.flac # MAP05 -8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_the_da.flac # MAP06 -41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn.flac # MAP07 +954636c7ee09edf5d98f20000cfbb54d07d52204 = doom2-music/d_doom.flac # MAP05,13 +8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_the_da.flac # MAP06,12,24 +41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn.flac # MAP07,19,29 +# Assuming single D_DDTBLU; see http://doomwiki.org/wiki/Doom_II_music#Trivia 51c0872fec9f43259318bde5ed65f8dbe003733f = doom2-music/d_ddtblu.flac # MAP08 +acb7ad85494d18235df83d3efb2c7c67df835a00 = doom2-music/d_ddtblu.flac # MAP14,22 4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = doom2-music/d_in_cit.flac # MAP09 -1d1f4a9edba174584e115d4600dcafbf3413aa69 = doom2-music/d_dead.flac # MAP10 -868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stlks2.flac # MAP11 -8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_theda2.flac # MAP12 -954636c7ee09edf5d98f20000cfbb54d07d52204 = doom2-music/d_doom2.flac # MAP13 -acb7ad85494d18235df83d3efb2c7c67df835a00 = doom2-music/d_ddtbl2.flac # MAP14 -79080e9681a2d7bec3fbc4f251aaaab3a3831ac1 = doom2-music/d_runni2.flac # MAP15 -1d1f4a9edba174584e115d4600dcafbf3413aa69 = doom2-music/d_dead2.flac # MAP16 -868b3aae73c7b12e92c0fd80431885097ff50487 = doom2-music/d_stlks3.flac # MAP17 -1736c81aac77f9bffd3d376d8a07b9a800105125 = doom2-music/d_romero.flac # MAP18 -41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn2.flac # MAP19 -a55d400570ad255a576bc39d5b3f32a7f96a2728 = doom2-music/d_messag.flac # MAP20 -19237754d2eb85f41d846b34660dd52dd1a83ffd = doom2-music/d_count2.flac # MAP21 -acb7ad85494d18235df83d3efb2c7c67df835a00 = doom2-music/d_ddtbl3.flac # MAP22 +1d1f4a9edba174584e115d4600dcafbf3413aa69 = doom2-music/d_dead.flac # MAP10,16 +1736c81aac77f9bffd3d376d8a07b9a800105125 = doom2-music/d_romero.flac # MAP18,27 +a55d400570ad255a576bc39d5b3f32a7f96a2728 = doom2-music/d_messag.flac # MAP20,26 29d30c3fbd712016f2e574f8432b87b873d63187 = doom2-music/d_ampie.flac # MAP23 -8d32b2b7aa3b806474c1c237ef2b909478973c40 = doom2-music/d_theda3.flac # MAP24 bcfe9786afdcfb704afa563f6f387c2c2cb63e51 = doom2-music/d_adrian.flac # MAP25 -a55d400570ad255a576bc39d5b3f32a7f96a2728 = doom2-music/d_messg2.flac # MAP26 -1736c81aac77f9bffd3d376d8a07b9a800105125 = doom2-music/d_romer2.flac # MAP27 e05c10389e71836834ae2919fe71dbca8930276a = doom2-music/d_tense.flac # MAP28 -41efc3c84bb321af2b6b6758364a06d34e96ee31 = doom2-music/d_shawn3.flac # MAP29 b779022b1d0f0010b8f049e3fc705a89449c57eb = doom2-music/d_openin.flac # MAP30 a9a5f7b0ab3be0f4fc24e26236c565d9d7dcd6cc = doom2-music/d_evil.flac # MAP31 4503d155aafec0296689e4de4fc994125056c171 = doom2-music/d_ultima.flac # MAP32 -e632318629869811f7dca9b15d1912495ae6953b = doom2-music/d_read_m.flac 56f2363f01df38908c77cf4734f8dc3a3a820d7d = doom2-music/d_dm2ttl.flac 71e58baf9e9dea4dd24ad8013c2f5a60134f117c = doom2-music/d_dm2int.flac +e632318629869811f7dca9b15d1912495ae6953b = doom2-music/d_read_m.flac # These tracks are reused in Alien Vendetta, but are MIDs: 9433604c098b7b1119a453dc33ee2b50fe60009a = doom2-music/d_in_cit.flac # MAP26 diff --git a/strife-music.cfg b/strife-music.cfg index 9972c58..e64d901 100644 --- a/strife-music.cfg +++ b/strife-music.cfg @@ -1,38 +1,26 @@ # Config file for Strife high quality MIDI pack. -# SHA1 hash = filename -8ac2b2b47707f0fdf8f67496ba3e27ff3cf38efa = strife-music/d_logo.flac -62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac -12fa000f3fa1edac5c4f7ed5d152183ecf78e661 = strife-music/d_tavern.flac -695e56ab3251792d20e509bf4cb3e0b6932648ea = strife-music/d_danger.flac -96fe30e8712217b60dd7ef40e49783aae06f358c = strife-music/d_fast.flac -ec8fa484c4e85adbf70060eea82668a4bdfb09a2 = strife-music/d_intro.flac -61345598a3de04aad5084c695521d46d17c7f94e = strife-music/d_darker.flac -52353e9a435b7b1cb2687de5dd315df372342337 = strife-music/d_strike.flac -061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac -3dbb4b703ce69aafcdd59d748fb5a33f1a6381f0 = strife-music/d_tribal.flac -393773688eba050c3548498a2a8640cc7b495227 = strife-music/d_march.flac -695e56ab3251792d20e509bf4cb3e0b6932648ea = strife-music/d_danger.flac -3cba3c627de065a667dd63da234c5a2055fb5ba8 = strife-music/d_mood.flac -b1f65a333e5c70255784d702c30f9fdfedecf10c = strife-music/d_castle.flac -61345598a3de04aad5084c695521d46d17c7f94e = strife-music/d_darker.flac -62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac -e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strife-music/d_fight.flac -17f822b7374b1f069b891d651288c758bbe77d7c = strife-music/d_spense.flac -061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac -52353e9a435b7b1cb2687de5dd315df372342337 = strife-music/d_strike.flac -e66c5a1a7d05f021f4ae531bff95c34176e6b121 = strife-music/d_dark.flac -1c92bd0625026af30dadeb2e30a68252cae324aa = strife-music/d_tech.flac -061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac -7ae280713d078de7933a998479000b0205f1793a = strife-music/d_drone.flac -4a664afd0d7eae79c97aaac42877e3f679618f8d = strife-music/d_panthr.flac -4a7d62beeac5601ccf218bccfefee42b6028051e = strife-music/d_sad.flac -e60e109779400f2855d72a77d37ffc547edb4729 = strife-music/d_instry.flac -1c92bd0625026af30dadeb2e30a68252cae324aa = strife-music/d_tech.flac -62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac -e60e109779400f2855d72a77d37ffc547edb4729 = strife-music/d_instry.flac -7ae280713d078de7933a998479000b0205f1793a = strife-music/d_drone.flac -e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strife-music/d_fight.flac -b7d36878faeb291d6df52b153da2dffdfe6999dc = strife-music/d_happy.flac -ff4a342c8c5ec51b06c3e16247fb16d0f02d8b84 = strife-music/d_end.flac - +# SHA1 hash = filename # Area (map) +8ac2b2b47707f0fdf8f67496ba3e27ff3cf38efa = strife-music/d_logo.flac # Title +62e1c58054a1f1bc39b20e39bdb3f932b663de03 = strife-music/d_action.flac # 1,15,28 +12fa000f3fa1edac5c4f7ed5d152183ecf78e661 = strife-music/d_tavern.flac # 2 +695e56ab3251792d20e509bf4cb3e0b6932648ea = strife-music/d_danger.flac # 3,11 +96fe30e8712217b60dd7ef40e49783aae06f358c = strife-music/d_fast.flac # 4 +ec8fa484c4e85adbf70060eea82668a4bdfb09a2 = strife-music/d_intro.flac # 5 +61345598a3de04aad5084c695521d46d17c7f94e = strife-music/d_darker.flac # 6,14 +52353e9a435b7b1cb2687de5dd315df372342337 = strife-music/d_strike.flac # 7,19 +061164504907bffc9c2267a4f320e23d700f0b55 = strife-music/d_slide.flac # 8,18,22 +3dbb4b703ce69aafcdd59d748fb5a33f1a6381f0 = strife-music/d_tribal.flac # 9 +393773688eba050c3548498a2a8640cc7b495227 = strife-music/d_march.flac # 10 +3cba3c627de065a667dd63da234c5a2055fb5ba8 = strife-music/d_mood.flac # 12 +b1f65a333e5c70255784d702c30f9fdfedecf10c = strife-music/d_castle.flac # 13 +e1455a83a04c9ac4a09f6a941dbaf85631c9c15c = strife-music/d_fight.flac # 16,31 +17f822b7374b1f069b891d651288c758bbe77d7c = strife-music/d_spense.flac # 17 +e66c5a1a7d05f021f4ae531bff95c34176e6b121 = strife-music/d_dark.flac # 20 +1c92bd0625026af30dadeb2e30a68252cae324aa = strife-music/d_tech.flac # 21,27 +7ae280713d078de7933a998479000b0205f1793a = strife-music/d_drone.flac # 23,30 +4a664afd0d7eae79c97aaac42877e3f679618f8d = strife-music/d_panthr.flac # 24 +4a7d62beeac5601ccf218bccfefee42b6028051e = strife-music/d_sad.flac # 25 +e60e109779400f2855d72a77d37ffc547edb4729 = strife-music/d_instry.flac # 26,29 +b7d36878faeb291d6df52b153da2dffdfe6999dc = strife-music/d_happy.flac # Better ending +ff4a342c8c5ec51b06c3e16247fb16d0f02d8b84 = strife-music/d_end.flac # Worse ending diff --git a/tnt-music.cfg b/tnt-music.cfg index e762585..4225d10 100644 --- a/tnt-music.cfg +++ b/tnt-music.cfg @@ -1,43 +1,32 @@ # Config file for TNT high quality MIDI pack. -# SHA1 hash = filename -97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt-music/d_runnin.flac # MAP01 -f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt-music/d_stalks.flac # MAP02 +# SHA1 hash = filename # Levels +97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt-music/d_runnin.flac # MAP01,09 +f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt-music/d_stalks.flac # MAP02,15 a55d400570ad255a576bc39d5b3f32a7f96a2728 = tnt-music/d_countd.flac # MAP03 -59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_betwee.flac # MAP04 -16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt-music/d_doom.flac # MAP05 +59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_betwee.flac # MAP04,13,29 +16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt-music/d_doom.flac # MAP05,17 74f3e46aa433fae2a903efd6a8a7aff867b61096 = tnt-music/d_the_da.flac # MAP06 34cf5e4fcc9fbc0c6b6fa4944791002a0e661e86 = tnt-music/d_shawn.flac # MAP07 -510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_ddtblu.flac # MAP08 -97d5863d91df1b76aa21c7d44c26a30cd9c722ca = tnt-music/d_in_cit.flac # MAP09 -edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt-music/d_dead.flac # MAP10 +510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_ddtblu.flac # MAP08,27,30 +edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt-music/d_dead.flac # MAP10,18 019fce82f2942bf16c80499f1dd1449d6b77c4e9 = tnt-music/d_stlks2.flac # MAP11 51c0872fec9f43259318bde5ed65f8dbe003733f = tnt-music/d_theda2.flac # MAP12 -59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_doom2.flac # MAP13 186c92c1979e1c898a859955dc9c76be21a252b0 = tnt-music/d_ddtbl2.flac # MAP14 -f4721b6c93b00a3fbf8dd24c2db6f2cabe9e2626 = tnt-music/d_runni2.flac # MAP15 -5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt-music/d_dead2.flac # MAP16 -16c38fd3f10830e009be30e49819e8f9ca10a31b = tnt-music/d_stlks3.flac # MAP17 -edf4f6bf3a43a9a6fc095ae259c2add1a69e28a4 = tnt-music/d_romero.flac # MAP18 +5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt-music/d_dead2.flac # MAP16,26 19237754d2eb85f41d846b34660dd52dd1a83ffd = tnt-music/d_shawn2.flac # MAP19 05cad8ca0cc0aca19ac350414674f9205c31893c = tnt-music/d_messag.flac # MAP20 -4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt-music/d_count2.flac # MAP21 -91ee43214e8caf392c03e5688d559643d6dcc30a = tnt-music/d_ddtbl3.flac # MAP22 +4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt-music/d_count2.flac # MAP21,32 +91ee43214e8caf392c03e5688d559643d6dcc30a = tnt-music/d_ddtbl3.flac # MAP22,28 29d30c3fbd712016f2e574f8432b87b873d63187 = tnt-music/d_ampie.flac # MAP23 00abff3b61b25a6855d2413ac26894ec7c559dfb = tnt-music/d_theda3.flac # MAP24 954636c7ee09edf5d98f20000cfbb54d07d52204 = tnt-music/d_adrian.flac # MAP25 -5b7f14bbc17db95ef14e3ee37c27482dbcdcb4e2 = tnt-music/d_messg2.flac # MAP26 -510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_romer2.flac # MAP27 -91ee43214e8caf392c03e5688d559643d6dcc30a = tnt-music/d_tense.flac # MAP28 -59571ac502fc595e0e3d16d0b159cbefcaf76579 = tnt-music/d_shawn3.flac # MAP29 -510f56db080f78275db948d88b4667fdef22eafa = tnt-music/d_openin.flac # MAP30 4a0ffb88faf9965a90985482d4f1f87df2607bed = tnt-music/d_evil.flac # MAP31 -4b7ceccbf47e78e2fa0bf9492d5d34c25523796c = tnt-music/d_ultima.flac # MAP32 7e804ab092a44a0f323abbd0e6f8072edae8ef5b = tnt-music/d_read_m.flac 2b2fa62ea748a2549b681be0711942a2900ab46d = tnt-music/d_dm2ttl.flac 4a0ffb88faf9965a90985482d4f1f87df2607bed = tnt-music/d_dm2int.flac # These tracks are reused in Alien Vendetta, but are MIDs: -d397948e19d4a23cbb57a6f5e3d09ac1d22cea76 = tnt-music/d_openin.flac # MAP17 +d397948e19d4a23cbb57a6f5e3d09ac1d22cea76 = tnt-music/d_ddtblu.flac # MAP17 eb355cb43b8aae49cda17f9fa21c5ee3762d7f88 = tnt-music/d_betwee.flac # MAP18