Page MenuHomeWildfire Games
Differential D1794

template_structure_defensive_wall* simplification
ClosedPublic
Actions

Authored by Nescio on Mar 17 2019, 5:26 PM.

Details

Reviewers
bb
Commits
rP22325: Reduce defensive_wall* duplication
Summary

Currently:

  • template_structure_defensive_wall_long.xml, template_structure_defensive_wall_medium.xml, template_structure_defensive_wall_short.xml have template_structure_defensive_wall.xml as their parent (as should be)
  • template_structure_defensive_wall_gate.xml has template_structure_defensive_wall_long.xml as its parent (name suggests otherwise)
  • template_structure_defensive_wall_tower.xml has template_structure_defensive.xml as its parent (name suggests otherwise)

This patch:

  • changes the parent of the *_wall_gate.xml and *_wall_tower.xml to *_wall.xml, which means all wall templates all have the same inheritance
  • removes some duplication
  • moves cost and health out of template_structure_defensive_wall.xml, because all its children have different values
  • [EDIT]: removed different <RepairTimeRatio> from the gate template and tweaked <Cost/BuildTime> instead, to keep health/s the same
Test Plan

Check if nothing is overlooked and everything still works.

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.Mar 17 2019, 5:26 PM
Nescio edited the summary of this revision. (Show Details)
Nescio updated this revision to Diff 7577.Mar 17 2019, 5:43 PM

Updated (RallyPoint).

Vulcan added a subscriber: Vulcan.Mar 17 2019, 5:50 PM

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

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

Harbormaster completed remote builds in B7002: Diff 7576.Mar 17 2019, 5:50 PM
Vulcan added a comment.Mar 17 2019, 5:51 PM

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

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

Harbormaster completed remote builds in B7003: Diff 7577.Mar 17 2019, 5:51 PM
Nescio updated this revision to Diff 7682.Apr 6 2019, 7:44 PM
Vulcan added a comment.Apr 6 2019, 7:53 PM

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

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

Harbormaster completed remote builds in B7116: Diff 7682.Apr 6 2019, 7:53 PM
Nescio updated this revision to Diff 7683.Apr 6 2019, 7:54 PM
Nescio updated this revision to Diff 7684.
Nescio edited the summary of this revision. (Show Details)
Vulcan added a comment.Apr 6 2019, 7:55 PM

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

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

Harbormaster completed remote builds in B7117: Diff 7683.Apr 6 2019, 7:55 PM
Vulcan added a comment.Apr 6 2019, 7:57 PM

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

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

Harbormaster completed remote builds in B7118: Diff 7684.Apr 6 2019, 7:57 PM
Nescio updated this revision to Diff 7737.Apr 12 2019, 9:21 PM
Nescio edited the summary of this revision. (Show Details)
Nescio added inline comments.
binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
6 ↗(On Diff #7737)

cost of upgrading long wall to gate

Vulcan added a comment.Apr 12 2019, 9:29 PM

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

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

Harbormaster completed remote builds in B7172: Diff 7737.Apr 12 2019, 9:29 PM
Nescio updated this revision to Diff 7740.Apr 12 2019, 10:07 PM
Nescio edited the summary of this revision. (Show Details)
Vulcan added a comment.Apr 13 2019, 1:38 AM

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

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

Harbormaster completed remote builds in B7175: Diff 7740.Apr 13 2019, 1:38 AM
Nescio mentioned this in D1796: create template_defensive_palisade.xml.Apr 22 2019, 1:04 PM
Nescio updated this revision to Diff 8227.May 30 2019, 11:21 PM

updated

Vulcan added a comment.May 30 2019, 11:22 PM

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

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

Harbormaster completed remote builds in B7687: Diff 8227.May 30 2019, 11:22 PM
Nescio mentioned this in D1790: Separate stable from barracks.May 30 2019, 11:23 PM
bb accepted this revision.May 31 2019, 1:16 PM

Couple of minor issues, fixing while committing

binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
4 ↗(On Diff #8227)

The comment was added with a reason (me wanting to remove the cost component), so we need to keep it, but we need to paraphrase it:
<!-- We need a Cost component, although gates cannot be built directly, as Cost/BuildTime is required to prevent instantaneous repair -->

39–41 ↗(On Diff #8227)

the visualActor.FoundationActor got removed here, in vanilla it is indeed never used since the gate is not directly buildable however I don't see it that odd some mod changes this, so I did keep it around

binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
13–15 ↗(On Diff #8227)

RallyPoint should be disabled here

This revision is now accepted and ready to land.May 31 2019, 1:16 PM
Closed by commit rP22325: Reduce defensive_wall* duplication (authored by bb). · Explain WhyMay 31 2019, 1:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8234

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml

Loading...
Wildfire Games · Phabricator