Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/camel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/camel.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/camel.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
-	<Distanceless>1</Distanceless>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/camel_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/camel_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/camel_select.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>camel_10.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/chickens_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/chickens_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/chickens_select.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>chicken_13.ogg</Sound>
+	<Sound>chicken_10.ogg</Sound>
+	<Sound>chicken_11.ogg</Sound>
+	<Sound>chicken_12.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_attack_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_attack_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_attack_order.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>elephant_attack1.ogg</Sound>
+	<Sound>elephant_attack2.ogg</Sound>
+	<Sound>elephant_attack3.ogg</Sound>
+	<Sound>elephant_order1.ogg</Sound>
+	<Sound>elephant_order2.ogg</Sound>
+	<Sound>elephant_select1.ogg</Sound>
+	<Sound>elephant_select2.ogg</Sound>
+	<Sound>elephant_order1.ogg</Sound>
+	<Sound>elephant_order2.ogg</Sound>
+	<Sound>elephant_select1.ogg</Sound>
+	<Sound>elephant_select2.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_order.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Distanceless>1</Distanceless>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/elephant_trained.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_order.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>goat_15.ogg</Sound>
+	<Sound>goat_10.ogg</Sound>
+	<Sound>goat_11.ogg</Sound>
+	<Sound>goat_12.ogg</Sound>
+	<Sound>goat_13.ogg</Sound>
+	<Sound>goat_14.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_select.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>goat_15.ogg</Sound>
+	<Sound>goat_10.ogg</Sound>
+	<Sound>goat_11.ogg</Sound>
+	<Sound>goat_12.ogg</Sound>
+	<Sound>goat_13.ogg</Sound>
+	<Sound>goat_14.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/goat_trained.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>goat_15.ogg</Sound>
+	<Sound>goat_10.ogg</Sound>
+	<Sound>goat_11.ogg</Sound>
+	<Sound>goat_12.ogg</Sound>
+	<Sound>goat_13.ogg</Sound>
+	<Sound>goat_14.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_attack_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_attack_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_attack_order.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>horse_attack1.ogg</Sound>
+	<Sound>horse_attack2.ogg</Sound>
+	<Sound>horse_attack3.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_order.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Distanceless>1</Distanceless>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/horse_trained.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/lion_death.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/lion_death.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/lion_death.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Gain>1</Gain>
+	<Priority>80</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainUpper>0.8</GainUpper>
+	<GainLower>0.6</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>lion_select1.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/lion_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/lion_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/lion_select.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Distanceless>1</Distanceless>
 	<Gain>1</Gain>
 	<Priority>80</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/peacock_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/peacock_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/peacock_select.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>peacock_call_01.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/peacock_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/peacock_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/peacock_trained.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>peacock_call_01.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_flaming_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_flaming_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_flaming_select.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>pig_squeal_move.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_flaming_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_flaming_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_flaming_trained.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>pig_squeal_move.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_order.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>pig_12.ogg</Sound>
+	<Sound>pig_10.ogg</Sound>
+	<Sound>pig_11.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_select.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>pig_12.ogg</Sound>
+	<Sound>pig_10.ogg</Sound>
+	<Sound>pig_11.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/pig_trained.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>pig_12.ogg</Sound>
+	<Sound>pig_10.ogg</Sound>
+	<Sound>pig_11.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_order.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>sheep_11.ogg</Sound>
+	<Sound>sheep_10.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_select.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_select.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_select.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>sheep_11.ogg</Sound>
+	<Sound>sheep_10.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/animal/sheep_trained.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/animal</Path>
+	<Sound>sheep_11.ogg</Sound>
+	<Sound>sheep_10.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/fauna/movement/camel_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/fauna/movement/camel_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/fauna/movement/camel_order.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>0</RandOrder>
+	<RandGain>0</RandGain>
+	<GainLower>0.9</GainLower>
+	<RandPitch>0</RandPitch>
+	<Threshold>5</Threshold>
+	<Path>audio/actor/fauna/movement</Path>
+	<Sound>camel_10.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/ship/boat_move.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/ship/boat_move.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/ship/boat_move.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Distanceless>1</Distanceless>
 	<Gain>0.5</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/actor/singlesteps/steps_grass_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/singlesteps/steps_grass_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/singlesteps/steps_grass_order.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/actor/singlesteps</Path>
