OpenMusic release v1.5 (#21004)

Adds Rock style 4 ride music by Blackend Blue.

CMakeLists.txt

@@ -72,9 +72,9 @@ set(OPENSFX_VERSION "1.0.3")
 set(OPENSFX_URL  "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip")
 set(OPENSFX_SHA1 "ffec5a97bd5035860c4c9a43fe32cf51886478e3")
 
-set(OPENMSX_VERSION "1.4")
+set(OPENMSX_VERSION "1.5")
 set(OPENMSX_URL  "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip")
-set(OPENMSX_SHA1 "aaad314183bc4e875e013d70b655a661db238bf3")
+set(OPENMSX_SHA1 "f3c707e576281758637598ce68880416891fe5f9")
 
 set(REPLAYS_VERSION "0.0.78")
 set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")

contributors.md

@@ -285,6 +285,7 @@ The following people are not part of the development team, but have been contrib
 * (Flyxxpy)
 * Jan Büchner (Greyfade)
 * (Skyshard)
+* (Blackend Blue)
 
 ## Sound Effects
 * Karst van Galen Last (AuraSpecs)

distribution/changelog.txt

@@ -4,6 +4,7 @@
 - Feature: [#19919] Add diagonal brakes and diagonal block brakes to most coaster types.
 - Feature: [#20141] Add additional track pieces to the Giga Coaster.
 - Feature: [OpenMusic#46] Added Mystic ride music style.
+- Feature: [OpenMusic#50] Added Rock style 4 ride music.
 - Feature: [#20825] Made setting the game speed a game action.
 - Feature: [#20853] [Plugin] Add “BaseTileElement.owner” which is saved in the park file.
 - Change: [#20790] Default ride price set to free if park charges for entry.

openrct2.proj

@@ -49,8 +49,8 @@
     <ObjectsSha1>02ddf6c685a2da8bac98a57b34be95d63192443d</ObjectsSha1>
     <OpenSFXUrl>https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.3/opensound.zip</OpenSFXUrl>
     <OpenSFXSha1>ffec5a97bd5035860c4c9a43fe32cf51886478e3</OpenSFXSha1>
-    <OpenMSXUrl>https://github.com/OpenRCT2/OpenMusic/releases/download/v1.4/openmusic.zip</OpenMSXUrl>
-    <OpenMSXSha1>aaad314183bc4e875e013d70b655a661db238bf3</OpenMSXSha1>
+    <OpenMSXUrl>https://github.com/OpenRCT2/OpenMusic/releases/download/v1.5/openmusic.zip</OpenMSXUrl>
+    <OpenMSXSha1>f3c707e576281758637598ce68880416891fe5f9</OpenMSXSha1>
     <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.78/replays.zip</ReplaysUrl>
     <ReplaysSha1>31C5D07EED8481D5C6D57F9E4FE9443AAEDE7739</ReplaysSha1>
   </PropertyGroup>

src/openrct2/object/DefaultObjects.cpp

@@ -122,6 +122,7 @@ const std::string_view DefaultSelectedObjects[] = {
     "openrct2.music.ragtime2",
     "openrct2.music.prehistoric",
     "openrct2.music.mystic",
+    "openrct2.music.rock4",
 
     // Footpath surfaces
     "rct2.footpath_surface.tarmac",

src/openrct2/object/DefaultObjects.h

@@ -12,5 +12,5 @@
 #include "Object.h"
 
 extern const std::string_view MinimumRequiredObjects[2];
-extern const std::string_view DefaultSelectedObjects[112];
+extern const std::string_view DefaultSelectedObjects[113];
 extern const std::string_view DesignerSelectedObjects[39];

src/openrct2/rct12/RCT12.cpp

@@ -759,6 +759,7 @@ static constexpr std::string_view _musicStyles[] = {
     "openrct2.music.ragtime2",
     "openrct2.music.prehistoric",
     "openrct2.music.mystic",
+    "openrct2.music.rock4",
 };
 
 std::string_view GetStationIdentifierFromStyle(uint8_t style)