From ede48a077b61edde3e7efb20e21ac6b67a9a881e Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sun, 8 May 2011 03:24:12 +0000
Subject: [PATCH] Edited some actors so that the melee sound effect happens at
 the correct time. I may need to go through all of the melee cavalry unit
 actors and do this.

New Acropolis II map for Alpha 5. Nearly complete. Is already playable.

This was SVN commit r9478.
---
 .../actors/units/hellenes/cavalry_swordsman_a.xml  | 14 ++++----------
 .../units/hellenes/cavalry_swordsman_a_r.xml       |  4 ++--
 .../actors/units/hellenes/cavalry_swordsman_b.xml  |  4 ++--
 .../units/hellenes/cavalry_swordsman_b_r.xml       |  4 ++--
 .../actors/units/hellenes/cavalry_swordsman_e.xml  | 12 +++---------
 .../units/hellenes/cavalry_swordsman_e_r.xml       |  4 ++--
 .../art/actors/units/hellenes/super_unit_4.xml     |  4 ++--
 .../art/actors/units/hellenes/super_unit_4_r.xml   |  9 ++-------
 .../biome-mediterranean/medit_city_pavement.png    |  4 ++--
 .../mods/public/maps/scenarios/Acropolis II.pmp    |  3 +++
 .../mods/public/maps/scenarios/Acropolis II.xml    |  3 +++
 11 files changed, 27 insertions(+), 38 deletions(-)
 create mode 100644 binaries/data/mods/public/maps/scenarios/Acropolis II.pmp
 create mode 100644 binaries/data/mods/public/maps/scenarios/Acropolis II.xml

diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml
index f3a1c4f335..03086760b8 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
-		<animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
@@ -20,7 +18,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="hyppikon-horse-texture-plain">
       <texture>skeletal/horse_hele_a_1.dds</texture>
@@ -29,7 +26,6 @@
       <texture>skeletal/horse_hele_a_2.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="horse-color-bay">
       <colour>228 107 27</colour>
@@ -50,7 +46,5 @@
       <colour>209 203 131</colour>
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml
index 02ec4e4c8f..d7682ec77e 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml
@@ -7,8 +7,8 @@
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
-        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="240"/>
         <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="400"/>
         <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="400"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml
index edb4299111..1638c54146 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b.xml
@@ -9,8 +9,8 @@
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
         <animation file="quadraped/horse_walk.psa" name="carry_food" speed="120"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml
index d6d0538f31..a7be07bcca 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml
@@ -7,8 +7,8 @@
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
-        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="240"/>
         <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="400"/>
         <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="400"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml
index 3d2c38e846..fb87729f63 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
@@ -10,8 +8,8 @@
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
@@ -20,13 +18,11 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="hyppikon-horse-texture-plain">
       <texture>skeletal/horse_hele_csw_e_1.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="horse-color-bay">
       <colour>228 107 27</colour>
@@ -47,7 +43,5 @@
       <colour>251 254 146</colour>
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml
index 2e280a10b0..c052faafb6 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml
@@ -7,8 +7,8 @@
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
-        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="240"/>
         <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="400"/>
         <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="400"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml
index c0f787362f..47bae262c4 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4.xml
@@ -7,8 +7,8 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="30"/>
-        <animation event="0.5" file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
-        <animation event="0.5" file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
+        <animation event="" file="quadraped/horse_attack_a.psa" name="melee" speed="20"/>
+        <animation event="" file="quadraped/horse_attack_b.psa" name="melee" speed="22"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="235"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml
index 8b6e122850..d1611c06c2 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="17"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-        <animation event="" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" load="" name="melee" speed="100"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" load="" name="melee" speed="400"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="225"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -21,7 +19,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="armor-linen linothorax">
       <texture>skeletal/hele_hetairoi_a.dds</texture>
@@ -33,7 +30,5 @@
       <texture>skeletal/hele_hetairoi_c.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png
index 9dca91f96d..e39f858f28 100644
--- a/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-mediterranean/medit_city_pavement.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc1e0e95d3e8dee2bca9aa610600ff2edf45f85715920385ef68bd2187e553e6
-size 582321
+oid sha256:ddb1dc845c35570d300619d637f45ecaf7e11fac6b2faf3409fd688bb1ed96fa
+size 609629
diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis II.pmp b/binaries/data/mods/public/maps/scenarios/Acropolis II.pmp
new file mode 100644
index 0000000000..8b6a5a2320
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Acropolis II.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffd0c7cb8e97381c0de8baac550c03b686d0458a0e2ac8923d00a092f53c24e8
+size 656981
diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis II.xml b/binaries/data/mods/public/maps/scenarios/Acropolis II.xml
new file mode 100644
index 0000000000..102d0f3f32
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Acropolis II.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6056f3b72e34a6ea077b55780b4459607a7f554c60072582595e9b0aa4d55195
+size 267993