From ac3ab7e1d226368aafd93232f3c8f594073d9b9c Mon Sep 17 00:00:00 2001 From: ZeeMaji <42477864+ZeeMaji@users.noreply.github.com> Date: Tue, 12 Dec 2023 05:15:00 -0500 Subject: [PATCH] Fix #20311: Restore removed coaster colour presets (#20880) * Restore removed coaster colour presets * Update changelog entry * Add lost purple impulse preset * Add lost yellow and red presets to impulse * Fix typo in purple impulse preset * Remove accidentally included hairpin presets from impulse --- distribution/changelog.txt | 1 + src/openrct2/ride/coaster/meta/HybridCoaster.h | 1 + src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h | 5 +++-- src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h | 1 + src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h | 2 ++ src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h | 2 ++ src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 96fe242970..e3f59c13fe 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -8,6 +8,7 @@ - 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. +- Change: [#20880] Restore removed default coaster colours. - Fix: [#15293] TTF fonts don’t format correctly with OpenGL. - Fix: [#16453] Tile inspector invisibility shortcut does not use a game action. - Fix: [#17774] Misplaced/missing land and construction rights tiles in RCT1 & RCT2 scenarios. diff --git a/src/openrct2/ride/coaster/meta/HybridCoaster.h b/src/openrct2/ride/coaster/meta/HybridCoaster.h index 0ccc5b4dcd..3d1cf8de97 100644 --- a/src/openrct2/ride/coaster/meta/HybridCoaster.h +++ b/src/openrct2/ride/coaster/meta/HybridCoaster.h @@ -44,6 +44,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD = SET_FIELD(BonusValue, 120), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( { COLOUR_LIGHT_ORANGE, COLOUR_LIGHT_ORANGE, COLOUR_DARK_BROWN }, // Medusa + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_SATURATED_BROWN}, { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_GREY }, // Storm Chaser { COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_WHITE }, // Hakugei { COLOUR_BORDEAUX_RED_DARK, COLOUR_BORDEAUX_RED_DARK, COLOUR_DARK_BROWN }, // Zadra diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index 13d895c120..e496482eec 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -46,8 +46,9 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 75), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( - { COLOUR_BLACK, COLOUR_ICY_BLUE, COLOUR_BLACK }, - { COLOUR_WHITE, COLOUR_WHITE, COLOUR_YELLOW }, + { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_GREY }, + { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_WHITE }, + { COLOUR_BRIGHT_PURPLE, COLOUR_BRIGHT_PURPLE, COLOUR_BORDEAUX_RED }, { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BORDEAUX_RED }, // Volcano: The Blast Coaster { COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_TEAL }, // Wicked Twister )), diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index 87be14f563..738bc0a2d4 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -48,6 +48,7 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(ColourPresets,TRACK_COLOUR_PRESETS( { COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BLACK }, { COLOUR_WHITE, COLOUR_YELLOW, COLOUR_WHITE }, + { COLOUR_SALMON_PINK, COLOUR_SALMON_PINK, COLOUR_GREY }, { COLOUR_BLACK, COLOUR_BRIGHT_RED, COLOUR_BLACK }, { COLOUR_SATURATED_BROWN, COLOUR_WHITE, COLOUR_SATURATED_BROWN }, { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BLACK }, diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index c91e623373..8aee963625 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -48,6 +48,8 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_PINK, COLOUR_YELLOW, COLOUR_YELLOW }, // X + { COLOUR_LIGHT_PURPLE, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }, + { COLOUR_BORDEAUX_RED, COLOUR_WHITE, COLOUR_WHITE }, { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK }, // X2 { COLOUR_BORDEAUX_RED_DARK, COLOUR_DARK_YELLOW, COLOUR_OLIVE_DARK }, // Dinoconda { COLOUR_BLACK, COLOUR_BLACK, COLOUR_GREY }, // Eejanaika diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index ce9341e889..c80190ce48 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -49,7 +49,9 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = SET_FIELD(BonusValue, 120), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( { COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED }, + { COLOUR_AQUAMARINE, COLOUR_AQUAMARINE, COLOUR_DARK_PURPLE }, { COLOUR_WHITE, COLOUR_WHITE, COLOUR_LIGHT_BLUE }, + { COLOUR_DARK_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN }, { COLOUR_BORDEAUX_RED, COLOUR_LIGHT_ORANGE, COLOUR_WHITE }, { COLOUR_LIGHT_BLUE, COLOUR_YELLOW, COLOUR_DARK_PINK }, // Scream { COLOUR_DARK_ORANGE, COLOUR_DARK_ORANGE, COLOUR_BLACK }, // Rougarou diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index 9bd7848688..cd8271ba71 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -50,6 +50,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = { COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY }, { COLOUR_YELLOW, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN }, { COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_WHITE }, + { COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_BLACK }, { COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_DARK_BROWN }, { COLOUR_SATURATED_BROWN_LIGHT, COLOUR_TAN_DARK, COLOUR_LIGHT_BROWN }, // Generic GCI { COLOUR_TAN_DARK, COLOUR_DULL_BROWN_DARK, COLOUR_GREY }, // The Voyage /* Change supports to "minetrain" if possible in the future. */