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

Industries: support 16 cargos in / 16 cargos out #15

Merged
merged 23 commits into from Mar 21, 2019

Conversation

Projects
None yet
5 participants
@andythenorth
Copy link
Contributor

commented Feb 23, 2019

Currently using peter1138's rebase.

Spec documented in the OpenTTD PR OpenTTD/OpenTTD#6867

Still WIP, known issues:

@andythenorth andythenorth added the draft label Feb 23, 2019

@TrueBrain

This comment has been minimized.

Copy link
Member

commented Feb 23, 2019

Instead of a label 'draft', you can nowedays also make a Draft Pull Request in GitHub. Just you cannot convert an existing PR to a Draft PR :D

@PeterN

This comment has been minimized.

Copy link
Member

commented Mar 6, 2019

Is this ready for merge?

@nielsmh

This comment has been minimized.

Copy link
Contributor

commented Mar 6, 2019

I think @andythenorth talked about the old production cb syntax no longer working. I don't think that was fixed yet.

@planetmaker

This comment has been minimized.

Copy link
Contributor

commented Mar 6, 2019

I'd like to encourage you again to just replace the old production syntax by this new one and not carry a bag of backward compatible stuff around. For backward compatibility I shall make releases for some time without such change.

@nielsmh

This comment has been minimized.

Copy link
Contributor

commented Mar 6, 2019

I made another PR to this PR branch, removing some deprecated industry properties: PeterN#3

Apart from taking out the deprecated parts, this needs some better error reporting (if possible) of the old syntax, a migration guide, possibly better examples, and also support for 16 accepts for town houses.

@nielsmh nielsmh self-assigned this Mar 7, 2019

@andythenorth

This comment has been minimized.

Copy link
Contributor Author

commented Mar 10, 2019

invalid_sprite_16_cargos

firs.grf.zip

EDIT ^ OpenTTD bug, fixed by OpenTTD/OpenTTD#7364

@andythenorth

This comment has been minimized.

Copy link
Contributor Author

commented Mar 11, 2019

FIRS branch that compiles with this and works as expected: https://github.com/andythenorth/firs/commits/v4-development-track

  • new industry cargo_types prop
  • produce block new format
  • cb 37 new format and new flag
  • new tile flag

There are no nml docs currently. Best reference is nml examples, and https://0x0.st/zHBc.txt

Newgrf wiki is up to date for the nfo spec on these changes.

I favour shipping this sooner not later, nobody else is likely to test it. Best to get it in the hands of authors and fix any bugs that come up.

@planetmaker planetmaker merged commit 8db309b into OpenTTD:master Mar 21, 2019

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.