From 5adbea9ac829b76507543e4c09b2000138ffbbcf Mon Sep 17 00:00:00 2001 From: Karst Date: Thu, 30 Mar 2023 19:41:42 +0200 Subject: [PATCH 1/4] Select OpenMusic by default when opening a new scenario --- distribution/changelog.txt | 1 + src/openrct2/rct12/RCT12.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index db197c16118b..85cbf27f65f2 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -5,6 +5,7 @@ - Feature: [OpenMusic#41] Official Title Theme by Allister Brimble. - Improved: [#20119, #20243] Add new colour presets to several roller coasters (using the new colours). - Improved: [#20393, #20410] Add Cyrillic characters Ґґ, Ѕѕ, Єє, Іі, Її, and Јј to the sprite font. +- Change: [#19785] OpenMusic is now selected by default when opening a new scenario. - Change: [#20110] Fix a few RCT1 build height parity discrepancies. - Change: [#20550] Change SEK conversion rate from 1 GBP to 0.1 GBP. - Fix: [#6152] Camera and UI are no longer locked at 40 Hz, providing a smoother experience. diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 54b9fee1d79d..3a0b69d6b0c3 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -750,6 +750,11 @@ static constexpr std::string_view _musicStyles[] = { "rct2.music.pirate", "rct2.music.rock3", "rct2.music.candy", + "openrct2.music.galaxy", + "openrct2.music.acid", + "openrct2.music.dodgems", + "openrct2.music.blizzard", + "openrct2.music.extraterrestrial", }; std::string_view GetStationIdentifierFromStyle(uint8_t style) From c23362d67a9db1c4af3d0d3a289037625b126be5 Mon Sep 17 00:00:00 2001 From: Karst Date: Fri, 19 May 2023 17:08:26 +0200 Subject: [PATCH 2/4] Add new OpenMusic tunes --- src/openrct2/rct12/RCT12.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 3a0b69d6b0c3..34f2f8717eae 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -755,6 +755,9 @@ static constexpr std::string_view _musicStyles[] = { "openrct2.music.dodgems", "openrct2.music.blizzard", "openrct2.music.extraterrestrial", + "openrct2.music.fairground2", + "openrct2.music.ragtime2", + "openrct2.music.prehistoric", }; std::string_view GetStationIdentifierFromStyle(uint8_t style) From 0dafa3ca888c83814024fbc5a10088af4e57f123 Mon Sep 17 00:00:00 2001 From: Karst Date: Fri, 25 Aug 2023 16:47:31 +0200 Subject: [PATCH 3/4] Add OpenMusic to DefaultObjects This adds all OpenMusic to be included when creating a new scenario. --- src/openrct2/object/DefaultObjects.cpp | 8 ++++++++ src/openrct2/object/DefaultObjects.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/openrct2/object/DefaultObjects.cpp b/src/openrct2/object/DefaultObjects.cpp index 90c8567f9d4e..a70a485d0a1c 100644 --- a/src/openrct2/object/DefaultObjects.cpp +++ b/src/openrct2/object/DefaultObjects.cpp @@ -113,6 +113,14 @@ const std::string_view DefaultSelectedObjects[] = { "rct2.music.pirate", "rct2.music.rock3", "rct2.music.candy", + "openrct2.music.galaxy", + "openrct2.music.acid", + "openrct2.music.dodgems", + "openrct2.music.blizzard", + "openrct2.music.extraterrestrial", + "openrct2.music.fairground2", + "openrct2.music.ragtime2", + "openrct2.music.prehistoric", // Footpath surfaces "rct2.footpath_surface.tarmac", diff --git a/src/openrct2/object/DefaultObjects.h b/src/openrct2/object/DefaultObjects.h index ca8f8af7ec18..8f8c7f9b4c0c 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[103]; +extern const std::string_view DefaultSelectedObjects[111]; extern const std::string_view DesignerSelectedObjects[39]; From dca49ccb5f02c85d706ec2a4096f8e2b0ef7ffcc Mon Sep 17 00:00:00 2001 From: Karst Date: Fri, 25 Aug 2023 16:55:01 +0200 Subject: [PATCH 4/4] Amend changelog --- distribution/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 85cbf27f65f2..574d180aceee 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -5,7 +5,7 @@ - Feature: [OpenMusic#41] Official Title Theme by Allister Brimble. - Improved: [#20119, #20243] Add new colour presets to several roller coasters (using the new colours). - Improved: [#20393, #20410] Add Cyrillic characters Ґґ, Ѕѕ, Єє, Іі, Її, and Јј to the sprite font. -- Change: [#19785] OpenMusic is now selected by default when opening a new scenario. +- Change: [#19785] OpenMusic is now selected by default when opening SC4/SC6 - or creating new - scenarios. - Change: [#20110] Fix a few RCT1 build height parity discrepancies. - Change: [#20550] Change SEK conversion rate from 1 GBP to 0.1 GBP. - Fix: [#6152] Camera and UI are no longer locked at 40 Hz, providing a smoother experience.