diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index ce381a7b04..829d97989a 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -944,7 +944,7 @@ static void WindowNewRidePaintRideInformation( money64 price = GetRideTypeDescriptor(item.Type).BuildCosts.TrackPrice; const auto& ted = GetTrackElementDescriptor(startPieceId); price *= ted.Price; - price = (price >> 17) * 10 * GetRideTypeDescriptor(item.Type).BuildCosts.PriceEstimateMultiplier; + price = (price >> 16) * GetRideTypeDescriptor(item.Type).BuildCosts.PriceEstimateMultiplier; // rct_string_id stringId = STR_NEW_RIDE_COST; diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index ab344ef52d..4cb0035dfa 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -360,7 +360,7 @@ money32 LandSetHeightAction::GetSurfaceHeightChangeCost(SurfaceElement* surfaceE { int32_t cornerHeight = tile_element_get_corner_height(surfaceElement, i); cornerHeight -= map_get_corner_height(_height, _style & TILE_ELEMENT_SURFACE_SLOPE_MASK, i); - cost += 2.5_GBP * abs(cornerHeight); + cost += 2.50_GBP * abs(cornerHeight); } return cost; } diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index fecb65e703..7d271d6947 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -118,8 +118,8 @@ GameActions::Result MazePlaceTrackAction::Query() const } const auto& ted = GetTrackElementDescriptor(TrackElemType::Maze); - money32 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); - res.Cost = canBuild.Cost + (price / 2) * 10; + money64 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); + res.Cost = canBuild.Cost + price; return res; } @@ -160,8 +160,8 @@ GameActions::Result MazePlaceTrackAction::Execute() const } const auto& ted = GetTrackElementDescriptor(TrackElemType::Maze); - money32 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); - res.Cost = canBuild.Cost + (price / 2) * 10; + money64 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); + res.Cost = canBuild.Cost + price; auto startLoc = _loc.ToTileStart(); diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index 0fec4a2c50..75e59064d4 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -137,8 +137,8 @@ GameActions::Result MazeSetTrackAction::Query() const } const auto& ted = GetTrackElementDescriptor(TrackElemType::Maze); - money32 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); - res.Cost = (price / 2) * 10; + money64 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); + res.Cost = price; return res; } @@ -173,8 +173,8 @@ GameActions::Result MazeSetTrackAction::Execute() const if (tileElement == nullptr) { const auto& ted = GetTrackElementDescriptor(TrackElemType::Maze); - money32 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); - res.Cost = (price / 2) * 10; + money64 price = (((ride->GetRideTypeDescriptor().BuildCosts.TrackPrice * ted.Price) >> 16)); + res.Cost = price; auto startLoc = _loc.ToTileStart(); diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 68ff5f8529..720fc0f9d9 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -213,7 +213,7 @@ GameActions::Result TrackPlaceAction::Query() const trackBlock = ted.Block; money32 costs = 0; - int32_t supportCosts = 0; // Note this is not money32 it requires / 2 * 10 to be money32 + money64 supportCosts = 0; for (int32_t blockIndex = 0; trackBlock->index != 0xFF; trackBlock++, blockIndex++) { auto rotatedTrack = CoordsXYZ{ CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(_origin.direction), trackBlock->z }; @@ -397,11 +397,11 @@ GameActions::Result TrackPlaceAction::Query() const supportCosts += ((supportHeight / (2 * COORDS_Z_STEP)) * ride->GetRideTypeDescriptor().BuildCosts.SupportPrice); } - money32 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; + money64 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; price *= ted.Price; price >>= 16; - res.Cost = costs + ((supportCosts + price) / 2) * 10; + res.Cost = costs + supportCosts + price; res.SetData(std::move(resultData)); return res; @@ -439,7 +439,7 @@ GameActions::Result TrackPlaceAction::Execute() const const auto& wallEdges = ted.SequenceElementAllowedWallEdges; money32 costs = 0; - int32_t supportCosts = 0; // Note this is not money32 it requires / 2 * 10 to be money32 + money64 supportCosts = 0; const rct_preview_track* trackBlock = ted.Block; for (int32_t blockIndex = 0; trackBlock->index != 0xFF; trackBlock++, blockIndex++) { @@ -695,11 +695,11 @@ GameActions::Result TrackPlaceAction::Execute() const map_invalidate_tile_full(mapLoc); } - money32 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; + money64 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; price *= ted.Price; price >>= 16; - res.Cost = costs + ((supportCosts + price) / 2) * 10; + res.Cost = costs + supportCosts + price; res.SetData(std::move(resultData)); return res; diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index 069730a6f4..1823d7386a 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -151,7 +151,7 @@ GameActions::Result TrackRemoveAction::Query() const res.Position.y = startLoc.y; res.Position.z = startLoc.z; - int32_t supportCosts = 0; // Note this is not money32 it requires / 2 * 10 to be money32 + money64 supportCosts = 0; trackBlock = ted.Block; for (; trackBlock->index != 255; trackBlock++) @@ -229,14 +229,14 @@ GameActions::Result TrackRemoveAction::Query() const supportCosts += (_support_height / 2) * ride->GetRideTypeDescriptor().BuildCosts.SupportPrice; } - money32 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; + money64 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; price *= ted.Price; price >>= 16; - price = ((supportCosts + price) / 2) * 10; + price = supportCosts + price; if (ride->lifecycle_flags & RIDE_LIFECYCLE_EVER_BEEN_OPENED) { // 70% modifier for opened rides - price = (static_cast(price) * 45875) / 65536; + price = (price * 45875) / 65536; } res.Cost = -price; @@ -334,7 +334,7 @@ GameActions::Result TrackRemoveAction::Execute() const res.Position.y = startLoc.y; res.Position.z = startLoc.z; - int32_t supportCosts = 0; // Note this is not money32 it requires / 2 * 10 to be money32 + money64 supportCosts = 0; trackBlock = ted.Block; for (; trackBlock->index != 255; trackBlock++) @@ -481,14 +481,14 @@ GameActions::Result TrackRemoveAction::Execute() const } } - money32 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; + money64 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; price *= ted.Price; price >>= 16; - price = ((supportCosts + price) / 2) * 10; + price = supportCosts + price; if (ride->lifecycle_flags & RIDE_LIFECYCLE_EVER_BEEN_OPENED) { // 70% modifier for opened rides - price = (static_cast(price) * 45875) / 65536; + price = (price * 45875) / 65536; } res.Cost = -price; diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 1c1e1ad7ec..d2eb018a4f 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -86,8 +86,8 @@ struct RideNameConvention struct RideBuildCost { - uint16_t TrackPrice; - uint16_t SupportPrice; + money64 TrackPrice; // Cost of a single straight piece of track + money64 SupportPrice; uint8_t PriceEstimateMultiplier; }; @@ -371,7 +371,7 @@ constexpr const RideTypeDescriptor DummyRTD = SET_FIELD(RatingsCalculationFunction, nullptr), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 0, 0, 1 }), + SET_FIELD(BuildCosts, { 0.00_GBP, 0.00_GBP, 1 }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h index 0d898d3e05..6b8c191669 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -38,7 +38,7 @@ constexpr const RideTypeDescriptor AirPoweredVerticalCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_air_powered_vertical_coaster), SET_FIELD(RatingsMultipliers, { 44, 66, 10 }), SET_FIELD(UpkeepCosts, { 90, 20, 0, 0, 0, 10 }), - SET_FIELD(BuildCosts, { 200, 0, 45, }), + SET_FIELD(BuildCosts, { 100.00_GBP, 0.00_GBP, 45, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index e80bd62517..20350c388b 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_bobsleigh_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 80, 5, 45, }), + SET_FIELD(BuildCosts, { 40.00_GBP, 2.50_GBP, 45, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h index fb121e4b73..87e47f5339 100644 --- a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor ClassicMiniRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_junior_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 45, 4, 40, }), + SET_FIELD(BuildCosts, { 22.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index af221b0299..d202cf3fff 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_compact_inverted_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 13, 3, 10 }), - SET_FIELD(BuildCosts, { 100, 5, 50, }), + SET_FIELD(BuildCosts, { 50.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index 09716956ec..2103a8ac58 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_corkscrew_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 105, 5, 50, }), + SET_FIELD(BuildCosts, { 52.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h index 1a96792c94..a44df3f389 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_flying_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), - SET_FIELD(BuildCosts, { 125, 5, 50, }), + SET_FIELD(BuildCosts, { 62.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), @@ -82,7 +82,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterAltRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_flying_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), - SET_FIELD(BuildCosts, { 125, 5, 50, }), + SET_FIELD(BuildCosts, { 62.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index d5f5341e48..e6bb46fe01 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor GigaCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_giga_coaster), SET_FIELD(RatingsMultipliers, { 51, 32, 10 }), SET_FIELD(UpkeepCosts, { 10, 20, 80, 12, 3, 40 }), - SET_FIELD(BuildCosts, { 120, 5, 55, }), + SET_FIELD(BuildCosts, { 60.00_GBP, 2.50_GBP, 55, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h index f37ae005ec..9f3aa43bb9 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_heartline_twister_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 47, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 135, 7, 30, }), + SET_FIELD(BuildCosts, { 72.50_GBP, 3.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 15, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/HybridCoaster.h b/src/openrct2/ride/coaster/meta/HybridCoaster.h index 80a50d607d..076b52a143 100644 --- a/src/openrct2/ride/coaster/meta/HybridCoaster.h +++ b/src/openrct2/ride/coaster/meta/HybridCoaster.h @@ -38,7 +38,7 @@ constexpr const RideTypeDescriptor HybridCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_hybrid_coaster), SET_FIELD(RatingsMultipliers, { 52, 36, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 110, 7, 55}), + SET_FIELD(BuildCosts, { 65.00_GBP, 3.50_GBP, 55}), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/HyperTwister.h b/src/openrct2/ride/coaster/meta/HyperTwister.h index 86255793c4..fe777048ce 100644 --- a/src/openrct2/ride/coaster/meta/HyperTwister.h +++ b/src/openrct2/ride/coaster/meta/HyperTwister.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor HyperTwisterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_twister_roller_coaster), SET_FIELD(RatingsMultipliers, { 52, 36, 10 }), SET_FIELD(UpkeepCosts, { 43, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 120, 5, 55, }), + SET_FIELD(BuildCosts, { 60.00_GBP, 2.50_GBP, 55, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/Hypercoaster.h b/src/openrct2/ride/coaster/meta/Hypercoaster.h index bafd210ed6..775e7eb9f9 100644 --- a/src/openrct2/ride/coaster/meta/Hypercoaster.h +++ b/src/openrct2/ride/coaster/meta/Hypercoaster.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor HypercoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_corkscrew_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 105, 5, 50, }), + SET_FIELD(BuildCosts, { 52.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index 6357ace511..28cd5ed773 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_inverted_hairpin_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 30 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), - SET_FIELD(BuildCosts, { 67, 4, 40, }), + SET_FIELD(BuildCosts, { 33.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index 03895e368b..87f64bc6a7 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_inverted_impulse_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 180, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 125, 5, 25, }), + SET_FIELD(BuildCosts, { 62.50_GBP, 2.50_GBP, 25, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index e3bd091417..6dcaabd53c 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_inverted_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 13, 3, 10 }), - SET_FIELD(BuildCosts, { 110, 5, 50, }), + SET_FIELD(BuildCosts, { 65.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h index 5b9eecc734..87c70d2a11 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_junior_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 45, 4, 40, }), + SET_FIELD(BuildCosts, { 22.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h index 46c16abd61..6232462dee 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_lim_launched_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 42, 20, 80, 9, 3, 10 }), - SET_FIELD(BuildCosts, { 95, 5, 50, }), + SET_FIELD(BuildCosts, { 47.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h index df643fc8ff..18c682a8b4 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_lay_down_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), - SET_FIELD(BuildCosts, { 107, 5, 50, }), + SET_FIELD(BuildCosts, { 53.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), @@ -78,7 +78,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_lay_down_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), - SET_FIELD(BuildCosts, { 107, 5, 50, }), + SET_FIELD(BuildCosts, { 53.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 58288429dc..851bde95b4 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_looping_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 90, 5, 50, }), + SET_FIELD(BuildCosts, { 45.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 7121b400bf..67e6e10688 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor MineRideRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_mine_ride), SET_FIELD(RatingsMultipliers, { 60, 20, 10 }), SET_FIELD(UpkeepCosts, { 50, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 85, 4, 40, }), + SET_FIELD(BuildCosts, { 42.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index 7bfce8242e..c5779cc0d7 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_mine_train_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 82, 6, 50, }), + SET_FIELD(BuildCosts, { 41.00_GBP, 3.00_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index 94dfaf1b61..a2635e703a 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_mini_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 35, 20, 80, 8, 3, 10 }), - SET_FIELD(BuildCosts, { 65, 4, 40, }), + SET_FIELD(BuildCosts, { 32.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index 935705449a..0e1afdc16b 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_mini_suspended_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 60, 5, 40, }), + SET_FIELD(BuildCosts, { 30.00_GBP, 2.50_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index d76a4e193d..e17dc4c88a 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_multi_dimension_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 75, 20, 90, 11, 3, 15 }), - SET_FIELD(BuildCosts, { 180, 5, 50, }), + SET_FIELD(BuildCosts, { 90.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo2), @@ -79,7 +79,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_multi_dimension_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 75, 20, 90, 11, 3, 15 }), - SET_FIELD(BuildCosts, { 180, 5, 50, }), + SET_FIELD(BuildCosts, { 90.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index 593a570d53..52a1c06f0a 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -38,7 +38,7 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_reverse_freefall_coaster), SET_FIELD(RatingsMultipliers, { 44, 66, 10 }), SET_FIELD(UpkeepCosts, { 80, 20, 0, 0, 0, 10 }), - SET_FIELD(BuildCosts, { 200, 0, 45, }), + SET_FIELD(BuildCosts, { 100.00_GBP, 0.00_GBP, 45, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index e615f4d3c7..c01a6b6c88 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_reverser_roller_coaster), SET_FIELD(RatingsMultipliers, { 48, 28, 7 }), SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 55, 6, 37, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 3.00_GBP, 37, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo3), diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index ff01179923..4ac352ab1d 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_side_friction_roller_coaster), SET_FIELD(RatingsMultipliers, { 48, 28, 7 }), SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 55, 6, 37, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 3.00_GBP, 37, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo3), diff --git a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h index 955cefe2cc..ae865d39ee 100644 --- a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h @@ -38,7 +38,7 @@ constexpr const RideTypeDescriptor SingleRailRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_single_rail_roller_coaster), SET_FIELD(RatingsMultipliers, { 52, 36, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 75, 5, 50}), + SET_FIELD(BuildCosts, { 37.50_GBP, 2.50_GBP, 50}), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h index 7ba0c89b7b..0a620f8131 100644 --- a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h @@ -38,7 +38,7 @@ constexpr const RideTypeDescriptor SpinningWildMouseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_wild_mouse), SET_FIELD(RatingsMultipliers, { 50, 30, 30 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), - SET_FIELD(BuildCosts, { 55, 4, 40, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index 5b8db0c0ca..1d9c57f0db 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_spiral_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 41, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 70, 5, 50, }), + SET_FIELD(BuildCosts, { 35.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index dcb16bc884..b016c99f70 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_stand_up_roller_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 100, 5, 50, }), + SET_FIELD(BuildCosts, { 50.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index 5573d3ff78..cc2b273181 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor SteelWildMouseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_wild_mouse), SET_FIELD(RatingsMultipliers, { 50, 30, 30 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), - SET_FIELD(BuildCosts, { 55, 4, 40, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index ee4a11a8e5..a178fcc0c1 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor SteeplechaseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_steeplechase), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 57, 4, 40, }), + SET_FIELD(BuildCosts, { 28.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index ee01100610..30bd6dddf9 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_suspended_swinging_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 20, 3, 10 }), - SET_FIELD(BuildCosts, { 95, 5, 50, }), + SET_FIELD(BuildCosts, { 47.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index 12e2673be8..c2be589fb6 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor TwisterRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_twister_roller_coaster), SET_FIELD(RatingsMultipliers, { 52, 36, 10 }), SET_FIELD(UpkeepCosts, { 43, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 120, 5, 55, }), + SET_FIELD(BuildCosts, { 60.00_GBP, 2.50_GBP, 55, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index bc6b66c64c..c42bd86628 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_vertical_drop_roller_coaster), SET_FIELD(RatingsMultipliers, { 52, 38, 10 }), SET_FIELD(UpkeepCosts, { 44, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 120, 5, 42, }), + SET_FIELD(BuildCosts, { 60.00_GBP, 2.50_GBP, 42, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/coaster/meta/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index 529110591a..30f257e195 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor VirginiaReelRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_virginia_reel), SET_FIELD(RatingsMultipliers, { 30, 15, 25 }), SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 53, 6, 25, }), + SET_FIELD(BuildCosts, { 26.50_GBP, 3.00_GBP, 25, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo3), diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index 6d0267652c..59c464eefe 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor WaterCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_water_coaster), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 60, 20, 80, 8, 3, 10 }), - SET_FIELD(BuildCosts, { 55, 4, 40, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index a61b86faab..124ccc3bec 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_wooden_roller_coaster), SET_FIELD(RatingsMultipliers, { 52, 33, 8 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 75, 7, 50, }), + SET_FIELD(BuildCosts, { 37.50_GBP, 3.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo3), diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index ab8a748a2f..f57ff52477 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor WoodenWildMouseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_wooden_wild_mouse), SET_FIELD(RatingsMultipliers, { 50, 30, 30 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), - SET_FIELD(BuildCosts, { 50, 6, 40, }), + SET_FIELD(BuildCosts, { 25.00_GBP, 3.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo3), diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index d036da0d67..97f604cd29 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor CarRideRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_car_ride), SET_FIELD(RatingsMultipliers, { 70, 10, 10 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 25, 5, 30, }), + SET_FIELD(BuildCosts, { 12.50_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 2e0bb6a4e5..18f4ed8643 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_circus), SET_FIELD(RatingsMultipliers, { 20, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 125, 2, 1, }), + SET_FIELD(BuildCosts, { 62.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, {}), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index 188e0061db..a764eec06b 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor CrookedHouseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_crooked_house), SET_FIELD(RatingsMultipliers, { 15, 8, 0 }), SET_FIELD(UpkeepCosts, { 30, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 65, 2, 1, }), + SET_FIELD(BuildCosts, { 32.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index a9d39e60a5..8341cbd7f1 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor DodgemsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_dodgems), SET_FIELD(RatingsMultipliers, { 40, 20, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 5, 0, 0 }), - SET_FIELD(BuildCosts, { 55, 2, 1, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_DODGEMS), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index 2094a2f45c..4223c13994 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor FerrisWheelRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_ferris_wheel), SET_FIELD(RatingsMultipliers, { 60, 20, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 225, 2, 1, }), + SET_FIELD(BuildCosts, { 112.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index 8da74cdf3d..b3ed243bc5 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_flying_saucers), SET_FIELD(RatingsMultipliers, { 50, 25, 0 }), SET_FIELD(UpkeepCosts, { 90, 1, 0, 5, 0, 0 }), - SET_FIELD(BuildCosts, { 70, 4, 1, }), + SET_FIELD(BuildCosts, { 35.00_GBP, 2.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index 3f65035076..853177d935 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor GhostTrainRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_ghost_train), SET_FIELD(RatingsMultipliers, { 70, 10, 10 }), SET_FIELD(UpkeepCosts, { 80, 20, 0, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 26, 5, 30, }), + SET_FIELD(BuildCosts, { 13.00_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_HORROR), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index fded890200..a64084d036 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor HauntedHouseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_haunted_house), SET_FIELD(RatingsMultipliers, { 20, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 85, 2, 1, }), + SET_FIELD(BuildCosts, { 42.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_HORROR), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index 6052f7cc6d..5f8eda50c4 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor MazeRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_maze), SET_FIELD(RatingsMultipliers, { 50, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 55, 2, 8, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 1.00_GBP, 8, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index dbf72ed1b1..20ba960f80 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor MerryGoRoundRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_merry_go_round), SET_FIELD(RatingsMultipliers, { 50, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 115, 2, 1, }), + SET_FIELD(BuildCosts, { 57.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_FAIRGROUND), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index 338bf62f53..b7086f5263 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor MiniGolfRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_mini_golf), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 30, 20, 80, 11, 3, 10 }), - SET_FIELD(BuildCosts, { 50, 7, 20, }), + SET_FIELD(BuildCosts, { 25.00_GBP, 3.50_GBP, 20, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index c2af3fa059..60a7bbce4a 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MiniHelicoptersRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_mini_helicopters), SET_FIELD(RatingsMultipliers, { 70, 10, 10 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 25, 5, 30, }), + SET_FIELD(BuildCosts, { 12.50_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index 5b20cf0411..4a7e5bfb55 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MonorailCyclesRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_monorail_cycles), SET_FIELD(RatingsMultipliers, { 50, 10, 10 }), SET_FIELD(UpkeepCosts, { 47, 20, 0, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 20, 5, 30, }), + SET_FIELD(BuildCosts, { 10.00_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/MonsterTrucks.h b/src/openrct2/ride/gentle/meta/MonsterTrucks.h index bda3bb6dce..a639e7def6 100644 --- a/src/openrct2/ride/gentle/meta/MonsterTrucks.h +++ b/src/openrct2/ride/gentle/meta/MonsterTrucks.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MonsterTrucksRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_car_ride), SET_FIELD(RatingsMultipliers, { 70, 10, 10 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), - SET_FIELD(BuildCosts, { 25, 5, 30, }), + SET_FIELD(BuildCosts, { 12.50_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index 4ad88129c6..a38cbb7aab 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor ObservationTowerRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_observation_tower), SET_FIELD(RatingsMultipliers, { 80, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), - SET_FIELD(BuildCosts, { 37, 0, 4, }), + SET_FIELD(BuildCosts, { 18.50_GBP, 0.00_GBP, 4, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index 9bca0d3669..1be6a35da7 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor SpaceRingsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_space_rings), SET_FIELD(RatingsMultipliers, { 12, 4, 4 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 72, 2, 1, }), + SET_FIELD(BuildCosts, { 36.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 5, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index 3f9f6855bb..f33b736ce2 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor SpiralSlideRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_spiral_slide), SET_FIELD(RatingsMultipliers, { 50, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 165, 2, 1, }), + SET_FIELD(BuildCosts, { 82.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index 791b42d3bd..b554937ea1 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -38,7 +38,7 @@ constexpr const RideTypeDescriptor CashMachineRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_cash_machine), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 40, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 400, 0, 1, }), + SET_FIELD(BuildCosts, { 200.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index da40cd7c86..8f04a20146 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor DrinkStallRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_drink_stall), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 500, 0, 1, }), + SET_FIELD(BuildCosts, { 250.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index 3059ebd264..e1f38b8818 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor FirstAidRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_first_aid), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 45, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 500, 0, 1, }), + SET_FIELD(BuildCosts, { 250.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index 89f516cc02..35d5cee57c 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor FoodStallRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_food_stall), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 600, 0, 1, }), + SET_FIELD(BuildCosts, { 300.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index df2bc9b720..59b5cf1807 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor InformationKioskRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_information_kiosk), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 500, 0, 1, }), + SET_FIELD(BuildCosts, { 250.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index 7bc5adcf4e..a9b00fc9fc 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor ShopRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_shop), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 400, 0, 1, }), + SET_FIELD(BuildCosts, { 200.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index a02f37289f..2314267276 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -39,7 +39,7 @@ constexpr const RideTypeDescriptor ToiletsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_toilets), SET_FIELD(RatingsMultipliers, { 0, 0, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 450, 0, 1, }), + SET_FIELD(BuildCosts, { 225.00_GBP, 0.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index c5f65ab10e..ee9d1dcd85 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor CinemaRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_3d_cinema), SET_FIELD(RatingsMultipliers, { 20, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 140, 2, 1, }), + SET_FIELD(BuildCosts, { 70.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index 372119e86a..c01387f018 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor EnterpriseRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_enterprise), SET_FIELD(RatingsMultipliers, { 50, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 100, 2, 1, }), + SET_FIELD(BuildCosts, { 50.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index 315341df82..59ed751e10 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor GoKartsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_go_karts), SET_FIELD(RatingsMultipliers, { 120, 20, 0 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 8, 0, 0 }), - SET_FIELD(BuildCosts, { 62, 4, 20, }), + SET_FIELD(BuildCosts, { 31.00_GBP, 2.00_GBP, 20, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index 6f89733834..246dacb258 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor LaunchedFreefallRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_launched_freefall), SET_FIELD(RatingsMultipliers, { 50, 50, 10 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), - SET_FIELD(BuildCosts, { 50, 0, 4, }), + SET_FIELD(BuildCosts, { 25.00_GBP, 0.00_GBP, 4, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index fa454c1b47..d692ed0abf 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MagicCarpetRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_magic_carpet), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 198, 2, 1, }), + SET_FIELD(BuildCosts, { 99.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_EGYPTIAN), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index 5b72bea04d..afce44010f 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor MotionSimulatorRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_motion_simulator), SET_FIELD(RatingsMultipliers, { 24, 20, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 220, 2, 1, }), + SET_FIELD(BuildCosts, { 110.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index 4c15d45a8d..0e4df5a217 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor RotoDropRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_roto_drop), SET_FIELD(RatingsMultipliers, { 50, 50, 10 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), - SET_FIELD(BuildCosts, { 55, 0, 4, }), + SET_FIELD(BuildCosts, { 22.50_GBP, 0.00_GBP, 4, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index fdf74f8914..e8104ca07f 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor SwingingInverterShipRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_inverter_ship), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 212, 2, 1, }), + SET_FIELD(BuildCosts, { 106.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index b755e1aa5e..ebb3605626 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_swinging_ship), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 155, 2, 1, }), + SET_FIELD(BuildCosts, { 77.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_PIRATE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index 18a57c02d8..0eb8680f60 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor TopSpinRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_top_spin), SET_FIELD(RatingsMultipliers, { 24, 20, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 145, 2, 1, }), + SET_FIELD(BuildCosts, { 72.50_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index 79e298ae14..1bda985fd2 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor TwistRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_twist), SET_FIELD(RatingsMultipliers, { 40, 20, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), - SET_FIELD(BuildCosts, { 90, 2, 1, }), + SET_FIELD(BuildCosts, { 45.00_GBP, 1.00_GBP, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index a2136573d4..f4f6dd2d92 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor ChairliftRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_chairlift), SET_FIELD(RatingsMultipliers, { 70, 10, 0 }), SET_FIELD(UpkeepCosts, { 60, 20, 0, 4, 3, 10 }), - SET_FIELD(BuildCosts, { 65, 1, 30, }), + SET_FIELD(BuildCosts, { 32.50_GBP, 0.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index db48208cb8..c7059cb405 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor LiftRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_lift), SET_FIELD(RatingsMultipliers, { 80, 10, 0 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), - SET_FIELD(BuildCosts, { 39, 0, 4, }), + SET_FIELD(BuildCosts, { 19.50_GBP, 0.00_GBP, 4, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index 4d882fb209..9e0e7fc6b5 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MiniatureRailwayRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_miniature_railway), SET_FIELD(RatingsMultipliers, { 70, 6, -10 }), SET_FIELD(UpkeepCosts, { 60, 20, 0, 10, 3, 5 }), - SET_FIELD(BuildCosts, { 35, 6, 50, }), + SET_FIELD(BuildCosts, { 17.50_GBP, 3.00_GBP, 50, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index c3e2241545..681c4b589f 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MonorailRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_monorail), SET_FIELD(RatingsMultipliers, { 70, 6, -10 }), SET_FIELD(UpkeepCosts, { 65, 20, 0, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 42, 5, 50, }), + SET_FIELD(BuildCosts, { 21.00_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index 7b34d86924..725688dc27 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor SuspendedMonorailRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_suspended_monorail), SET_FIELD(RatingsMultipliers, { 70, 6, -10 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 10, 3, 10 }), - SET_FIELD(BuildCosts, { 65, 5, 50, }), + SET_FIELD(BuildCosts, { 32.50_GBP, 2.50_GBP, 50, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index 42ac91bbd3..0b24ac3379 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor BoatHireRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_boat_hire), SET_FIELD(RatingsMultipliers, { 70, 6, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 4, 0, 0 }), - SET_FIELD(BuildCosts, { 55, 0, 5, }), + SET_FIELD(BuildCosts, { 27.50_GBP, 0.00_GBP, 5, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo), diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index 7f94f25668..f834bdf557 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor DinghySlideRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_dinghy_slide), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 40, 20, 80, 4, 3, 10 }), - SET_FIELD(BuildCosts, { 40, 4, 40, }), + SET_FIELD(BuildCosts, { 20.00_GBP, 2.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 18b14466ab..4ff17dc3ce 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor LogFlumeRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_log_flume), SET_FIELD(RatingsMultipliers, { 80, 34, 6 }), SET_FIELD(UpkeepCosts, { 80, 20, 0, 9, 0, 10 }), - SET_FIELD(BuildCosts, { 45, 5, 40, }), + SET_FIELD(BuildCosts, { 22.50_GBP, 2.50_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index 945d89bed8..3283fb6d9f 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor RiverRaftsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_river_rafts), SET_FIELD(RatingsMultipliers, { 80, 34, 6 }), SET_FIELD(UpkeepCosts, { 50, 20, 0, 9, 0, 10 }), - SET_FIELD(BuildCosts, { 40, 5, 30, }), + SET_FIELD(BuildCosts, { 20.00_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 10, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo4), diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 7dada70443..9ea73105b5 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor RiverRapidsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_river_rapids), SET_FIELD(RatingsMultipliers, { 72, 26, 6 }), SET_FIELD(UpkeepCosts, { 82, 20, 0, 10, 0, 10 }), - SET_FIELD(BuildCosts, { 62, 6, 40, }), + SET_FIELD(BuildCosts, { 31.00_GBP, 3.00_GBP, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index ea41d5a4b1..ab37566a68 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor SplashBoatsRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_splash_boats), SET_FIELD(RatingsMultipliers, { 80, 34, 6 }), SET_FIELD(UpkeepCosts, { 70, 20, 0, 9, 0, 10 }), - SET_FIELD(BuildCosts, { 57, 5, 30, }), + SET_FIELD(BuildCosts, { 28.50_GBP, 2.50_GBP, 30, }), SET_FIELD(DefaultPrices, { 20, 20 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index e5b8710682..7d1970994c 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SubmarineRideRTD = SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_submarine_ride), SET_FIELD(RatingsMultipliers, { 70, 6, 0 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 4, 0, 0 }), - SET_FIELD(BuildCosts, { 70, 5, 5, }), + SET_FIELD(BuildCosts, { 35.00_GBP, 2.50_GBP, 5, }), SET_FIELD(DefaultPrices, { 10, 0 }), SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo),