Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json (nonexistent)
@@ -1,15 +0,0 @@
-{
- "genericName": "Conscription",
- "description": "Significantly increase training speed of soldiers at the Barracks by training them in large batches or battalions.",
- "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
- "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "pers" }] },
- "requirementsTooltip": "Unlocked in City Phase.",
- "icon": "fist_spear.png",
- "researchTime": 40,
- "tooltip": "Faster batch training speed for the Barracks.",
- "modifications": [
- { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
- ],
- "affects": ["Barracks"],
- "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_conscription.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json (nonexistent)
@@ -1,16 +0,0 @@
-{
- "genericName": "Cavalry Conscription",
- "supersedes": "persians/training_levy_cavalry",
- "description": "Significantly increase training speed of cavalry at the stables by training them in large batches or battalions.",
- "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
- "requirements": { "all": [{ "tech": "phase_city" }, { "civ": "pers" }] },
- "requirementsTooltip": "Unlocked in City Phase.",
- "icon": "horse_rider.png",
- "researchTime": 40,
- "tooltip": "Faster batch training speed for the Stables.",
- "modifications": [
- { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
- ],
- "affects": ["Stable"],
- "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json (nonexistent)
@@ -1,16 +0,0 @@
-{
- "genericName": "Infantry Conscription",
- "supersedes": "persians/training_levy_infantry",
- "description": "Significantly increase training speed of soldiers at the Barracks by training them in large batches or battalions.",
- "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
- "requirements": { "all": [{ "tech": "phase_city" }, { "civ": "pers" }] },
- "requirementsTooltip": "Unlocked in City Phase.",
- "icon": "fist_spear.png",
- "researchTime": 40,
- "tooltip": "Faster batch training speed for the Barracks.",
- "modifications": [
- { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
- ],
- "affects": ["Barracks"],
- "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_infantry.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json (nonexistent)
@@ -1,16 +0,0 @@
-{
- "genericName": "Levy Cavalry",
- "description": "Calling up cavalry levies in time of war helps bolster the ranks of a king's army.",
- "cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
- "requirements": { "all": [{ "tech": "phase_town" }, { "civ": "pers" }] },
- "requirementsTooltip": "Unlocked in Town Phase.",
- "icon": "horse_trainer.png",
- "researchTime": 40,
- "tooltip": "All cavalry -20% train time, but also -5% health. Unlocks Cavalry Conscription.",
- "modifications": [
- { "value": "Cost/BuildTime", "multiply": 0.8 },
- { "value": "Health/Max", "multiply": 0.95 }
- ],
- "affects": ["Cavalry"],
- "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_cavalry.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json (nonexistent)
@@ -1,16 +0,0 @@
-{
- "genericName": "Levy Infantry",
- "description": "Calling up infantry levies in time of war helps bolster the ranks of a king's army.",
- "cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
- "requirements": { "all": [{ "tech": "phase_town" }, { "civ": "pers" }] },
- "requirementsTooltip": "Unlocked in Town Phase.",
- "icon": "clenched_fist.png",
- "researchTime": 40,
- "tooltip": "All infantry -20% train time, but also -5% health. Unlocks Infantry Conscription.",
- "modifications": [
- { "value": "Cost/BuildTime", "multiply": 0.8 },
- { "value": "Health/Max", "multiply": 0.95 }
- ],
- "affects": ["Infantry"],
- "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_levy_infantry.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json (nonexistent)
@@ -1,18 +0,0 @@
-{
- "genericName": "Nisean War Horses",
- "specificName": {
- "sele": "Nisioi"
- },
- "description": "The now-extinct Nisian breed of horse was one of the largest and robust horses of ancient times. They were highly sought after by the Seleucids and Persians as both rider and mount gained heavier armor as time progressed.",
- "cost": { "food": 200, "wood": 0, "stone": 0, "metal": 200 },
- "requirements": { "all": [{ "tech": "phase_city" }, { "any": [{ "civ": "sele" }, { "civ": "pers" }] }] },
- "requirementsTooltip": "Unlocked in City Phase.",
- "icon": "nisean_war_horses.png",
- "researchTime": 60,
- "tooltip": "All cavalry +20% health.",
- "modifications": [
- { "value": "Health/Max", "multiply": 1.2 }
- ],
- "affects": ["Cavalry"],
- "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/special_war_horses.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json (nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json (revision 24548)
@@ -0,0 +1,15 @@
+{
+ "genericName": "Conscription",
+ "description": "Significantly increase training speed of infantry by training them in large batches or companies.",
+ "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
+ "requirements": { "tech": "phase_city" },
+ "requirementsTooltip": "Unlocked in City Phase.",
+ "icon": "fist_spear_fire.png",
+ "researchTime": 40,
+ "tooltip": "Barracks −10% batch training time.",
+ "modifications": [
+ { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
+ ],
+ "affects": ["Barracks"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/barracks_batch_training.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json (nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json (revision 24548)
@@ -0,0 +1,20 @@
+{
+ "genericName": "Levy Cavalry",
+ "description": "Calling up cavalry levies in time of war helps bolster the ranks of a king's army.",
+ "cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
+ "requirements": {
+ "all": [
+ { "tech": "phase_town" },
+ { "civ": "pers" }
+ ]
+ },
+ "requirementsTooltip": "Unlocked in Town Phase.",
+ "icon": "horseshoe_silver.png",
+ "researchTime": 40,
+ "tooltip": "Cavalry −10% training time.",
+ "modifications": [
+ { "value": "Cost/BuildTime", "multiply": 0.9 }
+ ],
+ "affects": ["Cavalry"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_cost_time.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json (nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json (revision 24548)
@@ -0,0 +1,15 @@
+{
+ "genericName": "Horse Breeding",
+ "description": "Selectively breed better war horses.",
+ "cost": { "food": 400, "wood": 0, "stone": 0, "metal": 150 },
+ "requirements": { "tech": "phase_town" },
+ "requirementsTooltip": "Unlocked in Town Phase.",
+ "icon": "horse_trainer.png",
+ "researchTime": 50,
+ "tooltip": "Cavalry +10% health.",
+ "modifications": [
+ { "value": "Health/Max", "multiply": 1.1 }
+ ],
+ "affects": ["Cavalry"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/cavalry_health.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json (nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json (revision 24548)
@@ -0,0 +1,20 @@
+{
+ "genericName": "Levy Infantry",
+ "description": "Calling up infantry levies in time of war helps bolster the ranks of a king's army.",
+ "cost": { "food": 100, "wood": 0, "stone": 0, "metal": 0 },
+ "requirements": {
+ "all": [
+ { "tech": "phase_town" },
+ { "civ": "pers" }
+ ]
+ },
+ "requirementsTooltip": "Unlocked in Town Phase.",
+ "icon": "fist_spear.png",
+ "researchTime": 40,
+ "tooltip": "Infantry −10% training time.",
+ "modifications": [
+ { "value": "Cost/BuildTime", "multiply": 0.9 }
+ ],
+ "affects": ["Infantry"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/infantry_cost_time.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json (nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json (revision 24548)
@@ -0,0 +1,28 @@
+{
+ "genericName": "Nisean War Horses",
+ "specificName": {
+ "sele": "Nisioi"
+ },
+ "description": "The now-extinct Nisian breed of horse was one of the largest and robust horses of ancient times. They were highly sought after by the Seleucids and Persians as both rider and mount gained heavier armor as time progressed.",
+ "cost": { "food": 200, "wood": 0, "stone": 0, "metal": 200 },
+ "requirements": {
+ "all": [
+ { "tech": "phase_city" },
+ {
+ "any": [
+ { "civ": "sele" },
+ { "civ": "pers" }
+ ]
+ }
+ ]
+ },
+ "requirementsTooltip": "Unlocked in City Phase.",
+ "icon": "nisean_war_horses.png",
+ "researchTime": 60,
+ "tooltip": "Cavalry +20% health.",
+ "modifications": [
+ { "value": "Health/Max", "multiply": 1.2 }
+ ],
+ "affects": ["Cavalry"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/nisean_horses.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json (nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json (revision 24548)
@@ -0,0 +1,15 @@
+{
+ "genericName": "Conscription",
+ "description": "Significantly increase training speed of cavalry by training them in large batches or squadrons.",
+ "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
+ "requirements": { "tech": "phase_city" },
+ "requirementsTooltip": "Unlocked in City Phase.",
+ "icon": "horseshoe_gold.png",
+ "researchTime": 40,
+ "tooltip": "Stables −10% batch training time.",
+ "modifications": [
+ { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
+ ],
+ "affects": ["Stable"],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/stable_batch_training.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
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 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml (revision 24548)
@@ -1,73 +1,72 @@
structures/barracks_xp_trickle
150
200
100
12.0
10
Infantry Cavalry
2000
decay|rubble/rubble_stone_4x4
Barracks
template_structure_military_barracks
Train Infantry and research Infantry technologies.
Village Barracks
structures/pers_barracks.png
phase_village
40
20
0.8
units/{civ}/infantry_spearman_b
units/{civ}/infantry_pikeman_b
units/{civ}/infantry_axeman_b
units/{civ}/infantry_swordsman_b
units/{civ}/infantry_javelineer_b
units/{civ}/infantry_slinger_b
units/{civ}/infantry_archer_b
units/{civ}/champion_infantry_barracks
units/{civ}/champion_infantry_swordsman_barracks
units/{civ}/champion_maiden_barracks
- persians/training_levy_infantry
- persians/training_conscription_infantry
- training_conscription
+ barracks_batch_training
+ infantry_cost_time
unlock_champion_units
interface/complete/building/complete_barracks.xml
32
structures/fndn_6x6.xml
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 (revision 24547)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml (revision 24548)
@@ -1,65 +1,66 @@
120
200
50
12.0
10
Cavalry
2000
decay|rubble/rubble_stone_5x5
Stable
template_structure_military_stable
Train Cavalry and research Cavalry technologies.
Village Stable
structures/pers_stable.png
phase_village
40
10
0.8
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
units/{civ}/champion_chariot
units/{civ}/war_dog
+ stable_batch_training
+ cavalry_cost_time
cavalry_movement_speed
- persians/training_levy_cavalry
- persians/training_conscription_cavalry
- successors/special_war_horses
+ cavalry_health
+ nisean_horses
interface/complete/building/complete_cavalry_stables.xml
32