From 7e1f80f39eee38d2f6b6c8cdcb91cb940d10984f Mon Sep 17 00:00:00 2001
From: Chuck Miller <shadowmil@gmail.com>
Date: Wed, 3 Nov 2010 23:41:42 -0400
Subject: Update emotes to be used by the particle system

Reviewed-by: Bertram
---
 effects.xml                                        |  28 ++---
 emotes.xml                                         | 130 ++++++++++++++++++---
 graphics/particles/emote-angel.particle.xml        |  22 ----
 graphics/particles/emote-blah.particle.xml         |  22 ----
 graphics/particles/emote-blush.particle.xml        |  22 ----
 graphics/particles/emote-disgust.particle.xml      |  22 ----
 graphics/particles/emote-evil.particle.xml         |  22 ----
 graphics/particles/emote-grin.particle.xml         |  22 ----
 graphics/particles/emote-happy.particle.xml        |  22 ----
 graphics/particles/emote-perturbed.particle.xml    |  22 ----
 graphics/particles/emote-sad.particle.xml          |  22 ----
 graphics/particles/emote-speech.particle.xml       |  22 ----
 graphics/particles/emote-surprise.particle.xml     |  22 ----
 graphics/particles/emote-tongue.particle.xml       |  22 ----
 graphics/particles/emote-upset.particle.xml        |  22 ----
 graphics/particles/emote-wink.particle.xml         |  22 ----
 graphics/particles/emotes/angel.png                | Bin 0 -> 1960 bytes
 graphics/particles/emotes/blah.png                 | Bin 0 -> 822 bytes
 graphics/particles/emotes/blush.png                | Bin 0 -> 2038 bytes
 graphics/particles/emotes/disgust.png              | Bin 0 -> 1924 bytes
 graphics/particles/emotes/emote-angel.particle.xml |  23 ++++
 graphics/particles/emotes/emote-blah.particle.xml  |  23 ++++
 graphics/particles/emotes/emote-blush.particle.xml |  23 ++++
 .../particles/emotes/emote-disgust.particle.xml    |  23 ++++
 graphics/particles/emotes/emote-evil.particle.xml  |  23 ++++
 graphics/particles/emotes/emote-grin.particle.xml  |  23 ++++
 graphics/particles/emotes/emote-happy.particle.xml |  23 ++++
 .../particles/emotes/emote-perturbed.particle.xml  |  23 ++++
 graphics/particles/emotes/emote-sad.particle.xml   |  23 ++++
 .../particles/emotes/emote-speech.particle.xml     |  23 ++++
 .../particles/emotes/emote-surprise.particle.xml   |  23 ++++
 .../particles/emotes/emote-tongue.particle.xml     |  23 ++++
 graphics/particles/emotes/emote-upset.particle.xml |  23 ++++
 graphics/particles/emotes/emote-wink.particle.xml  |  23 ++++
 graphics/particles/emotes/evil.png                 | Bin 0 -> 1925 bytes
 graphics/particles/emotes/grin.png                 | Bin 0 -> 2047 bytes
 graphics/particles/emotes/happy.png                | Bin 0 -> 1734 bytes
 graphics/particles/emotes/perturbed.png            | Bin 0 -> 1763 bytes
 graphics/particles/emotes/sad.png                  | Bin 0 -> 1918 bytes
 graphics/particles/emotes/speech.png               | Bin 0 -> 796 bytes
 graphics/particles/emotes/surprise.png             | Bin 0 -> 2086 bytes
 graphics/particles/emotes/tongue.png               | Bin 0 -> 1753 bytes
 graphics/particles/emotes/upset.png                | Bin 0 -> 1632 bytes
 graphics/particles/emotes/wink.png                 | Bin 0 -> 1680 bytes
 44 files changed, 452 insertions(+), 336 deletions(-)
 delete mode 100644 graphics/particles/emote-angel.particle.xml
 delete mode 100644 graphics/particles/emote-blah.particle.xml
 delete mode 100644 graphics/particles/emote-blush.particle.xml
 delete mode 100644 graphics/particles/emote-disgust.particle.xml
 delete mode 100644 graphics/particles/emote-evil.particle.xml
 delete mode 100644 graphics/particles/emote-grin.particle.xml
 delete mode 100644 graphics/particles/emote-happy.particle.xml
 delete mode 100644 graphics/particles/emote-perturbed.particle.xml
 delete mode 100644 graphics/particles/emote-sad.particle.xml
 delete mode 100644 graphics/particles/emote-speech.particle.xml
 delete mode 100644 graphics/particles/emote-surprise.particle.xml
 delete mode 100644 graphics/particles/emote-tongue.particle.xml
 delete mode 100644 graphics/particles/emote-upset.particle.xml
 delete mode 100644 graphics/particles/emote-wink.particle.xml
 create mode 100644 graphics/particles/emotes/angel.png
 create mode 100644 graphics/particles/emotes/blah.png
 create mode 100644 graphics/particles/emotes/blush.png
 create mode 100644 graphics/particles/emotes/disgust.png
 create mode 100644 graphics/particles/emotes/emote-angel.particle.xml
 create mode 100644 graphics/particles/emotes/emote-blah.particle.xml
 create mode 100644 graphics/particles/emotes/emote-blush.particle.xml
 create mode 100644 graphics/particles/emotes/emote-disgust.particle.xml
 create mode 100644 graphics/particles/emotes/emote-evil.particle.xml
 create mode 100644 graphics/particles/emotes/emote-grin.particle.xml
 create mode 100644 graphics/particles/emotes/emote-happy.particle.xml
 create mode 100644 graphics/particles/emotes/emote-perturbed.particle.xml
 create mode 100644 graphics/particles/emotes/emote-sad.particle.xml
 create mode 100644 graphics/particles/emotes/emote-speech.particle.xml
 create mode 100644 graphics/particles/emotes/emote-surprise.particle.xml
 create mode 100644 graphics/particles/emotes/emote-tongue.particle.xml
 create mode 100644 graphics/particles/emotes/emote-upset.particle.xml
 create mode 100644 graphics/particles/emotes/emote-wink.particle.xml
 create mode 100644 graphics/particles/emotes/evil.png
 create mode 100644 graphics/particles/emotes/grin.png
 create mode 100644 graphics/particles/emotes/happy.png
 create mode 100644 graphics/particles/emotes/perturbed.png
 create mode 100644 graphics/particles/emotes/sad.png
 create mode 100644 graphics/particles/emotes/speech.png
 create mode 100644 graphics/particles/emotes/surprise.png
 create mode 100644 graphics/particles/emotes/tongue.png
 create mode 100644 graphics/particles/emotes/upset.png
 create mode 100644 graphics/particles/emotes/wink.png

