Merge remote-tracking branch 'testing/master'v2011.09.08

1 files changed, 8 insertions, 6 deletions

diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index d99b2d94..5fe8cbc3 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -9,7 +9,7 @@
     menu
         "What are those emotions above your head?", L_Learn,
         "Nothing I guess", -;
-    close;
+    goto L_Close;
 
 L_Learn:
     mes "[Entertainer]";
@@ -18,7 +18,7 @@ L_Learn:
     menu
         "Ok sure", L_Learn2,
         "Why would I need to that", -;
-    close;
+    goto L_Close;
 
 L_Learn2:
     setskill @EMOTE_SKILL, 1;
@@ -26,19 +26,21 @@ L_Learn2:
     mes "\"All you have to do is press alt and a number";
     mes "The number determines what emotion will be showned";
     mes "Some clients will also show an emote shortcut-bar with the F12 button\"";
-    close;
+    goto L_Close;
 
 L_Has:
     mes "[Entertainer]";
     mes "\"The entertainment life is a hard life...\" *sigh*";
-    close;
+    goto L_Close;
 
+L_Close:
+    set @EMOTE_SKILL, 0;
+    close;
 
 OnTimer3000:
-    emotion rand(0,11);
+    emotion rand(EMOTE_DISGUST, EMOTE_PERTURBED);
     setnpctimer 0;
 
 OnInit:
     initnpctimer;
-
 }