Extended tile inspector #4414

Broxzier · 2016-09-11T21:37:49Z

This is still work-in-progress

Make sure to compile the sprite list before testing

To do so run: openrct2.exe sprite build data\g2.dat ..\resources\g2

The biggest change to the tile inspector are the two new group boxes. When the player selects any of the elements, a group box with info, and another group box with properties will be shown. The content of those depends on the type. For rides it lists the ride name and track piece ID for example.

Surface

Info

Terrain style
Edge style
Ownership status
Water level

Settings

Remove park fences
Restore park fences
Raised corners
Raise / Lower

Path

Info

Name
Additions

Settings

Raise / Lower
Change connected edges and corners

Track

Info

Settings

Raise / Lower
Toggle lift hill
'Apply-all' Raise / Lower
'Apply-all' Toggle lift hill

Scenery

Info

Age
Quarter details

Settings

Raise / Lower
Change quarter-tile location
Change quarter-collision flags

Entrance

Info

Type
Entrance part (0-2)
Station number (needs to be solved for park entrance left/right side)
Ride ID

Settings

Raise / Lower

Fence

Info

Type
Banner info

Settings

Switch between flat, slanted right, and slanted left
Raise / Lower

Large Scenery

Info

Type
Part ID
Banner info

Settings

Raise / Lower
'Apply-all' Raise / Lower

Banner

Info

Banner info
No-Entry edges

Settings

Raise / Lower

Corrupt element

Info

...

Settings

Raise / Lower
Clamp to next element

Other things

marijnvdwerf · 2016-09-12T10:02:56Z

'Track piece ID' should probably be 'Track type', right?

Also, I think it would be better to move the 'change ride type' stuff to the tile inspector (currently in the ride window), but I don't really have an idea as to how that could look.

Gymnasiast · 2016-09-12T11:34:07Z

@marijnvdwerf:

Also, I think it would be better to move the 'change ride type' stuff to the tile inspector

I disagree. It's something that concerns the entire ride (in about the same way as the chosen vehicle) and not a track element on a tile.

IntelOrca · 2016-09-12T12:35:47Z

@Gymnasiast until we implement the ability to swap ride type (track style) throughout the ride. But otherwise I agree.

Broxzier · 2016-09-12T20:38:23Z

@marijnvdwerf
'Track piece ID' should probably be 'Track type', right?

That's indeed what it means. At the time I made it I thought calling it type would be confusing.

Gymnasiast · 2016-09-14T19:58:39Z

src/localisation/string_ids.h

@@ -1165,6 +1165,8 @@ enum {
 	STR_CONSTRUCTION_RIGHTS_NOT_FOR_SALE = 1727,
 	STR_CANT_BUY_CONSTRUCTION_RIGHTS_HERE = 1728,
 	STR_LAND_NOT_OWNED_BY_PARK = 1729,
+	STR_LAND_NOT_OWNED_AND_NOT_AVAILABLE = 5933,


String IDs should be sorted numerically.

I placed it there because they are very related, but I've moved everything down now.

Broxzier · 2016-10-04T22:34:32Z

The tile inspector is ready to be tested. I will rebase this on the develop branch tomorrow.

janisozaur · 2016-10-05T05:23:26Z

Remember to update g2 if you want to test it

janisozaur · 2016-10-05T06:55:32Z

Changes to src/drawing/sprite.c look superfluous.

janisozaur · 2016-10-05T07:08:22Z

https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L725 and https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L834 unused variable. The latter looks like it was meant to cache value, but you use original one anyway.

https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L730 pointless, you override this value further down: https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L735 (which is the same what you initially set it to: https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L719)

Same things in window_tile_inspector_track_block_set_lift

IntelOrca · 2016-10-05T07:16:44Z

src/windows/guest_list.c

@@ -200,7 +200,7 @@ void window_guest_list_open()
 	window->enabled_widgets =
 		(1 << WIDX_CLOSE) |
 		(1 << WIDX_PAGE_DROPDOWN) |
-		(1 << WIDX_PAGE_DROPDOWN_BUTTON) |
+		//(1 << WIDX_PAGE_DROPDOWN_BUTTON) |


Just noticed aswell. 6586636 is a messed up commit. will fix this today.

janisozaur · 2016-10-05T07:45:37Z

you check for NULL here: https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L680 but dereference them anyway: https://github.com/Broxzier/OpenRCT2/blob/abccf603252fb3d9de3e354211a7ef7afb0415aa/src/windows/tile_inspector.c#L686

Broxzier · 2016-10-05T09:07:01Z

@janisozaur: That check is to see if both pointers have been set, just to break out of the loop earlier. It can be replaced with i > max(first, second), or even removed entirely (but making it continue iterate over the remaining elements).

*firstElement = *secondElement; copyies the second map element to the first element, swapping them.

Broxzier · 2016-10-05T22:09:54Z

Rebased!

Appveyor artifacts can be downloaded here: https://ci.appveyor.com/project/IntelOrca/openrct2-ject9/build/0.0.5.5356/job/iiw1ohv4eq38tltv/artifacts

janisozaur · 2016-10-06T08:36:56Z

data/language/en-GB.txt

@@ -4230,8 +4230,70 @@ STR_5918    :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COM
 STR_5919    :{COMMA16}
 STR_5920    :Render weather effects
 STR_5921    :{SMALLFONT}{BLACK}If enabled, rain and gloomy colours will be rendered during storms.
+<<<<<<< HEAD


Shouldn't be here

Removed with a second rebase now.

janisozaur · 2016-10-08T20:36:18Z

Line 1335: stray printf

For some reason the dropdown arrow on fence slope detail does not raise after it's released (stays in "clicked" state)

Raising all 4 corners of surface yields weird results. Can you check if everything is correct in the code? Perhaps it would be better to have raising all 4 corners simply increase surface's base height a notch?

tile_inspector.c:714:8: error: unused variable ‘sequence’

tile_inspector.c:1490:12: error: unused variable ‘detailsAnchor’

tile_inspector.c:1353, 1354, 1867, 1868, 614, 622 and more shift signed values, which is undefined behaviour, please change it to multiplication or change windowTileInspectorTileX and Y to be unsigned, if it is valid thing to do.

janisozaur · 2016-10-08T21:10:34Z

I have tested it a little now and posted my comments above. Otherwise it looks to do what it is meant to. 👍

strings should be in order, and code formatted was to make it more consistant

Corrupt elements are now placed right under the selected element Local tile-inspector variables now all use camelCaseNames Removed unused string, and shifted string IDs

@todo

@todo: For park entrances, the left and right tile do not show the entrance ID. Will solve this later.

… page

These defines are used to calculate the edges of the widgets. They are now ordered in the same way the widgets are listed for the pages. This commit also adds some extra defines, to make it more easy to tweak the sizes and padding of widgets.

This commit also renamed a flag, and corrected the use of one. The flags in question are WALL_SCENERY_BANNER, WALL_SCENERY_2_FLAG4, and WALL_SCENERY_2_FLAG5.

- Replaces places where the first element was requested to use the same function

…ut have a position)

