From 7118249715fb71bb83520cc65dd712f699353b7c Mon Sep 17 00:00:00 2001 From: ZeeMajora Date: Sun, 30 Apr 2023 19:48:53 -0400 Subject: [PATCH] Fix a few RCT1 build height discrepancies --- distribution/changelog.txt | 1 + src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/HyperTwister.h | 2 +- src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/VerticalDropCoaster.h | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 535f7bab5e..2e35b09293 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.4.6 (in development) ------------------------------------------------------------------------ +- Change: [#20110] Fix a few RCT1 build height parity discrepancies. 0.4.5 (2023-05-08) ------------------------------------------------------------------------ diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 2649d94272..f7cbb8ed99 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -43,7 +43,7 @@ // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "0" +#define NETWORK_STREAM_VERSION "1" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION diff --git a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h index 0af9f01d23..4d84266a86 100644 --- a/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicWoodenRollerCoaster.h @@ -35,7 +35,7 @@ constexpr const RideTypeDescriptor ClassicWoodenRollerCoasterRTD = SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }), SET_FIELD(EnumName, nameof(RIDE_TYPE_CLASSIC_WOODEN_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), - SET_FIELD(Heights, { 41, 24, 8, 11, }), + SET_FIELD(Heights, { 24, 24, 8, 11, }), SET_FIELD(MaxMass, 19), SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftWood, 3, 5 }), SET_FIELD(RatingsMultipliers, { 52, 33, 4 }), diff --git a/src/openrct2/ride/coaster/meta/HyperTwister.h b/src/openrct2/ride/coaster/meta/HyperTwister.h index b452690555..65b4ce7e80 100644 --- a/src/openrct2/ride/coaster/meta/HyperTwister.h +++ b/src/openrct2/ride/coaster/meta/HyperTwister.h @@ -36,7 +36,7 @@ constexpr const RideTypeDescriptor HyperTwisterRTD = SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station}), SET_FIELD(EnumName, nameof(RIDE_TYPE_HYPER_TWISTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), - SET_FIELD(Heights, { 54, 24, 8, 9, }), + SET_FIELD(Heights, { 61, 24, 8, 9, }), SET_FIELD(MaxMass, 31), SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftBM, 5, 8 }), SET_FIELD(RatingsMultipliers, { 52, 36, 10 }), diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index c443e880de..10a0ab5417 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -35,7 +35,7 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }), SET_FIELD(EnumName, nameof(RIDE_TYPE_INVERTED_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), - SET_FIELD(Heights, { 38, 40, 29, 8, }), + SET_FIELD(Heights, { 42, 40, 29, 8, }), SET_FIELD(MaxMass, 27), SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftBM, 5, 7 }), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index 7cdccf1609..5032b9d6a1 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -35,7 +35,7 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD = SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }), SET_FIELD(EnumName, nameof(RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), - SET_FIELD(Heights, { 15, 24, 4, 11, }), + SET_FIELD(Heights, { 18, 24, 4, 11, }), SET_FIELD(MaxMass, 15), SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftWood, 3, 4 }), SET_FIELD(RatingsMultipliers, { 48, 28, 7 }), diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index 30bc44c7ad..c4194a84a7 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -36,7 +36,7 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD = SET_FIELD(NameConvention, { RideComponentType::Train, RideComponentType::Track, RideComponentType::Station }), SET_FIELD(EnumName, nameof(RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE)), - SET_FIELD(Heights, { 53, 24, 8, 11, }), + SET_FIELD(Heights, { 55, 24, 8, 11, }), SET_FIELD(MaxMass, 25), SET_FIELD(LiftData, { OpenRCT2::Audio::SoundId::LiftBM, 4, 5 }), SET_FIELD(RatingsMultipliers, { 52, 38, 10 }),