Some Internal stuff.

Gave trees uniform portraits. Fixed costs for ranged heroes. This was SVN commit r11495.
2012-04-14 06:02:45 +00:00 · 2012-04-14 06:02:45 +00:00 · 97a67662c5
commit 97a67662c5
parent 9028c354e6
49 changed files with 260 additions and 83 deletions
--- a/binaries/data/mods/internal/art/actors/props/units/heads/head_athen_pericles.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/heads/head_athen_pericles.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/head_pericles.dae</mesh>
+      <texture>props/head/xerxes.png</texture>
+    </variant>
+  </group>
+</actor>
--- a/binaries/data/mods/internal/art/actors/props/units/heads/mace_craterus.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/heads/mace_craterus.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Helmet-Chalcidean-Crested">
+      <mesh>props/helmet/mace_helmet_o.dae</mesh>
+      <texture>props/helmet/mace-g-silver.dds</texture>
+    </variant>
+  </group>
+  <material>playercolor_spec.xml</material>
+</actor>
--- a/binaries/data/mods/internal/art/actors/props/units/shields/athen_aspis_pericles.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/athen_aspis_pericles.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="base">
+      <mesh>props/shield/aspis_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/hele_aspis_back_black.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <texture>props/shield/hele_round_ae.dds</texture>
+    </variant>
+  </group>
+  <material>playercolor_spec.xml</material>
+</actor>
--- a/binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml
@ -5,7 +5,7 @@
    <variant frequency="1" name="base">
      <mesh>props/shield/aspis_f.dae</mesh>
      <props>
-        <prop actor="props/units/shields/mace_aspis_back_red.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/mace_silvershield_back.xml" attachpoint="root"/>
      </props>
    </variant>
  </group>
--- a/binaries/data/mods/internal/art/actors/props/units/shields/mace_round_craterus.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_round_craterus.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/aspis_sm_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back_red.xml" attachpoint="root"/>
+      </props>
+      <texture>props/shield/mace_round_craterus.png</texture>
+    </variant>
+  </group>
+  <material>playercolor_spec.xml</material>
+</actor>
--- a/binaries/data/mods/internal/art/actors/props/units/shields/mace_silvershield_back.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_silvershield_back.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/shield/aspis_b.dae</mesh>
+      <texture>props/shield/hele_aspis_back_silver.png</texture>
+    </variant>
+  </group>
+</actor>
--- a/binaries/data/mods/internal/art/actors/units/athenians/pericles.xml
+++ b/binaries/data/mods/internal/art/actors/units/athenians/pericles.xml
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="50"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="110"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="111"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/athen_pericles.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_athen_pericles.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/athen_aspis_pericles.xml" attachpoint="shield"/>
+        <prop actor="props/units/hero_star.xml" attachpoint="root"/>
+        <prop actor="props/units/cape_hd.xml" attachpoint="shoulders"/>
+      </props>
+      <texture>skeletal/hele_isp_e_f.dds</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Death">
+      <props>
+        <prop attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>playercolor_spec.xml</material>
+</actor>
--- a/binaries/data/mods/internal/art/actors/units/macedonians/craterus.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/craterus.xml
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="50"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="110"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="111"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="80"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="80"/>
+        <animation event="0.5" file="biped/not used/inf_2sword_attack_e.psa" name="Attack" speed="50"/>
+        <animation event="0.5" file="biped/not used/inf_2sword_attack_d.psa" name="Attack" speed="80"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/mace_craterus.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/mace_round_craterus.xml" attachpoint="shield"/>
+        <prop actor="props/units/hero_star.xml" attachpoint="root"/>
+        <prop actor="props/units/cape_hd.xml" attachpoint="shoulders"/>
+      </props>
+      <texture>skeletal/mace_hero_craterus.png</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Death">
+      <props>
+        <prop attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>playercolor_spec.xml</material>
+</actor>
--- a/binaries/data/mods/internal/art/actors/units/spartans/champion_infantry_sword.xml
+++ b/binaries/data/mods/internal/art/actors/units/spartans/champion_infantry_sword.xml
@ -43,23 +43,18 @@
        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
      <props>
        <prop actor="props/units/heads/hele_helmet_csw_e.xml" attachpoint="helmet"/>
        <prop actor="props/units/heads/head_spart_e.xml" attachpoint="head"/>
        <prop actor="props/units/shields/spart_aspis_skiritai.xml" attachpoint="shield"/>
        <prop actor="props/units/weapons/xiphos.xml" attachpoint="r_hand"/>
      </props>
