From 36dbb573ab77e24949378cf62d2e782797a3ff11 Mon Sep 17 00:00:00 2001
From: Wijitmaker <jason@wildfiregames.com>
Date: Sat, 10 Feb 2007 18:53:49 +0000
Subject: [PATCH] Fixing of projectile size, and female gathering animation

This was SVN commit r4890.
---
 .../actors/props/units/weapons/jav_projectile.xml   | 13 +++++++++++++
 .../art/actors/units/celts/female_citizen.xml       |  2 +-
 .../actors/units/celts/infantry_javelinist_a.xml    |  2 +-
 .../actors/units/celts/infantry_javelinist_b.xml    |  2 +-
 .../actors/units/celts/infantry_javelinist_e.xml    |  2 +-
 .../art/actors/units/hellenes/female_citizen.xml    |  2 +-
 .../art/actors/units/hellenes/infantry_archer_a.xml |  3 +--
 .../art/actors/units/hellenes/infantry_archer_b.xml |  3 +--
 .../art/actors/units/hellenes/infantry_archer_e.xml |  3 +--
 .../actors/units/hellenes/infantry_javelinist_a.xml |  2 +-
 .../actors/units/hellenes/infantry_javelinist_b.xml |  2 +-
 .../actors/units/hellenes/infantry_javelinist_e.xml |  2 +-
 .../art/animation/infantry/general/forage_fem.psa   |  3 +++
 .../official/art/meshes/props/weap_arrow_back.pmd   |  4 ++--
 .../official/art/meshes/props/weap_arrow_front.pmd  |  4 ++--
 .../art/meshes/props/weap_jav_projectile.pmd        |  3 +++
 .../entities/template_gaia_flora_bush_berry.xml     |  2 +-
 .../official/entities/template_gaia_flora_tree.xml  |  2 +-
 .../official/entities/template_gaia_geo_mineral.xml |  2 +-
 .../official/entities/template_gaia_geo_rock.xml    |  2 +-
 20 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 binaries/data/mods/official/art/actors/props/units/weapons/jav_projectile.xml
 create mode 100644 binaries/data/mods/official/art/animation/infantry/general/forage_fem.psa
 create mode 100644 binaries/data/mods/official/art/meshes/props/weap_jav_projectile.pmd

diff --git a/binaries/data/mods/official/art/actors/props/units/weapons/jav_projectile.xml b/binaries/data/mods/official/art/actors/props/units/weapons/jav_projectile.xml
new file mode 100644
index 0000000000..729ad286bc
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/weapons/jav_projectile.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <texture>props/prop_weap.dds</texture>
+      <mesh>props/weap_jav_projectile.pmd</mesh>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
index 4ee72af9fb..091ad6da58 100644
--- a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
@@ -12,7 +12,7 @@
 		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
 		<!-- Shared  -->
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
index 6f88700d9a..144561c391 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
@@ -80,7 +80,7 @@
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
index a7cf819c89..f575f08bad 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
@@ -45,7 +45,7 @@
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
index 53a9288075..dfc44172fa 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
@@ -54,7 +54,7 @@
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml
index 3b84a6752f..34f15f2533 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/female_citizen.xml
@@ -8,7 +8,7 @@
       <animations>
         <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
         <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml
