Skip to content

Commit

Permalink
Update the music related stuff
Browse files Browse the repository at this point in the history
- Add more Showdown Duel tunes (Yes.)
- Update the music track for `MAPKF` ("Merry peak")
- Create the credits file for the Music and some MIDI sequences/arrangements
- Fix bug where Showdown music would not stop when the map changes
  • Loading branch information
LeonardoTheMutant committed Nov 4, 2024
1 parent fcc43dd commit d7140df
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 27 deletions.
57 changes: 35 additions & 22 deletions DIGITMUS/MM_DigitalMusic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ this add-on fully client-side (players are not required to have this file to joi

NOTE: Posting music-only add-ons on the SRB2 Message Board (mb.srb2.org) is PROHIBITED!

===============================================
HOW TO MAKE THE MUSIC ADD-ON FROM THIS SOURCE
===============================================
=================================================
= HOW TO MAKE THE MUSIC ADD-ON FROM THIS SOURCE =
=================================================
1. Create a new .ZIP archive
2. Add the contents of this folder to the archive WITHOUT THIS .TXT
3. Change the extension of the .ZIP file to .PK3
Expand All @@ -18,25 +18,31 @@ NOTE: Posting music-only add-ons on the SRB2 Message Board (mb.srb2.org) is PROH
As long as the archive has ONLY MUSIC LUMPS (O_* and D_* prefixed lumps) the add-on will
not trigger "Game Modified" state in SRB2

===========
CREDITS
===========
=================================================
===--- --- CREDITS --- ---===
=================================================

Digitalization of the original MIDI Soundtrack - LeonardoTheMutant & Troplucky

MAPS
------
========
= MAPS =
========
MAPK0 - "Balancing Act" by Andrew Bassett (Freedoom: Phase 2 (v0.12.1))
MAPK1 - "Fear" by Discoholic (Freedoom: Phase 2 (v0.13.0))
MAPK2 - "Syntax Error" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
MAPK3 - "Inside the Ruins" by Korp (Freedoom: Phase 2 (MAP11's track in October 15 2022 build))
MAPK4 - "Under Maintenance" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
MAPK5 - "Dam" by Grant Kirkhope (Goldeneye 007)
MAPK5 - "Dam" by Graeme Norgate (Goldeneye 007)
MAPK7 - "Rough Landing" by Korp, remix of dave3d08.mid by jute (Freedoom: Phase 2 (v0.13.0))
MAPK8 - *unknown*
MAPK9 - "Reflection" by Scragadelic (Freedoom: Phase 2 (v0.13.0))
MAPKA - "Bright sound" (Sonic Adventure 2)
MAPKE - "Theme of Tara" by Iku Mizutani (Metal Gear)
MAPKF - "Theme of Holly" by Kazuki Muraoka & Norihiko Hibino (Metal Gear 2: Solid Snake)
MAPKG - "Concept of Technology" by Korp (Freedoom: Phase 2 (v0.13.0))

MAPKC: "Stauf's Mansion":
MAPKC: "Stauf's Mansion"
------------------------
Original game soundtrack composed by the Fat Man and Team Fat
11H_00 - "Hey conductor" (Foyer)
11H_01 - "Pool Balls" (Library)
Expand All @@ -63,27 +69,34 @@ Original game soundtrack composed by the Fat Man and Team Fat
11H_16 - "In the walls I" (Dutton's-Chapel passage)
11H_17 - "Bathroom (alt)" (Laboratory-Library passage)

MAPKD: "East City":
MAPKD: "East City"
------------------
Present - "Voidgaze" by Korp (Freedoom: Phase 1 (v0.13.0))
Past - "Wacky Workbench 'P' Remix" by Masafumi Ogata (Sonic CD JP)
Bad Future - "Look At Me I'm Underhalls Too" by Mark "TheMisterCat" McGill-Smith (Freedoom: Phase 1 (v0.13.0))
Good Future - "Main Code" by Korp (Freedoom: Phase 1 (v0.13.0))

SHOWDOWN
----------

============
= SHOWDOWN =
============

DRMBM2 - "2 player VS." (Puyo Puyo, Dr. Robotnik's Mean Bean Machine)
EWJ2TN - "Anything but tangerines" by Tommy Tallarico (Earthworm Jim 2)
S2GGBS - "Boss theme" (Sonic 2 Game Gear)
S2MSBS - "Boss theme" (Sonic 2 Master System)
STORMR - "Stormer" by Korp, originally by Samuel "Blastfrog" Oliver (Freedoom: Phase 2 (v0.13.0))
UNDYNE - "Battle Against a True Hero" by Toby Fox (Undertale)

INTERMISSION
--------------
Tie - "No way!" (Sonic the Hedgehog 3 & Knuckles)
Murderer ending - "007 Watch Theme" by Grant Kirkhope (Goldeneye 007)
Civilian ending - "FTW You 100" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
No deffenders ending - "Vanilla Dome" by Koji Kondo (Super Mario World)
Bad Sheriff ending - "Gaster's theme" by Toby Fox (Undertale)
Bad Hero ending - "Dolls of Doom" by The Fat Man and Team Fat (The 11th Hour: The sequel to The 7th Guest)
2 player duel - "Driftevil City" (Pokemon Black & White)

================
= INTERMISSION =
================

NOWAY - Tie - "No way!" (Sonic the Hedgehog 3 & Knuckles)
007WTC - Murderer ending - "007 Watch Theme" by Grant Kirkhope (Goldeneye 007)
FD2INT - Civilian ending - "FTW You 100" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
VANDOM - No deffenders ending - "Vanilla Dome" by Koji Kondo (Super Mario World)
GASTER - Bad Sheriff ending - "Gaster's theme" by Toby Fox (Undertale)
11H_IN - Bad Hero ending - "Dolls of Doom" by The Fat Man and Team Fat (The 11th Hour: The sequel to The 7th Guest)
PBW_DC - 2 player duel ending - "Driftevil City" (Pokemon Black & White)
10 changes: 6 additions & 4 deletions SRC/LUA/FUNCTIONS.LUA
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ local death_sfx = { --SFXs that are used as Death Sounds
}

local shwdwn_music = { --Tracks used as Showdown Duel themes
"DRMBM2", --Dr. Robotnik's Mean Bean Machine: 2 Player Vs.
"EWJ2TN", --Earthworm Jim 2: Anything but tangerines
"RBYILL", --Sonic Mania: "Ruby Illusions"
"RDBUST", --Deltarune: "Rude Buster" (by Toby Fox)
"S2MSBS", --Sonic 2 (Master System): Boss
"S2GGBS", --Sonic 2 (Game Gear): Boss
"EWJ2TN", --Earthworm Jim 2: Anything but tangerines
"DRMBM2", --Dr. Robotnik's Mean Bean Machine: 2 Player Vs.
--"SSBLBS", --Sonic Spinball: Boss
"SSBLSD", --Sonic Spinball: "Showdown"
"STORMR", --Freedoom Phase 2: "Stormer" (by Blastfrog & Korp)
"UNDYNE", --Undertale: "Battle Against A True Hero" (by Toby Fox)
--"SSBLBS", --Sonic Spinball: Boss
"SSBLSD" --Sonic Spinball: "Showdown"
}

--
Expand Down
2 changes: 1 addition & 1 deletion SRC/LUA/GAME.LUA
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ addHook("MusicChange", function(old, new)
if (gametype != GT_LTMMURDERMYSTERY) return end

--Showdown Duel music
if ((gamestate == GS_LEVEL) and (MM.shwdwn) and not (consoleplayer.powers[pw_underwater] or consoleplayer.powers[pw_spacetime])) return MM.shwdwn end
if ((gamestate == GS_LEVEL) and (MM.shwdwn) and (leveltime) and not (consoleplayer.powers[pw_underwater] or consoleplayer.powers[pw_spacetime])) return MM.shwdwn end

--Intermission theme
if (new == "_inter")
Expand Down
Binary file modified SRC/MUSIC/MAPS/D_MAPKFM.MID
Binary file not shown.
93 changes: 93 additions & 0 deletions SRC/MUSIC/MUSIC.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
MIDI SOUNDTRACK
for LTM's Murder Mystery add-on

Credits and sources of the music used for this add-on's Soundtrack.
Some songs were originally not in MIDI format, the authors of such sequences/arrangements are credited as well.
Most of the MIDI sequences/arrangements are downloaded from VGMusic.com

This mod has music only in MIDI format, Digital Soundtrack is placed in
a sepparate add-on (to not bloat the filesize of the main add-on) and can be downloaded from the GitHub repository:
https://github.com/LeonardoTheMutant/SRB2-Murder-Mystery/tree/main/DIGITMUS

========
= MAPS =
========

MAPK0 - "Balancing Act" by Andrew Bassett (Freedoom: Phase 2 (v0.12.1))
MAPK1 - "Fear" by Discoholic (Freedoom: Phase 2 (v0.13.0))
MAPK2 - "Syntax Error" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
MAPK3 - "Inside the Ruins" by Korp (Freedoom: Phase 2 (MAP11's track in October 15 2022 build))
MAPK4 - "Under Maintenance" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
MAPK5 - "Dam" by Graeme Norgate (Goldeneye 007) (MIDI by Jarron Woodsorre)
MAPK7 - "Rough Landing" by Korp, remix of dave3d08.mid by jute (Freedoom: Phase 2 (v0.13.0))
MAPK8 - *unknown*
MAPK9 - "Reflection" by Scragadelic (Freedoom: Phase 2 (v0.13.0))
MAPKA - "Bright sound" (Sonic Adventure 2) (MIDI by Jose)
MAPKE - "Theme of Tara" by Iku Mizutani (Metal Gear) (MIDI by King Meteor)
MAPKF - "Theme of Holly" by Kazuki Muraoka & Norihiko Hibino (Metal Gear 2: Solid Snake) (MIDI by Nathaniel Lind)
MAPKG - "Concept of Technology" by Korp (Freedoom: Phase 2 (v0.13.0))

MAPKC: "Stauf's Mansion"
------------------------
Original game soundtrack composed by the Fat Man and Team Fat
11H_00 - "Hey conductor" (Foyer)
11H_01 - "Pool Balls" (Library)
11H_02 - "Sadness" (Music room)
11H_03 - Kitchen
11H_04 - "Pool Balls (alt)" (Dinning room)
11H_05 - "Creep" (Upstairs hallway)
11H_06 - "In the walls II" (Foyer-Gallery passage)
11H_07 - Gallery
11H_08 - "Ghost of Bo" (Hamilton Temple's bedroom)
11H_09 - "Long jazzy end of XMusic Box" (Game room)
11H_0A - "XMusic Box" (Julia Heine's bedroom)
11H_0B - "All the guests" (Edward Knox's bedroom)
11H_0C - Bathroom
11H_0D - Doll room
11H_0E - "Dool of Doom" (Nursery)
11H_0F - Brian Dutton's bedroom
11H_10 - "Bedspread" (Martin Burden's bedroom)
11H_11 - "Mirror puzzle" (Attic staircase)
11H_12 - "Doorbell (short)" (Attic)
11H_13 - "Rain" (Room at the top)
11H_14 - "Funky tubes" (Chapel)
11H_15 - Laboratory
11H_16 - "In the walls I" (Dutton's-Chapel passage)
11H_17 - "Bathroom (alt)" (Laboratory-Library passage)

MAPKD: "East City"
------------------
MAPKDM (Present) - "Voidgaze" by Korp (Freedoom: Phase 1 (v0.13.0))
MAPKDP (Past) - "Wacky Workbench 'P' Remix" by Masafumi Ogata (Sonic CD JP) (MIDI by Monster Iestyn)
MAPKDB (Bad Future) - "Look At Me I'm Underhalls Too" by Mark "TheMisterCat" McGill-Smith (Freedoom: Phase 1 (v0.13.0))
MAPKDG (Good Future) - "Main Code" by Korp (Freedoom: Phase 1 (v0.13.0))


============
= SHOWDOWN =
============

11H_TR - "Train puzzle" by the Fat Man and Team Fat (The 11th Hour: The sequel to The 7th Guest)
DRMBM2 - "2 player VS." (Puyo Puyo, Dr. Robotnik's Mean Bean Machine) (MIDI by ???)
EWJ2TN - "Anything but tangerines" by Tommy Tallarico (Earthworm Jim 2) (MIDI by Chris Heneghan)
MGSENC - "Encounter" (Metal Gear Solid) (MIDI by King Meteor)
RBYILL - "Ruby Illusions" (Sonic Mania) (MIDI by Foxhunt)
RDBSTR - "Rude Buster" by Toby Fox (Deltarune) (MIDI by ???)
S2GGBS - "Boss theme" (Sonic the Hedgehog 2 (Game Gear)) (MIDI by King Meteor)
S2MSBS - "Boss theme" (Sonic the Hedgehog 2 (Master System)) (MIDI by ???)
SSBLSD - "Showdown" (Sonic Spinball (Genesis)) (MIDI by King Meteor)
STORMR - "Stormer" by Korp, originally by Samuel "Blastfrog" Oliver (Freedoom: Phase 2 (v0.13.0))
UNDYNE - "Battle Against a True Hero" by Toby Fox (Undertale) (MIDI by ???)


================
= INTERMISSION =
================

NOWAY - Tie - "No way!" (Sonic the Hedgehog 3 & Knuckles) (MIDI taken from "Sonic 3 & Knuckles Collection")
007WTC - Murderer ending - "007 Watch Theme" by Grant Kirkhope (Goldeneye 007) (MIDI by Jay Reichard)
FD2INT - Civilian ending - "FTW You 100" by Lola "BlueWorrior" Harvey (Freedoom: Phase 2 (v0.13.0))
VANDOM - No deffenders ending - "Vanilla Dome" by Koji Kondo (Super Mario World) (MIDI by Daniel Lippert)
GASTER - Bad Sheriff ending - "Gaster's theme" by Toby Fox (Undertale) (MIDI by ???)
11H_IN - Bad Hero ending - "Dolls of Doom" by The Fat Man and Team Fat (The 11th Hour: The sequel to The 7th Guest)
PBW_DC - 2 player duel ending - "Driftevil City" (Pokemon Black & White) (MIDI by ???)
Binary file added SRC/MUSIC/SHOWDOWN/D_RBYILL.MID
Binary file not shown.
Binary file added SRC/MUSIC/SHOWDOWN/D_RDBSTR.MID
Binary file not shown.

0 comments on commit d7140df

Please sign in to comment.