mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix #20311: Restore removed coaster colour presets (#20880)

Browse source 
* 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
This commit is contained in:
ZeeMaji 2023-12-12 05:15:00 -05:00 committed by GitHub
parent 09cf5b37d2
commit ac3ab7e1d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/changelog.txt
View file

@ -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.

1
src/openrct2/ride/coaster/meta/HybridCoaster.h
View file

@ -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

5
src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h
View file

@ -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
)),

1
src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h
View file

@ -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 },

2
src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h
View file

@ -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

2
src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h
View file

@ -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

1
src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h
View file

@ -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. */