From cd3596ee611f2847aeca546f60dcd9d00df84272 Mon Sep 17 00:00:00 2001
From: CharlesVaneenoo <charlesvaneenoo@gmail.com>
Date: Sat, 27 Feb 2016 11:16:38 +0100
Subject: [PATCH] name properly the rest of the facial emotes

---
 data/plugins/dialogue/emotes.rb | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/data/plugins/dialogue/emotes.rb b/data/plugins/dialogue/emotes.rb
index 4634a612..77eea3e4 100644
--- a/data/plugins/dialogue/emotes.rb
+++ b/data/plugins/dialogue/emotes.rb
@@ -1,7 +1,31 @@
 # Declares all of the possible emotes
 declare_emote(:calm, 588)
 declare_emote(:anxious, 589)
+declare_emote(:calm_talk, 590)
 declare_emote(:default, 591)
+declare_emote(:evil, 592)
+declare_emote(:bad, 593)
+declare_emote(:wicked, 594)
+declare_emote(:annoyed, 595)
+declare_emote(:distressed, 596)
+declare_emote(:afflicted, 597)
+declare_emote(:almost_crying, 598)
+declare_emote(:drunk_left, 600)
+declare_emote(:drunk_right, 601)
+declare_emote(:not_interested, 602)
+declare_emote(:sleepy, 603)
+declare_emote(:plain_evil, 604)
+declare_emote(:laugh, 605)
+declare_emote(:snigger, 606)
+declare_emote(:have_fun, 607)
+declare_emote(:guffaw, 608)
+declare_emote(:evil_laugh, 609)
+declare_emote(:sad, 610)
+declare_emote(:more_sad, 611)
+declare_emote(:on_one_hand, 612)
+declare_emote(:nearly_crying, 613)
+declare_emote(:angry, 614)
+declare_emote(:furious, 615)
+declare_emote(:enraged, 616)
+declare_emote(:mad, 617)
 
-# TODO: Properly name the rest of the facial emotes.
-# Found at http://www.rune-server.org/runescape-development/rs2-server/tutorials/518991-pi-317-player-npc-facial-dialogue-expressions.html