index 06defabff5..5dce436a94 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml
@@ -7,7 +7,7 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
@@ -25,7 +25,6 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml
index dff66aaf99..9dd0d084f4 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml
@@ -7,7 +7,7 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
@@ -25,7 +25,6 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_e.xml
index ef0081cb27..0f36645db4 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_e.xml
@@ -7,7 +7,7 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
+        <animation event="0.85" file="biped/inf_arch_atk_a.psa" load="0" name="Attack" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
@@ -25,7 +25,6 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
index c1767ddfef..71aa230d9e 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
@@ -49,7 +49,7 @@
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
index 78f8da57f2..1e2fffca13 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
@@ -44,7 +44,7 @@
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
index 12d5c94923..f2d47acfdf 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
@@ -50,7 +50,7 @@
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/official/art/animation/infantry/general/forage_fem.psa b/binaries/data/mods/official/art/animation/infantry/general/forage_fem.psa
new file mode 100644
index 0000000000..9b91e661d1
--- /dev/null
+++ b/binaries/data/mods/official/art/animation/infantry/general/forage_fem.psa
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:356f182b7fe1bc5ae9a81a7d8b019ebbac39dca8ee83d6622be37ff62c06772b
+size 118589
diff --git a/binaries/data/mods/official/art/meshes/props/weap_arrow_back.pmd b/binaries/data/mods/official/art/meshes/props/weap_arrow_back.pmd
index 6b0e09a9bb..5154e3afbc 100644
--- a/binaries/data/mods/official/art/meshes/props/weap_arrow_back.pmd
+++ b/binaries/data/mods/official/art/meshes/props/weap_arrow_back.pmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:700d54827d518a1109a7de679c3826b04597ad7d1153ab2640f51422b6ca552d
-size 3440
+oid sha256:07926d20f06525b5700e7a059a6de2e48c16a655cd10c90738da072b97adf3a3
+size 2400
diff --git a/binaries/data/mods/official/art/meshes/props/weap_arrow_front.pmd b/binaries/data/mods/official/art/meshes/props/weap_arrow_front.pmd
index 8e86d43493..e9588c7b5d 100644
--- a/binaries/data/mods/official/art/meshes/props/weap_arrow_front.pmd
+++ b/binaries/data/mods/official/art/meshes/props/weap_arrow_front.pmd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0781a13bc67d360724d339aa5daece3e78322cb96431d54309321a2f9cc62c4
-size 2400
+oid sha256:a39ab913b1d7d8dec4ec22a7039ee758ca778408eb79d14ab34b2712bc9c4489
+size 2324
diff --git a/binaries/data/mods/official/art/meshes/props/weap_jav_projectile.pmd b/binaries/data/mods/official/art/meshes/props/weap_jav_projectile.pmd
new file mode 100644
index 0000000000..7f746401b4
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/props/weap_jav_projectile.pmd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:205708465e02c55e5eac0dcf2446aab3658496647ebf142effa1ee9494b887c4
+size 2080
diff --git a/binaries/data/mods/official/entities/template_gaia_flora_bush_berry.xml b/binaries/data/mods/official/entities/template_gaia_flora_bush_berry.xml
index 53ac60da88..8f41a4c9a4 100644
--- a/binaries/data/mods/official/entities/template_gaia_flora_bush_berry.xml
+++ b/binaries/data/mods/official/entities/template_gaia_flora_bush_berry.xml
@@ -29,7 +29,7 @@
  		</MiniMap>
 
  		<Supply>
- 			<Max>200</Max>
+ 			<Max>2000</Max>
  			<Type>food</Type>
  			<SubType>fruit</SubType>
  		</Supply>
diff --git a/binaries/data/mods/official/entities/template_gaia_flora_tree.xml b/binaries/data/mods/official/entities/template_gaia_flora_tree.xml
index 095fb2f935..a005d96996 100644
--- a/binaries/data/mods/official/entities/template_gaia_flora_tree.xml
+++ b/binaries/data/mods/official/entities/template_gaia_flora_tree.xml
@@ -28,7 +28,7 @@
  		</MiniMap>
 
  		<Supply>
- 			<Max>400</Max>
+ 			<Max>4000</Max>
  			<Type>wood</Type>
  		</Supply>
 
diff --git a/binaries/data/mods/official/entities/template_gaia_geo_mineral.xml b/binaries/data/mods/official/entities/template_gaia_geo_mineral.xml
index c0dbbec005..25cc2b2d5b 100644
--- a/binaries/data/mods/official/entities/template_gaia_geo_mineral.xml
+++ b/binaries/data/mods/official/entities/template_gaia_geo_mineral.xml
@@ -27,7 +27,7 @@
 		</MiniMap>
 
  		<Supply>
- 			<Max>500</Max>
+ 			<Max>5000</Max>
  			<Type>metal</Type>
  		</Supply>
 
diff --git a/binaries/data/mods/official/entities/template_gaia_geo_rock.xml b/binaries/data/mods/official/entities/template_gaia_geo_rock.xml
index be3d1396b3..61eb2830f7 100644
--- a/binaries/data/mods/official/entities/template_gaia_geo_rock.xml
+++ b/binaries/data/mods/official/entities/template_gaia_geo_rock.xml
@@ -28,7 +28,7 @@
 		</MiniMap>
 
  		<Supply>
- 			<Max>250</Max>
+ 			<Max>2500</Max>
  			<Type>stone</Type>
  		</Supply>