Placed all emotes in the graphics/emotes/ folder for clarity.

31 files changed, 299 insertions, 18 deletions

diff --git a/emotes.xml b/emotes.xml
index ebd0a4b4..55fb7fd5 100644
--- a/emotes.xml
+++ b/emotes.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <emotes>
+
     <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
         <its:translateRule selector="//emote/@name" translate="yes"/>
         <its:translateRule selector="//emote/sprite/@name" translate="yes"/>
         <its:translateRule selector="//*" translate="no"/>
     </its:rules>
 
-    <!-- Important note that the sprite tags are purely for
-         backwards compatibility -->
+    <!-- The sprite tags are purely for backwards compatibility. -->
 
     <emote id="0"
            name="Disgust"
            effectid="10000"
-           image="graphics/particles/emotes/disgust.png"
+           image="graphics/emotes/disgust.png"
            width="30" height="32">
         <sprite name="Disgust" variant="0">emote.xml</sprite>
     </emote>
@@ -20,7 +20,7 @@
     <emote id="1"
            name="Surprise"
            effectid="10001"
-           image="graphics/particles/emotes/surprise.png"
+           image="graphics/emotes/surprise.png"
            width="30" height="32">
         <sprite name="Surprise" variant="1">emote.xml</sprite>
     </emote>
@@ -28,7 +28,7 @@
     <emote id="2"
            name="Happy"
            effectid="10002"
-           image="graphics/particles/emotes/happy.png"
+           image="graphics/emotes/happy.png"
            width="30" height="32">
         <sprite name="Happy" variant="2">emote.xml</sprite>
     </emote>
@@ -36,7 +36,7 @@
     <emote id="3"
            name="Sad"
            effectid="10003"
-           image="graphics/particles/emotes/sad.png"
+           image="graphics/emotes/sad.png"
            width="30" height="32">
         <sprite name="Sad" variant="3">emote.xml</sprite>
     </emote>
@@ -44,7 +44,7 @@
     <emote id="4"
            name="Evil"
            effectid="10004"
-           image="graphics/particles/emotes/evil.png"
+           image="graphics/emotes/evil.png"
            width="30" height="32">
         <sprite name="Evil" variant="4">emote.xml</sprite>
     </emote>
@@ -52,7 +52,7 @@
     <emote id="5"
            name="Wink"
            effectid="10005"
-           image="graphics/particles/emotes/wink.png"
+           image="graphics/emotes/wink.png"
            width="30" height="32">
         <sprite name="Wink" variant="5">emote.xml</sprite>
     </emote>
@@ -60,7 +60,7 @@
     <emote id="6"
            name="Angel"
            effectid="10006"
-           image="graphics/particles/emotes/angel.png"
+           image="graphics/emotes/angel.png"
            width="30" height="32">
         <sprite name="Angel" variant="6">emote.xml</sprite>
     </emote>
@@ -68,7 +68,7 @@
     <emote id="7"
            name="Blush"
            effectid="10007"
-           image="graphics/particles/emotes/blush.png"
+           image="graphics/emotes/blush.png"
            width="30" height="32">
         <sprite name="Blush" variant="7">emote.xml</sprite>
     </emote>
@@ -76,7 +76,7 @@
     <emote id="8"
            name="Tongue"
            effectid="10008"
-           image="graphics/particles/emotes/tongue.png"
+           image="graphics/emotes/tongue.png"
            width="30" height="32">
         <sprite name="Tongue" variant="8">emote.xml</sprite>
     </emote>
@@ -84,7 +84,7 @@
     <emote id="9"
            name="Grin"
            effectid="10009"
-           image="graphics/particles/emotes/grin.png"
+           image="graphics/emotes/grin.png"
            width="30" height="32">
         <sprite name="Grin" variant="9">emote.xml</sprite>
     </emote>
@@ -92,7 +92,7 @@
     <emote id="10"
            name="Upset"
            effectid="10010"