+	<Sound>fs_grass8.ogg</Sound>
+	<Sound>fs_grass1.ogg</Sound>
+	<Sound>fs_grass2.ogg</Sound>
+	<Sound>fs_grass3.ogg</Sound>
+	<Sound>fs_grass4.ogg</Sound>
+	<Sound>fs_grass5.ogg</Sound>
+	<Sound>fs_grass6.ogg</Sound>
+	<Sound>fs_grass7.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/actor/singlesteps/steps_gravel_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/actor/singlesteps/steps_gravel_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/actor/singlesteps/steps_gravel_trained.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/actor/singlesteps</Path>
+	<Sound>fs_gravel8.ogg</Sound>
+	<Sound>fs_gravel1.ogg</Sound>
+	<Sound>fs_gravel2.ogg</Sound>
+	<Sound>fs_gravel3.ogg</Sound>
+	<Sound>fs_gravel4.ogg</Sound>
+	<Sound>fs_gravel5.ogg</Sound>
+	<Sound>fs_gravel6.ogg</Sound>
+	<Sound>fs_gravel7.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_attack_order.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_attack_order.xml
+++ ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_attack_order.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Distanceless>1</Distanceless>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_move.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_move.xml
+++ ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_move.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
+	<Distanceless>1</Distanceless>
 	<Gain>1</Gain>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
Index: ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_trained.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_trained.xml
+++ ps/trunk/binaries/data/mods/public/audio/attack/siege/ram_trained.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Omnipresent>1</Omnipresent>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>1</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/attack/siege</Path>
+	<Sound>ram_move.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
@@ -29,7 +29,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_select.xml</death>
+      <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -25,8 +25,8 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel.xml</order_walk>
+      <select>actor/fauna/animal/camel_select.xml</select>
+      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
@@ -23,7 +23,7 @@
   <Sound>
     <SoundGroups>
       <panic>actor/fauna/animal/chickens.xml</panic>
-      <select>actor/fauna/animal/chickens.xml</select>
+      <select>actor/fauna/animal/chickens_select.xml</select>
       <death>actor/fauna/animal/chickens.xml</death>
     </SoundGroups>
   </Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -34,7 +34,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_select.xml</death>
+      <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -25,10 +25,10 @@
   </ResourceSupply>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/goat.xml</select>
-      <order_walk>actor/fauna/animal/goat.xml</order_walk>
+      <select>actor/fauna/animal/goat_select.xml</select>
+      <order_walk>actor/fauna/animal/goat_order.xml</order_walk>
       <death>actor/fauna/animal/goat.xml</death>
-      <trained>actor/fauna/animal/goat.xml</trained>
+      <trained>actor/fauna/animal/goat_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -18,8 +18,8 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
+      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/horse_attack.xml</order_attack>
       <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -25,7 +25,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_select.xml</death>
+      <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
@@ -25,7 +25,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_select.xml</death>
+      <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
@@ -16,10 +16,10 @@
   </ResourceSupply>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/peacock_call.xml</select>
-      <order_walk>actor/fauna/animal/peacock_call.xml</order_walk>
+      <select>actor/fauna/animal/peacock_select.xml</select>
+      <order_walk>actor/fauna/animal/peacock_order.xml</order_walk>
       <death>actor/fauna/animal/peacock_call.xml</death>
-      <trained>actor/fauna/animal/peacock_call.xml</trained>
+      <trained>actor/fauna/animal/peacock_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitAI>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -20,10 +20,10 @@
   </Position>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/pig.xml</select>
-      <order_walk>actor/fauna/animal/pig.xml</order_walk>
+      <select>actor/fauna/animal/pig_select.xml</select>
+      <order_walk>actor/fauna/animal/pig_order.xml</order_walk>
       <death>actor/fauna/animal/pig.xml</death>
