Merge pull request #338 from mekolat/emotion

update for new emotion builtin

8 files changed, 19 insertions, 17 deletions

diff --git a/world/map/npc/002-1/sarah.txt b/world/map/npc/002-1/sarah.txt
index 83fc6558..19e5f866 100644
--- a/world/map/npc/002-1/sarah.txt
+++ b/world/map/npc/002-1/sarah.txt
@@ -51,14 +51,15 @@ L_Progress:
     mes "\"Whee!\"";
     next;
     mes "You brought me Cherry Cake!  Here is your new hat, as promised.\"";
-    emotion EMOTE_TONGUE;
     getinventorylist;
     if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany;
     delitem "CherryCake", 1;
     getitem "SerfHat", 1;
     set @state, 2;
     callsub S_Update_Var;
-    goto L_Close;
+    close2;
+    emotion EMOTE_TONGUE, strcharinfo(0);
+    end;
 
 L_NotEnough:
     mes "[Sarah]";
@@ -68,8 +69,9 @@ L_NotEnough:
 L_Done:
     mes "[Sarah]";
     mes "\"It was so tasty, I can't eat anything more... Thank you!\"";
-    emotion EMOTE_TONGUE;
-    goto L_Close;
+    close2;
+    emotion EMOTE_TONGUE, strcharinfo(0);
+    end;
 
 L_Close:
     set @TEMP, 0;
diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt
index 21f0efd1..3935fe24 100644
--- a/world/map/npc/002-2/bleacher.txt
+++ b/world/map/npc/002-2/bleacher.txt
@@ -127,6 +127,6 @@ L_Close:
     mes "[Candide]";
     mes "\"Come again.\"";
     close2;
-    emotion EMOTE_GRIN;
+    emotion EMOTE_GRIN, strcharinfo(0);
     end;
 }
diff --git a/world/map/npc/002-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt
index 15fc61f9..f6910149 100644
--- a/world/map/npc/002-2/hetchel.txt
+++ b/world/map/npc/002-2/hetchel.txt
@@ -330,7 +330,7 @@ L_Next1:
     mes "";
     mes "\"Thank you, I hope the sheets will fit your needs.";
     mes "Please greet Lora for me when you see her.\"";
-    emotion EMOTE_HAPPY;
+    emotion EMOTE_HAPPY, strcharinfo(0);
     goto L_Close;
 
 L_sheet_missing_cocoons:
diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index 9c51fe3f..0366ea5c 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -357,7 +357,7 @@ L_Next14:
     set Zeny, Zeny + @CHOCOLATECAKE_REWARD_GOLD;
     set $@VOLTAIN_state, 0;
     mes "\"I love chocolate cakes. I wonder, if I can use my ven- \"";
-    emotion EMOTE_EVIL;
+    emotion EMOTE_EVIL, strcharinfo(0);
     goto L_Close;
 
 L_NOHELP:
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index c3f2c638..474dec3c 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -159,6 +159,6 @@ L_havenone:
 L_Close:
     mes "\"Farewell and good luck in your journeys!\"";
     close2;
-    emotion EMOTE_WINK;
+    emotion EMOTE_WINK, strcharinfo(0);
     end;
 }
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index 679a2c9d..bef9f0a7 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -16,7 +16,7 @@ L_Ask:
     mes "[Crastur]";
     mes "";
     mes "\"Just look who arrived here\"";
-    emotion EMOTE_EVIL;
+    emotion EMOTE_EVIL, strcharinfo(0);
     next;
     mes "[Crastur]";
     mes "";
@@ -128,7 +128,7 @@ L_Wrong_Item:
     next;
      mes "[Crastur]";
     mes "THIS IS NOT FROM THE PIRATES FROM TULIMSHAR, it is a cheap scam.";
-    emotion EMOTE_PERTURBED;
+    emotion EMOTE_PERTURBED, strcharinfo(0);
     mes "As far as you can tell through his mask he seems very mad";
     goto L_Insult;
 
@@ -150,7 +150,7 @@ L_Regular:
         "\"Ugh, no. I have to leave now. Bye.\"", L_Close;
 
 L_Insult:
-    mes "Die " + strcharinfo(0) + "!";
+    npctalk "Crastur : Die " + strcharinfo(0) + "!";
     heal -10000, 0;
     emotion EMOTE_VICIOUS;
     mes "[Crastur]";
@@ -188,7 +188,7 @@ L_Personal:
     mes "\"Today you have accomplished tasks that are worth " + DailyQuestPoints + " Hours in the Northern Mines\"";
     next;
     if (BOSS_POINTS < 1000) goto L_Worm;
-    emotion EMOTE_DEAD;
+    emotion EMOTE_DEAD, strcharinfo(0);
     mes "[Crastur]";
     mes "";
     mes "\"Also you seem to be quite a hero, it appears you have a record in the Almanach\"";
@@ -198,13 +198,13 @@ L_Personal:
     goto L_Close;
 
 L_Worm:
-    emotion EMOTE_SUSPICIOUS;
+    emotion EMOTE_SUSPICIOUS, strcharinfo(0);
     mes "[Crastur]";
     mes "\"Other than that you have not done anything notable for the mana world.\"";
     goto L_Close;
 
 L_Hurnscald:
-    emotion EMOTE_FACEPALM;
+    emotion EMOTE_FACEPALM, strcharinfo(0);
     mes "Crastur makes a barking sound that probably was meant as a laugh.";
     mes "[Crastur]";
     mes "";
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 450bc77c..df28f8ca 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -20,7 +20,7 @@
 
     mes "[Tanisha]";
     mes "\"Hey! You're up again!\"";
-    emotion EMOTE_HAPPY;
+    emotion EMOTE_HAPPY, strcharinfo(0);
     mes "\"Are you feeling better?\"";
     menu
         "Yes, thank you.",L_Next,
@@ -137,7 +137,7 @@ L_Money:
 L_Advice:
     mes "\"When you go to Hurnscald, you should see Bernard. He can make a delicious soup!";
     mes "Good luck!\"";
-    emotion EMOTE_HAPPY;
+    emotion EMOTE_HAPPY, strcharinfo(0);
     goto L_Close;
 
 L_Explain:
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 5a1c20cc..bd4c17fb 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -31,7 +31,7 @@ L_Happy_Random:
     strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
     set @random, rand(9);
     if (@random != 5)
-        emotion EMOTE_HAPPY;
+        emotion EMOTE_HAPPY, strcharinfo(0);
     set @quote$, "\"" + @quote_Cindy$[@random] + "\"";
     mes "[Cindy]";
     mes @quote$;