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

Change: Allow AI companies to start immediately. #7151

Merged
merged 1 commit into from Feb 2, 2019

Conversation

@SamuXarick
Copy link
Contributor

SamuXarick commented Jan 31, 2019

Allow multiple AIs to possibly start in the same tick.
start_date = 0 becomes a special case, where random deviation does not occur.
If start_date was not already 0, then a minimum value of 1 must apply.

src/script/script_config.cpp Outdated Show resolved Hide resolved
@SamuXarick SamuXarick force-pushed the SamuXarick:start_date-=-0 branch from e373e78 to e773c3b Jan 31, 2019
Copy link
Contributor

glx22 left a comment

ScriptConfig::AddRandomDeviation() could be simpler, just assume "start_date" exists only for AIs, and if it's 0 then don't add random to it

src/ai/ai_gui.cpp Outdated Show resolved Hide resolved
@SamuXarick SamuXarick force-pushed the SamuXarick:start_date-=-0 branch from e773c3b to 941f932 Jan 31, 2019
src/ai/ai_config.cpp Outdated Show resolved Hide resolved
@SamuXarick SamuXarick force-pushed the SamuXarick:start_date-=-0 branch from 941f932 to ba617cf Jan 31, 2019
src/ai/ai_config.cpp Outdated Show resolved Hide resolved
@SamuXarick SamuXarick changed the title Codechange: Allow AI companies start_date to be 0 Change: Allow AI companies to start immediately. Jan 31, 2019
@SamuXarick SamuXarick force-pushed the SamuXarick:start_date-=-0 branch 2 times, most recently from 1539a46 to 7069060 Jan 31, 2019
src/company_cmd.cpp Outdated Show resolved Hide resolved
Allow multiple AIs to possibly start in the same tick.
start_date = 0 becomes a special case, where random deviation does not occur.
If start_date was not already 0, then a minimum value of 1 must apply.
@SamuXarick SamuXarick force-pushed the SamuXarick:start_date-=-0 branch from 7069060 to e4fa330 Feb 1, 2019
@PeterN
PeterN approved these changes Feb 2, 2019
@PeterN PeterN merged commit 011257d into OpenTTD:master Feb 2, 2019
1 check passed
1 check passed
OpenTTD CI Build #20190201.19 succeeded
Details
@SamuXarick SamuXarick deleted the SamuXarick:start_date-=-0 branch Feb 3, 2019
PeterN added a commit to PeterN/OpenTTD that referenced this pull request Feb 4, 2019
PeterN added a commit to PeterN/OpenTTD that referenced this pull request Feb 4, 2019
PeterN added a commit to PeterN/OpenTTD that referenced this pull request Feb 4, 2019
PeterN added a commit to PeterN/OpenTTD that referenced this pull request Feb 4, 2019
nielsmh added a commit that referenced this pull request Feb 5, 2019
PeterN added a commit that referenced this pull request Feb 11, 2019
…a random AI. (#7223)
nielsmh added a commit to nielsmh/OpenTTD that referenced this pull request Mar 11, 2019
nielsmh added a commit to nielsmh/OpenTTD that referenced this pull request Mar 11, 2019
TrueBrain added a commit to TrueBrain/OpenTTD that referenced this pull request Mar 24, 2019
…tiplayer, or with shift pressed."

This reverts commit b1e40b6.

This is a fix for a patch that will be reverted in the next commit.
TrueBrain added a commit that referenced this pull request Mar 24, 2019
…r, or with shift pressed."

This reverts commit b1e40b6.

This is a fix for a patch that will be reverted in the next commit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.