Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml (nonexistent) @@ -1,15 +0,0 @@ - - - - units/heroes/rome_hero_maximus - - - rome - latin - Quintus Fabius Maximus - units/rome_hero_maximus.png - - - units/romans/hero_maximus.xml - - Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml (nonexistent) @@ -1,10 +0,0 @@ - - - - Elite - - - - units/ptolemies/cavalry_archer_e.xml - - Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/xml \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml (nonexistent) @@ -1,17 +0,0 @@ - - - - units/heroes/rome_hero_marcellus_1 - units/heroes/rome_hero_marcellus_2 - - - rome - latin - Marcus Claudius Marcellus - units/rome_hero_marcellus.png - - - units/romans/hero_marcellus.xml - - - Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml (nonexistent) @@ -1,16 +0,0 @@ - - - - units/heroes/maur_hero_ashoka - - - maur - 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. - - - units/mauryans/hero_ashoka.xml - - Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml (nonexistent) @@ -1,12 +0,0 @@ - - - - Advanced - - - units/ptol_cavalry_archer_e - - - units/ptolemies/cavalry_archer_a.xml - - Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/xml \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml (nonexistent) @@ -1,25 +0,0 @@ - - - - ptol - Camel - units/ptol_camel_archer - Nabataean Camel Archer - Mutsābiq Gamal Nabatu - units/ptol_camelry_archer.png - phase_village - - - units/ptol_cavalry_archer_a - - - - - actor/fauna/movement/camel_order.xml - actor/fauna/death/death_camel.xml - - - - units/ptolemies/cavalry_archer_b.xml - - Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/xml \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/brit_hero_boudicca brit Boudicca (Sword) Boadicea female units/brit_hero_boudicca.png - units/celts/boudicca_horse.xml + units/britons/hero_cavalry_javelinist_boudicca_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml (revision 21202) @@ -1,17 +1,17 @@ brit units/brit_cavalry_swordsman_b Epos Celtic Cavalry units/celt_cavalry_swordsman.png phase_town units/brit_cavalry_swordsman_a - units/celts/cavalry_swordsman_b.xml + units/celts/cavalry_swordsman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/brit_hero_cunobelin brit Cunobelin units/brit_hero_cunobelin.png - units/celts/cunobelin_horse.xml + units/britons/hero_cavalry_swordsman_cunobelin_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml (revision 21202) @@ -1,18 +1,18 @@ 5.0 brit Chariot Celtic Chariot Carbanto units/brit_champion_chariot units/brit_champion_chariot.png - units/celts/champion_unit_4.xml + units/britons/chariot_javelinist_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml (revision 21202) @@ -1,21 +1,21 @@ units/heroes/brit_hero_boudicca 5.0 brit Chariot Boudicca (Chariot) Boadicea female units/brit_hero_boudicca.png - units/celts/boudicca_chariot.xml + units/britons/hero_chariot_javelinist_boudicca_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/brit_hero_caratacos brit Caratacos units/brit_hero_caratacos.png - units/celts/caradoc.xml + units/britons/hero_infantry_swordsman_caratacos.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/brit_war_dog_e - units/celts/cavalry_spearman_a.xml + units/britons/war_dog_mastiff_a.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/cart_cavalry_javelinist_e - units/carthaginians/cavalry_javelinist_a.xml + units/carthaginians/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/cart_cavalry_spearman_ital_e - units/carthaginians/cavalry_spearman_a.xml + units/carthaginians/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/cart_cavalry_swordsman_gaul_e - units/celts/cavalry_swordsman_a.xml + units/celts/cavalry_swordsman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml (revision 21202) @@ -1,15 +1,15 @@ brit units/brit_war_dog_b Coun units/brit_war_dog.png units/brit_war_dog_a - units/celts/cavalry_spearman_b.xml + units/britons/war_dog_mastiff_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml (revision 21202) @@ -1,16 +1,16 @@ cart units/cart_cavalry_javelinist_b Numidian Cavalry Ḥayyāl Raḫūv Masili units/cart_cavalry_javelinist.png units/cart_cavalry_javelinist_a - units/carthaginians/cavalry_javelinist_b.xml + units/carthaginians/cavalry_javelinist_b_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml (revision 21202) @@ -1,25 +1,25 @@ -25 25 cart Italian 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 - units/carthaginians/cavalry_spearman_b.xml + units/carthaginians/cavalry_spearman_b_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml (revision 21202) @@ -1,25 +1,25 @@ -25 25 cart Celt 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 - units/celts/cavalry_swordsman_b.xml + units/celts/cavalry_swordsman_b_m.xml Index: ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js =================================================================== --- ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js (revision 21201) +++ ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js (revision 21202) @@ -1,642 +1,642 @@ Engine.LoadLibrary("rmgen"); Engine.LoadLibrary("rmbiome"); Engine.LoadLibrary("heightmap"); var g_Map = new RandomMap(0, "whiteness"); /** * getArray - To ensure a terrain texture is contained within an array */ function getArray(stringOrArrayOfStrings) { if (typeof stringOrArrayOfStrings == "string") return [stringOrArrayOfStrings]; return stringOrArrayOfStrings; } setSelectedBiome(); // Terrain, entities and actors let wildLakeBiome = [ // 0 Deep water { "texture": getArray(g_Terrains.water), "actor": [[g_Gaia.fish], 0.01], "textureHS": getArray(g_Terrains.water), "actorHS": [[g_Gaia.fish], 0.03] }, // 1 Shallow water { "texture": getArray(g_Terrains.water), "actor": [[g_Decoratives.lillies, g_Decoratives.reeds], 0.3], "textureHS": getArray(g_Terrains.water), "actorHS": [[g_Decoratives.lillies], 0.1] }, // 2 Shore { "texture": getArray(g_Terrains.shore), "actor": [ [ g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.mainHuntableAnimal, g_Decoratives.grass, g_Decoratives.grass, g_Decoratives.rockMedium, g_Decoratives.rockMedium, g_Decoratives.bushMedium, g_Decoratives.bushMedium ], 0.3 ], "textureHS": getArray(g_Terrains.cliff), "actorHS": [[g_Decoratives.grassShort, g_Decoratives.rockMedium, g_Decoratives.bushSmall], 0.1] }, // 3 Low ground { "texture": getArray(g_Terrains.tier1Terrain), "actor": [ [ g_Decoratives.grass, g_Decoratives.grassShort, g_Decoratives.rockLarge, g_Decoratives.rockMedium, g_Decoratives.bushMedium, g_Decoratives.bushSmall ], 0.2 ], "textureHS": getArray(g_Terrains.cliff), "actorHS": [[g_Decoratives.grassShort, g_Decoratives.rockMedium, g_Decoratives.bushSmall], 0.1] }, // 4 Mid ground. Player and path height { "texture": getArray(g_Terrains.mainTerrain), "actor": [ [ g_Decoratives.grass, g_Decoratives.grassShort, g_Decoratives.rockLarge, g_Decoratives.rockMedium, g_Decoratives.bushMedium, g_Decoratives.bushSmall ], 0.2 ], "textureHS": getArray(g_Terrains.cliff), "actorHS": [[g_Decoratives.grassShort, g_Decoratives.rockMedium, g_Decoratives.bushSmall], 0.1] }, // 5 High ground { "texture": getArray(g_Terrains.tier2Terrain), "actor": [ [ g_Decoratives.grass, g_Decoratives.grassShort, g_Decoratives.rockLarge, g_Decoratives.rockMedium, g_Decoratives.bushMedium, g_Decoratives.bushSmall ], 0.2 ], "textureHS": getArray(g_Terrains.cliff), "actorHS": [[g_Decoratives.grassShort, g_Decoratives.rockMedium, g_Decoratives.bushSmall], 0.1] }, // 6 Lower hilltop forest border { "texture": getArray(g_Terrains.dirt), "actor": [ [ g_Gaia.tree1, g_Gaia.tree3, g_Gaia.fruitBush, g_Gaia.secondaryHuntableAnimal, g_Decoratives.grass, g_Decoratives.rockMedium, g_Decoratives.bushMedium ], 0.3 ], "textureHS": getArray(g_Terrains.cliff), "actorHS": [[g_Decoratives.grassShort, g_Decoratives.rockMedium, g_Decoratives.bushSmall], 0.1] }, // 7 Hilltop forest { "texture": getArray(g_Terrains.forestFloor1), "actor": [ [ g_Gaia.tree1, g_Gaia.tree2, g_Gaia.tree3, g_Gaia.tree4, g_Gaia.tree5, g_Decoratives.tree, g_Decoratives.grass, g_Decoratives.rockMedium, g_Decoratives.bushMedium ], 0.5 ], "textureHS": getArray(g_Terrains.cliff), "actorHS": [[g_Decoratives.grassShort, g_Decoratives.rockMedium, g_Decoratives.bushSmall], 0.1] } ]; var mercenaryCampGuards = { "generic/temperate": [ { "Template" : "structures/merc_camp_egyptian" }, { "Template" : "units/mace_infantry_javelinist_b", "Count" : 4 }, { "Template" : "units/mace_cavalry_spearman_e", "Count" : 3 }, { "Template" : "units/mace_infantry_archer_a", "Count" : 4 }, { "Template" : "units/mace_champion_infantry_a", "Count" : 3 } ], "generic/snowy": [ { "Template" : "structures/ptol_mercenary_camp" }, { "Template" : "units/brit_infantry_javelinist_b", "Count" : 4 }, { "Template" : "units/brit_cavalry_swordsman_e", "Count" : 3 }, { "Template" : "units/brit_infantry_slinger_a", "Count" : 4 }, { "Template" : "units/brit_champion_infantry", "Count" : 3 } ], "generic/desert": [ { "Template" : "structures/ptol_mercenary_camp" }, { "Template" : "units/pers_infantry_javelinist_b", "Count" : 4 }, { "Template" : "units/pers_cavalry_swordsman_e", "Count" : 3 }, { "Template" : "units/pers_infantry_archer_a", "Count" : 4 }, { "Template" : "units/pers_champion_infantry", "Count" : 3 } ], "generic/alpine": [ { "Template" : "structures/ptol_mercenary_camp" }, { "Template" : "units/rome_infantry_swordsman_b", "Count" : 4 }, { "Template" : "units/rome_cavalry_spearman_e", "Count" : 3 }, { "Template" : "units/rome_infantry_javelinist_a", "Count" : 4 }, { "Template" : "units/rome_champion_infantry", "Count" : 3 } ], "generic/mediterranean": [ { "Template" : "structures/merc_camp_egyptian" }, { "Template" : "units/iber_infantry_javelinist_b", "Count" : 4 }, { "Template" : "units/iber_cavalry_spearman_e", "Count" : 3 }, { "Template" : "units/iber_infantry_slinger_a", "Count" : 4 }, { "Template" : "units/iber_champion_infantry", "Count" : 3 } ], "generic/savanna": [ { "Template" : "structures/merc_camp_egyptian" }, { "Template" : "units/sele_infantry_javelinist_b", "Count" : 4 }, { "Template" : "units/sele_cavalry_spearman_merc_e", "Count" : 3 }, { "Template" : "units/sele_infantry_spearman_a", "Count" : 4 }, { "Template" : "units/sele_champion_infantry_swordsman", "Count" : 3 } ], "generic/tropic": [ { "Template" : "structures/merc_camp_egyptian" }, { "Template" : "units/ptol_infantry_javelinist_b", "Count" : 4 }, - { "Template" : "units/ptol_cavalry_archer_e", "Count" : 3 }, + { "Template" : "units/ptol_camelry_archer_e", "Count" : 3 }, { "Template" : "units/ptol_infantry_slinger_a", "Count" : 4 }, { "Template" : "units/ptol_champion_infantry_pikeman", "Count" : 3 } ], "generic/autumn": [ { "Template" : "structures/ptol_mercenary_camp" }, { "Template" : "units/gaul_infantry_javelinist_b", "Count" : 4 }, { "Template" : "units/gaul_cavalry_swordsman_e", "Count" : 3 }, { "Template" : "units/gaul_infantry_slinger_a", "Count" : 4 }, { "Template" : "units/gaul_champion_infantry", "Count" : 3 } ] }; /** * Resource spots and other points of interest */ function placeMine(position, centerEntity, decorativeActors = [ g_Decoratives.grass, g_Decoratives.grassShort, g_Decoratives.rockLarge, g_Decoratives.rockMedium, g_Decoratives.bushMedium, g_Decoratives.bushSmall ] ) { g_Map.placeEntityPassable(centerEntity, 0, position, randomAngle()); let quantity = randIntInclusive(11, 23); let dAngle = 2 * Math.PI / quantity; for (let i = 0; i < quantity; ++i) g_Map.placeEntityPassable( pickRandom(decorativeActors), 0, Vector2D.add(position, new Vector2D(randFloat(2, 5), 0).rotate(-dAngle * randFloat(i, i + 1))), randomAngle()); } // Groves, only Wood let groveActors = [g_Decoratives.grass, g_Decoratives.rockMedium, g_Decoratives.bushMedium]; let clGrove = g_Map.createTileClass(); let clGaiaCamp = g_Map.createTileClass(); function placeGrove(point, groveEntities = [ g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.tree3, g_Gaia.tree3, g_Gaia.tree3, g_Gaia.tree4, g_Gaia.tree4, g_Gaia.tree5 ], groveActors = [g_Decoratives.grass, g_Decoratives.rockMedium, g_Decoratives.bushMedium], groveTileClass = undefined, groveTerrainTexture = getArray(g_Terrains.forestFloor1) ) { let position = new Vector2D(point.x, point.y); g_Map.placeEntityPassable(pickRandom(["structures/gaul_outpost", "gaia/flora_tree_oak_new"]), 0, position, randomAngle()); let quantity = randIntInclusive(20, 30); let dAngle = 2 * Math.PI / quantity; for (let i = 0; i < quantity; ++i) { let angle = dAngle * randFloat(i, i + 1); let dist = randFloat(2, 5); let objectList = groveEntities; if (i % 3 == 0) objectList = groveActors; let pos = Vector2D.add(position, new Vector2D(dist, 0).rotate(-angle)); g_Map.placeEntityPassable(pickRandom(objectList), 0, pos, randomAngle()); let painters = [new TerrainPainter(groveTerrainTexture)]; if (groveTileClass) painters.push(new TileClassPainter(groveTileClass)); createArea( new ClumpPlacer(5, 1, 1, Infinity, pos), painters); } } var farmEntities = { "generic/temperate": { "building": "structures/mace_farmstead", "animal": "gaia/fauna_pig" }, "generic/snowy": { "building": "structures/brit_farmstead", "animal": "gaia/fauna_sheep" }, "generic/desert": { "building": "structures/pers_farmstead", "animal": "gaia/fauna_camel" }, "generic/alpine": { "building": "structures/rome_farmstead", "animal": "gaia/fauna_sheep" }, "generic/mediterranean": { "building": "structures/iber_farmstead", "animal": "gaia/fauna_pig" }, "generic/savanna": { "building": "structures/sele_farmstead", "animal": "gaia/fauna_horse" }, "generic/tropic": { "building": "structures/ptol_farmstead", "animal": "gaia/fauna_camel" }, "generic/autumn": { "building": "structures/gaul_farmstead", "animal": "gaia/fauna_horse" } }; g_WallStyles.other = { "overlap": 0, "fence": readyWallElement("other/fence_long", "gaia"), "fence_short": readyWallElement("other/fence_short", "gaia"), "bench": { "angle": Math.PI / 2, "length": 1.5, "indent": 0, "bend": 0, "templateName": "other/bench" }, "foodBin": { "angle": Math.PI / 2, "length": 1.5, "indent": 0, "bend": 0, "templateName": "gaia/treasure/food_bin" }, "animal": { "angle": 0, "length": 0, "indent": 0.75, "bend": 0, "templateName": farmEntities[currentBiome()].animal }, "farmstead": { "angle": Math.PI, "length": 0, "indent": -3, "bend": 0, "templateName": farmEntities[currentBiome()].building } }; let fences = [ new Fortress("fence", [ "foodBin", "farmstead", "bench", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "fence" ]), new Fortress("fence", [ "foodBin", "farmstead", "fence", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "bench", "animal", "fence", "turn_0.25", "animal", "turn_0.25", "fence" ]), new Fortress("fence", [ "foodBin", "farmstead", "turn_0.5", "bench", "turn_-0.5", "fence_short", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "fence_short", "animal", "fence" ]), new Fortress("fence", [ "foodBin", "farmstead", "turn_0.5", "fence_short", "turn_-0.5", "bench", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "fence", "turn_0.25", "animal", "turn_0.25", "fence_short", "animal", "fence" ]), new Fortress("fence", [ "foodBin", "farmstead", "fence", "turn_0.25", "animal", "turn_0.25", "bench", "animal", "fence", "turn_0.25", "animal", "turn_0.25", "fence_short", "animal", "fence", "turn_0.25", "animal", "turn_0.25", "fence_short", "animal", "fence" ]) ]; let num = fences.length; for (let i = 0; i < num; ++i) fences.push(new Fortress("fence", clone(fences[i].wall).reverse())); // Camps with fire and gold treasure function placeCamp(position, centerEntity = "actor|props/special/eyecandy/campfire.xml", otherEntities = ["gaia/treasure/metal", "gaia/treasure/standing_stone", "units/brit_infantry_slinger_b", "units/brit_infantry_javelinist_b", "units/gaul_infantry_slinger_b", "units/gaul_infantry_javelinist_b", "units/gaul_champion_fanatic", "actor|props/special/common/waypoint_flag.xml", "actor|props/special/eyecandy/barrel_a.xml", "actor|props/special/eyecandy/basket_celt_a.xml", "actor|props/special/eyecandy/crate_a.xml", "actor|props/special/eyecandy/dummy_a.xml", "actor|props/special/eyecandy/handcart_1.xml", "actor|props/special/eyecandy/handcart_1_broken.xml", "actor|props/special/eyecandy/sack_1.xml", "actor|props/special/eyecandy/sack_1_rough.xml" ] ) { g_Map.placeEntityPassable(centerEntity, 0, position, randomAngle()); let quantity = randIntInclusive(5, 11); let dAngle = 2 * Math.PI / quantity; for (let i = 0; i < quantity; ++i) { let angle = dAngle * randFloat(i, i + 1); let dist = randFloat(1, 3); g_Map.placeEntityPassable(pickRandom(otherEntities), 0, Vector2D.add(position, new Vector2D(dist, 0).rotate(-angle)), randomAngle()); } addCivicCenterAreaToClass(position, clGaiaCamp); } function placeStartLocationResources( point, foodEntities = [g_Gaia.fruitBush, g_Gaia.chicken], groveEntities = [ g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree1, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.tree2, g_Gaia.tree3, g_Gaia.tree3, g_Gaia.tree3, g_Gaia.tree4, g_Gaia.tree4, g_Gaia.tree5 ], groveTerrainTexture = getArray(g_Terrains.forestFloor1), averageDistToCC = 10, dAverageDistToCC = 2 ) { function getRandDist() { return averageDistToCC + randFloat(-dAverageDistToCC, dAverageDistToCC); } let currentAngle = randomAngle(); // Stone let dAngle = 4/9 * Math.PI; let angle = currentAngle + randFloat(dAngle / 4, 3 * dAngle / 4); placeMine(Vector2D.add(point, new Vector2D(averageDistToCC, 0).rotate(-angle)), g_Gaia.stoneLarge); currentAngle += dAngle; // Wood let quantity = 80; dAngle = 2/3 * Math.PI / quantity; for (let i = 0; i < quantity; ++i) { angle = currentAngle + randFloat(0, dAngle); let dist = getRandDist(); let objectList = groveEntities; if (i % 2 == 0) objectList = groveActors; let position = Vector2D.add(point, new Vector2D(dist, 0).rotate(-angle)); g_Map.placeEntityPassable(pickRandom(objectList), 0, position, randomAngle()); createArea( new ClumpPlacer(5, 1, 1, Infinity, position), [ new TerrainPainter(groveTerrainTexture), new TileClassPainter(clGrove) ]); currentAngle += dAngle; } // Metal dAngle = 4/9 * Math.PI; angle = currentAngle + randFloat(dAngle / 4, 3 * dAngle / 4); placeMine(Vector2D.add(point, new Vector2D(averageDistToCC, 0).rotate(-angle)), g_Gaia.metalLarge); currentAngle += dAngle; // Berries and domestic animals quantity = 15; dAngle = 4/9 * Math.PI / quantity; for (let i = 0; i < quantity; ++i) { angle = currentAngle + randFloat(0, dAngle); let dist = getRandDist(); g_Map.placeEntityPassable(pickRandom(foodEntities), 0, Vector2D.add(point, new Vector2D(dist, 0).rotate(-angle)), randomAngle()); currentAngle += dAngle; } } /** * Base terrain shape generation and settings */ // Height range by map size let heightScale = (g_Map.size + 256) / 768 / 4; let heightRange = { "min": MIN_HEIGHT * heightScale, "max": MAX_HEIGHT * heightScale }; // Water coverage let averageWaterCoverage = 1/5; // NOTE: Since terrain generation is quite unpredictable actual water coverage might vary much with the same value let heightSeaGround = -MIN_HEIGHT + heightRange.min + averageWaterCoverage * (heightRange.max - heightRange.min); // Water height in environment and the engine let heightSeaGroundAdjusted = heightSeaGround + MIN_HEIGHT; // Water height as terrain height setWaterHeight(heightSeaGround); // Generate base terrain shape let lowH = heightRange.min; let medH = (heightRange.min + heightRange.max) / 2; // Lake let initialHeightmap = [ [medH, medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH, medH], [medH, medH, lowH, lowH, medH, medH], [medH, medH, lowH, lowH, medH, medH], [medH, medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH, medH], ]; if (g_Map.size < 256) { initialHeightmap = [ [medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH], [medH, medH, lowH, medH, medH], [medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH] ]; } if (g_Map.size >= 384) { initialHeightmap = [ [medH, medH, medH, medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH, medH, medH, medH], [medH, medH, medH, lowH, lowH, medH, medH, medH], [medH, medH, medH, lowH, lowH, medH, medH, medH], [medH, medH, medH, medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH, medH, medH, medH], [medH, medH, medH, medH, medH, medH, medH, medH], ]; } setBaseTerrainDiamondSquare(heightRange.min, heightRange.max, initialHeightmap, 0.8); g_Map.log("Eroding map"); for (let i = 0; i < 5; ++i) splashErodeMap(0.1); g_Map.log("Smoothing map"); createArea( new MapBoundsPlacer(), new SmoothingPainter(1, 0.8, 1)); g_Map.log("Rescaling map"); rescaleHeightmap(heightRange.min, heightRange.max); Engine.SetProgress(25); /** * Prepare terrain texture placement */ let heighLimits = [ heightRange.min + 3/4 * (heightSeaGroundAdjusted - heightRange.min), // 0 Deep water heightSeaGroundAdjusted, // 1 Shallow water heightSeaGroundAdjusted + 2/8 * (heightRange.max - heightSeaGroundAdjusted), // 2 Shore heightSeaGroundAdjusted + 3/8 * (heightRange.max - heightSeaGroundAdjusted), // 3 Low ground heightSeaGroundAdjusted + 4/8 * (heightRange.max - heightSeaGroundAdjusted), // 4 Player and path height heightSeaGroundAdjusted + 6/8 * (heightRange.max - heightSeaGroundAdjusted), // 5 High ground heightSeaGroundAdjusted + 7/8 * (heightRange.max - heightSeaGroundAdjusted), // 6 Lower forest border heightRange.max // 7 Forest ]; let playerHeightRange = { "min" : heighLimits[3], "max" : heighLimits[4] }; let resourceSpotHeightRange = { "min" : (heighLimits[2] + heighLimits[3]) / 2, "max" : (heighLimits[4] + heighLimits[5]) / 2 }; let playerHeight = (playerHeightRange.min + playerHeightRange.max) / 2; // Average player height g_Map.log("Chosing starting locations"); let [playerIDs, playerPosition] = sortPlayersByLocation(getStartLocationsByHeightmap(playerHeightRange, 1000, 30)); g_Map.log("Smoothing starting locations before height calculation"); for (let position of playerPosition) createArea( new ClumpPlacer(diskArea(20), 0.8, 0.8, Infinity, position), new SmoothElevationPainter(ELEVATION_SET, g_Map.getHeight(position), 20)); Engine.SetProgress(30); /** * Calculate tile centered height map after start position smoothing but before placing paths * This has nothing to to with TILE_CENTERED_HEIGHT_MAP which should be false! */ let tchm = getTileCenteredHeightmap(); g_Map.log("Get points per height"); let areas = heighLimits.map(heightLimit => []); for (let x = 0; x < tchm.length; ++x) for (let y = 0; y < tchm[0].length; ++y) { let minHeight = heightRange.min; for (let h = 0; h < heighLimits.length; ++h) { if (tchm[x][y] >= minHeight && tchm[x][y] <= heighLimits[h]) { areas[h].push(new Vector2D(x, y)); break; } minHeight = heighLimits[h]; } } g_Map.log("Get slope limits per heightrange"); let slopeMap = getSlopeMap(); let minSlope = []; let maxSlope = []; for (let h = 0; h < heighLimits.length; ++h) { minSlope[h] = Infinity; maxSlope[h] = 0; for (let point of areas[h]) { let slope = slopeMap[point.x][point.y]; if (slope > maxSlope[h]) maxSlope[h] = slope; if (slope < minSlope[h]) minSlope[h] = slope; } } g_Map.log("Paint areas by height and slope"); for (let h = 0; h < heighLimits.length; ++h) for (let point of areas[h]) { let actor; let texture = pickRandom(wildLakeBiome[h].texture); if (slopeMap[point.x][point.y] < (minSlope[h] + maxSlope[h]) / 2) { if (randBool(wildLakeBiome[h].actor[1])) actor = pickRandom(wildLakeBiome[h].actor[0]); } else { texture = pickRandom(wildLakeBiome[h].textureHS); if (randBool(wildLakeBiome[h].actorHS[1])) actor = pickRandom(wildLakeBiome[h].actorHS[0]); } g_Map.setTexture(point, texture); if (actor) g_Map.placeEntityAnywhere(actor, 0, randomPositionOnTile(point), randomAngle()); } Engine.SetProgress(80); g_Map.log("Placing resources"); let avoidPoints = playerPosition.map(pos => pos.clone()); for (let i = 0; i < avoidPoints.length; ++i) avoidPoints[i].dist = 30; let resourceSpots = getPointsByHeight(resourceSpotHeightRange, avoidPoints).map(point => new Vector2D(point.x, point.y)); Engine.SetProgress(55); g_Map.log("Placing players"); if (isNomad()) placePlayersNomad( g_Map.createTileClass(), [ new HeightConstraint(playerHeightRange.min, playerHeightRange.max), avoidClasses(clGaiaCamp, 8) ]); else for (let p = 0; p < playerIDs.length; ++p) { placeCivDefaultStartingEntities(playerPosition[p], playerIDs[p], g_Map.size > 192); placeStartLocationResources(playerPosition[p]); } let mercenaryCamps = isNomad() ? 0 : Math.ceil(g_Map.size / 256); g_Map.log("Placing at most " + mercenaryCamps + " mercenary camps"); for (let i = 0; i < resourceSpots.length; ++i) { let radius; let choice = i % 5; if (choice == 0) placeMine(resourceSpots[i], g_Gaia.stoneLarge); if (choice == 1) placeMine(resourceSpots[i], g_Gaia.metalLarge); if (choice == 2) placeGrove(resourceSpots[i]); if (choice == 3) { placeCamp(resourceSpots[i]); radius = 5; } if (choice == 4) { if (mercenaryCamps) { placeStartingEntities(resourceSpots[i], 0, mercenaryCampGuards[currentBiome()]); radius = 15; --mercenaryCamps; } else { placeCustomFortress(resourceSpots[i], pickRandom(fences), "other", 0, randomAngle()); radius = 10; } } if (radius) createArea( new ClumpPlacer(diskArea(radius), 1, 1, Infinity, resourceSpots[i]), new SmoothElevationPainter(ELEVATION_SET, g_Map.getHeight(resourceSpots[i]), radius)); } g_Map.ExportMap(); Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml (revision 21202) @@ -1,15199 +1,15199 @@ cumulus 0.00229492 0 ocean 20.1443 4.0 0.818359 -0.015625 1.08594 1.01563 0.160938 hdr 0 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 4 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - + 1 - + 1 - + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 1 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 1 1 1 1 1 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml (revision 21202) @@ -1,25 +1,25 @@ -25 25 cart Iberian 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 - units/carthaginians/cavalry_swordsman_b.xml + units/carthaginians/cavalry_swordsman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/cart_cavalry_swordsman_iber_e - units/carthaginians/cavalry_swordsman_a.xml + units/carthaginians/cavalry_swordsman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml (revision 21202) @@ -1,12 +1,12 @@ cart North African War Elephant Pil Malḥamit units/cart_champion_elephant.png - units/carthaginians/champion_unit_2.xml + units/carthaginians/elephantry_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/carthaginians/cavalry_swordsman_e.xml + units/carthaginians/cavalry_swordsman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml (revision 21202) @@ -1,12 +1,12 @@ cart Sacred Band Infantry Sacred Band of Ba'al units/cart_champion_infantry.png - units/carthaginians/champion_spearman.xml + units/carthaginians/infantry_spearman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/cart_hero_maharbal cart Maharbal Maharbaʿal units/cart_hero_maharbal.png - units/carthaginians/hero_maharbal_horse.xml + units/carthaginians/hero_cavalry_spearman_maharbal_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/cart_hero_hannibal cart Hannibal Barca Ḥannibaʿal Baraq units/cart_hero_hannibal.png - units/carthaginians/hero_hannibal_mount.xml + units/carthaginians/hero_elephantry_hannibal_m.xml Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml (revision 21202) @@ -1,11634 +1,11634 @@ sunset 0.0040625 0.248047 ocean 26.3344 4.0 0.501953 0 1.21094 0.765625 0.0818359 hdr 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 - + 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml (revision 21202) @@ -1,12 +1,12 @@ cart Sacred Band Pikeman Mašal units/cart_champion_infantry.png - units/carthaginians/champion_unit_1.xml + units/carthaginians/infantry_pikeman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/gaul_cavalry_javelinist_e - units/celts/cavalry_javelinist_a.xml + units/celts/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/gaul_cavalry_swordsman_e - units/celts/cavalry_swordsman_a.xml + units/celts/cavalry_swordsman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml (revision 21202) @@ -1,33 +1,33 @@ -3 -3 0.5 0 2 0.85 gaul Naked Fanatic Gaesata units/celt_fanatic.png phase_town 1.4 1.4 - units/celts/fanatic.xml + units/gauls/infantry_spearman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/celts/cavalry_javelinist_e.xml + units/celts/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml (revision 21202) @@ -1,13 +1,13 @@ gaul Gallic Noble Cavalry Gallic Brihent units/gaul_champion_cavalry units/gaul_champion_cavalry.png - units/celts/champion_unit_2.xml + units/gauls/cavalry_spearman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml (revision 21202) @@ -1,16 +1,16 @@ gaul units/gaul_cavalry_swordsman_b Epos units/celt_cavalry_swordsman.png phase_town units/gaul_cavalry_swordsman_a - units/celts/cavalry_swordsman_b.xml + units/celts/cavalry_swordsman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/gaul_hero_viridomarus gaul Britomartus units/gaul_hero_viridomarus.png - units/celts/viridomarus.xml + units/gauls/hero_infantry_spearman_viridomarus.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/gaul_hero_vercingetorix gaul Vercingetorix units/gaul_hero_vercingetorix.png - units/celts/vercingetorix_horse.xml + units/gauls/hero_cavalry_swordsman_vercingetorix_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml (revision 21202) @@ -1,13 +1,13 @@ gaul Heavy Swordsman Solduros units/gaul_champion_infantry units/gaul_champion_infantry.png - units/celts/champion_unit_1.xml + units/gauls/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/gaul_hero_vercingetorix gaul Vercingetorix units/gaul_hero_vercingetorix.png - units/celts/vercingetorix.xml + units/gauls/hero_infantry_swordsman_vercingetorix.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/iberians/cavalry_javelinist_e.xml + units/iberians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml (revision 21202) @@ -1,19 +1,19 @@ 5 15 iber Leial Zalduneria units/iber_champion_cavalry.png units/iber_champion_cavalry Special: Flaming javelins. Good vs. Buildings. - units/iberians/champion_unit_2.xml + units/iberians/cavalry_javelinist_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml (revision 21202) @@ -1,15 +1,15 @@ iber units/iber_cavalry_javelinist_b Kantabriako Zaldun units/iber_cavalry_javelinist.png units/iber_cavalry_javelinist_a - units/iberians/cavalry_javelinist_b.xml + units/iberians/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/iberians/cavalry_spearman_e.xml + units/iberians/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml (revision 21202) @@ -1,12045 +1,12045 @@ cumulus 0.00232422 0 ocean 19.9 4.0 0.700195 0 1 0.99 0.1999 hdr 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 - + 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml (revision 21202) @@ -1,10 +1,10 @@ Wolfhound units/brit_wolfhound.png - units/celts/wolfhound.xml + units/britons/wolfhound.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml (revision 21202) @@ -1,13 +1,13 @@ skirm units/{civ}_cavalry_javelinist_b - units/athenians/cavalry_javelinist_b.xml + units/athenians/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml (revision 21202) @@ -1,26 +1,32 @@ 100 200 decay|rubble/rubble_stone_5x5 ptol ḥwt-n-mš' Train Egyptian and Middle-Eastern citizen-soldiers. Research training improvements. + + + -units/{civ}_cavalry_archer_b + units/{civ}_camelry_archer_b + + structures/ptolemies/barracks.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml (revision 21202) @@ -1,27 +1,27 @@ 8.0 ptol pr-'a units/{civ}_infantry_pikeman_b units/{civ}_infantry_javelinist_b - units/{civ}_cavalry_archer_b + units/{civ}_camelry_archer_b units/{civ}_hero_ptolemy_I units/{civ}_hero_ptolemy_IV units/{civ}_hero_cleopatra structures/ptolemies/civic_centre.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/athen_cavalry_javelinist_e - units/athenians/cavalry_javelinist_a.xml + units/athenians/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml (revision 21202) @@ -1,16 +1,16 @@ athen greek units/athen_cavalry_javelinist_b Pródromos units/hele_cavalry_javelinist.png units/athen_cavalry_javelinist_a - units/athenians/cavalry_javelinist_b.xml + units/athenians/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/athenians/cavalry_javelinist_e.xml + units/athenians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/athen_cavalry_swordsman_e - units/athenians/cavalry_swordsman_a.xml + units/athenians/cavalry_swordsman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml (revision 21202) @@ -1,18 +1,18 @@ athen greek units/athen_cavalry_swordsman_b Greek Cavalry Hippeús units/hele_cavalry_swordsman.png phase_town units/athen_cavalry_swordsman_a - units/athenians/cavalry_swordsman_b.xml + units/athenians/cavalry_swordsman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/athenians/cavalry_swordsman_e.xml + units/athenians/cavalry_swordsman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml (revision 21202) @@ -1,13 +1,13 @@ athen greek City Guard Epílektos units/athen_champion_infantry.png - units/athenians/champion_unit_spear.xml + units/athenians/infantry_spearman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml (revision 21202) @@ -1,14 +1,14 @@ athen greek Athenian Marine Epibátēs Athēnaîos units/athen_champion_marine.png hellenes/special_iphicratean_reforms - units/athenians/champion_unit_marine.xml + units/athenians/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml (revision 21202) @@ -1,13 +1,13 @@ athen greek Scythian Archer Toxótēs Skythikós units/athen_champion_ranged.png - units/athenians/champion_unit_ranged.xml + units/athenians/infantry_archer_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml (revision 21202) @@ -1,28 +1,28 @@ 0 6.5 0 76 0.0 100.0 2320 3000 1.0 Human athen greek Greek Gastraphetes Toxótēs Skythikós units/athen_champion_ranged.png - units/athenians/champion_unit_gastraphetes.xml + units/athenians/infantry_crossbowman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml (revision 21202) @@ -1,17 +1,17 @@ units/heroes/athen_hero_iphicrates_1 units/heroes/athen_hero_iphicrates_2 athen greek Iphicrates Iphikratēs units/athen_hero_iphicrates.png - units/athenians/iphicrates.xml + units/athenians/hero_infantry_javelinist_iphicrates.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml (revision 21202) @@ -1,17 +1,17 @@ units/heroes/athen_hero_pericles_1 units/heroes/athen_hero_pericles_2 athen greek Pericles Periklēs units/athen_hero_pericles.png - units/athenians/pericles.xml + units/athenians/hero_infantry_spearman_pericles.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml (revision 21202) @@ -1,17 +1,17 @@ units/heroes/athen_hero_themistocles_1 units/heroes/athen_hero_themistocles_2 athen greek Themistocles Themistoklês units/athen_hero_themistocles.png - units/athenians/themistocles.xml + units/athenians/hero_infantry_swordsman_themistocles.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml (revision 21202) @@ -0,0 +1,13 @@ + + + + athen + greek + Iphicrates + Iphikratēs + units/athen_hero_iphicrates.png + + + units/athenians/hero_infantry_javelinist_xenophon.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/brit_cavalry_javelinist_e - units/celts/cavalry_javelinist_a.xml + units/celts/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml (revision 21202) @@ -1,16 +1,16 @@ brit units/brit_cavalry_javelinist_b Gaisaredos Raiding Cavalry units/celt_cavalry_javelinist.png units/brit_cavalry_javelinist_a - units/celts/cavalry_javelinist_b.xml + units/celts/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/celts/cavalry_javelinist_e.xml + units/celts/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/brit_cavalry_swordsman_e - units/celts/cavalry_swordsman_a.xml + units/celts/cavalry_swordsman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/celts/cavalry_swordsman_e.xml + units/celts/cavalry_swordsman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml (revision 21202) @@ -1,13 +1,13 @@ brit Brythonic Longswordsman Delamokludda units/brit_champion_infantry units/brit_champion_infantry.png - units/celts/champion_unit_3.xml + units/britons/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/brit_hero_boudicca brit Boudicca (Sword) Boadicea female units/brit_hero_boudicca.png - units/celts/boudicca.xml + units/britons/hero_infantry_swordsman_boudicca.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/brit_hero_cunobelin brit Cunobelin units/celt_hero_cunobelin.png - units/celts/cunobelin.xml + units/britons/hero_infantry_swordsman_cunobelin.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/celts/cavalry_spearman_e.xml + units/britons/war_dog_mastiff_e.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/carthaginians/cavalry_javelinist_e.xml + units/carthaginians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/carthaginians/cavalry_spearman_e.xml + units/carthaginians/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/celts/cavalry_swordsman_e.xml + units/celts/cavalry_swordsman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml (revision 21202) @@ -1,12 +1,12 @@ cart Sacred Band Cavalry Sacred Band of Astarte units/cart_champion_cavalry.png - units/carthaginians/champion_unit_3.xml + units/carthaginians/cavalry_spearman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/cart_hero_hamilcar cart Ḥimelqart Baraq Hamilcar Barca units/cart_hero_hamilcar.png - units/carthaginians/hero_hamilcar_horse.xml + units/carthaginians/hero_cavalry_swordsman_hamilcar_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml (revision 21202) @@ -1,15 +1,15 @@ gaul units/gaul_cavalry_javelinist_b Gaisaredos units/celt_cavalry_javelinist.png units/gaul_cavalry_javelinist_a - units/celts/cavalry_javelinist_b.xml + units/celts/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/celts/cavalry_swordsman_e.xml + units/celts/cavalry_swordsman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/gaul_hero_brennus gaul Brennus units/gaul_hero_brennus.png - units/celts/brennus.xml + units/gauls/hero_infantry_swordsman_brennus.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/iber_cavalry_javelinist_e - units/iberians/cavalry_javelinist_a.xml + units/iberians/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml (revision 21202) @@ -1,16 +1,16 @@ iber units/iber_cavalry_spearman_b Lantzari units/iber_cavalry_spearman.png phase_town units/iber_cavalry_spearman_a - units/iberians/cavalry_spearman_b.xml + units/iberians/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/iber_cavalry_spearman_e - units/iberians/cavalry_spearman_a.xml + units/iberians/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/iber_hero_viriato_1 units/heroes/iber_hero_viriato_2 iber Viriato units/iber_hero_viriato.png - units/iberians/hero_viriato.xml + units/iberians/hero_infantry_swordsman_viriato.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/iber_hero_indibil iber Indibil units/iber_hero_indibil.png - units/iberians/hero_indibil_horse.xml + units/iberians/hero_cavalry_spearman_indibil_h.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/iber_hero_caros_1 units/heroes/iber_hero_caros_2 iber Caros units/iber_hero_caros.png - units/iberians/hero_caros.xml + units/iberians/hero_infantry_swordsman_caros.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml (revision 21202) @@ -1,31 +1,31 @@ -25 25 kush Camel units/kush_camel_javelinist_b Blemmye Desert Raider nhw Bulahau gml units/kush_merc_camelry.png phase_town units/kush_camelry_javelinist_a actor/fauna/movement/camel_order.xml actor/fauna/death/death_camel.xml - units/kushites/camelry_javelinist_b.xml + units/kushites/camelry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml (revision 21202) @@ -1,12 +1,12 @@ iber Leial Ezpatari units/iber_champion_infantry.png units/iber_champion_infantry - units/iberians/champion_unit_1.xml + units/iberians/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml (revision 21202) @@ -1,14 +1,14 @@ units/heroes/iber_hero_indibil iber Indibil units/iber_hero_indibil.png - units/iberians/hero_indibil_infantry.xml + units/iberians/hero_infantry_spearman_indibil.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml (revision 21202) @@ -1,17 +1,17 @@ kush units/kush_cavalry_javelinist_b iry hr ssmwtt Napatan Light Cavalry phase_village units/kush_cavalry_javelinist.png units/kush_cavalry_javelinist_a - units/kushites/cavalry_javelinist_b.xml + units/kushites/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/kushites/cavalry_spearman_e.xml + units/kushites/cavalry_spearman_e_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml (revision 21202) @@ -1,13 +1,13 @@ kush Napatan Temple Guard rs ‘Imn AmunGuard units/kush_champion_amun.png - units/kushites/infantry_swordsman_champion.xml + units/kushites/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml (revision 21202) @@ -1,17 +1,17 @@ units/heroes/kush_hero_nastasen kush Nastasen Nastasen Ankhkhare Nastasen units/hele_hero_alexander.png Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships. - units/kushites/cavalry_spearman_hero_nastasen.xml + units/kushites/hero_cavalry_spearman_nastasen_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/mace_cavalry_spearman_e - units/macedonians/cavalry_spearman_a.xml + units/macedonians/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml (revision 21202) @@ -1,18 +1,18 @@ mace greek Macedonian Shield Bearer Hypaspistḗs units/mace_hypaspist.png units/mace_champion_infantry_a units/mace_champion_infantry_e 2000 - units/macedonians/champion_infantry_a.xml + units/macedonians/infantry_spearman_c_a.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/mace_hero_demetrius mace greek Demetrius The Besieger Dēmḗtrios Poliorkḗtēs units/hele_hero_demetrius.png - units/macedonians/demetrius.xml + units/macedonians/hero_infantry_swordsman_demetrius.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/mace_infantry_pikeman_e - units/macedonians/infantry_spearman_a.xml + units/macedonians/infantry_pikeman_a.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml (revision 21202) @@ -1,16 +1,16 @@ maur units/maur_cavalry_javelinist_b Indian Light Cavalry Ashwarohi units/maur_cavalry_javelinist.png units/maur_cavalry_javelinist_a - units/mauryans/cavalry_javelinist_b.xml + units/mauryans/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/kush_cavalry_javelinist_e - units/kushites/cavalry_javelinist_a.xml + units/kushites/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml (revision 21202) @@ -1,17 +1,17 @@ kush units/kush_cavalry_spearman_b Meroitic Heavy Cavalry Htr units/kush_cavalry_spearman.png phase_town units/kush_cavalry_spearman_a - units/kushites/cavalry_spearman_b.xml + units/kushites/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml (revision 21202) @@ -1,12 +1,12 @@ kush Noble Archer Hry pdty units/kush_champion_archer.png - units/kushites/infantry_archer_champion.xml + units/kushites/infantry_archer_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml (revision 21202) @@ -1,17 +1,17 @@ units/heroes/kush_hero_arakamani_1 units/heroes/kush_hero_arakamani_2 units/heroes/kush_hero_arakamani_3 kush Arakamani ‘Irk.‘Imn units/mace_hero_philip.png - units/ptolemies/hero_ptolemy_IV.xml + units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/macedonians/cavalry_javelinist_e.xml + units/macedonians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml (revision 21202) @@ -1,14 +1,14 @@ mace greek Companion Cavalry Hetaîros units/mace_champion_cavalry.png units/mace_champion_cavalry - units/macedonians/champion_cavalry.xml + units/macedonians/cavalry_spearman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/mace_hero_craterus mace greek Crateros Kraterós units/mace_hero_craterus.png - units/macedonians/craterus.xml + units/macedonians/hero_infantry_swordsman_craterus.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/mace_hero_pyrrhus mace greek Pyrrhus of Epirus Pyrrhos ton Epeiros units/mace_hero_pyrrhus.png - units/macedonians/pyrrhus_horse.xml + units/macedonians/hero_cavalry_spearman_pyrrhus_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/maur_cavalry_javelinist_e - units/mauryans/cavalry_javelinist_a.xml + units/mauryans/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml (revision 21202) @@ -1,17 +1,17 @@ maur units/maur_cavalry_swordsman_b Indian Raiding Cavalry Aśvārohagaṇaḥ units/maur_cavalry_swordsman.png phase_town units/maur_cavalry_swordsman_a - units/mauryans/cavalry_swordsman_b.xml + units/mauryans/cavalry_swordsman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/kush_cavalry_spearman_e - units/kushites/cavalry_spearman_a.xml + units/kushites/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml (revision 21202) @@ -1,12 +1,12 @@ kush Meroitic War Elephant Abore ‘h3 units/kush_champion_elephant.png - units/kushites/elephant_champion.xml + units/kushites/elephantry_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/kush_hero_amanirenas kush Amanirenas Amnirense qore li kdwe li female units/ptol_hero_cleopatra.png - units/kushites/infantry_archer_hero_amanirenas.xml + units/kushites/hero_infantry_archer_amanirenas.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml (revision 21202) @@ -1,25 +1,25 @@ -25 25 mace greek units/mace_cavalry_javelinist_b Odrysian Skirmish Cavalry Hippakontistḕs Odrysós Mercenary units/mace_cavalry_javelinist.png phase_town units/mace_cavalry_javelinist_a - units/macedonians/cavalry_javelinist_b.xml + units/macedonians/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/macedonians/cavalry_spearman_e.xml + units/macedonians/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml (revision 21202) @@ -1,28 +1,28 @@ - + Hero 1.2 units/heroes/mace_hero_alexander_1 units/heroes/mace_hero_alexander_2 mace greek Alexander The Great Mégās Aléxandros "Herocide" Bonus: +20% attack bonus vs. enemy Heroes. units/hele_hero_alexander.png - units/macedonians/alexander.xml + units/macedonians/hero_cavalry_swordsman_alexander_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/mace_hero_philip mace greek Philip II of Macedon Phílippos B' ho Makedṓn units/hele_hero_philip.png - units/macedonians/philip.xml + units/macedonians/hero_infantry_pikeman_philip.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/macedonians/infantry_spearman_e.xml + units/macedonians/infantry_pikeman_e.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/maur_cavalry_swordsman_e - units/mauryans/cavalry_swordsman_a.xml + units/mauryans/cavalry_swordsman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/kushites/cavalry_javelinist_e.xml + units/kushites/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml (revision 21202) @@ -1,12 +1,12 @@ kush Noble Cavalry Htr Ms’ n mh-ib units/kush_champion_cavalry.png - units/kushites/cavalry_spearman_champion.xml + units/kushites/cavalry_spearman_c_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml (revision 21202) @@ -1,14 +1,14 @@ kush Meroitic Temple Guard rs ‘Iprmk Axe ApedemakGuard units/kush_champion_apedemak.png - units/kushites/infantry_axeman_champion.xml + units/kushites/infantry_axeman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/mace_cavalry_javelinist_e - units/macedonians/cavalry_javelinist_a.xml + units/macedonians/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml (revision 21202) @@ -1,17 +1,17 @@ mace greek units/mace_cavalry_spearman_b Thessalian Lancer Xystophóros Thessalikós units/mace_cavalry_spearman.png units/mace_cavalry_spearman_a - units/macedonians/cavalry_spearman_b.xml + units/macedonians/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml (revision 21202) @@ -1,18 +1,18 @@ 1 1 1.1 Hypaspistḗs Argyraspídi units/mace_argyraspidai.png - units/macedonians/champion_infantry_e.xml + units/macedonians/infantry_spearman_c_e.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/mace_hero_philip mace greek Philip II of Macedon Phílippos B' ho Makedṓn units/hele_hero_philip.png - units/macedonians/philip_horse.xml + units/macedonians/hero_cavalry_spearman_philip_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml (revision 21202) @@ -1,24 +1,24 @@ structures/mace_workshop structures/mace_theatron structures/mace_library mace greek units/mace_infantry_pikeman_b Foot Companion Pezétairos units/mace_infantry_pikeman.png units/mace_infantry_pikeman_a - units/macedonians/infantry_spearman_b.xml + units/macedonians/infantry_pikeman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/mauryans/cavalry_javelinist_e.xml + units/mauryans/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/mauryans/cavalry_swordsman_e.xml + units/mauryans/cavalry_swordsman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml (revision 21202) @@ -1,14 +1,14 @@ maur female Maiden Guard Visha Kanya units/maur_champion_maiden units/maur_champion_maiden.png - units/mauryans/champion_maiden_guard.xml + units/mauryans/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml (revision 21202) @@ -1,13 +1,13 @@ maur Warrior Yōddha units/maur_champion_infantry units/maur_champion_maceman.png - units/mauryans/champion_maceman.xml + units/mauryans/infantry_maceman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml (revision 21202) @@ -1,12 +1,12 @@ maur Indian War Elephant Gajendra units/maur_champion_elephant.png - units/mauryans/elephant_siege.xml + units/mauryans/elephantry_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml (revision 21202) @@ -1,25 +1,25 @@ 5.0 maur Chariot War Chariot Rath units/maur_champion_chariot units/maur_champion_chariot.png Deals Trample Damage. 5.0 50 - units/mauryans/chariot_a.xml + units/mauryans/chariot_archer_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml (revision 21202) @@ -1,13 +1,13 @@ maur female Maiden Guard Archer Visha Kanya units/maur_champion_maiden_archer.png - units/mauryans/champion_maiden_guard_archer.xml + units/mauryans/infantry_archer_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/mauryans/elephant_archer_e.xml + units/mauryans/elephantry_archer_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml (revision 21202) @@ -1,25 +1,25 @@ maur Chandragupta Maurya Chandragupta Maurya units/maur_hero_chandragupta.png 0.7 units/maur_champion_maiden_archer 1.0 1.0 1.0 1.0 - units/mauryans/elephant_hero.xml + units/mauryans/hero_elephantry_maurya_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml (revision 21202) @@ -1,19 +1,19 @@ 5 0 80 pers Persian Apple Bearer Arštibara units/pers_arstibara.png - units/persians/apple_bearer.xml + units/persians/infantry_spearman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/pers_cavalry_javelinist_e - units/persians/cavalry_javelinist_a.xml + units/persians/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml (revision 21202) @@ -1,17 +1,17 @@ pers units/pers_cavalry_spearman_b Cappadocian Cavalry Katpaduka Asabara units/pers_cavalry_spearman.png phase_town units/pers_cavalry_spearman_a - units/persians/cavalry_spearman_b.xml + units/persians/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml (revision 21202) @@ -1,12 +1,12 @@ pers Bactrian Heavy Cavalry Archer Bakhtrish Asabara units/pers_champion_cavalry.png - units/persians/champion_unit_2_archer.xml + units/persians/cavalry_archer_c_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml (revision 21202) @@ -1,20 +1,20 @@ units/heroes/pers_hero_darius 5.0 pers Chariot Darius The Great Darayavahush I units/pers_hero_darius.png - units/persians/hero_darius_chariot.xml + units/persians/hero_chariot_archer_darius_m.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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml (revision 21202) @@ -1,19 +1,19 @@ 0 2 pers Cardaces Skirmisher Peltastes Kardakes units/pers_kardakes_skirmisher.png Mercenary - units/persians/kardakes_skirmisher.xml + units/persians/infantry_javelinist_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/ptol_cavalry_javelinist_merc_e - units/macedonians/cavalry_javelinist_a.xml + units/macedonians/cavalry_javelinist_a_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml (revision 21202) @@ -1,77 +1,77 @@ 1.0 2.0 1.5 1.5 1.5 0.75 200 80 20 8.0 2.0 maur Elephant Archer units/maur_cavalry_archer.png phase_town units/maur_elephant_archer_b Vachii Gaja Elephant -Cavalry 260 25 10 0 5 units/maur_elephant_archer_a circle/256x256.png circle/256x256_mask.png actor/fauna/animal/elephant_order.xml actor/fauna/animal/elephant_attack_order.xml actor/fauna/animal/elephant_death.xml actor/fauna/animal/elephant_trained.xml large 0.5 0.5 - units/mauryans/elephant_archer_b.xml + units/mauryans/elephantry_archer_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml (revision 21202) @@ -0,0 +1,16 @@ + + + + units/heroes/maur_hero_ashoka + + + maur + 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. + + + units/mauryans/hero_infantry_archer_ashoka.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml (revision 21202) @@ -1,21 +1,21 @@ 0 2 gaia greek Heavy Skirmisher Thyreophóros units/mace_thureophoros.png phase_city Mercenary - units/macedonians/thureophoros.xml + units/hellenes/infantry_javelinist_c_thureophoros.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/persians/cavalry_archer_e.xml + units/persians/chariot_archer_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/pers_cavalry_spearman_e - units/persians/cavalry_spearman_a.xml + units/persians/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml (revision 21202) @@ -1,12 +1,12 @@ pers Bactrian Heavy Lancer Bakhtrish Asabara units/pers_champion_cavalry.png - units/persians/champion_unit_2.xml + units/persians/cavalry_spearman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml (revision 21202) @@ -1,28 +1,28 @@ units/heroes/pers_hero_cyrus pers Cyrus II The Great Kurush II units/pers_hero_cyrus.png 0.7 units/pers_champion_infantry 1.0 1.0 1.0 1.0 - units/persians/hero_cyrus.xml + units/persians/hero_cavalry_spearman_cyrus_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml (revision 21202) @@ -1,19 +1,19 @@ 0 2 pers Cardaces Hoplite Hoplites Kardakes units/pers_kardakes.png Mercenary - units/persians/kardakes_hoplite.xml + units/persians/infantry_spearman_c3.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml (revision 21202) @@ -0,0 +1,10 @@ + + + + Elite + + + + units/ptolemies/camelry_archer_e_m.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/maur_elephant_archer_e - units/mauryans/elephant_archer_a.xml + units/mauryans/elephantry_archer_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/maur_hero_chanakya_1 units/heroes/maur_hero_chanakya_2 maur Acharya Chanakya Acharya Chāṇakya units/maur_hero_chanakya.png - units/mauryans/hero_chanakya.xml + units/mauryans/hero_healer_chanakya.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml (revision 21202) @@ -1,30 +1,30 @@ 2 2 -2 0 2 gaia greek Armored Swordsman Thōrakitēs units/mace_thorakites.png phase_city Mercenary - units/macedonians/thorakites.xml + units/hellenes/infantry_swordsman_c_thorakites.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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml (revision 21202) @@ -1,29 +1,29 @@ 5.0 pers Chariot units/pers_cavalry_archer_b Babylonian Scythed Chariot Babiruviya Ratha units/pers_chariot_archer.png Causes trample damage to enemy units. phase_town units/pers_cavalry_archer_a 5.0 50 - units/persians/cavalry_archer_b.xml + units/persians/chariot_archer_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/persians/cavalry_javelinist_e.xml + units/persians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml (revision 21202) @@ -1,17 +1,17 @@ pers units/pers_cavalry_swordsman_b Hyrcanian Cavalry Varkaniya Asabara units/pers_cavalry_swordsman.png phase_town units/pers_cavalry_swordsman_a - units/persians/cavalry_swordsman_b.xml + units/persians/cavalry_swordsman_b_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml (revision 21202) @@ -1,13 +1,13 @@ pers Persian Immortal Anusiya Immortal units/pers_champion_infantry.png - units/persians/champion_unit_1.xml + units/persians/infantry_spearman_c2.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml (revision 21202) @@ -1,20 +1,20 @@ units/heroes/pers_hero_xerxes 5.0 pers Chariot Xerxes I Xsayarsa I units/pers_hero_xerxes.png - units/persians/hero_xerxes_chariot.xml + units/persians/hero_chariot_archer_xerxes_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml (revision 21202) @@ -0,0 +1,25 @@ + + + + ptol + Camel + units/ptol_camelry_archer + Nabataean Camel Archer + Mutsābiq Gamal Nabatu + units/ptol_camelry_archer.png + phase_village + + + units/ptol_camelry_archer_a + + + + + actor/fauna/movement/camel_order.xml + actor/fauna/death/death_camel.xml + + + + units/ptolemies/camelry_archer_b_m.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml (revision 21202) @@ -1,22 +1,22 @@ units/heroes/maur_hero_ashoka 5.0 maur Ashoka the Great Aśoka Devānāmpriya Ashoka Chariot units/maur_hero_ashoka.png Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime. - units/mauryans/hero_chariot.xml + units/mauryans/hero_chariot_archer_ashoka_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml (revision 21202) @@ -1,22 +1,22 @@ 0.5 0 1.5 gaia greek Thracian Black Cloak Rhomphaiaphoros Mercenary units/sele_infantry_swordsman.png phase_town - units/hellenes/thracian_blackcloak.xml + units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/pers_cavalry_archer_e - units/persians/cavalry_archer_a.xml + units/persians/chariot_archer_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml (revision 21202) @@ -1,16 +1,16 @@ pers units/pers_cavalry_javelinist_b Median Light Cavalry Mada Asabara units/pers_cavalry_javelinist.png units/pers_cavalry_javelinist_a - units/persians/cavalry_javelinist_b.xml + units/persians/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/persians/cavalry_spearman_e.xml + units/persians/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml (revision 21202) @@ -1,12 +1,12 @@ pers Indian War Elephant Hinduya Pila units/pers_champion_elephant.png - units/persians/war_elephant.xml + units/persians/elephantry_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/pers_hero_xerxes pers Xerxes I Xsayarsa I units/pers_hero_xerxes.png - units/persians/hero_xerxes.xml + units/persians/hero_infantry_archer_xerxes.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml (revision 21202) @@ -0,0 +1,12 @@ + + + + Advanced + + + units/ptol_camelry_archer_e + + + units/ptolemies/camelry_archer_a_m.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml (revision 21202) @@ -1,24 +1,24 @@ -25 25 ptol units/ptol_cavalry_javelinist_merc_b Tarantine Settler Cavalry Hippeús Tarantînos Mercenary units/mace_cavalry_javelinist.png phase_town units/ptol_cavalry_javelinist_merc_a - units/macedonians/cavalry_javelinist_b.xml + units/macedonians/cavalry_javelinist_b_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml (revision 21202) @@ -1,24 +1,24 @@ -25 25 ptol units/ptol_cavalry_spearman_merc_b Macedonian Settler Cavalry Hippeús Makedonikós Mercenary units/ptol_cavalry_spearman.png phase_town units/ptol_cavalry_spearman_merc_a - units/ptolemies/cavalry_spearman_b.xml + units/ptolemies/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/ptol_cavalry_spearman_merc_e - units/ptolemies/cavalry_spearman_a.xml + units/ptolemies/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml (revision 21202) @@ -1,12 +1,12 @@ ptol Towered War Elephant Polémou Eléphantos units/ptol_champion_elephant.png - units/ptolemies/champion_elephant.xml + units/ptolemies/elephantry_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/macedonians/cavalry_javelinist_e.xml + units/macedonians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml (revision 21202) @@ -1,12 +1,12 @@ ptol Royal Guard Cavalry Ágēma Basiléōs units/ptol_champion_cavalry.png - units/ptolemies/champion_cavalry.xml + units/ptolemies/cavalry_spearman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/ptolemies/cavalry_spearman_e.xml + units/ptolemies/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml (revision 21202) @@ -1,13 +1,13 @@ ptol greek Royal Guard Infantry Phalangitès Agema units/ptol_champion_infantry.png - units/ptolemies/champion_infantry.xml + units/ptolemies/infantry_pikeman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/ptol_infantry_pikeman_e - units/ptolemies/infantry_spearman_a.xml + units/ptolemies/infantry_pikeman_a.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml (revision 21202) @@ -1,30 +1,30 @@ structures/ptol_military_colony structures/ptol_lighthouse structures/ptol_library -25 25 ptol units/ptol_infantry_spearman_merc_b Mercenary Thureos Spearman Thureophóros Misthophóros Mercenary units/ptol_infantry_spearman_2.png units/ptol_infantry_spearman_merc_a - units/ptolemies/infantry_spearman_2_b.xml + units/ptolemies/infantry_spearman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/romans/cavalry_javelinist_e.xml + units/romans/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml (revision 21202) @@ -1,22 +1,22 @@ 20 140 rome latin Roman Centurion Centurio Legionarius units/rome_champion_legion_centurio.png - units/romans/imp_rome_champion_1.xml + units/romans/infantry_swordsman_c4.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml (revision 21202) @@ -0,0 +1,15 @@ + + + + units/heroes/rome_hero_maximus + + + rome + latin + Quintus Fabius Maximus + units/rome_hero_maximus.png + + + units/romans/hero_infantry_swordsman_maximus.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml (revision 21202) @@ -1,22 +1,22 @@ 18.5 rome latin Roman Legionnaire Legionarius Romanus units/rome_champion_legion_imperial.png units/rome_centurio_imperial 300 - units/romans/champion_unit_4_imp_legion.xml + units/romans/infantry_swordsman_c3.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml (revision 21202) @@ -1,13 +1,13 @@ gaia Samnite Swordsman Samnite Swordsman Mercenary units/samnite_swordsman.png - units/carthaginians/samnite_swordsman.xml + units/carthaginians/infantry_swordsman_2_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/sele_cavalry_javelinist_e - units/athenians/cavalry_javelinist_a.xml + units/athenians/cavalry_javelinist_a_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml (revision 21202) @@ -1,25 +1,25 @@ -25 25 sele greek units/sele_cavalry_spearman_merc_b Companion Cavalry Hippos Hetairike Mercenary phase_town units/mace_cavalry_spearman.png units/sele_cavalry_spearman_merc_a - units/macedonians/cavalry_spearman_b.xml + units/macedonians/cavalry_spearman_b_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/ptol_hero_ptolemy_IV ptol Ptolemy IV "Father Loving" Ptolemaios D' Philopator PtolemyIV units/mace_hero_philip.png - units/ptolemies/hero_ptolemy_IV.xml + units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/ptol_infantry_spearman_merc_e - units/ptolemies/infantry_spearman_2_a.xml + units/ptolemies/infantry_spearman_a.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml (revision 21202) @@ -1,18 +1,18 @@ rome latin units/rome_cavalry_javelinist_b Italian Allied Cavalry Eques Socius units/rome_cavalry_javelinist.png phase_town units/rome_cavalry_javelinist_a - units/romans/cavalry_javelinist_b.xml + units/romans/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/romans/cavalry_spearman_e.xml + units/romans/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml (revision 21202) @@ -0,0 +1,17 @@ + + + + units/heroes/rome_hero_marcellus_1 + units/heroes/rome_hero_marcellus_2 + + + rome + latin + Marcus Claudius Marcellus + units/rome_hero_marcellus.png + + + units/romans/hero_infantry_swordsman_marcellus.xml + + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/rome_hero_scipio rome latin Scipio Africanus units/rome_hero_scipio.png - units/romans/hero_scipio_horse.xml + units/romans/hero_cavalry_swordsman_scipio_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml (revision 21202) @@ -1,13 +1,13 @@ gaia Samnite Spearman Samnite Spearman Mercenary units/samnite_spearman.png - units/carthaginians/samnite_spearman.xml + units/carthaginians/infantry_spearman_c_samnite.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/seleucids/cavalry_archer_e.xml + units/seleucids/cavalry_archer_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/sele_cavalry_spearman_merc_e - units/macedonians/cavalry_spearman_a.xml + units/macedonians/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/ptol_hero_ptolemy_I_1 units/heroes/ptol_hero_ptolemy_I_2 ptol Ptolemy I "Savior" Ptolemaios A' Soter units/hele_hero_alexander.png - units/ptolemies/hero_ptolemy_I_mount.xml + units/ptolemies/hero_elephantry_ptolemy_I_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/ptolemies/infantry_spearman_e.xml + units/ptolemies/infantry_pikeman_e.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/rome_cavalry_javelinist_e - units/romans/cavalry_javelinist_a.xml + units/romans/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml (revision 21202) @@ -1,17 +1,17 @@ rome latin units/rome_cavalry_spearman_b Roman Cavalry Eques Romanus units/rome_cavalry_spearman.png units/rome_cavalry_spearman_a - units/romans/cavalry_spearman_b.xml + units/romans/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml (revision 21202) @@ -1,14 +1,14 @@ rome latin Italic Heavy Infantry Extraordinarius units/rome_champion_infantry units/rome_champion_infantry.png - units/romans/champion_unit_1.xml + units/romans/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml (revision 21202) @@ -1,15 +1,15 @@ units/heroes/rome_hero_maximus rome latin Quintus Fabius Maximus units/rome_hero_maximus.png - units/romans/hero_maximus_horse.xml + units/romans/hero_cavalry_swordsman_maximus_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml (revision 21202) @@ -1,13 +1,13 @@ gaia Samnite Skirmisher Samnite Skirmisher Mercenary units/samnite_skirmisher.png - units/carthaginians/samnite_skirmisher.xml + units/carthaginians/infantry_javelinist_c_samnite.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml (revision 21202) @@ -1,18 +1,18 @@ sele greek units/sele_cavalry_archer_b Dahae Horse Archer Hippotoxotès Dahae units/sele_cavalry_archer.png phase_town units/sele_cavalry_archer_a - units/seleucids/cavalry_archer_b.xml + units/seleucids/cavalry_archer_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/athenians/cavalry_javelinist_e.xml + units/athenians/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml (revision 21202) @@ -1,18 +1,18 @@ units/heroes/ptol_hero_cleopatra_1 units/heroes/ptol_hero_cleopatra_2 units/heroes/ptol_hero_cleopatra_3 ptol female Cleopatra VII Kleopatra H' Philopator units/ptol_hero_cleopatra.png - units/ptolemies/hero_cleopatra.xml + units/ptolemies/hero_infantry_archer_cleopatra.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml (revision 21202) @@ -1,23 +1,23 @@ structures/ptol_military_colony structures/ptol_lighthouse structures/ptol_library ptol units/ptol_infantry_pikeman_b Egyptian Pikeman Phalaggomákhimos units/ptol_infantry_spearman.png units/ptol_infantry_pikeman_a - units/ptolemies/infantry_spearman_b.xml + units/ptolemies/infantry_pikeman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/ptolemies/infantry_spearman_2_e.xml + units/ptolemies/infantry_spearman_e.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/rome_cavalry_spearman_e - units/romans/cavalry_spearman_a.xml + units/romans/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml (revision 21202) @@ -1,14 +1,14 @@ rome latin Eques Consularis Consular Bodyguard units/rome_champion_cavalry.png units/rome_champion_cavalry - units/romans/champion_unit_2.xml + units/romans/cavalry_swordsman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/rome_hero_marcellus_1 units/heroes/rome_hero_marcellus_2 rome latin Marcus Claudius Marcellus units/rome_hero_marcellus.png - units/romans/hero_marcellus_horse.xml + units/romans/hero_cavalry_swordsman_marcellus_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml (revision 21202) @@ -1,18 +1,18 @@ rome latin Marian Legionaire Marian Legionarius units/rome_champion_legion_marian.png units/rome_legionnaire_marian units/rome_legionnaire_imperial 150 - units/romans/champion_unit_3.xml + units/romans/infantry_swordsman_c2.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/sele_cavalry_archer_e - units/seleucids/cavalry_archer_a.xml + units/seleucids/cavalry_archer_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml (revision 21202) @@ -1,17 +1,17 @@ sele greek units/sele_cavalry_javelinist_b Militia Cavalry Hippakontistès Politès units/sele_cavalry_javelinist.png units/sele_cavalry_javelinist_a - units/athenians/cavalry_javelinist_b.xml + units/athenians/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml (revision 21202) @@ -1,13 +1,13 @@ sele greek Armored War Elephant Thorakisménos Eléphantos units/maur_champion_elephant.png - units/seleucids/champion_elephant.xml + units/seleucids/elephantry_c_m.xml 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 (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml (revision 21202) @@ -1,25 +1,25 @@ 5.0 sele greek Chariot Scythed Chariot Drepanèphoros units/sele_champion_chariot.png successors/unlock_traditional_army 5.0 50 - units/seleucids/champion_chariot.xml + units/seleucids/chariot_archer_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml (revision 21202) @@ -1,14 +1,14 @@ sele greek Seleucid Cataphract Seleukidón Kataphraktos units/sele_champion_cavalry.png successors/unlock_reform_army - units/seleucids/champion_cataphract.xml + units/seleucids/cavalry_spearman_c_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml (revision 21202) @@ -1,14 +1,14 @@ sele greek Romanized Heavy Swordsman Thorakitès Rhomaïkós units/sele_champion_swordsman.png successors/unlock_reform_army - units/seleucids/champion_infantry_swordsman.xml + units/seleucids/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/macedonians/cavalry_spearman_e.xml + units/macedonians/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml (revision 21202) @@ -1,14 +1,14 @@ sele greek Silver Shield Pikeman Phalangitès Argyraspis units/sele_champion_pikeman.png successors/unlock_traditional_army - units/seleucids/champion_infantry_pikeman.xml + units/seleucids/infantry_pikeman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/sele_hero_antiochus_righteous sele greek Antiochus IV "The Righteous" Antiokhos D' Epiphanes units/sele_hero_antiochus_the_righteous.png - units/ptolemies/hero_ptolemy_IV.xml + units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/seleucids/thureophoros_e.xml + units/seleucids/infantry_spearman_e.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/spart_cavalry_spearman_e - units/spartans/cavalry_spearman_a.xml + units/spartans/cavalry_spearman_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml (revision 21202) @@ -1,13 +1,13 @@ spart greek Spartan Hoplite Spartiátēs units/spart_champion_infantry_spear.png - units/spartans/champion_infantry.xml + units/spartans/infantry_spearman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/spart_hero_leonidas spart greek Leonidas I Leōnídēs units/spart_hero_leonidas.png - units/spartans/leonidas.xml + units/spartans/hero_infantry_spearman_leonidas.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/sele_hero_antiochus_great sele greek Antiochus III "The Great" Antiokhos G' Mégās units/sele_hero_antiochus_the_great.png - units/seleucids/hero_antiochus_the_great_cav.xml + units/seleucids/hero_cavalry_spearman_antiochus_the_great_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml (revision 21202) @@ -1,23 +1,23 @@ structures/sele_military_colony structures/sele_library sele greek units/sele_infantry_spearman_b Militia Thureos Spearman Thureophóros Politès units/sele_infantry_spearman_2.png units/sele_infantry_spearman_a - units/seleucids/thureophoros_b.xml + units/seleucids/infantry_spearman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/spartans/cavalry_javelinist_e.xml + units/spartans/cavalry_javelinist_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml (revision 21202) @@ -1,13 +1,13 @@ spart greek Spartan Pikeman Phalangites Spartiatis units/spart_champion_infantry_pike.png - units/spartans/champion_pikeman.xml + units/spartans/infantry_pikeman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/spart_hero_brasidas spart greek Brasidas Brasidas units/spart_hero_brasidas.png - units/spartans/brasidas.xml + units/spartans/hero_infantry_swordsman_brasidas.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/sele_infantry_spearman_e - units/seleucids/thureophoros_a.xml + units/seleucids/infantry_spearman_a.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml (revision 21202) @@ -1,17 +1,17 @@ spart greek units/spart_cavalry_javelinist_b Perioikoi Cavalryman Pródromos Perioïkós units/spart_cavalry_javelinist.png units/spart_cavalry_javelinist_a - units/spartans/cavalry_javelinist_b.xml + units/spartans/cavalry_javelinist_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml (revision 21202) @@ -1,10 +1,10 @@ Elite - units/spartans/cavalry_spearman_e.xml + units/spartans/cavalry_spearman_e_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml (revision 21202) @@ -1,16 +1,16 @@ 2000 spart greek Agis III Agis units/spart_hero_agis.png - units/spartans/agis.xml + units/spartans/hero_infantry_spearman_agis.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml (revision 21202) @@ -1,14 +1,14 @@ gaia greek Theban Sacred Band Hoplite Hieroû Thebaíou Lókhou Hoplítai Champion Spearman. units/thebes_sacred_band_hoplitai.png - units/hellenes/champion_sacred_band.xml + units/hellenes/infantry_spearman_c_sacred_band.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml (revision 21202) @@ -1,16 +1,16 @@ units/heroes/sele_hero_seleucus_victor sele greek Seleucus I "The Victor" Seleukos A' Nikator units/sele_hero_seleucus.png - units/seleucids/hero_seleucus_victor_mount.xml + units/seleucids/hero_elephantry_seleucus_victor_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml (revision 21202) @@ -1,12 +1,12 @@ Advanced units/spart_cavalry_javelinist_e - units/spartans/cavalry_javelinist_a.xml + units/spartans/cavalry_javelinist_a_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml (revision 21202) @@ -1,18 +1,18 @@ spart greek units/spart_cavalry_spearman_b Greek Allied Cavalry Hippeús Symmakhikós units/spart_cavalry_spearman.png phase_town units/spart_cavalry_spearman_a - units/spartans/cavalry_spearman_b.xml + units/spartans/cavalry_spearman_b_m.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml (revision 21202) @@ -1,35 +1,35 @@ structures/spart_syssiton structures/spart_theatron structures/spart_royal_stoa -structures/{civ}_wallset_stone -10.0 +20.0 +5 spart greek Skiritai Commando Ékdromos Skirítēs Elite units/spart_champion_infantry_sword.png phase_town 2.0 2.0 - units/spartans/champion_infantry_sword.xml + units/spartans/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml (revision 21202) @@ -1,9 +1,9 @@ units/spart_hero_leonidas_300.png - units/spartans/leonidas_300.xml + units/spartans/hero_infantry_spearman_leonidas_300.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml (revision 21201) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml (revision 21202) @@ -1,13 +1,13 @@ gaia greek Thespian Black Cloak Melanochitones units/thespian_melanochitones.png - units/hellenes/thespian.xml + units/hellenes/infantry_swordsman_c_thespian.xml