Commit Graph

2601 Commits

Author SHA1 Message Date
ZeeMajora ff85b6bcc3
More accurate rating calculations for the classic coasters 2022-09-27 12:47:16 -04:00
73 4f05ef58b2
Add 5 colour presets to Car Ride 2022-09-25 19:20:29 +02:00
73 bfa22d4ac0
Add 4 colour presets to Boat Hire 2022-09-25 19:17:49 +02:00
73 d00737367b
Add 2 colour presets to Dodgems 2022-09-25 19:17:01 +02:00
73 a7cd02b2be
Add 2 additional colour presets to Flying Saucers 2022-09-25 19:16:06 +02:00
AuraSpecs fd531903ce
Make maintenance of Mini-Golf less hateful (#17745)
This commit gets rid of Diamond Golf Balls: https://youtu.be/Szk3iPckVTo?t=106
2022-09-24 22:12:01 +00:00
AuraSpecs 6972811bff
Fix clipping on Flying RC Inline Twist
Same bug as #17832 but on the Flying RC. This fixes that.
2022-09-24 23:48:44 +02:00
Michael Steenbeek e0a25f3d22
Merge pull request #18081 from rik-smeets/fix-10535
Fix #10535: Guests getting stuck at specific level crossings.
2022-09-23 22:58:13 +02:00
Michael Steenbeek 7af999e2dd
Fix #17980: Path mess and desync when hovering track design 2022-09-23 22:49:16 +02:00
Rik Smeets 9e68226df0 Fix #10535: Guests stuck at some level crossings
The location of the back vehicle itself should be included in determining whether to clear the 'blocked by vehicle' flag on footpath. Otherwise, in specific cases, blocked footpath can be missed and therefore this flag wouldn't ever be cleared.
2022-09-23 07:53:41 +02:00
Rik Smeets 189ebbced7 Reformat code on updating crossings 2022-09-23 07:11:15 +02:00
AuraSpecs 53877c244c
Allow laydown to pull pieces from corkscrew
This PR allows the Laydown RC to render missing pieces from the corkscrew rc.
2022-09-22 21:29:31 +00:00
Gymnasiast f5f4a8a2f6
Use gMapSize instead of MAXIMUM_MAP_SIZE_TECHNICAL in appropriate places
Backported from my map size refactors.

These functions previously scanned the whole map,
so this might also provide a slight performance boost (not tested).
2022-09-22 16:19:46 +02:00
Michael Steenbeek 31e2d7692c
Rename more instances of “vehicle” to “train” 2022-09-22 11:22:18 +02:00
Rik Smeets d2634640ce
Fix visual glitch with Mine Ride's large turn (#18051) 2022-09-18 23:05:20 +02:00
Michael Steenbeek 36904cf3d0
Remove Reverse Incline Launched Shuttle mode from Junior RC (#18001)
This mode was not available in vanilla RCT2. We added it for RCT1 parity
before realising it was a better idea to just spin it off into its own
roller coaster (namely the Classic Mini RC). When we did eventually split
it, I overlooked this one.

Obviously, this mode still remains available on the Classic Mini RC.
2022-09-17 13:07:16 +02:00
Rik Smeets a271c6c6f1
Fix Steeplechase S-bends bounding boxes 2022-09-11 17:56:21 +02:00
Gymnasiast 2a5bccb4c3
Fix whitespace 2022-09-07 20:54:23 +02:00
Michael Steenbeek 400bbbc5ed
Use constant reference 2022-09-07 20:51:00 +02:00
Gymnasiast b4ab72416e
Move Boundbox to its own file, remove non-Coords constructors 2022-09-07 20:51:00 +02:00
iikorni b5ba892bd9
Fix naming case errors 2022-09-07 19:41:35 +02:00
iikorni d70bca7980
Fix error with MagicCarpet BoundBox conversion 2022-09-07 19:41:35 +02:00
iikorni 388387c809
Fix formatting on files 2022-09-07 19:41:35 +02:00
iikorni 4fa4e4d440
Change some rides over to the BoundBoxXY struct
Changes over the Crooked House, Ferris Wheel, Haunted House,
Magic Carpet, Swinging Ship, Swinging Inverter Ship, Monorail, and
the Supports file over to using the new BoundBoxXY(Z) struct(s).
2022-09-07 19:41:35 +02:00
Michael Steenbeek 1956b718ef
Merge pull request #17821 from Basssiiie/plugin-tracksegment-subposition-length
[Plugin] Implement plugin getters for track and vehicle subpositions
2022-09-07 02:36:42 +02:00
Michael Steenbeek 99a0876ad6
Disable track elements if no train supports them (#17909)
This can be useful in several situations:
- In RCT1 scenarios, or when playing with ported RCT1 vehicles, it will disable elements like banked turns
- We can add extra elements to existing coaster types by default, even if no RCT2 train supports them
2022-09-06 21:24:02 +00:00
Bas 7b5aeece59 Implement plugin getters for subposition and subposition length 2022-09-02 23:18:29 +02:00
Michael Steenbeek 027482cbcf
Fix UpdateRotating function for the Motion Simulator 2022-09-01 12:57:32 +02:00
frutiemax c2cfa95d1a
Add UpdateRideApproachVehicleWaypoints to RTD (#17124) 2022-08-31 22:56:13 -03:00
frutiemax 306cc65258
Add UpdateRotating field to RTD 2022-08-31 10:10:39 +02:00
Michael Steenbeek 6c54bacd41
Fix #17921: NPE in track_block_get_next() (#17922) 2022-08-28 23:46:50 +02:00
AuraSpecs 2633eb013f
Add three colour schemes to Flying Roller Coaster 2022-08-27 15:37:24 +00:00
Gymnasiast bc650d1238
Use RCT2 brakes 2022-08-26 23:53:03 +02:00
spacek531 74ff5429a9
Add Classic Wooden Roller Coaster
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
2022-08-26 23:53:03 +02:00
Rik Smeets f7c769603b Close #9104: Calculate maze support costs 2022-08-22 19:30:01 +02:00
Rik Smeets 5c596eae5d Extract maze cost calculation 2022-08-22 19:29:56 +02:00
Hielke Morsink 7f29e4e39c
Make `rct_windowclass` strong type `WindowClass`
This already revealed some places where implicit conversions were done, including some where its use was nonsense (MouseInput.cpp).
The changes to the Intent class were necessary to keep things working, and this splits things up more neatly.
2022-08-21 18:38:25 +02:00
Michael Steenbeek ebe38a91ce
Return dummy TED when index is out of bounds (#17810) 2022-08-21 17:09:18 +01:00
Dan Stevens 4291568a95
Fix #17844L ‘ride.ratings.calculate’ hook called several times during calculation
The ‘ride.ratings.calculate’ API hook is now called for a ride only after its rating calculations are complete (RIDE_LIFECYCLE_TESTED lifecycle_flag is set).
2022-08-21 00:25:17 +02:00
Michael Steenbeek 564a902b5f
Fix #15328: Incorrect railing on Wooden RC station (#17831) 2022-08-18 23:24:23 +02:00
AuraSpecs 615325dd70
Hotfix B&M inline twist issue (#17832) 2022-08-16 23:50:41 -03:00
frutiemax 37500525b7
Add SpecialElementRatingAdjustment field in the RTD (#17652) 2022-08-13 22:49:38 -03:00
Gymnasiast 5945f7110a
Move gGotoStartPlacementMode to windows/RideConstruction.cpp 2022-08-13 23:00:54 +02:00
Gymnasiast f8a94c2e12
Move two functions out of _legacy.cpp 2022-08-13 23:00:53 +02:00
frutiemax f9bb5b2447
Add GetGuestWaypointLocation to RTD (#17750) 2022-08-13 16:53:27 -03:00
Michael Steenbeek d9e23e9dfa
Use ride_type_t instead of uint8_t in more places (#17803)
Part of preparation for making ride types into objects.
2022-08-13 21:49:19 +02:00
skdltmxn 6aabe38590
Improve FileIndex (#17773) 2022-08-13 20:32:59 +01:00
Duncan adc51ad9aa
Rework rct_vehicle_colour (#16051)
* Remove rct_vehicle_colour and replace with VehicleColour

* Update network version

* Update replay version
2022-08-13 19:30:30 +00:00
Michael Steenbeek 49215a52cf
Remove unnecessary pops from some strings (#17805) 2022-08-13 20:12:30 +02:00
ale a187e10819
Fix #17535: Multiplayer desync when placing rides with scenery 2022-08-13 18:27:43 +02:00
Michael Steenbeek b3d65c9ee6
Merge pull request #17801 from Gymnasiast/fix/17797
Fix #17797: NPE in ride_check_block_brakes()
2022-08-13 17:55:06 +02:00
Ted John b0656122c1
Fix #17784: Colour preset RNG is biased 2022-08-13 17:33:21 +02:00
Gymnasiast 4832e67d14
Fix crash in ride_scroll_to_track_error() 2022-08-13 17:21:34 +02:00
Gymnasiast ec81a5ff14
Fix #17797: NPE in ride_check_block_brakes() 2022-08-13 16:51:48 +02:00
frutiemax 807e080d41
Add RideUpdate to RTD (#17752) 2022-08-13 10:36:43 -03:00
frutiemax a21d9183e6
Add MusicTrackOffsetLength field to RTD (#17684) 2022-08-13 09:56:05 -03:00
frutiemax 2202f8d060
Add ConstructionWindowContext field to RTD (#17749) 2022-08-13 09:18:56 -03:00
spacek531 48530026a2
Flying coaster track additions 2022-08-10 22:54:33 +00:00
Michael Steenbeek 5661da1c68
Unwrap game action compat wrappers 2022-08-11 00:00:58 +02:00
frutiemax 59c31e8b7a
Add AccelerationFactor field to RTD (#17687) 2022-08-09 22:20:07 -03:00
frutiemax 9cd6c646a9
Add UpdateMeasurementsSpecialElements field to RTD (#17659) 2022-08-09 22:18:15 -03:00
frutiemax 6868b3dcaf
Rename IS_SHOP to IS_SHOP_OR_FACILITY and use it for RideObject 2022-08-06 15:00:52 +02:00
frutiemax 2d75858589
Add IS_FIRST_AID flag 2022-08-06 15:00:52 +02:00
frutiemax 76104cbbee
Use RIDE_TYPE_FLAG_IS_TOILET 2022-08-06 15:00:52 +02:00
Gymnasiast ab68d7d631
Remove ride type check in JuniorRollerCoaster.cpp 2022-08-06 12:19:27 +02:00
frutiemax d6d43e5b0b
Remove ride type check for reverser upkeep cost 2022-08-05 21:56:28 +02:00
spacek531 468084a401
Move supported track pieces return type to BitSet 2022-08-05 18:55:30 +00:00
Michael Steenbeek 840f497d85
Merge pull request #17663 from frutiemax/RTD_PoweredLaunchBlock
Convert PoweredLaunch to PoweredLaunchBlockSectioned when block brake
2022-08-03 20:09:36 +02:00
Gymnasiast b54ef13c4f
Implement cleaner method for checking mode availability 2022-08-03 19:42:43 +02:00
Michael Steenbeek 80f0d952ad
Merge pull request #17638 from X123M3-256/new_track_pieces
Add new track pieces to the hybrid and single rail
2022-08-01 23:24:22 +02:00
Gymnasiast d3fd31c611
Rename rct_string_id to StringId 2022-07-31 22:30:13 +02:00
Hielke Morsink d05d675ed9
Refactor window functions to take references 6 2022-07-31 17:23:17 +02:00
Hielke Morsink a258008bef
Refactor window functions to take references 4 2022-07-31 17:23:16 +02:00
Rik Smeets 889293f2b7
Lower default price for the Crooked House (#17655)
Guests didn't want to pay the previous default price,
even if the ride was brand new.
2022-07-31 14:07:36 +02:00
frutiemax e96f428c7b
Add RIDE_TYPE_FLAG_HAS_SEAT_ROTATION for multi-dim rollercoaster 2022-07-31 12:01:22 +02:00
Hielke Morsink 099b3c939b Apply regular expressions to format tables 2022-07-31 10:22:46 +01:00
X123M3-256 da472ff033 Remove unnecessary changes 2022-07-31 10:22:45 +01:00
X123M3-256 f77a2386ca Remove excess newlines from VehicleSubpositionData 2022-07-31 10:22:45 +01:00
X123M3-256 0347ee62cb Remove apparently redundant cast 2022-07-31 10:22:45 +01:00
X123M3-256 8090eab2a3 Fix comments in TrackData 2022-07-31 10:22:45 +01:00
X123M3-256 3b7cd1194c Fix formatting 2022-07-31 10:22:44 +01:00
X123M3-256 77c5bbcafe Finalize track data and G forces 2022-07-31 10:22:04 +01:00
X123M3-256 15d82db8fd Implement zero g rolls, large corkscrews and medium loops 2022-07-31 10:22:00 +01:00
frutiemax aab94437dc
Add RIDE_TYPE_FLAG_HAS_ONE_STATION for gokarts and minigolf 2022-07-31 02:16:48 +02:00
Michael Steenbeek 0bfc151ab9
Remove remaining usages of gGameCommandErrorText 2022-07-30 18:04:59 +02:00
frutiemax d556eafc73
Add LightFXAddLightsMagicVehicle to RTD (#17211) 2022-07-30 16:45:41 +02:00
Michael Steenbeek 5a5b107245
Refactor Twist rotations, fix truncating of operating value (#17636) 2022-07-30 16:32:22 +02:00
Hielke Morsink e2da19f0f7
Add missing includes 2022-07-29 18:45:10 +02:00
Michael Steenbeek 2b859c7099
Remove __ENABLE_LIGHTFX__ define
It is already enabled for all our builds, and upcoming changes to RTD would add a slew more.
Discussed in team chat with Duncan and Hielke.
2022-07-28 21:34:02 +00:00
Michael Steenbeek 6852b184b6
Fix #17541: Station style not correctly saved to TD6 2022-07-28 14:23:53 +02:00
Michael Steenbeek a75cc10dd5
Refactor Ride::Open, Ride::Test not to use gGameCommandErrorText 2022-07-28 14:23:33 +02:00
Michael Steenbeek 1a8660d59d
Pass window reference to tool_set (#17625) 2022-07-27 22:22:22 -03:00
frutiemax a3ce24658c
Add StartRideMusic field to RTD 2022-07-27 23:50:20 +00:00
frutiemax bc72c7e24c
Add UpdateLeaveEntrance field to the RTD (#16986)
Co-authored-by: frutiemax <frutiemax@users.noreply.github.com>
2022-07-26 19:33:54 -03:00
Michael Steenbeek 3f56a0eac9
Fix stray white line 2022-07-26 20:08:05 +01:00
Raymond Zhao 4f23e5e9ec
Refactor struct TrackDesignFileRef
- Refactors track_design_file_ref to TrackDesignFileRef and replaces the utf8* fields of that struct with u8string
- Gets rid of some String::Duplicate() and delete calls
- Uses a bunch of c_str() calls to interface with older functions
2022-07-26 16:12:46 +00:00
Nikolas Parshook 628da77c0e
Refactor ride construction window (#17578) 2022-07-26 15:17:25 +01:00
frutiemax bf432cc943
Add name field to RideTypeDescriptor structure 2022-07-25 00:06:37 +02:00
X123M3-256 55c8a3d775
Add extra vehicle sprite groups (new track pieces part 1) (#17352)
* Add new sprite groups for zero G rolls

* Fix formatting

* Rename vehicle paint functions

* Fix formatting

* Fix parameter name

* Fix formatting
2022-07-24 05:40:41 +01:00
Karst a74acee961
Fix: Wrong boundboxes for tunnels & terrain. (#17312)
* Edit Boundboxes

* Make all code consistent

Eight is the magic number
2022-07-21 07:57:49 +01:00
8street 213696ea27
Add option to sell merchandise in random colours
Co-authored-by: 8street <nikolai_e@rambler.ru>
2022-07-12 22:20:49 +00:00
underdoom fe2f1bad5a
Remove unwanted condition in ride_ratings_update_state_5 2022-07-12 19:58:40 +02:00
Gymnasiast 8871760472
Rename car entry animation flags 2022-07-11 18:06:22 +02:00
Gymnasiast 06c368694a
Update variables containing a CarEntry 2022-07-11 18:06:22 +02:00
spacek531 312ad3e3ce
Warn user if unsupported vehicle or element used 2022-07-04 19:06:59 +00:00
Gymnasiast d42e67ddfe
Reformat the ifs, remove unnecessary parameter 2022-07-01 23:26:40 +02:00
Gymnasiast d936aa48e1
Fix #17481: Roto-drop cars try going up to the wrong top pieces 2022-07-01 18:23:03 +02:00
Hielke Morsink 2936de5c86
Replace hardcoded 255/0xFF with TUNE_ID_NULL 2022-06-28 22:55:25 +02:00
Ted John 83758de284 Prevent ride music popping in loudly 2022-06-28 00:16:40 +01:00
Ted John 585ebed600
Fix #17297: Crash when switching language (#17370)
* Refactor all uses of IAudioChannel and the audio mixer.
* Use shared_ptr to avoid dead pointers hanging about.
* Reload particular audio channels where necessary after object reload.
2022-06-27 17:41:53 +01:00
Basssiiie 4d8dd516bf
Fix plugin ‘Car.travelBy()’ moving other cars as well (#17369) 2022-06-26 20:28:54 +01:00
ywnico 2d9e2de603
Fix: Wrong T-shirt colors when riding Twist (#17433)
A typo in the code had caused the wrong ImageId object to be used when
painting the peeps, resulting in their T-shirts being set to the ride
colors. The peeps are now painted with the correct T-shirt colors.
2022-06-23 07:07:59 +01:00
Gymnasiast 20f458b561
Remove outdated comment 2022-06-21 19:05:31 +02:00
Hielke Morsink 13db5a771b
Annotate hardcoded arrays and verify their sizes
This also reduces the number of lines within // clang-format comments
2022-06-16 23:51:24 +02:00
autofire372 d76a21551a
Fix #17381: wrong stat penalty on APVC
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
2022-06-13 18:31:26 +00:00
frutiemax 9c796816a1
Add DesignCreateMode field to the RTD (#16987) 2022-06-13 08:39:37 -03:00
Hielke Morsink b0ffa9d28e
Add missing includes to VehicleEntry.h (#17376) 2022-06-11 13:48:57 -03:00
Ted John dda5402644 Allow ride music to loop seamlessly without reload 2022-06-08 00:28:57 +01:00
Michael Steenbeek 3fae2413db
Use “car” instead of the ambiguous “vehicle”, part 1
Currently, the word “vehicle” is used for both “train” and “car”. This is a first effort towards disambiguation.
2022-06-07 20:36:20 +00:00
frutiemax 0791b221e5
Add MusicUpdateFunction field to RTD 2022-06-06 21:00:16 +02:00
X123M3-256 4b11a4fc6a
Remove incorrect flags from alpine coaster (#17347) 2022-06-06 20:10:56 +02:00
Michael Steenbeek 88b3e88bdd
Remove Testpaint (#17333)
TestPaint served us well, but it hasn’t compiled for years, and before that it produced incorrect results for years.
2022-06-06 10:07:07 +02:00
spacek531 673ec0fa10
Frames rotation count part 1 (#17106)
Refactor vehicle sprite groups

rename rotationType to spriteGroup

remove numframes getters from scobject

add sprite groups getters

add documentation to plugin

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2022-06-03 23:03:02 +01:00
X123M3-256 502f06af91
Add "Alpine Coaster" ride type (#16825)
* Implement "Alpine Coaster" ride type


Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2022-05-26 21:28:17 +00:00
Ted John 97c0c4e052
Merge pull request #16975 from IntelOrca/plugin/track-segments
[Plugin] Add APIs for track segments and track iteration
2022-05-26 20:33:53 +01:00
Ted John 2effca59d1 Fix audio source leak 2022-05-23 22:24:56 +01:00
Ted John a2e6691ac2 Add new audio objects for loading sounds 2022-05-23 22:24:56 +01:00
Ted John 4eef86dc50 Implement track iterator 2022-05-17 19:27:39 +01:00
Gymnasiast 4c4a20af81
Load Spiral Slide images from the object 2022-05-14 23:48:36 +02:00
Ted John 0b9184b99b Avoid overwriting _currentTrackPieceDirection when placing TD 2022-05-10 22:41:09 +01:00
Matt aea88b7320 Fix #13997: Placing track design influences clients ride construction 2022-05-10 21:58:51 +01:00
germanaizek 958bfbc08a
Using std::move(), correct clear strings, better use '= default;', modernize make_* and replace heavy strlen 2022-05-07 16:05:39 +02:00
frutiemax 275e970d69
Add RIDE_TYPE_FLAG_IS_CASH_MACHINE flag to RTD (#17130)
* Add RIDE_TYPE_FLAG_HAS_CASH flag to RTD

* Rename to RIDE_TYPE_FLAG_IS_CASH_MACHINE
2022-05-04 19:37:11 +01:00
frutiemax c1065db88f
Add Classification field to RTD (#17131) 2022-05-03 23:32:00 -03:00
frutiemax 8ab1258af7
Close #15353: Add VerticalFactor and LateralFactor fields to TrackElementDescriptor (#15401)
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2022-05-03 23:27:16 -03:00
spacek531 22c44fac71
Cleanup vehicle drawing code part 4 (#17105)
* Refactor VehiclePaint to take into account NumRotationFrames

* Reduce copied code
2022-04-30 11:26:55 +01:00
spacek531 5659d43f46
Cleanup vehicle drawing code part 3 (#16968)
* Cleanup vehicle drawing code part 3

* Create functions to convert between rotation amounts

* Add regions to ease code navigation
2022-04-30 07:56:23 +01:00
Michael Steenbeek 4d2ca33c2f
Use more constants in WoodenRollerCoaster.cpp 2022-04-25 23:32:26 +02:00
norisa118 483548120b
Fix #16879: TED::Price is price modifier, not price (#16962)
* Fix #16879: TED::Price is price modifier, not price

Change unit type to uint32_t, change name to 'PriceModifer' &
add comment on how to use PriceModifier.
2022-04-14 20:36:39 +01:00
Ivan 9c04024537
Close #16933: Rename car_visual to PaintStyle (#16969) 2022-04-11 23:18:18 -03:00
spacek531 5ecb7a6c6a
Cleanup vehicle drawing code part 2 (#16960) (#16960)
* Rename assembly variable names

* Repurpose unused rct_ride_entry_vehicle field for NumRotationFrames
2022-04-10 21:26:00 +01:00
spacek531 e699e96f38
Cleanup vehicle drawing code part 1 (#16956)
* rename some constants based on pitch index

* rename functions based on pitch index
2022-04-09 21:40:54 +01:00
Michael Steenbeek e9213e3ecf
Fix switched order of imageids on looping coasters (#16951) 2022-04-09 00:34:55 -03:00
Duncan 9c9b554813
Fix #16890. Incorrect rotation for splash boats (#16949) 2022-04-09 00:32:17 -03:00
Duncan 5760f11349
Simplify Track Cost calcs (#16940)
* Multiply out 5 in track cost calcs and use _GBP

* Fix typo on Hypercoaster conversion

* Use two decimals for literals converted by _GBP

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2022-04-07 11:35:11 +01:00
Michael Steenbeek 765bc59acd
Merge pull request #14207 from geoff-B/money32-UDL
#14093 User defined literals for Money32
2022-04-06 15:29:26 +02:00
X123M3-256 605112297d
Implement RIDE_ENTRY_FLAG_RIDER_CONTROLS_SPEED (#16837) 2022-04-06 08:38:24 -03:00
Hielke Morsink 7db9aeb709
Remove max queue length limit 2022-04-05 19:55:47 +02:00
Charles Machalow 0ece5d0f44
Add a new cheat to disable queue length limits 2022-04-02 20:07:06 +02:00
Tulio Leao 4bb17e643b Make whole ShopItems array use _GBP 2022-03-29 07:23:35 -03:00
Geoff Banh 85baa6f7ca Fix #14093: Replace MONEY macro with user defined literal 2022-03-29 07:23:35 -03:00
Rik Smeets 4e8ea47e1b
Guests with umbrellas no longer always avoid Maze when it rains (#16859)
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2022-03-28 23:26:56 -03:00
spacek531 047a7f8090
Do not turn off chain when building downhill if chain cheat is on 2022-03-28 20:34:37 +00:00
X123M3-256 f5507c42e0
Add RIDE_TYPE_FLAG_UP_INCLINE_REQUIRES_LIFT 2022-03-28 21:32:42 +02:00
Michael Steenbeek 18be90f8b6
Split TRACK_SLOPE_STEEP into flags for up and down 2022-03-21 21:05:59 +01:00
Ted John fc2ed95641
Merge pull request #16831 from IntelOrca/feature/ternary-scenery-colours
Implement tertiary colours for small and large scenery objects.
2022-03-20 19:24:47 +00:00
Ted John 793acf67ae Implement small scenery ternary colours 2022-03-20 18:53:11 +00:00
Michael Steenbeek e78c29ea5c
Fix most occurrences of ‘ternary’ (#16832) 2022-03-20 19:22:05 +01:00
Ted John e9e377ac09 Implement large scenery ternary colours 2022-03-20 18:12:39 +00:00
Ted John f909be7a43
Merge pull request #16797 from IntelOrca/feature/enhanced-transparency
Introduce more transparency toggles and allow each one to be set to either an invisible or ghost state which is a persisted user setting.

A new window is introduced to control these settings and is inspired by OpenTTD.
2022-03-20 17:56:08 +00:00
Duncan d266743083
Fix #16808: Incorrect serialisation of track design object (#16817) 2022-03-18 07:10:19 -03:00
Ted John 61f1e13c0b Refactor viewport flags 2022-03-14 21:57:05 +00:00
Ted John c68359662d Refactor visibility control 2022-03-14 21:57:05 +00:00
Ted John 8aafab2a70 Split paint item into element and entity 2022-03-14 21:55:15 +00:00
Ted John ba2fea88fd Fix build failure 2022-03-14 21:55:07 +00:00
Kane b83e21a953 Improve code readability (added parentheses) 2022-03-14 21:43:12 +00:00
Kane 20cd8465f5 Code cleanup, remove ignore_invisible_flag.
Known issues:
- Some flat-rides have transparency issues
2022-03-14 21:43:12 +00:00
Kane 3d3271a5ec Misc. clean ups
Define see-through paint colours in Paint.h for global use
Color staff sprite button
Change ride->is_visible bool to ignore_invisible_flag bool
Add shortcut to open transparency options (CTRL+T)
2022-03-14 21:41:49 +00:00
Kane 2e93e42a71 More finishing touches
- Changes all references of `VIEWPORT_FLAG_INVISIBLE_PEEPS` to `VIEWPORT_FLAG_INVISIBLE_GUESTS` and `VIEWPORT_FLAG_INVISIBLE_STAFF`
- Updates Invisible People menu item and shortcut.
- Added new viewport flags into the `viewport_set_visibility` function
- Invisible options only work if see-through is activated as well
- Added see-through supports

- Regression: Exclude ride from invisible no longer works (ride is still see-through)
2022-03-14 21:40:27 +00:00
Kane e134be9538 Implement more options
- Invisible guests
- Invisible staff
- See-through trees
- Invisible trees
- Strings/Ids
2022-03-14 21:38:46 +00:00
Kane 204f8ceac1 Add new Transparency options window.
Remove added options from Top Toolbar.
Move invisible ride code into ride paint functions.
Move invisible vehicle code into sprite paint function.
2022-03-14 21:37:41 +00:00
duncanspumpkin 7a36e34782 Apply review comments 2022-03-12 07:26:34 +00:00
duncanspumpkin 68d0d05d49 Remove extra non rotated PaintAddImageAsChild 2022-03-11 21:45:12 +00:00
duncanspumpkin 763aae70f7 Fix regex fail 2022-03-11 21:45:12 +00:00
duncanspumpkin 39c8fda4e6 Apply regex to PaintAddImageAsChildRotated 2022-03-11 21:45:12 +00:00
duncanspumpkin b7aa5ebd2e Correct failures 2022-03-11 13:55:01 +00:00
duncanspumpkin a5a00517ea Apply regex on PaintAddImageAsParentRotated2 2022-03-11 13:45:00 +00:00
Duncan b6175bb556
Apply regex for PaintAddIMageAsParentRotated (#16775)
* Apply regex for PaintAddIMageAsParentRotated

* Remove unused function
2022-03-11 13:36:55 +00:00
Bas 078078416b Replace all 'cars_per_flat_ride' 0xFF with 'NoFlatRideCars' 2022-03-04 20:21:15 +01:00
Duncan 66b8f283eb
Rename flag and reorg ghost remove flags (#16734) 2022-02-27 22:39:55 +00:00
Hielke Morsink ba85cf4873
Close #15896: Refactor out the ZoomLevel operators 2022-02-26 23:14:59 +01:00
ζeh Matt f27d0ff3b0
Merge pull request #16359 from ZehMatt/refactor/didpasssurface
Refactor out DidPassSurface
2022-02-26 12:43:40 -08:00
spacek531 466c8b4b89
rename vehicle position variables (#15370) 2022-02-25 07:21:45 +00:00
ζeh Matt d9bdc1441f
Rename IsPassedSurface to PassedSurface and cleanup values 2022-02-25 01:21:36 +02:00
ζeh Matt b5d6abdd22
Refactor out DidPassSurface and rename Unk141E9DB to Flags 2022-02-25 00:34:24 +02:00
GalBr f44d944b26
Refactor DodgemsCarWouldCollideAt to return optional (#16695) 2022-02-24 21:29:11 +00:00
Michael Steenbeek 70121eae38
Close #14484: Make the Heartline Twister ratings less hateful (#16680)
This raises two parameters: the base excitement value (which is very low, especially since the air-time bonus is limited too) and the bonus value (the novelty of this ride type warrants a bigger value).
It leaves the rest of the poor bonuses as-is, as some of them (like scenery and synchronisation bonuses) might just be there because the track obscures the view.
2022-02-23 11:24:02 +01:00
spacek531 05b80acfa1
Rename VAR_C4 (#16217) 2022-02-22 20:14:42 -03:00
spacek531 82378c09c3
Rename VAR_CE and its unions (#16215) 2022-02-20 23:20:06 -03:00
Hielke Morsink 5c5f86ac42
Correct some mistakes 2022-02-18 23:28:21 +02:00
Hielke Morsink ad0a2a8f96
Remove entrance/exit location functions 2022-02-18 23:28:17 +02:00
Hielke Morsink 2137cea3bb
Reduce use of UnderlyingType 2022-02-18 23:21:38 +02:00
Hielke Morsink f06645d2f7
Make stations a private std::array and use getters for access 2022-02-18 23:21:35 +02:00
Hielke Morsink 4b73923425
Access properties with full name 2022-02-18 23:11:11 +02:00
Hielke Morsink 054f7392a1
Let index underflow for reverse loops 2022-02-18 23:11:11 +02:00
Hielke Morsink f47c1b9f96
Close #16468: Use TIdentifier for StationIndex 2022-02-18 23:11:07 +02:00
Michael Steenbeek 5edc561715
Close #11437: Migrate old platform methods 2022-02-18 21:57:00 +01:00
Michael Steenbeek 4c046024a3
Merge pull request #16640 from ZehMatt/refactor/entityid-16469
#16469: Introduce EntityId and refactor everything
2022-02-18 21:29:23 +01:00
Karst d0c019d222
Fix #16674: Double support on B&M left inline-twist (up to down) 2022-02-17 19:22:24 +01:00
ζeh Matt ff1eb583fc
Make clang-format happy 2022-02-16 18:56:43 +02:00