From 1223b739e0da80f21b43b9c1b89a06a5658df0c3 Mon Sep 17 00:00:00 2001 From: AuraSpecs Date: Thu, 21 Sep 2023 20:36:37 +0200 Subject: [PATCH] Create OpenMusic 1.4 release (#20795) nl-NL: Fix/amend some descriptions by @Gymnasiast in #42 Update French translation by @rmnvgr in #43 Normalize the ragtime tunes by @karst in #44 Complete list of Fairground organ style 2 tunes by @karst in #45 Update Hungarian translation by @anon569 in #47 Add Mystic style by @SkyshardMelody in #46 pt-BR: Translate Mystic Style by @tupaschoal in #48 hu-HU: Translate Mystic Style by @anon569 in #49 --- CMakeLists.txt | 4 ++-- contributors.md | 5 +++-- 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, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7e5ace65..d95ff209c9 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.3.1") +set(OPENMSX_VERSION "1.4") set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip") -set(OPENMSX_SHA1 "cb7b05af97aaf7949fb509063d45df6613f20521") +set(OPENMSX_SHA1 "aaad314183bc4e875e013d70b655a661db238bf3") 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 224807024e..f57abd208b 100644 --- a/contributors.md +++ b/contributors.md @@ -278,11 +278,12 @@ The following people are not part of the development team, but have been contrib * Booster Sprites - Nicolas Hawrysh (xp4xbox) ## Music +* Allister Brimble +* Herman Riddering * Karst "Jalmaan" van Galen Last (AuraSpecs) * (Flyxxpy) * Jan Büchner (Greyfade) -* Allister Brimble -* Herman Riddering +* (Skyshard) ## Sound Effects * Karst van Galen Last (AuraSpecs) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index d637a1998a..1b6d0bc27e 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.4.7 (in development) ------------------------------------------------------------------------ +- Feature: [OpenMusic#46] Added Mystic ride music style. - Change: [#20790] Default ride price set to free if park charges for entry. - Fix: [#20737] Spent money in player window underflows when getting refunds. - Fix: [#20778] [Plugin] Incorrect target api when executing custom actions. diff --git a/openrct2.proj b/openrct2.proj index 252dc79eb2..b0e1a7cf8f 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.3.1/openmusic.zip - cb7b05af97aaf7949fb509063d45df6613f20521 + https://github.com/OpenRCT2/OpenMusic/releases/download/v1.4/openmusic.zip + aaad314183bc4e875e013d70b655a661db238bf3 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 a70a485d0a..7f7f1bb9da 100644 --- a/src/openrct2/object/DefaultObjects.cpp +++ b/src/openrct2/object/DefaultObjects.cpp @@ -121,6 +121,7 @@ const std::string_view DefaultSelectedObjects[] = { "openrct2.music.fairground2", "openrct2.music.ragtime2", "openrct2.music.prehistoric", + "openrct2.music.mystic", // Footpath surfaces "rct2.footpath_surface.tarmac", diff --git a/src/openrct2/object/DefaultObjects.h b/src/openrct2/object/DefaultObjects.h index 8f8c7f9b4c..10a42072b9 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[111]; +extern const std::string_view DefaultSelectedObjects[112]; extern const std::string_view DesignerSelectedObjects[39]; diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 34f2f8717e..6156a2603d 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -758,6 +758,7 @@ static constexpr std::string_view _musicStyles[] = { "openrct2.music.fairground2", "openrct2.music.ragtime2", "openrct2.music.prehistoric", + "openrct2.music.mystic", }; std::string_view GetStationIdentifierFromStyle(uint8_t style)