Reduced the size of a bunch of massive specular maps.

Tweaked some maps.

A new map called "Wasteland". Don't know what to do with it yet.

Dust storm and other particles changes and tweaks.

Tweaks to some maps.

Spec and Norm maps for the Great Pyramid.

New Mace shield prop textures for buildings.

This was SVN commit r14261.

binaries/data/mods/public/art/actors/particle/dust_storm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Base">
+      <particles file="dust_storm.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>

binaries/data/mods/public/art/actors/props/structures/macedonians/barracks_props_shields.xml

@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="barracks props a">
-      <mesh>props/mace_barracks_shields.dae</mesh>
-      <textures>
-<texture file="props/mace_prop_shields.png" name="baseTex"/>
-</textures>
-    </variant>
-  </group>
-<material>playercolor_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="barracks props a">
+      <mesh>props/mace_barracks_shields.dae</mesh>
+      <textures>
+        <texture file="props/mace_prop_shields.png" name="baseTex"/>
+        <texture file="props/mace_prop_shields_norm.png" name="normTex"/>
+        <texture file="props/mace_prop_shields_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/props/structures/macedonians/civic_centre_shields.xml

@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>structural/mace_cc_shields.dae</mesh>
-      <textures>
-        <texture file="props/mace_prop_shields.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>playercolor_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="civic center shields">
+      <mesh>structural/mace_cc_shields.dae</mesh>
+      <textures>
+        <texture file="props/mace_prop_shields.png" name="baseTex"/>
+        <texture file="props/mace_prop_shields_norm.png" name="normTex"/>
+        <texture file="props/mace_prop_shields_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/props/structures/macedonians/fortress_shields.xml

@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/hele_fortress_up_shields.dae</mesh>
-      <textures><texture file="props/mace_prop_shields.png" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>playercolor_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="fortress shields">
+      <mesh>props/hele_fortress_up_shields.dae</mesh>
+      <textures>
+        <texture file="props/mace_prop_shields.png" name="baseTex"/>
+        <texture file="props/mace_prop_shields_norm.png" name="normTex"/>
+        <texture file="props/mace_prop_shields_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/props/units/shields/athen_round_epilektos.xml

@@ -11,17 +11,33 @@
   </group>
   <group>
     <variant frequency="1" name="h">
-      <textures><texture file="props/shield/hele_round_h.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/hele_round_h.dds" name="baseTex"/>
+        <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
+        <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="k">
-      <textures><texture file="props/shield/hele_round_k.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/hele_round_k.dds" name="baseTex"/>
+        <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
+        <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="m">
-      <textures><texture file="props/shield/hele_round_m.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/hele_round_m.dds" name="baseTex"/>
+        <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
+        <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="shield-ah-alpha">
-      <textures><texture file="props/shield/hele_round_ah.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/hele_round_ah.dds" name="baseTex"/>
+        <texture file="props/shield/aspis_smooth_a_norm.png" name="normTex"/>
+        <texture file="props/shield/aspis_smooth_a_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
-  <material>playercolor_spec.xml</material>
+  <material>player_trans_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/props/units/shields/thracian_oval.xml

@@ -11,10 +11,14 @@
   </group>
   <group>
     <variant frequency="1" name="White Shield Oval A">
-      <textures><texture file="props/shield/celt_oval2_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/celt_oval2_a.dds" name="baseTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="White Shield Oval C">
-      <textures><texture file="props/shield/celt_oval2_c.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/shield/celt_oval2_c.dds" name="baseTex"/>
+      </textures>
     </variant>
   </group>
   <material>player_trans.xml</material>

binaries/data/mods/public/art/actors/special/pyramid.xml

@@ -4,7 +4,12 @@
   <group>
     <variant name="Pyramid_Great">
       <mesh>props/pyramid_a.dae</mesh>
-      <textures><texture file="props/pyramid_great.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="props/pyramid_great.dds" name="baseTex"/>
+        <texture file="props/pyramid_great_spec.png" name="specTex"/>
+        <texture file="props/pyramid_great_norm.png" name="normTex"/>
+      </textures>
     </variant>
   </group>
+  <material>basic_trans_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/units/seleucids/champion_elephant_rider1.xml

@@ -4,10 +4,10 @@
   <group>
     <variant frequency="100" name="Elephant Pikeman">
       <animations>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="Walk" speed="10"/>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="run" speed="2"/>
-        <animation event="" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="350"/>
+        <animation file="biped/not used/inf_phalanx_a.psa" name="Idle" speed="100"/>
+        <animation file="biped/not used/inf_phalanx_b.psa" name="Walk" speed="10"/>
+        <animation file="biped/inf_phalanx_c.psa" name="run" speed="2"/>
+        <animation event="" file="biped/inf_phalanx_atk_a.psa" name="attack_melee" speed="350"/>
         <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"/>
@@ -15,7 +15,7 @@
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/sarissa.xml" attachpoint="r_hand"/>
         <prop actor="props/units/heads/mace_bronzeshield_a.xml" attachpoint="helmet"/>
       </props>
     </variant>

binaries/data/mods/public/art/particles/blowing_snow.xml

@@ -9,7 +9,12 @@
     <constant name="emissionrate" value="0.2"/>
     <uniform name="lifetime" min="15.0" max="25.0"/>
 
+	<uniform name="position.x" min="-20.0" max="20.0"/>
+    <uniform name="position.z" min="-10.0" max="10.0"/>
+    <constant name="position.y" value="0.0"/>
+
     <uniform name="velocity.x" min="1.0" max="2.0"/>
-    <uniform name="size" min="25.0" max="30.0"/>
+    <uniform name="velocity.angle" min="-0.1" max="0.15"/>
+    <uniform name="size" min="20.0" max="40.0"/>
 
 </particles>

binaries/data/mods/public/art/particles/dust_storm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<particles>
+
+    <texture>art/textures/particles/blowing_sand.png</texture>
+    <blend mode="over"/>
+
+    <start_full/>
+
+    <constant name="emissionrate" value="2.0"/>
+    <uniform name="lifetime" min="15.0" max="30.0"/>
+	
+	<uniform name="position.x" min="-50.0" max="50.0"/>
+    <uniform name="position.z" min="-50.0" max="50.0"/>
+    <constant name="position.y" value="3.0"/>
+
+    <uniform name="velocity.x" min="1.0" max="2.0"/>
+    <uniform name="velocity.angle" min="-0.1" max="0.15"/>
+    <uniform name="size" min="20.0" max="40.0"/>
+
+</particles>

binaries/data/mods/public/simulation/templates/other/pyramid_great.xml

@@ -17,6 +17,9 @@
   <Obstruction>
     <Static width="59.0" depth="59.0"/>
   </Obstruction>
+  <Position>
+    <Altitude>-2.0</Altitude>
+  </Position>
   <ResourceSupply>
     <Amount>10000</Amount>
     <Type>stone.ruins</Type>