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

Add: industry vars 0x70 and 0x71 #84

Merged
merged 2 commits into from Feb 17, 2020

Conversation

@andythenorth
Copy link
Contributor

@andythenorth andythenorth commented Feb 16, 2020

Addresses #83
NML support for OpenTTD/OpenTTD@02b2b7b

@andythenorth andythenorth force-pushed the andythenorth:83-industry-vars-70-71 branch from 780a4c5 to d383b71 Feb 16, 2020
Copy link
Contributor

@planetmaker planetmaker left a comment

Why are production_rate_1 and _2 obsolete with that commit?
Or is it simply a cleanup mixed into the addition?

@andythenorth
Copy link
Contributor Author

@andythenorth andythenorth commented Feb 17, 2020

Why are production_rate_1 and _2 obsolete with that commit?
Or is it simply a cleanup mixed into the addition?

I misread the previous commit for vars 0x69..0x6F 417e86e

I thought that also removed the old vars, but they're in a separate 'Remove' commit ff89170

I'll split them, should be 2 commits 1 PR imo.

@andythenorth andythenorth force-pushed the andythenorth:83-industry-vars-70-71 branch from d383b71 to ba01336 Feb 17, 2020
…(0x8F) are deprecated and replaced by new parametric var production_rate (0x70)
Copy link
Contributor

@planetmaker planetmaker left a comment

Ok, it's an omission from 16-cargo introduction which removes the old variables in a separate commit.

@planetmaker planetmaker merged commit 6b4472c into OpenTTD:master Feb 17, 2020
12 checks passed
12 checks passed
Python 3.5 on ubuntu-latest
Details
Python 3.6 on ubuntu-latest
Details
Python 3.7 on ubuntu-latest
Details
Python 3.8 on ubuntu-latest
Details
Python 3.5 on macOS-latest
Details
Python 3.6 on macOS-latest
Details
Python 3.7 on macOS-latest
Details
Python 3.8 on macOS-latest
Details
Python 3.5 on windows-2016
Details
Python 3.6 on windows-2016
Details
Python 3.7 on windows-2016
Details
Python 3.8 on windows-2016
Details
FLHerne added a commit to FLHerne/nml that referenced this pull request May 8, 2020
…0..100.

This was overlooked when it was added in PR OpenTTD#84.
FLHerne added a commit that referenced this pull request May 8, 2020
…#122)

This was overlooked when it was added in PR #84.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.