Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Add NotRoadTypes (NRT) #6811

Merged
merged 6 commits into from May 1, 2019
Merged

Conversation

@andythenorth
Copy link
Contributor

andythenorth commented Jun 3, 2018

The 'one big diff' approach.

16 types only, PeterN has a patch for 64, but that needs finish, tested, argued about etc. Can do that later. We make progress by not waiting for perfect eh? :)

Spec: https://wiki.openttd.org/Frosch/NotRoadTypes

Want to try it out? https://www.openttd.org/downloads/openttd-pullrequests/pr6811/latest.html has precompiled binaries for you! (last updated: 24th of March 2018)

@andythenorth andythenorth force-pushed the andythenorth:nrt-block branch from e6006e2 to 25644fd Jun 3, 2018
@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Jun 3, 2018

Argument for doing 64 types initially is it saves having to add a bunch of savegame conversion code.

@LordAro LordAro force-pushed the andythenorth:nrt-block branch from 25644fd to 061771d Jun 24, 2018
@andythenorth

This comment has been minimized.

Copy link
Contributor Author

andythenorth commented Jul 20, 2018

Previous reviews by PeterN and TrueBrain took place in a ticket of the NRT fork (predated OpenTTD github).

andythenorth/NotRoadTypes#22 (comment)

@andythenorth andythenorth force-pushed the andythenorth:nrt-block branch from 3032674 to 061771d Jul 26, 2018
@LordAro LordAro added the wip label Sep 19, 2018
@andythenorth andythenorth force-pushed the andythenorth:nrt-block branch from 061771d to 6595995 Jan 1, 2019
@andythenorth

This comment has been minimized.

Copy link
Contributor Author

andythenorth commented Jan 1, 2019

Rebased by Alberth using Peter's July 2018 rebase
https://github.com/Alberth289346/OpenTTD/tree/nrt-block-based

This builds and runs fine, but it's not clear yet:

  • if there are any compile warnings to attend to
  • whether docs (landscape_grid.html etc) are accurate
  • what state translation strings are in

With respect to 64 types (or not): this PR adds 64 types. It's the better option.

Crowd-sourced opinion is that this won't have enough play-test time to make it into 1.9.0 by April 2019. It has been play-tested quite a lot already, but eh. Save it for 2.0? 🎁

@andythenorth andythenorth force-pushed the andythenorth:nrt-block branch 2 times, most recently from 6147526 to 77f06c4 Jan 5, 2019
Copy link
Contributor

nielsmh left a comment

@andythenorth andythenorth force-pushed the andythenorth:nrt-block branch from 77f06c4 to 5e005ae Jan 5, 2019
@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Jan 30, 2019

I have rebased to master, available here https://github.com/PeterN/OpenTTD/tree/nrt-block

New sprites have been split off to separate files to avoid future conflicts. I have not addressed the regression test failure.

@nielsmh

This comment has been minimized.

Copy link
Contributor

nielsmh commented Jan 30, 2019

The assertion failure mentioned above still happens in the regression tests.

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Jan 30, 2019

The assertion failure mentioned above still happens in the regression tests.

Yes, #7142 has only just been merged into master!

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Jan 30, 2019

Two issues I've noticed during gameplay testing:

  • Inconsistencies between roadtypes available and roadtypes buildable, resulting in misleading menus and button states. This may be something to do with date-introduced roadtypes.
  • Not possible to set up one-way roads.
@PeterN PeterN force-pushed the andythenorth:nrt-block branch 3 times, most recently from aada649 to 6fe4eee Jan 30, 2019
@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Jan 30, 2019

One-way roads have now been fixed, this was due to the 64 road types addition. The regression failure is now resolved!

@PeterN PeterN force-pushed the andythenorth:nrt-block branch 3 times, most recently from ac4f33c to 24b6afc Jan 31, 2019
@PeterN PeterN force-pushed the andythenorth:nrt-block branch from 24b6afc to 06ea99c Feb 7, 2019
@PeterN PeterN dismissed nielsmh’s stale review Feb 7, 2019

Resolved

@PeterN PeterN force-pushed the andythenorth:nrt-block branch 10 times, most recently from a318c10 to 91b030f Apr 13, 2019
@PeterN PeterN force-pushed the andythenorth:nrt-block branch 3 times, most recently from 6c24853 to 77e72cb Apr 23, 2019
@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Apr 30, 2019

I guess I need to come clean on this, as it seems nobody knows: this is awaiting review and approval for merging.

@stormcone

This comment has been minimized.

Copy link
Contributor

stormcone commented Apr 30, 2019

If you try to "autoreplace" a ship or an aircraft, the game crashes:
"NOT_REACHED triggered at line 460 of OpenTTD-nrt-block/src/autoreplace_gui.cpp"

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented May 1, 2019

@stormcone Thanks, this has now been fixed.

PeterN added 6 commits Apr 13, 2018
…ake sense.

Road type and rail type are stored in separate locations, so this parameter does
not make make sense as it is only used for rail bridges. Instead explicitly set the
rail type in MakeRailBridgeRamp().
…using rail.

INVALID_RAILTYPES, if it was accidentally tested, would match any railtype.
@PeterN PeterN force-pushed the andythenorth:nrt-block branch from daa68d2 to bcfaaba May 1, 2019
@michicc
michicc approved these changes May 1, 2019
@michicc michicc merged commit 672c857 into OpenTTD:master May 1, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190501.6 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@Gymnasiast

This comment has been minimized.

Copy link

Gymnasiast commented May 1, 2019

Congratulations on getting this massive update finished! 🎉

stormcone added a commit to stormcone/nml that referenced this pull request May 5, 2019
The number of GUI sprites has increased according to NRT (OpenTTD/OpenTTD#6811).
michicc added a commit to OpenTTD/nml that referenced this pull request May 5, 2019
The number of GUI sprites has increased according to NRT (OpenTTD/OpenTTD#6811).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.