This patch is split off from D2863. It moves other/hellenic_stoa.xml to structures/mace_stoa.xml, deletes mace_royal_stoa.xml, renames athen_royal_stoa.xml to athen_stoa.xml and spart_royal_stoa.xml to spart_stoa.xml, and updates the relevant map files accordingly.
Details
Details
- Reviewers
wraitii Freagarach Silier - Group Reviewers
Restricted Owners Package (Owns No Changed Paths)
Check for completeness and correctness.
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- /ps/trunk
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 12820 Build 25065: Vulcan Build Jenkins Build 25064: Vulcan Build (macOS) Jenkins Build 25063: Vulcan Build (Windows) Jenkins Build 25062: arc lint + arc unit
Event Timeline
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2623/display/redirect
Comment Actions
grep shows you're missing *_royal_stoa changes: the wall.xml scenario and Petra has {civ}_royal_stoa
Comment Actions
grep shows you're missing *_royal_stoa changes: the wall.xml scenario and Petra has {civ}_royal_stoa.
Thanks for checking; I had those included in D2863 but must have missed them when creating this patch.
Comment Actions
- include wall.xml map
- remove stoa from simulation/ai/petra/config.js (renaming it here and removing it next seems less efficient)
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2626/display/redirect
Comment Actions
(renaming it here and removing it next seems less efficient)
the same applies to {civ}_infantry_*_b.xml templates.
If goal here is to make it efficient, merge renaming with removing for all cases.
If goal here is to rename, please, do not do something else.
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2655/display/redirect
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2944/display/redirect
Comment Actions
Could you please elaborate on
moves other/hellenic_stoa.xml to structures/mace_stoa.xml, deletes mace_royal_stoa.xml
Since the templates of mace_stoa and mace_royal_stoa are different now, whereas the other moves were one on one.
| binaries/data/mods/public/simulation/ai/petra/config.js | ||
|---|---|---|
| 60 | They were actually aligned. | |
Comment Actions
svn mv other/hellenic_stoa.xml structures/mace_stoa.xml svn mv structures/athen_royal_stoa.xml structures/athen_stoa.xml svn mv structures/spart_royal_stoa.xml structures/spart_stoa.xml svn rm structures/mace_royal_stoa.xml svn propset svn:mime-type text/xml */*stoa* svn propset svn:eol-style native */*stoa*
Since neither the hellenic nor the mace stoa is buildable, it doesn't really matter they're slightly different.
It makes more sense to do everything stoa-related in a single patch, i.e. D2863, but that one was deemed too complicated, therefore @wraitii requested it to be split, hence why the file moves are done separately in this patch (and D2873).
| binaries/data/mods/public/simulation/ai/petra/config.js | ||
|---|---|---|
| 60 | Tab width varies from programme to programme. | |
Comment Actions
This was were I was after, thanks :) While they are not buildable, it may matter for any map they were in. Because the actor has changed, as did garrisonHolder, health, loot, productionQueue and territoryInfluence.