From 83598ba898d526751b360c09b7480a7b8cc42f47 Mon Sep 17 00:00:00 2001 From: AuraSpecs Date: Tue, 28 Nov 2023 10:09:58 +0100 Subject: [PATCH] OpenMusic release v1.5 (#21004) Adds Rock style 4 ride music by Blackend Blue. --- CMakeLists.txt | 4 ++-- contributors.md | 1 + distribution/changelog.txt | 1 + openrct2.proj | 4 ++-- src/openrct2/object/DefaultObjects.cpp | 1 + src/openrct2/object/DefaultObjects.h | 2 +- src/openrct2/rct12/RCT12.cpp | 1 + 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d95ff209c9..875cfab1c9 100644 --- a/CMakeLists.txt +++ b/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") diff --git a/contributors.md b/contributors.md index ff319d73c0..a773d1344f 100644 --- a/contributors.md +++ b/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) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 14bdbab3ba..788b574062 100644 --- a/distribution/changelog.txt +++ b/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. diff --git a/openrct2.proj b/openrct2.proj index b0e1a7cf8f..857bd27b65 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -49,8 +49,8 @@ 02ddf6c685a2da8bac98a57b34be95d63192443d https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.3/opensound.zip ffec5a97bd5035860c4c9a43fe32cf51886478e3 - https://github.com/OpenRCT2/OpenMusic/releases/download/v1.4/openmusic.zip - aaad314183bc4e875e013d70b655a661db238bf3 + https://github.com/OpenRCT2/OpenMusic/releases/download/v1.5/openmusic.zip + f3c707e576281758637598ce68880416891fe5f9 https://github.com/OpenRCT2/replays/releases/download/v0.0.78/replays.zip 31C5D07EED8481D5C6D57F9E4FE9443AAEDE7739 diff --git a/src/openrct2/object/DefaultObjects.cpp b/src/openrct2/object/DefaultObjects.cpp index 7f7f1bb9da..6497b8216f 100644 --- a/src/openrct2/object/DefaultObjects.cpp +++ b/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", diff --git a/src/openrct2/object/DefaultObjects.h b/src/openrct2/object/DefaultObjects.h index 10a42072b9..9889e47c3a 100644 --- a/src/openrct2/object/DefaultObjects.h +++ b/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]; diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 6156a2603d..be792d3243 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/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)