…king

…intf.

Broxzier · 2016-10-11T21:38:38Z

@IntelOrca @duncanspumpkin If one of you could test and merge this, that would be appreciated. Rebasing on future conflicts will only costs me more time.

IntelOrca · 2016-10-16T20:13:01Z

@Broxzier two things which I will let you do in a follow up PR:

collision is spelt wrong
inspecting an entrance tile doesn't show base height correctly, just a blank box.

invalidCards · 2016-10-17T09:40:28Z

data/language/en-GB.txt

+STR_5929    :Fence details
+STR_5930    :Large scenery details
+STR_5931    :Banner details
+STR_5932    :Currupt element details


Typo - Currupt should be Corrupt

duncanspumpkin added the work in progress label Sep 12, 2016

duncanspumpkin added this to the v0.0.5 - fourth stable milestone Sep 12, 2016

Gymnasiast reviewed Sep 14, 2016

View reviewed changes

janisozaur added enhancement An improvement to an existing feature (no alteration). user interface Has to do with user interfaces. labels Sep 14, 2016

Broxzier force-pushed the extended_tile_inspector branch 4 times, most recently from 0248898 to 09dfd5b Compare September 18, 2016 19:51

Broxzier force-pushed the extended_tile_inspector branch from a211495 to 0b4e39a Compare October 1, 2016 23:26

IntelOrca reviewed Oct 5, 2016

View reviewed changes

Broxzier force-pushed the extended_tile_inspector branch from abccf60 to 95938a0 Compare October 5, 2016 22:09

janisozaur added pending review testing required PR needs to be tested before it is merged. and removed work in progress labels Oct 5, 2016

janisozaur reviewed Oct 6, 2016

View reviewed changes

Broxzier force-pushed the extended_tile_inspector branch from 33684d1 to e2a1654 Compare October 6, 2016 19:59

Broxzier added 20 commits October 11, 2016 23:21

Moved new strings to end of file, and formatting

7eb4c72

strings should be in order, and code formatted was to make it more consistant

Improve corrupt element insertion, code formatting

a965421

Corrupt elements are now placed right under the selected element Local tile-inspector variables now all use camelCaseNames Removed unused string, and shifted string IDs

Add entrance type detail and raise/lower ability

af59bf3

Entrance details

f5423f7

@todo: For park entrances, the left and right tile do not show the entrance ID. Will solve this later.

Add raise/lower for remaining elements, fix sort button not switching…

3eb4d8c

… page

Add clamp button for corrupt elements

545da27

Add dropdown for changing fence slopes

0de8b4f

Reordered widget defines

34a7ab5

These defines are used to calculate the edges of the widgets. They are now ordered in the same way the widgets are listed for the pages. This commit also adds some extra defines, to make it more easy to tweak the sizes and padding of widgets.

