Merge persian and mauryan Archery Tradition technologies

Add the tech to ranges, and make them also pop upin captured barracks

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1941
This was SVN commit r22329.

binaries/data/mods/public/simulation/data/technologies/archery_tradition.json

@@ -1,8 +1,8 @@
 {
 	"genericName": "Archery Tradition",
-	"description": "The Indians had a tradition of fine archery and a penchant for using massed archers in battle.",
+	"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" }, { "civ": "maur" }] },
+	"requirements": { "all": [{ "tech": "phase_village" }, { "any": [{ "civ": "maur" }, { "civ": "pers" }] }] },
 	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "armor_plates_ranged.png",
 	"researchTime": 60,

binaries/data/mods/public/simulation/data/technologies/persians/special_archery_tradition.json

@@ -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"
-}

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

@@ -17,7 +17,6 @@
       units/{civ}_champion_maiden_barracks
     </Entities>
     <Technologies datatype="tokens">
-      mauryas/special_archery_tradition
       unlock_champion_units
     </Technologies>
   </ProductionQueue>

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

@@ -16,7 +16,6 @@
     <Technologies datatype="tokens">
       persians/training_levy_infantry
       persians/training_conscription_infantry
-      persians/special_archery_tradition
       -training_conscription
     </Technologies>
   </ProductionQueue>

binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml

@@ -49,6 +49,7 @@
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
+      archery_tradition
     </Technologies>
   </ProductionQueue>
   <Sound>

binaries/data/mods/public/simulation/templates/template_structure_military_range.xml

@@ -42,6 +42,7 @@
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
+      archery_tradition
     </Technologies>
   </ProductionQueue>
   <Sound>