synch with new test repo.

33 files changed, 165 insertions, 155 deletions

diff --git a/graphics/particles/emote-blah.particle.xml b/graphics/particles/emote-blah.particle.xml
deleted file mode 100644
index 14a8f1a5..00000000
--- a/graphics/particles/emote-blah.particle.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<effect>

-	<particle

-		position-x = "0"

-		position-y = "0"

-		position-z = "96"

-		lifetime = "1"

-		>

-		<emitter>

-			<property name="position-x" value="0"/>

-			<property name="position-y" value="0"/>

-			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="13" delay="1000"/>

-			</animation>

-			<property name="follow-parent" />

-		</emitter>

-	</particle>

-</effect>

diff --git a/graphics/particles/emote-perturbed.particle.xml b/graphics/particles/emote-perturbed.particle.xml
deleted file mode 100644
index a5cd71ad..00000000
--- a/graphics/particles/emote-perturbed.particle.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<effect>

-	<particle

-		position-x = "0"

-		position-y = "0"

-		position-z = "96"

-		lifetime = "1"

-		>

-		<emitter>

-			<property name="position-x" value="0"/>

-			<property name="position-y" value="0"/>

-			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="11" delay="1000"/>

-			</animation>

-			<property name="follow-parent" />

-		</emitter>

-	</particle>

-</effect>

diff --git a/graphics/particles/emote-speech.particle.xml b/graphics/particles/emote-speech.particle.xml
deleted file mode 100644
index 877a6d3e..00000000
--- a/graphics/particles/emote-speech.particle.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<effect>

-	<particle

-		position-x = "0"

-		position-y = "0"

-		position-z = "96"

-		lifetime = "1"

-		>

-		<emitter>

-			<property name="position-x" value="0"/>

-			<property name="position-y" value="0"/>

-			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="12" delay="1000"/>

-			</animation>

-			<property name="follow-parent" />

-		</emitter>

-	</particle>

-</effect>

diff --git a/graphics/particles/emote-upset.particle.xml b/graphics/particles/emote-upset.particle.xml
deleted file mode 100644
index 8016e446..00000000
--- a/graphics/particles/emote-upset.particle.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<effect>

-	<particle

-		position-x = "0"

-		position-y = "0"

-		position-z = "96"

-		lifetime = "1"

-		>

-		<emitter>

-			<property name="position-x" value="0"/>

-			<property name="position-y" value="0"/>

-			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="10" delay="1000"/>

-			</animation>

-			<property name="follow-parent" />

-		</emitter>

-	</particle>

-</effect>

diff --git a/graphics/particles/emotes/angel.png b/graphics/particles/emotes/angel.png
new file mode 100644
index 00000000..043d0755
--- /dev/null
+++ b/graphics/particles/emotes/angel.png
diff --git a/graphics/particles/emotes/blah.png b/graphics/particles/emotes/blah.png
new file mode 100644
index 00000000..3eae88a2
--- /dev/null
+++ b/graphics/particles/emotes/blah.png
diff --git a/graphics/particles/emotes/blush.png b/graphics/particles/emotes/blush.png
new file mode 100644
index 00000000..22172ae0
--- /dev/null
+++ b/graphics/particles/emotes/blush.png
diff --git a/graphics/particles/emotes/disgust.png b/graphics/particles/emotes/disgust.png
new file mode 100644
index 00000000..9965f89d
--- /dev/null
+++ b/graphics/particles/emotes/disgust.png
diff --git a/graphics/particles/emote-angel.particle.xml b/graphics/particles/emotes/emote-angel.particle.xml
index a79d865f..a4bb1b53 100644
--- a/graphics/particles/emote-angel.particle.xml
+++ b/graphics/particles/emotes/emote-angel.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="6" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/angel.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emotes/emote-blah.particle.xml b/graphics/particles/emotes/emote-blah.particle.xml
new file mode 100644
index 00000000..38cb327a
--- /dev/null
+++ b/graphics/particles/emotes/emote-blah.particle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "96"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" value="0"/>

+			<property name="position-y" value="0"/>

+			<property name="position-z" value="-32"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/blah.png" width="30" height="32">

+				<frame index="0" />

+			</animation>

