Page MenuHomeWildfire Games

move palisades from other/ to structures/
ClosedPublic

Authored by Nescio on Aug 30 2019, 4:22 PM.

Details

Summary

D1002 moved {civ}_*.xml structures from other/ to structures/, D1796 introduced a shared parent template for the palisades, D1881 moved the wallset_palisade.xml from other/ to structures/, and this patch moves the individual palisade files from other/ to structures/:

  • other/palisades_rocks_*.xmlstructures/palisades_*.xml
  • other/palisades_angle_spike.xmlstructures/palisades_spike_angle.xml
  • other/palisades_small_spikes.xmlstructures/palisades_spikes_small.xml
  • other/palisades_tall_spikes.xmlstructures/palisades_spikes_tall.xml

and updates the simulation/templates files accordingly.

Afterwards, run the following script to update the maps/ files:

find binaries/data/mods/public/maps/ \( -name '*.js' -o -name '*.json' -o -name '*.xml' \) -print0 | xargs -0 sed -i \
  -e 's,other/palisades_rocks,structures/palisades,g' \
  -e 's,other/palisades_angle_spike,structures/palisades_spike_angle,g' \
  -e 's,other/palisades_small_spikes,structures/palisades_spikes_small,g' \
  -e 's,other/palisades_tall_spikes,structures/palisades_spikes_tall,g'
Test Plan

Apply the patch and apply the sed script to update the maps, then check for errors, mistakes, and omissions.

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.Aug 30 2019, 4:22 PM
Nescio edited the summary of this revision. (Show Details)

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

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

wraitii accepted this revision.Sep 23 2019, 9:37 AM

Accepting the change, I think the template rename is a good move.
I'll commit this with some proper svn mv magic.

This revision is now accepted and ready to land.Sep 23 2019, 9:37 AM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Sep 23 2019, 9:48 AM
Nescio edited the summary of this revision. (Show Details)Tue, Feb 23, 5:03 PM
Nescio edited the summary of this revision. (Show Details)Tue, Feb 23, 5:27 PM
Nescio removed a reviewer: elexis.