petra: fix a case when ptol or sele have their cc destroyed while they already had a colony, they would no more try to build a cc
ClosedPublic
Actions

Authored by mimo on Jun 19 2017, 7:52 PM.

Details

Reviewers: None
Commits: rP19820: petra: fix a case when ptol or sele have their cc destroyed while they already…

Summary

as the title says.
in addition, the civs which can have a colony is no more hard-coded

Test Plan

test with ptol or sele and destroy the cc while they have a colony, they won't build a new one, so can't phase up anymore.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 2349
Build 3913: Vulcan Build (Windows)	Jenkins
Build 3912: Vulcan Build	Jenkins
Build 3911: arc lint + arc unit

Event Timeline

mimo created this revision.Jun 19 2017, 7:52 PM

Build is green

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

http://jw:8080/job/phabricator/1585/ for more details.

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

binaries/data/mods/public/simulation/ai/petra/headquarters.js
| 170| »   »   »   »   builders.forEach(function·(worker)·{
|    | [NORMAL] JSHintBear:
|    | Don't make functions within a loop.
Executing section XML GUI...
Executing section Python...
Executing section Perl...

http://jw:8080/job/phabricator_lint/209/ for more details.

Harbormaster completed remote builds in B2341: Diff 2621.Jun 19 2017, 8:40 PM

Sandarac added a subscriber: Sandarac.Jun 20 2017, 4:34 PM

Sandarac added inline comments.

binaries/data/mods/public/simulation/ai/petra/headquarters.js
1522	I guess naming this variable something like "numNonColonyCC" would be more clear.
1523	Perhaps it would be better to use a new var for "structures/{civ}_military_colony", as this raw string occurs four times here.

update patch

mimo added inline comments.Jun 20 2017, 7:13 PM

binaries/data/mods/public/simulation/ai/petra/headquarters.js
1522	I didn't want to singularize colonies, the real point is to have one cc which allows to phase up (that's what was meant by full CC). So now the name reflects it, and the plan is later to check on the productionQueue of the cc that it indeed allows phasing rather than relying on assumption on classes, but will only be done in another patch after the release because this patch should stay a simple fix for A22 the way to check on phasing will change after D654, so better wait for it before doing that kind of changes
1523	yes, i've tried but it broke the symmetry :( and i didn't like the look of the code, and in fact only 2 occurences of it are met in each path. (but i can add it if you insist).

Build is green

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

http://jw:8080/job/phabricator/1591/ for more details.

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

binaries/data/mods/public/simulation/ai/petra/headquarters.js
| 170| »   »   »   »   builders.forEach(function·(worker)·{
|    | [NORMAL] JSHintBear:
|    | Don't make functions within a loop.
Executing section XML GUI...
Executing section Python...
Executing section Perl...

http://jw:8080/job/phabricator_lint/215/ for more details.

Harbormaster completed remote builds in B2349: Diff 2629.Jun 20 2017, 7:49 PM

In fact, requiring a cc with phase techs is not enough as for these civs with colony, the cc also provide heroes. Thus the new patch now requires to have at least one cc from their civ

Build is green

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

http://jw:8080/job/phabricator/1599/ for more details.

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

binaries/data/mods/public/simulation/ai/petra/headquarters.js
| 170| »   »   »   »   builders.forEach(function·(worker)·{
|    | [NORMAL] JSHintBear:
|    | Don't make functions within a loop.
Executing section XML GUI...
Executing section Python...
Executing section Perl...

http://jw:8080/job/phabricator_lint/219/ for more details.

Harbormaster completed remote builds in B2362: Diff 2642.Jun 21 2017, 3:39 PM

Closed by commit rP19820: petra: fix a case when ptol or sele have their cc destroyed while they already… (authored by mimo). · Explain WhyJun 23 2017, 12:13 AM

This revision was automatically updated to reflect the committed changes.