+			<property name="follow-parent" />

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/emote-blush.particle.xml b/graphics/particles/emotes/emote-blush.particle.xml
index d979c9b0..11d2689d 100644
--- a/graphics/particles/emote-blush.particle.xml
+++ b/graphics/particles/emotes/emote-blush.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="7" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/blush.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emote-disgust.particle.xml b/graphics/particles/emotes/emote-disgust.particle.xml
index 1596b464..b04d18dd 100644
--- a/graphics/particles/emote-disgust.particle.xml
+++ b/graphics/particles/emotes/emote-disgust.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="0" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/disgust.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emote-evil.particle.xml b/graphics/particles/emotes/emote-evil.particle.xml
index 09ca625b..433aef30 100644
--- a/graphics/particles/emote-evil.particle.xml
+++ b/graphics/particles/emotes/emote-evil.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="4" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/evil.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emote-grin.particle.xml b/graphics/particles/emotes/emote-grin.particle.xml
index b5223cd8..5c50aa98 100644
--- a/graphics/particles/emote-grin.particle.xml
+++ b/graphics/particles/emotes/emote-grin.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="9" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/grin.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emote-happy.particle.xml b/graphics/particles/emotes/emote-happy.particle.xml
index 9eec8a6e..fa43997f 100644
--- a/graphics/particles/emote-happy.particle.xml
+++ b/graphics/particles/emotes/emote-happy.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="2" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/happy.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emotes/emote-perturbed.particle.xml b/graphics/particles/emotes/emote-perturbed.particle.xml
new file mode 100644
index 00000000..47f92e30
--- /dev/null
+++ b/graphics/particles/emotes/emote-perturbed.particle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "96"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" value="0"/>

+			<property name="position-y" value="0"/>

+			<property name="position-z" value="-32"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/perturbed.png" width="30" height="32">

+				<frame index="0" />

+			</animation>

+			<property name="follow-parent" />

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/emote-sad.particle.xml b/graphics/particles/emotes/emote-sad.particle.xml
index 2bbf26db..0e0b7dc8 100644
--- a/graphics/particles/emote-sad.particle.xml
+++ b/graphics/particles/emotes/emote-sad.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="3" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/sad.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emotes/emote-speech.particle.xml b/graphics/particles/emotes/emote-speech.particle.xml
new file mode 100644
index 00000000..7d6350b0
--- /dev/null
+++ b/graphics/particles/emotes/emote-speech.particle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "96"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" value="0"/>

+			<property name="position-y" value="0"/>

+			<property name="position-z" value="-32"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/speech.png" width="30" height="32">

+				<frame index="0" />

+			</animation>

+			<property name="follow-parent" />

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/emote-surprise.particle.xml b/graphics/particles/emotes/emote-surprise.particle.xml
index 1321d31c..29498c8f 100644
--- a/graphics/particles/emote-surprise.particle.xml
+++ b/graphics/particles/emotes/emote-surprise.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="1" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/surprise.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emote-tongue.particle.xml b/graphics/particles/emotes/emote-tongue.particle.xml
index 2e326762..2796ac6c 100644
--- a/graphics/particles/emote-tongue.particle.xml
+++ b/graphics/particles/emotes/emote-tongue.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="8" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/tongue.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emotes/emote-upset.particle.xml b/graphics/particles/emotes/emote-upset.particle.xml
new file mode 100644
index 00000000..4b10d9f2
--- /dev/null
+++ b/graphics/particles/emotes/emote-upset.particle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>

+<effect>

+	<particle

+		position-x = "0"

+		position-y = "0"

+		position-z = "96"

+		lifetime = "1"

+		>

+		<emitter>

+			<property name="position-x" value="0"/>

+			<property name="position-y" value="0"/>

+			<property name="position-z" value="-32"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/upset.png" width="30" height="32">

+				<frame index="0" />

+			</animation>

+			<property name="follow-parent" />

+		</emitter>

+	</particle>

+</effect>

diff --git a/graphics/particles/emote-wink.particle.xml b/graphics/particles/emotes/emote-wink.particle.xml
index a521cfc3..b217a649 100644
--- a/graphics/particles/emote-wink.particle.xml
+++ b/graphics/particles/emotes/emote-wink.particle.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>

 <effect>

 	<particle

 		position-x = "0"

@@ -9,12 +10,12 @@
 			<property name="position-x" value="0"/>

 			<property name="position-y" value="0"/>

 			<property name="position-z" value="-32"/>

