Replace emotion() arguments with constants instead of ID.

15 files changed, 24 insertions, 24 deletions

diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 24e48d5f..1e3c4f8c 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -275,7 +275,7 @@ L_BasicSkill:
     next;
     adddefaultskills;
     mesq l("Here you go, everything is fixed.");
-    emotion 3;
+    emotion E_HAPPY;
     next;
     mesq l("Do you have any other questions for me?");
     next;
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 1309c2fa..f76c0ec2 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -153,7 +153,7 @@
             l("Go to meet him, and return me the package, it's an easy task."),
             l("You will be able to find Don's house in the west of this city, it's the first house just after left bridge, you can't miss it!"),
             l("A young apprentice called Chelios might be waiting outside, speak to him, and return the present to me.");
-            emotion 3;
+            emotion E_HAPPY;
 
         setq ArtisQuests_Enora, 1;
 
@@ -307,7 +307,7 @@
             l("You now also have access to the Legion building. Good job, you earned it."),
             l("We hold various training sessions, and also have a task board with a heap of things to do for the city and its surroundings."),
             l("It's a very good place if you want to make some more money.");
-            emotion 6;
+            emotion E_WINK;
 
         if (getq (ArtisQuests_Enora) == 10)
         {
diff --git a/npc/001-1/katja.txt b/npc/001-1/katja.txt
index 70e68e8c..8213b466 100644
--- a/npc/001-1/katja.txt
+++ b/npc/001-1/katja.txt
@@ -75,7 +75,7 @@
             mes "";
             mesn;
             mesq l("Great!");
-            emotion 103;
+            emotion E_JOY;
             next;
             break;
         case 2:
@@ -86,7 +86,7 @@
             mes "";
             mesn;
             mesq l("Okay, I'll be here, if you change your mind.");
-            emotion 4;
+            emotion E_SAD;
             close;
     }
 
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index 3fd27a6d..cb43e951 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -145,7 +145,7 @@
             l("It's Ivan... I'm sure that he sent you to annoy me..."),
             l("I'm just a merchant, I trade and make deals, yes \"excuse\" me if I'm not as skilled as this stupid alchemist."),
             l("But rare are those that receive grants from the Legion itself. For anybody else only a hard work can pay your bills!");
-        emotion 11;
+        emotion E_UPSET;
 
         switch (select (l("Sorry I didn't mean to bother you."),
                         l("You are just sitting on the shadow of your store.")))
diff --git a/npc/001-2-11/mona.txt b/npc/001-2-11/mona.txt
index 4d17a877..5dfdedd5 100644
--- a/npc/001-2-11/mona.txt
+++ b/npc/001-2-11/mona.txt
@@ -46,7 +46,7 @@
                     l("I will tell my dad!");
                 break;
         }
-        emotion 4;
+        emotion E_SAD;
         close;
     }
 
@@ -57,7 +57,7 @@
 
     npctalkonce l("Please find daddy...");
 
-    emotion 4;
+    emotion E_SAD;
     close;
 
 OnInit:
diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt
index 7106909a..d34a55b2 100644
--- a/npc/001-2-19/lloyd.txt
+++ b/npc/001-2-19/lloyd.txt
@@ -34,7 +34,7 @@
                 speech 1,
                     l("This is your first time asking for something, you won't pay this time, take it as a sign of good faith!"),
                     l("If you need something in the future, do not hesitate to pass by here, our stock is full of box collecting dust.");
-                emotion 6;
+                emotion E_WINK;
                 break;
             case 2:
                 speech 1,
@@ -42,7 +42,7 @@
                     l("Since Don settled in Artis he and his band refused to register to the Merchant Guild."),
                     l("I will close my eyes for once, but only because it's your first time asking for something!"),
                     l("Sometimes a good merchant needs to reach out first. It's on the house, give Chelios my regards!");
-                emotion 7;
+                emotion E_WINK;
                 break;
         }
         setq ArtisQuests_Enora, 3;
diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt
index 97b8b33d..d5cddf01 100644
--- a/npc/001-2-21/julia.txt
+++ b/npc/001-2-21/julia.txt
@@ -120,7 +120,7 @@ L_BasicSkill:
     next;
     adddefaultskills;
     mesq l("Here you go, everything is fixed.");
-    emotion 3;
+    emotion E_HAPPY;
     next;
     mesq l("Do you have any other questions for me?");
     next;