-           image="graphics/particles/emotes/upset.png"
+           image="graphics/emotes/upset.png"
            width="30" height="32">
         <sprite name="Upset" variant="10">emote.xml</sprite>
     </emote>
@@ -100,7 +100,7 @@
     <emote id="11"
            name="Perturbed"
            effectid="10011"
-           image="graphics/particles/emotes/perturbed.png"
+           image="graphics/emotes/perturbed.png"
            width="30" height="32">
         <sprite name="Perturbed" variant="11">emote.xml</sprite>
     </emote>
@@ -108,7 +108,7 @@
     <emote id="12"
            name="Speech"
            effectid="10012"
-           image="graphics/particles/emotes/speech.png"
+           image="graphics/emotes/speech.png"
            width="30" height="32">
         <sprite name="Speech" variant="14">emote.xml</sprite>
     </emote>
@@ -116,7 +116,7 @@
     <emote id="13"
            name="Blah"
            effectid="10013"
-           image="graphics/particles/emotes/blah.png"
+           image="graphics/emotes/blah.png"
            width="30" height="32">
         <sprite name="Blah" variant="13">emote.xml</sprite>
     </emote>
diff --git a/graphics/emotes/angel.png b/graphics/emotes/angel.png
new file mode 100644
index 00000000..043d0755
--- /dev/null
+++ b/graphics/emotes/angel.png
diff --git a/graphics/emotes/angel.xml b/graphics/emotes/angel.xml
new file mode 100644
index 00000000..36fe27c0
--- /dev/null
+++ b/graphics/emotes/angel.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/blah.png b/graphics/emotes/blah.png
new file mode 100644
index 00000000..3eae88a2
--- /dev/null
+++ b/graphics/emotes/blah.png
diff --git a/graphics/emotes/blah.xml b/graphics/emotes/blah.xml
new file mode 100644
index 00000000..528c004b
--- /dev/null
+++ b/graphics/emotes/blah.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/blush.png b/graphics/emotes/blush.png
new file mode 100644
index 00000000..22172ae0
--- /dev/null
+++ b/graphics/emotes/blush.png
diff --git a/graphics/emotes/blush.xml b/graphics/emotes/blush.xml
new file mode 100644
index 00000000..cd9d0d0e
--- /dev/null
+++ b/graphics/emotes/blush.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/disgust.png b/graphics/emotes/disgust.png
new file mode 100644
index 00000000..9965f89d
--- /dev/null
+++ b/graphics/emotes/disgust.png
diff --git a/graphics/emotes/disgust.xml b/graphics/emotes/disgust.xml
new file mode 100644
index 00000000..6133bb7c
--- /dev/null
+++ b/graphics/emotes/disgust.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/evil.png b/graphics/emotes/evil.png
new file mode 100644
index 00000000..7c417ec6
--- /dev/null
+++ b/graphics/emotes/evil.png
diff --git a/graphics/emotes/evil.xml b/graphics/emotes/evil.xml
new file mode 100644
index 00000000..79c98812
--- /dev/null
+++ b/graphics/emotes/evil.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/grin.png b/graphics/emotes/grin.png
new file mode 100644
index 00000000..0c21cfe8
--- /dev/null
+++ b/graphics/emotes/grin.png
diff --git a/graphics/emotes/grin.xml b/graphics/emotes/grin.xml
new file mode 100644
index 00000000..852ae751
--- /dev/null
+++ b/graphics/emotes/grin.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/happy.png b/graphics/emotes/happy.png
new file mode 100644
index 00000000..8ca2930e
--- /dev/null
+++ b/graphics/emotes/happy.png
diff --git a/graphics/emotes/happy.xml b/graphics/emotes/happy.xml
new file mode 100644
index 00000000..42256bcd
--- /dev/null
+++ b/graphics/emotes/happy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/perturbed.png b/graphics/emotes/perturbed.png
new file mode 100644
index 00000000..0a33e0ad
--- /dev/null
+++ b/graphics/emotes/perturbed.png
diff --git a/graphics/emotes/perturbed.xml b/graphics/emotes/perturbed.xml
new file mode 100644
index 00000000..d15fd5a0
--- /dev/null
+++ b/graphics/emotes/perturbed.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/sad.png b/graphics/emotes/sad.png
new file mode 100644
index 00000000..3ceb3caf
--- /dev/null
+++ b/graphics/emotes/sad.png
diff --git a/graphics/emotes/sad.xml b/graphics/emotes/sad.xml
new file mode 100644
index 00000000..ef27a06d
--- /dev/null
+++ b/graphics/emotes/sad.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/speech.png b/graphics/emotes/speech.png
new file mode 100644
index 00000000..72044719
--- /dev/null
+++ b/graphics/emotes/speech.png
diff --git a/graphics/emotes/speech.xml b/graphics/emotes/speech.xml
new file mode 100644
index 00000000..569c10fd
--- /dev/null
+++ b/graphics/emotes/speech.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/surprise.png b/graphics/emotes/surprise.png
new file mode 100644
index 00000000..e1649a63
--- /dev/null
+++ b/graphics/emotes/surprise.png
diff --git a/graphics/emotes/surprise.xml b/graphics/emotes/surprise.xml
new file mode 100644
index 00000000..7c1162d7
--- /dev/null
+++ b/graphics/emotes/surprise.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/tongue.png b/graphics/emotes/tongue.png
new file mode 100644
index 00000000..0d5bc959
--- /dev/null
+++ b/graphics/emotes/tongue.png
diff --git a/graphics/emotes/tongue.xml b/graphics/emotes/tongue.xml
new file mode 100644
index 00000000..8b4fb498
--- /dev/null
+++ b/graphics/emotes/tongue.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/upset.png b/graphics/emotes/upset.png
new file mode 100644
index 00000000..b2f0ce2b
--- /dev/null
+++ b/graphics/emotes/upset.png
diff --git a/graphics/emotes/upset.xml b/graphics/emotes/upset.xml
new file mode 100644
index 00000000..be88a9dd
--- /dev/null
+++ b/graphics/emotes/upset.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/emotes/wink.png b/graphics/emotes/wink.png
new file mode 100644
index 00000000..13488bb8
--- /dev/null
+++ b/graphics/emotes/wink.png
diff --git a/graphics/emotes/wink.xml b/graphics/emotes/wink.xml
new file mode 100644
index 00000000..9c5b0007
--- /dev/null
+++ b/graphics/emotes/wink.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2010 The Mana World Development Team
+Copyright (C) 2010-2011  Evol Online -->

+<effect>

+	<particle

+		position-x="0" position-y="0" position-z="105" lifetime="5">

+		<emitter>

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

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

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

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

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

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

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

+				<frame index="0"/>

+			</animation>

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

+		</emitter>

+	</particle>

+</effect>
diff --git a/graphics/sprites/emotions.png b/graphics/sprites/emote.png
index 91babc8c..91babc8c 100644
--- a/graphics/sprites/emotions.png
+++ b/graphics/sprites/emote.png
diff --git a/graphics/sprites/emote.xml b/graphics/sprites/emote.xml
index 231d6ed2..b2e1a340 100644
--- a/graphics/sprites/emote.xml
+++ b/graphics/sprites/emote.xml
@@ -2,11 +2,12 @@
 <!-- Original Author possible tmw, tmw br, ufb projects
 Copyright (C) 2010-2011  Evol Online -->
 <sprite variants="15" variant_offset="1">
-	<imageset name="base" src="graphics/sprites/emotions.png" width="30" height="32" />
+	<imageset name="base" src="graphics/sprites/emote.png" width="30" height="32"/>
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
-			<frame index="0" />
+			<frame index="0"/>
 		</animation>
 	</action>
+
 </sprite>