-      <texture>skeletal/hele_tunic.dds</texture>
+      <texture>skeletal/mace_ijv_b.png</texture>
    </variant>
  </group>
  <group>
    <variant frequency="1" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
    <variant name="gather_tree">
      <props>
        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
--- a/binaries/data/mods/internal/art/actors/units/spartans/leonidas.xml
+++ b/binaries/data/mods/internal/art/actors/units/spartans/leonidas.xml
@ -8,7 +8,6 @@
        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="120"/>
        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="220"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
--- a/binaries/data/mods/internal/art/meshes/props/head_pericles.dae
+++ b/binaries/data/mods/internal/art/meshes/props/head_pericles.dae
--- a/binaries/data/mods/internal/art/meshes/props/helmet/hele_corinthian_pushed.dae
+++ b/binaries/data/mods/internal/art/meshes/props/helmet/hele_corinthian_pushed.dae
--- a/binaries/data/mods/internal/art/textures/skins/skeletal/mace_hero_craterus.png
+++ b/binaries/data/mods/internal/art/textures/skins/skeletal/mace_hero_craterus.png
--- a/binaries/data/mods/internal/art/textures/ui/session/portraits/units/athen_hero_pericles.png
+++ b/binaries/data/mods/internal/art/textures/ui/session/portraits/units/athen_hero_pericles.png
--- a/binaries/data/mods/internal/art/textures/ui/session/portraits/units/mace_hero_craterus.png
+++ b/binaries/data/mods/internal/art/textures/ui/session/portraits/units/mace_hero_craterus.png
--- a/binaries/data/mods/internal/maps/scenarios/The
+++ b/binaries/data/mods/internal/maps/scenarios/The
--- a/binaries/data/mods/internal/maps/scenarios/The
+++ b/binaries/data/mods/internal/maps/scenarios/The
--- a/binaries/data/mods/internal/simulation/templates/structures/athen_prytaneion.xml
+++ b/binaries/data/mods/internal/simulation/templates/structures/athen_prytaneion.xml
@ -36,8 +36,9 @@
  </Sound>
  <TrainingQueue>
    <Entities datatype="tokens">
-      units/hele_hero_themistocles
-      units/hele_hero_xenophon
+      units/athen_hero_themistocles
+      units/athen_hero_pericles
+      units/athen_hero_xenophon
    </Entities>
  </TrainingQueue>
  <VisualActor>
--- a/binaries/data/mods/internal/simulation/templates/units/athen_hero_pericles.xml
+++ b/binaries/data/mods/internal/simulation/templates/units/athen_hero_pericles.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_spearman">
+  <Auras>
+    <Fear>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Fear>
+  </Auras>
+  <Identity>
+    <Civ>athen</Civ>
+	<GenericName>Pericles</GenericName>
+    <SpecificName>Periklēs</SpecificName>
+    <Tooltip>Hero Aura: Buildings construct much faster within his vision. Temples are much cheaper during his lifetime.</Tooltip>
+    <History>.</History>
+    <Icon>units/athen_hero_pericles.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/pericles.xml</Actor>
+  </VisualActor>
+</Entity>
--- a/binaries/data/mods/internal/simulation/templates/units/mace_hero_craterus.xml
+++ b/binaries/data/mods/internal/simulation/templates/units/mace_hero_craterus.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_swordsman">
+  <Auras>
+    <Courage>
+      <Radius>20</Radius>
+      <Bonus>5</Bonus>
+    </Courage>
+  </Auras>
+  <Identity>
+    <Civ>mace</Civ>
+    <GenericName>Crateros</GenericName>
+    <SpecificName>Kraterós</SpecificName>
+    <Tooltip>Trusted general under Alexander the Great.</Tooltip>
+    <History>.</History>
+    <Icon>units/mace_hero_craterus.png</Icon>
+  </Identity>
+  <Vision>
+    <Range>66</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>units/macedonians/craterus.xml</Actor>
+  </VisualActor>
+</Entity>
--- a/binaries/data/mods/public/art/actors/flora/trees/palm_tropical.xml
+++ b/binaries/data/mods/public/art/actors/flora/trees/palm_tropical.xml
@ -1,35 +1,27 @@
-<?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="mesh-a">
-      <mesh>gaia/palm_desert_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mesh-b">
-      <mesh>gaia/palm_desert_b.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mesh-c">
-      <mesh>gaia/palm_desert_c.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mesh-d">
-      <mesh>gaia/palm_desert_d.dae</mesh>
+    <variant frequency="100" name="texture">
+      <texture>gaia/tree_palm_2_a.png</texture>
    </variant>
  </group>
