Add four default skirm structures
ClosedPublic
Actions

Authored by Nescio on Jul 6 2019, 3:43 PM.

Details

Reviewers

Commits

rP22497: Add skirmish templates for range, stable, wonder and workshop

Trac Tickets

#4849

Summary

This patch adds simulation/templates/skirmish/structures/default_*.xml files for the range, stable, workshop, and wonder templates, because these exist for all factions and could thus be used in maps.
Default skirmish placeholders for the elephant stable aren't added, because not all civilizations have one; for comparison, other structures shared by some but not all (e.g. library, rotary mill, theatre) don't have them either.

[EDIT]: also corrected workshop templates encountered when looking for largest footprint:

all workshops have the same footprint; brit was the exception, but if anything, its actor looks slightly smaller than the others in Atlas, therefore there is no need to assign it a slightly larger footprint in its template
removed foundation and rubble from specific templates, because it's already appropiately defined in the shared generic parent template
no need to give kush workshop a different queue, because technologies already have "civ": or "notciv": requirements
correct Greek specific name, per https://wildfiregames.com/forum/index.php?/topic/25268-specific-name-review-structures/page/3/&tab=comments#comment-378978

(should probably have been done in a separate patch)

Test Plan

Ought to be unproblematic.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 8337
Build 13613: Vulcan Build	Jenkins
Build 13611: arc lint + arc unit

Event Timeline

Nescio created this revision.Jul 6 2019, 3:43 PM

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

Link to build: https://jenkins.wildfiregames.com/job/differential/1926/display/redirect

Harbormaster completed remote builds in B8221: Diff 8754.Jul 6 2019, 4:12 PM

When doing D723, D726, D727, D728 we took as a convention that the obstruction/footprint of the default buildings should be the greatest of all the civ's buildings such that Atlas guides you to make nothing overlapping. It would be good to do the same for these buildings immediately. e.g. for the range the footprint would be 27x27 and obstruction 26x26 since the ptol is the biggest with those size. Also if there is one building with 20x 25 and another 25x20 we would need 25x25 here.

binaries/data/mods/public/simulation/templates/skirmish/structures/default_stable.xml
9	guess not that

This revision now requires changes to proceed.Jul 12 2019, 8:49 PM

Good point! Not all skirmish templates specify a footprint, though; should those (barracks, blacksmith, civic centre, etc) be updated here as well?

binaries/data/mods/public/simulation/templates/skirmish/structures/default_stable.xml
9	Oops, I'll correct that.

Updated, now with footprint and obstruction.
Also minor workshop templates corrections.

Build failure - The Moirai have given mortals hearts that can endure.

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

Harbormaster failed remote builds in B8337: Diff 8872!Jul 13 2019, 11:20 PM

In D2049#86151, @Nescio wrote:

Good point! Not all skirmish templates specify a footprint, though; should those (barracks, blacksmith, civic centre, etc) be updated here as well?

The skirmish templates could inherit the correct value from the parent, if that is not the case it needs to be updated, however sounds like a topic of another patch, excluding the barracks chance for now

binaries/data/mods/public/simulation/templates/skirmish/structures/default_barracks.xml
4	should be 25x 26
10	22x23
binaries/data/mods/public/simulation/templates/skirmish/structures/default_range.xml
10	26x26
binaries/data/mods/public/simulation/templates/skirmish/structures/default_stable.xml
4	25x26
binaries/data/mods/public/simulation/templates/skirmish/structures/default_wonder.xml
4	62x66
10	59x63 (one might consider making the Obstruction+2=footprint in another revision, but while doing that one should check all the values...)
binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
3–5	this is certainly too big, so a good chance here, one could try in atlas if there are more buildings that have improper sizes (see those revisions linked before)
binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
7–12	Wondering why this was done, don't see a good reason why
binaries/data/mods/public/simulation/templates/structures/pers_wonder.xml
3	MaxSpawnDistance not used with structures, so ok

This revision is now accepted and ready to land.Jul 17 2019, 9:29 PM

Default skirmish placeholders for the elephant stable aren't added, because not all civilizations have one; for comparison, other structures shared by some but not all (e.g. library, rotary mill, theatre) don't have them either.

Notice that houses have a skirmish replacer and there actually are 2 types of them i.e. small and big houses, so that would be the way to handle the structures that not all civs have

This revision was landed with ongoing or failed builds.Jul 17 2019, 9:41 PM

Closed by commit rP22497: Add skirmish templates for range, stable, wonder and workshop (authored by bb). · Explain Why

This revision was automatically updated to reflect the committed changes.