Move palisades from other/ to structures/

Following D1881 which introduced a common parent, palisade templates can
be moved:
 - other/palisades_rocks_* to structures/palisades_*
 - other/palisades_*_spike* to structures/palisades_spike*

Map scripts were updated accordingly.

Patch By: Nescio
Reviewed By: wraitii
Refs #4770

Differential Revision: https://code.wildfiregames.com/D2234
This was SVN commit r22982.

binaries/data/mods/public/maps/random/danubius.js

@@ -66,16 +66,16 @@ const oHouse = "uncapturable|structures/gaul_house";
 const oLongHouse = "uncapturable|other/celt_longhouse";
 const oHut = "uncapturable|other/celt_hut";
 const oSentryTower = "uncapturable|structures/gaul_sentry_tower";
-const oWatchTower = "uncapturable|other/palisades_rocks_watchtower";
+const oWatchTower = "uncapturable|structures/palisades_watchtower";
 
-const oPalisadeTallSpikes = "uncapturable|other/palisades_tall_spikes";
+const oPalisadeTallSpikes = "uncapturable|structures/palisades_spikes_tall";
-const oPalisadeAngleSpikes = "uncapturable|other/palisades_angle_spike";
+const oPalisadeAngleSpikes = "uncapturable|structures/palisades_spike_angle";
-const oPalisadeCurve = "uncapturable|other/palisades_rocks_curve";
+const oPalisadeCurve = "uncapturable|structures/palisades_curve";
-const oPalisadeShort = "uncapturable|other/palisades_rocks_short";
+const oPalisadeShort = "uncapturable|structures/palisades_short";
-const oPalisadeMedium = "uncapturable|other/palisades_rocks_medium";
+const oPalisadeMedium = "uncapturable|structures/palisades_medium";
-const oPalisadeLong = "uncapturable|other/palisades_rocks_long";
+const oPalisadeLong = "uncapturable|structures/palisades_long";
-const oPalisadeGate = "uncapturable|other/palisades_rocks_gate";
+const oPalisadeGate = "uncapturable|structures/palisades_gate";
-const oPalisadePillar = "uncapturable|other/palisades_rocks_tower";
+const oPalisadePillar = "uncapturable|structures/palisades_tower";
 
 const oFemale = "units/gaul_support_female_citizen";
 const oHealer = "units/gaul_support_healer_b";

binaries/data/mods/public/maps/random/extinct_volcano.js

@@ -29,7 +29,7 @@ const oBear = "gaia/fauna_bear";
 const oStoneLarge = "gaia/geology_stonemine_temperate_quarry";
 const oStoneSmall = "gaia/geology_stone_temperate";
 const oMetalLarge = "gaia/geology_metal_temperate_slabs";
-const oTower = "other/palisades_rocks_fort";
+const oTower = "structures/palisades_fort";
 
 const aRockLarge = "actor|geology/stone_granite_med.xml";
 const aRockMedium = "actor|geology/stone_granite_med.xml";

binaries/data/mods/public/maps/random/jebel_barkal.js

@@ -81,9 +81,9 @@ const oElephantStables = "structures/kush_elephant_stables";
 const oWallMedium = "structures/kush_wall_medium";
 const oWallGate = "structures/kush_wall_gate";
 const oWallTower = "structures/kush_wall_tower";
-const oPalisadeMedium = "other/palisades_rocks_medium";
+const oPalisadeMedium = "structures/palisades_medium";
-const oPalisadeGate = "other/palisades_rocks_gate";
+const oPalisadeGate = "structures/palisades_gate";
-const oPalisadeTower = "other/palisades_rocks_tower";
+const oPalisadeTower = "structures/palisades_tower";
 const oKushCitizenArcher = "units/kush_infantry_archer_b";
 const oKushHealer = "units/kush_support_healer_b";
 const oKushChampionArcher = "units/kush_champion_infantry";

binaries/data/mods/public/maps/random/rmgen-common/wall_builder.js

@@ -193,7 +193,7 @@ function getWallElement(element, style)
 		break;
 
 	case "entryTower":
-		ret.templateName = g_CivData[civ] ? "structures/" + civ + "_defense_tower" : "other/palisades_rocks_watchtower";
+		ret.templateName = g_CivData[civ] ? "structures/" + civ + "_defense_tower" : "structures/palisades_watchtower";
 		ret.indent = ret.length * -3;
 		ret.length = wallset.gate.length;
 		break;

binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js

