diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json b/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json index 33ac5e749e..aa19894eb2 100644 --- a/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json +++ b/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json @@ -5,13 +5,13 @@ "iber": "Toledo Steel" }, "description": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.", - "cost": {"food": 0, "wood": 200, "stone": 0, "metal": 200}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 0, "wood": 200, "stone": 0, "metal": 200 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "any": [{ "civ": "iber" }, { "civ": "maur" }] }] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "metalworker.png", "researchTime": 60, "tooltip": "+2 attack for all sword units.", - "modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}], + "modifications": [{ "value": "Attack/Melee/Hack", "add": 2.0 }], "affects": ["Sword"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json b/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json index 5ee4085b37..f16177ba59 100644 --- a/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json +++ b/binaries/data/mods/public/simulation/data/technologies/pair_walls_01.json @@ -1,5 +1,6 @@ { "genericName": "Walls build time vs. Health", "top": "buildtime_walls_rubble", - "bottom": "health_walls_geometric_masonry" + "bottom": "health_walls_geometric_masonry", + "requirements": { "notciv": "iber" } } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city.json b/binaries/data/mods/public/simulation/data/technologies/phase_city.json index 86309a74fe..8d5569c1d4 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city.json @@ -5,17 +5,17 @@ "spart": "Megalópolis" }, "description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology.", - "cost": {"food": 0, "wood": 0, "stone": 750, "metal": 750}, - "requirements": { "class": "Town", "number": 4 }, + "cost": { "food": 0, "wood": 0, "stone": 750, "metal": 750 }, + "requirements": { "all": [{ "class": "Town", "number": 4 }, { "notciv": "athen" }] }, "requirementsTooltip": "Requires 4 new Town Phase structures (except Walls and Civic Centers).", "supersedes": "phase_town", "icon": "city_phase.png", "researchTime": 60, "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by another +50%", "modifications": [ - {"value": "TerritoryInfluence/Radius", "multiply": 1.50, "affects": "CivCentre"}, - {"value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier"}, - {"value": "Capturable/GarrisonRegenRate", "add": 1.5, "affects": "Structure"} + { "value": "TerritoryInfluence/Radius", "multiply": 1.50, "affects": "CivCentre" }, + { "value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier" }, + { "value": "Capturable/GarrisonRegenRate", "add": 1.5, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json index 733ac4f664..0f2f3b48ea 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json @@ -4,8 +4,8 @@ "athen": "Megalópolis" }, "description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology. This is the Athenian city phase, where metal gathering rates are boosted because of the 'Silver Owls' bonus.", - "cost": {"food": 0, "wood": 0, "stone": 750, "metal": 750}, - "requirements": { "class": "Town", "number": 4 }, + "cost": { "food": 0, "wood": 0, "stone": 750, "metal": 750 }, + "requirements": { "all": [{ "class": "Town", "number": 4 }, { "civ": "athen" }] }, "requirementsTooltip": "Requires 4 new Town Phase structures (except Walls and Civic Centers).", "supersedes": "phase_town_athen", "replaces": ["phase_city"], @@ -13,10 +13,10 @@ "researchTime": 60, "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by another +50%. Silver Owls civ bonus grants an extra +10% metal gather rate to all workers.", "modifications": [ - {"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.1, "affects": "Worker"}, - {"value": "TerritoryInfluence/Radius", "multiply": 1.50, "affects": "CivCentre"}, - {"value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier"}, - {"value": "Capturable/GarrisonRegenRate", "add": 1.5, "affects": "Structure"} + { "value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.1, "affects": "Worker" }, + { "value": "TerritoryInfluence/Radius", "multiply": 1.50, "affects": "CivCentre" }, + { "value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier" }, + { "value": "Capturable/GarrisonRegenRate", "add": 1.5, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town.json b/binaries/data/mods/public/simulation/data/technologies/phase_town.json index 8b7f94daea..433c3837bb 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_town.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_town.json @@ -6,16 +6,16 @@ }, "description": "Advances from a small village to a bustling town, ready to expand rapidly.", "cost": { "food": 500, "wood": 500, "stone": 0, "metal": 0 }, - "requirements": { "class": "Village", "number": 5 }, + "requirements": { "all": [{ "class": "Village", "number": 5 }, { "notciv": "athen" }] }, "requirementsTooltip": "Requires 5 Village Phase structures (except Palisades and Farm Fields).", "supersedes": "phase_village", "icon": "town_phase.png", "researchTime": 30, "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by +30%", "modifications": [ - {"value": "TerritoryInfluence/Radius", "multiply": 1.30, "affects": "CivCentre"}, - {"value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier"}, - {"value": "Capturable/GarrisonRegenRate", "add": 2.0, "affects": "Structure"} + { "value": "TerritoryInfluence/Radius", "multiply": 1.30, "affects": "CivCentre" }, + { "value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier" }, + { "value": "Capturable/GarrisonRegenRate", "add": 2.0, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json b/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json index b17c0dd060..611659bc95 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json @@ -4,8 +4,8 @@ "athen": "Kōmópolis" }, "description": "Advances from a small village to a bustling town, ready to expand rapidly. This is the Athenian town phase, where metal gathering rates are boosted because of the 'Silver Owls' bonus.", - "cost": {"food": 500, "wood": 500, "stone": 0, "metal": 0}, - "requirements": { "class": "Village", "number": 5 }, + "cost": { "food": 500, "wood": 500, "stone": 0, "metal": 0 }, + "requirements": { "all": [{ "class": "Village", "number": 5 }, { "civ": "athen" }] }, "requirementsTooltip": "Requires 5 Village Phase structures (except Palisades and Farm Fields).", "supersedes": "phase_village", "replaces": ["phase_town"], @@ -13,10 +13,10 @@ "researchTime": 30, "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by +30%. 'Silver Owls' civ bonus grants an extra +10% metal gather rate to all workers.", "modifications": [ - {"value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.1, "affects": "Worker"}, - {"value": "TerritoryInfluence/Radius", "multiply": 1.30, "affects": "CivCentre"}, - {"value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier"}, - {"value": "Capturable/GarrisonRegenRate", "add": 2.0, "affects": "Structure"} + { "value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.1, "affects": "Worker" }, + { "value": "TerritoryInfluence/Radius", "multiply": 1.30, "affects": "CivCentre" }, + { "value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier" }, + { "value": "Capturable/GarrisonRegenRate", "add": 2.0, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_armor.json b/binaries/data/mods/public/simulation/data/technologies/siege_armor.json index 37d430ef35..712550f278 100644 --- a/binaries/data/mods/public/simulation/data/technologies/siege_armor.json +++ b/binaries/data/mods/public/simulation/data/technologies/siege_armor.json @@ -1,13 +1,13 @@ { "genericName": "Armor plating", "description": "Increased armor on siege weapons", - "cost": {"food": 0, "wood": 500, "stone": 0, "metal": 250}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 0, "wood": 500, "stone": 0, "metal": 250 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "maur" }] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "armor_plates_gold.png", "researchTime": 40, "tooltip": "All Siege weapons +2 Hack armor levels.", - "modifications": [{"value": "Armour/Hack", "add": 2.0}], + "modifications": [{ "value": "Armour/Hack", "add": 2.0 }], "affects": ["Siege"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_attack.json b/binaries/data/mods/public/simulation/data/technologies/siege_attack.json index 866127c905..df628b44fa 100644 --- a/binaries/data/mods/public/simulation/data/technologies/siege_attack.json +++ b/binaries/data/mods/public/simulation/data/technologies/siege_attack.json @@ -1,8 +1,8 @@ { "genericName": "Advanced Siege", "description": "Advanced technologies improve siege efficiency", - "cost": {"food": 0, "wood": 1000, "stone": 0, "metal": 500}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 0, "wood": 1000, "stone": 0, "metal": 500 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "maur" }] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "siege_ram.png", "researchTime": 40, diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json b/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json index 4ac9bc8ffc..3fb9046829 100644 --- a/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json +++ b/binaries/data/mods/public/simulation/data/technologies/siege_bolt_accuracy.json @@ -1,13 +1,13 @@ { "genericName": "Bolt Accuracy", "description": "Improvement to projectile accuracy", - "cost": {"food": 0, "wood": 250, "stone": 0, "metal": 250}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 0, "wood": 250, "stone": 0, "metal": 250 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "all": [{ "notciv": "brit"}, { "notciv": "gaul" }, { "notciv": "iber" }, { "notciv": "maur" }, { "notciv": "pers" }] } ]}, "requirementsTooltip": "Unlocked in City Phase.", "icon": "accuracy_bolt.png", "researchTime": 40, "tooltip": "Bolt shooter accuracy increased 25%.", - "modifications": [{"value": "Attack/Ranged/Spread", "multiply": 0.8}], + "modifications": [{ "value": "Attack/Ranged/Spread", "multiply": 0.8 }], "affects": ["Bolt Shooter"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json b/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json index f1e5013cf8..ccecbf117d 100644 --- a/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json +++ b/binaries/data/mods/public/simulation/data/technologies/siege_cost_metal.json @@ -1,13 +1,13 @@ { "genericName": "Metalworker", "description": "Siege weapons require less metal resource", - "cost": {"food": 500, "wood": 500, "stone": 250, "metal": 0}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 500, "wood": 500, "stone": 250, "metal": 0 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "maur" }] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "metalworker.png", "researchTime": 40, "tooltip": "Siege weapons cost 20% less metal", - "modifications": [{"value": "Cost/Resources/metal", "multiply": 0.8}], + "modifications": [{ "value": "Cost/Resources/metal", "multiply": 0.8 }], "affects": ["Siege"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json b/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json index ae53c740b2..8bb1a97790 100644 --- a/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json +++ b/binaries/data/mods/public/simulation/data/technologies/siege_cost_wood.json @@ -1,13 +1,13 @@ { "genericName": "Artillery Instructors", "description": "Siege weapons cost less wood", - "cost": {"food": 500, "wood": 0, "stone": 250, "metal": 500}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 500, "wood": 0, "stone": 250, "metal": 500 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "maur" }] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "anvil.png", "researchTime": 40, "tooltip": "Siege weapons cost 20% less wood", - "modifications": [{"value": "Cost/Resources/wood", "multiply": 0.8}], + "modifications": [{ "value": "Cost/Resources/wood", "multiply": 0.8 }], "affects": ["Siege"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/training_conscription.json b/binaries/data/mods/public/simulation/data/technologies/training_conscription.json index e1dba505e0..3528083aef 100644 --- a/binaries/data/mods/public/simulation/data/technologies/training_conscription.json +++ b/binaries/data/mods/public/simulation/data/technologies/training_conscription.json @@ -1,13 +1,13 @@ { "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": {"tech": "phase_city"}, + "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}], + "modifications": [{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }], "affects": ["Barracks"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json b/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json index 77e491b33d..aa9e93481f 100644 --- a/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json +++ b/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json @@ -1,13 +1,13 @@ { "genericName": "Naval Architects", "description": "Significantly increase build speed of batches of ships at the Dock.", - "cost": {"food": 200, "wood": 200, "stone": 0, "metal": 0}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "cart" }] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "calipers.png", "researchTime": 40, "tooltip": "Docks increased batch construction speed bonus.", - "modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}], + "modifications": [{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }], "affects": ["Dock"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json index 02f2626724..ca97ebab66 100644 --- a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json +++ b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json @@ -7,8 +7,8 @@ "rome": "Regio Cohors" }, "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}, - "requirements": {"tech": "phase_city"}, + "cost": { "food": 0, "wood": 0, "stone": 0, "metal": 1000 }, + "requirements": { "all": [{ "tech": "phase_city" }, { "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, diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml index 3e72c6a18b..146ff59726 100644 --- a/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml @@ -21,11 +21,6 @@ - - - -unlock_champion_units - - structures/athenians/barracks.xml structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml index 06422a408e..c5525d9aa0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml @@ -23,6 +23,9 @@ units/{civ}_champion_infantry_barracks units/{civ}_champion_cavalry_barracks + + unlock_champion_units + structures/britons/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml index 444c864c6b..83924fc280 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml @@ -22,11 +22,6 @@ - - - -unlock_champion_units - - structures/carthaginians/barracks.xml structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml index 79fe9f43d8..6372c692c3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml @@ -23,6 +23,9 @@ units/{civ}_champion_infantry_barracks units/{civ}_champion_cavalry_barracks + + unlock_champion_units + structures/celts/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml index cc1e80cb89..56df34faee 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml @@ -16,6 +16,9 @@ units/{civ}_champion_infantry_barracks units/{civ}_champion_cavalry_barracks + + unlock_champion_units + structures/iberians/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml index 90f2520905..3110d1faf5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml @@ -26,6 +26,9 @@ units/{civ}_champion_infantry_a_barracks units/{civ}_champion_cavalry_barracks + + unlock_champion_units + structures/macedonians/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml index 4ebb155ebb..206d6047c5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml @@ -19,6 +19,7 @@ mauryans/special_archery_tradition + unlock_champion_units diff --git a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml index 2e57ac809d..b139dc8f72 100644 --- a/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml +++ b/binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml @@ -45,7 +45,6 @@ units/ptol_cavalry_javelinist_merc_b - -unlock_champion_units upgrade_rank_advanced_infantry upgrade_rank_elite_infantry upgrade_rank_advanced_cavalry diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml index 49862a2335..865cba6ae3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml @@ -19,7 +19,6 @@ persians/training_conscription_infantry persians/special_archery_tradition -training_conscription - -unlock_champion_units diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml b/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml index faeac50a05..939f9fcf24 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml @@ -36,7 +36,6 @@ -training_conscription - -unlock_champion_units persians/training_levy_cavalry persians/training_conscription_cavalry successors/special_war_horses diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml index c64dd30a53..28dd8b505d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml @@ -20,11 +20,6 @@ - - - -unlock_champion_units - - structures/ptolemies/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml index ada3538d2e..24edd1fa1a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml @@ -47,7 +47,6 @@ units/ptol_cavalry_javelinist_merc_b - -unlock_champion_units upgrade_rank_advanced_infantry upgrade_rank_elite_infantry upgrade_rank_advanced_cavalry diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml index 7ecff91fa6..5516525af8 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml @@ -26,6 +26,9 @@ units/{civ}_champion_infantry_barracks units/{civ}_champion_cavalry_barracks + + unlock_champion_units + structures/romans/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml index 973e964d94..8b0339bde6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml @@ -17,6 +17,7 @@ siege_armor siege_cost_metal siege_cost_wood + siege_bolt_accuracy diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml index 9f9320a54a..242e50b001 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_barracks.xml @@ -20,11 +20,6 @@ - - - -unlock_champion_units - - structures/seleucids/barracks.xml structures/fndn_5x5.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml index d8a1e4a20b..bfadcdf965 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml @@ -27,6 +27,7 @@ siege_armor siege_cost_metal siege_cost_wood + siege_bolt_accuracy successors/special_war_horses successors/special_parade_of_daphne diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml index 151a496d55..032357467e 100644 --- a/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/structures/spart_barracks.xml @@ -25,9 +25,6 @@ units/{civ}_champion_infantry_sword - - -unlock_champion_units - structures/spartans/barracks.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml index 8e43bdf13f..c3c434f73b 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml @@ -45,8 +45,8 @@ 0.8 - units/{civ}_infantry_spearman_b - units/{civ}_infantry_pikeman_b + 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 @@ -59,7 +59,6 @@ heal_barracks training_conscription - unlock_champion_units