Page MenuHomeWildfire Games
Differential D2887

[ai/petra] correct config.js entries
ClosedPublic
Actions

Authored by Nescio on Jul 18 2020, 10:43 AM.

Details

Reviewers
Silier
Freagarach
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23946: Correct buildings in PetraAI's config.js.
Summary

This patch is split off from D2885. It corrects the simulation/ai/petra/config.js file:

  • Structure entries are alphabetized and placed on a new line each, to make things easier to maintain and review in the long run.
  • Removed the rotary mill deprecated in D2668/rP23803.
  • Add missing entries:
    • kush_pyramid_small.xml
    • kush_temple_amun.xml
    • rome_temple_vesta.xml
Test Plan

Check for mistakes.

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

Nescio created this revision.Jul 18 2020, 10:43 AM
Owners added a subscriber: Restricted Owners Package.Jul 18 2020, 10:43 AM
Herald added a reviewer: Silier. · View Herald TranscriptJul 18 2020, 10:43 AM
Vulcan added a comment.Jul 18 2020, 10:56 AM

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2692/display/redirect

Nescio mentioned this in D2885: fix various oversights from recent commits.Jul 18 2020, 10:59 AM
Harbormaster completed remote builds in B12475: Diff 12761.Jul 18 2020, 11:02 AM
Silier added a parent revision: D2863: [gameplay] deprecate stoas and stoa champions.Jul 18 2020, 5:56 PM
Nescio added a comment.Jul 18 2020, 7:53 PM

Angen added a parent revision: D2863: [gameplay] deprecate stoa champions and clean up stoa templates.

Actually that one (D2863) has to be split and things would be easier if this one (D2887) were reviewed and committed before.

Nescio removed a parent revision: D2863: [gameplay] deprecate stoas and stoa champions.Jul 18 2020, 7:53 PM
Nescio added a child revision: D2863: [gameplay] deprecate stoas and stoa champions.
Nescio mentioned this in D2549: clean up tower classes.Jul 19 2020, 9:44 PM
Nescio mentioned this in D2892: clean up market and other structure classes.Jul 21 2020, 10:02 PM
Nescio mentioned this in D2834: alphabetize entity limits and statistics classes.Jul 21 2020, 10:21 PM
Freagarach added a subscriber: Freagarach.EditedAug 7 2020, 3:51 PM
In D2887#124697, @Nescio wrote:

Angen added a parent revision: D2863: [gameplay] deprecate stoa champions and clean up stoa templates.

Actually that one (D2863) has to be split and things would be easier if this one (D2887) were reviewed and committed before.

Then please restore the Stoa and delete it only in the mentioned patch.

Nescio added a comment.Aug 7 2020, 4:10 PM

Then please restore the Stoa and delete it only in the mentioned patch.

I didn't include (which is not exactly the same as exclude, since the config.js file didn't have a stoa entry in the first place) the stoa here to avoid a file line conflict and having to rebase this when D2874 is committed and again after D2863, or vice versa. Updating this file only once seemed cleaner than doing it thrice in a row.

Freagarach added a comment.Aug 7 2020, 4:20 PM

As far as I can see makes this patch the config.js more readable and removes the deprecated rotary mill, which is nice. Therefore I would like to get it in the game, however I cannot do so if PetraAI won't build a Stoa after this while it can still be used.

In D2887#128144, @Nescio wrote:

since the config.js file didn't have a stoa entry in the first place)

It has in SVN? But perhaps I misunderstood you?

Nescio added a comment.Aug 7 2020, 4:38 PM

It has in SVN? But perhaps I misunderstood you?

You're right, I apologize. That's what happens when replying from memory rather than looking at the actual changes.

Nescio updated this revision to Diff 13137.Aug 7 2020, 4:40 PM
Nescio edited the summary of this revision. (Show Details)
  • reinsert "structures/{civ}_royal_stoa",, per @Angen and @Freagarach
Nescio removed a child revision: D2863: [gameplay] deprecate stoas and stoa champions.Aug 7 2020, 4:42 PM
Freagarach accepted this revision.Aug 7 2020, 4:45 PM

Thanks :)

This revision is now accepted and ready to land.Aug 7 2020, 4:45 PM
Vulcan added a comment.Aug 7 2020, 5:23 PM

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2947/display/redirect

Harbormaster completed remote builds in B12822: Diff 13137.Aug 7 2020, 5:23 PM
Closed by commit rP23946: Correct buildings in PetraAI's config.js. (authored by Freagarach). · Explain WhyAug 7 2020, 7:36 PM
This revision was automatically updated to reflect the committed changes.
Freagarach added a commit: rP23946: Correct buildings in PetraAI's config.js..
Freagarach added a comment.Aug 7 2020, 7:38 PM

Notice that the order *can* matter for which structure is build first, but since these are structures that will be be constructed only at phase 3 with sufficient resources it will not matter much. Also previous additions to the structures seem to have not cared.

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
ai/
petra/
68 lines

Diff 13139

View Options

ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js

Loading...
Wildfire Games · Phabricator