Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/iphicrates.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/iphicrates.png =================================================================== --- ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/iphicrates.png (nonexistent) +++ ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/iphicrates.png (revision 14268) Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/iphicrates.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/pericles.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/pericles.png =================================================================== --- ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/pericles.png (nonexistent) +++ ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/pericles.png (revision 14268) Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/pericles.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/quinquereme.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/savanna_biome.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/themistocles.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/themistocles.png =================================================================== --- ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/themistocles.png (nonexistent) +++ ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/themistocles.png (revision 14268) Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/loading/tips/themistocles.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/product.psd =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/product.psd =================================================================== --- ps/trunk/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/product.psd (nonexistent) +++ ps/trunk/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/product.psd (revision 14268) Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/pregame/shell/logo/product.psd ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/watering_holes_skirmish.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/watering_holes_skirmish.png =================================================================== --- ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/watering_holes_skirmish.png (nonexistent) +++ ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/watering_holes_skirmish.png (revision 14268) Property changes on: ps/trunk/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/watering_holes_skirmish.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Watering Holes (4).xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/Watering Holes (4).xml (revision 14267) +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Watering Holes (4).xml (revision 14268) @@ -1,15296 +1,15296 @@ sunny 0.00140625 0.00195313 - + default 5 150 2.51953 0.863281 - + 0.258789 0 1 0.99 0.153125 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 1 2 3 4 4 4 4 4 4 4 4 4 4 4 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 \ No newline at end of file Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/special_iphicratean_reforms.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/special_iphicratean_reforms.json (revision 14267) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenes/special_iphicratean_reforms.json (revision 14268) @@ -1,11 +1,11 @@ { "genericName": "Iphicratean Reforms", - "description": "Athenian triremes can train Marines (Epibastes Athenaikos) and Cretan Mercenary Archers (Toxotes Kretikos).", + "description": "Athenian triremes can train Marines (Epibates Athenaikos) and Cretan Mercenary Archers (Toxotes Kretikos).", "cost": { "food": 300, "wood": 0, "stone": 0, "metal": 300 }, "requirements": {"tech": "phase_city"}, "requirementsTooltip": "Unlocked in City Phase.", "icon": "helmet_corinthian_crest.png", "researchTime": 60, "tooltip": "Athenian triremes can train Marines and Cretan Mercenary Archers.", "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_equine_transports.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_equine_transports.json (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/special_equine_transports.json (revision 14268) @@ -0,0 +1,11 @@ +{ + "genericName": "Equine Transports", + "description": "Early Achaemenid rulers acted towards making Persia the first great Asian empire to rule the seas. The Great King behaved favourably towards the various sea peoples in order to secure their services, but also carried out various marine initiatives. During the reign of Darius the Great, for example, a canal was built in Egypt and a Persian navy was sent exploring the Indus river. According to Herodotus, some 300 ships in the Persian navy were retrofitted to carry horses and their riders.", + "cost": { "food": 0, "wood": 300, "stone": 0, "metal": 300 }, + "requirements": {"tech": "phase_city"}, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "horse_rider.png", + "researchTime": 60, + "tooltip": "Phoenician Triremes gain the ability to train cavalry units.", + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_dock.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_dock.xml (revision 14267) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_dock.xml (revision 14268) @@ -1,27 +1,30 @@ 8.0 rubble/rubble_pers_dock pers Nāvašta Situated on the Mediterranean coast, all Phoenician cities had excellent docks and harbors, the outstanding example being Tyre, which was situated on an island close to the shore. units/pers_ship_bireme units/pers_ship_trireme + + persians/special_equine_transports + structures/persians/dock.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml (revision 14268) @@ -0,0 +1,29 @@ + + + + 2 + 4 + 2 + + + + 1.3 + 48 + + + + 160 + + + Advanced + + + units/pers_cavalry_javelinist_e_trireme + + + 0.75 + + + units/persians/cavalry_javelinist_a.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml (revision 14268) @@ -0,0 +1,21 @@ + + + + 15 + + + pers + units/pers_cavalry_javelinist_b + Median Light Cavalry + Mada Asabara + Just as the archers were the rock of the Persian infantry, the Persian cavalry was formed around the light cavalryman, or Asabari. Armed with javelins for long-ranged combat or close-quarter fighting, Asabari were also equipped with swords and axes. Since they were recruited from the upper classes many wore armor and helmets and their horses could also be fitted with light armor. + persians/special_equine_transports + units/pers_cavalry_javelinist.png + + + units/pers_cavalry_javelinist_a_trireme + + + units/persians/cavalry_javelinist_b.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml (revision 14268) @@ -0,0 +1,27 @@ + + + + 3 + 5 + 3 + + + + 1.0 + 52 + + + + 170 + + + Elite + + + + 0.5 + + + units/persians/cavalry_javelinist_e.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml (revision 14268) @@ -0,0 +1,37 @@ + + + + 2 + 6 + 5 + + + + 14.0 + + + 25.0 + + + + 160 + + + Advanced + + + units/pers_cavalry_swordsman_e_trireme + + + 0.75 + + + 12.5 + + 25.0 + + + + units/persians/cavalry_swordsman_a.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml (revision 14268) @@ -0,0 +1,24 @@ + + + + 15 + + 70 + + + + pers + units/pers_cavalry_swordsman_b + Hyrcanian Cavalry + Varkaniya Asabara + The Hyrcanians were the light cavalry of the Achaemenid Great Kings. These men were of superb quality, and are mentioned in every major Persian campaign. Their homeland of Hyrcania bordering the Caspian Sea was both a lush fertile rain forest and foreboding mountain country. + units/pers_cavalry_swordsman.png + persians/special_equine_transports + + + units/pers_cavalry_swordsman_a_trireme + + + units/persians/cavalry_swordsman_b.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml (revision 14268) @@ -0,0 +1,35 @@ + + + + 3 + 7 + 6 + + + + 25.0 + + + 30.0 + + + + 170 + + + Elite + + + + 0.5 + + + 12.0 + + 24.0 + + + + units/persians/cavalry_swordsman_e.xml + + Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml (revision 14267) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml (revision 14268) @@ -1,18 +1,24 @@ 8.0 pers Phoenician Trireme Vazarka Hamaraniyanava The first Triremes were built circa 650BC, and by 500BC the Trireme was the most widely used heavy warship of the Persian Empire. In the Trireme the outriggers were now an integral part of the ship's hull. The Trireme also had a partial or full fighting deck above the rowers. The length of the Trireme remained approximately 35-38 meters, and the beam was approximately 3.5 metres. A Trireme carried 170 oarsmen. The top speed of a Trireme was approximately 11.5 knots. Some Triremes may have been able to reach higher speeds in short bursts. The Trireme could accelerate much faster than a Bireme or Penteconter, and was much more manoeuvrable. This gave the Trireme an advantage in combat, where higher speed and manoeuvrability meant a better chance of victory. units/pers_ship_trireme.png - Medium Warship + + 0.8 + + units/pers_cavalry_swordsman_b_trireme + units/pers_cavalry_javelinist_b_trireme + + structures/persians/trireme.xml