mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Move RideProperties and rideBonusValue to RideTypeDescriptors

Browse Source 
Part of #11964.
This commit is contained in:
frutiemax
2020-06-17 12:59:04 -04:00
committed by GitHub
parent 723e8347ec
commit de1c172c74
90 changed files with 199 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
src/openrct2/ride/RideData.cpp
View File

@@ -110,100 +110,6 @@
#include <iterator>
// clang-format off
// Data at 0x0097D21E
const uint8_t rideBonusValue[RIDE_TYPE_COUNT] = {
85, // 00 Spiral Roller coaster
90, // 01 Stand Up Coaster
90, // 02 Suspended Swinging
100, // 03 Inverted
60, // 04 Steel Mini Coaster
50, // 05 Mini Railway
60, // 06 Monorail
50, // 07 Mini Suspended Coaster
40, // 08 Boat Hire
55, // 09 Wooden Wild Mine/Mouse
60, // 0a Steeplechase/Motorbike/Soap
50, // 0b Car Ride
65, // 0c Launched Freefall
75, // 0d Bobsleigh Coaster
45, // 0e Observation Tower
95, // 0f Looping Roller Coaster
55, // 10 Dinghy Slide
85, // 11 Mine Train Coaster
55, // 12 Chairlift
100, // 13 Corkscrew Roller Coaster
40, // 14 Maze
40, // 15 Spiral Slide
55, // 16 Go Karts
65, // 17 Log Flume
70, // 18 River Rapids
35, // 19 Dodgems
35, // 1a Pirate Ship
35, // 1b Swinging Inverter Ship
15, // 1c Food Stall
15, // 1d (none)
15, // 1e Drink Stall
15, // 1f (none)
15, // 20 Shop (all types)
45, // 21 Merry Go Round
15, // 22 Balloon Stall (maybe)
15, // 23 Information Kiosk
5, // 24 Bathroom
45, // 25 Ferris Wheel
45, // 26 Motion Simulator
45, // 27 3D Cinema
55, // 28 Topspin
30, // 29 Space Rings
70, // 2a Reverse Freefall Coaster
45, // 2b Elevator
95, // 2c Vertical Drop Roller Coaster
5, // 2d ATM
40, // 2e Twist
22, // 2f Haunted House
5, // 30 First Aid
39, // 31 Circus Show
50, // 32 Ghost Train
120, // 33 Twister Roller Coaster
105, // 34 Wooden Roller Coaster
65, // 35 Side-Friction Roller Coaster
55, // 36 Wild Mouse
100, // 37 Multi Dimension Coaster
100, // 38 (none)
100, // 39 Flying Roller Coaster
100, // 3a (none)
50, // 3b Virginia Reel
65, // 3c Splash Boats
45, // 3d Mini Helicopters
100, // 3e Lay-down Roller Coaster
60, // 3f Suspended Monorail
100, // 40 (none)
65, // 41 Reverser Roller Coaster
35, // 42 Heartline Twister Roller Coaster
23, // 43 Mini Golf
120, // 44 Giga Coaster
45, // 45 Roto-Drop
35, // 46 Flying Saucers
22, // 47 Crooked House
45, // 48 Monorail Cycles
80, // 49 Compact Inverted Coaster
60, // 4a Water Coaster
70, // 4b Air Powered Vertical Coaster
55, // 4c Inverted Hairpin Coaster
35, // 4d Magic Carpet
40, // 4e Submarine Ride
65, // 4f River Rafts
15, // 50 (none)
45, // 51 Enterprise
15, // 52 (none)
15, // 53 (none)
15, // 54 (none)
100, // 55 (none)
75, // 56 Inverted Impulse Coaster
60, // 57 Mini Roller Coaster
70, // 58 Mine Ride
55, // 59 (none)
55, // 5a LIM Launched Roller Coaster
};
const rct_ride_entry_vehicle CableLiftVehicle = {
/* .rotation_frame_mask = */ 31,
@@ -353,101 +259,6 @@ const rating_tuple RideRatings[RIDE_TYPE_COUNT] = {
{ 50, 30, 10 }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
};
// rct2: 0x0097CF40
const rct_ride_properties RideProperties[RIDE_TYPE_COUNT] = {
{ 10, 27, 30, 17, 17, 0 }, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
{ 7, 27, 0, 0, 0, 0 }, // RIDE_TYPE_STAND_UP_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER
{ 7, 27, 0, 0, 0, 0 }, // RIDE_TYPE_INVERTED_ROLLER_COASTER
{ 0, 0, 0, 17, 16, -1 }, // RIDE_TYPE_JUNIOR_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MONORAIL
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_BOAT_HIRE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_STEEPLECHASE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_CAR_RIDE
{ 10, 40, 0, 0, 0, 0 }, // RIDE_TYPE_LAUNCHED_FREEFALL
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_BOBSLEIGH_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_OBSERVATION_TOWER
{ 10, 27, 26, 18, 18, 0 }, // RIDE_TYPE_LOOPING_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_DINGHY_SLIDE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MINE_TRAIN_COASTER
{ 1, 4, 0, 0, 0, 0 }, // RIDE_TYPE_CHAIRLIFT
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER
{ 1, 64, 0, 0, 0, 0 }, // RIDE_TYPE_MAZE
{ 1, 5, 0, 0, 0, 0 }, // RIDE_TYPE_SPIRAL_SLIDE
{ 1, 10, 0, 0, 0, 0 }, // RIDE_TYPE_GO_KARTS
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_LOG_FLUME
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_RIVER_RAPIDS
{ 20, 180, 0, 0, 0, 0 }, // RIDE_TYPE_DODGEMS
{ 7, 25, 0, 0, 0, 0 }, // RIDE_TYPE_SWINGING_SHIP
{ 7, 15, 0, 0, 0, 0 }, // RIDE_TYPE_SWINGING_INVERTER_SHIP
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_FOOD_STALL
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_1D
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_DRINK_STALL
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_1F
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SHOP
{ 4, 25, 0, 0, 0, 0 }, // RIDE_TYPE_MERRY_GO_ROUND
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_22
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_INFORMATION_KIOSK
{ 4, 4, 0, 0, 0, 0 }, // RIDE_TYPE_TOILETS
{ 1, 3, 0, 0, 0, 0 }, // RIDE_TYPE_FERRIS_WHEEL
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MOTION_SIMULATOR
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_3D_CINEMA
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_TOP_SPIN
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SPACE_RINGS
{ 7, 30, 30, 40, 40, 0 }, // RIDE_TYPE_REVERSE_FREEFALL_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_LIFT
{ 10, 27, 26, 17, 68, 0 }, // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_CASH_MACHINE
{ 3, 6, 0, 0, 0, 0 }, // RIDE_TYPE_TWIST
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_HAUNTED_HOUSE
{ 8, 8, 0, 0, 0, 0 }, // RIDE_TYPE_FIRST_AID
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_CIRCUS
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_GHOST_TRAIN
{ 10, 27, 30, 17, 68, 0 }, // RIDE_TYPE_TWISTER_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_WOODEN_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_STEEL_WILD_MOUSE
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_FLYING_ROLLER_COASTER
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_VIRGINIA_REEL
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SPLASH_BOATS
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MINI_HELICOPTERS
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SUSPENDED_MONORAIL
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_REVERSER_ROLLER_COASTER
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MINI_GOLF
{ 10, 27, 30, 17, 68, 1 }, // RIDE_TYPE_GIGA_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_ROTO_DROP
{ 20, 180, 0, 0, 0, 0 }, // RIDE_TYPE_FLYING_SAUCERS
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_CROOKED_HOUSE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MONORAIL_CYCLES
{ 7, 27, 0, 0, 0, 0 }, // RIDE_TYPE_COMPACT_INVERTED_COASTER
{ 0, 0, 0, 17, 16, -1 }, // RIDE_TYPE_WATER_COASTER
{ 30, 50, 30, 40, 40, 0 }, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER
{ 7, 15, 0, 0, 0, 0 }, // RIDE_TYPE_MAGIC_CARPET
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_SUBMARINE_RIDE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_RIVER_RAFTS
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_50
{ 10, 20, 0, 0, 0, 0 }, // RIDE_TYPE_ENTERPRISE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_52
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_53
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_54
{ 10, 27, 30, 25, 25, 0 }, // RIDE_TYPE_55
{ 10, 33, 30, 25, 25, 0 }, // RIDE_TYPE_INVERTED_IMPULSE_COASTER
{ 0, 0, 0, 0, 68, 1 }, // RIDE_TYPE_MINI_ROLLER_COASTER
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_MINE_RIDE
{ 0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_59
{ 10, 31, 26, 18, 18, 0 }, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
};
#define TRACK_COLOUR_PRESETS(...) {static_cast<uint8_t>(std::size<TrackColour>({__VA_ARGS__})), {__VA_ARGS__}}
#define DEFAULT_FLAT_RIDE_COLOUR_PRESET TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW } )