Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml	(nonexistent)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Abstract entity to serve as a bare-minimum dummy constructable entity to initiate wall placement.
-     Defines the set of actual entities that are part of the same wall construction system (i.e., towers,
-     gates, wall segments of various length, etc.) using the WallSet component (to be overridden by child
-     templates). -->
-<Entity>
-  <Identity>
-    <Civ>gaia</Civ>
-    <Icon>structures/wall.png</Icon>
-    <Classes datatype="tokens">StoneWall</Classes>
-    <GenericName>City Wall</GenericName>
-    <Tooltip>Wall off your town for a stout defense.</Tooltip>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <Undeletable>true</Undeletable>
-  </Identity>
-  <WallSet>
-    <MaxTowerOverlap>0.85</MaxTowerOverlap>
-    <MinTowerOverlap>0.05</MinTowerOverlap>
-  </WallSet>
-  <Visibility>
-    <RetainInFog>false</RetainInFog>
-    <AlwaysVisible>false</AlwaysVisible>
-    <Corpse>false</Corpse>
-    <Preview>false</Preview>
-  </Visibility>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml	(revision 22116)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <GenericName>Wooden Wall</GenericName>
     <SpecificName>Palisade</SpecificName>
     <Classes datatype="tokens">-StoneWall Palisade</Classes>
     <Icon>structures/palisade_wall.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>other/palisades_rocks_tower</Tower>
       <Gate>other/palisades_rocks_gate</Gate>
       <Fort>other/palisades_rocks_fort</Fort>
       <WallLong>other/palisades_rocks_long</WallLong>
       <WallMedium>other/palisades_rocks_medium</WallMedium>
       <WallShort>other/palisades_rocks_short</WallShort>
       <WallCurves>
         other/palisades_rocks_curve
       </WallCurves>
       <WallEnd>other/palisades_rocks_end</WallEnd>
     </Templates>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/athen_wall_tower</Tower>
       <Gate>structures/athen_wall_gate</Gate>
       <WallLong>structures/athen_wall_long</WallLong>
       <WallMedium>structures/athen_wall_medium</WallMedium>
       <WallShort>structures/athen_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/brit_wall_tower</Tower>
       <Gate>structures/brit_wall_gate</Gate>
       <WallLong>structures/brit_wall_long</WallLong>
       <WallMedium>structures/brit_wall_medium</WallMedium>
       <WallShort>structures/brit_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.80</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Low Wall</SpecificName>
     <RequiredTechnology>phase_village</RequiredTechnology>
     <Icon>structures/palisade_wall.png</Icon>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/cart_s_wall_tower</Tower>
       <Gate>structures/cart_s_wall_gate</Gate>
       <WallLong>structures/cart_s_wall_long</WallLong>
       <WallMedium>structures/cart_s_wall_medium</WallMedium>
       <WallShort>structures/cart_s_wall_short</WallShort>
     </Templates>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Jdar</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/cart_wall_tower</Tower>
       <Gate>structures/cart_wall_gate</Gate>
       <WallLong>structures/cart_wall_long</WallLong>
       <WallMedium>structures/cart_wall_medium</WallMedium>
       <WallShort>structures/cart_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Rate</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/gaul_wall_tower</Tower>
       <Gate>structures/gaul_wall_gate</Gate>
       <WallLong>structures/gaul_wall_long</WallLong>
       <WallMedium>structures/gaul_wall_medium</WallMedium>
       <WallShort>structures/gaul_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.80</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Zabal Horma</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/iber_wall_tower</Tower>
       <Gate>structures/iber_wall_gate</Gate>
       <WallLong>structures/iber_wall_long</WallLong>
       <WallMedium>structures/iber_wall_medium</WallMedium>
       <WallShort>structures/iber_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.80</MaxTowerOverlap>
     <MinTowerOverlap>0.20</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>sbty</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/kush_wall_tower</Tower>
       <Gate>structures/kush_wall_gate</Gate>
       <WallLong>structures/kush_wall_long</WallLong>
       <WallMedium>structures/kush_wall_medium</WallMedium>
       <WallShort>structures/kush_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/mace_wall_tower</Tower>
       <Gate>structures/mace_wall_gate</Gate>
       <WallLong>structures/mace_wall_long</WallLong>
       <WallMedium>structures/mace_wall_medium</WallMedium>
       <WallShort>structures/mace_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wallset_stone.xml	(revision 22116)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Shilabanda</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/maur_wall_tower</Tower>
       <Gate>structures/maur_wall_gate</Gate>
       <WallLong>structures/maur_wall_long</WallLong>
       <WallMedium>structures/maur_wall_medium</WallMedium>
       <WallShort>structures/maur_wall_short</WallShort>
     </Templates>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_wallset_stone.xml	(revision 22116)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Para</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/pers_wall_tower</Tower>
       <Gate>structures/pers_wall_gate</Gate>
       <WallLong>structures/pers_wall_long</WallLong>
       <WallMedium>structures/pers_wall_medium</WallMedium>
       <WallShort>structures/pers_wall_short</WallShort>
     </Templates>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>h-n-njwt</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/ptol_wall_tower</Tower>
       <Gate>structures/ptol_wall_gate</Gate>
       <WallLong>structures/ptol_wall_long</WallLong>
       <WallMedium>structures/ptol_wall_medium</WallMedium>
       <WallShort>structures/ptol_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
     <MinTowerOverlap>0.15</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml	(revision 22116)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Siege Wall</GenericName>
     <SpecificName>Murus Latericius</SpecificName>
     <Icon>structures/siege_wall.png</Icon>
     <Tooltip>A wooden and turf palisade buildable in enemy and neutral territories.</Tooltip>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/rome_siege_wall_tower</Tower>
       <Gate>structures/rome_siege_wall_gate</Gate>
       <Fort>structures/rome_army_camp</Fort>
       <WallLong>structures/rome_siege_wall_long</WallLong>
       <WallMedium>structures/rome_siege_wall_medium</WallMedium>
       <WallShort>structures/rome_siege_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>1.00</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Moenia</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/rome_wall_tower</Tower>
       <Gate>structures/rome_wall_gate</Gate>
       <WallLong>structures/rome_wall_long</WallLong>
       <WallMedium>structures/rome_wall_medium</WallMedium>
       <WallShort>structures/rome_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.80</MaxTowerOverlap>
     <MinTowerOverlap>0.10</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_wallset_stone.xml	(revision 22116)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/sele_wall_tower</Tower>
       <Gate>structures/sele_wall_gate</Gate>
       <WallLong>structures/sele_wall_long</WallLong>
       <WallMedium>structures/sele_wall_medium</WallMedium>
       <WallShort>structures/sele_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wallset_stone.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wallset_stone.xml	(revision 22115)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_wallset_stone.xml	(revision 22116)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wallset">
