Page MenuHomeWildfire Games
Differential D1788

rename template_structure_defense* to *defensive*
ClosedPublic
Actions

Authored by Nescio on Mar 16 2019, 10:58 PM.

Details

Reviewers
bb
Commits
rP22120: Change structure_defense to structure_defensive so it is consistent with the…
Summary

Currently:

  • Civic-class structures have corresponding template_structure_civic*
  • Economic-class structures have corresponding template_structure_economic*
  • Military-class structures have corresponding template_structure_military*
  • Resource-class structures have corresponding template_structure_resource*
  • Special-class structures have corresponding template_structure_special*

However:

  • Defensive-class structures have corresponding template_structure_defense*

This patch:

  • moves *_defense* templates to *_defensive* for consistency
  • updates all their specific children accordingly (did a grep)
Test Plan

Ought to be unproblematic.

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 16 2019, 10:58 PM
Vulcan added a subscriber: Vulcan.Mar 16 2019, 11:06 PM

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

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

Harbormaster completed remote builds in B6976: Diff 7551.Mar 16 2019, 11:06 PM
bb added a comment.Mar 16 2019, 11:25 PM

Idea is ok, but patch is inclomplete: your grep doesn't seem to have found the skirmish buildings (the templates under skirmish/structures/)

Nescio added a comment.Mar 17 2019, 9:56 AM

Oops, you're right; I did a grep in the other/ and structure/ directories, but I forgot to check skirmish/structures/ ; I should have done simply a grep -r defense_ * in templates/

Nescio updated this revision to Diff 7554.Mar 17 2019, 9:57 AM

Updated, now with skirmish templates.

Vulcan added a comment.Mar 17 2019, 10:08 AM

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

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

Harbormaster completed remote builds in B6979: Diff 7554.Mar 17 2019, 10:08 AM
bb accepted this revision.Mar 17 2019, 1:56 PM

Patch reads correct, unit demo test succeeded, grep gives translate hate=> accept

This revision is now accepted and ready to land.Mar 17 2019, 1:56 PM
Closed by commit rP22120: Change structure_defense to structure_defensive so it is consistent with the… (authored by bb). · Explain WhyMar 17 2019, 2:05 PM
This revision was automatically updated to reflect the committed changes.

Large Diff

This large diff affects 159 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
templates/
other/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
skirmish/
structures/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
structures/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
20 lines
69 lines
72 lines
70 lines
57 lines
61 lines
45 lines
58 lines
39 lines
16 lines
106 lines
20 lines
69 lines
72 lines
70 lines
57 lines
61 lines
45 lines
58 lines
39 lines
16 lines
106 lines

Diff 7560

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wall_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_gate.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wall_tower.xml

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Wildfire Games · Phabricator