@@ -158,20 +158,20 @@ experiments.units_running_into_eachother = {
 
 experiments.enclosed = {
 	"spawn": () => {
-		QuickSpawn(gx, gy - 8, "other/palisades_rocks_long");
+		QuickSpawn(gx, gy - 8, "structures/palisades_long");
-		QuickSpawn(gx, gy + 8, "other/palisades_rocks_long");
+		QuickSpawn(gx, gy + 8, "structures/palisades_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "structures/palisades_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "structures/palisades_long"));
 
 		WalkTo(gx + 100, gy + 100, QuickSpawn(gx - 1, gy - 1, UNIT_TEMPLATE));
 		WalkTo(gx - 100, gy + 100, QuickSpawn(gx + 1, gy - 1, UNIT_TEMPLATE));
 		WalkTo(gx - 100, gy - 100, QuickSpawn(gx + 1, gy + 1, UNIT_TEMPLATE));
 		WalkTo(gx + 100, gy - 100, QuickSpawn(gx - 1, gy + 1, UNIT_TEMPLATE));
 
-		QuickSpawn(gx, gy + 20, "other/palisades_rocks_long");
+		QuickSpawn(gx, gy + 20, "structures/palisades_long");
-		experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "other/palisades_rocks_long");
+		experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "structures/palisades_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "structures/palisades_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "structures/palisades_long"));
 		WalkTo(gx, gy + 100, QuickSpawn(gx, gy + 28, UNIT_TEMPLATE));
 	},
 
@@ -221,18 +221,18 @@ experiments.units_superdense_forest_of_units = {
 
 experiments.u_shape_tight_exit = {
 	"spawn": () => {
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "structures/palisades_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "structures/palisades_long"));
-		QuickSpawn(gx, gy + 16, "other/palisades_rocks_long");
+		QuickSpawn(gx, gy + 16, "structures/palisades_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "other/palisades_rocks_medium"));
+		Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "structures/palisades_medium"));
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "structures/palisades_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "structures/palisades_long"));
-		QuickSpawn(gx - 4, gy, "other/palisades_rocks_medium");
+		QuickSpawn(gx - 4, gy, "structures/palisades_medium");
-		QuickSpawn(gx - 12, gy, "other/palisades_rocks_medium");
+		QuickSpawn(gx - 12, gy, "structures/palisades_medium");
-		Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "other/palisades_rocks_short"));
+		Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "structures/palisades_short"));
-		QuickSpawn(gx, gy - 10, "other/palisades_rocks_long");
+		QuickSpawn(gx, gy - 10, "structures/palisades_long");
-		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "structures/palisades_long"));
-		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "structures/palisades_long"));
 
 		let tree = QuickSpawn(gx, gy + 80, "gaia/flora_tree_acacia");
 

binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_gate">
+<Entity parent="structures/palisades_gate">
   <Identity>
     <Civ>cart</Civ>
   </Identity>

binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_long">
+<Entity parent="structures/palisades_long">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_medium">
+<Entity parent="structures/palisades_medium">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_short">
+<Entity parent="structures/palisades_short">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/palisades_rocks_tower">
+<Entity parent="structures/palisades_tower">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>structures/cart_wallset_short</SelectionGroupName>

binaries/data/mods/public/simulation/templates/structures/wallset_palisade.xml

@@ -9,16 +9,14 @@
   </Identity>
   <WallSet>
     <Templates>
-      <Tower>other/palisades_rocks_tower</Tower>
+      <Tower>structures/palisades_tower</Tower>
-      <Gate>other/palisades_rocks_gate</Gate>
+      <Gate>structures/palisades_gate</Gate>
-      <Fort>other/palisades_rocks_fort</Fort>
+      <Fort>structures/palisades_fort</Fort>
-      <WallLong>other/palisades_rocks_long</WallLong>
+      <WallLong>structures/palisades_long</WallLong>
-      <WallMedium>other/palisades_rocks_medium</WallMedium>
+      <WallMedium>structures/palisades_medium</WallMedium>
-      <WallShort>other/palisades_rocks_short</WallShort>
+      <WallShort>structures/palisades_short</WallShort>
-      <WallCurves>
+      <WallCurves>structures/palisades_curve</WallCurves>
-        other/palisades_rocks_curve
+      <WallEnd>structures/palisades_end</WallEnd>
-      </WallCurves>
-      <WallEnd>other/palisades_rocks_end</WallEnd>
     </Templates>
   </WallSet>
 </Entity>