Add fence and banner info to tile inspector

a68dc7a

This commit also renamed a flag, and corrected the use of one. The flags in question are WALL_SCENERY_BANNER, WALL_SCENERY_2_FLAG4, and WALL_SCENERY_2_FLAG5.

Disables fence slope setting for entries that do not allow sloped fences

3ac29b2

- Replaces places where the first element was requested to use the same function

Clipping strings in list to fit their column

1e4de56

Large scenery info

4243545

Use rotation mask instead of modulo operator to get indices

5ee1fc2

Add banner text info. Fix rotating banners (they are never rotated, b…

e078c03

…ut have a position)

Add toggle for blocked paths - even works when the banner is non-bloc…

75326ba

…king

Fix crash when moving selected tile with spinners

2b87dcf

Cleanups

52beb41

fix path corner checksbox values

2ad5ef3

Tile inspector raises surface when all corners are raised. Removes pr…

9fdad31

…intf.

[ci skip] Removes unused variables

b9e7786

Broxzier force-pushed the extended_tile_inspector branch from b801a31 to e89cff2 Compare October 11, 2016 21:32

Resolves left-shift warning for signed variables

1fcca77

Broxzier force-pushed the extended_tile_inspector branch from e89cff2 to 1fcca77 Compare October 11, 2016 21:35

Add myself to 'Additional implementation' and changed changelog entry

b80e637

IntelOrca merged commit 00e907d into OpenRCT2:develop Oct 16, 2016

Broxzier mentioned this pull request Oct 17, 2016

Strings 5341-5342 and 5924-5984 - Tile Inspector OpenRCT2/Localisation#913

Closed

13 tasks

invalidCards reviewed Oct 17, 2016

View reviewed changes

Broxzier deleted the extended_tile_inspector branch December 26, 2016 00:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extended tile inspector #4414

Extended tile inspector #4414

Broxzier commented Sep 11, 2016 •

edited

marijnvdwerf commented Sep 12, 2016

Gymnasiast commented Sep 12, 2016 •

edited

IntelOrca commented Sep 12, 2016

Broxzier commented Sep 12, 2016

Gymnasiast Sep 14, 2016

Broxzier Sep 18, 2016

Broxzier commented Oct 4, 2016

janisozaur commented Oct 5, 2016

janisozaur commented Oct 5, 2016

janisozaur commented Oct 5, 2016 •

edited

IntelOrca Oct 5, 2016

Broxzier Oct 5, 2016

janisozaur commented Oct 5, 2016

Broxzier commented Oct 5, 2016

Broxzier commented Oct 5, 2016 •

edited

janisozaur Oct 6, 2016

Broxzier Oct 6, 2016

janisozaur commented Oct 8, 2016 •

edited

janisozaur commented Oct 8, 2016

Broxzier commented Oct 11, 2016

IntelOrca commented Oct 16, 2016

invalidCards Oct 17, 2016

Extended tile inspector #4414

Extended tile inspector #4414

Conversation

Broxzier commented Sep 11, 2016 • edited

Make sure to compile the sprite list before testing

Surface

Info

Settings

Path

Info

Settings

Track

Info

Settings

Scenery

Info

Settings

Entrance

Info

Settings

Fence

Info

Settings

Large Scenery

Info

Settings

Banner

Info

Settings

Corrupt element

Info

Settings

Other things

marijnvdwerf commented Sep 12, 2016

Gymnasiast commented Sep 12, 2016 • edited

IntelOrca commented Sep 12, 2016

Broxzier commented Sep 12, 2016

Gymnasiast Sep 14, 2016

Choose a reason for hiding this comment

Broxzier Sep 18, 2016

Choose a reason for hiding this comment

Broxzier commented Oct 4, 2016

janisozaur commented Oct 5, 2016

janisozaur commented Oct 5, 2016

janisozaur commented Oct 5, 2016 • edited

IntelOrca Oct 5, 2016

Choose a reason for hiding this comment

Broxzier Oct 5, 2016

Choose a reason for hiding this comment

janisozaur commented Oct 5, 2016

Broxzier commented Oct 5, 2016

Broxzier commented Oct 5, 2016 • edited

janisozaur Oct 6, 2016

Choose a reason for hiding this comment

Broxzier Oct 6, 2016

Choose a reason for hiding this comment

janisozaur commented Oct 8, 2016 • edited

janisozaur commented Oct 8, 2016

Broxzier commented Oct 11, 2016

IntelOrca commented Oct 16, 2016

invalidCards Oct 17, 2016

Choose a reason for hiding this comment

Broxzier commented Sep 11, 2016 •

edited

Gymnasiast commented Sep 12, 2016 •

edited

janisozaur commented Oct 5, 2016 •

edited

Broxzier commented Oct 5, 2016 •

edited

janisozaur commented Oct 8, 2016 •

edited