Fix: AI/GS settings with the flag SCRIPTCONFIG_RANDOM could be altered after loading from a savegame. #7486
Conversation
|
The second commit is probably better than the first. Need someone to review which to pick. |
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
b889e88 to
72a45c4
Compare
|
This PR fixes two things now. 2 - I found out that random ais were not getting their start_date deviated. It appears to be a constructor issue. ScriptConfig constructor thing doesn't construct the start_date in random AI, so there was no setting at all to deviate. PushExtraConfigList calls the AI version of the function which adds the "start_date". AddRandomDeviation then calls the AI version of the function which already does the right thing, so that's why it doesn't run the 2nd part of the code. |
|
The 2nd thing that I fix here with 72a45c4 https://github.com/OpenTTD/OpenTTD/pull/7486/files#diff-b1ee4283f7522a54d2b5a8c603b301f5R42 Now random deviation is done twice for Random AIs start_date. |
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
2 times, most recently
from
203e764 to
48408c2
Compare
|
Commit 1 of the first thing fixed, was removed. Commit 2 was the correct way to fix it. As it stands now, commit 2 became 1, commit 3 became 2, and 4 became 3. |
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
48408c2 to
fd246dd
Compare
|
This pull request has been automatically marked as stale because it has not had any activity in the last month. |
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
fd246dd to
8ba7d38
Compare
| /* If we're in an existing game and the Script is changed, set all settings | ||
| * for the Script that have the random flag to a random value. */ | ||
| for (ScriptConfigItemList::const_iterator it = this->info->GetConfigList()->begin(); it != this->info->GetConfigList()->end(); it++) { | ||
| if ((*it).flags & SCRIPTCONFIG_RANDOM) { | ||
| this->SetSetting((*it).name, InteractiveRandomRange((*it).max_value + 1 - (*it).min_value) + (*it).min_value); | ||
| } | ||
| } | ||
| this->AddRandomDeviation(); | ||
| this->AddRandomDeviation(false); |
There was a problem hiding this comment.
Why is the entire changeset even this large? Wouldn't it make more sense to just not call AddRandomDeviation at all if the script that's being restarted after load has already been started? So scripts that were active when the save was made have their settings static (all of them), and scripts that were not started yet can get randomized.
There was a problem hiding this comment.
I'm not sure how to answer this.
The scripts are not started at the time ScriptConfig::Change is called from ai_sl.cpp / game_sl.cpp.
Fix from commit 1 already prevents AddRandomDeviation from being called after load. So I'm confused as to what you're requesting here.
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
8ba7d38 to
87229c7
Compare
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
87229c7 to
a5d2e75
Compare
|
Note: if #7661 is approved, it turns commit 2 and 3 of this PR irrelevant. |
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
a5d2e75 to
a8988c1
Compare
…d after loading from a savegame. Non-Random AI/GS configured in the main menu with their settings left at their defaults, could have their SCRIPTCONFIG_RANDOM flagged settings randomized when loading from a saved game. This patch disallows SM_LOAD_GAME switch mode from randomizing them.
SamuXarick
force-pushed
the
also-anchor-SCRIPTCONFIG_RANDOM-as-unchangeable-settings
branch
from
a8988c1 to
02843e9
Compare
|
Would like to see @nielsmh 's comment addessed before doing anything further with this |
|
Closing in favour of #7661 |
This attempts to redo the whole start_date thing to be more sane, understandable and predictable. - Moves 'start_date' AI parameter away from scripts losing its "per-AI" customization, into a game setting. It is now a "one for all" approach for the feature. - Retains the random deviation behaviour for AIs with a start date different than zero - Default value was set to that of Easy Preset. - Also display Start Delay on AI/Game Script Config window. - Solves all of the issues reported in OpenTTD#7486, due to the hackish attempts to deal with the 'start_date' parameter and the randomization features upon loading savegames.
This attempts to redo the whole start_date thing to be more sane, understandable and predictable. - Moves 'start_date' AI parameter away from scripts losing its "per-AI" customization, into a game setting. It is now a "one for all" approach for the feature. - Retains the random deviation behaviour for AIs with a start date different than zero - Default value was set to that of Easy Preset. - Also display Start Delay on AI/Game Script Config window. - Solves all of the issues reported in OpenTTD#7486, due to the hackish attempts to deal with the 'start_date' parameter and the randomization features upon loading savegames.
This attempts to redo the whole start_date thing to be more sane, understandable and predictable. - Moves 'start_date' AI parameter away from scripts losing its "per-AI" customization, into a game setting. It is now a "one for all" approach for the feature. - Retains the random deviation behaviour for AIs with a start date different than zero - Default value was set to that of Easy Preset. - Also display Start Delay on AI/Game Script Config window. - Solves all of the issues reported in OpenTTD#7486, due to the hackish attempts to deal with the 'start_date' parameter and the randomization features upon loading savegames.
Non-Random AI/GS configured in the main menu with their settings left at their defaults, could have their SCRIPTCONFIG_RANDOM flagged settings randomized when loading from a saved game.
This patch anchors them as unchangeable to prevent game load from randomizing them.