From 11aec4d67fd8ceee3fe5a55d33af940c678968da Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sat, 18 Feb 2012 01:51:42 +0000
Subject: [PATCH] Tweaking destruction smoke for Barracks test.

This was SVN commit r11091.
---
 .../public/art/actors/props/units/shields/hele_round_su2.xml  | 3 +++
 .../public/art/actors/structures/carthaginians/barracks.xml   | 4 ++++
 .../mods/public/art/actors/structures/celts/barracks_new.xml  | 4 ++++
 .../mods/public/art/actors/structures/hellenes/barracks.xml   | 1 +
 .../mods/public/art/actors/structures/iberians/barracks.xml   | 2 ++
 .../mods/public/art/actors/structures/persians/barracks.xml   | 3 +++
 .../mods/public/art/actors/structures/romans/barracks.xml     | 1 +
 .../data/mods/public/art/particles/destruction_dust_med.xml   | 4 ++--
 .../mods/public/art/particles/destruction_dust_med_dark.xml   | 2 +-
 .../mods/public/art/particles/destruction_dust_med_gray.xml   | 4 ++--
 .../data/mods/public/art/particles/destruction_smoke_med.xml  | 2 +-
 .../public/art/textures/skins/props/shield/hele_round_ah.dds  | 3 +++
 .../mods/public/simulation/templates/template_structure.xml   | 2 +-
 .../templates/template_structure_military_barracks.xml        | 3 +++
 14 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/skins/props/shield/hele_round_ah.dds

diff --git a/binaries/data/mods/public/art/actors/props/units/shields/hele_round_su2.xml b/binaries/data/mods/public/art/actors/props/units/shields/hele_round_su2.xml
index b743aaad6f..edc0c793d1 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/hele_round_su2.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/hele_round_su2.xml
@@ -19,6 +19,9 @@
     <variant frequency="1" name="m">
       <texture>props/shield/hele_round_m.dds</texture>
     </variant>
+    <variant frequency="1" name="ah">
+      <texture>props/shield/hele_round_ah.dds</texture>
+    </variant>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/barracks.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/barracks.xml
index cbccd81b6e..ff88f7c2e7 100644
--- a/binaries/data/mods/public/art/actors/structures/carthaginians/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/carthaginians/barracks.xml
@@ -21,9 +21,13 @@
     </variant>
     <variant name="death">
       <props>
+        <prop attachpoint="garrisoned"/>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/carthaginians/barracks.xml" attachpoint="root"/>
+        <prop actor="props/structures/carthaginians/barracks_weap.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/barracks_new.xml b/binaries/data/mods/public/art/actors/structures/celts/barracks_new.xml
index 78e60be498..398a5acb11 100644
--- a/binaries/data/mods/public/art/actors/structures/celts/barracks_new.xml
+++ b/binaries/data/mods/public/art/actors/structures/celts/barracks_new.xml
@@ -25,6 +25,10 @@
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_color.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_props1.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/barracks_weapons.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/celt_barracks.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/barracks.xml b/binaries/data/mods/public/art/actors/structures/hellenes/barracks.xml
index cde1f61f9b..d6b9e7a897 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/barracks.xml
@@ -19,6 +19,7 @@
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/iberians/barracks.xml b/binaries/data/mods/public/art/actors/structures/iberians/barracks.xml
index 30ed11c10e..841b57d324 100644
--- a/binaries/data/mods/public/art/actors/structures/iberians/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/iberians/barracks.xml
@@ -23,6 +23,8 @@
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/iberians/barracks.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/persians/barracks.xml b/binaries/data/mods/public/art/actors/structures/persians/barracks.xml
index 78a115b316..f4ff13da6b 100644
--- a/binaries/data/mods/public/art/actors/structures/persians/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/persians/barracks.xml
@@ -26,9 +26,12 @@
     </variant>
     <variant name="death">
       <props>
+        <prop attachpoint="garrisoned"/>
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/persians/barracks.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/romans/barracks.xml b/binaries/data/mods/public/art/actors/structures/romans/barracks.xml
index a777c89f5d..d731c01d75 100644
--- a/binaries/data/mods/public/art/actors/structures/romans/barracks.xml
+++ b/binaries/data/mods/public/art/actors/structures/romans/barracks.xml
@@ -22,6 +22,7 @@
         <prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
         <prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/particles/destruction_dust_med.xml b/binaries/data/mods/public/art/particles/destruction_dust_med.xml
