Autostart victoryduration times
ClosedPublic
Actions

Authored by bb on Feb 6 2018, 6:54 PM.

Details

Reviewers

Commits

rP21122: Fix the autostart victoryDuration support, which was broken by rP20122

Summary

Since rP20122 the autostart support for victorydurations is broken, since it used to be 1 time for both relic and wonder victory, but that was split but forgotten for the autostart feature.

Noticed by @mimo

Test Plan

Autostart a relic and a wonder game
Dislike the hardcodation of victoryconditions in the engine
Notice there is an error with ceasefire when opening the observatives dialog, but consider it unrelated
Notice more gamesetup options are not settable in autostart, I guess we need to fix that by making an option.json like file with the gamesetup options and use that in both places, consider this out of scope

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

bb created this revision.Feb 6 2018, 6:54 PM

bb retitled this revision from Autoostart victoryduration times to Autostart victoryduration times.

bb mentioned this in D1240: Combine victory conditions, excluding all scenario/skirmish map changes.

Successful build - Chance fights ever on the side of the prudent.

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...

Executing section Default...
Executing section Source...
Executing section JS...

Harbormaster completed remote builds in B4824: Diff 5683.Feb 6 2018, 7:00 PM

Patch looks good to me. But i think we should have either a default (10 mn?) or an error message if the player set a victory=wonder and forget the wonderduration, as Setup.js has no such default and will set it silently to undefined.

true, https://code.wildfiregames.com/rP20122#change-DZcAbGhMs37j

bb updated this revision to Diff 5684.Feb 6 2018, 8:17 PM

Successful build - Chance fights ever on the side of the prudent.

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...

Executing section Default...
Executing section Source...
Executing section JS...

Harbormaster completed remote builds in B4825: Diff 5684.Feb 6 2018, 8:22 PM

Patch works as expected, Thanks.

This revision is now accepted and ready to land.Feb 6 2018, 8:26 PM

Closed by commit rP21122: Fix the autostart victoryDuration support, which was broken by rP20122 (authored by bb). · Explain WhyFeb 6 2018, 8:44 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

ps/

trunk/

source/

ps/

GameSetup/

GameSetup.cpp

16 lines

Diff 5687

View Options

ps/trunk/source/ps/GameSetup/GameSetup.cpp

Autostart victoryduration timesClosedPublicActions