From 13b62f6613d716d3375625a809c7ad0027d09342 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Fri, 22 Apr 2011 02:28:47 +0000
Subject: [PATCH] Iberian javelinist tweaks.

This was SVN commit r9295.
---
 .../public/art/actors/props/units/weapons/jav_gold.xml   | 7 ++-----
 .../public/art/actors/props/units/weapons/jav_iron.xml   | 7 ++-----
 .../actors/props/units/weapons/jav_projectile_flame.xml  | 6 +++---
 .../art/actors/units/iberians/infantry_javelinist_a.xml  | 9 ++++-----
 .../art/actors/units/iberians/infantry_javelinist_b.xml  | 8 ++++----
 .../art/actors/units/iberians/infantry_javelinist_e.xml  | 7 +++----
 .../templates/units/iber_infantry_javelinist_b.xml       | 4 ++--
 7 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/jav_gold.xml b/binaries/data/mods/public/art/actors/props/units/weapons/jav_gold.xml
index 7662b22010..e8ea0c8b2e 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/jav_gold.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/jav_gold.xml
@@ -1,13 +1,10 @@
-<?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="gold">
-      <mesh>props/weap_jav_f.pmd</mesh>
+      <mesh>props/weap_jav_g.pmd</mesh>
       <texture>props/prop_weap.dds</texture>
     </variant>
   </group>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/jav_iron.xml b/binaries/data/mods/public/art/actors/props/units/weapons/jav_iron.xml
index 17697a8980..fac8162139 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/jav_iron.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/jav_iron.xml
@@ -1,13 +1,10 @@
-<?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="iron">
-      <mesh>props/weap_jav_g.pmd</mesh>
+      <mesh>props/weap_jav_f.pmd</mesh>
       <texture>props/prop_weap.dds</texture>
     </variant>
   </group>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/jav_projectile_flame.xml b/binaries/data/mods/public/art/actors/props/units/weapons/jav_projectile_flame.xml
index b56d5cea38..672c2427fb 100644
--- a/binaries/data/mods/public/art/actors/props/units/weapons/jav_projectile_flame.xml
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/jav_projectile_flame.xml
@@ -1,9 +1,9 @@
-<?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="Flaming Javelin">
-      <mesh>props/weap_jav_projectile.pmd</mesh>
+    <variant frequency="100" name="Flaming Iron Javelin">
+      <mesh>props/weap_jav_f.pmd</mesh>
       <props>
         <prop actor="particle/flame_jav.xml" attachpoint="root"/>
         <prop actor="particle/smoke_jav.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a.xml
index 33096934ad..549649524d 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_a.xml
@@ -33,8 +33,8 @@
       <mesh>skeletal/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_iber_su1.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="l_hand"/>
         <prop actor="props/units/heads/iber_helmet_04.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/iberian_buckler_adv.xml" attachpoint="shield"/>
       </props>
@@ -46,9 +46,8 @@
     <variant name="Melee">
       <props>
         <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_tree">
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b.xml
index 229648a09f..a6e5df24b6 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_b.xml
@@ -33,8 +33,8 @@
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_iber_isl_b.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="l_hand"/>
         <prop actor="props/units/shields/iberian_buckler_basic.xml" attachpoint="shield"/>
       </props>
       <texture>skeletal/iber_isw_b_3.dds</texture>
@@ -45,8 +45,8 @@
     <variant name="Melee">
       <props>
         <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_tree">
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e.xml
index 36353931bf..cc5d46ee9c 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_javelinist_e.xml
@@ -33,8 +33,8 @@
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_iber_su1.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="l_hand"/>
         <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/iberian_buckler_elite.xml" attachpoint="shield"/>
       </props>
@@ -46,8 +46,7 @@
     <variant name="Melee">
       <props>
         <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/jav_projectile_flame.xml" attachpoint="projectile"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_javelinist_b.xml
index c576e1b898..982add24ec 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_javelinist_b.xml
@@ -2,8 +2,8 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Identity>
     <Civ>iber</Civ>
-    <SpecificName>Caetrati</SpecificName>
-    <History>Iberians were good at ranged combat and ambushing enemy columns. Sometimes the Iberians would even add burning pitch to their javelins.</History>
+    <SpecificName>Caetrati Lusitano</SpecificName>
+    <History>Iberians, especially the Lusitanians, were good at ranged combat and ambushing enemy columns. They throw heavy iron javelins and sometimes even add burning pitch to them, making them good as a cheap siege weapon.</History>
 	<Icon>units/cart_cavalry_javelinist.png</Icon>
   </Identity>
   <Promotion>