index 528622afbf..eb76d04772 100644
--- a/binaries/data/mods/public/art/particles/destruction_dust_med.xml
+++ b/binaries/data/mods/public/art/particles/destruction_dust_med.xml
@@ -4,12 +4,12 @@
     <texture>art/textures/particles/dust_256a.png</texture>
     <blend mode="over"/>
 
-    <constant name="emissionrate" value="75.0"/>
+    <constant name="emissionrate" value="25.0"/>
     <uniform name="lifetime" min="20.0" max="30.0"/>
 
     <uniform name="position.x" min="-14.0" max="14.0"/>
     <uniform name="position.z" min="-14.0" max="14.0"/>
-    <constant name="position.y" value="4.0"/>
+    <constant name="position.y" value="2.0"/>
 
     <uniform name="angle" min="-3.14" max="3.14"/>
 
diff --git a/binaries/data/mods/public/art/particles/destruction_dust_med_dark.xml b/binaries/data/mods/public/art/particles/destruction_dust_med_dark.xml
index 3f3d3971c4..3ed250e695 100644
--- a/binaries/data/mods/public/art/particles/destruction_dust_med_dark.xml
+++ b/binaries/data/mods/public/art/particles/destruction_dust_med_dark.xml
@@ -4,7 +4,7 @@
     <texture>art/textures/particles/smoke_256a.png</texture>
     <blend mode="over"/>
 	
-    <constant name="emissionrate" value="25.0"/>
+    <constant name="emissionrate" value="15.0"/>
     <uniform name="lifetime" min="15.0" max="25.0"/>
 
     <uniform name="position.x" min="-12.0" max="12.0"/>
diff --git a/binaries/data/mods/public/art/particles/destruction_dust_med_gray.xml b/binaries/data/mods/public/art/particles/destruction_dust_med_gray.xml
index 845dd99772..136a69da24 100644
--- a/binaries/data/mods/public/art/particles/destruction_dust_med_gray.xml
+++ b/binaries/data/mods/public/art/particles/destruction_dust_med_gray.xml
@@ -4,12 +4,12 @@
     <texture>art/textures/particles/smoke_256a.png</texture>
     <blend mode="over"/>
 	
-    <constant name="emissionrate" value="20.0"/>
+    <constant name="emissionrate" value="10.0"/>
     <uniform name="lifetime" min="15.0" max="25.0"/>
 
     <uniform name="position.x" min="-12.0" max="12.0"/>
     <uniform name="position.z" min="-12.0" max="12.0"/>
-    <constant name="position.y" value="8.0"/>
+    <constant name="position.y" value="5.0"/>
 
     <uniform name="angle" min="-3.14" max="3.14"/>
 
diff --git a/binaries/data/mods/public/art/particles/destruction_smoke_med.xml b/binaries/data/mods/public/art/particles/destruction_smoke_med.xml
index dea8e7fd98..6b40bb0a09 100644
--- a/binaries/data/mods/public/art/particles/destruction_smoke_med.xml
+++ b/binaries/data/mods/public/art/particles/destruction_smoke_med.xml
@@ -4,7 +4,7 @@
     <texture>art/textures/particles/dust_256a.png</texture>
     <blend mode="over"/>
 
-    <constant name="emissionrate" value="26.0"/>
+    <constant name="emissionrate" value="20.0"/>
     <uniform name="lifetime" min="20.0" max="30.0"/>
 
     <uniform name="position.x" min="-4.0" max="4.0"/>
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/hele_round_ah.dds b/binaries/data/mods/public/art/textures/skins/props/shield/hele_round_ah.dds
new file mode 100644
index 0000000000..65587d4c89
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/shield/hele_round_ah.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6eb99c476717adabd6eae3cb8d07739d2c5cd1fb2922d794481ee6650b741fa
+size 22000
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index 8c4e1e140e..d87661387a 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -27,7 +27,7 @@
   <Decay>
     <Inactive/>
     <DelayTime>0.0</DelayTime>
-    <SinkRate>4.0</SinkRate>
+    <SinkRate>3.0</SinkRate>
     <SinkAccel>9.8</SinkAccel>
   </Decay>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
index b233704173..bb411ffdf2 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -14,6 +14,9 @@
       <wood>300</wood>
     </Resources>
   </Cost>
+  <Decay>
+    <DelayTime>1.5</DelayTime>
+  </Decay>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
     <Height>5.0</Height>