+<Entity parent="template_wallset">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Teîkhos</SpecificName>
   </Identity>
   <WallSet>
     <Templates>
       <Tower>structures/spart_wall_tower</Tower>
       <Gate>structures/spart_wall_gate</Gate>
       <WallLong>structures/spart_wall_long</WallLong>
       <WallMedium>structures/spart_wall_medium</WallMedium>
       <WallShort>structures/spart_wall_short</WallShort>
     </Templates>
     <MaxTowerOverlap>0.90</MaxTowerOverlap>
     <MinTowerOverlap>0.05</MinTowerOverlap>
   </WallSet>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml	(revision 22116)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Abstract entity to serve as a bare-minimum dummy constructable entity to initiate wall placement.
+     Defines the set of actual entities that are part of the same wall construction system (i.e., towers,
+     gates, wall segments of various length, etc.) using the WallSet component (to be overridden by child
+     templates). -->
+<Entity>
+  <Identity>
+    <Civ>gaia</Civ>
+    <Icon>structures/wall.png</Icon>
+    <Classes datatype="tokens">StoneWall</Classes>
+    <GenericName>City Wall</GenericName>
+    <Tooltip>Wall off your town for a stout defense.</Tooltip>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <Undeletable>true</Undeletable>
+  </Identity>
+  <WallSet>
+    <MaxTowerOverlap>0.85</MaxTowerOverlap>
+    <MinTowerOverlap>0.05</MinTowerOverlap>
+  </WallSet>
+  <Visibility>
+    <RetainInFog>false</RetainInFog>
+    <AlwaysVisible>false</AlwaysVisible>
+    <Corpse>false</Corpse>
+    <Preview>false</Preview>
+  </Visibility>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property