-
  <group>
-    <variant frequency="1" name="texture-palm-brown">
-      <texture>gaia/tree_palm_a.dds</texture>
+    <variant frequency="2" name="tropical palm straight">
+      <mesh>gaia/tree_palm_tropical_01.dae</mesh>
    </variant>
-    <variant frequency="4" name="texture-palm-b">
-      <texture>gaia/tree_palm_b.dds</texture>
+    <variant frequency="1" name="tropical palm bent">
+      <mesh>gaia/tree_palm_tropical_02.dae</mesh>
    </variant>
-    <variant frequency="2" name="texture-palm-c">
-      <texture>gaia/tree_palm_c.dds</texture>
+    <variant frequency="1" name="tropical palm dual swayed">
+      <mesh>gaia/tree_palm_tropical_03.dae</mesh>
+    </variant>
+    <variant frequency="1" name="tropical palm dual">
+      <mesh>gaia/tree_palm_tropical_04.dae</mesh>
+    </variant>
+    <variant frequency="1" name="tropical palm triple">
+      <mesh>gaia/tree_palm_tropical_05.dae</mesh>
    </variant>
  </group>
-
-  <material>basic_trans.xml</material>
-
+  <material>alphatest.xml</material>
 </actor>
--- a/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_soft_dry_small_tall.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 name="a">
      <mesh>gaia/grass_sm_tall_a.dae</mesh>
@ -11,13 +9,10 @@
      <mesh>gaia/grass_sm_tall_b.dae</mesh>
    </variant>
  </group>
-
  <group>
    <variant>
      <texture>gaia/grass_field_dry.dds</texture>
    </variant>
  </group>
-
-  <material>basic_trans.xml</material>
-
+  <material>alphatest.xml</material>
 </actor>
--- a/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml
+++ b/binaries/data/mods/public/art/actors/props/flora/grass_tropic_field_tall.xml
@ -10,5 +10,5 @@
      <texture>gaia/grass_tropic_a.png</texture>
    </variant>
  </group>
-  <material>basic_trans.xml</material>
+  <material>alphatest.xml</material>
 </actor>
--- a/binaries/data/mods/public/art/actors/props/units/heads/hele_themistocles.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/hele_themistocles.xml
@ -2,9 +2,6 @@
 <actor version="1">
  <castshadow/>
  <group>
-    <variant frequency="1" name="Helmet-Crest">
-      <mesh>props/helmet/hele_helmet_o.dae</mesh>
-    </variant>
    <variant frequency="1" name="Helmet-High Crest">
      <mesh>props/helmet/hele_themistocles_highcrest.dae</mesh>
    </variant>
--- a/binaries/data/mods/public/art/actors/props/units/shields/hele_round_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/hele_round_e.xml
@ -35,9 +35,6 @@
    <variant frequency="1" name="shield-ad-octopus">
      <texture>props/shield/hele_round_ad.dds</texture>
    </variant>
-    <variant frequency="1" name="shield-ae-helmet">
-      <texture>props/shield/hele_round_ae.dds</texture>
-    </variant>
    <variant frequency="1" name="shield-af-winged creatures">
      <texture>props/shield/hele_round_af.dds</texture>
    </variant>
--- a/binaries/data/mods/public/art/actors/props/units/shields/hele_round_themistocles.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/hele_round_themistocles.xml
@ -5,7 +5,7 @@
    <variant name="base">
      <mesh>props/shield/aspis_f.dae</mesh>
      <props>
