diff --git a/planet/Arena.ocf/HotIce.ocs/Script.c b/planet/Arena.ocf/HotIce.ocs/Script.c index e510e9546..2435858a7 100644 --- a/planet/Arena.ocf/HotIce.ocs/Script.c +++ b/planet/Arena.ocf/HotIce.ocs/Script.c @@ -110,6 +110,7 @@ func InitializeRound() SetSky(g_theme.Sky); g_theme->InitializeRound(); + g_theme->InitializeMusic(); return true; } @@ -473,6 +474,21 @@ static const HotIce = new Global { AltMatRatio = 50, BackgroundMat = nil, Sky = "Default", + + PlayList = nil, + InitializeMusic = func() + { + // No special play list => music by Ambience + if (this.PlayList == nil) + InitializeAmbience(); + else + { + // Remove Ambience to avoid interference. + RemoveAll(Find_ID(Ambience)); + SetPlayList(this.PlayList, NO_OWNER, true); + SetGlobalSoundModifier(nil); + } + }, }; static const EciToh = new HotIce { @@ -484,6 +500,11 @@ static const EciToh = new HotIce { static const MiamiIce = new HotIce { MatNames = ["^BlackIce-black", "^BlackIce-black"], Sky = "SkyMiami", + PlayList = + { + PlayList = "beach", + MusicBreakChance = 0, + }, InitializeRound = func() { diff --git a/planet/Music.ocg/@CrushedIceCocktail.ogg b/planet/Music.ocg/@CrushedIceCocktail.ogg new file mode 100644 index 000000000..5b345f81c Binary files /dev/null and b/planet/Music.ocg/@CrushedIceCocktail.ogg differ diff --git a/planet/Music.ocg/Version.txt b/planet/Music.ocg/Version.txt index 504953848..cc40bca69 100644 --- a/planet/Music.ocg/Version.txt +++ b/planet/Music.ocg/Version.txt @@ -1 +1 @@ -6.0 \ No newline at end of file +8.0 diff --git a/planet/Music.ocg/authors.txt b/planet/Music.ocg/authors.txt index 50b1f7249..5d3e12fbf 100644 --- a/planet/Music.ocg/authors.txt +++ b/planet/Music.ocg/authors.txt @@ -4,4 +4,4 @@ CC Attribution 3.0 license (http://creativecommons.org/licenses/by/3.0/) Author Work(s) =============================================================================== -K-Pone IslandDreams, Motorway, TheSkylands, UrbanBolero, LucidDream, Offshore +K-Pone IslandDreams, Motorway, TheSkylands, UrbanBolero, LucidDream, Offshore, CrushedIceCocktail