@@ -144,7 +144,7 @@ L_Island:
     speech 5,
         l("Of course, as a fully-fledged crew member you can decide of the destination of La Johanne directly with Nard.");
         l("Do you have any other questions for me?");
-    emotion 3;
+    emotion E_HAPPY;
 
     goto L_YNMenu;
 
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index 6538eeb6..00552225 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -38,7 +38,7 @@
                 break;
             case 2:
                 narrator 1, l("Ivan grumbles and resumes his work.");
-                emotion 11;
+                emotion E_UPSET;
                 close;
         }
 
@@ -47,7 +47,7 @@
             l("I have some spare one, take them, and tell Enora that any fees are paid!");
 
         setq ArtisQuests_Enora, 9;
-        emotion 3;
+        emotion E_HAPPY;
         return;
     }
 
diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt
index fddde8a5..696d8df5 100644
--- a/npc/001-2-27/don.txt
+++ b/npc/001-2-27/don.txt
@@ -29,7 +29,7 @@
     function take_apprentice {
         speech 5,
             l("I do not.");
-        emotion 11;
+        emotion E_UPSET;
 
         select (l("What about Chelios?"));
 
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 62199467..a3daa3fc 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -26,7 +26,7 @@
         }
         else
         {
-            emotion 3;
+            emotion E_HAPPY;
             Zeny = Zeny - .@price;
             INN_REGISTER = REDPLUSH_INN;
             PC_IS_DEAD = false;
@@ -121,7 +121,7 @@
                 lodge_check;
                 break;
             case 2:
-                emotion 6;
+                emotion E_WINK;
                 speech 5,
                     l("We offer a room for travelers passing by Artis, our beds are comfy and you can be guaranted to be right as rain after a night here!"),
                     l("If you wake up at the INN after a harsh battle, you will find yourself revitalized in an instant unlike other places where you can rest.");
diff --git a/npc/001-2-6/leonard.txt b/npc/001-2-6/leonard.txt
index 1b23b5d3..3ae6cefe 100644
--- a/npc/001-2-6/leonard.txt
+++ b/npc/001-2-6/leonard.txt
@@ -15,7 +15,7 @@
             l("I had a great childhood in Esperia!"),
             l("It was wonderful.");
 
-        emotion 3;
+        emotion E_HAPPY;
 
         return;
     }
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index 729f2020..a2e03d4f 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -112,7 +112,7 @@
     function janus_is_not_ianus {
         speech 1,
             l("Janus!");
-        emotion 11;
+        emotion E_UPSET;
         next;
 
         speech 12,
diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt
index b6bdf738..7443e904 100644
--- a/npc/functions/asleep.txt
+++ b/npc/functions/asleep.txt
@@ -15,7 +15,7 @@ function	script	asleep	{
     else if (.@rand == 1) npctalk3 l("Rrrr... Pchhhh...");
     else if (.@rand == 2) npctalk3 l("Ggrmm... Grmmmm...");
     else if (.@rand == 3) npctalk3 l("Hm... Shhhh...");
-    else emotion 106; // Sleepy
+    else emotion E_SLEEPY; // Sleepy
 
     close;
 }
diff --git a/npc/functions/legiontalk.txt b/npc/functions/legiontalk.txt
index 20e4235a..3dc69dae 100644
--- a/npc/functions/legiontalk.txt
+++ b/npc/functions/legiontalk.txt
@@ -50,7 +50,7 @@ function	script	legiontalk	{
             npctalk3 l("Out of my way.");
             break;
         case 12:
-            emotion 111;
+            emotion E_LOOKAWAY;
             break;
     }
 
diff --git a/npc/functions/villagertalk.txt b/npc/functions/villagertalk.txt
index 99803621..f8c239d1 100644
--- a/npc/functions/villagertalk.txt
+++ b/npc/functions/villagertalk.txt
@@ -14,12 +14,12 @@ function	script	villagertalk	{
 
         if (.@darn < 26)
         {
-            emotion 103; // ^.^
+            emotion E_JOY; // ^.^
             hello;
         }
         else if (.@darn > 26)
         {
-            emotion 111; // Look away
+            emotion E_LOOKAWAY; // Look away
             goodbye;
         }
         else
@@ -45,7 +45,7 @@ function	script	villagertalk	{
             npctalk3 l("I just want to live my life in peace.");
             break;
         default:
-            emotion 3;
+            emotion E_HAPPY;
             break;
     }