Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/mauryas/special_archery_tradition.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/mauryas/special_archery_tradition.json	(revision 22328)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/mauryas/special_archery_tradition.json	(nonexistent)
@@ -1,19 +0,0 @@
-{
-	"genericName": "Archery Tradition",
-	"description": "The Indians had a tradition of fine archery and a penchant for using massed archers in battle.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 250 },
-	"requirements": { "all": [{ "tech": "phase_village" }, { "civ": "maur" }] },
-	"requirementsTooltip": "Unlocked in Village Phase.",
-	"icon": "armor_plates_ranged.png",
-	"researchTime": 60,
-	"tooltip": "Range +10 meters for bow-wielding units. Archer units better accuracy and -20% train time, but also -20% health.",
-	"modifications": [
-		{ "value": "Attack/Ranged/MaxRange", "add": 10.0 },
-		{ "value": "Attack/Ranged/Spread", "multiply": 0.8 },
-		{ "value": "Vision/Range", "add": 10.0 },
-		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Health/Max", "multiply": 0.8 }
-	],
-	"affects": ["Archer"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/mauryas/special_archery_tradition.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json	(revision 22328)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json	(nonexistent)
@@ -1,19 +0,0 @@
-{
-	"genericName": "Archery Tradition",
-	"description": "The Persians had a tradition of fine archery and a penchant for using massed archers in battle.",
-	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 250 },
-	"requirements": { "all": [{ "tech": "phase_village" }, { "civ": "pers" }] },
-	"requirementsTooltip": "Unlocked in Village Phase.",
-	"icon": "armor_plates_ranged.png",
-	"researchTime": 60,
-	"tooltip": "Range +10 meters for bow-wielding units. Archer units better accuracy and -20% train time, but also -20% health.",
-	"modifications": [
-		{ "value": "Attack/Ranged/MaxRange", "add": 10.0 },
-		{ "value": "Attack/Ranged/Spread", "multiply": 0.8 },
-		{ "value": "Vision/Range", "add": 10.0 },
-		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Health/Max", "multiply": 0.8 }
-	],
-	"affects": ["Archer"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json	(revision 22329)
@@ -0,0 +1,19 @@
+{
+	"genericName": "Archery Tradition",
+	"description": "The Indian and Iranian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
+	"cost": { "food": 500, "wood": 500, "stone": 0, "metal": 250 },
+	"requirements": { "all": [{ "tech": "phase_village" }, { "any": [{ "civ": "maur" }, { "civ": "pers" }] }] },
+	"requirementsTooltip": "Unlocked in Village Phase.",
+	"icon": "armor_plates_ranged.png",
+	"researchTime": 60,
+	"tooltip": "Range +10 meters for bow-wielding units. Archer units better accuracy and -20% train time, but also -20% health.",
+	"modifications": [
+		{ "value": "Attack/Ranged/MaxRange", "add": 10.0 },
+		{ "value": "Attack/Ranged/Spread", "multiply": 0.8 },
+		{ "value": "Vision/Range", "add": 10.0 },
+		{ "value": "Cost/BuildTime", "multiply": 0.8 },
+		{ "value": "Health/Max", "multiply": 0.8 }
+	],
+	"affects": ["Archer"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/archery_tradition.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml	(revision 22328)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml	(revision 22329)
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Footprint>
     <Square width="24.0" depth="26.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Sainyavasa</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_barracks
       units/{civ}_champion_maiden_barracks
     </Entities>
     <Technologies datatype="tokens">
-      mauryas/special_archery_tradition
       unlock_champion_units
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryas/barracks.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml	(revision 22328)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml	(revision 22329)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Padgan</SpecificName>
     <Tooltip>Levy citizen-infantry units.</Tooltip>
     <Icon>structures/pers_barracks.png</Icon>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       -units/{civ}_cavalry_swordsman_b
       -units/{civ}_cavalry_spearman_b
       -units/{civ}_cavalry_javelinist_b
       -units/{civ}_cavalry_archer_b
     </Entities>
     <Technologies datatype="tokens">
       persians/training_levy_infantry
       persians/training_conscription_infantry
-      persians/special_archery_tradition
       -training_conscription
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/barracks.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 22328)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 22329)
@@ -1,66 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <List datatype="tokens">Infantry Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Barracks</GenericName>
     <Tooltip>Train citizen-soldiers. Research training improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
     <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>30</wood>
     <stone>10</stone>
   </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_pikeman_b
       units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
       units/{civ}_cavalry_swordsman_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
+      archery_tradition
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_barracks.xml</select>
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml	(revision 22328)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml	(revision 22329)
@@ -1,59 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <List datatype="tokens">Infantry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Practice Range</GenericName>
     <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Range</VisibleClasses>
     <Icon>structures/range.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>30</wood>
     <stone>10</stone>
   </Loot>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
+      archery_tradition
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_range.xml</constructed>
       <select>interface/select/building/sel_barracks.xml</select>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
   </VisualActor>
 </Entity>