Track Design GameAction #10189

duncanspumpkin · 2019-11-03T15:14:47Z

No more Game Commands. Woooo!

~~Still some work to be done on this. Desyncs on ghosts and also need to add a callback~~.
~~Need to network direction of design currently uses global var.~~
I've created the action as a separate cpp file as I want to move a bunch of code into this and don't want a ridiculously polluted header.
~~Desync on ghosts is caused by ride demolish and also by peeps checking ride count.~~

Closes #6327

duncanspumpkin · 2019-11-04T08:36:54Z

Note to self serialise the track design vehicle style

duncanspumpkin · 2019-11-05T20:12:45Z

CheckIfLost has different results depending on ghosts when placing second ride.

src/openrct2-ui/windows/TrackDesignPlace.cpp

src/openrct2-ui/WindowManager.cpp

tupaschoal · 2019-12-11T16:44:37Z

src/openrct2-ui/windows/NewRide.cpp

-        _lastTrackDesignCount = 0;
-    }
-    else if (item.type != _lastTrackDesignCountRideType.type || item.entry_index != _lastTrackDesignCountRideType.entry_index)
+    if (item.type != _lastTrackDesignCountRideType.type || item.entry_index != _lastTrackDesignCountRideType.entry_index)


Isn't ride_list_item just a type and an entry_index? If so, having the operator== and operator!= implemented there would make this a lot more readable

Slightly out of scope but I agree.

I had a little play around and decided I wouldn't do it in this PR as to do this sensibly I needed to modify the window.h header and it had a bunch of dependencies that I didn't want to work out how to resolve at this time.

src/openrct2-ui/windows/TrackDesignPlace.cpp

src/openrct2/actions/TrackDesignAction.h

src/openrct2/actions/GameActionCompat.cpp

src/openrct2/actions/TrackDesignAction.cpp

ZehMatt · 2019-12-11T18:04:37Z

src/openrct2-ui/windows/Window.h

@@ -95,6 +95,9 @@ rct_window* window_loadsave_open(int32_t type, const char* defaultName, loadsave
 rct_window* window_track_place_open(const struct track_design_file_ref* tdFileRef);
 rct_window* window_track_manage_open(struct track_design_file_ref* tdFileRef);

+void TrackPlaceClearProvisionalTemporarily();


Is this really the best way to do it? We should eventually come up with a way to prevent peeps from accessing ghost elements. For the time being its okay, the way ghosts work should have a massive overhaul at some point.

I think it is the best way at the moment. Its a real pain though as it means debug builds are too laggy for my computer with this constant placing. There are quite a few things that technically will cause a desync without doing something like this.

src/openrct2-ui/windows/TrackDesignPlace.cpp

ZehMatt · 2019-12-11T18:10:42Z

src/openrct2-ui/windows/NewRide.cpp

-        _lastTrackDesignCount = 0;
-    }
-    else if (item.type != _lastTrackDesignCountRideType.type || item.entry_index != _lastTrackDesignCountRideType.entry_index)
+    if (item.type != _lastTrackDesignCountRideType.type || item.entry_index != _lastTrackDesignCountRideType.entry_index)


Slightly out of scope but I agree.

Gymnasiast · 2019-12-11T21:56:45Z

Here is a patch to fix the Xcode project.

xcodepatch.diff.txt

Make place track design work with game actions

Fix track designs issuing extra game actions

Fix callback by reworking placement code

Refactor of z increment

Change array type to avoid additional code Make CI's happier

@Gymnasiast

@Gymnasiast