-        <prop actor="props/units/shields/hele_aspis_back.xml" attachpoint="root"/>
+        <prop actor="props/units/shields/hele_aspis_back_black.xml" attachpoint="root"/>
      </props>
    </variant>
  </group>
--- a/binaries/data/mods/public/art/actors/units/carthaginians/siege_rock.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/siege_rock.xml
@ -4,7 +4,7 @@
  <group>
    <variant frequency="100" name="carthaginian ballista">
      <animations>
-        <animation event="0.5" load="0" name="melee" speed="100"/>
+        <animation event="0.75" file="mechanical/rome_ballista_atttack.dae" load="0.7" name="melee" speed="100"/>
      </animations>
      <mesh>structural/kart_ballista.dae</mesh>
      <props>
--- a/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_persia_rocks.png
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_persia_rocks.png
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_aleppo_pine.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_aleppo_pine.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Aleppo Pine Tree</SpecificName>
    <History>This pine has an irregular shap and can be found in the highlands of the Mediterranean area.</History>
-    <Icon>gaia/flora_tree_aleppo_pine.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/aleppo_pine.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
@ -7,7 +7,7 @@
  <Identity>
    <SpecificName>Apple Tree</SpecificName>
    <History>Apple trees bear delicious fruit and are bountiful.</History>
-    <Icon>gaia/flora_tree_apple.png</Icon>
+    <Icon>gaia/flora_bush_berry.png</Icon>
  </Identity>
  <Obstruction>
    <Unit radius="0.9"/>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
@ -7,7 +7,6 @@
  <Identity>
    <SpecificName>Baobab</SpecificName>
    <History>The baobab is the giant African tree that dots the landscape of the African savanna.</History>
-    <Icon>gaia/flora_tree_baobab.png</Icon>
  </Identity>
  <ResourceSupply>
    <Amount>400</Amount>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_carob.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_carob.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Carob Tree</SpecificName>
    <History>The carob is a leafed evergreen common in the Aegean Sea region.</History>
-    <Icon>gaia/flora_tree_carob.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/carob.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml
@ -7,7 +7,6 @@
  <Identity>
    <SpecificName>Cretan Date Palm</SpecificName>
    <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
-    <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
  </Identity>
  <Obstruction>
    <Unit radius="2.25"/>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Cretan Date Palm</SpecificName>
    <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
-    <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
  </Identity>
  <ResourceSupply>
    <Amount>100</Amount>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_tall.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_tall.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Cretan Date Palm</SpecificName>
    <History>The Cretan Date Palm is an palm tree generally found on the island of Crete, but in ancient times its range spanned the entire Aegean Sea. The Peloponnese had Cretan Date Palm forests along its shores.</History>
-    <Icon>gaia/flora_tree_cretan_date_palm.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/palm_cretan_date_tall.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cypress.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cypress.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Cypress Tree</SpecificName>
    <History>Pliny narrates several remarkable, but not incredible, instances of the durability of Cypress-wood. He says that there were in his time Cypresses still standing at Rome which were more ancient than the city itself; but that the tree was not a native of Italy, having been originally introduced from Greece to the Greek colony of Tarentum; whence, indeed, Cato, in his work on "Rural Economy," recommends that its seed should be procured. The doors of the temple of Diana, at Ephesus, were, Pliny relates, of Cypress-wood, and appeared quite new when four centuries old; as did also the statue of Jupiter in the Capitol, which was of the same material and half as old again. The tree in his time was employed for rafters, joists, and especially for vine-props, so that a Cypress grove was thought a valuable dowry for a daughter.</History>
-    <Icon>gaia/flora_tree_cypress.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/mediterranean_cypress.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_date_palm.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_date_palm.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Date Palm</SpecificName>
    <History>The Date Palm is found all over the Southern and Eastern Mediterranean. Their fruit, the date, is an important food crop in ancient and modern times.</History>
-    <Icon>gaia/flora_tree_date_palm.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/palm_date.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
@ -8,7 +8,7 @@
    <SpecificName>Fig</SpecificName>
    <History>The Common Fig is widely grown for its edible fruit throughout its natural range in the Mediterranean region, North Africa, Persia, and northern India.</History>
    <Tooltip>Gather figs for Food.</Tooltip>
