Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackManager.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackManager.js +++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackManager.js @@ -151,7 +151,7 @@ } } - let bombers = gameState.updatingCollection("bombers", API3.Filters.byClassesOr(["BoltShooter", "Catapult"]), gameState.getOwnUnits()); + let bombers = gameState.updatingCollection("bombers", API3.Filters.byClassesOr(["BoltShooter", "StoneThrower"]), gameState.getOwnUnits()); for (let ent of bombers.values()) { if (!ent.position() || !ent.isIdle() || !ent.attackRange("Ranged")) Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/defenseManager.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/ai/petra/defenseManager.js +++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/defenseManager.js @@ -428,7 +428,7 @@ return; if (ent.hasClass("Support") || ent.attackTypes() === undefined) return; - if (ent.hasClass("Catapult")) + if (ent.hasClass("StoneThrower")) return; if (ent.hasClass("FishingBoat") || ent.hasClass("Trader")) return; @@ -649,7 +649,7 @@ continue; } - // try to garrison any attacked support unit if low healthlevel + // Try to garrison any attacked support unit if low health. if (target.hasClass("Support") && target.healthLevel() < this.Config.garrisonHealthLevel.medium && !target.getMetadata(PlayerID, "transport") && plan != -2 && plan != -3) { @@ -657,8 +657,8 @@ continue; } - // try to garrison any attacked catapult - if (target.hasClass("Catapult") && + // Try to garrison any attacked stone thrower. + if (target.hasClass("StoneThrower") && !target.getMetadata(PlayerID, "transport") && plan != -2 && plan != -3) { this.garrisonSiegeUnit(gameState, target); @@ -673,7 +673,7 @@ if (target.hasClass("Unit") && attacker.hasClass("Unit")) { - // Consider if we should retaliate or continue our task + // Consider whether we should retaliate or continue our task. if (target.hasClass("Support") || target.attackTypes() === undefined) continue; let orderData = target.unitAIOrderData(); Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js +++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js @@ -1,18 +1,18 @@ function Identity() {} Identity.prototype.Schema = - "Specifies various names and values associated with the unit type, typically for GUI display to users." + + "Specifies various names and values associated with the entity, typically for GUI display to users." + "" + "athen" + "Athenian Hoplite" + "Hoplī́tēs Athēnaïkós" + "units/athen_infantry_spearman.png" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "" + "" + @@ -24,11 +24,11 @@ "" + "" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "" + "" + @@ -57,7 +57,7 @@ "" + "" + "" + - "" + + "" + "" + "tokens" + "" + @@ -65,7 +65,7 @@ "" + "" + "" + - "" + + "" + "" + "tokens" + "" + @@ -73,7 +73,7 @@ "" + "" + "" + - "" + + "" + "" + "tokens" + "" + Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js +++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js @@ -32,7 +32,7 @@ " good as a cheap siege weapon.", "Rank": "Basic", "Classes": { "_string": "CitizenSoldier Human Organic" }, - "VisibleClasses": { "_string": "Javelin" }, + "VisibleClasses": { "_string": "Javelinist" }, "Formations": { "_string": "special/formations/skirmish" }, "Icon": "units/iber_infantry_javelinist.png", "RequiredTechnology": "phase_town" @@ -42,8 +42,8 @@ TS_ASSERT_EQUALS(cmpIdentity.GetLang(), "iberian"); TS_ASSERT_EQUALS(cmpIdentity.GetPhenotype(), "female"); TS_ASSERT_EQUALS(cmpIdentity.GetRank(), "Basic"); -TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelin", "Basic"]); -TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelin"]); +TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelinist", "Basic"]); +TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelinist"]); TS_ASSERT_EQUALS(cmpIdentity.HasClass("CitizenSoldier"), true); TS_ASSERT_EQUALS(cmpIdentity.HasClass("Female"), false); TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetFormationsList(), ["special/formations/skirmish"]); Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js +++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js @@ -514,25 +514,25 @@ "modifications": [{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 15, - "affects": "Spear Sword" + "affects": "Spearman Swordsman" }, { "value": "ResourceGatherer/Rates/food.meat", "multiply": 10 }], - "affects": ["Female", "CitizenSoldier Melee"] + "affects": ["FemaleCitizen", "CitizenSoldier Melee"] }; let techMods = { "ResourceGatherer/Rates/food.grain": [{ "affects": [ - ["Female", "Spear", "Sword"], - ["CitizenSoldier", "Melee", "Spear", "Sword"] + ["FemaleCitizen", "Spearman", "Swordsman"], + ["CitizenSoldier", "Melee", "Spearman", "Swordsman"] ], "multiply": 15 }], "ResourceGatherer/Rates/food.meat": [{ "affects": [ - ["Female"], + ["FemaleCitizen"], ["CitizenSoldier", "Melee"] ], "multiply": 10 @@ -544,37 +544,37 @@ "modifications": [{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 15, - "affects": "Spear" + "affects": "Spearman" }, { "value": "ResourceGatherer/Rates/food.grain", "multiply": 15, - "affects": "Sword" + "affects": "Swordsman" }, { "value": "ResourceGatherer/Rates/food.meat", "multiply": 10 }], - "affects": ["Female", "CitizenSoldier Melee"] + "affects": ["FemaleCitizen", "CitizenSoldier Melee"] }; techMods = { "ResourceGatherer/Rates/food.grain": [{ "affects": [ - ["Female", "Spear"], - ["CitizenSoldier", "Melee", "Spear"] + ["FemaleCitizen", "Spearman"], + ["CitizenSoldier", "Melee", "Spearman"] ], "multiply": 15 }, { "affects": [ - ["Female", "Sword"], - ["CitizenSoldier", "Melee", "Sword"] + ["FemaleCitizen", "Swordsman"], + ["CitizenSoldier", "Melee", "Swordsman"] ], "multiply": 15 }], "ResourceGatherer/Rates/food.meat": [{ "affects": [ - ["Female"], + ["FemaleCitizen"], ["CitizenSoldier", "Melee"] ], "multiply": 10 Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json @@ -1,6 +1,6 @@ { "type": "global", - "affects": ["Citizen Javelin"], + "affects": ["Citizen Javelinist"], "affectedPlayers": ["ExclusiveMutualAlly"], "modifications": [ { "value": "Cost/Resources/food", "multiply": 0.8 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json @@ -1,6 +1,6 @@ { "type": "global", - "affects": ["Citizen Infantry Spear"], + "affects": ["Citizen Infantry Spearman"], "affectedPlayers": ["ExclusiveMutualAlly"], "modifications": [ { "value": "Health/Max", "multiply": 1.10 } Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json @@ -1,6 +1,6 @@ { "type": "global", - "affects": ["Javelin"], + "affects": ["Javelinist"], "modifications": [ { "value": "Attack/Ranged/MaxRange", "multiply": 1.2 } ], Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json @@ -1,6 +1,6 @@ { "type": "global", - "affects": ["Citizen Infantry Spear"], + "affects": ["Citizen Infantry Spearman"], "modifications": [ { "value": "Cost/Resources/food", "multiply": 0.9 }, { "value": "Cost/Resources/wood", "multiply": 0.9 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json @@ -1,6 +1,6 @@ { "type": "global", - "affects": ["Champion Spear Infantry"], + "affects": ["Champion Infantry Spearman"], "modifications": [ { "value": "Cost/Resources/food", "multiply": 0.95 }, { "value": "Cost/Resources/wood", "multiply": 0.95 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json @@ -1,6 +1,6 @@ { "type": "global", - "affects": ["Javelin Infantry"], + "affects": ["Infantry Javelinist"], "modifications": [ { "value": "UnitMotion/WalkSpeed", "multiply": 1.15 } ], Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json @@ -1,7 +1,7 @@ { "type": "range", "radius": 60, - "affects": ["Infantry Pike"], + "affects": ["Infantry Pikeman"], "modifications": [ { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 }, { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json @@ -1,7 +1,7 @@ { "type": "range", "radius": 60, - "affects": ["Pike"], + "affects": ["Pikeman"], "modifications": [ { "value": "Health/Max", "multiply": 1.40 } ], Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json @@ -1,7 +1,7 @@ { "type": "range", "radius": 60, - "affects": ["Javelin Infantry Citizen"], + "affects": ["Citizen Infantry Javelinist"], "modifications": [ { "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.25 }, { "value": "Armour/Pierce", "add": 1 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json @@ -1,7 +1,7 @@ { "type": "range", "radius": 30, - "affects": ["Spear"], + "affects": ["Spearman"], "modifications": [ { "value": "Attack/Melee/Damage/Hack", "multiply": 1.25 }, { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.25 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json @@ -18,6 +18,6 @@ "modifications": [ { "value": "Armour/Pierce", "add": 2 } ], - "affects": ["Infantry Spear"], + "affects": ["Infantry Spearman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json @@ -18,6 +18,6 @@ "modifications": [ { "value": "Armour/Pierce", "add": 1 } ], - "affects": ["Infantry Spear"], + "affects": ["Infantry Spearman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json @@ -18,6 +18,6 @@ "modifications": [ { "value": "Armour/Pierce", "add": 1 } ], - "affects": ["Infantry Spear"], + "affects": ["Infantry Spearman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json @@ -15,6 +15,6 @@ { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 }, { "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 } ], - "affects": ["Sword", "Maceman"], + "affects": ["Swordsman", "Maceman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json @@ -15,6 +15,6 @@ "modifications": [ { "value": "Attack/Melee/Damage/Hack", "add": 2 } ], - "affects": ["Infantry Spear"], + "affects": ["Infantry Spearman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json @@ -11,6 +11,6 @@ { "value": "Health/Max", "multiply": 1.25 }, { "value": "Cost/BuildTime", "multiply": 1.1 } ], - "affects": ["Spear Infantry"], + "affects": ["Infantry Spearman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json @@ -17,6 +17,6 @@ "modifications": [ { "value": "Attack/Damage/Melee/Hack", "add": 2 } ], - "affects": ["Spear"], + "affects": ["Spearman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json @@ -20,6 +20,6 @@ { "value": "Attack/Ranged/MaxRange", "add": 4 }, { "value": "Vision/Range", "add": 4 } ], - "affects": ["Javelin"], + "affects": ["Javelinist"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml @@ -39,8 +39,8 @@ gaia + Unit Organic ConquestCritical Unit - Unit ConquestCritical special/formations/null special/formations/box Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml @@ -11,14 +11,14 @@ - -ConquestCritical + -Organic -ConquestCritical + Relic Catafalque units/catafalque.png template_unit_catafalque A catafalque that holds the remains of a great leader. true - Relic Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml @@ -36,8 +36,8 @@ 160 - CitizenSoldier Human Organic - Cavalry Citizen Soldier + Human CitizenSoldier + Citizen Soldier Cavalry Cavalry Basic Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml @@ -22,7 +22,7 @@ - Spear + Spearman Cavalry Spearman Counters: 1.5x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml @@ -21,7 +21,7 @@ - Sword + Swordsman Cavalry Swordsman Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml @@ -25,8 +25,8 @@ 100 - Ranged Cavalry Ranged + Ranged Cavalry special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml @@ -23,7 +23,7 @@ - Javelin + Javelinist Cavalry Skirmisher Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml @@ -9,9 +9,9 @@ + Human + Soldier Champion Champion Unit - Organic Human - Champion Soldier phase_city Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml @@ -23,8 +23,8 @@ 240 - Champion Cavalry Cavalry + Champion Cavalry special/formations/wedge Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml @@ -28,7 +28,7 @@ Ranged Archer - Champion Cavalry Archer. + Champion Cavalry Archer special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml @@ -27,7 +27,7 @@ - Ranged Javelin + Ranged Javelinist Champion Cavalry Skirmisher special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml @@ -32,7 +32,7 @@ 300 - Melee Spear + Melee Spearman Champion Cavalry Spearman Counters: 1.5x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml @@ -27,7 +27,7 @@ 300 - Melee Sword + Melee Swordsman Champion Cavalry Swordsman Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml @@ -23,8 +23,8 @@ 750 - War Elephant Elephant + War Elephant gaia/fauna_elephant.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml @@ -30,7 +30,7 @@ 120 - Ranged Javelin + Ranged Javelinist Champion Skirmisher special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml @@ -33,7 +33,7 @@ 200 - Melee Spear Pike + Melee Pikeman Champion Pikeman Counters: 3x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml @@ -32,8 +32,8 @@ 200 + Melee Spearman Champion Spearman - Melee Spear Counters: 3x vs. Cavalry. special/formations/testudo Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml @@ -27,7 +27,7 @@ 200 - Melee Sword + Melee Swordsman Champion Swordsman special/formations/testudo Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml @@ -36,7 +36,7 @@ 90 - Organic Human + Human Dog Melee War Dog Basic Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml @@ -9,7 +9,7 @@ - Animal Organic -ConquestCritical + -ConquestCritical Animal gaia/fauna_generic.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml @@ -28,9 +28,9 @@ 600 + Human + Soldier Hero Hero - Organic Human - Hero Soldier phase_city Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml @@ -21,8 +21,8 @@ 1500 - Hero Cavalry Cavalry + Hero Cavalry special/formations/wedge Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml @@ -29,11 +29,11 @@ 1500 + Ranged Javelinist special/formations/skirmish Hero Cavalry Skirmisher - Javelin Ranged 1.05 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml @@ -24,7 +24,7 @@ - Melee Spear + Melee Spearman Hero Cavalry Spearman Counters: 1.5x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml @@ -24,7 +24,7 @@ - Melee Sword + Melee Swordsman Hero Cavalry Swordsman Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml @@ -22,8 +22,8 @@ - Hero Archer Ranged Archer + Hero Archer special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml @@ -22,7 +22,7 @@ - Ranged Javelin + Ranged Javelinist Hero Skirmisher special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml @@ -24,7 +24,7 @@ - Melee Spear Pike + Melee Pikeman Hero Pikeman Counters: 3x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml @@ -24,7 +24,7 @@ - Melee Spear + Melee Spearman Hero Spearman Counters: 3x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml @@ -24,7 +24,7 @@ - Melee Sword + Melee Swordsman Hero Swordsman 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 @@ -61,9 +61,9 @@ 80 + Human CitizenSoldier + Citizen Worker Soldier Infantry Infantry - CitizenSoldier Human Organic - Citizen Infantry Soldier Worker Basic Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml @@ -26,7 +26,7 @@ - Spear Pike + Pikeman Pikeman Counters: 3x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml @@ -25,7 +25,7 @@ - Spear + Spearman Spearman Counters: 3x vs. Cavalry. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml @@ -21,7 +21,7 @@ - Sword + Swordsman Swordsman Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml @@ -30,8 +30,8 @@ 50 - Ranged Ranged + Ranged special/formations/skirmish Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml @@ -27,7 +27,7 @@ - Javelin + Javelinist Skirmisher Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml @@ -28,7 +28,7 @@ - Sling + Slinger Slinger Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml @@ -31,9 +31,10 @@ 200 + -Organic + Ship Ship - Ship 60 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml @@ -52,8 +52,8 @@ 800 + Ranged Warship Bireme Light Warship - Ranged Warship phase_town Garrison units for transport and to increase firepower. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml @@ -42,8 +42,8 @@ + Melee Warship Fireship Fire Ship - Fireship Melee Warship Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly. phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml @@ -32,7 +32,8 @@ true - FishingBoat -ConquestCritical + -ConquestCritical + FishingBoat Fishing Boat Fish the waters for food. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml @@ -25,11 +25,11 @@ -ConquestCritical + Trader Bribable Merchantman phase_town Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures. - Trader Bribable 25 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml @@ -35,7 +35,7 @@ 1 10 1 - Catapult + StoneThrower 3 @@ -63,10 +63,10 @@ 2000 + Ranged Warship Quinquereme Heavy Warship - Garrison units for transport and to increase firepower. - Ranged Warship phase_city + Garrison units for transport and to increase firepower. 150 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml @@ -52,8 +52,8 @@ 1400 + Ranged Warship Trireme Medium Warship - Ranged Warship phase_town Garrison units for transport and to increase firepower. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml @@ -22,6 +22,7 @@ true + -Organic Siege Siege phase_city Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml @@ -50,8 +50,8 @@ 200 + Ranged BoltShooter Bolt Shooter - BoltShooter Ranged 200 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml @@ -33,8 +33,8 @@ 400 - Battering Ram Melee Ram + Battering Ram Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml @@ -51,8 +51,8 @@ 250 + Ranged StoneThrower Siege Catapult - Catapult Ranged 300 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml @@ -56,8 +56,8 @@ 500 + Ranged SiegeTower Siege Tower - SiegeTower Ranged Garrison units for transport and to increase firepower. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml @@ -9,9 +9,9 @@ 8 - Support Human Organic Support + Support 10 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 @@ -47,10 +47,10 @@ 25 - Female Citizen - female FemaleCitizen Citizen Worker + Female Citizen + female Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml @@ -22,11 +22,11 @@ -ConquestCritical + Healer Healer Basic phase_town Heal units. - Healer 150 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_wallset.xml @@ -6,11 +6,11 @@ gaia - structures/wall.png StoneWall City Wall - Wall off your town for a stout defense. + structures/wall.png phase_town + Wall off your town for a stout defense. true Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml @@ -16,11 +16,11 @@ athen + Mercenary greek units/athen_infantry_javelinist_b Thracian Peltast Peltastḗs Thrâx - Mercenary units/hele_infantry_javelinist.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml @@ -16,9 +16,9 @@ athen + Mercenary greek units/athen_infantry_marine_archer_b - Mercenary Cretan Mercenary Archer Toxótēs Krētikós units/hele_infantry_archer.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml @@ -9,12 +9,12 @@ cart Italian + Mercenary Italic Cavalry units/cart_cavalry_spearman.png phase_town units/cart_cavalry_spearman_ital_b Ḥayyāl Romaḥ Raḫūv - Mercenary units/cart_cavalry_spearman_ital_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml @@ -9,12 +9,12 @@ cart Celt + Mercenary Gallic Mercenary Cavalry units/cart_cavalry_swordsman_2.png phase_town units/cart_cavalry_swordsman_gaul_b Ḥayyāl Ḥerev Raḫūv - Mercenary units/cart_cavalry_swordsman_gaul_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml @@ -9,12 +9,12 @@ cart Iberian + Mercenary Iberian Heavy Cavalry units/cart_cavalry_swordsman.png phase_town units/cart_cavalry_swordsman_iber_b Ḥayyāl Ḥerev Raḫūv - Mercenary units/cart_cavalry_swordsman_iber_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml @@ -17,12 +17,12 @@ cart Iberian + Mercenary Iberian Mercenary Skirmisher units/cart_infantry_javelinist.png phase_town units/cart_infantry_javelinist_iber_b Sǝḫīr Kidōn - Mercenary units/cart_infantry_javelinist_iber_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml @@ -17,12 +17,12 @@ cart Iberian + Mercenary Balearic Slinger units/cart_infantry_slinger.png phase_town units/cart_infantry_slinger_iber_b Qallāʿ Ibušimi - Mercenary units/cart_infantry_slinger_iber_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml @@ -17,12 +17,12 @@ cart Celt + Mercenary Gallic Mercenary Swordsman units/cart_infantry_swordsman.png phase_town units/cart_infantry_swordsman_gaul_b Seḫīr Ḥerev - Mercenary units/cart_infantry_swordsman_gaul_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml @@ -17,12 +17,12 @@ cart Italian + Mercenary Samnite Swordsman units/cart_infantry_swordsman.png phase_town units/cart_infantry_swordsman_ital_b Seḫīr Romaḥ - Mercenary units/cart_infantry_swordsman_ital_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml @@ -8,12 +8,12 @@ kush + Camel Mercenary units/kush_cavalry_javelinist_merc_b Blemmye Desert Raider nhw Bulahau gml units/kush_merc_camelry.png phase_town - Camel Mercenary units/kush_cavalry_javelinist_merc_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml @@ -2,9 +2,9 @@ kush + AmunGuard Napatan Temple Guard rs ‘Imn - AmunGuard units/kush_champion_amun.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml @@ -20,11 +20,11 @@ kush + ApedemakGuard + -Swordsman Axeman Meroitic Temple Guard rs ‘Iprmk Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes. - Axe - ApedemakGuard units/kush_champion_apedemak.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml @@ -28,12 +28,12 @@ kush + -Swordsman Clubman Mercenary units/kush_infantry_clubman_b Nuba Clubman nhw Noba units/kush_infantry_clubman.png phase_town - Mercenary units/kush_infantry_clubman_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml @@ -17,12 +17,12 @@ kush + Mercenary units/kush_infantry_javelinist_merc_b Nuba Skirmisher nhw ‘h3w Noba units/kush_infantry_merc_javelinist.png phase_town - Mercenary units/kush_infantry_javelinist_merc_a Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml @@ -8,9 +8,9 @@ kush + KushTrireme Ptolemaic Mercenary Trireme shry ‘3 - KushTrireme units/ptol_ship_trireme.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml @@ -8,11 +8,11 @@ mace + Mercenary greek units/mace_cavalry_javelinist_b Odrysian Skirmish Cavalry Hippakontistḕs Odrysós - Mercenary units/mace_cavalry_javelinist.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml @@ -19,6 +19,7 @@ mace + -Archer Crossbowman greek Champion Crossbowman Gastraphetophoros Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml @@ -15,11 +15,11 @@ mace + Mercenary greek units/mace_infantry_archer_b Cretan Mercenary Archer Toxótēs Krētikós - Mercenary units/hele_infantry_archer.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml @@ -15,11 +15,11 @@ mace + Mercenary greek units/mace_infantry_slinger_b Rhodian Slinger Sphendonḗtēs Rhódios - Mercenary units/mace_infantry_slinger.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml @@ -31,12 +31,12 @@ maur + -Cavalry Elephant Elephant Archer units/maur_cavalry_archer.png phase_town units/maur_elephant_archer_b Vachii Gaja - Elephant -Cavalry 260 Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml @@ -9,10 +9,10 @@ maur - Ashoka the Great - Aśoka Devānāmpriya Ashoka Chariot + Ashoka the Great + Aśoka Devānāmpriya units/maur_hero_ashoka.png Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime. Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml @@ -16,7 +16,6 @@ maur Yudhpot - Melee units/maur_ship_trireme.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml @@ -8,10 +8,10 @@ + Mercenary greek Thracian Black Cloak Rhomphaiaphoros - Mercenary units/sele_infantry_swordsman.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml @@ -18,12 +18,12 @@ + Mercenary greek Armored Swordsman Thōrakitēs units/mace_thorakites.png phase_city - Mercenary units/hellenes/infantry_swordsman_c_thorakites.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml @@ -7,12 +7,12 @@ + Mercenary greek Heavy Skirmisher Thyreophóros units/mace_thureophoros.png phase_city - Mercenary units/hellenes/infantry_javelinist_c_thureophoros.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml @@ -6,8 +6,8 @@ pers - persian Chariot + persian units/pers_cavalry_archer_b Babylonian Scythed Chariot Raθa Bābiruviya Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml @@ -2,10 +2,10 @@ pers + Immortal persian Persian Immortal Anušiya - Immortal units/pers_champion_infantry.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml @@ -9,8 +9,8 @@ pers - persian Chariot + persian Darius I the Great Dārayavahuš units/pers_hero_darius.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml @@ -9,8 +9,8 @@ pers - persian Chariot + persian Xerxes I Xšayāršā units/pers_hero_xerxes.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml @@ -8,11 +8,11 @@ pers + Mercenary persian Cardaces Hoplite Hoplites Kardakes units/pers_kardakes.png - Mercenary units/persians/infantry_spearman_c3.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml @@ -8,11 +8,11 @@ pers + Mercenary persian Cardaces Skirmisher Peltastes Kardakes units/pers_kardakes_skirmisher.png - Mercenary units/persians/infantry_javelinist_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml @@ -8,10 +8,10 @@ ptol + Mercenary units/ptol_cavalry_javelinist_merc_b Tarantine Settler Cavalry Hippeús Tarantînos - Mercenary units/mace_cavalry_javelinist.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml @@ -8,10 +8,10 @@ ptol + Mercenary units/ptol_cavalry_spearman_merc_b Macedonian Settler Cavalry Hippeús Makedonikós - Mercenary units/ptol_cavalry_spearman.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml @@ -17,9 +17,9 @@ ptol + Juggernaut Juggernaut Tessarakonterēs - Juggernaut units/rome_ship_quinquereme.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml @@ -5,9 +5,9 @@ ptol + PtolemyIV Ptolemy IV "Father Loving" Ptolemaios D' Philopator - PtolemyIV units/mace_hero_philip.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml @@ -15,10 +15,10 @@ ptol + Mercenary units/ptol_infantry_javelinist_b Mercenary Thureos Skirmisher Thureophóros Akrobolistḗs - Mercenary units/ptol_infantry_javelinist_merc.png phase_village Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml @@ -15,10 +15,10 @@ ptol + Mercenary units/ptol_infantry_spearman_merc_b Mercenary Thureos Spearman Thureophóros Misthophóros - Mercenary units/ptol_infantry_spearman_2.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml @@ -15,11 +15,11 @@ ptol + Celt + Mercenary units/ptol_infantry_swordsman_merc_b Gallic Mercenary Swordsman Gallikós Mistophorós - Celt - Mercenary units/cart_infantry_swordsman.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml @@ -1,9 +1,9 @@ + Mercenary Samnite Skirmisher Samnite Skirmisher - Mercenary units/samnite_skirmisher.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml @@ -1,9 +1,9 @@ + Mercenary Samnite Spearman Samnite Spearman - Mercenary units/samnite_spearman.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml @@ -1,9 +1,9 @@ + Mercenary Samnite Swordsman Samnite Swordsman - Mercenary units/samnite_swordsman.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml @@ -8,11 +8,11 @@ sele + Mercenary greek units/sele_cavalry_spearman_merc_b Companion Cavalry Hippos Hetairike - Mercenary phase_town units/mace_cavalry_spearman.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml @@ -6,8 +6,8 @@ sele - greek Chariot + greek Scythed Chariot Drepanèphoros units/sele_champion_chariot.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml @@ -14,11 +14,11 @@ sele + Mercenary greek units/sele_infantry_archer_merc_b Syrian Archer Toxótēs Syrías - Mercenary units/hele_infantry_archer.png phase_town Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml @@ -14,12 +14,12 @@ sele + Mercenary greek units/sele_infantry_swordsman_merc_b Thracian Mercenary Swordsman Rhomphaiaphoros Thrakikós units/sele_infantry_swordsman.png - Mercenary phase_town