-			<property name="lifetime" value="360"/>

-			<property name="fade-out" value="20" />

-			<property name="acceleration" value="0.06" />

-			<property name="momentum" value="0.993" />

-			<animation imageset="graphics/sprites/emotions.png" width="30" height="32">

-				<frame index="5" delay="1000"/>

+			<property name="lifetime" value="80"/>

+			<property name="fade-out" value="50" />

+			<property name="gravity" value="-0.02" />

+

+			<animation imageset="graphics/particles/emotes/wink.png" width="30" height="32">

+				<frame index="0" />

 			</animation>

 			<property name="follow-parent" />

 		</emitter>

diff --git a/graphics/particles/emotes/evil.png b/graphics/particles/emotes/evil.png
new file mode 100644
index 00000000..7c417ec6
--- /dev/null
+++ b/graphics/particles/emotes/evil.png
diff --git a/graphics/particles/emotes/grin.png b/graphics/particles/emotes/grin.png
new file mode 100644
index 00000000..0c21cfe8
--- /dev/null
+++ b/graphics/particles/emotes/grin.png
diff --git a/graphics/particles/emotes/happy.png b/graphics/particles/emotes/happy.png
new file mode 100644
index 00000000..8ca2930e
--- /dev/null
+++ b/graphics/particles/emotes/happy.png
diff --git a/graphics/particles/emotes/perturbed.png b/graphics/particles/emotes/perturbed.png
new file mode 100644
index 00000000..0a33e0ad
--- /dev/null
+++ b/graphics/particles/emotes/perturbed.png
diff --git a/graphics/particles/emotes/sad.png b/graphics/particles/emotes/sad.png
new file mode 100644
index 00000000..3ceb3caf
--- /dev/null
+++ b/graphics/particles/emotes/sad.png
diff --git a/graphics/particles/emotes/speech.png b/graphics/particles/emotes/speech.png
new file mode 100644
index 00000000..72044719
--- /dev/null
+++ b/graphics/particles/emotes/speech.png
diff --git a/graphics/particles/emotes/surprise.png b/graphics/particles/emotes/surprise.png
new file mode 100644
index 00000000..e1649a63
--- /dev/null
+++ b/graphics/particles/emotes/surprise.png
diff --git a/graphics/particles/emotes/tongue.png b/graphics/particles/emotes/tongue.png
new file mode 100644
index 00000000..0d5bc959
--- /dev/null
+++ b/graphics/particles/emotes/tongue.png
diff --git a/graphics/particles/emotes/upset.png b/graphics/particles/emotes/upset.png
new file mode 100644
index 00000000..b2f0ce2b
--- /dev/null
+++ b/graphics/particles/emotes/upset.png
diff --git a/graphics/particles/emotes/wink.png b/graphics/particles/emotes/wink.png
new file mode 100644
index 00000000..13488bb8
--- /dev/null
+++ b/graphics/particles/emotes/wink.png
diff --git a/graphics/particles/monster-ball-lightning.particle.xml b/graphics/particles/monster-ball-lightning.particle.xml
index e8b4d39c..c4de5a03 100755
--- a/graphics/particles/monster-ball-lightning.particle.xml
+++ b/graphics/particles/monster-ball-lightning.particle.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0"?>

 

 <effect>

-	<particle

-		position-x = "0"

-		position-y = "0"

-		position-z = "10"

-		>

+	<particle position-x = "0" position-y = "0" position-z = "10" >

 		<emitter>

 			<property name="position-z" min="16" max="48" />

 			<animation imageset="graphics/particles/monster-ball-lightning.particle.png" width="15" height="15">

 				<sequence start="0" end="7" delay="20" />

 			</animation>

-			<property name="horizontal-angle" min="0" max="360"/>

+			<property name="horizontal-angle" min="0" max="360"/>
 			<property name="gravity" value="0.1"/>

 			<property name="randomnes" value="125"/>

 			<property name="lifetime" value="75"/>

 			<property name="fade-in" value="5"/>

 			<property name="fade-out" value="20"/>

 			<property name="alpha" value="0.6" />

-			<property name="output" value="1"/>

+			<property name="output" value="1"/>
 		</emitter>

 	</particle>

 </effect>