diff --git a/effects.xml b/effects.xml
index e201e91c..b7e8e389 100644
--- a/effects.xml
+++ b/effects.xml
@@ -37,18 +37,18 @@
 <!--  <effect id="120" particle="graphics/particles/magic.barrier-ends.xml"/> -->
 
 <!-- Emotion Effects -->
-  <effect id="10000" particle="graphics/particles/emote-disgust.particle.xml"/>
-  <effect id="10001" particle="graphics/particles/emote-surprise.particle.xml"/>
-  <effect id="10002" particle="graphics/particles/emote-happy.particle.xml"/>
-  <effect id="10003" particle="graphics/particles/emote-sad.particle.xml"/>
-  <effect id="10004" particle="graphics/particles/emote-evil.particle.xml"/>
-  <effect id="10005" particle="graphics/particles/emote-wink.particle.xml"/>
-  <effect id="10006" particle="graphics/particles/emote-angel.particle.xml"/>
-  <effect id="10007" particle="graphics/particles/emote-blush.particle.xml"/>
-  <effect id="10008" particle="graphics/particles/emote-tongue.particle.xml"/>
-  <effect id="10009" particle="graphics/particles/emote-grin.particle.xml"/>
-  <effect id="10010" particle="graphics/particles/emote-upset.particle.xml"/>
-  <effect id="10011" particle="graphics/particles/emote-perturbed.particle.xml"/>
-  <effect id="10012" particle="graphics/particles/emote-speech.particle.xml"/>
-  <effect id="10013" particle="graphics/particles/emote-blah.particle.xml"/>
+  <effect id="10000" particle="graphics/particles/emotes/emote-disgust.particle.xml"/>
+  <effect id="10001" particle="graphics/particles/emotes/emote-surprise.particle.xml"/>
+  <effect id="10002" particle="graphics/particles/emotes/emote-happy.particle.xml"/>
+  <effect id="10003" particle="graphics/particles/emotes/emote-sad.particle.xml"/>
+  <effect id="10004" particle="graphics/particles/emotes/emote-evil.particle.xml"/>
+  <effect id="10005" particle="graphics/particles/emotes/emote-wink.particle.xml"/>
+  <effect id="10006" particle="graphics/particles/emotes/emote-angel.particle.xml"/>
+  <effect id="10007" particle="graphics/particles/emotes/emote-blush.particle.xml"/>
+  <effect id="10008" particle="graphics/particles/emotes/emote-tongue.particle.xml"/>
+  <effect id="10009" particle="graphics/particles/emotes/emote-grin.particle.xml"/>
+  <effect id="10010" particle="graphics/particles/emotes/emote-upset.particle.xml"/>
+  <effect id="10011" particle="graphics/particles/emotes/emote-perturbed.particle.xml"/>
+  <effect id="10012" particle="graphics/particles/emotes/emote-speech.particle.xml"/>
+  <effect id="10013" particle="graphics/particles/emotes/emote-blah.particle.xml"/>
 </being-effects>