-      <trained>actor/fauna/animal/pig.xml</trained>
+      <trained>actor/fauna/animal/pig_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
@@ -22,10 +22,10 @@
   <ResourceSupply disable=""/>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/pig_flaming_order.xml</select>
+      <select>actor/fauna/animal/pig_flaming_select.xml</select>
       <order_walk>actor/fauna/animal/pig_flaming_order.xml</order_walk>
       <death>actor/fauna/animal/pig_death.xml</death>
-      <trained>actor/fauna/animal/pig_flaming_order.xml</trained>
+      <trained>actor/fauna/animal/pig_flaming_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
@@ -37,7 +37,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_select.xml</death>
+      <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -20,10 +20,10 @@
   </Position>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/sheep.xml</select>
-      <order_walk>actor/fauna/animal/sheep.xml</order_walk>
+      <select>actor/fauna/animal/sheep_select.xml</select>
+      <order_walk>actor/fauna/animal/sheep_order.xml</order_walk>
       <death>actor/fauna/animal/sheep.xml</death>
-      <trained>actor/fauna/animal/sheep.xml</trained>
+      <trained>actor/fauna/animal/sheep_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -25,7 +25,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_select.xml</death>
+      <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
@@ -27,7 +27,7 @@
   <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
-      <order_walk>actor/singlesteps/steps_grass.xml</order_walk>
+      <order_walk>actor/singlesteps/steps_grass_order.xml</order_walk>
       <run>actor/singlesteps/steps_grass.xml</run>
       <select>attack/siege/siege_select.xml</select>
       <walk>actor/singlesteps/steps_grass.xml</walk>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -42,7 +42,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -43,8 +43,8 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
@@ -24,8 +24,8 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -38,7 +38,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege.xml
@@ -25,8 +25,8 @@
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
-      <order_attack>attack/siege/ram_attack.xml</order_attack>
-      <trained>attack/siege/ram_move.xml</trained>
+      <order_attack>attack/siege/ram_move.xml</order_attack>
+      <trained>attack/siege/ram_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
@@ -39,7 +39,7 @@
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <order_attack>attack/siege/ram_attack_order.xml</order_attack>
-      <trained>attack/siege/ram_move.xml</trained>
+      <trained>attack/siege/ram_trained.xml</trained>
       <attack_melee>attack/siege/ram_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
@@ -66,11 +66,11 @@
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
+      <order_attack>attack/siege/ram_move.xml</order_attack>
       <order_walk>attack/siege/ram_move.xml</order_walk>
-      <order_attack>attack/siege/ram_attack.xml</order_attack>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
-      <trained>attack/siege/ram_move.xml</trained>
+      <trained>attack/siege/ram_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -80,7 +80,7 @@
       <gather_wood>resource/lumbering/lumbering.xml</gather_wood>
       <gather_stone>resource/mining/pickaxe.xml</gather_stone>
       <gather_metal>resource/mining/mining.xml</gather_metal>
-      <trained>actor/singlesteps/steps_gravel.xml</trained>
+      <trained>actor/singlesteps/steps_gravel_trained.xml</trained>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_trader.xml
@@ -11,8 +11,8 @@
   </Identity>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel.xml</order_walk>
+      <select>actor/fauna/animal/camel_select.xml</select>
+      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -59,7 +59,7 @@
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
@@ -56,8 +56,8 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
+      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <order_attack>actor/fauna/animal/elephant_attack.xml</order_attack>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_trader.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_trader.xml
@@ -13,8 +13,8 @@
   </Identity>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel.xml</order_walk>
+      <select>actor/fauna/animal/camel_select.xml</select>
+      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
@@ -14,8 +14,8 @@
   </Promotion>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel.xml</order_walk>
+      <select>actor/fauna/animal/camel_select.xml</select>
+      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_trader.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_trader.xml
@@ -11,8 +11,8 @@
   </Identity>
   <Sound>
     <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel.xml</order_walk>
+      <select>actor/fauna/animal/camel_select.xml</select>
+      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>