-    <Icon>gaia/flora_tree_apple.png</Icon>
+    <Icon>gaia/flora_bush_berry.png</Icon>
  </Identity>
  <ResourceSupply>
    <Amount>500</Amount>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_medit_fan_palm.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_medit_fan_palm.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Mediterranean Fan Palm</SpecificName>
    <History>The Mediterranean Fan Palm is common throughout low-lying areas around the Mediterranean Sea.</History>
-    <Icon>gaia/flora_tree_medit_fan_palm.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/palm_medit_fan_palm.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Pine Tree</SpecificName>
    <History>The pine is an evergreen conifer.</History>
-    <Icon>gaia/flora_tree_pine.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/pine.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine_animated.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_pine_animated.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Pine Tree</SpecificName>
    <History>The pine is an evergreen conifer.</History>
-    <Icon>gaia/flora_tree_pine.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/pine_animated.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Poplar Tree</SpecificName>
    <History>The poplar is a leafed deciduous.</History>
-    <Icon>gaia/flora_tree_poplar.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/poplar.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar_lombardy.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_poplar_lombardy.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Lombardy Poplar Tree</SpecificName>
    <History>The lombardy poplar is an leafed deciduous.</History>
-    <Icon>gaia/flora_tree_poplar_lombardy.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/lumbardypoplar.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_senegal_date_palm.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_senegal_date_palm.xml
@ -3,7 +3,6 @@
  <Identity>
    <SpecificName>Senegal Date Palm</SpecificName>
    <History>The Senegal Date Palm is an evergreen palm tree generally found on the continent of Africa. Their fruit, the date, is an important food crop in ancient and modern times.</History>
-    <Icon>gaia/flora_tree_senegal_date_palm.png</Icon>
  </Identity>
  <VisualActor>
    <Actor>flora/trees/palm_senegal_date.xml</Actor>
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@ -7,7 +7,7 @@
  </Armour>
  <Attack>
    <Ranged>
-      <Pierce>40.0</Pierce>
+      <Pierce>50.0</Pierce>
      <MaxRange>60</MaxRange>
 	  <Bonuses>
 		<BonusPrimary>
@ -23,7 +23,14 @@
  </Attack>
  <Cost>
    <BuildTime>35</BuildTime>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
  </Cost>
+  <Health>
+    <Max>750</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
  <Identity>
    <GenericName>Hero Archer</GenericName>
    <Classes datatype="tokens">Hero</Classes>
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@ -7,7 +7,7 @@
  </Armour>
  <Attack>
    <Ranged>
-      <Pierce>50.0</Pierce>
+      <Pierce>55.0</Pierce>
 	  <Bonuses>
 		<BonusPrimary>
 		  <Classes>Infantry Spear</Classes>
@ -30,7 +30,14 @@
  </Attack>
  <Cost>
    <BuildTime>35</BuildTime>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
  </Cost>
+  <Health>
+    <Max>750</Max>
+    <RegenRate>0.5</RegenRate>
+  </Health>
  <Identity>
    <Classes datatype="tokens">Hero</Classes>
    <GenericName>Hero Skirmisher</GenericName>
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@ -44,11 +44,6 @@
    <stone>0</stone>
    <metal>10</metal>
  </Loot>
-  <Sound>
-    <SoundGroups>
-      <select>attack/siege/siege_select.xml</select>
-    </SoundGroups>
-  </Sound>
  <UnitMotion>
    <WalkSpeed>6.5</WalkSpeed>
    <Run>
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@ -45,7 +45,7 @@
  </Loot>
  <Sound>
    <SoundGroups>
-      <select>attack/siege/siege_select.xml</select>
+      <attack>attack/siege/ballist_attack.xml</attack>
    </SoundGroups>
  </Sound>
  <StatusBars>
--- a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista.xml
@ -29,11 +29,6 @@
  <Obstruction>
    <Unit radius="3.5"/>
  </Obstruction>
-  <Sound>
-    <SoundGroups>
-      <attack>attack/siege/ballist_attack.xml</attack>
-    </SoundGroups>
-  </Sound>
  <Vision>
    <Range>94</Range>
  </Vision>