diff --git a/emotes.xml b/emotes.xml
index 37fad037..0fbb0a16 100644
--- a/emotes.xml
+++ b/emotes.xml
@@ -1,16 +1,118 @@
+<?xml version="1.0"?>
 <emotes>
-	<emote id="0"><sprite name="Disgust" variant="0">emote.xml</sprite></emote>
-	<emote id="1"><sprite name="Surprise" variant="1">emote.xml</sprite></emote>
-	<emote id="2"><sprite name="Happy" variant="2">emote.xml</sprite></emote>
-	<emote id="3"><sprite name="Sad" variant="3">emote.xml</sprite></emote>
-	<emote id="4"><sprite name="Evil" variant="4">emote.xml</sprite></emote>
-	<emote id="5"><sprite name="Wink" variant="5">emote.xml</sprite></emote>
-	<emote id="6"><sprite name="Angel" variant="6">emote.xml</sprite></emote>
-	<emote id="7"><sprite name="Blush" variant="7">emote.xml</sprite></emote>
-	<emote id="8"><sprite name="Tongue" variant="8">emote.xml</sprite></emote>
-	<emote id="9"><sprite name="Grin" variant="9">emote.xml</sprite></emote>
-	<emote id="10"><sprite name="Upset" variant="10">emote.xml</sprite></emote>
-	<emote id="11"><sprite name="Perturbed" variant="11">emote.xml</sprite></emote>
-	<emote id="12"><sprite name="Speech" variant="14">emote.xml</sprite></emote>
-	<emote id="13"><sprite name="Blah Blah Blah" variant="13">emote.xml</sprite></emote>
+    <!-- Important note that the sprite tags are purely for
+         backwards compatibility -->
+
+    <emote id="0"
+           name="Disgust"
+           effectid="10000"
+           image="graphics/particles/emotes/disgust.png"
+           width="30" height="32">
+        <sprite name="Disgust" variant="0">emote.xml</sprite>
+    </emote>
+
+    <emote id="1"
+           name="Surprise"
+           effectid="10001"
+           image="graphics/particles/emotes/surprise.png"
+           width="30" height="32">
+        <sprite name="Surprise" variant="1">emote.xml</sprite>
+    </emote>
+
+    <emote id="2"
+           name="Happy"
+           effectid="10002"
+           image="graphics/particles/emotes/happy.png"
+           width="30" height="32">
+        <sprite name="Happy" variant="2">emote.xml</sprite>
+    </emote>
+
+    <emote id="3"
+           name="Sad"
+           effectid="10003"
+           image="graphics/particles/emotes/sad.png"
+           width="30" height="32">
+        <sprite name="Sad" variant="3">emote.xml</sprite>
+    </emote>
+
+    <emote id="4"
+           name="Evil"
+           effectid="10004"
+           image="graphics/particles/emotes/evil.png"
+           width="30" height="32">
+        <sprite name="Evil" variant="4">emote.xml</sprite>
+    </emote>
+
+    <emote id="5"
+           name="Wink"
+           effectid="10005"
+           image="graphics/particles/emotes/wink.png"
+           width="30" height="32">
+        <sprite name="Wink" variant="5">emote.xml</sprite>
+    </emote>
+
+    <emote id="6"
+           name="Angel"
+           effectid="10006"
+           image="graphics/particles/emotes/angel.png"
+           width="30" height="32">
+        <sprite name="Angel" variant="6">emote.xml</sprite>
+    </emote>
+
+    <emote id="7"
+           name="Blush"
+           effectid="10007"
+           image="graphics/particles/emotes/blush.png"
+           width="30" height="32">
+        <sprite name="Blush" variant="7">emote.xml</sprite>
+    </emote>
+
+    <emote id="8"
+           name="Tongue"
+           effectid="10008"
+           image="graphics/particles/emotes/tongue.png"
+           width="30" height="32">
+        <sprite name="Tongue" variant="8">emote.xml</sprite>
+    </emote>
+
+    <emote id="9"
+           name="Grin"
+           effectid="10009"
+           image="graphics/particles/emotes/grin.png"
+           width="30" height="32">
+        <sprite name="Grin" variant="9">emote.xml</sprite>
+    </emote>
+
+    <emote id="10"
+           name="Upset"
+           effectid="10010"
+           image="graphics/particles/emotes/upset.png"
+           width="30" height="32">
+        <sprite name="Upset" variant="10">emote.xml</sprite>
+    </emote>
+
+    <emote id="11"
+           name="Perturbed"
+           effectid="10011"
+           image="graphics/particles/emotes/perturbed.png"
+           width="30" height="32">
+        <sprite name="Perturbed" variant="11">emote.xml</sprite>
+    </emote>
+
+    <emote id="12"
+           name="Speech"
+           effectid="10012"
+           image="graphics/particles/emotes/speech.png"
+           width="30" height="32">
+        <sprite name="Speech" variant="14">emote.xml</sprite>
+    </emote>
+
+    <emote id="13"
+           name="Blah"
+           effectid="10013"
+           image="graphics/particles/emotes/blah.png"
+           width="30" height="32">
+        <sprite name="Blah" variant="13">emote.xml</sprite>
+    </emote>
+
 </emotes>
