Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
@@ -94,15 +94,6 @@
],
"Structures": [
{
- "Name": "Stable",
- "Class": "",
- "Emblem": "",
- "History": "The Persian Empire's best soldiers were Eastern horsemen.",
- "Phase": "Village",
- "Requirements": "",
- "Special": "Train Cavalry and research Cavalry technologies."
- },
- {
"Name": "Apadana",
"Class": "",
"Emblem": "",
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
@@ -1,5 +1,5 @@
{
- "genericName": "Unlock Champion Units",
+ "genericName": "Unlock Champion Infantry",
"specificName": {
"mace": "Agēma",
"ptol": "Agēma",
@@ -7,23 +7,25 @@
"sele": "Agēma"
},
"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
- "cost": { "food": 0, "wood": 0, "stone": 0, "metal": 1000 },
+ "cost": { "food": 0, "wood": 0, "stone": 0, "metal": 700 },
"requirements": {
"all": [
{ "tech": "phase_city" },
- { "any": [
- { "civ": "brit" },
- { "civ": "gaul" },
- { "civ": "iber" },
- { "civ": "mace" },
- { "civ": "maur" },
- { "civ": "rome" }
- ]}
+ {
+ "any": [
+ { "civ": "brit" },
+ { "civ": "gaul" },
+ { "civ": "iber" },
+ { "civ": "mace" },
+ { "civ": "maur" },
+ { "civ": "rome" }
+ ]
+ }
]
},
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "helmet_corinthian_crest.png",
"researchTime": 90,
- "tooltip": "Unlock the ability to train Champions at the Barracks.",
+ "tooltip": "Unlock Champions Infantry at the Barracks.",
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
@@ -20,7 +20,6 @@
units/{civ}/champion_infantry
- units/{civ}/champion_chariot
units/{civ}/hero_boudicca
units/{civ}/hero_caratacos
units/{civ}/hero_cunobelin
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/temple.xml
@@ -1,10 +1,5 @@
-
-
- 400
-
-
12.0
@@ -12,18 +7,14 @@
cart
Maqdaš
- Train Healers and Champions and research healing technologies.
+ Train Healers and Champion Infantry and research healing technologies.
-
- 80
-
units/{civ}/champion_infantry
- units/{civ}/champion_cavalry
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/tophet.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/tophet.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/tophet.xml
@@ -17,7 +17,6 @@
cart
Sacrificial Temple
Tophet
- Train Healers and Champion Cavalry and research healing technologies.
40
@@ -26,11 +25,6 @@
-
-
- units/{civ}/champion_cavalry
-
-
structures/fndn_6x6.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
@@ -10,7 +10,6 @@
units/{civ}/champion_infantry
- units/{civ}/champion_cavalry
units/{civ}/hero_brennus
units/{civ}/hero_viridomarus
units/{civ}/hero_vercingetorix
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
@@ -25,7 +25,6 @@
units/{civ}/champion_infantry
- units/{civ}/champion_cavalry
units/{civ}/hero_caros
units/{civ}/hero_indibil
units/{civ}/hero_viriato
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
@@ -14,7 +14,6 @@
units/{civ}/champion_infantry
- units/{civ}/champion_cavalry
units/{civ}/champion_elephant
units/{civ}/hero_nastasen
units/{civ}/hero_amanirenas
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
@@ -15,7 +15,6 @@
units/{civ}/champion_infantry_a
units/{civ}/champion_infantry_swordsman
- units/{civ}/champion_cavalry
units/{civ}/hero_philip
units/{civ}/hero_alexander
units/{civ}/hero_demetrius
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
@@ -8,7 +8,6 @@
units/{civ}/champion_infantry
units/{civ}/champion_maiden
- units/{civ}/champion_chariot
units/{civ}/hero_chanakya
units/{civ}/hero_chandragupta
units/{civ}/hero_ashoka
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
@@ -3,25 +3,7 @@
pers
Padgan
- Train Infantry.
- structures/pers_barracks.png
-
-
- -units/{civ}/cavalry_axeman_b
- -units/{civ}/cavalry_swordsman_b
- -units/{civ}/cavalry_spearman_b
- -units/{civ}/cavalry_javelineer_b
- -units/{civ}/cavalry_archer_b
- -units/{civ}/champion_cavalry_barracks
- -units/{civ}/champion_chariot_barracks
-
-
- persians/training_levy_infantry
- persians/training_conscription_infantry
- -training_conscription
-
-
structures/persians/barracks.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
@@ -5,11 +5,6 @@
Didā
Research technologies. Garrison Soldiers for additional arrows.
-
-
- units/{civ}/champion_chariot
-
-
structures/persians/fortress.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
@@ -15,7 +15,6 @@
units/{civ}/champion_infantry_pikeman
- units/{civ}/champion_cavalry
units/{civ}/champion_elephant
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
@@ -7,7 +7,6 @@
units/{civ}/champion_infantry
- units/{civ}/champion_cavalry
units/{civ}/hero_marcellus
units/{civ}/hero_maximus
units/{civ}/hero_scipio
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
@@ -15,14 +15,11 @@
units/{civ}/champion_infantry_pikeman
- units/{civ}/champion_chariot
units/{civ}/champion_infantry_swordsman
- units/{civ}/champion_cavalry
units/{civ}/champion_elephant
successors/pair_unlock_champions
- successors/special_war_horses
successors/special_parade_of_daphne
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -104,6 +104,7 @@
phase_city_{civ}
unlock_spies
spy_counter
+ archery_tradition
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -25,9 +25,9 @@
Barracks
template_structure_military_barracks
- Train Citizen Soldiers and research technologies.
+ Train Infantry and research Infantry technologies.
Village Barracks
- structures/barracks.png
+ structures/pers_barracks.png
phase_village
@@ -47,23 +47,16 @@
units/{civ}/infantry_javelineer_b
units/{civ}/infantry_slinger_b
units/{civ}/infantry_archer_b
- units/{civ}/cavalry_axeman_b
- units/{civ}/cavalry_swordsman_b
- units/{civ}/cavalry_spearman_b
- units/{civ}/cavalry_javelineer_b
- units/{civ}/cavalry_archer_b
units/{civ}/champion_infantry_barracks
units/{civ}/champion_infantry_swordsman_barracks
units/{civ}/champion_maiden_barracks
- units/{civ}/champion_cavalry_barracks
- units/{civ}/champion_chariot_barracks
- units/{civ}/war_dog
heal_barracks
+ persians/training_levy_infantry
+ persians/training_conscription_infantry
training_conscription
unlock_champion_units
- archery_tradition
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
@@ -39,11 +39,6 @@
units/{civ}/infantry_slinger_b
units/{civ}/infantry_archer_b
-
- heal_barracks
- training_conscription
- archery_tradition
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -43,9 +43,10 @@
units/{civ}/cavalry_javelineer_b
units/{civ}/cavalry_archer_b
units/{civ}/champion_cavalry
+ units/{civ}_champion_chariot
+ units/{civ}_war_dog
- heal_barracks
cavalry_movement_speed
persians/training_levy_cavalry
persians/training_conscription_cavalry
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -35,7 +35,6 @@
gather_animals_stockbreeding
- cavalry_movement_speed
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -29,6 +29,7 @@
structures/{civ}/corral
structures/{civ}/dock
structures/{civ}/barracks
+ structures/{civ}/stable
structures/{civ}/arsenal
structures/{civ}/forge
structures/{civ}/temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -33,6 +33,7 @@
structures/{civ}/corral
structures/{civ}/dock
structures/{civ}/barracks
+ structures/{civ}/stable
structures/{civ}/arsenal
structures/{civ}/forge
structures/{civ}/temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -13,6 +13,7 @@
structures/{civ}/corral
structures/{civ}/dock
structures/{civ}/barracks
+ structures/{civ}/stable
structures/{civ}/arsenal
structures/{civ}/forge
structures/{civ}/temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml
@@ -1,6 +0,0 @@
-
-
-
- unlock_champion_units
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml
@@ -1,6 +0,0 @@
-
-
-
- unlock_champion_units
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml
@@ -1,6 +0,0 @@
-
-
-
- unlock_champion_units
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml
@@ -1,6 +0,0 @@
-
-
-
- unlock_champion_units
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
@@ -2,7 +2,6 @@
- structures/pers/stable
structures/pers/apadana
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
@@ -2,7 +2,6 @@
- structures/pers/stable
structures/pers/apadana
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
@@ -2,7 +2,6 @@
- structures/pers/stable
structures/pers/apadana
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
@@ -2,7 +2,6 @@
- structures/pers/stable
structures/pers/apadana
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml
@@ -1,6 +0,0 @@
-
-
-
- unlock_champion_units
-
-