- Feature: [#3154] Use a random title sequence each time it is shown. - Feature: [#6553] Android version now runs in full screen. - Feature: [#7865] Transport rides can now be synchronised. - Feature: [#9073] Shortcut keys for the Tile Inspector. - Feature: [#10305] Add two shortcuts for increasing and decreasing the scaling factor. - Feature: [#10189] Make Track Designs work in multiplayer. - Feature: [#10357] Added window for scenery scatter tool, allowing for area and density selection. - Feature: [#10637] Console command to remove all floating objects. - Change: [#1164] Use available translations for shortcut key bindings. - Change: [#10997] Speed is automatically reset to normal upon scenario completion. - Fix: [#2485] Hide Vertical Faces not applied to the edges of water. - Fix: [#5249] No collision detection when building ride entrance at heights > 85.5m. - Fix: [#6766] Changelog window doesn't open on some platforms. - Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour. - Fix: [#7854] Cannot build a custom spiral roller coaster design. - Fix: [#7854] Empty entries in spiral roller coaster designs list. - Fix: [#8151] Game freezes upon demolishing mazes at odd heights. - Fix: [#8875] RCT1 competition scenarios are classified incorrectly. - Fix: [#10176] Mistake in the sprite for the land tool's 6x6 grid. - Fix: [#10196] Doors unable to be placed at end of track corners. - Fix: [#10228] Can't import RCT1 Deluxe from Steam. - Fix: [#10313] Path furniture can be placed on level crossings. - Fix: [#10325] Crash when banners have no text. - Fix: [#10376] No ratings generated when a shop and track intersect. - Fix: [#10420] Money effect causing false positive desync. - Fix: [#10477] Large Scenery cannot be placed higher using SHIFT. - Fix: [#10489] Hosts last player action not being synchronized. - Fix: [#10543] Secondary shop item prices are not imported correctly from RCT1 saves. - Fix: [#10547] RCT1 parks have too many rides available. - Fix: [#10587] Update last action coordinates on correct player. - Fix: [#10631] Game bugs out and crashes if you get too many stations via copying stations with the tile inspector. - Fix: [#10662] Duck cheat tooltips look odd and do not explain anything. - Fix: [#10694] The lift hill speed of the flying roller coaster cannot be changed (original bug). - Fix: [#10705] Apply multithreaded rendering to all viewports. - Fix: [#10739] Mountain tool overlay for even-numbered selections. - Fix: [#10752] Mute button state not correctly set at startup. - Fix: [#10822] Can place too many peep spawns. - Fix: [#10898] Banner text has an offset in tile inspector window. - Fix: [#10904] RCT1/LL-scenarios with red water won't open. - Fix: [#10941] The Clear Scenery tool gives refunds for ghost elements. - Fix: [#10963] Light effects are drawn off-centre in some rotations. - Fix: [#10993] Bottom toolbar not refreshing when a guest leaves the park. - Fix: [#11001] Rides list does not use natural sorting. - Fix: [objects#54] Stage Coach cars are not considered covered by the game. - Fix: [objects#56] Handymen cut grass incorrectly. - Improved: [#682] The staff patrol area is now drawn on the water, instead of on the surface under water. - Improved: [#10858] Added horizontal grid lines to finance charts. - Improved: [#10884] Added y-axes and labels to park window charts. - Improved: [#10970] Introduced optional light effects for vehicles at night. - Removed: [#6898] LOADMM and LOADRCT1 title sequence commands (use LOADSC instead).

duncanspumpkin added work in progress network version Network version needs updating - double check before merging! game actions Relates to one of the serialisable atomic game actions. labels Nov 3, 2019

ZehMatt mentioned this pull request Nov 3, 2019

Refactor game commands to game actions. #6327

Closed

72 tasks

duncanspumpkin added this to In Progress in New Game Action Framework via automation Nov 3, 2019

duncanspumpkin force-pushed the track_ac branch from 563fb37 to 957ce7e Compare November 5, 2019 19:54

duncanspumpkin force-pushed the track_ac branch 2 times, most recently from d7cf531 to 960516a Compare December 11, 2019 08:44

tupaschoal reviewed Dec 11, 2019

View reviewed changes

duncanspumpkin force-pushed the track_ac branch 2 times, most recently from 8f339de to 364b503 Compare December 11, 2019 14:07

duncanspumpkin removed the work in progress label Dec 11, 2019

tupaschoal reviewed Dec 11, 2019

View reviewed changes

ZehMatt reviewed Dec 11, 2019

View reviewed changes

duncanspumpkin force-pushed the track_ac branch from ef9665f to 2a10f3b Compare December 11, 2019 19:40

duncanspumpkin force-pushed the track_ac branch from 391ea26 to 0e65a07 Compare December 12, 2019 08:12

duncanspumpkin removed the Xcode Fix Required label Dec 12, 2019

duncanspumpkin added 9 commits December 15, 2019 08:21

Start moving track design into a game action

c781fcb

Make place track design work with game actions

Serialise track design. Start work on making it work

83503f4

Fix track designs issuing extra game actions

Serialise scenery, mazes, entrances

7dbf035

Fix ghost desync and rotation issue

fa3332f

Fix callback by reworking placement code

Remove dead game command code.

d8b5060

Refactor of z increment

Remove todo and clang format where required

cfb4bba

Change array type to avoid additional code Make CI's happier

Reduce desyncs by removing teh track before updating peep logic

d97bb88

Update changelog

d4e15d7

Remove extra line break

073e75a

duncanspumpkin added 5 commits December 15, 2019 08:23

Make suggested changes

63b8f83

Xcode patch from

d9db7a0

@Gymnasiast

Fix formatting and declaration

2eab8c3

Reduce logging of variables to just name to make logs useful

3c89fc6

Increment Network Version

11974dd

duncanspumpkin force-pushed the track_ac branch from 284c543 to 11974dd Compare December 15, 2019 08:31

Fix the logging once and for all

df5d5f4

duncanspumpkin force-pushed the track_ac branch from 4cabff1 to df5d5f4 Compare December 15, 2019 16:48

duncanspumpkin merged commit b767351 into OpenRCT2:develop Dec 15, 2019

New Game Action Framework automation moved this from In Progress to Completed Dec 15, 2019

duncanspumpkin deleted the track_ac branch December 15, 2019 17:11

Gymnasiast mentioned this pull request Feb 19, 2020

Stock tracks unable to be used online (v0.1.3) #7553

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Track Design GameAction #10189

Track Design GameAction #10189

duncanspumpkin commented Nov 3, 2019 •

edited

Loading

duncanspumpkin commented Nov 4, 2019

duncanspumpkin commented Nov 5, 2019

tupaschoal Dec 11, 2019

ZehMatt Dec 11, 2019

duncanspumpkin Dec 12, 2019

ZehMatt Dec 11, 2019

duncanspumpkin Dec 11, 2019

ZehMatt Dec 11, 2019

Gymnasiast commented Dec 11, 2019 •

edited

Loading

Track Design GameAction #10189

Track Design GameAction #10189

Conversation

duncanspumpkin commented Nov 3, 2019 • edited Loading

duncanspumpkin commented Nov 4, 2019

duncanspumpkin commented Nov 5, 2019

tupaschoal Dec 11, 2019

Choose a reason for hiding this comment

ZehMatt Dec 11, 2019

Choose a reason for hiding this comment

duncanspumpkin Dec 12, 2019

Choose a reason for hiding this comment

ZehMatt Dec 11, 2019

Choose a reason for hiding this comment

duncanspumpkin Dec 11, 2019

Choose a reason for hiding this comment

ZehMatt Dec 11, 2019

Choose a reason for hiding this comment

Gymnasiast commented Dec 11, 2019 • edited Loading

duncanspumpkin commented Nov 3, 2019 •

edited

Loading

Gymnasiast commented Dec 11, 2019 •

edited

Loading