diff --git a/graphics/particles/emote-angel.particle.xml b/graphics/particles/emote-angel.particle.xml
deleted file mode 100644
index a79d865f..00000000
--- a/graphics/particles/emote-angel.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="6" delay="1000"/>
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
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-blush.particle.xml b/graphics/particles/emote-blush.particle.xml
deleted file mode 100644
index d979c9b0..00000000
--- a/graphics/particles/emote-blush.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="7" delay="1000"/>
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emote-disgust.particle.xml b/graphics/particles/emote-disgust.particle.xml
deleted file mode 100644
index 1596b464..00000000
--- a/graphics/particles/emote-disgust.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="0" delay="1000"/>
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emote-evil.particle.xml b/graphics/particles/emote-evil.particle.xml
deleted file mode 100644
index 09ca625b..00000000
--- a/graphics/particles/emote-evil.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="4" delay="1000"/>
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emote-grin.particle.xml b/graphics/particles/emote-grin.particle.xml
deleted file mode 100644
index b5223cd8..00000000
--- a/graphics/particles/emote-grin.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="9" delay="1000"/>
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emote-happy.particle.xml b/graphics/particles/emote-happy.particle.xml
deleted file mode 100644
index 9eec8a6e..00000000
--- a/graphics/particles/emote-happy.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="2" 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-sad.particle.xml b/graphics/particles/emote-sad.particle.xml
deleted file mode 100644
index 2bbf26db..00000000
--- a/graphics/particles/emote-sad.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="3" 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-surprise.particle.xml b/graphics/particles/emote-surprise.particle.xml
deleted file mode 100644
index 1321d31c..00000000
--- a/graphics/particles/emote-surprise.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="1" delay="1000"/>
-			</animation>
-			<property name="follow-parent" />
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/emote-tongue.particle.xml b/graphics/particles/emote-tongue.particle.xml
deleted file mode 100644
index 2e326762..00000000
--- a/graphics/particles/emote-tongue.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="8" 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/emote-wink.particle.xml b/graphics/particles/emote-wink.particle.xml
deleted file mode 100644
index a521cfc3..00000000
--- a/graphics/particles/emote-wink.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="5" 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
Binary files /dev/null and b/graphics/particles/emotes/angel.png differ
diff --git a/graphics/particles/emotes/blah.png b/graphics/particles/emotes/blah.png
new file mode 100644
index 00000000..3eae88a2
Binary files /dev/null and b/graphics/particles/emotes/blah.png differ
diff --git a/graphics/particles/emotes/blush.png b/graphics/particles/emotes/blush.png
new file mode 100644
index 00000000..22172ae0
Binary files /dev/null and b/graphics/particles/emotes/blush.png differ
diff --git a/graphics/particles/emotes/disgust.png b/graphics/particles/emotes/disgust.png
new file mode 100644
index 00000000..9965f89d
Binary files /dev/null and b/graphics/particles/emotes/disgust.png differ
diff --git a/graphics/particles/emotes/emote-angel.particle.xml b/graphics/particles/emotes/emote-angel.particle.xml
new file mode 100644
index 00000000..a4bb1b53
--- /dev/null
+++ b/graphics/particles/emotes/emote-angel.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/angel.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
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/emotes/emote-blush.particle.xml b/graphics/particles/emotes/emote-blush.particle.xml
new file mode 100644
index 00000000..11d2689d
--- /dev/null
+++ b/graphics/particles/emotes/emote-blush.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/blush.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/emote-disgust.particle.xml b/graphics/particles/emotes/emote-disgust.particle.xml
new file mode 100644
index 00000000..b04d18dd
--- /dev/null
+++ b/graphics/particles/emotes/emote-disgust.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/disgust.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/emote-evil.particle.xml b/graphics/particles/emotes/emote-evil.particle.xml
new file mode 100644
index 00000000..433aef30
--- /dev/null
+++ b/graphics/particles/emotes/emote-evil.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/evil.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/emote-grin.particle.xml b/graphics/particles/emotes/emote-grin.particle.xml
new file mode 100644
index 00000000..5c50aa98
--- /dev/null
+++ b/graphics/particles/emotes/emote-grin.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/grin.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/emote-happy.particle.xml b/graphics/particles/emotes/emote-happy.particle.xml
new file mode 100644
index 00000000..fa43997f
--- /dev/null
+++ b/graphics/particles/emotes/emote-happy.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/happy.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
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/emotes/emote-sad.particle.xml b/graphics/particles/emotes/emote-sad.particle.xml
new file mode 100644
index 00000000..0e0b7dc8
--- /dev/null
+++ b/graphics/particles/emotes/emote-sad.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/sad.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
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/emotes/emote-surprise.particle.xml b/graphics/particles/emotes/emote-surprise.particle.xml
new file mode 100644
index 00000000..29498c8f
--- /dev/null
+++ b/graphics/particles/emotes/emote-surprise.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/surprise.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/emote-tongue.particle.xml b/graphics/particles/emotes/emote-tongue.particle.xml
new file mode 100644
index 00000000..2796ac6c
--- /dev/null
+++ b/graphics/particles/emotes/emote-tongue.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/tongue.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
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/emotes/emote-wink.particle.xml b/graphics/particles/emotes/emote-wink.particle.xml
new file mode 100644
index 00000000..b217a649
--- /dev/null
+++ b/graphics/particles/emotes/emote-wink.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/wink.png" width="30" height="32">
+				<frame index="0" />
+			</animation>
+			<property name="follow-parent" />
+		</emitter>
+	</particle>
+</effect>
diff --git a/graphics/particles/emotes/evil.png b/graphics/particles/emotes/evil.png
new file mode 100644
index 00000000..7c417ec6
Binary files /dev/null and b/graphics/particles/emotes/evil.png differ
diff --git a/graphics/particles/emotes/grin.png b/graphics/particles/emotes/grin.png
new file mode 100644
index 00000000..0c21cfe8
Binary files /dev/null and b/graphics/particles/emotes/grin.png differ
diff --git a/graphics/particles/emotes/happy.png b/graphics/particles/emotes/happy.png
new file mode 100644
index 00000000..8ca2930e
Binary files /dev/null and b/graphics/particles/emotes/happy.png differ
diff --git a/graphics/particles/emotes/perturbed.png b/graphics/particles/emotes/perturbed.png
new file mode 100644
index 00000000..0a33e0ad
Binary files /dev/null and b/graphics/particles/emotes/perturbed.png differ
diff --git a/graphics/particles/emotes/sad.png b/graphics/particles/emotes/sad.png
new file mode 100644
index 00000000..3ceb3caf
Binary files /dev/null and b/graphics/particles/emotes/sad.png differ
diff --git a/graphics/particles/emotes/speech.png b/graphics/particles/emotes/speech.png
new file mode 100644
index 00000000..72044719
Binary files /dev/null and b/graphics/particles/emotes/speech.png differ
diff --git a/graphics/particles/emotes/surprise.png b/graphics/particles/emotes/surprise.png
new file mode 100644
index 00000000..e1649a63
Binary files /dev/null and b/graphics/particles/emotes/surprise.png differ
diff --git a/graphics/particles/emotes/tongue.png b/graphics/particles/emotes/tongue.png
new file mode 100644
index 00000000..0d5bc959
Binary files /dev/null and b/graphics/particles/emotes/tongue.png differ
diff --git a/graphics/particles/emotes/upset.png b/graphics/particles/emotes/upset.png
new file mode 100644
index 00000000..b2f0ce2b
Binary files /dev/null and b/graphics/particles/emotes/upset.png differ
diff --git a/graphics/particles/emotes/wink.png b/graphics/particles/emotes/wink.png
new file mode 100644
index 00000000..13488bb8
Binary files /dev/null and b/graphics/particles/emotes/wink.png differ
-- 
cgit v1.2.3-60-g2f50