Index: ps/trunk/binaries/data/mods/public/gui/credits/texts/balancing.json =================================================================== --- ps/trunk/binaries/data/mods/public/gui/credits/texts/balancing.json +++ ps/trunk/binaries/data/mods/public/gui/credits/texts/balancing.json @@ -22,6 +22,7 @@ { "nick": "elexis", "name": "Alexander Heinsius" }, { "nick": "fatherbushido", "name": "Nicolas Tisserand" }, { "nick": "Feldfeld" }, + { "nick": "Freagarach" }, { "nick": "Grugnas", "name": "Giuseppe Tranchese" }, { "nick": "Hannibal_Barca", "name": "Clive Juhász S." }, { "nick": "historic_bruno", "name": "Ben Brian" }, 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 @@ -65,7 +65,7 @@ "" + "" + "" + - "" + + "" + "" + "tokens" + "" + Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json +++ ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json @@ -81,6 +81,7 @@ ], "SkirmishReplacements": { "skirmish/units/default_infantry_ranged_b": "units/kush/infantry_archer_b", + "skirmish/units/special_starting_unit": "units/kush/support_healer_b", "skirmish/structures/default_house_10": "structures/{civ}/house" }, "SelectableInGameSetup": true Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json @@ -2,7 +2,12 @@ "genericName": "Wooden Construction", "autoResearch": true, "description": "Celtic structures were mostly made of wood with rubble foundations.", - "requirements": { "any": [{ "civ": "brit" }, { "civ": "gaul" }] }, + "requirements": { + "any": [ + { "civ": "brit" }, + { "civ": "gaul" } + ] + }, "icon": "wooden_buildings.png", "tooltip": "Briton and Gaulish Structures −20% build time, −20% health, and −20% capture points.", "modifications": [ Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_ranged_experience.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_ranged_experience.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/soldier_ranged_experience.json @@ -1,5 +1,6 @@ { "autoResearch": true, + "icon": "arrow.png", "tooltip": "Ranged Soldiers +25% promotion experience.", "modifications": [ { "value": "Promotion/RequiredXp", "multiply": 1.25 } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json @@ -1,5 +1,6 @@ { "autoResearch": true, + "icon": "armor_elephant.png", "tooltip": "African Elephants −10% resource costs, training time, health, attack damage, and loot.", "modifications": [ { "value": "Attack/Melee/Damage/Hack", "multiply": 0.9 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json @@ -1,5 +1,6 @@ { "autoResearch": true, + "icon": "armor_elephant.png", "tooltip": "Indian Elephants +10% resource costs, training time, health, attack damage, and loot.", "modifications": [ { "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 }, Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json @@ -1,5 +1,6 @@ { "autoResearch": true, + "icon": "coins.png", "tooltip": "Non-Champion Mercenaries cost −25 food, +25 metal.", "modifications": [ { "value": "Cost/Resources/food", "add": -25 }, Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/fortress.xml @@ -7,7 +7,6 @@ athen Phrourion - Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml @@ -10,6 +10,7 @@ brit Dunon + Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/fortress.xml @@ -7,6 +7,7 @@ cart Ḥamet + Territory root. Train Champion Elephants and Heroes. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml @@ -3,6 +3,7 @@ gaul Dunon + Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows. 12 Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml @@ -12,6 +12,7 @@ iber Castro + Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows. 240 Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml @@ -0,0 +1,60 @@ + + + + structures/loyalty_regen + + + + 200 + + 250 + 500 + + + + + 8.0 + + + 10 + + + 2000 + + + Ishtar Gate of Babylon + Territory root. + structures/pers_gate.png + + + 50 + 100 + + + + + + + + + + + + + + interface/complete/building/complete_broch.xml + + + + true + 38 + 40000 + + + 40 + + + special/pers_ishtar_gate.xml + structures/fndn_9x4.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml @@ -7,6 +7,7 @@ kush Htm + Territory root. Train Champion Infantry and Elephants and Heroes. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml @@ -7,6 +7,7 @@ mace Phrourion + Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml @@ -3,6 +3,7 @@ maur Durg + Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml @@ -3,7 +3,6 @@ pers Didā - Research technologies. Garrison Soldiers for additional arrows. structures/persians/fortress.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/ishtar_gate.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/ishtar_gate.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/ishtar_gate.xml @@ -1,61 +0,0 @@ - - - - structures/loyalty_regen - - - - 200 - - 250 - 500 - - - - - 8.0 - - - 10 - - - 2000 - - - pers - Ishtar Gate of Babylon - IshtarGate - structures/pers_gate.png - - - 50 - 100 - - - - - - - - - - - - - - interface/complete/building/complete_broch.xml - - - - true - 38 - 40000 - - - 40 - - - special/pers_ishtar_gate.xml - structures/fndn_9x3_wall.xml - - Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml @@ -7,7 +7,7 @@ ptol Phrourion - Train Champions and research technologies. Garrison Soldiers for additional arrows. + Territory root. Train Champion Infantry and Elephants. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml @@ -3,6 +3,7 @@ rome Castellum + Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_long.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_long.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_long.xml @@ -101,5 +101,6 @@ structures/romans/siege_wall_long.xml + structures/fndn_9x2.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_medium.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_medium.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_medium.xml @@ -78,5 +78,6 @@ structures/romans/siege_wall_medium.xml + structures/fndn_6x2.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_short.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_short.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_short.xml @@ -54,6 +54,6 @@ structures/romans/siege_wall_short.xml - structures/fndn_1x1.xml + structures/fndn_3x2.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml @@ -7,7 +7,7 @@ sele Phrourion - Train Champions and research technologies. Garrison Soldiers for additional arrows. + Territory root. Train Champion Infantry and Elephants. Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/fortress.xml @@ -7,7 +7,6 @@ spart Phrourion - Garrison Soldiers for additional arrows. Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml @@ -67,7 +67,7 @@ Fortress template_structure_military_fortress - Train Champions and Heroes and research technologies. Garrison Soldiers for additional arrows. + Territory root. Garrison Soldiers for additional arrows. GarrisonFortress Defensive City Fortress structures/fortress.png Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml @@ -33,6 +33,11 @@ + + + attack/weapon/sword_attack.xml + + 1.1 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml @@ -27,6 +27,11 @@ + + + attack/weapon/sword_attack.xml + + 1.1 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml @@ -17,4 +17,9 @@ Hero Cavalry Maceman Melee Maceman + + + attack/weapon/sword_attack.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml @@ -25,4 +25,9 @@ + + + attack/weapon/sword_attack.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml @@ -33,4 +33,9 @@ + + + attack/weapon/sword_attack.xml + +