Emoticons constant name (#2527)

This PR change the emoticons constant name to match emoticonlist from client side.
Note: the previous emoticons names are now deprecated.

Additionnally emotion and unitemote scripts commands are being merged together to the new format
-> emotion <emotion number>{,<target>};
Where target use the target Game ID (GID) of the unit (npc, pet, character etc..).

* unitemote is now deprecated.
* Additionnally fixed incorrect variable in quests_brasilis.txt

Thanks to @aleos89 and @Lemongrass3110 !

doc/sample/getequipcardid.txt

@@ -22,6 +22,6 @@ prontera,155,177,4	script	Check My Hat	810,{
 		close;
 	}
 	mes "Nothing?";
-	emotion e_hmm;
+	emotion ET_SCRATCH;
 	close;
 }

doc/sample/instancing.txt

@@ -27,7 +27,7 @@ prontera,151,190,6	script	Sample Instance	101,{
 		case 2:
 			mes "[Sample Instance]";
 			mes "You don't want to try again?";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 	} else {
@@ -47,7 +47,7 @@ prontera,151,190,6	script	Sample Instance	101,{
 				}
 				mes " ";
 				mes "Instance creation ^FF0000failed^000000.";
-				emotion e_omg;
+				emotion ET_HUK;
 				close;
 			}
 			mes "[Sample Instance]";
@@ -72,7 +72,7 @@ prontera,151,190,6	script	Sample Instance	101,{
 		}
 		mes " ";
 		mes "Instance entry ^FF0000failed^000000.";
-		emotion e_omg;
+		emotion ET_HUK;
 		close;
 	}
 	close;
@@ -164,7 +164,7 @@ abyss_03,97,102,4	script	Instance NPC#finish	101,{
 	mes "[Instance NPC]";
 	mes "Congratulations! You've finished the instance.";
 	mes "I'll send you back to town now.";
-	emotion e_no1;
+	emotion ET_BEST;
 	close2;
 	warp "prontera",156,191;
 	instance_destroy();
@@ -199,4 +199,4 @@ OnTouch:
 OnInit:
 	disablenpc strnpcinfo(0);
 	end;
-}
+}

doc/sample/npc_live_dialogues.txt

@@ -34,7 +34,7 @@ prontera,167,177,5	script	Luppy	1107,{
 		mes "I like "+callfunc("F_Sex","smiling ladies!","bloody pirates!");
 
 		// Show one of 3 emotion from the list (we added ,1 to show emotion over PLAYER's head)
-		emotion callfunc("F_Rand",e_scissors,e_kis,e_pat),1;
+		emotion callfunc("F_Rand",ET_SCISSOR,ET_CHUP,ET_GOODBOY), playerattached();
 		close;
 	}
 

doc/sample/npc_test_duplicate.txt

@@ -23,7 +23,7 @@ OnInit:
 
 OnTouch:
 	getmapxy(.map$, .x, .y, 1);
-	emotion e_scissors;
+	emotion ET_SCISSOR;
 	end;
 }
 

doc/script_commands.txt

@@ -5947,7 +5947,7 @@ Example:
 	// spawn 1 Shining Plant in the 5x5 area centered on (155,188)
 	areamonster "prontera",153,186,157,190,"Shining Plant",1083,1;
 	// make the plant cast level 10 Cold Bolt on a random target
-	areamobuseskill "prontera",155,188,2,1083,"MG_COLDBOLT",10,3000,1,e_gg,3;
+	areamobuseskill "prontera",155,188,2,1083,"MG_COLDBOLT",10,3000,1,ET_KEK,3;
 
 ---------------------------------------
 
@@ -7212,19 +7212,15 @@ must be used.
 
 ---------------------------------------
 
-*emotion <emotion number>{,<target>{,"<target name>"}};
+*emotion <emotion number>{,<target>};
 
 This command makes an object display an emotion sprite above their own as
 if they were doing that emotion. For a full list of emotion numbers,
-see 'src/map/script_constants.h' under 'e_'. The not so obvious ones are 'e_what'
-(a question mark) and 'e_gasp' (the exclamation mark).
+see 'src/map/script_constants.h' under 'ET_'. The not so obvious ones are 'ET_QUESTION'
+(a question mark) and 'ET_SURPRISE' (the exclamation mark).
 
 The optional target parameter specifies who will get the emotion on top of
-their head. If 0 (the default if omitted), the NPC in current use will show
-the emotion, if 1, the player that is running the script will display it.
-
-Target name parameter allows to display emotion on top of other NPC/PC without
-event labels. If specified name is not found, command does nothing.
+their head. Use the target Game ID (GID).
 
 ---------------------------------------
 
@@ -7472,13 +7468,6 @@ flag: Specify target
 
 ---------------------------------------
 
-*unitemote <GID>,<emotion number>;
-
-This command will make a <GID> display an emotion sprite.
-For a full list of emotion numbers, see 'src/map/script_constants.h' under 'e_'.
-
----------------------------------------
-
 *unitskilluseid <GID>,<skill id>,<skill lvl>{,<target id>,<casttime>};
 *unitskilluseid <GID>,"<skill name>",<skill lvl>{,<target id>,<casttime>};
 *unitskillusepos <GID>,<skill id>,<skill lvl>,<x>,<y>{,<casttime>};

npc/airports/airships.txt

@@ -190,7 +190,7 @@ airplane,100,69,3	script	Airship Crew#ein-1	852,{
 }
 
 airplane,64,94,1	script	Umbala Kid#ein_p	787,{
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	mes "[Kid]";
 	if (event_umbala >= 3) {
 		mes "Wow, mom!";
@@ -208,7 +208,7 @@ airplane,64,94,1	script	Umbala Kid#ein_p	787,{
 }
 
 airplane,66,93,3	script	Umbala Lady#ein_p	783,{
-	emotion e_dots;
+	emotion ET_THINK;
 	mes "[Lady]";
 	if (event_umbala >= 3) {
 		mes "Shush...";
@@ -235,7 +235,7 @@ airplane,71,91,7	script	Umbala Man#ein_p	789,{
 		mes "you can understand";
 		mes "me. ^333333*Whew...!*^000000";
 		next;
-		emotion e_pif;
+		emotion ET_HNG;
 		mes "[Chrmlim]";
 		mes "I've been helping the";
 		mes "Airship enterprise by";
@@ -259,7 +259,7 @@ airplane,71,91,7	script	Umbala Man#ein_p	789,{
 		mes "...";
 		mes "......";
 		next;
-		emotion e_pif;
+		emotion ET_HNG;
 		mes "[Chrmlim]";
 		mes "Shabala moow bajama";
 		mes "Airship kulaha googoona ";
@@ -373,7 +373,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 		mes "[Pilot]";
 		mes "But! Driving under the influence is not good.";
 		mes "But! That makes me want to drink more and more!";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		select("Do you know a passenger named Thierry?");
 		mes "[Pilot]";
@@ -389,7 +389,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 		mes "comes into this room.";
 		mes "And the captain IS a reindeer. I could just strip to my boxers.";
 		next;
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Pilot]";
 		mes "Wah!? Who is it!";
 		next;
@@ -414,7 +414,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 		mes "or even a day off. Yeap, some";
 		mes "booze, some chips, some TV";
 		mes "and serius R&R is in order.";
-		emotion e_sob;
+		emotion ET_CRY;
 		close;
 	case 2:
 		mes "[Pilot]";
@@ -449,7 +449,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 		mes "Yeah, they got this Airship";
 		mes "operation in a hurry.";
 		next;
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Pilot]";
 		mes "Still, they where real";
 		mes "serius, really thought";
@@ -1009,7 +1009,7 @@ airplane_01,221,158,2	script	Pilot#airplane_01	852,{
 		mes "And the captain IS a reindeer.";
 		mes "I could just strip to my boxers.";
 		next;
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Pilot]";
 		mes "Oh...! Hello there!";
 		mes "E-e-enjoying your flight?!";
@@ -1028,7 +1028,7 @@ airplane_01,83,61,2	script	Dianne#01airplane_01	72,2,2,{
 	close;
 
 OnTouch_:
-	emotion e_sob;
+	emotion ET_CRY;
 	end;
 }
 

npc/cities/amatsu.txt

@@ -366,7 +366,7 @@ amatsu,269,221,1	script	Propose Girl#ama	758,{
 	mes "After the proposal, the reply must";
 	mes "be answered before Sunday evening. This is the most crucial part of it.";
 	next;
-	emotion e_lv2;
+	emotion ET_BIGTHROB;
 	mes "[Hutari Shioko]";
 	mes "If you like someone...";
 	mes "You should try proposing";
@@ -398,7 +398,7 @@ amatsu,243,202,3	script	Drama Teacher#ama	760,{
 		mes "as the 'White Drayd...'";
 		close;
 	}
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mes "[Garakame sensei]";
 	mes "Are you interested in acting?";
 	mes "I need someone who sees";
@@ -426,19 +426,19 @@ amatsu,283,203,1	script	Bonubonu#ama1	1323,{
 
 amatsu,283,203,1	script	Bonubonu#ama2	111,{
 	set jap_tree,3;
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	mes "[Bonubonu]";
 	mes "That tree on the hill is";
 	mes "a very old tree. It is a big";
 	mes "cherry tree with everlasting blossoms.";
 	next;
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	mes "[Bonubonu]";
 	mes "There is something about this";
 	mes "tree that makes me forget about";
 	mes "all the troubles in my life when I sit under it.";
 	next;
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	mes "[Bonubonu]";
 	mes "Everything about this tree is";
 	mes "simply wonderful...";
@@ -446,7 +446,7 @@ amatsu,283,203,1	script	Bonubonu#ama2	111,{
 	mes "I feel when I look at it...";
 	mes "It just leaves me breathless...";
 	next;
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	mes "[Bonubonu]";
 	mes "You should visit the tree and";
 	mes "spend some time there.";
@@ -481,7 +481,7 @@ amatsu,274,178,7	script	Veterinarian#ama	735,{
 		mes "By the way, do you want";
 		mes "make a bet on it...?";
 		next;
-		emotion e_dots;
+		emotion ET_THINK;
 		mes "[Sakura Seiichi]";
 		mes "If I..........";
 		mes "............";
@@ -495,7 +495,7 @@ amatsu,274,178,7	script	Veterinarian#ama	735,{
 	mes "[Sakura Seiichi]";
 	mes "I can't help it if you think that way. But one day, you too could be buried underneath...";
 	next;
-	emotion e_dots;
+	emotion ET_THINK;
 	mes "[Sakura Seiichi]";
 	mes "Haha... Hahaha.....";
 	mes "...............";

npc/cities/ayothaya.txt

@@ -145,14 +145,14 @@ ayothaya,171,152,5	script	Girl#Lalitha	838,{
 		next;
 		mes "[Lalitha]";
 		mes "You know, like the dresses and jewelry that ladies wear in other countries, whether or not the men are good looking, what kind of songs you have, what kind of girls that guys over there like...";
-		emotion e_what;
+		emotion ET_QUESTION;
 		next;
 		mes "[" +strcharinfo(0)+ "]";
 		mes ".........";
 		next;
 		mes "[Lalitha]";
 		mes "..........";
-		emotion e_swt;
+		emotion ET_SWEAT;
 		next;
 		mes "[Lalitha]";
 		mes "Okay~!";
@@ -174,7 +174,7 @@ ayothaya,171,152,5	script	Girl#Lalitha	838,{
 		mes "Ah...";
 		mes "I wonder where";
 		mes "my Black Knight is~";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Don't you mean...";
@@ -289,12 +289,12 @@ ayothaya,241,264,5	script	Young Man#5ayothaya2	843,{
 		next;
 		mes "[Eik]";
 		mes "I'm not so rude as to pick fights with strangers for no reason!";
-		emotion e_wah;
+		emotion ET_KEK;
 		close;
 	}
 	mes "[Eik]";
 	mes "Real power is developed after having thousands of matches with other people. So, don't be afraid of fighting, okay?";
-	emotion e_pif;
+	emotion ET_HNG;
 	close;
 }
 

npc/cities/einbroch.txt

@@ -351,7 +351,7 @@ einbroch,40,116,1	script	Airship Engineer#ein-1	855,{
 			mes "ain't special at all. You've";
 			mes "gone loony tunes, paley boy.";
 			next;
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Airship Engineer]";
 			mes "Wh-what...?!";
 			close;

npc/cities/geffen.txt

@@ -102,7 +102,7 @@ geffen,147,26,0	script	Ralphie	97,{
 	mes "With that, anyone could be as strong as Hercules... Even a weakling like me! Hahahahahah,";
 	mes "I must have it!";
 	next;
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mes "[Ralphie]";
 	mes "...Good Heavens!";
 	mes "Since when were";
@@ -156,7 +156,7 @@ geffen,111,48,0	script	Stacey	101,{
 			mes "It's...";
 			mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistable to all the girls!";
 			next;
-			emotion e_lv;
+			emotion ET_THROB;
 			mes "[Stacey]";
 			mes "And I'm no exception.";
 		}
@@ -460,7 +460,7 @@ geffen_in,22,125,1	script	Crumpler	52,{
 			mes "[Crumpler]";
 			mes "Ooooooooh";
 			mes "crraaaap!";
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			next;
 			mes "[Crumpler]";
 			mes "Help meeeee!";
@@ -498,7 +498,7 @@ geffen_in,22,125,1	script	Crumpler	52,{
 		mes "[Crumpler]";
 		mes "A...";
 		mes "Sage?";
-		emotion e_what;
+		emotion ET_QUESTION;
 		next;
 		mes "[Crumpler]";
 		mes "I don't know what that is. But I guess it can't be half as bad as a Mage.";

npc/cities/jawaii.txt

@@ -260,7 +260,7 @@ jawaii,141,200,3	script	Employee#sroom	798,{
 	mes "[Alowa]";
 	mes "^666666*Sniff*^000000";
 	mes "B-but I promise th-that this room is the nicest and cl-cleanest room! P-Please! C-come back!";
-	emotion e_sob;
+	emotion ET_CRY;
 	close;
 }
 
@@ -457,10 +457,10 @@ jawaii_in,25,94,0	script	Employee#jaw1	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -487,10 +487,10 @@ jawaii_in,25,96,0	script	Employee#jaw2	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -531,10 +531,10 @@ jawaii_in,25,98,0	script	Employee#jaw3	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -570,10 +570,10 @@ jawaii_in,25,100,0	script	Employee#jaw4	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -603,10 +603,10 @@ jawaii_in,30,94,4	script	Employee#jaw5	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -628,10 +628,10 @@ jawaii_in,30,96,4	script	Employee#jaw6	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -662,10 +662,10 @@ jawaii_in,30,98,4	script	Employee#jaw7	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -686,10 +686,10 @@ jawaii_in,30,100,4	script	Employee#jaw8	724,{
 	close;
 
 OnWelcome:
-	emotion e_kis;
+	emotion ET_CHUP;
 	end;
 OnSolo:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -727,7 +727,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 		mes "[Waitress]";
 		mes "Hello,";
 		mes "how can I help you?";
-		emotion e_kis;
+		emotion ET_CHUP;
 		next;
 		switch(select("Give me food.:Bring me drink.:Where's the bar?")) {
 		case 1:
@@ -789,7 +789,7 @@ jawaii_in,15,104,0	script	Waitress#jawaii	80,{
 			close;
 		}
 	}
-	emotion e_omg;
+	emotion ET_HUK;
 	mes "[Waitress]";
 	mes "Hey, hey...!";
 	mes "I have no idea";
@@ -1243,7 +1243,7 @@ prt_in,173,13,4	script	Customer#SoloHan	86,{
 		next;
 		mes "[Bachewcca]";
 		mes "...!";
-		emotion e_no1,0,"Customer#Bachewcca";
+		emotion ET_BEST, getnpcid(0, "Customer#Bachewcca");
 		next;
 		mes "[SoloHan]";
 		mes "It's doesn't really matter whether you're married";
@@ -1393,7 +1393,7 @@ prt_in,170,14,0	script	Customer#Bachewcca	89,{
 	mes "..............";
 	mes "^666666*Gulp....gulp...*^000000";
 	mes "Grrrrr!! That hit the spot!";
-	emotion e_sob;
+	emotion ET_CRY;
 	close;
 }
 

npc/cities/lighthalzen.txt

@@ -239,8 +239,8 @@ lighthalzen,66,94,3	script	Elmer Keays#li_03	866,{
 	mes "precious sight to these";
 	mes "old eyes, my dear. I'm";
 	mes "really lucky to be with you.";
-	emotion e_kis,0,"Margie Keays#li_02";
-	emotion e_kis2;
+	emotion ET_CHUP, getnpcid(0, "Margie Keays#li_02");
+	emotion ET_CHUPCHUP;
 	close;
 }
 
@@ -959,7 +959,7 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 		mes "[Berru]";
 		mes "Daddy...! Waaaaah~!";
 		mes "I wanna see my Daddy!";
-		emotion e_sob,0,"Berru#lhz_01";
+		emotion ET_CRY, getnpcid(0, "Berru#lhz_01");
 		next;
 		mes "[Pilia]";
 		mes "Berru, I don't ";
@@ -973,7 +973,7 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 		mes "home! He said he'll";
 		mes "bring us candy tonight!";
 		mes "You go sleep first, Pilia!";
-		emotion e_ag,0,"Berru#lhz_01";
+		emotion ET_ANGER, getnpcid(0, "Berru#lhz_01");
 		next;
 		mes "[Pilia]";
 		mes "^333333*Sigh...*^000000";
@@ -981,7 +981,7 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 		mes "He said he found a";
 		mes "good job, but we haven't";
 		mes "heard from him since then...";
-		emotion e_dots,0,"Pilia#lhz_01";
+		emotion ET_THINK, getnpcid(0, "Pilia#lhz_01");
 		close;
 	case 2:
 		mes "[Pilia]";
@@ -989,7 +989,7 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 		mes "so long? I hope Daddy";
 		mes "comes back home soon.";
 		mes "Come on, Berru, don't cry.";
-		emotion e_dots,0,"Pilia#lhz_01";
+		emotion ET_THINK, getnpcid(0, "Pilia#lhz_01");
 		next;
 		mes "[Berru]";
 		mes "^333333*Sob...*^000000";
@@ -1007,7 +1007,7 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 		mes "but my little brother";
 		mes "just won't stop crying.";
 		mes "I'm sorry if we're loud...";
-		emotion e_what,0,"Pilia#lhz_01";
+		emotion ET_QUESTION, getnpcid(0, "Pilia#lhz_01");
 		next;
 		mes "[Pilia]";
 		mes "Our daddy goes to work";
@@ -1022,7 +1022,7 @@ lighthalzen,296,239,3	script	Berru#lhz_01	706,{
 		mes "misses him a lot. I don't";
 		mes "know how to make him";
 		mes "stop crying! What do I do?";
-		emotion e_swt2,0,"Pilia#lhz_01";
+		emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Pilia#lhz_01");
 		close;
 	}
 }
@@ -1047,7 +1047,7 @@ OnTouch_:
 			mes "looks like you're in need";
 			mes "of zeny, too. Would you";
 			mes "like to join me?";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		}
 		mes "[" + strcharinfo(0) + "]";
@@ -1062,7 +1062,7 @@ OnTouch_:
 		mes "a story with you and impart";
 		mes "some of the wisdom I've";
 		mes "learned over the years.";
-		emotion e_thx;
+		emotion ET_THANKS;
 		next;
 		switch(rand(1,3)) {
 		case 1:
@@ -1089,22 +1089,22 @@ OnTouch_:
 			mes "during the day, we'll always have hope, even if we can't see it.";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[Beggar]";
-			emotion e_what;
+			emotion ET_QUESTION;
 			mes "Hmm...?";
 			mes "You seem surprised~";
 			close;
@@ -1140,22 +1140,22 @@ OnTouch_:
 			mes "miracle. Isn't that wonderful?";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[Beggar]";
-			emotion e_what;
+			emotion ET_QUESTION;
 			mes "Don't believe me?";
 			mes "Well, you'll see for";
 			mes "yourself, youngster.";
@@ -1208,22 +1208,22 @@ OnTouch_:
 			mes "born of frustration will make you a bully. Know the difference.";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[" + strcharinfo(0) + "]";
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			mes ". . . . . . . . . . . .";
 			next;
 			mes "[Beggar]";
-			emotion e_what;
+			emotion ET_QUESTION;
 			mes "What's wrong?";
 			mes "It might be a lot";
 			mes "to take in, I know.";
@@ -1244,14 +1244,14 @@ lighthalzen,311,194,3	script	Reuben#lhz_02	870,{
 		mes "become a train conductor";
 		mes "and just get outta here!";
 		mes "I really hate this place!";
-		emotion e_ag;
+		emotion ET_ANGER;
 		next;
 		mes "[Reuben]]";
 		mes "Wh-whoa...!";
 		mes "Did you just hear";
 		mes "me talk to myself?";
 		mes "Crud! Don't be so nosy!";
-		emotion e_an;
+		emotion ET_FRET;
 		close;
 	}
 	mes "[Reuben]";
@@ -1260,7 +1260,7 @@ lighthalzen,311,194,3	script	Reuben#lhz_02	870,{
 	mes "looking at me?";
 	mes "I don't know you";
 	mes "from Adam, so get lost~";
-	emotion e_rock;
+	emotion ET_ROCK;
 	close;
 }
 
@@ -1427,7 +1427,7 @@ lhz_in01,125,40,3	script	Dowbow Ryuei#ryusei	843,{
 		mes "outlook on life. If you don't";
 		mes "mind, I'd like to shake";
 		mes "your hand, adventurer.";
-		emotion e_no1;
+		emotion ET_BEST;
 		close;
 	}
 	mes "[Dowbow Ryuei]";
@@ -1864,7 +1864,7 @@ lhz_in01,217,121,3	script	Repairman#li_01	851,{
 		mes "Hey, you don't work--";
 		mes "G-guards! Hurry! There's";
 		mes "somebody over here!";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		close2;
 		warp "lhz_in01",33,224;
 		end;
@@ -1895,7 +1895,7 @@ lhz_in01,203,123,3	script	Scientist#li_02	750,{
 	mes "replace th--hey. You're";
 	mes "not Ralphie. Wait. Guaaards!";
 	mes "Help me, there's some weirdo!";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	close2;
 	warp "lhz_in01",33,224;
 	end;
@@ -1917,7 +1917,7 @@ lhz_in01,199,137,3	script	Scientist#li_03	865,{
 	mes "here, and I think";
 	mes "it's one of those crazy";
 	mes "stalkers! Why, why me?!";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	close2;
 	warp "lhz_in01",33,224;
 	end;
@@ -1932,7 +1932,7 @@ OnTouch_:
 		if (select("Nice day, huh?:Cancel") == 1) {
 			mes "[Rekenber Guard]";
 			mes "...";
-			emotion e_an;
+			emotion ET_FRET;
 			close;
 		}
 		mes "[Rekenber Guard]";
@@ -1941,7 +1941,7 @@ OnTouch_:
 	}
 	mes "[Rekenber Guard]";
 	mes "...!";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	close2;
 	warp "lhz_in01",33,224;
 	end;
@@ -2326,7 +2326,7 @@ lhz_in01,157,47,1	script	Mareth#seram	797,{
 	mes "Yoo hoo hoo~";
 	mes "Oh, how I love";
 	mes "love love chocolate!";
-	emotion e_lv;
+	emotion ET_THROB;
 	next;
 	mes "[Mareth]";
 	mes "Eat it up...";
@@ -2459,7 +2459,7 @@ lighthalzen,162,304,7	script	Rekenber Guard Drew#li	868,{
 	mes "Official glossy photos";
 	mes "of the Kafra Ladies. Now...";
 	mes "With 20% more garter belts!";
-	emotion e_ho;
+	emotion ET_DELIGHT;
 	next;
 	mes "[Rekenber Guard Tan]";
 	mes "So they're all wearing";
@@ -2468,7 +2468,7 @@ lighthalzen,162,304,7	script	Rekenber Guard Drew#li	868,{
 	mes "even got the glasses chick";
 	mes "to wear 'em too? That's the";
 	mes "best news I've heard all day!";
-	emotion e_omg,0,"Rekenber Guard Tan#li";
+	emotion ET_HUK, getnpcid(0, "Rekenber Guard Tan#li");
 	next;
 	mes "[Rekenber Guard Drew]";
 	mes "Okay man, you know these";
@@ -2494,7 +2494,7 @@ lighthalzen,163,306,3	script	Rekenber Guard Tan#li	867,{
 	mes "This is art. The lighting,";
 	mes "the angle, the... the...";
 	mes "subject matter. Oh yes.";
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	next;
 	mes "[Rekenber Guard Drew]";
 	mes "Man, these officially licensed";
@@ -2688,7 +2688,7 @@ lhz_in02,267,25,4	script	Diana#npc	747,{
 	mes "good taste. Now, this Stiletto";
 	mes "is a steal at 39,800 zeny...";
 	next;
-	emotion e_omg;
+	emotion ET_HUK;
 	mes "[Diana]";
 	mes "Huh...?!";
 	mes "That's ridiculous!";
@@ -2947,7 +2947,7 @@ lhz_in01,139,48,7	script	Leimi#mimir	73,{
 	mes "Oh...!";
 	mes "Good heavens!";
 	mes "Um, may I help you?";
-	emotion e_omg;
+	emotion ET_HUK;
 	if (BaseJob == Job_Assassin) {
 		if (Sex == SEX_MALE) {
 			next;
@@ -3144,7 +3144,7 @@ lighthalzen,337,296,3	script	Rekenber Employee#li_2	868,{
 		mes "professional positions. This";
 		mes "is a great chance to make a";
 		mes "difference... and some money~";
-		emotion e_no1;
+		emotion ET_BEST;
 		close;
 	}
 }
@@ -3171,7 +3171,7 @@ lhz_in01,221,131,7	script	Scientist#li_01	865,{
 		mes "What?! Guards!";
 		mes "Hurry, there's an";
 		mes "intruder right here!";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		close2;
 		warp "lhz_in01",33,224;
 		end;

npc/cities/louyang.txt

@@ -144,7 +144,7 @@ louyang,297,167,2	script	Muscular Woman#lou	815,{
 		next;
 		mes "[Zhi Ching Li]";
 		mes "Recently we've had a hard time recruiting new members, so I came here to check if there's any woman who wishes to join us.";
-		emotion e_dots;
+		emotion ET_THINK;
 		close;
 	}
 	mes "[Zhi Ching Li]";

npc/cities/niflheim.txt

@@ -180,7 +180,7 @@ niflheim,350,258,1	script	Cursed Spirit#nif	802,{
 	next;
 	mes "[Ashe Bruce]";
 	mes "Just because I'm a cursed spirit, you adventurers think you can just dump your curses on me?!";
-	emotion e_an;
+	emotion ET_FRET;
 	next;
 	mes "[Ashe Bruce]";
 	mes "I refuse to let";
@@ -233,7 +233,7 @@ niflheim,350,258,1	script	Cursed Spirit#nif	802,{
 		mes "And the spell to lift";
 		mes "your curse has been";
 		mes "lost to the ages~!";
-		emotion e_gg;
+		emotion ET_KIK;
 		next;
 		if (select("Clover:Klaatu:Klaytos") == 2)
 			set .@spell,.@spell+1;

npc/cities/rachel.txt

@@ -276,7 +276,7 @@ rachel,206,30,3	script	Freya's Priest#play	920,{
 	mes "[Freya's Priest]";
 	mes "You!";
 	mes "Entertain me!";
-	emotion e_ag;
+	emotion ET_ANGER;
 	next;
 	if (select("What? You can't tell me what to do!:You got it.") == 1) {
 		mes "[Freya's Priest]";
@@ -343,7 +343,7 @@ rachel,197,137,3	script	Bard#aru	51,{
 	mes ".........";
 	mes ".........";
 	mes ".........";
-	emotion e_sob;
+	emotion ET_CRY;
 	close;
 }
 
@@ -421,7 +421,7 @@ ra_temin,138,64,5	script	Child Follower#in1	921,{
 	mes "I really wanted it to just";
 	mes "rest and be healthy again";
 	mes "but it died! Waaaaah!";
-	emotion e_sob;
+	emotion ET_CRY;
 	next;
 	mes "[Child Follower]";
 	mes "I... I'm going to";
@@ -557,7 +557,7 @@ rachel,127,117,4	script	Child Follower#2	914,{
 	mes "believe that if it is Freya's";
 	mes "will, then it shall be realized.";
 	next;
-	emotion e_what;
+	emotion ET_QUESTION;
 	mes "[Deno]";
 	mes "I know it might seem";
 	mes "a little confusing to";

npc/cities/splendide.txt

@@ -381,13 +381,13 @@ splendide,210,95,3	script	Middle-Ranked Laphine#2	442,{
 	if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
 		mes "[Middle-Ranked Laphine]";
 		mes "Wow~ Great!!";
-		emotion e_no1;
+		emotion ET_BEST;
 		close;
 	}
 	else {
 		mes "[Middle-Ranked Laphine]";
 		mes "MushIyazTur Ee YurDana";
-		emotion e_no1;
+		emotion ET_BEST;
 		close;
 	}
 }

npc/cities/umbala.txt

@@ -43,7 +43,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	next;
 	mes "[La Ed]";
 	mes "Let's do it~ !!";
-	emotion e_gg;
+	emotion ET_KIK;
 	next;
 	mes "[Haith]";
 	mes "................";
@@ -52,8 +52,8 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "By the way...do you think he";
 	mes "would tell us about such a";
 	mes "great treasure so easily?";
-	emotion e_hmm;
-	emotion e_hmm,0,"La Ed#um";
+	emotion ET_SCRATCH;
+	emotion ET_SCRATCH, getnpcid(0, "La Ed#um");
 	next;
 	select("Hm? What treasure?");
 	mes "[La Ed]";
@@ -63,7 +63,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "Huh...seems like you wanna know";
 	mes "more about the treasure. Well,";
 	mes "this information doesn't come cheap...";
-	emotion e_gg;
+	emotion ET_KIK;
 	next;
 	mes "[La Ed]";
 	mes "Plus, we'll need a little";
@@ -73,8 +73,8 @@ comodo,171,137,1	script	Haith#um	92,{
 	next;
 	mes "[La Ed, Haith]";
 	mes "If you pay us 1,000 zeny, we will tell you!";
-	emotion e_gg;
-	emotion e_gg,0,"La Ed#um";
+	emotion ET_KIK;
+	emotion ET_KIK, getnpcid(0, "La Ed#um");
 	next;
 	if (select("Pay 1,000 zeny:Refuse to pay") == 1) {
 		if (Zeny > 999) {
@@ -108,7 +108,7 @@ comodo,171,137,1	script	Haith#um	92,{
 			mes "whether or not Niels would tell";
 			mes "us the location of where he";
 			mes "found the treasure...";
-			emotion e_hmm;
+			emotion ET_SCRATCH;
 			next;
 			mes "[La Ed]";
 			mes "Because Niels always treat us like";
@@ -133,8 +133,8 @@ comodo,171,137,1	script	Haith#um	92,{
 	}
 	mes "[Haith]";
 	mes "Bah! Whatever~";
-	emotion e_hmm;
-	emotion e_hmm,0,"La Ed#um";
+	emotion ET_SCRATCH;
+	emotion ET_SCRATCH, getnpcid(0, "La Ed#um");
 	close;
 }
 
@@ -208,7 +208,7 @@ cmd_in01,164,115,1	script	Niels#um	731,{
 	mes "rather dramatic sound effect";
 	mes "for my declaration!";
 	mes "Eh, oh well...";
-	emotion e_hmm;
+	emotion ET_SCRATCH;
 	next;
 	mes "[Niels]";
 	mes "Well, in the spirit of discovery,";
@@ -247,7 +247,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "[???]";
 		mes "Heh! Hi!";
 		mes "My name is Haatan.";
-		emotion e_heh;
+		emotion ET_SMILE;
 		next;
 		mes "[Haatan]";
 		mes "...*Sigh*";
@@ -255,7 +255,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "you right now. My parent's house";
 		mes "was struck by lightning yesterday";
 		mes "and it burned down our roof...";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[Haatan]";
 		mes " . . . !";
@@ -267,7 +267,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "re-constructing my parents' house?";
 		mes "You Rune-Midgardians are all";
 		mes "richier than Utans! I beg you!";
-		emotion e_heh;
+		emotion ET_SMILE;
 		next;
 		if (select("(Nod head):(Shake head)") == 1) {
 			mes "[Haatan]";
@@ -279,7 +279,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 				if (checkweight(517,1)) {
 					getitem 517,1;// Meat
 				}
-				emotion e_swt2;
+				emotion ET_PROFUSELY_SWEAT;
 			}
 			else {
 				next;
@@ -288,18 +288,18 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 				mes "It looks like...";
 				mes "You don't have much";
 				mes "yourself...";
-				emotion e_pif;
+				emotion ET_HNG;
 				close;
 			}
 			next;
 			mes "[Haatan]";
 			mes "Thank you so much!";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		}
 		mes "[Haatan]";
 		mes ".............*Sob*...";
-		emotion e_sob;
+		emotion ET_CRY;
 		close;
 	}
 	else {
@@ -310,7 +310,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "[???]";
 		mes "Umbah! Umbaumbah!";
 		mes "Umbahumbah Haatan babah.";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[Haatan]";
 		mes "........umbah,";
@@ -318,7 +318,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "Babaum babahum woombah umbah umbabah";
 		mes "Umbah umbah";
 		mes "..Umbah umbabah umbah...";
-		emotion e_heh;
+		emotion ET_SMILE;
 		next;
 		mes "[Haatan]";
 		mes " . . . !";
@@ -328,7 +328,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "Umbah umbah? Umbah umbahbah";
 		mes "abaum babahum woombah!";
 		mes "Umbahumbah umbabahumbaumhumbah! Umbah!";
-		emotion e_heh;
+		emotion ET_SMILE;
 		next;
 		if (select("(Nod head):(Shake head)") == 1) {
 			mes "[Haatan]";
@@ -340,24 +340,24 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 				if (checkweight(517,1)) {
 					getitem 517,1;// Meat
 				}
-				emotion e_swt2;
+				emotion ET_PROFUSELY_SWEAT;
 			}
 			else {
 				next;
 				mes "[Haatan]";
 				mes "...umbah? Umbahumbah!! Umbaum!";
-				emotion e_pif;
+				emotion ET_HNG;
 				close;
 			}
 			next;
 			mes "[Haatan]";
 			mes "Umba umba umbaum.";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 		mes "[Haatan]";
 		mes "........umbah..";
-		emotion e_heh;
+		emotion ET_SMILE;
 		close;
 	}
 	close;
@@ -370,7 +370,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 		mes ".........poop!";
 		mes ".....me like Meat.";
 		mes "....gimme a Meat.";
-		emotion e_rock;
+		emotion ET_ROCK;
 		next;
 		if (select("Give him Meat.:Refuse.") == 1) {
 			if (countitem(517) > 0) {
@@ -382,7 +382,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 				getitem 909,2;// Jellopy
 				getitem 914,2;// Fluff
 				getitem 705,2;// Clover
-				emotion e_scissors;
+				emotion ET_SCISSOR;
 				close;
 			}
 			mes "[Kotan]";
@@ -391,7 +391,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 			mes "I hate people who lie";
 			mes "to me!!";
 			percentheal -20,0;
-			emotion e_an;
+			emotion ET_FRET;
 			close;
 		}
 		mes "[Kotan]";
@@ -399,7 +399,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 		mes ".....hungwee.";
 		mes ".....I want Meat.";
 		percentheal -1,0;
-		emotion e_sob;
+		emotion ET_CRY;
 		close;
 	}
 	else {
@@ -408,7 +408,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 		mes "........umbah.";
 		mes ".......umbabah.";
 		mes "......humbah.";
-		emotion e_rock;
+		emotion ET_ROCK;
 		next;
 		if (select("Umbah:Umbaboo") == 1) {
 			if (countitem(517) > 0) {
@@ -419,21 +419,21 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 				getitem 909,2;// Jellopy
 				getitem 914,2;// Fluff
 				getitem 705,2;// Clover
-				emotion e_scissors;
+				emotion ET_SCISSOR;
 				close;
 			}
 			mes "[???]";
 			mes "Umbahumumhumbubabababah!!";
 			mes "Umbahumbababah umbahumboo!";
 			percentheal -20,0;
-			emotion e_an;
+			emotion ET_FRET;
 			close;
 		}
 		mes "[???]";
 		mes "...........";
 		mes "......woong bah.";
 		mes "....umbabababah.";
-		emotion e_sob;
+		emotion ET_CRY;
 		percentheal -1,0;
 		close;
 	}
@@ -441,7 +441,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 
 umbala,177,153,3	script	Pasto#um	97,{
 	mes "[Pasto]";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mes "Oh my god~! Finally,";
 	mes "another Rune-Midgardian!";
 	mes "I've never seen anyone from";
@@ -486,7 +486,7 @@ umbala,177,153,3	script	Pasto#um	97,{
 	mes "people here that speak my";
 	mes "language...I...I'm...";
 	mes "So very lonely...*Sob*";
-	emotion e_sob;
+	emotion ET_CRY;
 	close;
 }
 
@@ -798,7 +798,7 @@ umbala,92,159,4	script	Bertan#um	785,{
 		next;
 		mes "[????]";
 		mes "Umbaumba Umbaumbah woo~";
-		emotion e_ho;
+		emotion ET_DELIGHT;
 		close;
 	}
 	close;

npc/custom/etc/marriage.txt

@@ -109,7 +109,7 @@ prt_church,100,123,4	script	Vomars	60,{
 		mes "Why should they not be wed?";
 		input $@msg$;
 		npctalk @name$ +" : "+ strcharinfo(0) +"'s objection is: "+$@msg$;
-		emotion e_sob;
+		emotion ET_CRY;
 		mes "I see...";
 	} else
 		mes "Very well, go sit and enjoy the ceremony.";
@@ -195,14 +195,14 @@ function SF_AcceptGroom {
 		mes "["+@name$+"]";
 		mes "You what!?";
 		mes "err.. *cough* *cough* very well... come back after you've made up your mind.";
-		emotion e_ag;
+		emotion ET_ANGER;
 		close;
 	case 2:
 		mes "["+@name$+"]";
 		mes "!!";
 		mes "Ah... err... ehm... okay. You two seem to have some differences to settle first.";
 		close2;
-		emotion e_omg;
+		emotion ET_HUK;
 		npctalk @name$ +" : Ladies and gentlemen, "+$wed_bride$+" has rejected to marry "+$wed_groom$+"!";
 		SF_wed_end();
 		break;
@@ -212,7 +212,7 @@ function SF_AcceptGroom {
 			SF_RingsAccepted();
 			break;
 		}
-		emotion e_ok;
+		emotion ET_OK;
 		mes "["+@name$+"]";
 		mes "After your groom approves, you will be given your rings, the ceremony will begin and you will be officially married.";
 		close;
@@ -228,13 +228,13 @@ function SF_AcceptBride {
 		mes "["+@name$+"]";
 		mes "You what!?";
 		mes "err.. *cough* *cough* very well... come back after you've made up your mind.";
-		emotion e_ag;
+		emotion ET_ANGER;
 		close;
 	case 2:
 		mes "["+@name$+"]";
 		mes "!!";
 		mes "Ah... err... ehm... okay. You two seem to have some differences to settle first.";
-		emotion e_omg;
+		emotion ET_HUK;
 		close2;
 		npctalk @name$ +" : Ladies and gentlemen, "+$wed_groom$+" has rejected to marry "+$wed_bride$+"!";
 		SF_wed_end();
@@ -245,7 +245,7 @@ function SF_AcceptBride {
 			SF_RingsAccepted();
 			break;
 		}
-		emotion e_ok;
+		emotion ET_OK;
 		mes "["+@name$+"]";
 		mes "After your bride approves, you will be given your rings, the ceremony will begin and you will be officially married.";
 		close;
@@ -259,7 +259,7 @@ function SF_RingsAccepted {
 	set $wed_groom_progress,3;
 	announce $wed_groom$+" and "+$wed_bride$+"'s wedding ceremony will be held at the church!",8;
 	close2;
-	emotion e_lv;
+	emotion ET_THROB;
 	npctalk @name$ +" : May the groom and bride please step forward and retrieve their rings?";
 }
 
@@ -397,19 +397,19 @@ function SF_equip_check {
 	if (Sex == SEX_MALE && getequipid(EQI_ARMOR) != 7170) {
 		mes "["+@name$+"]";
 		mes "Child, what did you do with your "+getitemname(7170)+"?";
-		emotion e_dots;
+		emotion ET_THINK;
 		return 0;
 	}
 	if (Sex == SEX_FEMALE && getequipid(EQI_ARMOR) != 2338) {
 		mes "["+@name$+"]";
 		mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
-		emotion e_dots;
+		emotion ET_THINK;
 		return 0;
 	}
 	if (Sex == SEX_FEMALE && $@wed_veil && getequipid(EQI_HEAD_TOP) != 2206) {
 		mes "["+@name$+"]";
 		mes "Child, you can't take off your "+getitemname(2206)+" yet....";
-		emotion e_dots;
+		emotion ET_THINK;
 		return 0;
 	}
 	return 1;
@@ -513,7 +513,7 @@ function SF_Register {
 		mes "["+@name$+"]";
 		mes "You are now registered as the groom.";
 		mes "Tell your bride to register as soon as possible.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		initnpctimer;
 		close;
 	case 2: //Bride
@@ -522,7 +522,7 @@ function SF_Register {
 		mes "["+@name$+"]";
 		mes "You are now registered as the bride.";
 		mes "Tell your groom to register as soon as possible.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		initnpctimer;
 		close;
 	default: //Cancel
@@ -559,10 +559,10 @@ function SF_WedProgress {
 			set $wed_groom_progress,1;
 			mes "["+@name$+"]";
 			mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; 
-			emotion e_no1;
+			emotion ET_BEST;
 			close2;
 			npctalk @name$ +" : Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
-			emotion e_no1;
+			emotion ET_BEST;
 			end;
 		} else {
 			mes "["+@name$+"]";
@@ -580,10 +580,10 @@ function SF_WedProgress {
 			stopnpctimer;
 			mes "["+@name$+"]";
 			mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; 
-			emotion e_no1;
+			emotion ET_BEST;
 			close2;
 			npctalk @name$ +" : Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
-			emotion e_no1;
+			emotion ET_BEST;
 			end;
 		} else {
 			mes "["+@name$+"]";
@@ -659,7 +659,7 @@ OnTimer60000:
 		set $@msg$, $wed_groom$;
 
 	npctalk @name$ +" : Registration timed out. Is it that noone wants to marry "+$@msg$+"..?";
-	emotion e_hmm;
+	emotion ET_SCRATCH;
 	
 	set $wed_groom$,"";
 	set $wed_groom_sex, 0;
@@ -684,7 +684,7 @@ function SF_TryRegister {
 	if (Upper == 2) {
 		mes "["+@name$+"]";
 		mes "Oh dear, you are too young to be thinking of marriage!";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		close;
 	}
 	if (Sex == SEX_MALE)
@@ -898,7 +898,7 @@ function SF_InProgress {
 	if (select("I don't want to divorce....","Yes, we have agreed to this.")!=2) {
 		mes "["+@name$+"]";
 		mes "I hope you can work things out.";
-		emotion e_pat;
+		emotion ET_GOODBOY;
 		goto SF_DivorceEnd;
 		close;
 	}
@@ -910,14 +910,14 @@ function SF_InProgress {
 	if (!(divorce())) {
 		mes "["+@name$+"]";
 		mes "Where has "+$@divorcer$+" gone to? I can't divorce you unless you both are here...";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 	set Zeny,Zeny-$@wed_divorce_fee;
 	announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
 	mes "["+@name$+"]";
 	mes "Your divorce has been filed. You are no longer wed.";
-	emotion e_sob;
+	emotion ET_CRY;
 	goto SF_DivorceEnd;
 	close;
 }
@@ -931,7 +931,7 @@ function SF_DivorceEnd {
 
 OnTimer60000:
 	npctalk @name$ +" : Divorce confirmation time's is up. Where did "+$@divorcer$+"'s spouse go...";
-	emotion e_what;
+	emotion ET_QUESTION;
 	SF_DivorceEnd();
 	end;
 }

npc/custom/etc/morroc_raceway.txt

@@ -88,7 +88,7 @@ OnCount3000:
 	announce "[1]",1;
 	end;
 OnCount4000:
-	emotion e_go;
+	emotion ET_GO;
 	specialeffect EF_CHIMTO;
 	announce "[GO!]",1;
 	set $@race,1;

npc/custom/etc/penal_servitude.txt

@@ -18,7 +18,7 @@
 
 sec_pri,36,58,1	script	Chief Warder	105,{ 
 	mes "[Saddeus]";
-	emotion e_what;
+	emotion ET_QUESTION;
 	mes (Sex==SEX_MALE?"Mr.":"Ms.")+" Prisoner #"+BaseLevel+JobLevel+",";
 	mes "what's the noise over there?";
 	next;
@@ -83,7 +83,7 @@ M_Q1:
 
 	mes "[Saddeus]";
 	if(checkcart() || checkfalcon() || checkriding()){
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!";
 		close;
 	}
@@ -121,7 +121,7 @@ M_NO_THANKS:
 	mes "[Saddeus]";  
 	if (rand(2)) mes "Is today X-Mas time, huh?";
 	mes "Now shut up and back off!";
-	if (rand(2)) emotion e_omg;
+	if (rand(2)) emotion ET_HUK;
 	close;  
 }
 

npc/custom/etc/quest_warper.txt

@@ -548,7 +548,7 @@ stampcard:
 	mes "You collected^00FF00 "+@Tstamp+" of "+@MaxTstamp+" ^000000Towns.";
 	if (@Tstamp == 15) {
 		mes "They say there is an island you can only get to when married...";
-		emotion e_heh;
+		emotion ET_SMILE;
 	}
 	next;
 	mes "Let me check what dungeons you have.";

npc/custom/etc/rpsroulette.txt

@@ -27,9 +27,9 @@ PLAY:
 	menu "^0000FFROCK!",-,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
 
   	if (.@lastchoice == 1) set .@opp, rand(1,3);
-  	if (.@opp == 1) emotion e_rock;
-  	else if (.@opp == 2) emotion e_scissors;
-  	else emotion e_paper;
+  	if (.@opp == 1) emotion ET_ROCK;
+  	else if (.@opp == 2) emotion ET_SCISSOR;
+  	else emotion ET_WRAP;
   	set .@lastchoice,1;
 	if (.@opp == 1) goto SAME;
 	if (.@opp == 2) goto WIN;
@@ -37,9 +37,9 @@ PLAY:
 
 SCISSORS:
 	if (.@lastchoice == 2) set .@opp,rand(1,2);
-  	if (.@opp == 1) emotion e_rock;
-  	else if (.@opp == 2) emotion e_scissors;
-  	else emotion e_paper;
+  	if (.@opp == 1) emotion ET_ROCK;
+  	else if (.@opp == 2) emotion ET_SCISSOR;
+  	else emotion ET_WRAP;
   	set .@lastchoice,2;
 	if (.@opp == 1) goto LOSE;
 	if (.@opp == 2) goto SAME;
@@ -47,9 +47,9 @@ SCISSORS:
 
 PAPER:
 	if (.@lastchoice == 3) set .@opp,rand(2,3);
-  	if (.@opp == 1) emotion e_rock;
-  	else if (.@opp == 2) emotion e_scissors;
-  	else emotion e_paper;
+  	if (.@opp == 1) emotion ET_ROCK;
+  	else if (.@opp == 2) emotion ET_SCISSOR;
+  	else emotion ET_WRAP;
   	set .@lastchoice,3;
 	if (.@opp == 1) goto WIN;
 	if (.@opp == 2) goto LOSE;
@@ -57,13 +57,13 @@ PAPER:
 
 WIN:
 	mes "Damnit, You Win!";
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	next;
 	set .@win, 1;
 	goto YOUPULL;
 
 LOSE:
-	emotion e_heh;
+	emotion ET_SMILE;
 	mes "Boorah! You Lose!";
 	next;
 	set .@win, 0;
@@ -78,13 +78,13 @@ YOUPULL:
 	if ( .@pull == 1 ) {
 		if ( .@win ) goto KILL;
 		specialeffect2 EF_SUI_EXPLOSION;
-		emotion e_gg;
+		emotion ET_KIK;
 		percentheal -100,-100;
 		mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
 		mes "You're dead!";
 		close;
 	}
-	emotion e_pif;
+	emotion ET_HNG;
 	mes "*^0000FFClick^000000* whew...";
 	goto PLAY;
 
@@ -100,7 +100,7 @@ RULES:
 
 KILL:
 	specialeffect EF_SUI_EXPLOSION;
-	emotion e_omg;
+	emotion ET_HUK;
 	mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
 	mes "OWWW @#$%^!! THAT HURT LIKE HELL!!";
 	next;

npc/custom/events/cluckers.txt

@@ -26,17 +26,17 @@ prontera,156,219,4	script	Cluckers	800,{
 	if (.startcluck) {
 		specialeffect2 EF_HIT3;
 		switch(rand(15)) {
-			case 0: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
+			case 0: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
 			case 1: npctalk "Cluckers : Cluuuuuck!~"; break;
 			case 2: unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; break;
 			case 3: sc_start SC_Freeze,10000,0; break;
-			case 4: npctalk "Cluckers : CLUUUUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
+			case 4: npctalk "Cluckers : CLUUUUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
 			case 5: sc_start SC_Sleep,10000,0; break;
-			case 6: sc_start SC_Stone,10000,0; emotion e_gg; break;
-			case 7: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
-			case 8: npctalk "Cluckers : Cluck! CLUUUCK!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion e_omg; break;
+			case 6: sc_start SC_Stone,10000,0; emotion ET_KIK; break;
+			case 7: npctalk "Cluckers : CLUUUUUUCK!!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
+			case 8: npctalk "Cluckers : Cluck! CLUUUCK!!"; unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; emotion ET_HUK; break;
 			case 9: sc_start SC_Stun,10000,0; break;
-			case 10: sc_start SC_Sleep,10000,0; emotion e_gg; break;
+			case 10: sc_start SC_Sleep,10000,0; emotion ET_KIK; break;
 			case 11: npctalk "Cluckers : Cluck! Cluck!"; break;
 			case 12: sc_start SC_Stun,10000,0; break;
 			case 13: unitkill getcharid(3); skilleffect "NPC_SELFDESTRUCTION",1; break;
@@ -64,7 +64,7 @@ prontera,156,219,4	script	Cluckers	800,{
 			case 1:
 				mes "[Cluckers]";
 				mes "CLUCK! ^FF0000~Sure thing!~^000000";
-				emotion e_ok;
+				emotion ET_OK;
 				close2;
 				announce "[Cluck! Cluck! Boom!] is about to start in Prontera!",bc_blue;
 				initnpctimer;
@@ -85,7 +85,7 @@ prontera,156,219,4	script	Cluckers	800,{
 				next;
 				mes "[Cluckers]";
 				mes "Cluck cluck..? Cluck. ^FF0000~So, the prize is^000000 ^008000"+ $cluck_item_amount +" "+ getitemname($cluck_item_id) +"^000000? ^FF0000Great.~^000000";
-				emotion e_ok;
+				emotion ET_OK;
 				next;
 				break;
 			case 4:

npc/custom/events/holiday/hallow06.txt

@@ -17,12 +17,12 @@ prontera,151,190,5	script	Hallows' Eve Event	807,{
 	mes "[Hallows' Eve Event]";
 	if(Class == Job_Novice){
 		mes "I am sorry but you have to got a job to complete the event.";
-		emotion e_swt,1;
+		emotion ET_SWEAT, playerattached();
 		close;
 	}
 	if((EVENT_HALWN06&1) && (EVENT_HALWN06&2)){
 		mes "I am sorry but you have already completed the event.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		close;
 	}
 	mes "Greetings fellow lively human.";
@@ -38,7 +38,7 @@ prontera,151,190,5	script	Hallows' Eve Event	807,{
 	mes "[Hallows' Eve Event]";
 	if(EVENT_HALWN06&2){
 		mes "I'm sorry but you have already had a trick. Why don't you go pick a treat now.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		close;
 	}
 	mes "Give me a min...";
@@ -57,7 +57,7 @@ L_Treat:
 	mes "[Hallows' Eve Event]";
 	if(EVENT_HALWN06&1){
 		mes "I'm sorry but you have already had a treat. Why don't you go pick a trick now.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		close;
 	}
 	if(!(EVENT_HALWN06&4)){
@@ -91,7 +91,7 @@ L_Treat:
 	mes "[Hallows' Eve Event]";
 	if((countitem(2220) < 1) || (countitem(535) < 30) || (countitem(7205) < 20)){
 		mes "You don't have enough items. Come back when you do.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		close;
 	}
 	delitem 2220,1;
@@ -100,11 +100,11 @@ L_Treat:
 	getitem 5134,1;
 	set EVENT_HALWN06,EVENT_HALWN06|1;
 	mes "Good job! I hope you are happy with your item.";
-	emotion e_grat;
+	emotion ET_CONGRATULATION;
 	next;
 	mes "[Hallows' Eve Event]";
 	mes "Enjoy the rest of your halloween.";
-	emotion e_scissors,1;
+	emotion ET_SCISSOR, playerattached();
 	close;
 
 L_Dont_Have:

npc/custom/events/holiday/uneasy_cemetery.txt

@@ -72,7 +72,7 @@ prontera,257,313,5	script	Mother Mathana	79,{
 	mes "I'm afraid there's something wrong with our old cemetery...";
 	if ($UNEASY_H$==strcharinfo(0)) mes "But thanks to you, "+$UNEASY_H$+", we'll be able to sleep " + $UNEASY_DL + " nights!";
 	if ($UNEASY_H$!=strcharinfo(0)) mes "But thanks to "+$UNEASY_H$+"'s support, we've got " + $UNEASY_DL + " easy nights!";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	close;
 
 L_Undead_Walk:

npc/custom/events/holiday/xmas_rings_event.txt

@@ -21,7 +21,7 @@ prontera,156,174,4	script	Snower	713,{
 	} else if (Q_XMSRINGS == 3) {
 		mes "Snoowy's sent me a bird with a message. She told me about your help...";
 		mes "I'll tell you a secret of the magic rings.";
-		emotion e_no1;
+		emotion ET_BEST;
 		next;
 		mes "[Snower]";
 		mes "They have magic power only from 8 December till 8 January.";
@@ -36,7 +36,7 @@ prontera,156,174,4	script	Snower	713,{
 	} else {
 		mes "Hi! Two my sisters and I are preparing gifts for the whole 3 holidays!";
 	}
-	emotion e_sob;
+	emotion ET_CRY;
 	next;
 	menu "Where are your sisters?",-, "What holidays?",M_PR,"What gifts?",M_WRAP,"May I help you?",M_QUEST;
 
@@ -103,12 +103,12 @@ louyang,224,249,4	script	Sneewy	717,{
 	mes "[Sneewy]";
 	if (Q_XMSRINGS == 0) {
 		mes "Hi! I'm waithing for my sister's birdy with mail...";
-		emotion e_sob;
+		emotion ET_CRY;
 		close;
 	}
 	if (Q_XMSRINGS == 1) {
 		mes "I wish I had 4 more gray Gift Boxes for native children...";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[Sneewy]";
 		mes "Oh, hello. Has my brother Snower told you everything?";
@@ -118,27 +118,27 @@ louyang,224,249,4	script	Sneewy	717,{
 		mes "[Sneewy]";
 		if (countitem(644) < 4) {
 			mes "Gimme 4 gifts for poor kids... Wait, you haven't got 4 of them!";
-			emotion e_sry;
+			emotion ET_SORRY;
 			close;
 		}
 		set Q_XMSRINGS,2;
 		delitem 644,4;
 		getnameditem 2637,strcharinfo(0);
-		emotion e_kis2;
+		emotion ET_CHUPCHUP;
 		mes "Thank you! Here's my li'l something for you!";
 		next;
 		mes "[Sneewy]";
 		mes "By the way, if you put on 2 different rings then your holidays leveling would be easier!";
 		close;
 	}
-	emotion e_thx;
+	emotion ET_THANKS;
 	mes "Thanks again! No children will meet the holidays without the gifts!";
 	close;
 
 M_END:
 	mes "[Sneewy]";
 	mes "Pity... I've got a magic Santa's ring... I'd exchange it for 4 Gift Boxes...";
-	emotion e_swt;
+	emotion ET_SWEAT;
 	close;
 }
 
@@ -146,7 +146,7 @@ izlu2dun,133,160,2	script	Snoowy	714,{
 	mes "[Snoowy]";
 	if (Q_XMSRINGS == 0) {
 		mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 	if (Q_XMSRINGS == 1) {
@@ -170,17 +170,17 @@ izlu2dun,133,160,2	script	Snoowy	714,{
 		mes "[Snoowy]";
 		if (countitem(644) < 3) {
 			mes "Oops!! You haven't got 3 gray gift boxes on you.";
-			emotion e_sry;
+			emotion ET_SORRY;
 			close;
 		}
 		set Q_XMSRINGS,3;
 		delitem 644,3;
 		getnameditem 2636,strcharinfo(0);
-		emotion e_kis;
+		emotion ET_CHUP;
 		mes "Thaank yoouu! Have this magic ring!";
 		close;
 	}
-	emotion e_thx;
+	emotion ET_THANKS;
 	mes "Oh... the whole marine folk send you their thanks! They love presents so much!!!";
 	if (rand(2))
 		mes "Didn't you know that Santa's Hat reveals the real power of the rings?";
@@ -189,6 +189,6 @@ izlu2dun,133,160,2	script	Snoowy	714,{
 M_END:
 	mes "[Snoowy]";
 	mes "I'd exchange a GOLD magic ring for 3 gift boxes...";
-	emotion e_swt;
+	emotion ET_SWEAT;
 	close;
 }

npc/custom/item_signer.txt

@@ -25,7 +25,7 @@ prt_in,24,61,7	script	Perchik	47,{
 	if(select("Tell me more...:Sign my items, please!") == 1) {
 		mes "[Perchik]";
 		mes "I can put your name on any slotless equipment or weapon.";
-		emotion e_ic;
+		emotion ET_AHA;
 		next;
 		mes "[Perchik]";
 		if (getarraysize(.@Item) || getarraysize(.@Cost)) {
@@ -37,7 +37,7 @@ prt_in,24,61,7	script	Perchik	47,{
 		}
 		else mes "I work for free, but...";
 		next;
-		emotion e_cry;
+		emotion ET_CRY;
 		mes "[Perchik]";
 		mes "Alas, I have 12 hungry children";
 		mes "and a very angry wife.";
@@ -45,7 +45,7 @@ prt_in,24,61,7	script	Perchik	47,{
 		mes "[Perchik]";
 		mes "Or it was 12 angry children";
 		mes "and a very hungry wife...";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 	mes "[Perchik]";
@@ -63,7 +63,7 @@ prt_in,24,61,7	script	Perchik	47,{
 	mes "[Perchik]";
 	if (!getequipisequiped(.@part)) {
 		mes "Nothing is equipped there!";
-		emotion e_wah;
+		emotion ET_KEK;
 		close;
 	}
 	for(set .@i,0; .@i<4; set .@i,.@i+1)
@@ -71,25 +71,25 @@ prt_in,24,61,7	script	Perchik	47,{
 	if (.@slot[0]==255 || .@slot[0]==254 || .@slot[0]<0) {
 		mes "Alas, this item's already signed.";
 		mes "I would never touch a master's work.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 	if (.@slot[0]>4000 && .@slot[0]<5000) {
 		mes "A card? Here?!";
 		mes "As I said before, I don't sign items with cards.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 	if (getiteminfo(.@id,10)) {
 		mes "Sorry, I don't sign slotted items.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		close;
 	}
 	getinventorylist;
 	for(set .@i,0; .@i<@inventorylist_count; set .@i,.@i+1)
 		if (@inventorylist_expire[.@i] != 0) {
 			mes "Sorry, I don't sign rental items!";
-			emotion e_hmm;
+			emotion ET_SCRATCH;
 			close;
 		}
 	set .@price, .@Cost[0]+(.@Cost[1]*.@ref);
@@ -106,20 +106,20 @@ prt_in,24,61,7	script	Perchik	47,{
 	if(select("Ok!:Leave")==2) {
 		mes "[Perchik]";
 		mes "See you...";
-		emotion e_yawn;
+		emotion ET_SLEEPY;
 		close;
 	}
 	mes "[Perchik]";
 	if (Zeny < .@price || .@nr) {
 		mes "I don't work for 'thanks'.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		close;
 	}
 	if (!countitem2(.@id,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3])) {
 		mes "Where is "+getitemname(@id)+"...?";
 		npctalk "Perchik : You're a snoozy cheater!";
 		logmes "Hack: Tried to sign an item not having it: "+getitemname(@id);
-		emotion e_wah;
+		emotion ET_KEK;
 		close;
 	}
 	if (.@price) set Zeny, Zeny-.@price;
@@ -127,7 +127,7 @@ prt_in,24,61,7	script	Perchik	47,{
 		delitem .@Item[.@i], .@Item[.@i+1];
 	delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3];
 	mes "Done!";
-	emotion e_proud;
+	emotion ET_OK;
 	getitem2 .@id,1,1,.@ref,0,254,0,getcharid(0)&0xffff,(getcharid(0)>>16)&0xffff;
 	equip .@id;
 	close;

npc/custom/official/GeffenMagicTournament.txt

@@ -127,27 +127,27 @@ OnTimer1000:
 		case  88: npctalk "Hook up with both of them? Ho ho ho~!", instance_npcname("Young Lady#gef1"); break;
 		case  91:
 			npctalk "Yes! You have finally arrived, my love!", instance_npcname("Handsome Adventurer#gef");
-			emotion 23, 0, instance_npcname("Young Lady#gef1");
-			emotion 23, 0, instance_npcname("Young Lady#gef2");
-			emotion 23, 0, instance_npcname("Young Lady#gef3");
+			emotion ET_HUK, getnpcid(0, instance_npcname("Young Lady#gef1"));
+			emotion ET_HUK, getnpcid(0, instance_npcname("Young Lady#gef2"));
+			emotion ET_HUK, getnpcid(0, instance_npcname("Young Lady#gef3"));
 			break;
 		case  95:
 			npctalk "My love...", instance_npcname("Male Adventurer#gef");
-			emotion 3, 0, instance_npcname("Male Adventurer#gef");
-			emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
-			emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
+			emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"));
+			emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
+			emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
 			break;
 		case  99:
 			npctalk "Maybe... There are no good guys left for us...", instance_npcname("Young Lady#gef3");
-			emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
+			emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
 			break;
 		case 103:
 			npctalk "Ahem... Maybe... Just the three of us... will be together forever...", instance_npcname("Young Lady#gef2");
-			emotion 3, 0, instance_npcname("Male Adventurer#gef");
+			emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"));
 			break;
 		case 106:
 			npctalk "Our friendship is forever~!!!", instance_npcname("Young Lady#gef3");
-			emotion 3, 0, instance_npcname("Handsome Adventurer#gef");
+			emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"));
 			sleep2 500;
 			npctalk "Our friendship is forever~!!!", instance_npcname("Young Lady#gef1");
 			sleep2 500;
@@ -155,14 +155,14 @@ OnTimer1000:
 			'm1_timer++;
 			break;
 		case 109:
-			emotion 3, 0, instance_npcname("Male Adventurer#gef");
-			emotion 28, 0, instance_npcname("Young Lady#gef1");
-			emotion 28, 0, instance_npcname("Young Lady#gef2");
-			emotion 28, 0, instance_npcname("Young Lady#gef3");
+			emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"));
+			emotion ET_CRY, getnpcid(0, instance_npcname("Young Lady#gef1"));
+			emotion ET_CRY, getnpcid(0, instance_npcname("Young Lady#gef2"));
+			emotion ET_CRY, getnpcid(0, instance_npcname("Young Lady#gef3"));
 			break;
-		case 111: emotion 3, 0, instance_npcname("Handsome Adventurer#gef"); break;
-		case 113: emotion 3, 0, instance_npcname("Male Adventurer#gef"); break;
-		case 115: emotion 3, 0, instance_npcname("Handsome Adventurer#gef"); break;
+		case 111: emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"); break);
+		case 113: emotion ET_THROB, getnpcid(0, instance_npcname("Male Adventurer#gef"); break);
+		case 115: emotion ET_THROB, getnpcid(0, instance_npcname("Handsome Adventurer#gef"); break);
 		case 118:
 			hideonnpc instance_npcname("Male Adventurer#gef");
 			hideonnpc instance_npcname("Handsome Adventurer#gef");
@@ -4379,7 +4379,7 @@ OnMobKilled:
 					hideoffnpc instance_npcname("Geffen Bully#33");
 					break;
 				case 23:
-					emotion e_gasp, 0, instance_npcname("Fenrir#1");
+					emotion ET_SURPRISE, getnpcid(0, instance_npcname("Fenrir#1"));
 					mapannounce instance_mapname("1@gef"), "Take your dirty hands off of me.", 0x00ebff;
 					break;
 				case 25:
@@ -4449,7 +4449,7 @@ OnMobKilled:
 				case 45:
 					specialeffect EF_ENCHANTPOISON, AREA, instance_npcname("Loki#3");
 					sleep2 500;
-					emotion e_gg, 0, instance_npcname("Loki#3");
+					emotion ET_KIK, getnpcid(0, instance_npcname("Loki#3"));
 					npctalk "Loki : 3... 2...", instance_npcname("Loki#3");
 					sleep2 500;
 					npctalk "Geffen Bully : What?! You went from from 9 to 3 seconds!!", instance_npcname("Geffen Bully#1");

npc/custom/quests/bandit_beard.txt

@@ -30,7 +30,7 @@ umbala,126,129,4	script	Bearded Man#bandit	120,{
 
 	mes "[Bearded Man]";
 	mes "HoHo~ So you want some whiskers.";
-	emotion e_heh;
+	emotion ET_SMILE;
 	mes "Well I would give you my beards but there not cheap.";
 	mes "Matter of fact I have only one left...";
 	mes "but I'm not selling it.";
@@ -59,14 +59,14 @@ L_LIST:
 M_NO:
 	mes "[Bearded Man]";
 	mes "Fine, be that way!";
-	emotion e_ag;
+	emotion ET_ANGER;
 	close;
 
 L_DONE:
 	mes "[Bearded Man]";
 	mes "Sorry, I can only make one per person.";
 	mes "We don't want too many beards now. Right?";
-	emotion e_gg;
+	emotion ET_KIK;
 	close;
 
 L_MAKE:
@@ -90,14 +90,14 @@ L_MAKE:
 	set BEARD_QUEST, 5;
 	mes "[Bearded Man]";
 	mes "Have a nice day!";
-	emotion e_gg;
+	emotion ET_KIK;
 	close;
 
 L_NOITEMS:
 	mes "[Bearded Man]";
 	mes "What the hell! I can't make a beard without the items!";
 	mes "Here is the list again:";
-	emotion e_omg;
+	emotion ET_HUK;
 	goto L_LIST;
 }  
 
@@ -174,7 +174,7 @@ alberta,65,123,6	script	Man#bandit	85,{
 	if($@beardmob > 0) mes "Kill! Kill them already!!!";
 	if($@beardmob > 0) close;
 	mes "Are you here to help me?";
-	emotion e_what;
+	emotion ET_QUESTION;
 	next;
 	menu "Yes",-,"No",M_NO;
 
@@ -184,7 +184,7 @@ alberta,65,123,6	script	Man#bandit	85,{
 	next;
 	mes "[Thread Merchant]";
 	mes "Oh NO! Here they come!!";
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	donpcevent "BRDQ_MOBS::OnStart";
 	close;
 
@@ -199,7 +199,7 @@ L_KILLED:
 L_DONE:
 	mes "[Thread Merchant]";
 	mes "Thank you again!";
-	emotion e_thx;
+	emotion ET_THANKS;
 	close;
 
 M_NO:

npc/custom/quests/berzebub.txt

@@ -54,7 +54,7 @@ prontera,165,178,8	script	Old Woman	103,{
 	getitem 4145,1;
 	set BerzQuest, 1;
 	mes "Congratulations! You have all the items. Here is your ^FF0000Berzebub Card^000000, as promised.";
-	emotion e_grat;
+	emotion ET_CONGRATULATION;
 	close;
 
 M_Leave:

npc/custom/quests/hunting_missions.txt

@@ -32,10 +32,10 @@ function Chk;
 		mes "[Hunting Missions]";
 		mes "I can't find any records...";
 		mes "You must be new here!";
-		emotion e_omg;
+		emotion ET_HUK;
 		next;
 		callsub Mission_Info;
-		emotion e_go;
+		emotion ET_GO;
 		#Mission_Delay = 1;
 		close;
 	}
@@ -62,7 +62,7 @@ function Chk;
 					mes "I can't seem to find any records";
 					mes "for that character, though...";
 					mes "One moment, please.";
-					emotion e_hmm;
+					emotion ET_SCRATCH;
 					#Mission_Count = 0;
 				}
 				@hm_char_del_check = 1;
@@ -108,11 +108,11 @@ function Chk;
 					mes "[Hunting Missions]";
 					mes "You don't have enough";
 					mes "Zeny to drop this mission.";
-					emotion e_sry;
+					emotion ET_SORRY;
 					close;
 				}
 				Zeny -= .Reset;
-				emotion e_cash;
+				emotion ET_MONEY;
 			}
 			mes "[Hunting Missions]";
 			mes "Alright, I've dropped";
@@ -130,7 +130,7 @@ function Chk;
 			mes "[Hunting Missions]";
 			mes "I knew you were kidding!";
 			mes "Keep up the good work.";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		}
 	case 4:
@@ -153,7 +153,7 @@ function Chk;
 	case 7:
 		mes "[Hunting Missions]";
 		mes "Nothing? Okay...";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 	end;
@@ -191,7 +191,7 @@ Mission_Status:
 	mes "Oh, you're done!";
 	mes "Good work.";
 	mes "Here's your reward.";
-	emotion e_no1;
+	emotion ET_BEST;
 	specialeffect2 EF_ANGEL;
 	specialeffect2 EF_TRUESIGHT;
 	#Mission_Points += .@Mission_Points;
@@ -259,7 +259,7 @@ OnBuyItem:
 		}
 		#Mission_Points -= @cost;
 		mes "Deal completed.";
-		emotion e_cash;
+		emotion ET_MONEY;
 	}
 	@cost = 0;
 	deletearray @bought_nameid[0], getarraysize(@bought_nameid);

npc/custom/quests/jewel_case.txt

@@ -19,17 +19,17 @@ lighthalzen,108,229,2	script	La Fenn	766,{
 		if(Q_99LVL) {
 			mes "You... You got younger!!! But you are defenitely YOU!";
 			mes "I couldn't think you were able to meet my condition...";
-			emotion e_hmm;
+			emotion ET_SCRATCH;
 			next;
 			mes "[La Fenn]";
 			mes "Here is your prize. It's yours for good.";
 			set Q_99LVL,0;
 			getitem 12106,1; //Jewel Case
-			emotion e_grat;
+			emotion ET_CONGRATULATION;
 		} else {
 			mes callfunc("F_Hi");
 			mes "...";
-			emotion e_yawn;
+			emotion ET_SLEEPY;
 			next;
 			mes "[La Fenn]";
 			mes "I've got a riddle for a strong man of 2nd Class and 99 Base Level.";
@@ -55,12 +55,12 @@ lighthalzen,108,229,2	script	La Fenn	766,{
 				mes "Now you're REALLY strong.";
 				mes "And if you get younger than now I'll give you my treasure.";
 				set Q_99LVL,1;
-				emotion e_no1;
+				emotion ET_BEST;
 			}
 		}
 		close;
 	}
-	emotion e_hmm;
+	emotion ET_SCRATCH;
 	mes "...";
 	close;
 }

npc/custom/quests/may_hats.txt

@@ -25,7 +25,7 @@ gonryun,187,140,4	script	Yakima	850,{
 
 	mes "[Yakima]";
 	mes "Oh.. it's an excellent item for any beast hunter.";
-	emotion e_rock;
+	emotion ET_ROCK;
 	next;
 	mes "[Yakima]";
 	mes "For the hat I'll need:";
@@ -51,7 +51,7 @@ gonryun,187,140,4	script	Yakima	850,{
 M_2:
 	mes "[Yakima]";
 	mes "Bingo! Many people are afraid of lions... to the muteness...";
-	emotion e_slur;
+	emotion ET_SEXY;
 	next;
 	mes "[Yakima]";
 	mes "For the hat I'll need:";
@@ -80,7 +80,7 @@ M_3:
 	mes "[Yakima]";
 	mes "I wish I sold this filthy manteau faster...";
 	mes "Guess it isn't so plain as it looks... Hmm.";
-	emotion e_wah;
+	emotion ET_KEK;
 	next;
 	mes "[Yakima]";
 	mes "I'm giving it almost for free:";
@@ -109,7 +109,7 @@ M_4:
 	mes "[Yakima]";
 	mes "It's a fresh style! Ancessory and a bag all in one! You'd get +2 STR... It's different from that sabby nest!";
 	mes "It fits to Merchant classonly.";
-	emotion e_heh;
+	emotion ET_SMILE;
 	next;
 	mes "[Yakima]";
 	mes "Now my stock is full of those bags... So I'll make it from 3 flower things and a rough piece of clothes:";
@@ -138,7 +138,7 @@ M_5:
 	mes "[Yakima]";
 	mes "Well, well, well... this sign fits any class from a certain level!";
 	mes "Your foes'd be dazzled!";
-	emotion e_no1;
+	emotion ET_BEST;
 	next;
 	mes "[Yakima]";
 	mes "Well... we construct it from some common items:";
@@ -170,7 +170,7 @@ M_5:
 L_NOITEM:
 	mes "[Yakima]";
 	mes "You are lack of items. Please, get all the items.";
-	emotion e_sry;
+	emotion ET_SORRY;
 	close;
 
 M_EXIT:

npc/custom/quests/thq/THQS_GuildNPC.txt

@@ -34,7 +34,7 @@ yuno_in01,124,164,6	script	Guild Leader	108,{
 	set Event_THQS,1;
 	mes "[Keegan]";
 	mes "Congratulations!";
-	emotion e_grat;
+	emotion ET_CONGRATULATION;
 	next;
 	mes "[Keegan]";
 	mes "Welcome to the Guild of Treasure Hunters.";

npc/custom/quests/thq/THQS_QuestNPC.txt

@@ -50,7 +50,7 @@ N_PayZeny:
 	mes "[Guy]";
 	mes "Its sad to see someone give a quest up...";
 	mes "Shame on you.";
-	emotion e_ag;
+	emotion ET_ANGER;
 	close;
 
 N_ZenyFail:
@@ -74,7 +74,7 @@ N_NewQuest:
 	mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards.";
 	next;
 	set #THQ_DELAY,(GetTime(DT_YEAR)*12*31*24+GetTime(DT_MONTH)*31*24+GetTime(DT_DAYOFMONTH)*24+GetTime(DT_HOUR) + 1); //you can get another quest after 1 hour [Lupus]
-	emotion e_no1;
+	emotion ET_BEST;
 	if(@treasure_job==0) set @treasure_job,rand(1,10); //doesn't allow cheaters to pick any quest they want
 	if(@treasure_job==2) goto N_JobList2;
 	if(@treasure_job==3) goto N_JobList3;
@@ -90,20 +90,20 @@ N_NewQuest:
 N_NoTime:
 	mes "[Guy]";
 	mes "Alright maybe next time "+strcharinfo(0)+".";
-	emotion e_hmm;
+	emotion ET_SCRATCH;
 	close;
 
 N_Signup:
 	mes "[Guy]";
 	mes "I'm afraid you must sign up for the guild before you can go on a quest!";
-	emotion e_sry;
+	emotion ET_SORRY;
 	close;
 
 L_NoQuestsForYet:
 	mes "[Guy]";
 	mes "I'm afraid there aren't any Quests for you yet.";
 	mes "Call in "+ (#THQ_DELAY - (GetTime(DT_YEAR)*12*31*24+GetTime(DT_MONTH)*31*24+GetTime(DT_DAYOFMONTH)*24+GetTime(DT_HOUR)) )+" hours later.";
-	emotion e_sry;
+	emotion ET_SORRY;
 	close;
 
 L_QuestGiven:

npc/custom/quests/umbalian_language.txt

@@ -79,7 +79,7 @@ M_DONE:
 	close;
 
 L_AGAIN:
-	emotion e_thx;
+	emotion ET_THANKS;
 	mes "Yay, I found her! Thank you very much for you help!";
 	close;
 
@@ -99,7 +99,7 @@ aldebaran,153,212,1	script	Mojo	740,{
 	if(umb_lang==1) set umb_mojo,1;
 	close;
 L_NOT_GOT_QUEST:
-	emotion e_what;
+	emotion ET_QUESTION;
 	mes "I lost my teacher's book!  What am I going to do...";
 	close;
 }
@@ -115,14 +115,14 @@ amatsu,267,189,4	script	Marie	744,{
 
 	mes "[Marie]";
 	mes "What does he want from me?";
-	emotion e_what;
+	emotion ET_QUESTION;
 	next;
 	mes "[Marie]";
 	mes "Oh wait, I see... he wants his reference scroll back am I right? Well, I'm kinda still using it buuut... I'll give it back if you can gimme a poring egg and an incubator. Those things are so cute!";
 	close;
 
 L_NOT_GOT_QUEST:
-	emotion e_what;
+	emotion ET_QUESTION;
 	mes "Hi! What do you want from me?";
 	close;
 
@@ -149,7 +149,7 @@ M_DOH:
 	close;
 
 L_AGAIN:
-	emotion e_thx;
+	emotion ET_THANKS;
 	mes "Yay! I love Porings!";
 	close;
 }
@@ -165,7 +165,7 @@ L_QUEST:
 	delitem 1006,1;	//Items: Old Magic Book,
 	delitem 7118,1;	//Items: Torn Scroll,
 	delitem 7117,1;//Items: Torn Spell Book,
-	emotion e_thx;
+	emotion ET_THANKS;
 	mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggsadril.";
 	next;
 	mes "[Fabius]";

npc/events/MemorialDay_2008.txt

@@ -29,7 +29,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		next;
 		mes "[Mad Sago Lauds]";
 		mes "What is this!?";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Mad Sago Lauds]";
 		mes "Where is your towel!?";
@@ -166,7 +166,7 @@ prontera,182,214,4	script	Lauds#Memorial	58,{
 		if (.@RandomMsg == 1) {
 			mes "[Mad Sago Lauds]";
 			mes "Don't panic!";
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			close;
 		}
 		else if (.@RandomMsg == 2) {

npc/events/RWC_2011.txt

@@ -23,7 +23,7 @@ prontera,114,81,5	script	RWC2011 Agent#2	407,{
 	if (oversea_event == 0) {
 		mes "[New Agent]";
 		mes "Wow~ Finally!! It's the season we've all been waiting for!";
-		emotion e_lv2;
+		emotion ET_BIGTHROB;
 		next;
 		mes "[New Agent]";
 		mes "It's RWC time!";
@@ -134,7 +134,7 @@ prontera,114,81,5	script	RWC2011 Agent#2	407,{
 		mes "[New Agent]";
 		mes "If you see the Golden Poring, could you please find the precious blue cards for me?";
 		next;
-		emotion e_sob;
+		emotion ET_CRY;
 		mes "- He looks at you with imploring eyes. -";
 		next;
 		if(select("Ok, I will help you!:How much money can you offer me?") == 2) {

npc/events/christmas_2005.txt

@@ -49,7 +49,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 	mes "bring it to me.";
 	mes "I'll change it to brand new one.";
 	mes "Stylish Louise's hat.";
-	emotion e_lv;
+	emotion ET_THROB;
 	next;
 	if (countitem(2236) > 0) {
 		if (select("Here.:It's ok.") == 1) {
@@ -84,7 +84,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "I like your style~.";
 					mes "Ok!! If everything is ready, no need to hesitate.";
 					mes "I'll show you what Designer Louise Kim's power is.";
-					emotion e_no1;
+					emotion ET_BEST;
 					next;
 					mes "-She puts the hat in a bucket -";
 					mes "-filled with Holy Water.-";
@@ -94,7 +94,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "[Designer Louise Kim]";
 					mes "~With the number one designer, Louise Kim,~";
 					mes "~you are the most blessed soul.~";
-					emotion e_ho;
+					emotion ET_DELIGHT;
 					misceffect EF_BLESSING;
 					next;
 					mes "-Immediately, she puts Rosary in an-";
@@ -106,7 +106,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "[Designer Louise Kim]";
 					mes "~With the number one designer, Louise Kim,~";
 					mes "~you are the luckiest soul.~";
-					emotion e_ho;
+					emotion ET_DELIGHT;
 					misceffect EF_GLORIA;
 					next;
 					mes "-She starts sewing the hat with -";
@@ -117,7 +117,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "~This is called the Louise's miracle.~";
 					mes "~The most talented disigner,~";
 					mes "~L_O_U_I_S_E K_I_M~";
-					emotion e_lv;
+					emotion ET_THROB;
 					misceffect EF_BENEDICTIO;
 					next;
 					mes "[Designer Louise Kim]";
@@ -132,7 +132,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "It's a gift for you!";
 					mes "I won't charge anything.";
 					mes "Just tell many people how good it is.";
-					emotion e_heh;
+					emotion ET_SMILE;
 					next;
 					mes "[Designer Louise Kim]";
 					mes "Wherever you go,";
@@ -146,7 +146,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "Go brag yourself!";
 					mes "~Who would be happier than~";
 					mes "~being with Louise.~";
-					emotion e_ho;
+					emotion ET_DELIGHT;
 					delitem 2236,1; //Santa's_Hat
 					delitem 952,1; //Cactus_Needle
 					delitem 523,10; //Holy_Water
@@ -159,21 +159,21 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 					mes "Come on~If you just get me the materials,";
 					mes "I won't charge anything,";
 					mes "Call me if you change your mind.";
-					emotion e_lv;
+					emotion ET_THROB;
 					close;
 				}
 			}
 			mes "[Designer Louise Kim]";
 			mes "You'll regret!";
 			mes "Think again!";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		}
 		mes "[Designer Louise Kim]";
 		mes "Ok~ whatever~";
 		mes "It's not me,";
 		mes "who's going to lose whose own luck.";
-		emotion e_heh;
+		emotion ET_SMILE;
 		close;
 	}
 	else {
@@ -182,7 +182,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 		mes "think about it carefully.";
 		mes "You can get the better designed hat,";
 		mes "and I can show off my talent.";
-		emotion e_heh;
+		emotion ET_SMILE;
 		close;
 	}
 }
@@ -250,7 +250,7 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 			mes "5 branch of dead trees!!!";
 			mes "Must bring item to attack town~";
 			mes "hahahaha~~";
-			emotion e_gg;
+			emotion ET_KIK;
 			next;
 			mes "[Enjoy]";
 			mes "Get it?!!!!";
@@ -384,8 +384,8 @@ prontera,155,285,3	script	Enjoy#enjoy	753,{
 			mes " ";
 			mes "[All]";
 			mes "Let's punish!!!!!";
-			emotion e_go;
-			emotion e_go,1;
+			emotion ET_GO;
+			emotion ET_GO, playerattached();
 			donpcevent "Happymerry#happymerry02::OnCommandEmotion";
 			donpcevent "Christ#christ02::OnCommandEmotion";
 			donpcevent "Mas#mas02::OnCommandEmotion";
@@ -512,7 +512,7 @@ OnCommandOn:
 	initnpctimer;
 	enablenpc "Happymerry#happymerry02";
 OnCommandEmotion:
-	emotion e_go;
+	emotion ET_GO;
 	end;
 
 OnCommandOff:
@@ -538,7 +538,7 @@ OnInit:
 OnCommandOn:
 	enablenpc "Christ#christ02";
 OnCommandEmotion:
-	emotion e_go;
+	emotion ET_GO;
 	end;
 
 OnCommandOff:
@@ -555,7 +555,7 @@ OnInit:
 OnCommandOn:
 	enablenpc "Mas#mas02";
 OnCommandEmotion:
-	emotion e_go;
+	emotion ET_GO;
 	end;
 
 OnCommandOff:
@@ -572,7 +572,7 @@ OnInit:
 OnCommandOn:
 	enablenpc "Event#event02";
 OnCommandEmotion:
-	emotion e_go;
+	emotion ET_GO;
 	end;
 
 OnCommandOff:
@@ -586,7 +586,7 @@ prontera,188,177,4	script	Happymerry#happymerry	869,{
 		mes "Holgren~~!!";
 		mes "I've never expected you betraying me! Don't wanna get refined~!!!";
 		mes "I hate christmas~!";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Are...you...?";
@@ -645,7 +645,7 @@ prontera,188,177,4	script	Happymerry#happymerry	869,{
 		mes "Holgren!!";
 		mes "I've never expected you betraying me! Don't wanna get refined~!!!";
 		mes "I hate christmas~!";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[Happymerry]";
 		mes "What are you laughing at? huh~!";
@@ -836,7 +836,7 @@ prontera,35,209,5	script	Event#event	881,{
 		next;
 		mes "[Event]";
 		mes "...I love you too~!!!";
-		emotion e_omg,1;
+		emotion ET_HUK, playerattached();
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "(Oh,my..)";
@@ -848,7 +848,7 @@ prontera,35,209,5	script	Event#event	881,{
 		next;
 		mes "-He laughed talking to his right hand.-";
 		//Emotion "Event#event" ET_KIK
-		emotion e_kis;
+		emotion ET_CHUP;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Mas sent me here.";
@@ -900,7 +900,7 @@ prontera,35,209,5	script	Event#event	881,{
 		next;
 		mes "[Event]";
 		mes "...I love you too~!!!";
-		emotion e_omg,1;
+		emotion ET_HUK, playerattached();
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "(Oh.my~)";
@@ -911,7 +911,7 @@ prontera,35,209,5	script	Event#event	881,{
 		mes "Hahahaha~~~";
 		next;
 		mes "-He laughed talking to his right hand.-";
-		emotion e_kis;
+		emotion ET_CHUP;
 		close;
 	}
 }
@@ -955,7 +955,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "[Oholy]";
 			mes "The latest headline by Oholy";
 			mes "Isn't it amazing?";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		case 2:
 			mes "[Oholy]";
@@ -979,7 +979,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "[Oholy]";
 			mes "The latest headline by Oholy";
 			mes "Isn't it amazing?";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		case 3:
 			mes "[Oholy]";
@@ -1015,7 +1015,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "Good gracious! Are you for real?";
 			mes "Oh? Shee... Can you hear it?";
 			mes "Every kids appreciate your kindness.";
-			emotion e_heh;
+			emotion ET_SMILE;
 			mes "Don't be afraid. I will not";
 			mes "ask you to make a new christmas carol.";
 			next;
@@ -1035,7 +1035,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "you are dealing with devil.";
 			mes "Well then, hope you a good luck!!!";
 			mes " ";
-			emotion e_no1;
+			emotion ET_BEST;
 			set christ_carol05,1;
 			close;
 		case 4:
@@ -1066,7 +1066,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "[Oholy]";
 			mes "The latest headline by Oholy";
 			mes "Isn't it amazing?";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		case 5:
 			mes "[Oholy]";
@@ -1084,7 +1084,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 			mes "[Oholy]";
 			mes "The latest headline by Oholy";
 			mes "Isn't it amazing?";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		}
 	}
@@ -1168,7 +1168,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "I wrapped those indivisually.";
 				mes "There are many sweets in them.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 12130,7;//Cookie_Bag
@@ -1180,7 +1180,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "Chief noun.";
 				mes "Very sweet and delicious.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 529,20;//Candy
@@ -1192,7 +1192,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "Chief noun.";
 				mes "Very sweet and delicious.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 530,15;//Candy_Striper
@@ -1204,7 +1204,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "Chief Acolyte.";
 				mes "Very soft and delicious.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 539,5;//Piece_of_Cake
@@ -1216,7 +1216,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "Chief Acolyte.";
 				mes "Very crispy and delicious.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 538,10;//Well_baked_Cookie
@@ -1228,7 +1228,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "Bishop, Tomas.";
 				mes "Very cute.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 743,1;//Spore_Doll
@@ -1240,7 +1240,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "How did it get in here..?!";
 				mes "Oops, oh well.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 750,1;//Baphomet_Doll
@@ -1252,7 +1252,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "How did it get in here..?!";
 				mes "Oops, oh well.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 751,1;//Osiris_Doll
@@ -1264,7 +1264,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "a knight, Lighten.";
 				mes "Very kind of him.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 752,1;//Grasshopper_Doll
@@ -1277,7 +1277,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "an assassin, Marzia.";
 				mes "Very kind of him.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 753,1;//Monkey_Doll
@@ -1289,7 +1289,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "a hunter, Raiden Kurs.";
 				mes "Very kind of him.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 754,1;//Raccoondog_Doll
@@ -1302,7 +1302,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "Very kind of her.";
 				mes "Hope she is doing okay.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 7206,1;//Black_Kitty_Doll
@@ -1313,7 +1313,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "I made this doll.";
 				mes "Isn't it adorable?!";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 7212,1;//Hanging_Doll
@@ -1326,7 +1326,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "An artisan made this doll";
 				mes "with his passion.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 7277,1;//Munak_Doll
@@ -1338,7 +1338,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 				mes "during Christmas season.";
 				mes "It is not a common hat.";
 				mes "Merry Christmas!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				delitem 1097,1;//Worn_Out_Page
 				set christ_carol05,3;
 				getitem 2236,1;//Santa's_Hat
@@ -1377,7 +1377,7 @@ function	script	F_carol_devi	{
 		mes "Heyhey, human!!";
 		mes "Don't ya wanna sell your";
 		mes "soul and be bound in a beneficial contract with me?";
-		emotion e_kis;
+		emotion ET_CHUP;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hey, you! Deviruchi!!!";
@@ -1392,8 +1392,8 @@ function	script	F_carol_devi	{
 			mes "What are you doing!?";
 			mes "Human?";
 			mes "Let go of me...right now!";
-			emotion e_omg;
-			emotion e_omg,1;
+			emotion ET_HUK;
+			emotion ET_HUK, playerattached();
 			next;
 			mes "-Deviruchi quickly ran away-";
 			mes "-^4d4dffWhere Deviruchi is gone,-";
@@ -1415,8 +1415,8 @@ function	script	F_carol_devi	{
 			mes "What are you doing!?";
 			mes "Human?";
 			mes "Let go of me...right now!";
-			emotion e_omg;
-			emotion e_omg,1;
+			emotion ET_HUK;
+			emotion ET_HUK, playerattached();
 			next;
 			mes "-Deviruchi ran away quickly-";
 			mes "-and mumbled something.-";
@@ -1425,15 +1425,15 @@ function	script	F_carol_devi	{
 			next;
 			mes "-You are now cursed!!!-";
 			sc_start SC_Curse,5000,0;
-			emotion e_omg,1;
+			emotion ET_HUK, playerattached();
 			close;
 		case 3:
 			mes "[Deviruchi]";
 			mes "What are you doing!?";
 			mes "Human?";
 			mes "Let go of me...right now!";
-			emotion e_omg;
-			emotion e_omg,1;
+			emotion ET_HUK;
+			emotion ET_HUK, playerattached();
 			next;
 			mes "-Deviruchi ran away quickly-";
 			mes "-and mumbled something.-";
@@ -1442,15 +1442,15 @@ function	script	F_carol_devi	{
 			next;
 			mes "-You are blinded!!!-";
 			sc_start SC_Blind,5000,0;
-			emotion e_omg,1;
+			emotion ET_HUK, playerattached();
 			close;
 		case 4:
 			mes "[Deviruchi]";
 			mes "What are you doing!?";
 			mes "Human?";
 			mes "Let go of me...right now!";
-			emotion e_omg;
-			emotion e_omg,1;
+			emotion ET_HUK;
+			emotion ET_HUK, playerattached();
 			next;
 			mes "-Deviruchi ran away quickly-";
 			mes "-and mumbled something.-";
@@ -1459,7 +1459,7 @@ function	script	F_carol_devi	{
 			next;
 			mes "-You are poisoned!!!-";
 			sc_start SC_Poison,5000,0;
-			emotion e_omg,1;
+			emotion ET_HUK, playerattached();
 			close;
 		}
 	}
@@ -1468,7 +1468,7 @@ function	script	F_carol_devi	{
 		mes "Heyhey, human!!";
 		mes "Don't ya wanna sell your";
 		mes "soul and be bound in a beneficial contract with me?";
-		emotion e_omg;
+		emotion ET_HUK;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hey, you! Deviruchi!!!";
@@ -1481,8 +1481,8 @@ function	script	F_carol_devi	{
 		mes "What are you doing!?";
 		mes "Human?";
 		mes "Let go of me...right now!";
-		emotion e_omg;
-		emotion e_omg,1;
+		emotion ET_HUK;
+		emotion ET_HUK, playerattached();
 		next;
 		mes "-Deviruchi ran away quickly-";
 		mes "-and mumbled something.-";
@@ -1498,7 +1498,7 @@ function	script	F_carol_devi2	{
 	mes "Heyhey, human!!";
 	mes "Don't ya wanna sell your";
 	mes "soul and be bound in a beneficial contract with me?";
-	emotion e_omg;
+	emotion ET_HUK;
 	next;
 	mes "["+ strcharinfo(0) +"]";
 	mes "Hey, you! Deviruchi!!!";
@@ -1511,8 +1511,8 @@ function	script	F_carol_devi2	{
 	mes "What are you doing!?";
 	mes "Human?";
 	mes "Let go of me...right now!";
-	emotion e_omg;
-	emotion e_omg,1;
+	emotion ET_HUK;
+	emotion ET_HUK, playerattached();
 	next;
 	mes "-Deviruchi ran away quickly-";
 	mes "-and mumbled something.-";

npc/events/christmas_2008.txt

@@ -69,7 +69,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "If you win over Santa, you can get a gift. Would you go for it?";
 				next;
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't that big news?";
@@ -87,7 +87,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "Furthermore, he has put bad magic on the gifts so that they become monsters!";
 				next;
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't it amazing?";
@@ -133,7 +133,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion e_heh;
+							emotion ET_SMILE;
 							delitem 6092,6;
 							getnameditem 12354,strcharinfo(0);
 							mes "[Caroller]";
@@ -154,7 +154,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion e_heh;
+							emotion ET_SMILE;
 							delitem 6092,6;
 							getitem 12354,1;
 							mes "[Caroller]";
@@ -232,7 +232,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 					mes "Please, for our children's hope!!!?";
 					mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
 					next;
-					emotion e_ok;
+					emotion ET_OK;
 					mes "[Caroller]";
 					mes "They're definitely as harsh as their name.";
 					mes "Go on please!";
@@ -254,7 +254,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "Are there some spcial abilities within them?";
 				mes "There's still the designer in the Christmas village... How about asking her to make that costume?";
 				next;
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "It's hot, huh?";
@@ -272,7 +272,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "And he isn't alone anymore... is what I heard...";
 				next;
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Hotness, right?";
@@ -295,7 +295,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "For all of the children of this world!!!";
 			mes "Please bring me ^0000FFSinging Crystal Pieces^000000 from ^0000FFViolent Gift Boxes^000000!";
 			next;
-			emotion e_ok;
+			emotion ET_OK;
 			mes "[Caroller]";
 			mes "Be careful!";
 			mes "They're definitely as harsh as their name.";
@@ -337,7 +337,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
 			delitem 6092,6;
-			emotion e_ok;
+			emotion ET_OK;
 			set iROxmas08carol,2;
 			mes "[Caroller]";
 			mes "Those are all needed.";
@@ -356,7 +356,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "So, we need more of some materials.";
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
-			emotion e_ok;
+			emotion ET_OK;
 			mes "[Caroller]";
 			mes "That's all we need.";
 			mes "Isn't that easy?";
@@ -416,7 +416,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Caroller]";
 			mes "Don't worry, it tastes good.";
 			next;
-			emotion e_ok;
+			emotion ET_OK;
 			getitem 2784,1;
 			getnameditem 12354,strcharinfo(0);
 			delitem 1019,10;
@@ -528,7 +528,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "Let's get started!";
 		next;
 		while(.@SantaCardTurn != 5) {
-			emotion e_loud;
+			emotion ET_BLABLA;
 			mes "[Santa Claus]";
 			mes "First let me shuffle up these cards... Ok!!!";
 			next;
@@ -595,16 +595,16 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			set .@SantaCardTurn,.@SantaCardTurn+1;
 			if (.@SantaCardP == .@SantaCardNpc) {
 				set .@SantaCardWins,.@SantaCardWins+1;
-				emotion e_gasp;
-				emotion e_ic,1;
+				emotion ET_SURPRISE;
+				emotion ET_AHA, playerattached();
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "You're lucky.";
 				mes "Can you guess the right card the next time around?";
 				next;
 			} else {
-				emotion e_gasp;
-				emotion e_omg,1;
+				emotion ET_SURPRISE;
+				emotion ET_HUK, playerattached();
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "Aww maybe next time...";
@@ -730,7 +730,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "The reason catching up to him is so hard, is that his clothes have been given strong power!";
 	mes "I blessed them with good luck!";
 	next;
-	emotion e_lv;
+	emotion ET_THROB;
 	mes "[Louise Kim]";
 	mes "Preta Porter!!";
 	mes "Which is quite luxurious but sold at good price ~";
@@ -747,7 +747,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "Ah!";
 		mes "You're silly! You lost your big chance!";
 		next;
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Louise Kim]";
 		mes "Come to me later if you want to get the mission.";
 		mes "I, Louise Kim, am generous enough to accept you next time.";
@@ -765,7 +765,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "Anyway, can you bring me some stuff?";
 	next;
 	if (select("Why not? What do you need?:Sorry, no time.") == 2) {
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Louise Kim]";
 		mes "What?";
 		mes "You will definitely regret it.";
@@ -783,13 +783,13 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 			mes "[Louise Kim]";
 			mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free...";
 			next;
-			emotion e_lv;
+			emotion ET_THROB;
 			mes "[Louise Kim]";
 			mes "Please see me again if you are interested.";
 			close;
 	} else {
 		select("Here you are.");
-		emotion e_ok;
+		emotion ET_OK;
 		mes "[Louise Kim]";
 		mes "Oh! Good!";
 		mes "Let's not delay.";
@@ -801,7 +801,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-and many blessings she sings.-";
 		next;
 		specialeffect EF_BLESSING;
-		emotion e_ho;
+		emotion ET_DELIGHT;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -815,7 +815,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-Count your blessings and sing!-";
 		next;
 		specialeffect EF_GLORIA;
-		emotion e_ho;
+		emotion ET_DELIGHT;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -827,7 +827,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-cheer and goodwill!-";
 		next;
 		specialeffect EF_BENEDICTIO;
-		emotion e_lv;
+		emotion ET_THROB;
 		mes "[Louise Kim]";
 		mes "This is miraculous!";
 		mes "I am a genius of the world.";
@@ -839,7 +839,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "My fashion is radiant.";
 		mes "I ain't envious of Designer Pierre.";
 		next;
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Louise Kim]";
 		mes "I am supposed to get paid well, however I will just let it be free, since this is Christmas!";
 		next;

npc/events/christmas_2013.txt

@@ -399,20 +399,20 @@ xmas,108,149,5	script	Drop Machine#xmas	562,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Drop Machine]";
 		mes "Dingding dong Ding!~";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Slot Machine]";
 		mes "!~";
-		emotion e_lv,0,"Slot Machine#xmas";
+		emotion ET_THROB, getnpcid(0, "Slot Machine#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Drop Machine]";
 		mes "Dingdingding ding!~";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Slot Machine]";
 		mes "Charrrrr Sharrrrrrrr Ding!~";
-		emotion e_lv,0,"Slot Machine#xmas";
+		emotion ET_THROB, getnpcid(0, "Slot Machine#xmas");
 		next;
 		mes "- Oh no, another couple!";
 		mes "- Even though they're just machines...";
@@ -469,20 +469,20 @@ xmas,181,150,5	script	Frightened Man#xmas	711,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Frightened Man]";
 		mes "It's my fault, I'm sorry. Please don't be mad.";
-		emotion e_sry;
+		emotion ET_SORRY;
 		next;
 		mes "[Angry Woman]";
 		mes "You're sorry? Do you know what you did? Do you have any idea why I'm mad?";
-		emotion e_an,0,"Angry Woman#xmas";
+		emotion ET_FRET, getnpcid(0, "Angry Woman#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Frightened Man]";
 		mes "It's my bad, I'm sorry. Please don't be mad";
-		emotion e_sry;
+		emotion ET_SORRY;
 		next;
 		mes "[Angry Woman]";
 		mes "You're sorry? Do you know what you did? Do you have any idea why I'm mad?";
-		emotion e_an,0,"Angry Woman#xmas";
+		emotion ET_FRET, getnpcid(0, "Angry Woman#xmas");
 		next;
 		mes "[Frightened Man]";
 		mes "Well, I just feel like everything's my fault";
@@ -580,20 +580,20 @@ xmas_in,32,99,5	script	Singles Union Kwami	10089,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Singles Union Kwami]";
 		mes "Rinka. It's a huge mystery how such a pretty girl like you ended up in this Singles Union Army.";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Singles Union Rinka]";
 		mes "You think I'm pretty? hoho... It's mystery for me too, that a handsome man like you joined the Singles Union Army.";
-		emotion e_lv,0,"Singles Union Rinka";
+		emotion ET_THROB, getnpcid(0, "Singles Union Rinka");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Singles Union Kwami]";
 		mes "Rinka. It's a huge mystery how such a pretty girl like you ended up in this Singles Union Army.";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Singles Union Rinka]";
 		mes "You think I'm pretty? hoho... It's mystery for me too, that a handsome man like you joined the Singles Union Army.";
-		emotion e_lv,0,"Singles Union Rinka";
+		emotion ET_THROB, getnpcid(0, "Singles Union Rinka");
 		next;
 		mes "[Singles Union Kwami]";
 		mes "Well, isn't it a shame we should spend Christmas alone? What do you say, Rinka, you and me...";
@@ -640,22 +640,22 @@ xmas,156,109,5	script	Poor Alchemist#xmas	749,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Poor Alchemist]";
 		mes "Oh, hello.";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		mes "[Florist]";
 		mes "Hello, Mr. Alchemist.";
 		mes "Are you working today, too?";
-		emotion e_ho,0,"Florist#xmas";
+		emotion ET_DELIGHT, getnpcid(0, "Florist#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Poor Alchemist]";
 		mes "Oh, hello.";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		mes "[Florist]";
 		mes "Hello, Mr. Alchemist.";
 		mes "Are you working today, too?";
-		emotion e_ho,0,"Florist#xmas";
+		emotion ET_DELIGHT, getnpcid(0, "Florist#xmas");
 		next;
 		mes "[Poor Alchemist]";
 		mes "Actually, I have something to tell you.";
@@ -768,22 +768,22 @@ xmas,166,164,5	script	Raffini Boy#xmas	443,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Raffini Boy]";
 		mes "This is Lutie village...";
-		emotion e_no;
+		emotion ET_STARE_ABOUT;
 		next;
 		mes "[Raffini Girl]";
 		mes "So much beautiful white snow flakes.";
 		mes "But it's too cold here...";
-		emotion e_sob,0,"Raffini Girl#xmas";
+		emotion ET_CRY, getnpcid(0, "Raffini Girl#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Raffini Boy]";
 		mes "This is Lutie village...";
-		emotion e_no;
+		emotion ET_STARE_ABOUT;
 		next;
 		mes "[Raffini Girl]";
 		mes "So much beautiful white snow flakes.";
 		mes "But it's too cold here...";
-		emotion e_sob,0,"Raffini Girl#xmas";
+		emotion ET_CRY, getnpcid(0, "Raffini Girl#xmas");
 		next;
 		mes "[Raffini Boy]";
 		mes "But it's you who wanted to see the snow this Christmas.";
@@ -865,20 +865,20 @@ xmas,147,123,5	script	Angeling#xmas	948,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Angeling]";
 		mes "Kkuing~";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Arc Angeling]";
 		mes "Kkuing Kkuing~";
-		emotion e_lv,0,"Arc Angeling#xmas";
+		emotion ET_THROB, getnpcid(0, "Arc Angeling#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Angeling]";
 		mes "Kkuing~";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Arc Angeling]";
 		mes "Kkuing Kkuing~";
-		emotion e_lv,0,"Arc Angeling#xmas";
+		emotion ET_THROB, getnpcid(0, "Arc Angeling#xmas");
 		next;
 		mes "- I cannot bother them though.";
 		mes "- Can't even talk to them,";
@@ -905,11 +905,11 @@ xmas,129,115,5	script	Prenetan#xmas	783,{
 		next;
 		mes "[Prenetan]";
 		mes "Finally got you, huh? You are cheating on me until now and even made me chase after you? I'll kill you boy!";
-		emotion e_an;
+		emotion ET_FRET;
 		next;
 		mes "[Umpoucoriotan]";
 		mes "Ooohh... my wife is too violent. Ohh...it hurts!";
-		emotion e_sob,0,"Umpoucoriotan#xmas";
+		emotion ET_CRY, getnpcid(0, "Umpoucoriotan#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Prenetan]";
@@ -918,11 +918,11 @@ xmas,129,115,5	script	Prenetan#xmas	783,{
 		next;
 		mes "[Prenetan]";
 		mes "Finally got you, huh? You are cheating on me until now and even made me chase after you? I'll kill you boy!";
-		emotion e_an;
+		emotion ET_FRET;
 		next;
 		mes "[Umpoucoriotan]";
 		mes "Ooohh... my wife is too violent. Ohh...it hurts!";
-		emotion e_sob,0,"Umpoucoriotan#xmas";
+		emotion ET_CRY, getnpcid(0, "Umpoucoriotan#xmas");
 		next;
 		mes "[Umpoucoriotan]";
 		mes "Wenathan, berzthan, Chabimathan";
@@ -985,20 +985,20 @@ xmas,138,174,5	script	Dark Lord#xmas	737,{
 	if (isbegin_quest(15056) == 0) {
 		mes "[Dark Lord]";
 		mes "Whahahahaha the world will turn into darkness soon and everyone will kneel down before me!!";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Succubus]";
 		mes "My master. All worlds will follow your will.";
-		emotion e_lv,0,"Succubus#xmas";
+		emotion ET_THROB, getnpcid(0, "Succubus#xmas");
 		close;
 	} else if (isbegin_quest(15056) == 1 && xmas2013_01 < 5) {
 		mes "[Dark Lord]";
 		mes "Whahahahaha the world will turn into darkness soon and everyone will kneel down before me!!";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Succubus]";
 		mes "My master. All worlds will follow your will.";
-		emotion e_lv,0,"Succubus#xmas";
+		emotion ET_THROB, getnpcid(0, "Succubus#xmas");
 		next;
 		mes "[Dark Lord]";
 		mes "You've been loyal to me even though I've been giving difficult orders. You deserve a reward. What do you want for now? I'll definitely make it for you. I can even give you more power!";

npc/events/easter_2010.txt

@@ -55,7 +55,7 @@ prontera,202,297,3	script	Rina#Easter	727,{
 		mes "several problems instead of me.";
 		next;
 		if (select("Let's help ^800080Rina^000000.:Just skip it.") == 2) {
-			emotion e_sigh;
+			emotion ET_OHNO;
 			mes "[Rina]";
 			mes "To help me,";
 			mes "I need a competent adventurer.";
@@ -63,7 +63,7 @@ prontera,202,297,3	script	Rina#Easter	727,{
 			mes "I hope you to introduce them to me later.";
 			close;
 		}
-		emotion e_awsm;
+		emotion ET_COOL;
 		mes "[Rina]";
 		mes "Are you really going to help me?";
 		mes "Thank you.";
@@ -90,7 +90,7 @@ prontera,202,297,3	script	Rina#Easter	727,{
 		mes "^800080Oath-taking ceremony^000000 is done enough now.";
 		mes "Isn't that so simple?";
 		next;
-		emotion e_dum;
+		emotion ET_HUM;
 		mes "[Rina]";
 		mes "Okay, from no on,";
 		mes "you need to go on ^006400a real adventure";
@@ -171,7 +171,7 @@ prontera,202,297,3	script	Rina#Easter	727,{
 			mes "you cannot feel the music.";
 			mes "What should we do now...";
 			close2;
-			emotion e_sob;
+			emotion ET_CRY;
 			end;
 		}
 		mes "[Rina]";
@@ -215,12 +215,12 @@ prontera,202,297,3	script	Rina#Easter	727,{
 		mes "It must be tough";
 		mes "but I hope you good luck.";
 		close2;
-		emotion e_sigh;
+		emotion ET_OHNO;
 		end;
 	} else {
 		set .@quest3, checkquest(9123);
 		if (.@quest3 == 0 || .@quest3 == 1) {
-			emotion e_kis;
+			emotion ET_CHUP;
 			mes "[Rina]";
 			mes "You're back~!";
 			mes "My curse has been released.";
@@ -336,7 +336,7 @@ rachel,36,132,4	script	#Hiddne04Easter	844,{
 prontera,204,297,3	script	Rina's Little Friend	463,{
 	disable_items;
 	if (checkquest(9117) == -1) {
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		mes "[Rina's Little Friend]";
 		mes ".......";
 		mes " ";
@@ -344,7 +344,7 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 		close;
 	}
 	if (checkquest(9123) == 2) {
-		emotion e_meh;
+		emotion ET_MERONG;
 		mes "[Rina's Little Friend]";
 		mes "Hi.";
 		mes "I guess you're the trustworthy friend.";
@@ -402,7 +402,7 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 				else
 					getitem 9023,1; //Deviruchi_Egg
 				close2;
-				emotion e_yawn;
+				emotion ET_SLEEPY;
 				end;
 			} else if (.@nPercentage <= 60) {
 				if (.@nPercentage >= 42 && .@nPercentage <= 45)
@@ -414,7 +414,7 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 				mes "I need to take some rest.";
 				mes "Good bye~!";
 				close2;
-				emotion e_yawn;
+				emotion ET_SLEEPY;
 				end;
 			} else if (.@nPercentage <= 85) {
 				if (.@nPercentage >= 61 && .@nPercentage <= 75) {
@@ -429,7 +429,7 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 				mes "I didn't mean to do it,";
 				mes "but I'm sorry...";
 				mes "I hope to see you again, my friend.";
-				emotion e_dum;
+				emotion ET_HUM;
 				close;
 			} else {
 				getitem 12093,2; //Dex_Dish08
@@ -439,7 +439,7 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 				mes "Looks delicious.";
 				mes "Then, good bye~!";
 				close2;
-				emotion e_rice;
+				emotion ET_HUNGRY;
 				end;
 			}
 		case 2:
@@ -449,7 +449,7 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 			mes "pretending to see me?";
 			mes "It's funny... haha~";
 			close2;
-			emotion e_gg;
+			emotion ET_KIK;
 			end;
 		case 3:
 			playbgm "23.mp3"; // Travel
@@ -504,11 +504,11 @@ prontera,204,297,3	script	Rina's Little Friend	463,{
 			mes "I'll be waiting for you.";
 			close2;
 			playbgm "08.mp3"; // Theme of Prontera
-			emotion e_gg;
+			emotion ET_KIK;
 			end;
 		}
 	}
-	emotion e_meh;
+	emotion ET_MERONG;
 	mes "[Rina's Little Friend]";
 	mes "Ahem!";
 	mes "Why? Are you surprised to see me speaking?";
@@ -549,7 +549,7 @@ prontera,116,82,5	script	Traveler#01Easter	85,{
 	mes "who were standing";
 	mes "near the ^8B4513Cathedral^000000.";
 	next;
-	emotion e_lv;
+	emotion ET_THROB;
 	mes "[Traveler]";
 	mes "That adventurer seemed pretty.";
 	mes "But...";
@@ -584,7 +584,7 @@ OnInit:
 	initnpctimer;
 	end;
 OnTimer5000:
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	stopnpctimer;
 	initnpctimer;
 	end;
@@ -613,7 +613,7 @@ OnInit:
 	initnpctimer;
 	end;
 OnTimer5000:
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	stopnpctimer;
 	initnpctimer;
 	end;

npc/events/event_skill_reset.txt

@@ -95,7 +95,7 @@ L_Reset:
 		mes @npcname$;
 		mes "It seems that you don't have enough money.";
 		mes "In addition we wait for the opportunity.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 	set Zeny, Zeny-@zeny;
@@ -103,7 +103,7 @@ L_Reset:
 	resetskill;
 	mes @npcname$;
 	mes "Thank you.";
-	emotion e_thx;
+	emotion ET_THANKS;
 //	logmes "SKILL RESET EVENT";
 	close;
 }

npc/events/gdevent_aru.txt

@@ -173,7 +173,7 @@ arug_dun01,199,195,5	script	Dwarf#aru_gd	826,{
 			case 2:
 				set $@gdeventv_a1,0;
 				set $@gdevents_a$,"";
-				emotion e_sob;
+				emotion ET_CRY;
 				mes "[Dwarf]";
 				mes "Ahhh...";
 				close;
@@ -306,7 +306,7 @@ arug_dun01,199,195,5	script	Dwarf#aru_gd	826,{
 				case 2:
 					set $@gdeventv_a1,0;
 					set $@gdevents_a$,"";
-					emotion e_sob;
+					emotion ET_CRY;
 					mes "[Dwarf]";
 					mes "Ah....";
 					close;
@@ -450,7 +450,7 @@ arug_dun01,199,195,5	script	Dwarf#aru_gd	826,{
 				case 2:
 					set $@gdeventv_a1,0;
 					set $@gdevents_a$,"";
-					emotion e_sob;
+					emotion ET_CRY;
 					mes "[Dwarf]";
 					mes "Ah....";
 					close;
@@ -539,22 +539,22 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 					mes "Let me see...";
 					mapannounce "arug_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
 					next;
-					emotion e_dots;
+					emotion ET_THINK;
 					mes "[Pierrot Pier]";
 					mes "Hm...";
 					mapannounce "arug_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
 					next;
-					emotion e_dots;
+					emotion ET_THINK;
 					mes "[Pierrot Pier]";
 					mes "Okay, I see...";
 					mapannounce "arug_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
 					next;
-					emotion e_dots;
+					emotion ET_THINK;
 					mes "[Pierrot Pier]";
 					mes "Indeed...";
 					mapannounce "arug_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
 					next;
-					emotion e_bzz;
+					emotion ET_STARE;
 					mes "[Pierrot Pier]";
 					mes "Verification completed!";
 					mapannounce "arug_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -570,12 +570,12 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				mes "^3131FF<You're someone who can only think about nonsense everyday, you have no focus at all.>^000000";
 				mapannounce "arug_que01", "Pierrot Pier: <You're someone who can only think about nonsense everyday, you have no focus at all.>",bc_map,"0x99CC00";
 				next;
-				emotion e_ho;
+				emotion ET_DELIGHT;
 				mes "[Pierrot Pier]";
 				mes "Hm? You don't think so?";
 				mapannounce "arug_que01", "Pierrot Pier: Hm? You don't think so?",bc_map,"0x99CC00";
 				next;
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Pierrot Pier]";
 				mes "Haha, I'm just kidding. Beep beep.";
 				mes "Ah, you are the one my master speaks of.";
@@ -628,7 +628,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				case 2:
 					break;
 				case 3:
-					emotion e_sob;
+					emotion ET_CRY;
 					mes "[Pierrot Pier]";
 					mes "Oh, you don't want to play?";
 					close;
@@ -878,22 +878,22 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				mes "Let me see...";
 				mapannounce "arug_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
 				next;
-				emotion e_dots;
+				emotion ET_THINK;
 				mes "[Pierrot Pier]";
 				mes "Hm...";
 				mapannounce "arug_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
 				next;
-				emotion e_dots;
+				emotion ET_THINK;
 				mes "[Pierrot Pier]";
 				mes "Okay, I see...";
 				mapannounce "arug_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
 				next;
-				emotion e_dots;
+				emotion ET_THINK;
 				mes "[Pierrot Pier]";
 				mes "Indeed...";
 				mapannounce "arug_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
 				next;
-				emotion e_bzz;
+				emotion ET_STARE;
 				mes "[Pierrot Pier]";
 				mes "Verification completed!";
 				mapannounce "arug_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -905,11 +905,11 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 				mes "When is that person coming? I am very bored~!";
 				close;
 			}
-			emotion e_heh;
+			emotion ET_SMILE;
 			mes "[Pierrot Pier]";
 			mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
 			next;
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			mes "[Pierrot Pier]";
 			mes "Hm? You don't think so?";
 			next;

npc/events/gdevent_sch.txt

@@ -173,7 +173,7 @@ schg_dun01,194,148,5	script	Dwarf#sch_gd	826,{
 			case 2:
 				set $@gdeventv_s1,0;
 				set $@gdevents_s$,"";
-				emotion e_sob;
+				emotion ET_CRY;
 				mes "[Dwarf]";
 				mes "Ahhh...";
 				close;
@@ -306,7 +306,7 @@ schg_dun01,194,148,5	script	Dwarf#sch_gd	826,{
 				case 2:
 					set $@gdeventv_s1,0;
 					set $@gdevents_s$,"";
-					emotion e_sob;
+					emotion ET_CRY;
 					mes "[Dwarf]";
 					mes "Ah....";
 					close;
@@ -449,7 +449,7 @@ schg_dun01,194,148,5	script	Dwarf#sch_gd	826,{
 				case 2:
 					set $@gdeventv_s1,0;
 					set $@gdevents_s$,"";
-					emotion e_sob;
+					emotion ET_CRY;
 					mes "[Dwarf]";
 					mes "Ah....";
 					close;
@@ -538,22 +538,22 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 					mes "Let me see...";
 					mapannounce "schg_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
 					next;
-					emotion e_dots;
+					emotion ET_THINK;
 					mes "[Pierrot Pier]";
 					mes "Hm...";
 					mapannounce "schg_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
 					next;
-					emotion e_dots;
+					emotion ET_THINK;
 					mes "[Pierrot Pier]";
 					mes "Okay, I see...";
 					mapannounce "schg_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
 					next;
-					emotion e_dots;
+					emotion ET_THINK;
 					mes "[Pierrot Pier]";
 					mes "Indeed...";
 					mapannounce "schg_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
 					next;
-					emotion e_bzz;
+					emotion ET_STARE;
 					mes "[Pierrot Pier]";
 					mes "Verification completed!";
 					mapannounce "schg_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -569,12 +569,12 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				mes "^3131FF<You're someone who can only think about nonsense everyday, you have no focus at all.>^000000";
 				mapannounce "schg_que01", "Pierrot Pier: <You're someone who can only think about nonsense everyday, you have no focus at all.>",bc_map,"0x99CC00";
 				next;
-				emotion e_ho;
+				emotion ET_DELIGHT;
 				mes "[Pierrot Pier]";
 				mes "Hm? You don't think so?";
 				mapannounce "schg_que01", "Pierrot Pier: Hm? You don't think so?",bc_map,"0x99CC00";
 				next;
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Pierrot Pier]";
 				mes "Haha, I'm just kidding. Beep beep.";
 				mes "Ah, you are the one my master speaks of.";
@@ -627,7 +627,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				case 2:
 					break;
 				case 3:
-					emotion e_sob;
+					emotion ET_CRY;
 					mes "[Pierrot Pier]";
 					mes "Oh, you don't want to play?";
 					close;
@@ -877,22 +877,22 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				mes "Let me see...";
 				mapannounce "schg_que01", "Pierrot Pier: Let me see...",bc_map,"0x99CC00";
 				next;
-				emotion e_dots;
+				emotion ET_THINK;
 				mes "[Pierrot Pier]";
 				mes "Hm...";
 				mapannounce "schg_que01", "Pierrot Pier: Hm...",bc_map,"0x99CC00";
 				next;
-				emotion e_dots;
+				emotion ET_THINK;
 				mes "[Pierrot Pier]";
 				mes "Okay, I see...";
 				mapannounce "schg_que01", "Pierrot Pier: Okay, I see...",bc_map,"0x99CC00";
 				next;
-				emotion e_dots;
+				emotion ET_THINK;
 				mes "[Pierrot Pier]";
 				mes "Indeed...";
 				mapannounce "schg_que01", "Pierrot Pier: Indeed...",bc_map,"0x99CC00";
 				next;
-				emotion e_bzz;
+				emotion ET_STARE;
 				mes "[Pierrot Pier]";
 				mes "Verification completed!";
 				mapannounce "schg_que01", "Pierrot Pier: Verification completed!",bc_map,"0x99CC00";
@@ -904,11 +904,11 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 				mes "When is that person coming? I am very bored~!";
 				close;
 			}
-			emotion e_heh;
+			emotion ET_SMILE;
 			mes "[Pierrot Pier]";
 			mes "^3131FF<Although you're a weirdo, you seem to be very dedicated>^000000. Beep beep.";
 			next;
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			mes "[Pierrot Pier]";
 			mes "Hm? You don't think so?";
 			next;

npc/events/halloween_2006.txt

@@ -654,7 +654,7 @@ nif_fild01,167,113,3	script	Masta's chicken#06_hw01	800,{
 		next;
 		input .@inputstr$;
 		if( .@inputstr$ == "Return" ) {
-			emotion e_omg;
+			emotion ET_HUK;
 			specialeffect EF_TELEPORTATION;
 			mes "The magic spell has been casted.";
 			set halloween, 103;
@@ -1058,7 +1058,7 @@ prontera,155,285,3	script	Familiar#06_hw01::HWFamiDup	799,{
 				mes "You don't have the ticket!";
 				mes "I'll suck up all your blood, you liar!";
 				percentheal -20,0;
-				emotion e_omg,1;
+				emotion ET_HUK, playerattached();
 				close;
 			}
 		}

npc/events/idul_fitri.txt

@@ -62,12 +62,12 @@ prontera,146,92,3	script	Cellerb	58,{
 		next;
 		mes "[Staff Idul Fitri]";
 		mes "We appreciate your participation in this special event.";
-		emotion e_thx;
+		emotion ET_THANKS;
 		close;
 	case 2:
 		mes "[Staff Idul Fitri]";
 		mes "Oh well, maybe you will participate in tommorow's quest.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		close;
 	}
 }

npc/events/nguild/nguild_warper.txt

@@ -51,15 +51,15 @@ prontera,146,163,6	script	Novice Castles	729,{
 	          ) {
 		mes "I see... your guild has Emergency Call mastered.";
 		mes "You cannot enter the Novice Castle area.";
-		emotion e_hmm;
-		emotion e_wah,1;
+		emotion ET_SCRATCH;
+		emotion ET_KEK, playerattached();
 	} else {
 		mes "I'm a new usher of Novice Castles.";
 		next;
 		mes "[Cita]";
 		if ((eaclass()&(EAJL_2|EAJL_UPPER)) || BaseLevel>=60) {
 			mes "I'm sorry, you can't enter the sacred Novice Castles place.";
-			emotion e_sry;
+			emotion ET_SORRY;
 		} else if (select("Warp me to Novice Castles","Cancel") == 1) {
 			// remove several unallowed buffs
 			sc_end SC_ASSUMPTIO;

npc/instances/SealedShrine.txt

@@ -1095,11 +1095,11 @@ OnTouch_:
 	specialeffect EF_LEXDIVINA;
 	disablenpc instance_npcname(strnpcinfo(0));
 	set .@map$, instance_mapname("2@cata");
-	if (strnpcinfo(2) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
-	else if (strnpcinfo(2) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
-	else if (strnpcinfo(2) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
-	else if (strnpcinfo(2) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
-	else if (strnpcinfo(2) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,e_hlp,0;
+	if (strnpcinfo(2) == "0") areamobuseskill .@map$,79,81,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+	else if (strnpcinfo(2) == "2") areamobuseskill .@map$,123,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+	else if (strnpcinfo(2) == "4") areamobuseskill .@map$,123,22,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+	else if (strnpcinfo(2) == "8") areamobuseskill .@map$,35,21,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
+	else if (strnpcinfo(2) == "10") areamobuseskill .@map$,35,109,10,1929,"NPC_INVINCIBLEOFF",1,0,0,ET_HELP,0;
 	percentheal -50,0;
 	sc_start Eff_Stone,20000,0;
 	setquest 3041;

npc/jobs/2-1/assassin.txt

@@ -297,7 +297,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
 	mes "[Assassin 'Khai']";
 	mes "Umm?!";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	next;
 	mes "[Assassin 'Khai']";
 	mes "Come closer. I prefer to talk to people face to face. It really irritates me if I have to raise my voice, just so you can hear me.";

npc/jobs/2-1/blacksmith.txt

@@ -1076,7 +1076,7 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 		mes "Tell him I'm satisfied with the quality of the workmanship.";
 		next;
 		getitem 1073,1; //Merchant_Voucher_1
-		emotion e_lv;
+		emotion ET_THROB;
 		mes "[Wickebine]";
 		mes "Here's the receipt.";
 		mes "I think you did";
@@ -1087,7 +1087,7 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 		end;
 	}
 	else if (BSMITH_Q == 14) {
-		emotion e_lv;
+		emotion ET_THROB;
 		cutin "Job_Black_hucke02",2;
 		mes "[Wickebine]";
 		mes "Thanks for the delivery.";
@@ -1113,7 +1113,7 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 		mes "[Wickebine]";
 		mes "How long does it take for something to ship from Geschupenschte? Usually, the Geffen Blacksmith Guild is pretty prompt...";
 		next;
-		emotion e_lv;
+		emotion ET_THROB;
 		mes "[Wickebine]";
 		mes "Ooohh...";
 		mes "This is very";
@@ -1375,7 +1375,7 @@ hugel,168,183,1	script	Bismarc#BLS	118,{
 
 ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 	if (BSMITH_Q == 16) {
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		mes "[Mitehmaeeuh]";
 		mes "Oh...so you're the one who wants to be a blacksmith?";
 		mes "Nice, heh heh.";
@@ -1563,7 +1563,7 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 		close;
 	}
 	else if (BSMITH_Q == 17) {
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		mes "[Mitehmaeeuh]";
 		mes "Yeap, you just passed the Blacksmith job test~";
 		next;
@@ -1578,7 +1578,7 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 		close;
 	}
 	else {
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		mes "[Mitehmaeeuh]";
 		mes "I had to deal with the heat when I was in Morroc,";
 		mes "and now I have to deal with the smog in this Einbroch!";

npc/jobs/2-2/dancer.txt

@@ -1328,14 +1328,14 @@ job_duncer,63,110,4	script	Backdancer#1	724,{
 	end;
 
 OnSmile:
-	emotion e_no1;
+	emotion ET_BEST;
 	donpcevent "Backdancer#2::OnSmile";
 	donpcevent "Backdancer#3::OnSmile";
 	donpcevent "Backdancer#4::OnSmile";
 	end;
 
 OnOmg:
-	emotion e_omg;
+	emotion ET_HUK;
 	donpcevent "Backdancer#2::OnOmg";
 	donpcevent "Backdancer#3::OnOmg";
 	donpcevent "Backdancer#4::OnOmg";
@@ -1346,11 +1346,11 @@ job_duncer,66,113,4	script	Backdancer#2	724,{
 	end;
 
 OnSmile:
-	emotion e_no1;
+	emotion ET_BEST;
 	end;
 
 OnOmg:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -1358,11 +1358,11 @@ job_duncer,72,113,4	script	Backdancer#3	724,{
 	end;
 
 OnSmile:
-	emotion e_no1;
+	emotion ET_BEST;
 	end;
 
 OnOmg:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 
@@ -1370,11 +1370,11 @@ job_duncer,75,110,4	script	Backdancer#4	724,{
 	end;
 
 OnSmile:
-	emotion e_no1;
+	emotion ET_BEST;
 	end;
 
 OnOmg:
-	emotion e_omg;
+	emotion ET_HUK;
 	end;
 }
 

npc/jobs/2-2e/SoulLinker.txt

@@ -91,7 +91,7 @@ morocc_in,174,30,6	script	Kid#link1	716,{
 				mes "in you! I might look";
 				mes "like a kid, but I'm over";
 				mes "three hundred years old!";
-				emotion e_pif;
+				emotion ET_HNG;
 				next;
 				mes "[Kid]";
 				mes "Now listen...";
@@ -100,7 +100,7 @@ morocc_in,174,30,6	script	Kid#link1	716,{
 				mes "It's a respectable art, but";
 				mes "I've got a proposition for";
 				mes "you if you want to hear it.";
-				emotion e_heh;
+				emotion ET_SMILE;
 				next;
 				mes "[Kid]";
 				mes "I'm looking at you, and I can";
@@ -229,7 +229,7 @@ morocc_in,174,30,6	script	Kid#link1	716,{
 					mes "go back and bring";
 					mes "everything that I ask";
 					mes "for this time, okay?";
-					emotion e_pif;
+					emotion ET_HNG;
 					next;
 					mes "[Kid]";
 					mes "I know I just told you";

npc/jobs/novice/supernovice.txt

@@ -117,7 +117,7 @@ aldeba_in,223,167,3	script	Tzerero#sn	709,{
 		mes ".....";
 		mes ".......";
 		mes ".........";
-		emotion e_dots;
+		emotion ET_THINK;
 		next;
 		mes "[Tzerero]";
 		mes "I see that the light";

npc/kafras/functions_kafras.txt

@@ -504,7 +504,7 @@ function	script	F_SetKafCode	{
 				set @code,callfunc("F_EntKafCode");
 				if(!@code || @code != #kafra_code) {
 					mes "Wrong password. You can't set a new password.";
-					emotion e_hmm;
+					emotion ET_SCRATCH;
 					break;
 				}
 				next;
@@ -516,14 +516,14 @@ function	script	F_SetKafCode	{
 				set @code,callfunc("F_EntKafCode");
 				if(!@code) {
 					mes "The password hasn't been removed.";
-					emotion e_hmm;
+					emotion ET_SCRATCH;
 					break;
 				}
 				next;
 				mes .@npc_name$;
 				if(Zeny < 1000) {
 					mes "You don't have enough zeny.";
-					emotion e_cash;
+					emotion ET_MONEY;
 					break;
 				}
 				set Zeny,Zeny-1000;
@@ -531,11 +531,11 @@ function	script	F_SetKafCode	{
 					set #kafra_code,0;
 					mes "You've successfully cleared your storage password.";
 					mes "Thank you for using "+.@comp_name$+".";
-					emotion e_thx;
+					emotion ET_THANKS;
 				} else {
 					mes "Wrong password. We won't return your 1000z.";
 					mes "Please, next time enter correct password.";
-					emotion e_sry;
+					emotion ET_SORRY;
 				}
 				break;
 			case 3:
@@ -560,21 +560,21 @@ S_SET:
 	set @code,callfunc("F_EntKafCode");
 	if(!@code) {
 		mes "The password hasn't been changed.";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		return;
 	}
 	next;
 	mes .@npc_name$;
 	if(Zeny < 5000) {
 		mes "You don't have enough zeny.";
-		emotion e_cash;
+		emotion ET_MONEY;
 		return;
 	}
 	set Zeny,Zeny-5000;
 	set #kafra_code,@code;
 	mes "You've protected your storage with a secret password.";
 	mes "Thank you for using "+.@comp_name$+".";
-	emotion e_thx;
+	emotion ET_THANKS;
 	return;
 }
 

npc/merchants/advanced_refiner.txt

@@ -67,7 +67,7 @@ payon,157,146,6	script	Suhnbi#cash	85,{
 	if (getequippercentrefinery(.@part, true) > rand(100)) {
 		successrefitem .@part;
 		next;
-		emotion e_no1;
+		emotion ET_BEST;
 		mes "[Suhnbi]";
 		mes "There you go! It's done.";
 		mes "It's been a while since I've made such a fine "+((getequipweaponlv(.@part))?"weapon":"armor")+". You must be happy because it has become stronger!";
@@ -75,7 +75,7 @@ payon,157,146,6	script	Suhnbi#cash	85,{
 	}
 	failedrefitem .@part;
 	next;
-	emotion (!rand(5))?e_cash:e_omg;
+	emotion (!rand(5))?ET_MONEY:ET_HUK;
 	mes "[Suhnbi]";
 	mes "Uuuuuuuuuummmmmph!!!";
 	next;

npc/merchants/hair_style.txt

@@ -753,7 +753,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 					mes "you're an adventurer, I know";
 					mes "you can be more daring than";
 					mes "that! Be fashionably adventurous, you fashionable adventurer~";
-					emotion e_lv,"Hair Dresser#i";
+					emotion ET_THROB;
 					close;
 				}
 			}
@@ -805,7 +805,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 					mes "you're an adventurer, I know";
 					mes "you can be more daring than";
 					mes "that! Be fashionably adventurous, you fashionable adventurer~";
-					emotion e_lv,"Hair Dresser#li";
+					emotion ET_THROB;
 					close;
 				}
 			}
@@ -846,7 +846,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 					mes "you're an adventurer, I know";
 					mes "you can be more daring than";
 					mes "that! Be fashionably adventurous, you fashionable adventurer~";
-					emotion e_lv,"Hair Dresser#li";
+					emotion ET_THROB;
 					close;
 				}
 			}
@@ -886,7 +886,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 					mes "you're an adventurer, I know";
 					mes "you can be more daring than";
 					mes "that! Be fashionably adventurous, you fashionable adventurer~";
-					emotion e_lv,"Hair Dresser#li";
+					emotion ET_THROB;
 					close;
 				}
 			}
@@ -1068,7 +1068,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 					mes "how graceful and elegant you";
 					mes "look! Absolutely gorgeous!";
 				}
-				emotion e_kis,"Hair Dresser#li";
+				emotion ET_CHUP;
 				next;
 				mes "[Prince Shammi]";
 				mes "You love your new";
@@ -1076,7 +1076,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 				mes "free to come back anytime.";
 				mes "I'll make you the best looking";
 				mes "person in the entire world!";
-				emotion e_no1,"Hair Dresser#li";
+				emotion ET_BEST;
 				close;
 			case 2:
 				mes "[Prince Shammi]";
@@ -1104,7 +1104,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 	mes "Wah?! Sweet Jiminy,";
 	mes "you freaked me out!";
 	mes "What are you doing?!";
-	emotion e_omg,"Assistant Beautician#li";
+	emotion ET_HUK;
 	next;
 	mes "[Assistant Beautician]";
 	mes "Oh! Um, a customer!";
@@ -1273,7 +1273,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 				mes "sweetheart for helping";
 				mes "me! Thank you for using";
 				mes "my service and come again~";
-				emotion e_kis,"Assistant Beautician#li";
+				emotion ET_CHUP;
 				close;
 			case 2:
 				mes "[Assistant Beautician]";

npc/merchants/quivers.txt

@@ -42,7 +42,7 @@ payon_in01,5,134,5	script	Inventor Jaax	89,{
 	mes "created something";
 	mes "truly extraordinary. I call them... ^663300Magic Quivers^000000 !! This will be remembered in history as an";
 	mes "arrow revolution!";
-	emotion e_no1;
+	emotion ET_BEST;
 	next;
 	mes "[Inventor Jaax]";
 	mes "I've studied magic and quivers for years, working night and day until I finally figured how to condense arrows with magic! With magic quivers, you'll be carrying more arrows, but with less weight!";

npc/merchants/refine.txt

@@ -589,7 +589,7 @@ function	script	refinemain	{
 		mes "You're not wearing";
 		mes "anything there that";
 		mes "I can refine.";
-		emotion e_an;
+		emotion ET_FRET;
 		close;
 	}
 	//Check if the item is refinable...
@@ -690,7 +690,7 @@ function	script	refinemain	{
 		if (callfunc("F_IsEquipIDHack", .@part, .@refineitemid) ||
 		    callfunc("F_IsEquipRefineHack", .@part, .@refinerycnt)) {
 			mes "["+ .@npc_name$ +"]";
-			emotion e_an;
+			emotion ET_FRET;
 			mes "Wait a second...";
 			mes "Do you think I'm stupid?!";
 			mes "You switched the item while I wasn't looking! Get out of here!";
@@ -700,7 +700,7 @@ function	script	refinemain	{
 		if(getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
 			mes "["+ .@npc_name$ +"]";
-			emotion (!rand(5))?e_cash:e_omg;
+			emotion (!rand(5))?ET_MONEY:ET_HUK;
 			.@lose = rand(1,3);
 			if (.@lose == 1) {
 				mes "OH! MY GOD!";
@@ -721,7 +721,7 @@ function	script	refinemain	{
 		}
 		mes "["+getarg(0)+"]";
 		successrefitem .@part;
-		emotion e_heh;
+		emotion ET_SMILE;
 		.@win = rand(1,3);
 		if (.@win == 1) {
 			mes "Perfect!";
@@ -818,7 +818,7 @@ function	script	refinemain	{
 		mes "Clang, clang!!!";
 		if(.@menu2 == 2 && getequippercentrefinery(.@part) <= rand(100)) {
 			failedrefitem .@part;
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "["+ .@npc_name$ +"]";
 			mes "WAHHHH!!! I'm so sorry... I warned you this could happen...";
 			.@refinecnt = .@refinecnt - 1;
@@ -830,7 +830,7 @@ function	script	refinemain	{
 			close;
 		}
 		successrefitem .@part;
-		emotion e_no1;
+		emotion ET_BEST;
 		.@refinecnt = .@refinecnt - 1;
 		next;
 	}

npc/other/acolyte_warp.txt

@@ -29,7 +29,7 @@ prontera,98,121,4	script	Acolyte#Prtclear	90,{
 
 	mes "[Keiki]";
 	mes "I am the one and only Acolyte that has attained the Level 10 Warp Portal skill!";
-	emotion e_dots,1;
+	emotion ET_THINK, playerattached();
 	next;
 	mes "[Keiki]";
 	mes "That's right! And...";
@@ -97,7 +97,7 @@ yuno,142,184,6	script	Acolyte#Junoclear	90,{
 
 	mes "[Isalei]";
 	mes "Though I have not mastered up to the level that she has, I have been able to attain Level 5.";
-	emotion e_dots,1;
+	emotion ET_THINK, playerattached();
 	next;
 	mes "[Isalei]";
 	mes "Maybe one day I can level up my skills enough so that I can use Warp portal to more saved locations.";

npc/other/arena/arena_aco.txt

@@ -1096,7 +1096,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 	set .@record_minaco, ((.@record_timeaco % 3600) / 60);
 	set .@record_secaco, .@record_timeaco % 60;
 	if ((.@record_timeaco < 0 ) || (.@record_houraco < 0) || (.@record_minaco < 0 ) || (.@record_secaco < 0)) {
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Staff]";
 		mes "How did you...?";
 		mes "According to these re-";
@@ -1122,7 +1122,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 		percentheal 100,100;
 		next;
 		mes "[Staff]";
-		emotion e_korea;
+		emotion ET_FLAG;
 		mes "Thank you.";
 		mes "I hope you enjoy";
 		mes "your time in the Arena~";
@@ -1178,7 +1178,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 		mes "of ^3131FF"+.@topbunaco+"^000000 minutes, ^3131FF"+.@topchoaco+"^000000 seconds, of the Acolyte Class Time Force Battle.";
 		next;
 		if ((.@acotop_t < 0) || (.@topbunaco < 0 ) || (.@topchoaco < 0)) {
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "[Staff]";
 			mes "Wait a second...";
 			mes "Your time is better";
@@ -1186,7 +1186,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			mes "It's time I made a little";
 			mes "correction to the records.";
 			next;
-			emotion e_no1;
+			emotion ET_BEST;
 			mes "[Staff]";
 			mes "Wow! A new record!";
 			mes "Excellent!";
@@ -1344,7 +1344,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	67,{
 			end;
 		}
 		else {
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "[Staff]";
 			mes "Wow! A new record!";
 			mes "This is awsome!";

npc/other/arena/arena_lvl50.txt

@@ -872,7 +872,7 @@ prt_are_in,25,188,3	script	Staff#50-2	67,{
 		donpcevent "Lv50 Waiting Room::OnStart";
 		end;
 	} else {
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
 		mes "What a great job!";

npc/other/arena/arena_lvl60.txt

@@ -882,7 +882,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
 	} else {
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
 		mes "What a great job!";

npc/other/arena/arena_lvl70.txt

@@ -847,7 +847,7 @@ prt_are_in,25,84,3	script	Staff#70-2	67,{
 		donpcevent "Lv70 Waiting Room::OnStart";
 		end;
 	} else {
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
 		mes "What a great job!";

npc/other/arena/arena_lvl80.txt

@@ -828,7 +828,7 @@ prt_are_in,77,187,3	script	Staff#80-2	67,{
 		donpcevent "Lv80 Waiting Room::OnStart";
 		end;
 	} else {
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
 		mes "What a great job!";

npc/other/arena/arena_party.txt

@@ -43,7 +43,7 @@ OnStart:
 prt_are_in,76,87,3	script	Helper#party	 67,4,4,{
 	if($arn_partywait == 0) {
 		set $arn_partywait,1;
-		emotion e_gasp,0;
+		emotion ET_SURPRISE;
 		mes "[Helper Iriff]";
 		mes "Good day, challengers!";
 		mes "You are in the party arena waiting room.";
@@ -1044,7 +1044,7 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 		warp "arena_room",100,75;
 		end;
 	} else {
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Staff]";
 		mes "Wow! You have renewed the record!";
 		mes "What a great job!";

npc/other/arena/arena_room.txt

@@ -260,7 +260,7 @@ arena_room,147,49,3	script	Helper Epin	727,{
 	mes "I am a helper of Lv 80 arena stage and my name is Epin.";
 	mes "I like reading and I am 19 years old...huh...? Don't you want to hear about me...?";
 	next;
-	emotion e_cry,0;
+	emotion ET_CRY;
 	mes "[Epin]";
 	mes "Okay...";
 	next;
@@ -368,7 +368,7 @@ arena_room,158,93,5	script	Helper Lunic	828,{
 }
 
 arena_room,158,82,1	script	Helper Lonik	828,{
-	emotion e_no1,0;
+	emotion ET_BEST;
 	mes "[Lonik]";
 	mes "Tah dah! Here I am!";
 	next;
@@ -379,14 +379,14 @@ arena_room,158,82,1	script	Helper Lonik	828,{
 	mes "My answer is...";
 	mes ".............";
 	if (getmapusers("force_1-2")) {
-		emotion e_oh,0;
+		emotion ET_O;
 		mes "Yes!";
 		mes "There is someone inside.";
 		next;
 		mes "[Lonik]";
 		mes "You'd better wait a little bit longer!";
 	} else {
-		emotion e_x,0;
+		emotion ET_X;
 		mes "No!";
 		mes "Go for it, good luck!";
 	}
@@ -739,22 +739,22 @@ OnInit:
 	end;
 
 OnHeart:
-	emotion e_lv,0;
+	emotion ET_THROB;
 	end;
 OnSci:
-	emotion e_scissors,0;
+	emotion ET_SCISSOR;
 	end;
 OnBest:
-	emotion e_no1,0;
+	emotion ET_BEST;
 	end;
 OnOmg:
-	emotion e_omg,0;
+	emotion ET_HUK;
 	end;
 OnKik:
-	emotion e_gg,0;
+	emotion ET_KIK;
 	end;
 OnKis:
-	emotion e_kis,0;
+	emotion ET_CHUP;
 	end;
 }
 prt_are_in,1,1,5	duplicate(#arena_1039)	#arena_6969	714

npc/other/comodo_gambling.txt

@@ -494,7 +494,7 @@ mjolnir_02,85,362,3	script	Blacksmith Miner	4_F_JOB_BLACKSMITH,{
 	mes "thousands of Diamonds,";
 	mes "all of them mine!";
 	mes "I'm rich!";
-	emotion e_heh;
+	emotion ET_SMILE;
 	next;
 	switch(select("I want to buy some.:Congratulations.")){
 	case 1:

npc/other/marriage.txt

@@ -376,7 +376,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 			mes "process, both of you should";
 			mes "speak to the Bishop to begin";
 			mes "the wedding ceremony.";
-			emotion e_lv;
+			emotion ET_THROB;
 			next;
 			mes "[Marry Happy]";
 			if (Sex == SEX_FEMALE) {
@@ -425,47 +425,47 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 		donpcevent "Single Army#Payon::OnEnable";
 		donpcevent "Single Army#Amatsu::OnEnable";
 		donpcevent "Single Army#Gonryun::OnEnable";
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "[Single Army]";
 		mes "^CC9933You have to refine";
 		mes "items on your own to";
 		mes "make great equipment!^000000";
-		emotion e_rock,0,"Single Army#Prontera";
+		emotion ET_ROCK, getnpcid(0, "Single Army#Prontera");
 		next;
 		mes "[Single Army]";
 		mes "^330099It's a waste to";
 		mes "form parties in";
 		mes "dungeons! I can";
 		mes "make it on my own!^000000";
-		emotion e_rock,0,"Single Army#Geffen";
+		emotion ET_ROCK, getnpcid(0, "Single Army#Geffen");
 		next;
 		mes "[Single Army]";
 		mes "^666666Hell, I've trained";
 		mes "all by myself since";
 		mes "birth, all the way";
 		mes "to my job change!^000000";
-		emotion e_rock,0,"Single Army#Morocc";
+		emotion ET_ROCK, getnpcid(0, "Single Army#Morocc");
 		next;
 		mes "[Single Army]";
 		mes "^666600I CHOOSE to spend";
 		mes "Christmas alone...";
 		mes "playing Solitaire and";
 		mes "doing crossword puzzles!^000000";
-		emotion e_rock,0,"Single Army#Payon";
+		emotion ET_ROCK, getnpcid(0, "Single Army#Payon");
 		next;
 		mes "[Single Army]";
 		mes "^CC9966Women may break my";
 		mes "spirit, but they'll never";
 		mes "take... my FREEDOM!^000000";
-		emotion e_rock,0,"Single Army#Amatsu";
+		emotion ET_ROCK, getnpcid(0, "Single Army#Amatsu");
 		next;
 		mes "[Single Army]";
 		mes "^669900...We're the free! We're";
 		mes "the Invincible Single Army!^000000";
-		emotion e_rock,0,"Single Army#Gonryun";
+		emotion ET_ROCK, getnpcid(0, "Single Army#Gonryun");
 		close2;
 		cutin "wedding_marry01",255;
-		emotion e_swt;
+		emotion ET_SWEAT;
 		donpcevent "Single Army#Prontera::OnInit";
 		donpcevent "Single Army#Geffen::OnInit";
 		donpcevent "Single Army#Morocc::OnInit";
@@ -497,7 +497,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Prontera";
-	emotion e_go;
+	emotion ET_GO;
 	end;
 }
 
@@ -515,7 +515,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Geffen";
-	emotion e_go;
+	emotion ET_GO;
 	end;
 }
 
@@ -533,7 +533,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Morocc";
-	emotion e_go;
+	emotion ET_GO;
 	end;
 }
 
@@ -551,7 +551,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Payon";
-	emotion e_go;
+	emotion ET_GO;
 	end;
 }
 
@@ -568,7 +568,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Amatsu";
-	emotion e_go;
+	emotion ET_GO;
 	end;
 }
 
@@ -584,7 +584,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Gonryun";
-	emotion e_go;
+	emotion ET_GO;
 	end;
 }
 

npc/other/monster_race.txt

@@ -207,7 +207,7 @@ OnInit:
 
 -	script	Runner_main	-1,{
 OnEnable:
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	enablenpc strnpcinfo(0);
 	getmapxy(.@m$,.@x,.@y,UNITTYPE_NPC);
 	setarray .@mob[1], 1725,1726,1727,1728,1730,1729;
@@ -381,7 +381,7 @@ p_track01,67,45,5	script	Medal Distributor#single	845,{
 
 OnEnable:
 	enablenpc "Medal Distributor#single";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	initnpctimer;
 	end;
 
@@ -1352,7 +1352,7 @@ p_track02,73,22,1	script	Ticket Helper#2	899,{
 						mes "to win this race. Good luck!";
 						mes "I really hope that the odds";
 						mes "work out in your favor~";
-						emotion e_kis;
+						emotion ET_CHUP;
 						monster_race_2_1 = .@m1;
 						monster_race_2_2 = .@m;
 						getitem 7514,1; //Monster_Ticket
@@ -1700,13 +1700,13 @@ OnEnable:
 OnTouchNPC:
 	.@i = MN;
 	if (!$@mon_race_2_1) {
-		emotion e_lv;
+		emotion ET_THROB;
 		specialeffect EF_MVP;
 		mapannounce "p_track02","Monster "+.@i+" has reached the Finish Line!",bc_map,"0x66FFCC";
 		$@mon_race_2_1 = .@i;
 		donpcevent strnpcinfo(0)+"::OnDisable";
 	} else {
-		emotion e_lv;
+		emotion ET_THROB;
 		specialeffect EF_MVP;
 		mapannounce "p_track02","The race is over! Monster "+.@i+" has reached the Finish Line!",bc_map,"0x66FFCC";
 		$@mon_race_2_2 = .@i;
@@ -2223,7 +2223,7 @@ S_Reward:
 		mes "those medals, so if you";
 		mes "change your mind, please";
 		mes "come back as soon as you can.";
-		emotion e_sob;
+		emotion ET_CRY;
 		close;
 	}
 	mes "[Ei'felle]";
@@ -2250,8 +2250,8 @@ S_Reward:
 			mes "becoming what you want";
 			mes "to be! B-believe... with";
 			mes "all of your freakin' heart!";
-			emotion e_omg,1;
-			emotion e_omg;
+			emotion ET_HUK, playerattached();
+			emotion ET_HUK;
 			next;
 			mes "[Ei'felle]";
 			mes "*Phew* How's that?";
@@ -2310,8 +2310,8 @@ S_Reward:
 			mes "You've gotta see it, and";
 			mes "you've gotta feel it in your";
 			mes "freakin' heart and mind!";
-			emotion e_omg,1;
-			emotion e_omg;
+			emotion ET_HUK, playerattached();
+			emotion ET_HUK;
 			next;
 			mes "[Ei'felle]";
 			mes "Yeap, it doesn't matter";
@@ -2482,7 +2482,7 @@ S_Reward:
 					mes "medals with you. Make sure";
 					mes "that you offer me an amount of";
 					mes "medals that you actually have.";
-					emotion e_heh;
+					emotion ET_SMILE;
 					close;
 				} else {
 					mes "[Ei'felle]";
@@ -2808,7 +2808,7 @@ p_track02,32,45,5	script	Eccentric Scholar#double	755,{
 	mes "my calculations!";
 	mes "Now, where was I...?";
 	specialeffect EF_CLAYMORE;
-	emotion e_an;
+	emotion ET_FRET;
 	close;
 }
 
@@ -2820,7 +2820,7 @@ p_track02,69,31,1	script	Blacksmith Guildsman#dou	726,{
 		mes "I haven't won even once!";
 		mes "Oh, I must have the worst";
 		mes "luck in wagering history!";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[Blacksmith Guildsman]";
 		mes "I've been assigned by my";
@@ -2829,7 +2829,7 @@ p_track02,69,31,1	script	Blacksmith Guildsman#dou	726,{
 		mes "They're apparently made";
 		mes "with some rare metal, but...";
 		mes "It's too hard for me to win~!";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	} 
 	mes "[Blacksmith Guildsman]";
@@ -2838,7 +2838,7 @@ p_track02,69,31,1	script	Blacksmith Guildsman#dou	726,{
 	mes "medals! Otherwise, I'll";
 	mes "be too ashamed to return";
 	mes "home to Einbroch! F-faster!";
-	emotion e_korea;
+	emotion ET_FLAG;
 	close;
 }
 
@@ -2862,7 +2862,7 @@ p_track02,53,45,3	script	Valiant Knight#double	733,{
 	mes "You too...!";
 	mes "Always bet";
 	mes "on Deviruchi!";
-	emotion e_no1;
+	emotion ET_BEST;
 	close;
 }
 

npc/other/poring_war.txt

@@ -1677,11 +1677,11 @@ OnTouch:
 	next;
 	mes "[Porings]";
 	mes "Let's go! Let's fight! Let's win, win, win!!!";
-	emotion e_go,0,"Angeling Side Poring#wa1";
-	emotion e_go,0,"Angeling Side Poring#wa2";
-	emotion e_go,0,"Angeling Side Poring#wa3";
-	emotion e_go,0,"Angeling Side Poring#wa4";
-	emotion e_go,0,"Angeling Side Poring#wa5";
+	emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa1");
+	emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa2");
+	emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa3");
+	emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa4");
+	emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa5");
 	next;
 	if (wop_team == 1) {
 		mes "[Porings]";
@@ -1695,20 +1695,20 @@ OnTouch:
 		mes "Wait, YOU! Aren't you on the side of the Devilings?!";
 		mes "Get out now! Leave!!";
 		mes "Booooo~ Boo~ Boooo~";
-		emotion e_omg,0,"Angeling Side Poring#wa1";
-		emotion e_an,0,"Angeling Side Poring#wa2";
-		emotion e_omg,0,"Angeling Side Poring#wa3";
-		emotion e_an,0,"Angeling Side Poring#wa4";
-		emotion e_gasp,0,"Angeling Side Poring#wa5";
+		emotion ET_HUK, getnpcid(0, "Angeling Side Poring#wa1");
+		emotion ET_FRET, getnpcid(0, "Angeling Side Poring#wa2");
+		emotion ET_HUK, getnpcid(0, "Angeling Side Poring#wa3");
+		emotion ET_FRET, getnpcid(0, "Angeling Side Poring#wa4");
+		emotion ET_SURPRISE, getnpcid(0, "Angeling Side Poring#wa5");
 	}
 	else {
 		mes "[Porings]";
 		mes "Hey, human. How about fighting for us Porings on Angeling's side??!";
-		emotion e_hlp,0,"Angeling Side Poring#wa1";
-		emotion e_go,0,"Angeling Side Poring#wa2";
-		emotion e_hlp,0,"Angeling Side Poring#wa3";
-		emotion e_go,0,"Angeling Side Poring#wa4";
-		emotion e_go,0,"Angeling Side Poring#wa5";
+		emotion ET_HELP, getnpcid(0, "Angeling Side Poring#wa1");
+		emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa2");
+		emotion ET_HELP, getnpcid(0, "Angeling Side Poring#wa3");
+		emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa4");
+		emotion ET_GO, getnpcid(0, "Angeling Side Poring#wa5");
 	}
 	next;
 	mes "[Porings]";
@@ -1730,11 +1730,11 @@ OnTouch:
 	next;
 	mes "[Marins]";
 	mes "Let's go! Let's fight! Fight for Triumph!!!!";
-	emotion e_go,0,"Deviling Side Marin#wd1";
-	emotion e_go,0,"Deviling Side Marin#wd2";
-	emotion e_go,0,"Deviling Side Marin#wd3";
-	emotion e_go,0,"Deviling Side Marin#wd4";
-	emotion e_go,0,"Deviling Side Marin#wd5";
+	emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd1");
+	emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd2");
+	emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd3");
+	emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd4");
+	emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd5");
 	next;
 	if (wop_team == 2) {
 		mes "[Marins]";
@@ -1747,20 +1747,20 @@ OnTouch:
 		mes "Wait, YOU! Aren't you on the side of the Angelings?!";
 		mes "Get out now! Leave!!";
 		mes "Booooo~ Boo~ Boooo~";
-		emotion e_omg,0,"Deviling Side Marin#wd1";
-		emotion e_an,0,"Deviling Side Marin#wd2";
-		emotion e_omg,0,"Deviling Side Marin#wd3";
-		emotion e_an,0,"Deviling Side Marin#wd4";
-		emotion e_gasp,0,"Deviling Side Marin#wd5";
+		emotion ET_HUK, getnpcid(0, "Deviling Side Marin#wd1");
+		emotion ET_FRET, getnpcid(0, "Deviling Side Marin#wd2");
+		emotion ET_HUK, getnpcid(0, "Deviling Side Marin#wd3");
+		emotion ET_FRET, getnpcid(0, "Deviling Side Marin#wd4");
+		emotion ET_SURPRISE, getnpcid(0, "Deviling Side Marin#wd5");
 	}
 	else {
 		mes "[Marins]";
 		mes "Hey, human. Don't you wanna fight for Deviling, the noble of darkness? What do you say?!";
-		emotion e_hlp,0,"Deviling Side Marin#wd1";
-		emotion e_go,0,"Deviling Side Marin#wd2";
-		emotion e_hlp,0,"Deviling Side Marin#wd3";
-		emotion e_go,0,"Deviling Side Marin#wd4";
-		emotion e_go,0,"Deviling Side Marin#wd5";
+		emotion ET_HELP, getnpcid(0, "Deviling Side Marin#wd1");
+		emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd2");
+		emotion ET_HELP, getnpcid(0, "Deviling Side Marin#wd3");
+		emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd4");
+		emotion ET_GO, getnpcid(0, "Deviling Side Marin#wd5");
 	}
 	next;
 	mes "[Marins]";

npc/other/powernpc.txt

@@ -58,7 +58,7 @@ gonryun,180,118,4	script	Iron man#gnp	85,{
 		case 3:
 			mes "[Songmoodoo]";
 			mes "I guess not...";
-			emotion e_pif;
+			emotion ET_HNG;
 			break;
 		}
 	} else if (in_battle == 1) {
@@ -85,7 +85,7 @@ gonryun,180,118,4	script	Iron man#gnp	85,{
 		mes "Guess you're not strong enough!";
 		mes "I'll give you another chance.";
 		mes "See you again.";
-		emotion e_pif;
+		emotion ET_HNG;
 		set in_battle,1;
 	}
 	close;
@@ -96,7 +96,7 @@ L_Lifting:
 		set in_battle,1;
 		getitem 7049, getarg(0); // Stone
 		next;
-		emotion e_no1;
+		emotion ET_BEST;
 		mes "[Songmoodoo]";
 		mes "Wow~ Excellent~";
 		mes "I'll take you to someplace nice";

npc/other/turbo_track.txt

@@ -995,7 +995,7 @@ OnTouch_:
 		case 1:
 		case 9:
 			sc_start SC_CONFUSION,8000,0;
-			emotion e_swt2,1;
+			emotion ET_PROFUSELY_SWEAT, playerattached();
 			end;
 		case 2:
 			sc_start SC_STONE,4000,0;
@@ -1005,7 +1005,7 @@ OnTouch_:
 			end;
 		case 6:
 			sc_start SC_FREEZE,4000,0;
-			emotion e_swt2,1;
+			emotion ET_PROFUSELY_SWEAT, playerattached();
 			end;
 		case 8:
 			sc_start SC_STUN,4000,0;
@@ -1807,7 +1807,7 @@ turbo_n_1,232,14,0	duplicate(cos#tt_main)	#cos_n1_8	45,1,1
 
 turbo_e_16,179,55,0	script	TurboHint_1#tt_main	-1,1,1,{
 OnTouch_:
-	emotion e_what,1;
+	emotion ET_QUESTION, playerattached();
 	end;
 }
 turbo_e_16,179,55,0	duplicate(TurboHint_1#tt_main)	#e16Intersectiona	-1,1,1
@@ -1855,7 +1855,7 @@ turbo_n_1,208,56,0	duplicate(TurboHint_1#tt_main)	#n1Intersectionn	-1,1,1
 
 -	script	TurboHint_2#tt_main	-1,{
 OnTouch_:
-	emotion e_gasp,1;
+	emotion ET_SURPRISE, playerattached();
 	end;
 }
 turbo_e_16,178,63,0	duplicate(TurboHint_2#tt_main)	#e16CorrectPath1	-1,1,1
@@ -1888,9 +1888,9 @@ turbo_n_1,191,30,0	duplicate(TurboHint_2#tt_main)	#n1CorrectPath9	-1,1,1
 
 -	script	TurboHint_3#tt_main	-1,{
 OnTouch_:
-	emotion e_swt2,1;
+	emotion ET_PROFUSELY_SWEAT, playerattached();
 	if (rand(1,4) == 3)
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 	end;
 }
 turbo_e_16,187,55,0	duplicate(TurboHint_3#tt_main)	#e16NoWayOut1	-1,1,1
@@ -1908,7 +1908,7 @@ turbo_n_1,219,39,0	duplicate(TurboHint_3#tt_main)	#n1NoWayOut4	-1,1,1
 
 -	script	TurboHint_4#tt_main	-1,1,1,{
 OnTouch_:
-	emotion e_swt2,1;
+	emotion ET_PROFUSELY_SWEAT, playerattached();
 	end;
 }
 turbo_e_16,222,45,0	duplicate(TurboHint_4#tt_main)	#e16NoWayOut5	-1,1,1

npc/pre-re/guides/guides_niflheim.txt

@@ -68,7 +68,7 @@ niflheim,107,156,6	script	Roaming Man#nif	798,{
 			mes "special once I realized no";
 			mes "Potion can ease the pain I feel.";
 			mes "...I wish I was in prison.";
-			emotion e_wah;
+			emotion ET_KEK;
 			viewpoint 1,217,196,3,0xCE6300;
 			break;
 		case 3:
@@ -84,7 +84,7 @@ niflheim,107,156,6	script	Roaming Man#nif	798,{
 			mes "the monsters here will just";
 			mes "make them angrier. You may as";
 			mes "well let them eat you.";
-			emotion e_wah;
+			emotion ET_KEK;
 			viewpoint 1,216,171,4,0x55FF33;
 			break;
 		case 4:

npc/pre-re/jobs/novice/novice.txt

@@ -565,7 +565,7 @@ new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
 			warp "new_1-2",28,178;
 			end;
 		case 3:
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			close;
 		}
 	}
@@ -608,7 +608,7 @@ new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
 				end;
 			}
 		case 3:
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			close;
 		}
 	}
@@ -648,7 +648,7 @@ new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
 				end;
 			}
 		case 3:
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			close;
 		}
 	}
@@ -848,7 +848,7 @@ new_1-2,83,111,3	script	Skill Tutor#nv	753,{
 				warp "new_1-2",28,178;
 				end;
 			case 3:
-				emotion e_omg;
+				emotion ET_HUK;
 				close;
 			}
 		case 2:
@@ -859,7 +859,7 @@ new_1-2,83,111,3	script	Skill Tutor#nv	753,{
 			warp "new_1-2",28,178;
 			end;
 		case 3:
-			emotion e_omg;
+			emotion ET_HUK;
 			close;
 		}
 	}
@@ -882,7 +882,7 @@ new_1-2,83,111,3	script	Skill Tutor#nv	753,{
 			warp "new_1-2",28,178;
 			end;
 		case 3:
-			emotion e_omg;
+			emotion ET_HUK;
 			close;
 		}
 	}
@@ -905,7 +905,7 @@ new_1-2,83,111,3	script	Skill Tutor#nv	753,{
 			warp "new_1-2",28,178;
 			end;
 		case 3:
-			emotion e_omg;
+			emotion ET_HUK;
 			close;
 		}
 	}
@@ -1926,7 +1926,7 @@ new_1-2,184,172,1	script	Understandings of Skills	47,{
 	mes "[Leo Handerson]";
 	mes "I, Leo Handerson,";
 	mes "feel so responsible for your performance and will be teaching you to the best of my ability. Now, please select the subject you wish to learn.";
-	emotion e_kis;
+	emotion ET_CHUP;
 	next;
 	while(1) {
 		switch(select("Passive and Active skills:Basic Skills:Use of Emoticons:Cancel.")) {
@@ -2066,7 +2066,7 @@ new_1-2,184,172,1	script	Understandings of Skills	47,{
 					mes "An adorable Novice";
 					mes "like you should pick";
 					mes "on this really quickly~";
-					emotion e_kis;
+					emotion ET_CHUP;
 					next;
 					break;
 				case 3:
@@ -2162,7 +2162,7 @@ new_1-2,184,172,1	script	Understandings of Skills	47,{
 			next;
 			mes "[Leo Handerson]";
 			mes "To check out the commands for even more emoticons, type the command ^4d4dff//emotion^000000 into your Chat Window to see the list~";
-			emotion e_lv;
+			emotion ET_THROB;
 			next;
 			break;
 		case 4:

npc/quests/bard_quest.txt

@@ -2908,7 +2908,7 @@ yuno_in04,33,119,3	script	Adventurer#1	828,{
 	mes "What is it?";
 	next;
 	if (Sex == SEX_FEMALE) {
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Energetic Young Man]";
 		mes "Oh...!";
 		mes "A beautiful,";
@@ -2932,7 +2932,7 @@ yuno_in04,33,119,3	script	Adventurer#1	828,{
 			next;
 			mes "[Energetic Young Man]";
 			mes "I shall remember your name, my lady. Oh, but I'm so sorry. I'm kind of busy right now. Would you come back later? I'll do my best to please you next time.";
-			emotion e_kis;
+			emotion ET_CHUP;
 			close;
 
 		} else {
@@ -2940,7 +2940,7 @@ yuno_in04,33,119,3	script	Adventurer#1	828,{
 			next;
 			mes "[Energetic Young Man]";
 			mes "Eh, whatever. Oh, but I'm so sorry. I'm kind of busy right now. Would you come back later? I'll do my best to please you next time.";
-			emotion e_heh;
+			emotion ET_SMILE;
 			close;
 		}
 

npc/quests/cooking_quest.txt

@@ -52,7 +52,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			mes "kitchen, then I'd like to";
 			mes "ask you to leave now.";
 			next;
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Charles Orleans]";
 			mes "Please don't be";
 			mes "offended, but I can't";
@@ -82,7 +82,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 	else if (getequipid(EQI_HEAD_TOP) != 5026) {
 		if (Sex == SEX_MALE) {
 			cutin "orleans_5",0;
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Charles Orleans]";
 			mes "Monsieur, why you look";
 			mes "at me so? Is it the Morroc";
@@ -138,14 +138,14 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		switch(select("......?:She is my sister:Actually, I don't know her.")) {
 		case 1:
 			cutin "nyuang_3",2;
-			emotion e_ho,0,"Child with Cat#cook";
+			emotion ET_DELIGHT, getnpcid(0, "Child with Cat#cook");
 			mes "[The kid with a cat]";
 			mes "Nyahahaha,";
 			mes "Nyahahaha~";
 			mes "Meow~ Meow~";
 			next;
 			cutin "orleans_2",0;
-			emotion e_heh;
+			emotion ET_SMILE;
 			mes "[Charles Orleans]";
 			mes "What a lovely child.";
 			mes "Be quiet like a good girl.";
@@ -153,13 +153,13 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			break;
 		case 2:
 			cutin "nyuang_1",2;
-			emotion e_what,0,"Child with Cat#cook";
+			emotion ET_QUESTION, getnpcid(0, "Child with Cat#cook");
 			mes "[Child with Cat]";
 			mes "...Nya?";
 			mes "...Meow?";
 			next;
 			cutin "orleans_2",0;
-			emotion e_lv2;
+			emotion ET_BIGTHROB;
 			mes "[Charles Orleans]";
 			mes "She is lovely and";
 			mes "quite although she";
@@ -168,7 +168,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			break;
 		case 3:
 			cutin "nyuang_2",2;
-			emotion e_pif,0,"Child with Cat#cook";
+			emotion ET_HNG, getnpcid(0, "Child with Cat#cook");
 			mes "[Child with Cat]";
 			mes "Nyahahaha,";
 			mes "Nyahahaha~";
@@ -176,7 +176,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			next;
 			cutin "orleans_4",0;
 			cutin "orleans_3",0;
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			mes "[Charles Orleans]";
 			mes "Ah, again, let me";
 			mes "apologize. I had believed";
@@ -232,7 +232,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 	}
 	else if (cooking_q == 0) {
 		cutin "orleans_5",0;
-		emotion e_dots;
+		emotion ET_THINK;
 		mes "[Charles Orleans]";
 		mes "Oh, have you come here";
 		mes "to learn cooking? ^333333*Sigh*^000000";
@@ -259,7 +259,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			next;
 			cutin "orleans_4",0;
 			cutin "orleans_3",0;
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "[Charles Orleans]";
 			mes "Goodness, you scared me!";
 			mes "What an ill natured kid!";
@@ -423,7 +423,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 	else if (cooking_q == 1) {
 		if (countitem(940) > 4 && countitem(7031) > 0 && countitem(7457) > 0) {
 			cutin "orleans_4",0;
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Charles Orleans]";
 			mes "Finally, you're here! Never";
 			mes "forget: your ingredients must";
@@ -828,7 +828,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		next;
 		switch(select("What's your name, kid?:Do you want to eat something?:Here, kitty~:Get out!")) {
 		case 1:
-			emotion e_ok,0,"Child with Cat#cook";
+			emotion ET_OK, getnpcid(0, "Child with Cat#cook");
 			mes "[Child with Cat]";
 			mes "Nyaaa~";
 			mes "nyaaa~";
@@ -842,7 +842,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			goto L_End;
 		case 2:
 			cutin "nyuang_2",2;
-			emotion e_pif,0,"Child with Cat#cook";
+			emotion ET_HNG, getnpcid(0, "Child with Cat#cook");
 			mes "[Child with Cat]";
 			mes "Nyaaaa~";
 			mes "(Purrrrrr~)";
@@ -858,7 +858,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			goto L_End;
 		case 3:
 			cutin "nyuang_3",2;
-			emotion e_heh,0,"Child with Cat#cook";
+			emotion ET_SMILE, getnpcid(0, "Child with Cat#cook");
 			mes "[Child with Cat]";
 			mes "Nyahahaha~";
 			mes "Nyhhahaha~";
@@ -870,13 +870,13 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 			mes "...Then I don't need you to be here.";
 			goto L_End;
 		case 4:
-			emotion e_dots,0,"Child with Cat#cook";
+			emotion ET_THINK, getnpcid(0, "Child with Cat#cook");
 			mes "[Child with Cat]";
 			mes "...";
 			mes "(Meow?)";
 			next;
 			cutin "nyuang_4",2;
-			emotion e_an,0,"Child with Cat#cook";
+			emotion ET_FRET, getnpcid(0, "Child with Cat#cook");
 			specialeffect2 EF_HIT2;
 			percentheal -10,0;
 			mes "[Child with Cat]";
@@ -894,7 +894,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 	}
 	else if (cooking_q == 9) {
 		cutin "orleans_5",0;
-		emotion e_an;
+		emotion ET_FRET;
 		mes "[Charles Orleans]";
 		mes "Alright, enough";
 		mes "is enough. We can't";
@@ -913,14 +913,14 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		mes "or shed on any of the food!";
 		next;
 		cutin "nyuang_4",2;
-		emotion e_an,0,"Child with Cat#cook";
+		emotion ET_FRET, getnpcid(0, "Child with Cat#cook");
 		mes "[Child with Cat]";
 		mes "Grrrrrrr!";
 		mes "RRRRreow!";
 		next;
 		donpcevent "Wickebine#cook::OnEnable";
-		emotion e_omg;
-		emotion e_ho,0,"Child with Cat#cook";
+		emotion ET_HUK;
+		emotion ET_DELIGHT, getnpcid(0, "Child with Cat#cook");
 		next;
 		cutin "job_black_hucke01",1;
 		mes "[Wickebine]";
@@ -948,7 +948,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		mes "bothering Charles, Nyuyang?";
 		next;
 		cutin "nyuang_3",2;
-		emotion e_heh,0,"Child with Cat#cook";
+		emotion ET_SMILE, getnpcid(0, "Child with Cat#cook");
 		mes "[Child with Cat]";
 		mes "Nyuuuunyuuu~";
 		mes "nyuuuunyuuu~";
@@ -966,7 +966,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		mes "wants you to leave?";
 		next;
 		cutin "orleans_3",0;
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		mes "[Charles Orleans]";
 		mes "Hahahahah, what";
 		mes "are you talking about!";
@@ -984,7 +984,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		mes "So do not worry, Madam~";
 		next;
 		cutin "job_black_hucke01",1;
-		emotion e_what,0,"Wickebine#cook";
+		emotion ET_QUESTION, getnpcid(0, "Wickebine#cook");
 		mes "[Wickebine]";
 		mes "Are you sure, Charles?";
 		mes "I know how serious you";
@@ -1001,18 +1001,18 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		mes "Well then, take care~";
 		next;
 		cutin "nyuang_3",2;
-		emotion e_heh,0,"Child with Cat#cook";
+		emotion ET_SMILE, getnpcid(0, "Child with Cat#cook");
 		mes "[Child with Cat]";
 		mes "Nyahahaha~";
 		mes "Nyahahaha~";
 		mes "(Meow, meow~)";
 		next;
 		cutin "job_black_hucke02",255;
-		emotion e_ho,0,"Wickebine#cook";
+		emotion ET_DELIGHT, getnpcid(0, "Wickebine#cook");
 		donpcevent "Wickebine#cook::OnDisable";
 		next;
-		emotion e_dots;
-		emotion e_dots,0,"Child with Cat#cook";
+		emotion ET_THINK;
+		emotion ET_THINK, getnpcid(0, "Child with Cat#cook");
 		mes "[Charles Orleans]";
 		mes "......";
 		next;
@@ -1058,7 +1058,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		mes "suggests that he is hiding";
 		mes "in the Schwaltzvalt Republic...";
 		next;
-		emotion e_go;
+		emotion ET_GO;
 		mes "[Charles Orleans]";
 		mes "Praise the glories of the";
 		mes "Rune-Midgarts Kingdom!";
@@ -1067,7 +1067,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 	}
 	else if (cooking_q == 11) {
 		cutin "orleans_5",0;
-		emotion e_dots;
+		emotion ET_THINK;
 		mes "[Charles Orleans]";
 		mes "Oh, I'm in great need of";
 		mes "some rest. Unless you ";
@@ -2124,7 +2124,7 @@ prt_castle,45,28,3	script	Child with Cat#cook	877,{
 	set .@nyu,rand(1,2);
 	if (.@nyu == 1) {
 		cutin "nyuang_1",2;
-		emotion e_what;
+		emotion ET_QUESTION;
 		mes "[Child with Cat]";
 		mes "...Nya?";
 		mes "(...Meow?)";
@@ -2133,7 +2133,7 @@ prt_castle,45,28,3	script	Child with Cat#cook	877,{
 		end;
 	}
 	cutin "nyuang_3",2;
-	emotion e_ho;
+	emotion ET_DELIGHT;
 	mes "[Child with Cat]";
 	mes "Nyahahahaha,";
 	mes "nyahahahaha~";

npc/quests/dandelion_request.txt

@@ -3079,7 +3079,7 @@ que_job01,16,21,5	script	Valdes#1	55,{
 				mes "Hey there~";
 				mes "I'm Kidd.";
 				mes "Nice to meet you.";
-				emotion e_ok,0,"Kidd#1";
+				emotion ET_OK, getnpcid(0, "Kidd#1");
 				cutin "mocseal_kid01.bmp",2;
 				next;
 				mes "[Valdes]";
@@ -3114,7 +3114,7 @@ que_job01,16,21,5	script	Valdes#1	55,{
 				mes "I'm lookin' forward";
 				mes "to working together";
 				mes "with you. Heh heh~";
-				emotion e_ok,0,"Lin#1";
+				emotion ET_OK, getnpcid(0, "Lin#1");
 				cutin "mocseal_rin01.bmp",2;
 				next;
 				mes "[Valdes]";
@@ -5490,7 +5490,7 @@ que_job01,91,83,3	script	Kidd#hall	884,{
 		mes "[Dandelion Member]";
 		mes "I still can't believe it...";
 		mes "Those poor, poor children...";
-		emotion e_hmm,1;
+		emotion ET_SCRATCH, playerattached();
 		close2;
 	}
 	else if(mao_request > 102 && mao_request < 126)
@@ -7725,7 +7725,7 @@ moc_castle,40,20,3	script	Man	849,{
 	{
 		mes "^3355FFYou find the body";
 		mes "of a dead man.^000000";
-		emotion e_hmm,1;
+		emotion ET_SCRATCH, playerattached();
 		close;
 	}
 	mes "^3355FFYou find a man lying";
@@ -8273,7 +8273,7 @@ OnStop2:
 
 OnTouch:
 	initnpctimer;
-	emotion e_wah,1;
+	emotion ET_KEK, playerattached();
 	disablenpc "#maogate1_battle";
 	end;
 
@@ -8339,7 +8339,7 @@ que_job02,66,85,5	script	Dandelion Member#1_bt	880,{
 		mes "...I said--!";
 		mes "...That's...";
 		mes "Why I oughta--!";
-		emotion e_gasp,0;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Dandelion Member]";
 		mes "Yeah, that's him again.";
@@ -8349,7 +8349,7 @@ que_job02,66,85,5	script	Dandelion Member#1_bt	880,{
 		mes "your strength while I go";
 		mes "in there and help him...";
 		close2;
-		emotion e_gasp,1;
+		emotion ET_SURPRISE, playerattached();
 		set mao_request,27;
 		disablenpc "Dandelion Member#1_bt";
 		end;
@@ -8413,7 +8413,7 @@ OnTouch:
 	mes "on here? Kidd! Lin?";
 	mes "A-and who's that guy?";
 	mes "Could it possibly be...";
-	emotion e_gasp,1;
+	emotion ET_SURPRISE, playerattached();
 	next;
 	cutin "mocseal_kid01.bmp",0;
 	mes "[Kidd]";
@@ -8432,7 +8432,7 @@ OnTouch:
 	mes "working for, the Dandelion";
 	mes "Organization, have been";
 	mes "hunting Mr. Moore down...";
-	emotion e_wah,0,"Lin#maogate1_1";
+	emotion ET_KEK, getnpcid(0, "Lin#maogate1_1");
 	next;
 	cutin "mocseal_kid01.bmp",0;
 	mes "[Kidd]";
@@ -8455,7 +8455,7 @@ OnTouch:
 	mes "me everything you know";
 	mes "about your own client,";
 	mes "the Dandelion Organization...";
-	emotion e_hmm,0,"R#maogate1";
+	emotion ET_SCRATCH, getnpcid(0, "R#maogate1");
 	next;
 	cutin "mocseal_rin01.bmp",255;
 	cutin "mocseal_kid01.bmp",255;
@@ -8472,8 +8472,8 @@ OnTouch:
 	mes "Your blood will be used";
 	mes "to revive Morroc Satan!";
 	donpcevent "R#maogate1::OnSpell";
-	emotion e_gasp,0,"Kidd#maogate1_1";
-	emotion e_gasp,1;
+	emotion ET_SURPRISE, getnpcid(0, "Kidd#maogate1_1");
+	emotion ET_SURPRISE, playerattached();
 	next;
 	mes "[Kidd]";
 	mes "Watch out!";
@@ -8503,7 +8503,7 @@ OnTouch:
 	mes "Fine, you leave me";
 	mes "no choice. Feel the";
 	mes "power of Morroc Satan!";
-	emotion e_gg,0,"R#maogate1";
+	emotion ET_KIK, getnpcid(0, "R#maogate1");
 	next;
 	donpcevent "R#maogate1::OnInit";
 	initnpctimer;
@@ -8536,10 +8536,10 @@ OnTimer500:
 	mapannounce "que_job02","I'll back you up!",1,0x90EE90;
 	donpcevent "Dandelion#maogate1_3::OnEnter";
 	donpcevent "Dandelion#maogate1_4::OnEnter";
-	emotion e_go,0,"Dandelion#maogate1_1";
-	emotion e_go,0,"Dandelion#maogate1_2";
-	emotion e_go,0,"Dandelion#maogate1_3";
-	emotion e_go,0,"Dandelion#maogate1_4";
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate1_1");
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate1_2");
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate1_3");
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate1_4");
 	end;
 
 OnTimer3000:
@@ -9256,7 +9256,7 @@ OnStop2:
 	
 OnTouch:
 	initnpctimer;
-	emotion e_wah,1;
+	emotion ET_KEK, playerattached();
 	disablenpc "#maogate2_battle";
 	end;
 	
@@ -9334,7 +9334,7 @@ que_job03,66,85,5	script	Dandelion Member#2_bt	880,{
 		mes "...S-stop...";
 		mes "...This is...";
 		mes "This is all insane!";
-		emotion e_gasp,0;
+		emotion ET_SURPRISE;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "That's... That's Lin's";
@@ -9406,7 +9406,7 @@ OnTouch:
 	mes "on here? Kidd! Lin?";
 	mes "A-and who's that guy?";
 	mes "Could it possibly be...";
-	emotion e_gasp,1;
+	emotion ET_SURPRISE, playerattached();
 	next;
 	cutin "mocseal_kid01.bmp",0;
 	mes "[Kidd]";
@@ -9425,7 +9425,7 @@ OnTouch:
 	mes "working for, the Dandelion";
 	mes "Organization, have been";
 	mes "hunting Mr. Moore down...";
-	emotion e_wah,0,"Lin#maogate2_1";
+	emotion ET_KEK, getnpcid(0, "Lin#maogate2_1");
 	next;
 	cutin "mocseal_kid01.bmp",0;
 	mes "[Kidd]";
@@ -9448,7 +9448,7 @@ OnTouch:
 	mes "me everything you know";
 	mes "about your own client,";
 	mes "the Dandelion Organization...";
-	emotion e_hmm,0,"R#maogate2";
+	emotion ET_SCRATCH, getnpcid(0, "R#maogate2");
 	next;
 	cutin "mocseal_rin01.bmp",255;
 	cutin "mocseal_kid01.bmp",255;
@@ -9465,8 +9465,8 @@ OnTouch:
 	mes "Your blood will be used";
 	mes "to revive Morroc Satan!";
 	donpcevent "R#maogate2::OnSpell";
-	emotion e_gasp,0,"Kidd#maogate2_1";
-	emotion e_gasp,1;
+	emotion ET_SURPRISE, getnpcid(0, "Kidd#maogate2_1");
+	emotion ET_SURPRISE, playerattached();
 	next;
 	mes "[Kidd]";
 	mes "Watch out!";
@@ -9496,7 +9496,7 @@ OnTouch:
 	mes "Fine, you leave me";
 	mes "no choice. Feel the";
 	mes "power of Morroc Satan!";
-	emotion e_gg,0,"R#maogate2";
+	emotion ET_KIK, getnpcid(0, "R#maogate2");
 	next;
 	donpcevent "R#maogate2::OnInit";
 	initnpctimer;
@@ -9530,10 +9530,10 @@ OnTimer500:
 	mapannounce "que_job03","I'll back you up!",1,0x90EE90;
 	donpcevent "Dandelion#maogate2_3::OnEnter";
 	donpcevent "Dandelion#maogate2_4::OnEnter";
-	emotion e_go,0,"Dandelion#maogate2_1";
-	emotion e_go,0,"Dandelion#maogate2_2";
-	emotion e_go,0,"Dandelion#maogate2_3";
-	emotion e_go,0,"Dandelion#maogate2_4";
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate2_1");
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate2_2");
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate2_3");
+	emotion ET_GO, getnpcid(0, "Dandelion#maogate2_4");
 	end;
 
 OnTimer3000:
@@ -10147,18 +10147,17 @@ OnMyMobDead:
 }
 
 que_job01,68,88,5	script	Simon#mao	881,{
-
 	mes "[Simon]";
 	mes "...No. How many";
 	mes "times must I tell you?";
 	mes "I'm not going back.";
-	emotion e_swt,0,"Simon#mao";
+	emotion ET_SWEAT, getnpcid(0, "Simon#mao");
 	next;
 	mes "[Kimmie]";
 	mes "Please...";
 	mes "We really need";
 	mes "you back home...";
-	emotion e_sob,0,"Kimmie";
+	emotion ET_CRY, getnpcid(0, "Kimmie");
 	next;
 	mes "[Simon]";
 	mes "I'm sorry, Kimmie.";
@@ -10174,7 +10173,7 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	mes "I d-didn't want to tell you";
 	mes "this, but Jimmy's been getting";
 	mes "in trouble with the law and...";
-	emotion e_wah,0,"Kimmie";
+	emotion ET_KEK, getnpcid(0, "Kimmie");
 	next;
 	mes "[Simon]";
 	mes "Then it's his own";
@@ -10197,7 +10196,7 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	close;
 }
 
-que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	882,0,0
+que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	882
 
 sec_in02,38,162,0	script	Morroc Invasion Manager	882,{
 	callfunc "F_GM_NPC";

npc/quests/first_class/tu_acolyte.txt

@@ -96,7 +96,7 @@ prt_church,179,15,1	script	Priest Praupin	4_M_MINISTER,{
 		close;
 	case 22:
 		if(countitem(7181) > 0){// Receipt_01
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			mes "Oh my, you seem";
 			mes "to be growing quickly";
 			mes "into your role as an Acolyte.";
@@ -370,7 +370,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 				mes "[Asthe]";
 				mes "Thank you so much.";
 				mes "You have returned the Mace.";
-				emotion e_heh;
+				emotion ET_SMILE;
 				tu_acolyte01 = 5;
 				delitem 1504,1; //Mace
 				if(Class == Job_Acolyte_High)
@@ -796,7 +796,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 			mes "What's that?";
 			mes "You have something for me?";
 			next;
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			mes "[Priest Gardron]";
 			mes "Oh! This is a letter from my mother back home. Thank you for bringing this to me, young Acolyte.";
 			next;
@@ -863,7 +863,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 				next;
 				mes "[Priest Gardron]";
 				mes "....!";
-				emotion e_gasp;
+				emotion ET_SURPRISE;
 				next;
 				mes "[Priest Gardron]";
 				mes "May I entrust you, acolyte "+strcharinfo(0)+",";
@@ -897,7 +897,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 				next;
 				mes "[Priest Gardron]";
 				mes "....!";
-				emotion e_gasp;
+				emotion ET_SURPRISE;
 				next;
 				mes "[Priest Gardron]";
 				mes ""+strcharinfo(0)+",";
@@ -952,7 +952,7 @@ prt_monk,235,245,5	script	Dog#tu	4_DOG01,{
 				if(.@dog_food > 4){
 					mes "[Dog]";
 					mes "^CDB79EGrrrrrr...!^000000";
-					emotion e_an;
+					emotion ET_FRET;
 					next;
 					mes "^3355FFThe dog grinds";
 					mes "its teeth and glares";
@@ -960,13 +960,13 @@ prt_monk,235,245,5	script	Dog#tu	4_DOG01,{
 				} else {
 					mes "[Dog]";
 					mes "^CDB79ERoof roof!^000000";
-					emotion e_lv;
+					emotion ET_THROB;
 				}
 				break;
 			case 2:
 				mes "[Dog]";
 				mes "^CDB79ERoof roof~^000000";
-				emotion e_lv;
+				emotion ET_THROB;
 				break;
 			case 3:
 				mes "[Dog]";
@@ -1000,7 +1000,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 		mes "Thanks for helping me.";
 		mes "I'm sad my older sister is no longer with me, but I oughta";
 		mes "cheer up, right? I'll try my best!";
-		emotion e_heh;
+		emotion ET_SMILE;
 		close;
 	}
 	mes "Sister, don't go...";
@@ -1059,7 +1059,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 		next;
 		specialeffect EF_CURSEATTACK;
 		soundeffectall "_curse.wav",0;
-		emotion e_omg;
+		emotion ET_HUK;
 		mes "["+strcharinfo(0)+"]";
 		mes "This is....!";
 		mes "A cursed spirit";
@@ -1216,7 +1216,7 @@ prt_monk,197,228,3	script	Veiner	4_M_ORIENT02,{
 		mes "[Veiner]";
 		mes "Oh right!";
 		mes "Thank you very much for delivering this to me. Sorry, but I'm always excited to hear from my cutie pie~";
-		emotion e_thx;
+		emotion ET_THANKS;
 		tu_acolyte01 = 19;
 		delitem 1081,1; //Merchant_Box_1
 	}
@@ -1224,7 +1224,7 @@ prt_monk,197,228,3	script	Veiner	4_M_ORIENT02,{
 		mes "I can't wait";
 		mes "to see her again!";
 		mes "Bibi...! I loooove you!";
-		emotion e_kis2;
+		emotion ET_CHUPCHUP;
 	}
 	else {
 		mes "So very";
@@ -1378,7 +1378,7 @@ prt_monk,219,164,3	script	Gloria#tu	4_F_SISTER,{
 			mes "one ^3131FFBlue Gemstone^000000.";
 			mes "Is this to help me?";
 			mes "Wow, I'm touched!";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		case 2:
 			mes "[Gloria]";
@@ -1440,7 +1440,7 @@ prt_monk,153,210,3	script	Cleope Verce	4_F_SISTER,{
 				mes "[Cleope Verce]";
 				mes "You'll have to go through a lot until you reach the point where I'm at right now. Ho ho ho! You still have a looong way to go~";
 				next;
-				emotion e_gg;
+				emotion ET_KIK;
 				mes "[Cleope Verce]";
 				mes "Good luck...";
 				mes "Rookie.";
@@ -1491,7 +1491,7 @@ prt_monk,153,210,3	script	Cleope Verce	4_F_SISTER,{
 				mes "until you become a well";
 				mes "experienced Acolyte. Ho ho~";
 				next;
-				emotion e_gg;
+				emotion ET_KIK;
 				mes "[Cleope Verce]";
 				mes "Good luck,";
 				mes "young friend.";
@@ -1549,7 +1549,7 @@ prt_monk,153,210,3	script	Cleope Verce	4_F_SISTER,{
 				mes "memories when you're";
 				mes "still an Acolyte.";
 				next;
-				emotion e_gg;
+				emotion ET_KIK;
 				mes "[Cleope Verce]";
 				mes "Good luck,";
 				mes "young friend~";

npc/quests/first_class/tu_archer.txt

@@ -48,7 +48,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		mes "Let me tell you a joke!";
 		mes "Trust me, it's hilarious~";
 		mes "^333333*Ahem*^000000";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Jet]";
 		mes "A termite walks";
@@ -56,7 +56,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		mes "'Is the bar tender here?'";
 		mes "Hahahahaha!";
 		mes "Bwehehehehe!";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Jet]";
 		mes "Hahaha~!";
@@ -65,7 +65,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		mes "Now, you try!";
 		mes "Come on, make";
 		mes "up a joke~!";
-		emotion e_gg;
+		emotion ET_KIK;
 		next;
 		if (Sex == SEX_MALE) {
 			select("A joke, eh?");
@@ -89,7 +89,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 			mes "I don't know why, but that was truly amazing. You must have";
 			mes "what it takes to become a Dancer...";
 		}
-		emotion e_no1;
+		emotion ET_BEST;
 		next;
 		mes "[Jet]";
 		mes "But before any of that, you've got to get rid of the Archer look, no?";
@@ -110,7 +110,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		next;
 		specialeffect2 EF_TALK_FROSTJOKE;
 		//specialeffect EF_TALK_FROSTJOKE,AREA,"Bard Jet#tu";
-		emotion e_no1;
+		emotion ET_BEST;
 		mes "[Jet]";
 		mes "Let's see...";
 		mes "I've been working";
@@ -428,7 +428,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "Kavaruk told you";
 				mes "to come to me, eh?";
 				mes "Alright. Okay.";
-				emotion e_gg;
+				emotion ET_KIK;
 				next;
 				break;
 			case 2:
@@ -512,7 +512,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "That's what I'm talkin' about! Yeah! Just trust me and you'll learn almost everything about Archer skills! Let's get started!";
 				next;
 				select("Yes, Chief!");
-				emotion e_ok;
+				emotion ET_OK;
 				mes "[Reidin Corse]";
 				mes "Great...!";
 				mes "I like your style!";
@@ -570,7 +570,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 							mes "about trying to become as";
 							mes "good as the greatest Archer";
 							mes "ever: me.";
-							emotion e_dots;
+							emotion ET_THINK;
 							next;
 							mes "[Reidin Corse]";
 							mes "Okay...!";
@@ -595,7 +595,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 							close;
 						}
 					case 2:
-						emotion e_an;
+						emotion ET_FRET;
 						mes "[Reidin Corse]";
 						mes "Say what...?";
 						mes "Alright, then.";
@@ -606,7 +606,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 					}
 
 				} else {
-					emotion e_ag;
+					emotion ET_ANGER;
 					mes "Huh. So you already know a little about Owl's Eye already, huh? Well then, I guess I oughta talk about something you don't know about!";
 					tu_archer01 = 7;
 					getexp 500,0;
@@ -630,7 +630,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "You've kept me";
 				mes "waiting for a while!";
 				next;
-				emotion e_gasp;
+				emotion ET_SURPRISE;
 				mes "[Reidin Corse]";
 				mes "Ah, but your eyes look a lot sharper than they used to be.";
 				mes "Here, this is a small, special reward for you.";
@@ -638,7 +638,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				tu_archer01 = 7;
 				getexp 500,0;
 				next;
-				emotion e_pif;
+				emotion ET_HNG;
 				mes "[Reidin Corse]";
 				mes "Not bad, but you really should master Owl's Eye. That means";
 				mes "you need to learn it all the way";
@@ -678,7 +678,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "Exactly!";
 				break;
 			case 2:
-				emotion e_lv2;
+				emotion ET_BIGTHROB;
 				mes "[Reidin Corse]";
 				mes "Hahahaha!";
 				mes "Well, I am famous";
@@ -691,7 +691,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			mes "[Reidin Corse]";
 			mes "Vultures circle the sky, find a target on the ground, and then very swiftly swoop down and ensnare their prey in their claws.";
 			next;
-			emotion e_lv;
+			emotion ET_THROB;
 			mes "[Reidin Corse]";
 			mes "No doubt about it.";
 			mes "Vultures are awesome!";
@@ -700,7 +700,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			mes "The ^3131FFVulture's Eye^000000 skill allows";
 			mes "you to train your vision to be like a vulture's. You'll increase your Attack Accuracy and can target enemies from further away.";
 			next;
-			emotion e_no;
+			emotion ET_STARE_ABOUT;
 			mes "[Reidin Corse]";
 			mes "I know that you can attack";
 			mes "from a distance now, but don't";
@@ -762,7 +762,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			} else {
 				mes "Eh?";
 				mes "Wait a minute...";
-				emotion e_what;
+				emotion ET_QUESTION;
 				next;
 				mes "[Reidin Corse]";
 				mes "You already";
@@ -863,7 +863,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 					// tu_archer01 = 10;
 					getexp 0,500;
 				}
-				emotion e_no1;
+				emotion ET_BEST;
 				next;
 				mes "[Reidin Corse]";
 				mes "Now, there's another skill known as ^FF0000Arrow Shower^000000. Where Double Strafe uses 2 Arrows, Arrow Shower fires a bunch of arrows at once.";
@@ -871,13 +871,13 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "[Reidin Corse]";
 				mes "Not even I can handle";
 				mes "Arrow Shower all that well since it's really hard. Still, maybe if you trained more at it, you'd manage to pull it off?";
-				emotion e_heh;
+				emotion ET_SMILE;
 				close;
 			}
 		} else if(tu_archer01 == 10){
 			if (checkre(0)) {
 				mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
-				emotion e_no1;
+				emotion ET_BEST;
 				next;
 				mes "[Reidin Corse]";
 				mes "Rockers live just southwest of Prontera.";
@@ -893,7 +893,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "It's easier to find them if you pass by the southern gate of Prontera and then head west. Alright, off you go, " + strcharinfo(0) + "~";
 			} else {
 				mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
-				emotion e_no1;
+				emotion ET_BEST;
 				next;
 				mes "[Reidin Corse]";
 				mes "There's a ship that";
@@ -933,7 +933,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "Hey, you're back!";
 				mes "Let's see now...";
 				next;
-				emotion e_no1;
+				emotion ET_BEST;
 				mes "[Reidin Corse]";
 				mes "Good! You pass.";
 				mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
@@ -973,7 +973,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			mes "It was a pain in the";
 			mes "ass, but we're finally";
 			mes "done with all of your lessons.";
-			emotion e_pif;
+			emotion ET_HNG;
 			next;
 			mes "[Reidin Corse]";
 			mes "Ah, but it's not time for";
@@ -1042,7 +1042,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 					mes "Alright!";
 					mes "Oh, and if you get";
 					mes "the chance, give a hello to my Acolyte pal over there for me~";
-					emotion e_heh;
+					emotion ET_SMILE;
 					close2;
 					warp "mjolnir_11",25,221;
 					end;
@@ -1081,17 +1081,17 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			mes "[Reidin Corse]";
 			mes "Well, it's like you're a full fledged Archer now. Honestly,";
 			mes "I've got nothing more to teach you. Well, about archery, anyway.";
-			emotion e_heh;
+			emotion ET_SMILE;
 			next;
 			mes "[Reidin Corse]";
 			mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
 			mes "for him too. That creep!";
-			emotion e_pif;
+			emotion ET_HNG;
 			next;
 			mes "[Reidin Corse]";
 			mes "Well, "+ strcharinfo(0) +",";
 			mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
-			emotion e_no1;
+			emotion ET_BEST;
 			close;
 		} else if(tu_archer01 == 16){
 			mes "I really like this town.";
@@ -1100,7 +1100,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			next;
 			mes "[Reidin Corse]";
 			mes "Of course, I've got friends here that I can trust with my life. We always argue, but we all want what's best for each other.";
-			emotion e_pif;
+			emotion ET_HNG;
 			next;
 			mes "[Reidin Corse]";
 			mes "Wouldn't you";
@@ -1118,7 +1118,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			mes "[Reidin Corse]";
 			mes "It might also be because I have my trustable friends here with me. Haha.";
 			mes "We always argue, but we care for each other deep down inside.";
-			emotion e_pif;
+			emotion ET_HNG;
 			next;
 			mes "[Reidin Corse]";
 			mes "..'friend' is a wonderful word. Don't you agree?";
@@ -1127,26 +1127,26 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 	}
 	mes "Allow me to introduce myself. I'm the Archer of all Archers, ^3131FFReidin Corse^000000, Master of the Icarus Guild!";
 	next;
-	emotion e_no1;
+	emotion ET_BEST;
 	mes "[Reidin Corse]";
 	mes "Right now, we're having a special event! The application fee for the Icarus Guild has been slashed by 50%! Join now and there'll be no annual fees!";
 	next;
-	emotion e_lv;
+	emotion ET_THROB;
 	mes "[Reidin Corse]";
 	mes "During our special event, we'll have no job class restrictions!";
 	mes "As an added bonus, all new male members will be introduced to beautiful Dancer girls!";
 	next;
-	emotion e_heh;
+	emotion ET_SMILE;
 	mes "[Reidin Corse]";
 	mes "And new female members will have the special opportunity to go out on a date with me! Don't miss out!";
 	next;
-	emotion e_cash;
+	emotion ET_MONEY;
 	mes "[Reidin Corse]";
 	mes "Join right now";
 	mes "for a one time fee of only ^3131FF1,000,000, zeny^000000! Hurry and join the Icarus Guild while";
 	mes "this offer still lasts!";
 	next;
-	emotion e_pif,"Arpesto";
+	emotion ET_HNG, getnpcid(0, "Arpesto");
 	mes "[Arpesto]";
 	mes "Reiden...";
 	mes "Stop messing around.";
@@ -1154,12 +1154,12 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 	mes "master of the Icarus Guild";
 	mes "is in that building.";
 	next;
-	emotion e_omg;
+	emotion ET_HUK;
 	mes "[Reidin Corse]";
 	mes "Arpesto...!";
 	mes "Why'd you...?!";
 	next;
-	emotion e_ag;
+	emotion ET_ANGER;
 	mes "[Reidin Corse]";
 	mes "^333333*Sigh*^000000";
 	mes "You got me, you got me.";
@@ -1397,7 +1397,7 @@ pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 			mes "Uh... Oh no~";
 			mes "What am I supposed";
 			mes "t-to tell you...?";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			next;
 			mes "[Acolyte]";
 			mes "Oh, since I'm training to be an Acolyte, I'm supposed to help out the people he's teaching. So...";
@@ -1419,7 +1419,7 @@ pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 				mes "If you don't need";
 				mes "my help, I guess";
 				mes "that's alright...";
-				emotion e_sob;
+				emotion ET_CRY;
 				close;
 			case 3:
 				mes "[Acolyte]";
@@ -1538,7 +1538,7 @@ pay_arche,130,113,3	script	Alchemist Guildmember#tu	2_M_ALCHE,{
 			mes "for the Icarus Guild";
 			mes "to send somebody";
 			mes "to help us! Finally!";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "[Alchemist Guildmember]";
 			mes "Would you like to sell ^3131FFStems^000000";
@@ -1570,13 +1570,13 @@ pay_arche,130,113,3	script	Alchemist Guildmember#tu	2_M_ALCHE,{
 				mes "Seriously...";
 				mes "I'm on the verge of begging!";
 				mes "The Alchemist Guild really needs lots of new supplies to keep our Flora field running!";
-				emotion e_sob;
+				emotion ET_CRY;
 				close;
 			}
 		} else {
 			mes "I don't know if you've heard";
 			mes "from Kavaruk, but our Flora field is getting ruined by stray cats.";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "[Alchemist Guildmember]";
 			mes "No matter how much we chase";
@@ -1679,7 +1679,7 @@ prontera,126,335,5	script	Arthail	1_M_BARD,{
 		mes "I sense something";
 		mes "dark and ominous...";
 		mes "I wonder what it could be?";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		next;
 		mes "[Arthail]";
 		mes "I'm probably just stressed and exhausted. I'll feel better once";
@@ -1719,7 +1719,7 @@ prontera,126,335,5	script	Arthail	1_M_BARD,{
 		next;
 		mes "[????]";
 		mes "AAAAAAAAAAAAAAAHHHHHHHHHHH!!!!!";
-		emotion e_omg;
+		emotion ET_HUK;
 		soundeffectall "se_scream_w01.wav",0;
 		next;
 		mes "["+strcharinfo(0)+"]";
@@ -1805,7 +1805,7 @@ prontera,144,301,5	script	Mage#tu	2_F_MAGICMASTER,{
 	mes "Talk about getting";
 	mes "on your soapbox!";
 	next;
-	emotion e_pif;
+	emotion ET_HNG;
 	mes "[Mage]";
 	mes "Doesn't he know that there";
 	mes "are a lot of famous guilds around nowadays? Why would anyone want";

npc/quests/first_class/tu_magician01.txt

@@ -708,7 +708,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 			mes "has you do, come back";
 			mes "and report to me, okay?";
 			tu_magician01 = 7;
-			emotion e_heh;
+			emotion ET_SMILE;
 			warp "morocc",182,286;
 			close;
 		case 2:

npc/quests/guildrelay.txt

@@ -116,7 +116,7 @@
 						mes "deeds when you're overworked!";
 						mes "Rest. Your guild must be able";
 						mes "to depend on your strength.";
-						emotion e_gasp;
+						emotion ET_SURPRISE;
 						next;
 						mes "[" + .@name$ + "]";
 						mes "Your determination and";
@@ -173,7 +173,7 @@
 						mes "deeds when you're overworked!";
 						mes "Rest. Your guild must be able";
 						mes "to depend on your strength.";
-						emotion e_gasp;
+						emotion ET_SURPRISE;
 						next;
 						mes "[" + .@name$ + "]";
 						mes "Your determination and";
@@ -229,7 +229,7 @@
 					mes "deeds when you're overworked!";
 					mes "Rest. Your guild must be able";
 					mes "to depend on your strength.";
-					emotion e_gasp;
+					emotion ET_SURPRISE;
 					next;
 					mes "[" + .@name$ + "]";
 					mes "Your determination and";
@@ -293,7 +293,7 @@
 					mes "deeds when you're overworked!";
 					mes "Rest. Your guild must be able";
 					mes "to depend on your strength.";
-					emotion e_gasp;
+					emotion ET_SURPRISE;
 					next;
 					mes "[" + .@name$ + "]";
 					mes "Your determination and";
@@ -331,7 +331,7 @@
 					mes "...............................";
 					next;
 					mes "[" + .@name$ + "]";
-					emotion e_omg;
+					emotion ET_HUK;
 					mes "Oh! M-master? Wh-when";
 					mes "did you...? I'm so sorry.";
 					mes "I was busy working.";
@@ -357,7 +357,7 @@
 				case 1:
 					mes "[" + .@name$ + "]";
 					mes "Hm? That's strange.";
-					emotion e_swt;
+					emotion ET_SWEAT;
 					mes "You didn't want to take";
 					mes "the trials again, did you?";
 					close;

npc/quests/kiel_hyre_quest.txt

@@ -841,7 +841,7 @@ kh_school,57,139,0	script	Student#khb	893,{
 	mes "know, rumors and ghost";
 	mes "stories that make no sense?";
 	mes "C'mon, Laci, knock it off!";
-	emotion e_swt2;
+	emotion ET_PROFUSELY_SWEAT;
 	close;
 }
 
@@ -1012,7 +1012,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 					mes "Come back, you";
 					mes "d-don't...! I really";
 					mes "need some help!";
-					emotion e_sob;
+					emotion ET_CRY;
 					close2;
 					cutin "",255;
 					end;
@@ -1120,7 +1120,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 			//KHPubMasterEnd no longer needed-- deleting.
 			set KHPubMasterEnd,0;
 			set KHToastGirlEnd,0;
-			emotion e_ho;
+			emotion ET_DELIGHT;
 		}
 	}
 	else if (KielHyreQuest == 8) {

npc/quests/newgears/2004_headgears.txt

@@ -115,7 +115,7 @@ geffen,129,148,3	script	Argen#1	779,{
 		mes "You mind sharing them with me?";
 		close;
 	}
-	emotion e_hmm;
+	emotion ET_SCRATCH;
 	mes "[Argen]";
 	mes "Man, oh man~";
 	mes "Am I bored~!";
@@ -124,7 +124,7 @@ geffen,129,148,3	script	Argen#1	779,{
 	mes "[" + strcharinfo(0) + "]";
 	mes "Impress the ladies...?";
 	next;
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	if (Sex == SEX_MALE) {
 		mes "[Argen]";
 		mes "Yeah dude. There are two things chicks dig. Small, adorable presents. And suave dudes.";
@@ -153,7 +153,7 @@ geffen,129,148,3	script	Argen#1	779,{
 		mes "So go ahead and tell me what kinda hairpin you're interested in.";
 	}
 	next;
-	emotion e_heh;
+	emotion ET_SMILE;
 	switch(select("^3131FFX Hairpin^000000:^3131FFBand Aid^000000:^3131FFFlower Hairpin^000000:No thanks.")) {
 	case 1:
 		if (countitem(2294) > 0 && countitem(7220) > 399) {
@@ -161,7 +161,7 @@ geffen,129,148,3	script	Argen#1	779,{
 			mes "X Hairpin!";
 			mes "Nice choice~!";
 			next;
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			mes "[Argen]";
 			mes "Ah... Right.";
 			mes "About the Stellar...";
@@ -175,7 +175,7 @@ geffen,129,148,3	script	Argen#1	779,{
 				mes "^3131FF * Scrape Scrape * ^000000";
 				mes "^3131FF * Scrape Scrape * ^000000";
 				next;
-				emotion e_no1;
+				emotion ET_BEST;
 				mes "[Argen]";
 				mes "Alright, I'm done!";
 				mes "So what do you think?";
@@ -215,7 +215,7 @@ geffen,129,148,3	script	Argen#1	779,{
 			mes "^3131FF * Scrape Scrape * ^000000";
 			mes "^3131FF * Scrape Scrape * ^000000";
 			next;
-			emotion e_no1;
+			emotion ET_BEST;
 			mes "[Argen]";
 			mes "*Whew~!*";
 			mes "I'm finished!";
@@ -246,7 +246,7 @@ geffen,129,148,3	script	Argen#1	779,{
 			mes "^3131FF - Scrape Scrape - ^000000";
 			mes "^3131FF - Scrape Scrape - ^000000";
 			next;
-			emotion e_no1;
+			emotion ET_BEST;
 			mes "[Argen]";
 			mes "Ah... It's done!";
 			mes "Hey, that looks pretty smooth! Oh, and uh, you can keep this leftover Stem.";
@@ -289,7 +289,7 @@ geffen,129,148,3	script	Argen#1	779,{
 		mes "If you want some kinda hairpin, just come back. I'll just be here, looking ^FF3333suaaave^000000 with this yo-yo.";
 		close;
 	}
-	emotion e_paper;
+	emotion ET_WRAP;
 	mes "[Argen]";
 	mes "Feel free to come ask me if you want more hairpins. Hey, I know I look lazy, but I do like to make things for the ladies. See ya later~!";
 	close;
@@ -979,7 +979,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		close;
 	}
 	else if (countitem(5033) > 0 && countitem(5064) > 0) {
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "[Pretty Lindsay]";
 		mes "Whoa~";
 		mes "You brought everything!";
@@ -1014,7 +1014,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		mes "Hello, there?";
 		mes "Mister...?";
 		next;
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Pretty Lindsay]";
 		mes "You look like you're freezing...";
 		mes "Um, I know! How about I make you a cute, warm and fuzzy Sea-Otter hat?";
@@ -1026,7 +1026,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		mes "I have to put together ^0000FF1 Raccoon Hat^000000 and ^0000FF1 Smokie Leaf^000000 to make a ^4D4DFFSea-Otter Hat^000000 for you, though.";
 		next;
 		if (select("Okay, I will come back with the stuff.:Um... How come you need a Raccoon Hat?") == 1) {
-			emotion e_heh;
+			emotion ET_SMILE;
 			mes "[Pretty Lindsay]";
 			mes "Cool~! Come back soon as you can~!";
 			close;
@@ -1051,7 +1051,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 	mes "Hello, hello~!";
 	mes "You're such a pretty lady!";
 	next;
-	emotion e_heh;
+	emotion ET_SMILE;
 	mes "[Pretty Lindsay]";
 	mes "Hey hey! Can I make you a Sea-Otter hat! It's really really really really cute!";
 	next;
@@ -1059,7 +1059,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 	mes "I need ^0000FF1 Raccoon Hat^000000 and ^0000FF1 Smokie Leaf^000000 so I can make a ^4D4DFFSea-Otter Hat^000000 for you.";
 	next;
 	if (select("Okay, I will come back with the stuff.:Um, why do you want to make hats so much?") == 1) {
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Pretty Lindsay]";
 		mes "Cool~!";
 		mes "Come back as";
@@ -1097,7 +1097,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 		mes "[Fuzzy Fuzz]";
 		mes "Excellent! You brought everything! Please make yourself comfortable while I make you your Teddybear Hat.";
 		next;
-		emotion e_ho;
+		emotion ET_DELIGHT;
 		mes "[Fuzzy Fuzz]";
 		mes "Hmm Hm Hmm...";
 		mes "Tear this off...";
@@ -1105,11 +1105,11 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 		mes "Okay, it's almost done...";
 		next;
 		mes "[Fuzzy Fuzz]";
-		emotion e_an;
+		emotion ET_FRET;
 		mes "There is an old saying, 'Everything comes to those who wait.' Oh, are you freezing? Why don't you rub your hands together?";
 		next;
 		mes "[Fuzzy Fuzz]";
-		emotion e_ic;
+		emotion ET_AHA;
 		mes "It's complete! There you go. I think this one will look really good on you! Please take good care of this hat.";
 		delitem 5030,1; //Panda_Cap
 		delitem 7213,100; //Needle_Pouch
@@ -1118,7 +1118,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 		getitem 5059,1; //Brown_Bear_Cap
 		close;
 	}
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mes "[Fuzzy Fuzz]";
 	mes "Hello there, young man.";
 	mes "What brings you to Lutie, town of goodwill and year round Christmas cheer?";
@@ -1159,7 +1159,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 	next;
 	mes "[Fuzzy Fuzz]";
 	mes "So, do you think you can get all of them? I will be here waiting for you.";
-	emotion e_heh;
+	emotion ET_SMILE;
 	close;
 }
 
@@ -1227,7 +1227,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 	}
 	if (countitem(2285) > 0 && countitem(1550) > 0) {
 		mes "[Nanhyang]";
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "You brought the materials~";
 		next;
 		mes "[Nanhyang]";
@@ -1241,7 +1241,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 		next;
 		if (select("Create:Cancel") == 1) {
 			mes "[Nanhyang]";
-			emotion e_ok;
+			emotion ET_OK;
 			mes "Thank you.";
 			mes "Let me create one for you right away. Please have a seat and make yourself comfortable.";
 			next;
@@ -1257,7 +1257,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 			mes " . . . . . . . . . . . . . ";
 			next;
 			mes "[Nanhyang]";
-			emotion e_ic;
+			emotion ET_AHA;
 			mes "That wasn't too difficult. I hope you wear this hat everyday to improve your posture.";
 			next;
 			mes "[Nanhyang]";
@@ -1282,12 +1282,12 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 			close;
 		}
 		mes "[Nanhyang]";
-		emotion e_dots;
+		emotion ET_THINK;
 		mes "I see. You must have brought items with cards or upgrades that you didn't want to lose. Feel free to come back anytime when you are ready.";
 		close;
 	}
 	mes "[Nanhyang]";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mes "Hello~";
 	mes "Welcome to the Handsome Charm Modeling School. May I help you?";
 	next;
@@ -1307,7 +1307,7 @@ payon_in03,8,193,4	script	Nanhyang#1	77,{
 		mes "Although we can't offer any classes at this time, I can create a special 'Model Training Hat' for you. That way, you can practice the glamourous way of walking down the catwalk on your own.";
 		next;
 		mes "[Nanhyang]";
-		emotion e_what;
+		emotion ET_QUESTION;
 		mes "But since our director is gone, we can't really use our budget to give you a hat. If you want, please bring me the following items...";
 		next;
 		mes "[Nanhyang]";
@@ -1337,27 +1337,27 @@ geffen,83,189,5	script	Seth#1	716,{
 	mes " [Seth]";
 	mes "Hello, my name is Seth!";
 	mes "I like folding paper and making origami. I made my mommy a big paper boat, and she gave me a big smile and patted my head!";
-	emotion e_heh;
+	emotion ET_SMILE;
 	next;
 	mes "[Seth]";
 	mes "Today at school, I learned how to make a paper flower! The flower was sort of hard, but now I can do it! Then I made a tiny tiny flower and put in on my head~";
-	emotion e_lv;
+	emotion ET_THROB;
 	next;
 	if (countitem(2278) > 0 && countitem(975) > 0) {
 		mes "[Seth]";
 		mes "Hey~!";
 		mes "You have a Mr. Smile and Scarlet Dyestuffs! Yaaay~! I could use those and make you a paper flower. C'mon, lemme show you!";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		mes "[Seth]";
 		mes "Lemme make";
 		mes "one for you,";
 		mes "pwease pwease?";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		switch(select("Alright!:No thanks kid.:Boys aren't supposed to make flowers.")) {
 		case 1:
-			emotion e_heh;
+			emotion ET_SMILE;
 			mes "[Seth]";
 			mes "Yay~";
 			mes "You're the best!";
@@ -1368,7 +1368,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "*Snip Snip Snip~~*";
 			mes "*Snip...Snip...*";
 			mes "Yyyyyaaaeeep...";
-			emotion e_ho;
+			emotion ET_DELIGHT;
 			next;
 			mes "[Seth]";
 			mes "Tah dah~!";
@@ -1399,7 +1399,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "*Sniff sniff*";
 			mes "O-okay...";
 			mes "But I just wanted to show you how good I am...";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		case 3:
 			mes "[" + strcharinfo(0) + "]";
@@ -1411,7 +1411,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "[Seth]";
 			mes "Waaaaaaah~!";
 			mes "But flowers are so nice and pweety!!!";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 	}
@@ -1436,7 +1436,7 @@ geffen,83,189,5	script	Seth#1	716,{
 			mes "Seth will wait for you here. Promise me you'll come back?";
 			close;
 		}
-		emotion e_sob;
+		emotion ET_CRY;
 		mes "[Seth]";
 		mes "Wah~~~~~!";
 		close;
@@ -2145,7 +2145,7 @@ morocc,273,79,4	script	Educated Traveller	99,{
 				delitem 7206,300; //Black_Kitty_Doll
 				delitem 7030,1; //Claw_Of_Desert_Wolf
 				getitem 5058,1; //Drooping_Kitty
-				emotion e_ho;
+				emotion ET_DELIGHT;
 				close;
 			}
 			else {
@@ -2215,7 +2215,7 @@ morocc,273,79,4	script	Educated Traveller	99,{
 				delitem 945,600; //Raccoon_Leaf
 				delitem 7030,1; //Claw_Of_Desert_Wolf
 				getitem 5064,1; //Leaf_Headgear
-				emotion e_gasp;
+				emotion ET_SURPRISE;
 				close;
 			}
 			else {
@@ -2292,7 +2292,7 @@ morocc,273,79,4	script	Educated Traveller	99,{
 				delitem 945,10; //Raccoon_Leaf
 				delitem 7030,1; //Claw_Of_Desert_Wolf
 				getitem 5084,1; //Lazy_Raccoon
-				emotion e_heh;
+				emotion ET_SMILE;
 				close;
 			}
 			else {
@@ -2379,7 +2379,7 @@ morocc,273,79,4	script	Educated Traveller	99,{
 				delitem 938,100; //Sticky_Mucus
 				delitem 7030,1; //Claw_Of_Desert_Wolf
 				getitem 5065,1; //Fish_On_Head
-				emotion e_ic;
+				emotion ET_AHA;
 				close;
 			}
 			else {
@@ -2448,7 +2448,7 @@ morocc,273,79,4	script	Educated Traveller	99,{
 		next;
 		mes "[Lee Hester]";
 		mes "I hope you're having a good time here in Morroc. If you ever question the special abilities of animals, just think of the majestic Desert Wolf that's able to thrive in the harsh Morroc deserts.";
-		emotion e_paper;
+		emotion ET_WRAP;
 		close;
 	}
 }

npc/quests/newgears/2005_headgears.txt

@@ -340,7 +340,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 										mes "Did you just--?!";
 										mes "Ugh, you're the worst";
 										mes "type of person, you know that?";
-										emotion e_omg;
+										emotion ET_HUK;
 										close;
 									case 2:
 										mes "[Morris]";
@@ -369,7 +369,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 												mes "cannot be forgiven, no";
 												mes "matter how unfounded";
 												mes "and groundless they are!";
-												emotion e_omg;
+												emotion ET_HUK;
 												close;
 										}
 								}
@@ -548,7 +548,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 					mes "^0000FF1887 Tassels^000000,";
 					mes "^0000FF1 Slotted Bucket Hat^000000";
 					mes "and ^0000FF1,887 zeny^000000. That's all!";
-					emotion e_an;
+					emotion ET_FRET;
 					next;
 					mes "[Morris]";
 					mes "Now, remember everything";
@@ -648,7 +648,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 				mes "and be able to recall";
 				mes "minute details in order";
 				mes "to crack the case.";
-				emotion e_sob;
+				emotion ET_CRY;
 				next;
 				mes "[Morris]";
 				mes "Remember...";
@@ -715,7 +715,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 					mes "^0000FF1887 Tassels^000000,";
 					mes "^0000FF1 Slotted Bucket Hat^000000";
 					mes "and ^0000FF1,887 zeny^000000. Okay?";
-					emotion e_an;
+					emotion ET_FRET;
 					close;
 				}
 				mes "[Morris]";
@@ -801,7 +801,7 @@ lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 			mes "for the past few days. But";
 			mes "if she doesn't eat, how does";
 			mes "she expect to get better?";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "[Kid]";
 			mes "So I guess what I'm";
@@ -857,7 +857,7 @@ lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 					mes "asking too much from";
 					mes "you. I mean, it's true";
 					mes "that you barely know me...";
-					emotion e_sob;
+					emotion ET_CRY;
 					close;
 			}
 		case 2:
@@ -868,7 +868,7 @@ lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 			mes "don't even have the";
 			mes "time to listen to some";
 			mes "little boy's problems...";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 	}
 }
@@ -1129,7 +1129,7 @@ lighthalzen,182,89,0	script	Relaxed-Looking Lady	91,{
 				mes "do much of anything.";
 				mes "Just sit. Relax.";
 				set LHZBTQ,1;
-				emotion e_heh;
+				emotion ET_SMILE;
 				next;
 				mes "[Achiha]";
 				mes "I do have a hobby,";
@@ -1584,7 +1584,7 @@ gl_prison1,137,138,5	script	Zealotus#LhzHat	1200,{
 		mes "passionate ways. Now I can";
 		mes "show him the stinging love";
 		mes "of my whip! Hohohohohoho!";
-		emotion e_kis;
+		emotion ET_CHUP;
 		close;
 	}
 
@@ -1623,7 +1623,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 		mes "honestly not carrying anything";
 		mes "of value! Z-Zealotus, please!";
 		mes "Zealotus, heeeeeelp me~!";
-		emotion e_sob;
+		emotion ET_CRY;
 
 		if(!(
 			countitem(1950) || countitem(1951) || countitem(1952) || 
@@ -1686,7 +1686,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 			mes "Th-there's nothing I can";
 			mes "give you, so please don't";
 			mes "hurt me! Oh, oh p-please...!";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			next;
 			switch( select( "Feed him Dark Crystal Fragment.", "Threaten him." ) )
 			{
@@ -1753,7 +1753,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 		mes "They're everywhere!";
 		mes "You guys--I can't...";
 		mes "You're torturing me!";
-		emotion e_sob;
+		emotion ET_CRY;
 		close;
 	}
 	else if(ZLMASKQ == 4)
@@ -1843,7 +1843,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 			mes "Zealotus is too good for me.";
 			mes "I'm not even worthy of tasting";
 			mes "the sting of her Love Whip.";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 		else if(.@phen_point == 4)
@@ -1926,7 +1926,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 								mes "[Phendark]";
 								mes "GRRRRRR!";
 								mes "THAT'S ENOUGH!";
-								emotion e_ag;
+								emotion ET_ANGER;
 								next;
 								mes "[Phendark]";
 								mes "I don't care who the";
@@ -1935,7 +1935,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	1202,{
 								mes "that tramp a piece of my";
 								mes "mind! Grrrr! She'll be sorry!";
 								set ZLMASKQ,6;
-								emotion e_an;
+								emotion ET_FRET;
 								close;
 							case 2:
 								mes "^3131FF[" + strcharinfo(0) + "]^000000";

npc/quests/newgears/2008_headgears.txt

@@ -17,7 +17,7 @@
 gef_fild05,80,149,3	script	Myu#08_hat	877,{
 	mes "[Myu]";
 	mes "Meow...";
-	emotion e_omg;
+	emotion ET_HUK;
 	next;
 	if(hatcat2008 == 0) {
 		mes "[Myu]";

npc/quests/quests_13_1.txt

@@ -1982,7 +1982,7 @@ mid_camp,222,283,4	script	Marian#ep13bs	727,{
 				mes "As expected~";
 				mes "I'm not lying, but usually";
 				mes "I never forget a face.";
-				emotion e_lv;
+				emotion ET_THROB;
 				next;
 				mes "[Marian]";
 				mes "Well, anyway...";
@@ -2030,21 +2030,21 @@ mid_camp,222,283,4	script	Marian#ep13bs	727,{
 	if (ep13_newbs == 1) {
 		mes "[Marian]";
 		mes "Go to the right to see ^0000FFInstructor Lugen^000000.";
-		emotion e_lv;
+		emotion ET_THROB;
 		close;
 	}
 	if ((ep13_newbs > 1) && (ep13_newbs < 13)) {
 		mes "[Marian]";
 		mes "Wow, good to see you again.";
 		mes "Do you feel comfortable around here?";
-		emotion e_lv;
+		emotion ET_THROB;
 		close;
 	}
 	if (ep13_newbs == 13) {
 		mes "[Marian]";
 		mes "Hey, how are you?";
 		mes "What brings you here?";
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "The instructor sent me.";
@@ -2079,7 +2079,7 @@ mid_camp,222,283,4	script	Marian#ep13bs	727,{
 			mes "[Marian]";
 			mes "Ha! You misplaced the Supply Box?!";
 			mes "What the~~?";
-			emotion e_omg;
+			emotion ET_HUK;
 			next;
 			mes "[Marian]";
 			mes "Ok, I have spares.";
@@ -2093,7 +2093,7 @@ mid_camp,222,283,4	script	Marian#ep13bs	727,{
 			mes "Do your job, man~";
 			mes "And please say hello";
 			mes "to the instructor.";
-			emotion e_lv;
+			emotion ET_THROB;
 			close;
 		}
 	}
@@ -2102,14 +2102,14 @@ mid_camp,222,283,4	script	Marian#ep13bs	727,{
 		mes "Hey~";
 		mes "How have you been recently?";
 		mes "I am busy all the time...";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[Marian]";
 		mes "The supplies from the motherland are...";
 		mes "Ah...";
 		mes "Nothing, do not care...";
 		mes "Hohoho...";
-		emotion e_omg;
+		emotion ET_HUK;
 		close;
 	}
 }
@@ -2459,7 +2459,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 		mes "please take care of yourself.";
 		mes "I have more things";
 		mes "to do now, ha...";
-		emotion e_pif;
+		emotion ET_HNG;
 		set ep13_newbs,21;
 		completequest 11098;
 		close;
@@ -2470,7 +2470,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			mes "There must be no";
 			mes "time to rest for me.";
 			mes "Huu...~";
-			emotion e_pif;
+			emotion ET_HNG;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "What is wrong with you?";
@@ -2563,7 +2563,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			mes "There must be no";
 			mes "time to rest for me.";
 			mes "Huu...~";
-			emotion e_pif;
+			emotion ET_HNG;
 			close;
 		}
 	}
@@ -2572,7 +2572,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 		mes "There must be no";
 		mes "time to rest for me.";
 		mes "Huu...~";
-		emotion e_pif;
+		emotion ET_HNG;
 		next;
 		switch(select("Help him.:Just pass.")) {
 		case 1:
@@ -2666,7 +2666,7 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			mes "Hehe, don't mention it.";
 			mes "And Otto said that he";
 			mes "would come to see you.";
-			emotion e_shy,1;
+			emotion ET_SHY, playerattached();
 			next;
 			mes "[Instructor Lugen]";
 			mes "Did he?";
@@ -2832,7 +2832,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 		mes "...I mean...";
 		mes "Hmm...";
 		mes "...I would...";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 	if (ep13_newbs == 3) {
@@ -2841,7 +2841,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 		mes "...What makes...";
 		mes "Hmm...";
 		mes "...I would...";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		mes "[Brink]";
 		mes "Hmmm... Hey...";
@@ -2855,7 +2855,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 			mes "Hmm...";
 			mes "...Hey...";
 			mes "What...your name...";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "My name is "+ strcharinfo(0) +".";
@@ -2866,7 +2866,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 			mes "You...";
 			mes "...registered...Hmm...";
 			mes "...";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			next;
 			mes "[Brink]";
 			mes "Here...";
@@ -2877,7 +2877,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 			mes "Hmmm...";
 			mes "and...";
 			mes "I mean...";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Is it finished?";
@@ -2903,7 +2903,7 @@ mid_campin,106,122,4	script	Receptionist Brink#ep13b	89,{
 			mes "And...";
 			mes "......This thing...";
 			mes "...Ehh...";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			close;
 		}
 	}
@@ -2925,20 +2925,20 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 	if (ep13_newbs < 5) {
 		mes "[Diego]";
 		mes "I'm busy right now!";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 	if (ep13_newbs == 5) {
 		mes "[Diego]";
 		mes "Wow, this is tent is big!";
 		mes "Hey, you there, adventurer. Please help me.";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		switch(select("Help him.:Don't help.")) {
 		case 1:
 			mes "[Diego]";
 			mes "Thanks.";
-			emotion e_thx;
+			emotion ET_THANKS;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "What do you need?";
@@ -2960,11 +2960,11 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Hah!! How did you know my name?!";
-			emotion e_omg,1;
+			emotion ET_HUK, playerattached();
 			next;
 			mes "[Diego]";
 			mes "It's on your nameplate.";
-			emotion e_dots;
+			emotion ET_THINK;
 			next;
 			select("So how can I help you.");
 			mes "[Diego]";
@@ -2998,7 +2998,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 			mes "...";
 			mes "You're too harsh.";
 			mes "Sob...";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 	}
@@ -3009,7 +3009,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 			mes "You finally brought";
 			mes "the materials!";
 			mes "I'm so grateful!!";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "[Diego]";
 			mes "Ok, so while I hold this post,";
@@ -3063,7 +3063,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 			mes "No, I just...";
 			mes "I was assigned to stay";
 			mes "in these barracks.";
-			emotion e_swt2,1;
+			emotion ET_PROFUSELY_SWEAT, playerattached();
 			next;
 			mes "[Diego]";
 			mes "Oh!!!";
@@ -3087,7 +3087,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 	else {
 		mes "[Diego]";
 		mes "I'm busy right now!";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 }
@@ -3189,7 +3189,7 @@ mid_campin,292,120,4	script	Davi#ep13bs	849,{
 	mes "Ahhh, my body...";
 	mes "I walked too much...";
 	mes "and my body hurts.";
-	emotion e_sob;
+	emotion ET_CRY;
 	close;
 }
 
@@ -3202,12 +3202,12 @@ mid_camp,160,298,4	script	Jan#ep13bs	865,{
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Yes...";
-			emotion e_swt,1;
+			emotion ET_SWEAT, playerattached();
 			next;
 			mes "[Jan]";
 			mes "Ahhh, it's exciting~";
 			mes "I love it.";
-			emotion e_awsm;
+			emotion ET_COOL;
 			next;
 			mes "[Jan]";
 			mes "I want to unwrap it right now~";
@@ -3225,7 +3225,7 @@ mid_camp,160,298,4	script	Jan#ep13bs	865,{
 			mes "Why hasn't the product";
 			mes "that I ordered one month";
 			mes "ago come yet?";
-			emotion e_an;
+			emotion ET_FRET;
 			close;
 		}
 	}
@@ -3243,7 +3243,7 @@ mid_camp,160,298,4	script	Jan#ep13bs	865,{
 		next;
 		mes "[Jan]";
 		mes "It, it's a secret...";
-		emotion e_shy;
+		emotion ET_SHY;
 		close;
 	}
 	else {
@@ -3281,7 +3281,7 @@ mid_camp,30,168,4	script	Gerard#ep13bs	939,{
 			mes "I was considering";
 			mes "going back to the camp.";
 			mes "I really appreciate this.";
-			emotion e_rice;
+			emotion ET_HUNGRY;
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "...";
@@ -3296,7 +3296,7 @@ mid_camp,30,168,4	script	Gerard#ep13bs	939,{
 			mes "[Gerard]";
 			mes "Please tell the instructor that";
 			mes "I won't be back for some time.";
-			emotion e_no1;
+			emotion ET_BEST;
 			delitem 6045,1; //Supply_Box
 			set ep13_newbs,18;
 			getitem 12322,1; //Chocolate_Pie
@@ -3308,7 +3308,7 @@ mid_camp,30,168,4	script	Gerard#ep13bs	939,{
 			mes "Hhhh, I am starving.";
 			mes "When will the supplies come?";
 			mes "It is killing me...";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 	}
@@ -3349,7 +3349,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "I finally got it.";
 			mes "My coat...sniff.";
 			mes "It's freezing here.";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "[Alberto]";
 			mes "Sniff...";
@@ -3378,7 +3378,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "Please tell the Instructor";
 			mes "that I am still alive.";
 			mes "Sniff.";
-			emotion e_sob;
+			emotion ET_CRY;
 			delitem 6045,1; //Supply_Box
 			set ep13_newbs,20;
 			getitem 12322,1; //Chocolate_Pie
@@ -3389,7 +3389,7 @@ man_fild01,80,248,4	script	Alberto#ep13bs	934,{
 			mes "[Alberto]";
 			mes "It's so cold here~~";
 			mes "the wind chills me to the bones~";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 	}
@@ -3437,7 +3437,7 @@ mid_camp,166,248,4	script	Sorcerer#ep13bs	937,{
 	next;
 	mes "[Biolay]";
 	mes "I want to go back to my house.";
-	emotion e_sob;
+	emotion ET_CRY;
 	close;
 }
 
@@ -3541,7 +3541,7 @@ mid_camp,267,263,0	script	Post#ep13bs1	111,{
 						mes "[Diego]";
 						mes "...";
 						mes "Why aren't you helping?";
-						emotion e_sob;
+						emotion ET_CRY;
 						close;
 					}
 				}
@@ -3625,7 +3625,7 @@ mid_camp,267,258,0	script	Post#ep13bs2	111,{
 						mes "[Diego]";
 						mes "...";
 						mes "Why aren't you helping?";
-						emotion e_sob;
+						emotion ET_CRY;
 						close;
 					}
 				}
@@ -3696,7 +3696,7 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 			mes "Botanist Terris Block is";
 			mes "my older twin brother.";
 			next;
-			emotion e_dots;
+			emotion ET_THINK;
 			mes "[Rumis Block]";
 			mes "This place is freezing. Not only";
 			mes "that, it's deserted and too";
@@ -4103,7 +4103,7 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 				changequest 2153,2154;
 				close;
 			case 2:
-				emotion e_sob;
+				emotion ET_CRY;
 				mes "[Rumis Block]";
 				mes "Oh.........";
 				close;
@@ -4338,7 +4338,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 		mes "Undiscovered life!";
 		mes "Everything about this world excites me.";
 		next;
-		emotion e_lv2;
+		emotion ET_BIGTHROB;
 		mes "[Botanist]";
 		mes "Oh, okay... Ah-hah!";
 		mes "This is how it goes...";
@@ -4351,7 +4351,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "Undiscovered life!";
 			mes "Everything about this world excites me.";
 			next;
-			emotion e_lv2;
+			emotion ET_BIGTHROB;
 			mes "[Botanist]";
 			mes "Oh, okay... Ah-hah!";
 			mes "This is how it goes...";
@@ -4362,8 +4362,8 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "Undiscovered life!";
 			mes "Everything about this world excites me.";
 			next;
-			emotion e_lv2;
-			emotion e_dots,1;
+			emotion ET_BIGTHROB;
+			emotion ET_THINK, playerattached();
 			mes "[Botanist]";
 			mes "Oh, okay... Ah-hah!";
 			mes "This is how it goes...";
@@ -4380,7 +4380,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			case 2:
-				emotion e_lv2,1;
+				emotion ET_BIGTHROB, playerattached();
 				mes "["+strcharinfo(0)+"]";
 				mes "I agree. There's so much to see around here!";
 				next;
@@ -4396,11 +4396,11 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			next;
 			mes "- You have given the Nepenthes Specimen to the botanist. -";
 			next;
-			emotion e_bzz;
+			emotion ET_STARE;
 			mes "[Botanist]";
 			mes "Oh...? Isn't this?!";
 			next;
-			emotion e_omg,1;
+			emotion ET_HUK, playerattached();
 			mes "[Botanist]";
 			mes "...Well, I've got a ton of samples of this specimen. Sorry.";
 			next;
@@ -4428,14 +4428,14 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 			mes "[Botanist]";
 			mes "Usually twins share the same feelings and ideas, I can see what he does or thinks if I try hard.";
 			next;
-			emotion e_sigh;
+			emotion ET_OHNO;
 			mes "[Botanist]";
 			mes "Let me see what Rumis is doing right now... Oh, he's picking his nose with his left hand and eating a slice of bread with his right.";
 			mes "God, how disgusting!";
 			next;
 			switch(select("Go check Rumis if it's true.:Do not trust his word.")) {
 			case 1:
-				emotion e_heh;
+				emotion ET_SMILE;
 				mes "[Botanist]";
 				mes "Hahaha!";
 				mes "Muhahaha!";
@@ -4448,7 +4448,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			case 2:
-				emotion e_sigh;
+				emotion ET_OHNO;
 				mes "[Botanist]";
 				mes "Oh,";
 				mes "won't you cut me some slack? I was just joking to melt the ice.";
@@ -4456,7 +4456,7 @@ mid_camp,240,270,3	script	Botanist#ep13	750,{
 				next;
 				break;
 			}
-			emotion e_pif;
+			emotion ET_HNG;
 			mes "[Botanist]";
 			mes "Anyways, as I said, I've got a lot of Nepenthes specimens.";
 			mes "But I'll gratefully take this pretentious gift of his.";
@@ -4852,7 +4852,7 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 			mes "It has tiny wings on the back...";
 			mes "It's a fairy!";
 			next;
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Small Fairy]";
 			mes "RLGHLRXLA TKANTLFDMS";
 			mes "WJACK TNAHRDNJSDMFH";
@@ -4867,7 +4867,7 @@ spl_fild02,34,223,5	script	Small Fairy#spl	442,{
 			close;
 		}
 	}
-	emotion e_an;
+	emotion ET_FRET;
 	if (!isequipped(2782) && ep13_2_rhea < 100) {
 		mes "[Small Fairy]";
 		mes "RLGHLRXLA TKANTLFDMS";
@@ -4889,7 +4889,7 @@ man_fild03,236,105,3	script	Tree Giant#man	454,{
 			mes "You have found something moving between dry branches.";
 			mes "It appears to be a tree at first glance, but it turns out to be a giant that is half tree and half man.";
 			next;
-			emotion e_dots;
+			emotion ET_THINK;
 			mes "[Tree Giant]";
 			mes "TJDTMFJDNS CJFDI";
 			mes "TKADLFDMF QKATOS";
@@ -4904,7 +4904,7 @@ man_fild03,236,105,3	script	Tree Giant#man	454,{
 			close;
 		}
 	}
-	emotion e_dots;
+	emotion ET_THINK;
 	if (!isequipped(2782) && ep13_2_rhea < 100) {
 		mes "[Tree Giant]";
 		mes "TJDTMFJDNS CJFDI";
@@ -5007,7 +5007,7 @@ OnTouch_:
 			next;
 			mes "[United Research Official]";
 			mes "Alas, the head office keeps pushing me to submit a report... As if I could perform miracles!";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "[United Research Official]";
 			mes "I can't go around and meet those people myself, mediate among troubled people... This is impossible!! Unless...Unless someone helps me with that ! I need... someone...";
@@ -5084,7 +5084,7 @@ OnTouch_:
 				next;
 				mes "[United Research Official]";
 				mes "As you've heard, about the 3 researchers, they don't agree with eachother too often. It's just too obvious that their meeting will turn out a disaster, and the whole research group could break down!";
-				emotion e_sob;
+				emotion ET_CRY;
 				next;
 				mes "[United Research Official]";
 				mes "Oh, just thinking about it scares the crap out of me.";
@@ -5114,7 +5114,7 @@ OnTouch_:
 			next;
 			mes "[United Research Official]";
 			mes "First, you should go meet those 3 researchers and check on them to prepare for the meeting. Hope they're not preparing any weapons though...";
-			emotion e_sob;
+			emotion ET_CRY;
 			close;
 		}
 		else if (ep13_1_rhea == 19) {
@@ -5229,7 +5229,7 @@ OnTouch_:
 			mes "Hhmm, hmmmm...";
 			mes "I really don't know what to say.";
 			mes "I mean... I'm totally OK with other monsters, mutants or whatever, but that black evil thing... Oh, I can't stand that one...";
-			emotion e_sob;
+			emotion ET_CRY;
 			next;
 			mes "- Knock, knock-";
 			mes "- The researchers come back into the room. -";
@@ -9829,7 +9829,7 @@ mid_camp,206,286,3	script	Expedition Messenger	997,{
 		mes "[Expedition Messenger]";
 		mes "You, head to Schwaltzval Republic.";
 		mes "And you, take Arunafeltz. I'll visit Prontera Palace.";
-		emotion e_ok,0,"Expedition Messenger#2";
+		emotion ET_OK, getnpcid(0, "Expedition Messenger#2");
 		next;
 		mes "[Expedition Messenger]";
 		mes "I'll see you guys later.";
@@ -9859,7 +9859,7 @@ mid_camp,206,286,3	script	Expedition Messenger	997,{
 			mes "Give it to me, now!";
 			next;
 			donpcevent "Expedition Messenger#2::OnEnable";
-			emotion e_casp,0,"Expedition Messenger#3";
+			emotion ET_SURPRISE, getnpcid(0, "Expedition Messenger#3");
 			cutin "ep13_shadow_edq",2;
 			mes "[???]";
 			mes "Argh...";
@@ -9913,7 +9913,7 @@ mid_camp,206,286,3	script	Expedition Messenger	997,{
 			mes "Oh, yeah? Then I'll have to use force!";
 			next;
 			donpcevent "Expedition Messenger#2::OnEnable";
-			emotion e_casp,0,"Expedition Messenger#3";
+			emotion ET_SURPRISE, getnpcid(0, "Expedition Messenger#3");
 			mes "[???]";
 			mes "Argh!";
 			next;
@@ -13527,8 +13527,8 @@ OnTouch_:
 	next;
 	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_1";
 	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_2";
-	emotion e_gasp,"Rin#moc2_bt_rin01";
-	emotion e_gasp,1;
+	emotion ET_SURPRISE, getnpcid(0, "Rin#moc2_bt_rin01");
+	emotion ET_SURPRISE, playerattached();
 	mes "[Rin]";
 	mes "You're not alone. So what?";
 	mes "You're still coming with me!";
@@ -13554,7 +13554,7 @@ OnTouch_:
 	donpcevent "Dandelion Member#moc2_5::OnEnable";
 	next;
 	specialeffect EF_FREEZED,AREA,"Rin#moc2_bt_rin02";
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mapannounce "que_dan01", "Rin: When.. When did you...!?!",bc_map,"0x7b68ee";
 	mes "[Rayan]";
 	mes "I'm sorry that I have to do this.";

npc/quests/quests_13_2.txt

@@ -3454,8 +3454,8 @@ OnReset:
 	end;
 
 OnTouch_:
-	emotion e_gasp,1;
-	emotion e_omg;
+	emotion ET_SURPRISE, playerattached();
+	emotion ET_HUK;
 	disablenpc "Stranger#ep13_2_dan01";
 	donpcevent "Stranger#ep13_2_dan02::OnCall";
 	end;
@@ -3482,8 +3482,8 @@ OnReset:
 	end;
 
 OnTouch_:
-	emotion e_gasp,1;
-	emotion e_omg;
+	emotion ET_SURPRISE, playerattached();
+	emotion ET_HUK;
 	disablenpc "Stranger#ep13_2_dan02";
 	donpcevent "Stranger#ep13_2_dan01::OnCall";
 	end;
@@ -4381,7 +4381,7 @@ mid_camp,147,256,3	script	Rune Midgarts Magician#1	735,{
 			mes "Lumos Nox Densaugeo Dissendium Diffindo Engorgio Mobiliarbus Expecto patronum!!!!";
 			next;
 			specialeffect EF_FLASHER; // 99 : "Rune Midgarts Magician#ep132_rhea03" EF_FLASHER
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			mes "[Magician Whisper]";
 			mes "Wow!!! Th, This is unbelievable!";
 			next;
@@ -4904,7 +4904,7 @@ mjolnir_12,220,37,0	duplicate(mjo_no_find)	#mj12_find_3	-1,5,5
 				}
 				else {
 					mes "- You succeeded to mine minerals. -";
-					emotion e_ic,1;
+					emotion ET_AHA, playerattached();
 					set .@stst,rand(1,5);
 					if (.@stst == 5) getitem 6077,5; //Rough_Mineral
 					else if (.@stst == 1) getitem 6077,1; //Rough_Mineral
@@ -5255,7 +5255,7 @@ OnTouch_:
 				}
 				else {
 					mes "- You succeeded to mine minerals. -";
-					emotion e_ic,1;
+					emotion ET_AHA, playerattached();
 					set .@stst,rand(1,5);
 					if (.@stst == 5) getitem 6077,5; //Rough_Mineral
 					else if (.@stst == 1) getitem 6077,2; //Rough_Mineral
@@ -5388,7 +5388,7 @@ OnTouch_:
 				}
 				else {
 					mes "- You succeeded to mine minerals. -";
-					emotion e_ic,1;
+					emotion ET_AHA, playerattached();
 					set .@stst,rand(1,5);
 					if (.@stst == 5) getitem 6077,5; //Rough_Mineral
 					else if (.@stst == 1) getitem 6077,2; //Rough_Mineral
@@ -5571,13 +5571,13 @@ spl_in01,30,324,3	script	High Laphine#grenouille	446,{
 			}
 			else if (ep13_2_tre1 == 3) {
 				if (countitem(6079) == 1) {
-					emotion e_swt;
-					emotion e_swt,1;
+					emotion ET_SWEAT;
+					emotion ET_SWEAT, playerattached();
 					mes "[Grenouille]";
 					mes "Hoo, this is one of the";
 					mes "most common kinds of flowers.";
 					next;
-					emotion e_heh;
+					emotion ET_SMILE;
 					mes "[Grenouille]";
 					mes "Haha, Don't worry.";
 					mes "Common flowers like this can bring the familiarity of home back to the soldiers.";
@@ -5728,16 +5728,16 @@ spl_in02,139,65,3	script	Middle-Ranked Laphine#la	438,{
 			mes "but sometimes he help others well! Huhu!";
 			next;
 			mes "- rummaging -";
-			emotion e_dots;
+			emotion ET_THINK;
 			next;
 			mes "- rummaging -";
 			mes "- rummaging -";
-			emotion e_dots;
+			emotion ET_THINK;
 			next;
 			mes "- rummaging -";
 			mes "- rummaging -";
 			mes "- rummaging -";
-			emotion e_ic;
+			emotion ET_AHA;
 			next;
 			mes "[Flowery]";
 			mes "Wow! Come here!";
@@ -5833,7 +5833,7 @@ splendide,205,139,5	script	Exhausted Soldier#1	447,{
 					next;
 					mes "[Exhausted Soldier]";
 					mes "Ahh! Feeling much better!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_1::OnEnable";
@@ -5890,7 +5890,7 @@ splendide,181,135,5	script	Exhausted Soldier#2	447,{
 					mes "What happen?";
 					mes "Feel better suddenly! I'm so happy now!";
 					mes "Let's go to work!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_2::OnEnable";
@@ -5950,7 +5950,7 @@ splendide,139,178,5	script	Exhausted Soldier#3	447,{
 					next;
 					mes "[Exhausted Soldier]";
 					mes "Let's beat Sapha and go back home!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_3::OnEnable";
@@ -6010,7 +6010,7 @@ splendide,164,188,5	script	Exhausted Soldier#4	447,{
 					next;
 					mes "[Exhausted Soldier]";
 					mes "Ahh! Feels like at home!!";
-					emotion e_sob;
+					emotion ET_CRY;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_4::OnEnable";
@@ -6070,7 +6070,7 @@ splendide,177,257,5	script	Exhausted Soldier#5	447,{
 					next;
 					mes "[Exhausted Soldier]";
 					mes "Ahh! Feeling much better!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_5::OnEnable";
@@ -6130,7 +6130,7 @@ splendide,124,212,5	script	Exhausted Soldier#6	447,{
 					mes "[Exhausted Soldier]";
 					mes "Yes, Splendide also a part of Alfheim!";
 					mes "Go Laphines!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_6::OnEnable";
@@ -6190,7 +6190,7 @@ splendide,196,153,5	script	Exhausted Soldier#7	447,{
 					next;
 					mes "[Exhausted Soldier]";
 					mes "Ahh! Feeling much better!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					delitem 6082,1; //Spirit_Of_Alfheim
 					close2;
 					donpcevent "#tukare_7::OnEnable";
@@ -6247,7 +6247,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 		mes "Hu~~";
 		mes "That's pretty interesting...";
 		mes "I will take note of it in my research papers.";
-		emotion e_ic,"Bazett Teablack#ep13bs";
+		emotion ET_AHA;
 		next;
 		mes "[Industrious Man]";
 		mes "write...write...";
@@ -6267,7 +6267,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 			mes "Hu~~";
 			mes "That's pretty interesting...";
 			mes "I will take note of it in my research papers.";
-			emotion e_ic,"Bazett Teablack#ep13bs";
+			emotion ET_AHA;
 			next;
 			mes "[Industrious Man]";
 			mes "write...write...";
@@ -6284,7 +6284,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 			mes "Auch!!!";
 			mes "Who...who are you?!";
 			mes "How long have you been standing there?";
-			emotion e_omg,"Bazett Teablack#ep13bs";
+			emotion ET_HUK;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "Uh, I'm just passing by.";
@@ -6292,7 +6292,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "See you~!!";
-			emotion e_swt2,1;
+			emotion ET_PROFUSELY_SWEAT, playerattached();
 			next;
 			mes "[Industrious Man]";
 			mes "Uh!! Wait!!";
@@ -6306,12 +6306,12 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 			next;
 			mes "[Industrious Man]";
 			mes "My research is not going so well. The god of fate must have sent you to me. I'm sure of it!!";
-			emotion e_no1,"Bazett Teablack#ep13bs";
+			emotion ET_BEST;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "......";
 			mes "......What?!";
-			emotion e_omg,1;
+			emotion ET_HUK, playerattached();
 			next;
 			mes "[Industrious Man]";
 			mes "Would you like to help me with my search?";
@@ -6363,7 +6363,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 					mes ".............";
 					mes ".............";
 					mes "...........Why!!!!!";
-					emotion e_sob,"Bazett Teablack#ep13bs";
+					emotion ET_CRY;
 					next;
 					mes "[Industrious Man]";
 					mes "Well if you decide to change your mind, come back to me.";
@@ -6422,7 +6422,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 				mes ".............";
 				mes ".............";
 				mes "...........Why!!!!!";
-				emotion e_sob,"Bazett Teablack#ep13bs";
+				emotion ET_CRY;
 				next;
 				mes "[Industrious Man]";
 				mes "Well if you decide to change your mind, come back to me.";
@@ -6509,7 +6509,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	883,{
 			mes "[Industrious Man]";
 			mes ".............";
 			mes "Well if you decide to change your mind, come back to me.";
-			emotion e_sob,"Bazett Teablack#ep13bs";
+			emotion ET_CRY;
 			close;
 		}
 	}
@@ -6648,7 +6648,7 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 				mes "......";
 				mes ".........";
 				mes "Nothing!!";
-				emotion e_omg,"Worker#ep13bs";
+				emotion ET_HUK;
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "What's up?";
@@ -6660,7 +6660,7 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "Yes, sorry to startle you.";
-				emotion e_heh,1;
+				emotion ET_SMILE, playerattached();
 				next;
 				mes "[Worker]";
 				mes "Haha, it's ok.";
@@ -6703,8 +6703,8 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 				mes "[Worker]";
 				mes "Ugh!!!";
 				mes "**Sigh**";
-				emotion e_sob,"Worker#ep13bs";
-				emotion e_sob,1;
+				emotion ET_CRY;
+				emotion ET_CRY, playerattached();
 				next;
 				mes "[Worker]";
 				mes "Well that's that!";
@@ -6767,7 +6767,7 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 				mes "......";
 				mes ".........";
 				mes "Nevermind. Nothing.";
-				emotion e_omg,"Worker#ep13bs";
+				emotion ET_HUK;
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "You don't have to be like this.";
@@ -6779,7 +6779,7 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "Since I'm travelling here, so I thought I'd need it...";
-				emotion e_heh,1," ET_SMILE";
+				emotion ET_SMILE, playerattached();
 				next;
 				mes "[Worker]";
 				mes "Haha, is that so?";
@@ -6824,8 +6824,8 @@ manuk,193,135,0	script	Worker#ep13bs	454,{
 				next;
 				mes "[Worker]";
 				mes "Ah!!!";
-				emotion e_sob,"Worker#ep13bs";
-				emotion e_sob,1;
+				emotion ET_CRY;
+				emotion ET_CRY, playerattached();
 				next;
 				mes "[Worker]";
 				mes "I can't just care about pride now.";

npc/quests/quests_airship.txt

@@ -132,7 +132,7 @@ airplane,47,61,7	script	Crewman	4_M_ZONDAOYAJI,{
 				mes "K-Kafra...?";
 				mes "Hmm, maybe I better";
 				mes "not send this up after all...";
-				emotion e_an;
+				emotion ET_FRET;
 			} else if (.@comment$ == "0") {
 				mes "[Kain Himere]";
 				mes "Ah, well, if you have any";
@@ -663,7 +663,7 @@ ein_in01,123,94,1	script	Theo Cherno	4_M_REPAIR,{
 		mes "Tarsha's father? Oh,";
 		mes "you must be a godsend!";
 	} else if (kain_ticket > 12) {
-		emotion e_heh;
+		emotion ET_SMILE;
 		mes "[Theo Cherno]";
 		mes "I'm so happy";
 		mes "for my wife. I....";
@@ -738,24 +738,24 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 		mes "my husband in school and";
 		mes "it was the greatest thing that";
 		mes "ever happened to me~";
-		emotion e_lv,0,"Theo Cherno";
+		emotion ET_THROB, getnpcid(0, "Theo Cherno");
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "By the way, I heard";
 		mes "your daughter singing";
 		mes "some sort of Miner's Song.";
 		mes "Did you teach her that?";
-		emotion e_omg,0,"Tarsha Cherno";
-		emotion e_omg,0,"Theo Cherno";
+		emotion ET_HUK;
+		emotion ET_HUK, getnpcid(0, "Theo Cherno");
 		next;
 		mes "[Theo Cherno]";
 		mes "I don't understand";
 		mes "why little Elle likes";
 		mes "such a rowdy, man song.";
 		mes "This is all your fault, Tarsha!";
-		emotion e_ag,0,"Theo Cherno";
+		emotion ET_ANGER, getnpcid(0, "Theo Cherno");
 		next;
-		emotion e_heh,0,"Tarsha Cherno";
+		emotion ET_SMILE;
 		mes "[Tarsha Cherno]";
 		mes "Oh~hohohoho~";
 		mes "I was too young to";
@@ -778,7 +778,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 		mes "a miner who lost his";
 		mes "daughter! Just maybe...)";
 		next;
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "["+ strcharinfo(0) +"]";
 		mes "...!";
 		mes "Tarsha...";
@@ -806,7 +806,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 		mes "Oh, welcome back~";
 		mes "So were you able to";
 		mes "bring back good news?";
-		emotion e_heh,0,"Tarsha Cherno";
+		emotion ET_SMILE;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Why, yes.";
@@ -944,8 +944,8 @@ function	script	F_Cherno	{
 	specialeffect EF_POISONATTACK,AREA,"#exp_ein";
 	mes "^33355F*Crash!*^000000";
 	mes ".....";
-	emotion e_swt,0,"Theo Cherno";
-	emotion e_swt,0,"Tarsha Cherno";
+	emotion ET_SWEAT, getnpcid(0, "Theo Cherno");
+	emotion ET_SWEAT, getnpcid(0, "Tarsha Cherno");
 	next;
 	mes "[Theo Cherno]";
 	mes "Honey...";
@@ -963,7 +963,7 @@ function	script	F_Cherno	{
 	mes "it a day and finish";
 	mes "this tomorrow, yeah?";
 	next;
-	emotion e_what,0,"Tarsha Cherno";
+	emotion ET_QUESTION, getnpcid(0, "Tarsha Cherno");
 	mes "[Tarsha Cherno]";
 	mes "Oh~";
 	mes "I didn't know we";
@@ -983,8 +983,8 @@ function	script	F_Cherno	{
 		mes "It's what we do...";
 		close;
 	case 2:
-		emotion e_swt,0,"Tarsha Cherno";
-		emotion e_swt,0,"Theo Cherno";
+		emotion ET_SWEAT, getnpcid(0, "Tarsha Cherno");
+		emotion ET_SWEAT, getnpcid(0, "Theo Cherno");
 		mes "[Tarsha Cherno]";
 		mes "Hahaha, Elle?";
 		mes "Why would our";
@@ -998,7 +998,7 @@ function	script	F_Cherno	{
 		mes "was sick or sad";
 		mes "...Or something?";
 		next;
-		emotion e_omg,0,"Tarsha Cherno";
+		emotion ET_HUK, getnpcid(0, "Tarsha Cherno");
 		mes "[Tarsha Cherno]";
 		mes "Oh my god...!";
 		mes "What is she thinking?";
@@ -1030,7 +1030,7 @@ function	script	F_Cherno	{
 		mes "["+ strcharinfo(0) +"]";
 		mes "I am called,";
 		mes ""+ strcharinfo(0) +".";
-		emotion e_heh;
+		emotion ET_SMILE;
 		next;
 		mes "[Tarsha Cherno]";
 		mes ""+ strcharinfo(0) +",";
@@ -1167,7 +1167,7 @@ ein_in01,121,99,3	script	Mirror#ein	HIDDEN_NPC,{
 				mes "and I can't seem to find";
 				mes "any flaws with my figure...";
 				next;
-				emotion e_swt2,0,"Tarsha Cherno";
+				emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Tarsha Cherno");
 				mes "[Tarsha Cherno]";
 				mes "Actually...";
 				mes "That's not one";
@@ -1517,7 +1517,7 @@ OnTimer63000:
 	hideoffnpc "Airship Captain#02";
 	end;
 OnTimer68000:
-	emotion e_ag,0,"Airship Captain#02";
+	emotion ET_ANGER, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: You ugly, godforsaken creatures... Get off my ship!",bc_map,0x70DBDB;
 	end;
 OnTimer73000:
@@ -1583,15 +1583,15 @@ OnTimer87000:
 	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
 	end;
 OnTimer88000:
-	emotion e_ag,0,"Airship Captain#02";
+	emotion ET_ANGER, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: You dirty monsters are dealing with this ship's captain...",bc_map,0x70DBDB;
 	end;
 OnTimer93000:
-	emotion e_ag,0,"Airship Captain#02";
+	emotion ET_ANGER, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: I'll protect this ship and my crew with my life!",bc_map,0x70DBDB;
 	end;
 OnTimer98000:
-	emotion e_pif,0,"Airship Captain#02";
+	emotion ET_HNG, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: Here goes! Special Exodus Joker XIII Doom Rifle!",bc_map,0x70DBDB;
 	end;
 OnTimer103000:
@@ -1639,7 +1639,7 @@ OnTimer108000:
 	killmonster "airplane_01","Airship#airplane02::OnCaptainMobDead";
 	end;
 OnTimer113000:
-	emotion e_pif,0,"Airship Captain#02";
+	emotion ET_HNG, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01","Captain Tarlock: Filthy animals! Stop ruining my ship!",bc_map,0x70DBDB;
 	end;
 OnTimer118000:
@@ -1699,18 +1699,18 @@ OnTimer127000:
 	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
 	end;
 OnTimer128000:
-	emotion e_an,0,"Airship Captain#02";
+	emotion ET_FRET, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: There's... Too many to handle!",bc_map,0x70DBDB;
 	end;
 OnTimer133000:
 	mapannounce "airplane_01", "Pilot: Captain, sir, the situation is getting critical!",bc_map,0x00FF00;
 	end;
 OnTimer138000:
-	emotion e_swt,0,"Airship Captain#02";
+	emotion ET_SWEAT, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: We'll need all the help we can get!",bc_map,0x70DBDB;
 	end;
 OnTimer143000:
-	emotion e_sry,0,"Airship Captain#02";
+	emotion ET_SORRY, getnpcid(0, "Airship Captain#02");
 	mapannounce "airplane_01", "Captain Tarlock: All hands and any passenger who can fight! We've got to drive away these monsters!",bc_map,0x70DBDB;
 	end;
 OnTimer148000:
@@ -2495,7 +2495,7 @@ airplane,236,63,4	script	Hallen	4_M_KID1,{
 		next;
 		switch(select("I'm not a passenger.:Hey kid, what are you doing?")) {
 		case 1:
-			emotion e_what,0;
+			emotion ET_QUESTION;
 			mes "[Hallen]";
 			mes "Does that mean you're";
 			mes "one of the crewmen, then?";
@@ -2503,7 +2503,7 @@ airplane,236,63,4	script	Hallen	4_M_KID1,{
 			mes "and I should be familiar with";
 			mes "everyone working here by now...";
 			next;
-			emotion e_gasp,0;
+			emotion ET_SURPRISE;
 			mes "[Hallen]";
 			mes "Hey...!";
 			mes "If you're on duty,";
@@ -2557,7 +2557,7 @@ airplane,236,63,4	script	Hallen	4_M_KID1,{
 		mes "this floor. It's gonna";
 		mes "take quite a while.";
 		next;
-		emotion e_gasp,0;
+		emotion ET_SURPRISE;
 		mes "[Hallen]";
 		mes "It doesn't look like";
 		mes "I'm gonna finish this";
@@ -2816,7 +2816,7 @@ airplane,236,63,4	script	Hallen	4_M_KID1,{
 		mes "But where have I heard";
 		mes "about that before...?";
 		next;
-		emotion e_gasp,0;
+		emotion ET_SURPRISE;
 		mes "[Hallen]";
 		mes "Oh, that's right!";
 		mes "Kaci told me about a";
@@ -3292,7 +3292,7 @@ OnTouch_:
 				mes "Airship. Wait, wait...";
 				mes "You look familiar...";
 				next;
-				emotion e_omg,0,"Ferlock#lab";
+				emotion ET_HUK, getnpcid(0, "Ferlock#lab");
 				mes "[Ferlock]";
 				mes "That's right, aren't you the";
 				mes "one who brought me my";

npc/quests/quests_alberta.txt

@@ -2074,7 +2074,7 @@ tur_dun03,105,74,4	script	Mudasamu#tur	119,{
 	mes "[Mudasamu]";
 	mes "Basically, our leader was so distracted by the idea of finding treasure himself that we've lost our men. It's bad enough that he's a fat slob, but he's a greedy slob too!";
 	next;
-	emotion e_ag;
+	emotion ET_ANGER;
 	mes "[Takuyaka]";
 	mes "Hey, Mudasamu!";
 	mes "Are you talking";

npc/quests/quests_amatsu.txt

@@ -1711,7 +1711,7 @@ ama_in02,115,177,7	script	Soldier#ama10	767,{
 	mes "[Jyuro]";
 	mes "What gate are you talking about?";
 	mes "A gate? On the top floor of the building??? Surely, you must been be mistaken.";
-	emotion e_swt;
+	emotion ET_SWEAT;
 	next;
 	if (countitem(7160) > 0) {
 		if (select("Show him the ticket:Cancel") == 1) {

npc/quests/quests_ayothaya.txt

@@ -117,9 +117,9 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				next;
 				mes "[Shuda]";
 				mes "In the meantime, I'll think of how I'm gonna pay back Annon for leaving me in misery! So hurry and find Annon! Hoo ho ho ho ho!";
-				emotion e_heh;
+				emotion ET_SMILE;
 				next;
-				emotion e_dots,1;
+				emotion ET_THINK, playerattached();
 				mes "["+strcharinfo(0)+"]";
 				mes "(She's so scary!";
 				mes "Making me do stuff";
@@ -209,7 +209,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 				mes "standing around for my";
 				mes "own amusement or something?!";
 				next;
-				emotion e_gg,1;
+				emotion ET_KIK, playerattached();
 				mes "["+strcharinfo(0)+"]";
 				mes "No no no no...";
 				mes "I meant, I can't";
@@ -313,7 +313,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					mes "^660000enslave^000000 him.";
 					mes "^666666*Grinds teeth*^000000";
 					next;
-					emotion e_gasp,1;
+					emotion ET_SURPRISE, playerattached();
 					mes "[" +strcharinfo(0)+ "]";
 					mes "(...H-Horrifying!)";
 					next;
@@ -323,7 +323,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					mes "[Shuda]";
 					mes "And so, that is my quest for you. It should keep you entertained for a while. So get into the water, and I'll supervise from here.";
 					mes "Oho ho ho ho ho!";
-					emotion e_heh;
+					emotion ET_SMILE;
 					set thai_find,1;
 					close;
 				case 2:
@@ -464,7 +464,7 @@ if (!$@annonactive) {
 				mes "...Awwww";
 				mes "Oh... Oh God...!";
 				next;
-				emotion e_gasp,1;
+				emotion ET_SURPRISE, playerattached();
 				mes "[" +strcharinfo(0)+ "]";
 				mes "Huh...?";
 				mes "I heard something";
@@ -483,7 +483,7 @@ if (!$@annonactive) {
 				mes "Wh...who's there?";
 				mes "Shuda?! If that's you,";
 				mes "stay back, or I'll kill myself!";
-				emotion e_omg,1;
+				emotion ET_HUK, playerattached();
 				next;
 				switch(select("What are you doing here?:I'm not Shuda!")) {
 				case 1:
@@ -547,7 +547,7 @@ if (!$@annonactive) {
 OnTouch_:
 	if (thai_find == 12) {
 		if (!rand(0,2)) {
-			emotion e_gasp,1;
+			emotion ET_SURPRISE, playerattached();
 			mes "[" +strcharinfo(0)+ "]";
 			mes "Huh...?";
 			next;
@@ -789,7 +789,7 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 				mes "My mission: Bring back an";
 				mes "ultra powerful potion for";
 				mes "this poor guy~";
-				emotion e_no1,1;
+				emotion ET_BEST, playerattached();
 				close;
 			}
 		case 2:
@@ -970,7 +970,7 @@ ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
 OnTouch_:
 	if (thai_find == 4) {
 		if (rand(1,3) < 2) {
-			emotion e_gasp,1;
+			emotion ET_SURPRISE, playerattached();
 			mes "^3355FFYou find footprints heading to the ^5C3317North^3355FF. It looks like somebody was in quite a hurry, just like the villager said!^000000";
 			set thai_find,5;
 			changequest 12032,12033;
@@ -984,7 +984,7 @@ ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
 OnTouch_:
 	if (thai_find == 5) {
 		if (rand(1,3) < 2) {
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "^3355FFYou find another set of footprints. It seems that somebody was running away from something. These prints are heading to the ^5C3317East^3355FF. You'd better follow them to see what";
 			mes "you can find.^000000";
 			set thai_find,6;
@@ -998,7 +998,7 @@ ayo_dun01,244,256,2	script	AyoFootprint3	139,2,0,{
 OnTouch_:
 	if (thai_find == 6) {
 		if (rand(1,3) < 2) {
-			emotion e_no,1;
+			emotion ET_STARE_ABOUT, playerattached();
 			mes "^3355FFThe footprints end around this area. Whoever was running must";
 			mes "have been exhausted and stumbled on something. Perhaps the owner of the footprints is nearby...^000000";
 			set thai_find,7;
@@ -1012,7 +1012,7 @@ ayo_dun01,17,257,0	script	AyoFootprint4	139,2,0,{
 OnTouch_:
 	if (thai_find == 7) {
 		if (rand(1,3) < 2) {
-			emotion e_ic,1;
+			emotion ET_AHA, playerattached();
 			mes "^3355FFAs you follow the footprints,";
 			mes "you arrive at the '^5C3317Entrance of the Shrine^3355FF.' Whoever this person was, he just ran into the second level.^000000";
 			set thai_find,8;
@@ -1043,7 +1043,7 @@ ayo_dun02,135,168,0	script	AyoFootprint6	139,0,2,{
 OnTouch_:
 	if (thai_find == 9) {
 		if (rand(1,3) == 1) {
-			emotion e_gasp,1;
+			emotion ET_SURPRISE, playerattached();
 			mes "^3355FFThe trail of footprints";
 			mes "continue here, and seem";
 			mes "to look more freshly made.^000000.";
@@ -1091,7 +1091,7 @@ OnTouch_:
 					mes "[Rat]";
 					mes "^FF0000Squeak!";
 					mes "^FF0000Squeak Squeak!^000000";
-					emotion e_omg,1;
+					emotion ET_HUK, playerattached();
 					next;
 					mes "["+strcharinfo(0)+"]";
 					mes "^8C1717Wah^000000!";
@@ -1117,7 +1117,7 @@ ayo_dun02,77,213,0	script	AyoFootprint7	139,1,1,{
 OnTouch_:
 	if (thai_find == 10) {
 		if (rand(1,3) < 2) {
-			emotion e_gasp,1;
+			emotion ET_SURPRISE, playerattached();
 			mes "^3355FFWhere is he...?";
 			mes "He seems to have gone";
 			mes "deep into the dungeon.";
@@ -1134,7 +1134,7 @@ ayo_dun02,86,254,0	script	AyoFootprint8	139,1,1,{
 OnTouch_:
 	if (thai_find == 11) {
 		if (rand(1,3) < 2) {
-			emotion e_gasp,1;
+			emotion ET_SURPRISE, playerattached();
 			mes "^3355FFYou find traces of blood. Whoever was running in this direction may have been wounded. The trail of blood leads to the ^5C3317North^3355FF.^000000";
 			changequest 12032,12033;
 			set thai_find,12;
@@ -1155,7 +1155,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 		mes "bothers me...";
 		next;
 		mes "[Tham]";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "Oh, aren't you";
 		mes "from Rune-Midgard?";
 		mes "Hello there~";
@@ -1168,7 +1168,7 @@ ayothaya,193,171,3	script	Old Man#02	842,{
 		mes "He came from out of nowhere, so he scared the crap out of me. Do you think he could be a criminal?";
 		next;
 		mes "[Tham]";
-		emotion e_ic;
+		emotion ET_AHA;
 		mes "Ah! I think, in his intense fear, he was screaming something about some kind of '^FF0000Shuda^000000,' or whatever. But what could it possibly mean?";
 		next;
 		mes "[Tham]";
@@ -2139,7 +2139,7 @@ ayothaya,196,265,3	script	Einon#ayo	842,{
 			mes "I recommend that you go";
 			mes "visit ^3131FFMali the Spicy^000000.";
 			next;
-			emotion e_no1;
+			emotion ET_BEST;
 			set tomyumgoong,1;
 			setquest 8123;
 			mes "[Einon]";
@@ -2271,7 +2271,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				mes "you've brought. Hmm...";
 				mes "These are...";
 				next;
-				emotion e_no1;
+				emotion ET_BEST;
 				mes "[Mali the Spicy]";
 				mes "The freshest Shrimp that";
 				mes "I've been looking for! Well done~";
@@ -2303,7 +2303,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 					mes "I guess.";
 					close;
 				}
-				emotion e_ag;
+				emotion ET_ANGER;
 				mes "[Mali the Spicy]";
 				mes "What a stupid...!";
 				mes "If you quit just because you really hate sour flavors, you must not be that eager to have my Tom Yum Goong!";
@@ -2344,7 +2344,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 			close;
 		} else if (tomyumgoong == 5) {
 			if (countitem(568) > 9) {
-				emotion e_gasp;
+				emotion ET_SURPRISE;
 				mes "[Mali the Spicy]";
 				mes "Welcome back!";
 				mes "Wow, you came back";
@@ -2424,7 +2424,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		if (MaxWeight - Weight > 1499) {
 			if (countitem(7286) > 29) {
 				delitem 7286,30; //Chilli
-				emotion e_gasp;
+				emotion ET_SURPRISE;
 				mes "[Mali the Spicy]";
 				mes "Now...";
 				mes "Everything is all set!";
@@ -2459,7 +2459,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				next;
 				mes "[Mali the Spicy]";
 				mes "Wah^00009Cah^0000FFahhhh^0063FFaaaahhh^000000!";
-				emotion e_omg;
+				emotion ET_HUK;
 				specialeffect EF_FLASHER;
 				specialeffect EF_LORD;
 				next;
@@ -2471,7 +2471,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 				set tomyumgoong,8;
 				completequest 8126;
 				getitem 566,10; //Tomyumkung
-				emotion e_no1;
+				emotion ET_BEST;
 				mes "[Mali the Spicy]";
 				mes "Here's your";
 				mes "Tom Yum Goong!";
@@ -2509,7 +2509,7 @@ ayo_in01,145,163,3	script	Cook#ayo	839,{
 		mes "You seem to be carrying too many things. Why don't you free up some space in your inventory first, and then come back?";
 		close;
 	}
-	emotion e_wah;
+	emotion ET_KEK;
 	mes "[Mali the Spicy]";
 	mes "Ah...!";
 	mes "So busy, so busy!";
@@ -2562,7 +2562,7 @@ ayothaya,153,86,5	script	Thongpool#ayo	843,{
 						set Zeny, Zeny-11000;
 						set tomyumgoong,3;
 						getitem 567,20; //Prawn
-						emotion e_no1;
+						emotion ET_BEST;
 						mes "[Thongpool]";
 						mes "Good, now you have the";
 						mes "freshest Shrimp in this village! It's time for you to go back and ask Ms. Mali to cook them for you.";
@@ -2642,7 +2642,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 		close;
 	}
 	if (tomyumgoong == 5) {
-		emotion e_swt;
+		emotion ET_SWEAT;
 		mes "[Mr. Jun]";
 		mes "Umm...?";
 		mes "You don't need";
@@ -2651,13 +2651,13 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 		next;
 		switch(select("No.:Give me Lemons, old man!:Can I have some more Lemons, please?")) {
 		case 1:
-			emotion e_ho;
+			emotion ET_DELIGHT;
 			mes "[Mr. Jun]";
 			mes "Then why don't you taste";
 			mes "the Lemons I gave you last time? They're really sour, but also very delicious!";
 			close;
 		case 2:
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Mr. Jun]";
 			mes "What...!?";
 			mes "What's wrong with you, kid?";
@@ -2694,7 +2694,7 @@ OnTouch_:
 		mes "Hello, there?";
 		mes "Did you need";
 		mes "some help...?";
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		next;
 		if (select("I need some Lemons.:No, thanks.") == 1) {
 			mes "[Mr. Jun]";
@@ -2741,7 +2741,7 @@ OnTouch_:
 					mes "Paper, Scissors!^000000";
 					mes "Perhaps you've heard";
 					mes "of it in your land.";
-					emotion e_scissors;
+					emotion ET_SCISSOR;
 					next;
 					mes "[Mr. Jun]";
 					mes "Nuh-uh, don't look at me like that. I'm an old man, and I want to play this game and re-live my youth";
@@ -2774,8 +2774,8 @@ OnTouch_:
 							switch(select("Scissors:Rock:Paper")) {
 							case 1:
 								if (.@jun_mark == 1) {
-									emotion e_scissors;
-									emotion e_scissors,1;
+									emotion ET_SCISSOR;
+									emotion ET_SCISSOR, playerattached();
 									mes "[Mr. Jun]";
 									mes "Hmpf.";
 									mes "It's a draw.";
@@ -2785,8 +2785,8 @@ OnTouch_:
 									next;
 								}
 								else if (.@jun_mark == 2) {
-									emotion e_rock;
-									emotion e_scissors,1;
+									emotion ET_ROCK;
+									emotion ET_SCISSOR, playerattached();
 									set @pc_score,@pc_score + 1;
 									mes "[Mr. Jun]";
 									mes "Yes...!";
@@ -2794,8 +2794,8 @@ OnTouch_:
 									next;
 								}
 								else {
-									emotion e_paper;
-									emotion e_scissors,1;
+									emotion ET_WRAP;
+									emotion ET_SCISSOR, playerattached();
 									set @pc_score,@pc_score + 1;
 									set @user_score,@user_score + 1;
 									mes "[Mr. Jun]";
@@ -2807,8 +2807,8 @@ OnTouch_:
 								break;
 							case 2:
 								if (.@jun_mark == 1) {
-									emotion e_scissors;
-									emotion e_rock,1;
+									emotion ET_SCISSOR;
+									emotion ET_ROCK, playerattached();
 									set @pc_score,@pc_score + 1;
 									set @user_score,@user_score + 1;
 									mes "[Mr. Jun]";
@@ -2817,8 +2817,8 @@ OnTouch_:
 									next;
 								}
 								else if (.@jun_mark == 2) {
-									emotion e_rock;
-									emotion e_rock,1;
+									emotion ET_ROCK;
+									emotion ET_ROCK, playerattached();
 									mes "[Mr. Jun]";
 									mes "Hmpf.";
 									mes "It's a draw.";
@@ -2828,8 +2828,8 @@ OnTouch_:
 									next;
 								}
 								else {
-									emotion e_paper;
-									emotion e_rock,1;
+									emotion ET_WRAP;
+									emotion ET_ROCK, playerattached();
 									set @pc_score,@pc_score + 1;
 									mes "[Mr. Jun]";
 									mes "Bwahahaha!";
@@ -2839,8 +2839,8 @@ OnTouch_:
 								break;
 							case 3:
 								if (.@jun_mark == 1) {
-									emotion e_scissors;
-									emotion e_paper,1;
+									emotion ET_SCISSOR;
+									emotion ET_WRAP, playerattached();
 									set @pc_score,@pc_score + 1;
 									mes "[Mr. Jun]";
 									mes "Heh heh~";
@@ -2848,8 +2848,8 @@ OnTouch_:
 									next;
 								}
 								else if (.@jun_mark == 2) {
-									emotion e_rock;
-									emotion e_paper,1;
+									emotion ET_ROCK;
+									emotion ET_WRAP, playerattached();
 									set @user_score,@user_score + 1;
 									set @pc_score,@pc_score + 1;
 									mes "[Mr. Jun]";
@@ -2858,8 +2858,8 @@ OnTouch_:
 									next;
 								}
 								else {
-									emotion e_paper;
-									emotion e_paper,1;
+									emotion ET_WRAP;
+									emotion ET_WRAP, playerattached();
 									mes "[Mr. Jun]";
 									mes "Hmpf.";
 									mes "It's a draw.";
@@ -2873,7 +2873,7 @@ OnTouch_:
 						}
 					}
 					if (@user_score == 3) {
-						emotion e_pif;
+						emotion ET_HNG;
 						mes "[Mr. Jun]";
 						mes "You... won.";
 						mes "I'm so exhausted.";
@@ -2891,7 +2891,7 @@ OnTouch_:
 						set tomyumgoong,5;
 						getitem 568,10; //Lemon
 						next;
-						emotion e_dots;
+						emotion ET_THINK;
 						mes "[Mr. Jun]";
 						mes "Hmm...";
 						mes "Looks like you need a lot of them. Oh well, that's fine with me. I had a good time with you.";
@@ -2901,7 +2901,7 @@ OnTouch_:
 						mes "Don't be selfish, and always share what you have with others. That's one of the most important values for human beings.";
 						close;
 					}
-					emotion e_scissors;
+					emotion ET_SCISSOR;
 					mes "[Mr. Jun]";
 					mes "Muhahahaha!";
 					mes "Victory is mine!";
@@ -2951,7 +2951,7 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 		mes "it all to you for 2,000 zeny.";
 		next;
 		if (select("Thanks, I'll take it.:It's a rip-off, man!") == 1) {
-			emotion e_thx;
+			emotion ET_THANKS;
 			if (Zeny > 1999) {
 				if (MaxWeight - Weight > 1199) {
 					set Zeny, Zeny-2000;
@@ -2984,7 +2984,7 @@ ayothaya,213,94,7	script	Merchant#ayo	841,{
 			mes "need from me.";
 			close;
 		}
-		emotion e_no;
+		emotion ET_STARE_ABOUT;
 		mes "[Merchant Thongdum]";
 		mes "Don't say that.";
 		mes "My prices are always";

npc/quests/quests_ein.txt

@@ -4234,7 +4234,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 		mes "...";
 		mes "......";
 		mes "......You...";
-		emotion e_what,1;
+		emotion ET_QUESTION, playerattached();
 		next;
 		mes "[Buender Hikeman]";
 		mes "...";
@@ -4556,7 +4556,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 		next;
 		mes "[Buender Hikeman]";
 		mes "................";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Buender Hikeman]";
 		mes "Uhhhh......";
@@ -4851,12 +4851,12 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "[Shinokas]";
 		mes "...";
 		mes ".......";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "I was right.";
 		mes "You're Shinokas!";
-		emotion e_gg,1;
+		emotion ET_KIK, playerattached();
 		next;
 		mes "[Shinokas]";
 		mes "Curses!";
@@ -4864,7 +4864,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "my cover!";
 		mes "W-wait! How much";
 		mes "do you know?!";
-		emotion e_omg;
+		emotion ET_HUK;
 		next;
 		mes "[Shinokas]";
 		mes "Did ^3131FFthey^000000 send you?";
@@ -4891,7 +4891,7 @@ ein_in01,231,163,7	script	Sick Old Man#ein	849,{
 		mes "Errr....";
 		mes "You're not";
 		mes "here to kill me?";
-		emotion e_what;
+		emotion ET_QUESTION;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "No...!";
@@ -5401,7 +5401,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 		mes "Let's do it!";
 		mes "^3131FFYmir's Heart^000000 is";
 		mes "on my side! GO!";
-		emotion e_go;
+		emotion ET_GO;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Huh...?";
@@ -5410,7 +5410,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 		next;
 		mes "^3355FF*Rolling and rumbling*^000000";
 		next;
-		emotion e_kis;
+		emotion ET_CHUP;
 		mes "[Kaci]";
 		mes "I have a total of ^FF000011^000000";
 		mes "and you have total ^FF00005^000000.";
@@ -5462,7 +5462,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 			mes "^3355FF*Rolling and rumbling*^000000";
 			next;
 			if (rand(1,10) > 7) {
-				emotion e_kis;
+				emotion ET_CHUP;
 				mes "[Kaci]";
 				mes "I got a total of ^FF00008^000000,";
 				mes "and you have total ^FF000011^000000.";
@@ -5472,7 +5472,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 				next;
 			}
 			else {
-				emotion e_omg;
+				emotion ET_HUK;
 				mes "[Kaci]";
 				mes "Oooh...";
 				mes "I got a total of ^FF000010^000000,";
@@ -5612,7 +5612,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 		mes "Let's do it!";
 		mes "^3131FFYmir's Heart^000000 is";
 		mes "on my side! GO!";
-		emotion e_go;
+		emotion ET_GO;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Huh...?";
@@ -5621,7 +5621,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 		next;
 		mes "^3355FF*Rolling and rumbling*^000000";
 		next;
-		emotion e_kis;
+		emotion ET_CHUP;
 		mes "[Kaci]";
 		mes "I have a total of ^FF00003^000000";
 		mes "and you have total ^FF00002^000000.";

npc/quests/quests_gonryun.txt

@@ -521,7 +521,7 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 		mes "Ahhh.. my stomach.. my head..";
 		mes "I shouldn't drink so much..";
 		mes "Ehhhh....";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 	else if (b_sword < 6) {
@@ -532,7 +532,7 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 				mes "*Urk!* I feel sick...";
 				mes "Can somebody bring me a potion?";
 				mes "*Groan*....";
-				emotion e_swt2;
+				emotion ET_PROFUSELY_SWEAT;
 				close;
 			}
 			mes "[Xue Bong]";
@@ -603,7 +603,7 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 			case 2:
 				delitem 506,1; //Green_Potion
 				set b_sword,5;
-				emotion e_thx;
+				emotion ET_THANKS;
 				mes "[Xue Bong]";
 				mes "Whew, Thanks!";
 				mes "I feel much better now.";
@@ -754,7 +754,7 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 			mes "Ahhh.. my stomach.. my head..";
 			mes "I shouldn't drink so much..";
 			mes "ughh....";
-			emotion e_swt2;
+			emotion ET_PROFUSELY_SWEAT;
 			close;
 		case 12:
 			mes "[Xue Bong]";
@@ -764,7 +764,7 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 			mes "blind eye to a";
 			mes "boozer's suffering?";
 			mes "Urk...!";
-			emotion e_an;
+			emotion ET_FRET;
 			close;
 		case 13:
 			mes "[Xue Bong]";
@@ -773,7 +773,7 @@ gon_in,165,16,4	script	Man in hangover#gon	748,{
 			mes "How could you turn away";
 			mes "a drunk in need...?";
 			mes "*Groan*...";
-			emotion e_an;
+			emotion ET_FRET;
 			close;
 		}
 	}
@@ -2088,7 +2088,7 @@ gon_in,18,27,5	script	Madam#gnbs	771,{
 	mes "My~! Aren't you a darling young";
 	mes "man. But still, not nearly as handsome as my husband~";
 	mes "Tee hee~";
-	emotion e_lv;
+	emotion ET_THROB;
 	close;
 }
 
@@ -2149,7 +2149,7 @@ gonryun,139,142,7	script	Girl##gnbs1	772,{
 		mes "I was happy meeting visitors";
 		mes "from outside the village,";
 		mes "but because of the thief, I feel terrible now...";
-		emotion e_dots;
+		emotion ET_THINK;
 		close;
 	}
 	mes "[Shi Ying Xiao]";
@@ -2172,7 +2172,7 @@ gonryun,139,142,7	script	Girl##gnbs1	772,{
 	mes "[ ^6699FF" + strcharinfo(0) + "^000000 ]";
 	mes "I AM YOUR HERO!";
 	next;
-	emotion e_heh;
+	emotion ET_SMILE;
 	mes "[Shi Ying Xiao]";
 	mes "Thank you so much for bringing hope to our village, hero~";
 	close;
@@ -2183,7 +2183,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 		mes "[Zuo Hei]";
 		mes "Hmm...";
 		mes "I'm pretty busy right now, come back later.";
-		emotion e_dots;
+		emotion ET_THINK;
 		close;
 	}
 	else if (b_sword < 17) {
@@ -2234,7 +2234,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 				mes "That's none of your business.";
 				mes "Take a look in the mirror first";
 				mes "before you say things like that.";
-				emotion e_ag;
+				emotion ET_ANGER;
 				close;
 			case 1:
 				mes "[Zuo Hei]";
@@ -2290,7 +2290,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 				mes "That's none of your business.";
 				mes "Take a look in the mirror first";
 				mes "before you say things like that.";
-				emotion e_ag;
+				emotion ET_ANGER;
 				close;
 			case 4:
 				mes "[Zuo Hei]";
@@ -2312,7 +2312,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 			mes "[Zuo Hei]";
 			mes "Sorry, I'm busy right now.";
 			mes "Why don't you come back later.";
-			emotion e_dots;
+			emotion ET_THINK;
 			close;
 		case 16:
 			switch(nakha) {
@@ -2374,7 +2374,7 @@ gonryun,100,241,0	script	Stranger#gnbs	733,{
 				mes "That's none of your business.";
 				mes "Take a look in the mirror first";
 				mes "before you say things like that.";
-				emotion e_ag;
+				emotion ET_ANGER;
 				close;
 			case 4:
 				mes "[Zuo Hei]";
@@ -2487,7 +2487,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 				mes "granddaughter all of a sudden!?";
 				mes "Get the hell out of here!";
 				mes "Don't ever come back here again!";
-				emotion e_pif;
+				emotion ET_HNG;
 				close;
 			case 2:
 				mes "[Aumgarl]";
@@ -2511,7 +2511,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 					mes "granddaughter all of a sudden!?";
 					mes "Get out of here you pervert!";
 					mes "Don't ever come back here again!";
-					emotion e_pif;
+					emotion ET_HNG;
 					close;
 				case 2:
 					mes "[Aumgarl]";
@@ -2573,7 +2573,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 						mes "as her fate. I just feel";
 						mes "so sorry for Lyroo.";
 						mes "...";
-						emotion e_dots;
+						emotion ET_THINK;
 						close;
 					case 2:
 						mes "[Aumgarl]";
@@ -2678,7 +2678,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 								mes "I hate people who lie like that. Get out of my sight.";
 								mes "Get out of my sight.";
 								mes " ";
-								emotion e_pif;
+								emotion ET_HNG;
 								close2;
 								warp "geffen",173,169;
 								end;
@@ -2758,7 +2758,7 @@ geffen_in,71,112,2	script	Blacksmith#SaYumMoon	731,{
 			mes "[Aumgarl]";
 			mes "Thank you so much...";
 			mes "Without your help...";
-			emotion e_sob;
+			emotion ET_CRY;
 			mes "it would have been hopeless.";
 			next;
 			mes "[Aumgarl]";
@@ -3237,7 +3237,7 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 								mes "Ah...I'm sorry..";
 								mes "I haven't seen a guy like you";
 								mes "for a long time.";
-								emotion e_heh;
+								emotion ET_SMILE;
 								next;
 								mes "[Cylrnel]";
 								mes "You make me laugh...";
@@ -3671,7 +3671,7 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 	mes "[Cylrnel]";
 	mes "But I found a treatment...";
 	mes "And...it's..a...secret! Haha~!";
-	emotion e_ho;
+	emotion ET_DELIGHT;
 	close;
 }
 

npc/quests/quests_hugel.txt

@@ -304,7 +304,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			mes "Something's not";
 			mes "right. Bunkoll A";
 			mes "doesn't taste like this...";
-			emotion e_swt,0,"Postell Schuwell#D";
+			emotion ET_SWEAT, getnpcid(0, "Postell Schuwell#D");
 			next;
 			mes "[Postell]";
 			mes "Bunkoll A...?";
@@ -332,8 +332,8 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 			close2;
 			set hg_herb,11;
 			disablenpc "Postell Schuwell#D";
-			emotion e_swt,1;
-			emotion e_swt;
+			emotion ET_SWEAT, playerattached();
+			emotion ET_SWEAT;
 			end;
 		} else if (hg_herb == 11) {
 			mes "[Allen]";
@@ -1903,7 +1903,7 @@ hugel,70,137,5	script	Shede	879,{
 		mes "[Shede]";
 		mes "Yay~ are you talking to me? Yay!";
 		mes "Hey, are you from a different city? Wow, nice to see you!";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Shede]";
 		mes "Ever since the airport was built, Hugel has been so busy to welcome tourists and adventurers.";
@@ -1919,7 +1919,7 @@ hugel,70,137,5	script	Shede	879,{
 			mes "[Shede]";
 			mes "Oh~ how kind of you! Thank you so much~";
 			mes "Then can I ask you a favor?";
-			emotion e_lv;
+			emotion ET_THROB;
 			next;
 			mes "[Shede]";
 			switch(rand(1,3)) {
@@ -2027,7 +2027,7 @@ hugel,70,137,5	script	Shede	879,{
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "'......I am confused...Does she love him or hate him?'";
-				emotion e_dots,1;
+				emotion ET_THINK, playerattached();
 				set hg_tre,30;
 				close2;
 				cutin "",255;
@@ -2067,7 +2067,7 @@ hugel,70,137,5	script	Shede	879,{
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake the Mushroom Flavor Cookies for uncle Hollun.";
 		mes "Thank you so much.";
-		emotion e_heh;
+		emotion ET_SMILE;
 		set hg_tre,40;
 		close2;
 		cutin "",255;
@@ -2077,7 +2077,7 @@ hugel,70,137,5	script	Shede	879,{
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake the best cookies of mine and compete with Agette!";
 		mes "Thank you so much.";
-		emotion e_heh;
+		emotion ET_SMILE;
 		set hg_tre,40;
 		close2;
 		cutin "",255;
@@ -2087,12 +2087,12 @@ hugel,70,137,5	script	Shede	879,{
 		mes "Oh! You came back earlier than I thought.";
 		mes "Now, I can bake Devil's Cookies to confess my love to the gentleman.";
 		mes "Thank you so much.";
-		emotion e_heh;
+		emotion ET_SMILE;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "(If he knew what ingredients she used for the cookies,)";
 		mes "(I am pretty sure that at least he will remember her face to avoid next time...)'";
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		set hg_tre,40;
 		close2;
 		cutin "",255;
@@ -2460,8 +2460,8 @@ hu_in01,256,40,3	script	Herico	897,{
 			mes "[Herico]";
 			mes "Haha, the first part was funny,";
 			mes "but the second part was kind of scary, you know?";
-			emotion e_dots;
-			emotion e_sob,1;
+			emotion ET_THINK;
+			emotion ET_CRY, playerattached();
 			next;
 			mes "[Herico]";
 			mes "So, tell me, where are all of his research documents?";
@@ -2491,7 +2491,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "I may now be an old man whose days are numbered,";
 		mes "but I used to work at ^3131FFthe Ymir's Heart imitation research department";
 		mes " in Regenschirm laboratory^000000 under Sage Varmunt's supervision.";
-		emotion e_omg,1;
+		emotion ET_HUK, playerattached();
 		next;
 		cutin "heri2.bmp",2;
 		mes "[Herico]";
@@ -2579,7 +2579,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "in order to continue with their research without Sage Varmunt.";
 		next;
 		cutin "heri3.bmp",2;
-		emotion e_ag;
+		emotion ET_ANGER;
 		mes "[Herico]";
 		mes "What? \"Bio Lab\"? I didn't image that they could";
 		mes "even think of that! I can't express enough of my resentment toward them!";
@@ -3007,7 +3007,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "Wow, this is that famous drink!";
 			mes "Let's see...*Gulp*";
 			next;
-			emotion e_no1;
+			emotion ET_BEST;
 			mes "[Enquro Carson]";
 			mes "Wow! This is awsome!";
 			mes "It is as delicious as I heard!";
@@ -3044,7 +3044,7 @@ lhz_in03,39,44,3	script	Enquro Carson	97,{
 			mes "this secret between you and me.";
 			mes "I released the personal information at my discretion,";
 			mes "and I know that I am not allowed to do that. Hehe.";
-			emotion e_gg;
+			emotion ET_KIK;
 			set hg_tre,47;
 			delitem 12112,1; //Tropical Sograt
 			delitem 12113,1; //Vermilion on the Beach
@@ -4930,7 +4930,7 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "disappeared too! I-I'm all";
 					mes "alone now! Waaaaaah~!";
 					next;
-					emotion e_dots,1;
+					emotion ET_THINK, playerattached();
 					mes "["+strcharinfo(0)+"]";
 					mes "Don't worry, I'll look";
 					mes "for your parents. I'm";
@@ -4947,7 +4947,7 @@ hugel,107,67,3	script	Torpy	706,{
 					mes "show up sooner";
 					mes "or later. Well, lots";
 					mes "of luck, kid.";
-					emotion e_dots,1;
+					emotion ET_THINK, playerattached();
 					close;
 				}
 			case 2:
@@ -4989,7 +4989,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "also tell her that Daddy";
 			mes "is safe! See you later~";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "......";
 			mes ".........";
 			mes "............";
@@ -5009,7 +5009,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "this town, where you last";
 			mes "saw her. Bye bye for now~";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "......";
 			mes ".........";
 			mes "............";
@@ -5023,7 +5023,7 @@ hugel,107,67,3	script	Torpy	706,{
 			mes "Um, that might not be good...^000000";
 			close;
 		} else if (hg_ubu01 == 8) {
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "[Torpy]";
 			mes "Daddy promised to get";
 			mes "me a girlfriend if I beat him";
@@ -5039,7 +5039,7 @@ hugel,107,67,3	script	Torpy	706,{
 			set hg_ubu01,9;
 			close;
 		} else if (hg_ubu01 == 9) {
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "[Torpy]";
 			mes "Maybe I should wait until";
 			mes "I'm older to have a girlfriend.";
@@ -5168,7 +5168,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		mes "after each other. Oh, well...";
 		close;
 	} else if (hg_ubu01 == 9) {
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "[Torpy's Mom]";
 		mes "When is that husband";
 		mes "of mine going to come";
@@ -5197,7 +5197,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 		mes "h-health... with... Steamed...";
 		mes "Crab... Nippers... Please...";
 		next;
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "^3355FFIt sounds like";
 		mes "this barrel wants";
 		mes "Steamed Crab Nippers.^000000";
@@ -5212,7 +5212,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "and 10... N-Nippers... to";
 			mes "c-cook th-them. Ugh...";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "["+strcharinfo(0)+"]";
 			mes "Hold on,";
 			mes "I have to cook";
@@ -5233,7 +5233,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "hunger...! It... It can't...";
 			mes "It c-can't be... d-denied!";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "["+strcharinfo(0)+"]";
 			mes "Weirdo! Why don't you";
 			mes "get out of that barrel,";
@@ -5250,7 +5250,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "It's b-been so... l-long...";
 			mes "G-Give me! G-Give me now!";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "^3355FFYou dumped the";
 			mes "Steamed Crab Nippers";
 			mes "into the barrel where";
@@ -5276,7 +5276,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "and 10... N-Nippers... to";
 			mes "c-cook th-them. Ugh...";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "["+strcharinfo(0)+"]";
 			mes "Hold on,";
 			mes "I have to cook";
@@ -5298,7 +5298,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "It's b-been so... l-long...";
 			mes "G-Give me! G-Give me now!";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "^3355FFYou dumped the";
 			mes "Steamed Crab Nippers";
 			mes "into the barrel where";
@@ -5324,7 +5324,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			mes "and 10... N-Nippers... to";
 			mes "c-cook th-them. Ugh...";
 			next;
-			emotion e_dots,1;
+			emotion ET_THINK, playerattached();
 			mes "["+strcharinfo(0)+"]";
 			mes "Hold on,";
 			mes "I have to cook";
@@ -5338,7 +5338,7 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 			close;
 		}
 	} else if (hg_ubu01 == 6) {
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "^3355FFFor now, you should";
 		mes "tell Torpy and his mom";
 		mes "where Torpy's father is";
@@ -5346,22 +5346,22 @@ hugel,100,176,3	script	Suspicious Barrel	111,{
 		mes "worry about him so much.";
 		close;
 	} else if (hg_ubu01 == 7) {
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "^800080Torpy's mom might want to know about^000000";
 		mes "^800080this extraordinary barrel.^000000";
 		close;
 	} else if (hg_ubu01 == 8) {
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "^800080How long does Torpy's father plan to stay within the barrel?^000000";
 		close;
 	} else if (hg_ubu01 == 9) {
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "^800080That barrel will become a symbolic object^000000";
 		mes "^800080that pays tribute to the firm will of Torpy's father^000000";
 		mes "^800080who is trying hard to avoid keeping the promise with his son to find his wife.^000000";
 		close;
 	} else {
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		mes "^800080You hear something bustling from the hole in the barrel.^000000";
 		mes "^800080However, it doesn't seem to be a big deal.^000000";
 		close;
@@ -7205,13 +7205,13 @@ OnTouch_:
 			mes "do?! I need to deliver the";
 			mes "milk tomorrow, but Burupu";
 			mes "still hasn't arrived yet!";
-			emotion e_omg,0;
+			emotion ET_HUK;
 			next;
 			mes "[Kurupe]";
 			mes "When is he coming";
 			mes "to work? Burupu,";
 			mes "where are you?!";
-			emotion e_swt,0;
+			emotion ET_SWEAT;
 			set hg_milk,1;
 			close;
 		}
@@ -7339,7 +7339,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		mes "world! But first, I gotta";
 		mes "learn how to use this thing!";
 		mes "Heeeeee-YAH! How's that? That was almost a Magnum Break, right?";
-		emotion e_swt2,0;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 
@@ -7349,7 +7349,7 @@ OnTouch_:
 		mes "Heeeyah!";
 		mes "Yaaaaaaaah!";
 		mes "Wh-whooooooosh!";
-		emotion e_swt2,0;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		mes "[Burupu]";
 		mes "Crap! Why do I have";
@@ -7358,14 +7358,14 @@ OnTouch_:
 		mes "tired of making all my own";
 		mes "whooshing sounds and effects.";
 		set hg_milk,3;
-		emotion e_an,0;
+		emotion ET_FRET;
 		close;
 	} else if (hg_milk == 5) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
 		mes "Yaaaaaaaah!";
 		mes "Yeeeeeeeyoooop!";
-		emotion e_swt2,0;
+		emotion ET_PROFUSELY_SWEAT;
 		close;
 	}
 }
@@ -7907,7 +7907,7 @@ hu_in01,19,161,0	script	Alex	803,{
 			mes "when you're done and";
 			mes "don't waste my time!";
 			next;
-			emotion e_ho,0,"Julian";
+			emotion ET_DELIGHT, getnpcid(0, "Julian");
 			mes "[Julian]";
 			mes "Hey, you know what,";
 			mes "Alex? You can't push";
@@ -7916,7 +7916,7 @@ hu_in01,19,161,0	script	Alex	803,{
 			mes "isn't a pushover, you know?";
 			next;
 			cutin "hu_alex03.bmp",2;
-			emotion e_an;
+			emotion ET_FRET;
 			mes "[Alex]";
 			mes "What was that...?";
 			mes "Are you trying to";
@@ -8024,7 +8024,7 @@ hu_in01,19,161,0	script	Alex	803,{
 		mes "And what is that grey haired";
 		mes "crone thinking? Hmmmm...";
 		next;
-		emotion e_omg;
+		emotion ET_HUK;
 		cutin "hu_alex03.bmp",2;
 		cutin "hu_alex01.bmp",2;
 		mes "[Alex]";
@@ -8129,7 +8129,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "Milton, is right over";
 		mes "there. Say, 'Hello,' Ashe.";
 		next;
-		emotion e_heh,0,"Ashe";
+		emotion ET_SMILE, getnpcid(0, "Ashe");
 		mes "[Ashe]";
 		mes "Hello!";
 		next;
@@ -8263,7 +8263,7 @@ hu_in01,14,11,4	script	Laura	70,{
 			mes "expedition for the Rune Midgarts Kingdom. Ashe Milton is my";
 			mes "assistant for this excavation.";
 			next;
-			emotion e_heh,0,"Ashe";
+			emotion ET_SMILE, getnpcid(0, "Ashe");
 			mes "[Ashe]";
 			mes "Hello!";
 			next;
@@ -8417,7 +8417,7 @@ hu_in01,14,11,4	script	Laura	70,{
 			mes "greets me with a fake";
 			mes "smile. I hate her!";
 			next;
-			emotion e_swt2,0,"Ashe";
+			emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Ashe");
 			mes "[Ashe]";
 			mes "Ms. Laurence...!";
 			mes "Stop it, please!";
@@ -8770,7 +8770,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "Well, have you";
 				mes "ever heard of Ymir's...";
 				next;
-				emotion e_gasp,0,"Ashe";
+				emotion ET_SURPRISE, getnpcid(0, "Ashe");
 				mes "[Ashe]";
 				mes "...Heart?";
 				mes "Ymir's Heart, right?";
@@ -8812,7 +8812,7 @@ hu_in01,14,11,4	script	Laura	70,{
 						next;
 						break;
 				}
-				emotion e_ok,0,"Ashe";
+				emotion ET_OK, getnpcid(0, "Ashe");
 				mes "[Ashe]";
 				mes "Ymir's Heart?";
 				mes "That's a clothing";
@@ -9130,7 +9130,7 @@ OnTouch_:
 hu_in01,159,84,3	script	Laura#2	70,{
 	if (hg_odin == 22 || hg_odin == 23) {
 		cutin "hu_laura03.bmp",2;
-		emotion e_an,0,"Laura#2";
+		emotion ET_FRET, getnpcid(0, "Laura#2");
 		mes "[Laura]";
 		mes "Wh-what...?!";
 		mes "Does this mean";
@@ -9140,7 +9140,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "complete lunacy!";
 		next;
 		cutin "hu_alex04.bmp",0;
-		emotion e_an,0,"Alex#2";
+		emotion ET_FRET, getnpcid(0, "Alex#2");
 		mes "[Alex]";
 		mes "What are you talking";
 		mes "about, you crazy wench?";
@@ -9197,12 +9197,12 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "waves a thick file";
 		mes "clasped in her hands.^000000";
 		next;
-		emotion e_omg,0,"Julian#2";
+		emotion ET_HUK, getnpcid(0, "Julian#2");
 		mes "[Julian]";
 		mes "What...?";
 		mes "Argh, that's--!";
 		next;
-		emotion e_ag,0,"Laura#2";
+		emotion ET_ANGER, getnpcid(0, "Laura#2");
 		mes "[Laura]";
 		mes "That's right.";
 		mes "Now tell me, what the";
@@ -9213,7 +9213,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "......";
 		mes "Julian!";
 		next;
-		emotion e_swt2,0,"Julian#2";
+		emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Julian#2");
 		mes "[Julian]";
 		mes "Uh, this isn't my fault!";
 		mes "Sh-she doesn't have any";
@@ -9237,7 +9237,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "what are your true goals?!";
 		next;
 		cutin "hu_alex03.bmp",0;
-		emotion e_swt2,0,"Alex#2";
+		emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Alex#2");
 		mes "[Alex]";
 		mes "I-I don't know what you're";
 		mes "talking about! J-Julian must";
@@ -9255,18 +9255,18 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "away, and threateningly";
 		mes "rolled up her sleeves.^000000";
 		next;
-		emotion e_sob,0,"Ashe#2";
+		emotion ET_CRY, getnpcid(0, "Ashe#2");
 		mes "[Ashe]";
 		mes "S-stop!";
 		mes "Both of you!";
 		next;
-		emotion e_swt2,0,"Laura#2";
+		emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Laura#2");
 		mes "[Laura]";
 		mes "Stay out of";
 		mes "this, Ashe!";
 		next;
 		cutin "hu_alex04.bmp",0;
-		emotion e_an,0,"Alex#2";
+		emotion ET_FRET, getnpcid(0, "Alex#2");
 		mes "[Alex]";
 		mes "Yeah, this is none";
 		mes "of your business!";
@@ -9279,14 +9279,14 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		end;
 	} else if (hg_odin > 23) {
 		cutin "hu_laura03.bmp",2;
-		emotion e_an,0,"Laura#2";
+		emotion ET_FRET, getnpcid(0, "Laura#2");
 		mes "[Laura]";
 		mes "Hah...!";
 		mes "Did you...";
 		mes "Just hit me?";
 		next;
 		cutin "hu_alex04.bmp",0;
-		emotion e_an,0,"Alex#2";
+		emotion ET_FRET, getnpcid(0, "Alex#2");
 		mes "[Alex]";
 		mes "You crazy...!";
 		close2;
@@ -9295,7 +9295,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 	}
 }
 
-hu_in01,158,84,5	duplicate(Laura#2)	Alex#2	803,0,0
+hu_in01,158,84,5	duplicate(Laura#2)	Alex#2	803
 
 hu_in01,162,85,4	script	Ashe#2	95,{
 	if (hg_odin == 22 || hg_odin == 23) {

npc/quests/quests_juperos.txt

@@ -1052,7 +1052,7 @@ yuno_in04,186,125,4	script	Bundle of Files	111,{
 					mes "less clear I am on what";
 					mes "the theory actually is.";
 					mes "I don't think there is one...";
-					emotion e_swt,1;
+					emotion ET_SWEAT, playerattached();
 					close;
 				}
 				mes "^8B6914What is most unsettling";

npc/quests/quests_lighthalzen.txt

@@ -1921,7 +1921,7 @@ OnTouch_:
 		mes "I'll give you back";
 		mes "your money, just ";
 		mes "let me go! Crap!";
-		emotion e_sob;
+		emotion ET_CRY;
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Alright, fine,";
@@ -3421,7 +3421,7 @@ OnTouch_:
 			next;
 			mes "............";
 			next;
-			emotion e_what,1;
+			emotion ET_QUESTION, playerattached();
 			mes "["+strcharinfo(0)+"]";
 			mes "Those voices weren't";
 			mes "just in my head, were they?";
@@ -3499,7 +3499,7 @@ OnTouch_:
 			next;
 			mes "............";
 			next;
-			emotion e_what,1;
+			emotion ET_QUESTION, playerattached();
 			mes "["+strcharinfo(0)+"]";
 			mes "I'm hearing things";
 			mes "again! Where are all of";
@@ -3784,7 +3784,7 @@ lhz_que01,21,31,5	script	#li_Varmunt	755,{
 			mes "you've finally agreed";
 			mes "to join us. Welcome!";
 			next;
-			emotion e_swt,"#li_Varmunt";
+			emotion ET_SWEAT;
 			mes "[Varmunt]";
 			mes "Well, I don't know if I agree";
 			mes "with this company's policies,";
@@ -3792,7 +3792,7 @@ lhz_que01,21,31,5	script	#li_Varmunt	755,{
 			mes "seems to be an opportunity that";
 			mes "comes once in a lifetime, so...";
 			next;
-			emotion e_no1,"#li_researcher";
+			emotion ET_BEST, getnpcid(0, "#li_researcher");
 			mes "[??]";
 			mes "To be honest, this project";
 			mes "can only be a success with";
@@ -3919,7 +3919,7 @@ lhz_que01,29,24,3	script	#li_researcher	754,{
 			mes "you've finally agreed";
 			mes "to join us. Welcome!";
 			next;
-			emotion e_swt,"#li_Varmunt";
+			emotion ET_SWEAT, getnpcid(0, "#li_Varmunt");
 			mes "[Varmunt]";
 			mes "Well, I don't know if I agree";
 			mes "with this company's policies,";
@@ -3927,7 +3927,7 @@ lhz_que01,29,24,3	script	#li_researcher	754,{
 			mes "seems to be an opportunity that";
 			mes "comes once in a lifetime, so...";
 			next;
-			emotion e_no1,"#li_researcher";
+			emotion ET_BEST;
 			mes "[??]";
 			mes "To be honest, this project";
 			mes "can only be a success with";
@@ -4853,7 +4853,7 @@ lhz_in03,32,162,3	script	Crippled Girl#li_tre	53,{
 				mes "What are you talking about?";
 				close;
 			}
-			emotion e_gasp,"Crippled Girl#li_tre";
+			emotion ET_SURPRISE;
 			mes "[Crippled Girl]";
 			mes "Oh, that's mine!";
 			mes "I gave it to my big brother";
@@ -5520,7 +5520,7 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 		mes "You again?!";
 		mes "What the hell do";
 		mes "you want from me?!";
-		emotion e_ag,"Mad Scientist#li";
+		emotion ET_ANGER;
 		next;
 		switch(select("Let me speak with you.:Sorry for bothering you.")) {
 		case 1:
@@ -5531,7 +5531,7 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 			next;
 			mes "[Wolfchev]";
 			mes "...........!";
-			emotion e_gasp,"Mad Scientist#li";
+			emotion ET_SURPRISE;
 			next;
 			mes "[Wolfchev]";
 			mes "Ah, but wait! I am collecting";
@@ -5543,7 +5543,7 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 			changequest 2089,2090;
 			close;
 		case 2:
-			emotion e_an,"Mad Scientist#li";
+			emotion ET_FRET;
 			mes "[Wolfchev]";
 			mes "''Sorry?!'' Do you";
 			mes "think ''sorry'' will";
@@ -5571,7 +5571,7 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 				mes "now that I would never";
 				mes "tell you why I neeeeed";
 				mes "these Beads. Bweh-heh!";
-				emotion e_gg,"Mad Scientist#li";
+				emotion ET_KIK;
 				next;
 				break;
 			}
@@ -5673,9 +5673,9 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 			next;
 			mes "[Wolfchev]";
 			mes "...........!";
-			emotion e_gasp,"Mad Scientist#li";
+			emotion ET_SURPRISE;
 			next;
-			emotion e_gg,"Mad Scientist#li";
+			emotion ET_KIK;
 			mes "[Wolfchev]";
 			mes "Ah, but wait! I am collecting";
 			mes "something. Yes, bring me the";
@@ -5763,7 +5763,7 @@ lhz_in01,286,226,3	script	Secretary Slierre#li	831,{
 		case 1:
 			mes "[Sueii Slierre]";
 			mes ".............!";
-			emotion e_gasp,"Secretary Slierre#li";
+			emotion ET_SURPRISE;
 			next;
 			mes "[Sueii Slierre]";
 			mes "How do you know";
@@ -5828,7 +5828,7 @@ lhz_in01,286,226,3	script	Secretary Slierre#li	831,{
 			mes "you have any more questions.";
 			next;
 			select("About Wolfchev's Research");
-			emotion e_dots,"Secretary Slierre#li";
+			emotion ET_THINK;
 			mes "[Sueii Slierre]";
 			mes "I couldn't tell you any";
 			mes "more about Wolfchev.";
@@ -5900,7 +5900,7 @@ lhz_in01,286,226,3	script	Secretary Slierre#li	831,{
 						mes "[Sueii Slierre]";
 						mes "...";
 						mes "......";
-						emotion e_ic,"Secretary Slierre#li";
+						emotion ET_AHA;
 						next;
 						mes "[Sueii Slierre]";
 						mes "So... You're";
@@ -6008,7 +6008,7 @@ lhz_in01,286,226,3	script	Secretary Slierre#li	831,{
 			mes "[Sueii Slierre]";
 			mes "...";
 			mes "......";
-			emotion e_ic,"Secretary Slierre#li";
+			emotion ET_AHA;
 			next;
 			mes "[Sueii Slierre]";
 			mes "So... You're";
@@ -8429,7 +8429,7 @@ L_Mission:
 		mes "["+strcharinfo(0)+"]";
 		mes "Not long ago, the scientists of Regenschrim have stolen the research record and destroyed the machines that they used for research purposes.";
 		next;
-		emotion e_gasp,0;
+		emotion ET_SURPRISE;
 		mes "[Karl]";
 		mes "...!";
 		mes "Did you do that? ";

npc/quests/quests_louyang.txt

@@ -214,7 +214,7 @@ lou_in02,61,175,3	script	Employee#3	818,2,2,{
 			mes "you go upstairs?";
 			mes "Ha ha ha!";
 			next;
-			emotion e_swt;
+			emotion ET_SWEAT;
 			mes "[Ya Hua]";
 			mes "Oh, if by any chance you came to try the Dragon Soup, I'm sorry, but it's no longer availalbe.";
 			next;
@@ -609,7 +609,7 @@ lou_fild01,195,177,5	script	Jiu Lian Bu#1-1	819,{
 }
 
 lou_fild01,175,173,3	script	Jiu Lian Bu#1-2	819,{
-	emotion e_heh;
+	emotion ET_SMILE;
 	if (ch_tre == 4) {
 		mes "[Jiu Lian Bu]";
 		mes "So...";
@@ -627,7 +627,7 @@ lou_fild01,175,173,3	script	Jiu Lian Bu#1-2	819,{
 		mes "[Jiu Lian Bu]";
 		mes "Why don't you sit down and close your eyes, and feel that soothing wind. It's pretty refreshing...";
 		next;
-		emotion e_hmm;
+		emotion ET_SCRATCH;
 		mes "[Jiu Lian Bu]";
 		mes "Also...";
 		mes "I'm a little";
@@ -888,7 +888,7 @@ lou_in02,58,183,5	script	Chef Assistant#lou1	823,5,5,{
 	specialeffect EF_SONICBLOWHIT;
 	mes "^3355FF* Chop chop chop chop chop *^000000";
 	next;
-	emotion e_no1;
+	emotion ET_BEST;
 	mes "[Jin Wei Ling]";
 	mes "Hahahaha! Look these perfect vergetable slices! Muhahahaha!!";
 	mes "I will continue to hone my martial arts through cooking!";
@@ -984,7 +984,7 @@ lou_in02,42,186,5	script	Liu Jia Lim#lou	816,{
 		mes "[Liu Jia Lim]";
 		mes "Do you know what was this restaurant's best dish throughout all of its history? Dragon Soup!";
 		next;
-		emotion e_lv;
+		emotion ET_THROB;
 		mes "[Liu Jia Lim]";
 		mes "Its delicate taste comes from";
 		mes "a broth extracted from pure meat that does not contain any fat. So it's also a very popular diet food for the ladies.";
@@ -1034,7 +1034,7 @@ louyang,261,123,3	script	Chi Wu Ping#lou	824,{
 	mes "All my muscles are sore...";
 	mes "There's only one thing that could cure all of this agonizing... pain...";
 	next;
-	emotion e_gasp;
+	emotion ET_SURPRISE;
 	mes "[Chi Wu Ping]";
 	mes "Hey kid~!";
 	mes "You don't look like a local!";
@@ -1103,7 +1103,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 		mes "[Hua Tuo]";
 		mes "However, as I studied and experimented with every pressure point, I came to the conclusion that the use of pressure points, depending on the circumstances,";
 		mes "can produce different results.";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		next;
 		mes "[Hua Tuo]";
 		mes "Few pressure points tend to show the same symptoms, regardless of the problem. Most of the time, the effects of pressure points will differ depending on the body's health or the time of day.";
@@ -1145,7 +1145,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 		mes "I cannot do anything without my medicine. But one my patients";
 		mes "needs immediate treatment and";
 		mes "I can't leave the office...";
-		emotion e_swt2;
+		emotion ET_PROFUSELY_SWEAT;
 		next;
 		if (select("I can help you.:What a shame!") == 1) {
 			mes "[Hua Tuo]";
@@ -1166,7 +1166,7 @@ lou_in02,265,69,5	script	Doctor#lyang	814,{
 				mes "However, I will ask you";
 				mes "if we meet another time.";
 				mes "Now, if you'll excuse me...";
-				emotion e_thx;
+				emotion ET_THANKS;
 				close;
 			}
 			mes "[Hua Tuo]";
@@ -1507,7 +1507,7 @@ lou_in02,272,55,0	script	Familiar-Looking Patient	798,{
 		mes "Awwww.....";
 		mes "Ummm....";
 		mes "^666666*Cough...cough...*^000000";
-		emotion e_omg;
+		emotion ET_HUK;
 		set ch_par,1;
 		close;
 	}
@@ -1516,7 +1516,7 @@ lou_in02,272,55,0	script	Familiar-Looking Patient	798,{
 		mes "^666666*Cough cough...*^000000";
 		mes "Aww......www...";
 		mes "Aww...wwww..";
-		emotion e_dots;
+		emotion ET_THINK;
 		close;
 	}
 	else {
@@ -1544,7 +1544,7 @@ lou_in02,248,166,2	script	Tool Shop Master#lou	824,{
 		mes "[Wang Chuiyi]";
 		mes "Um? Can I help";
 		mes "you with anything?";
-		emotion e_what;
+		emotion ET_QUESTION;
 		next;
 		if (select("I'm here to get something for the doctor...:I agree, the weather really is bad.") == 1) {
 			mes "[Wang Chuiyi]";
@@ -1632,7 +1632,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 			mes "say so? Let's see.";
 			mes "Hmmm...";
 			next;
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			next;
 			mes "[Jiang Xiayou]";
 			mes "Actually, could you help me";
@@ -1696,7 +1696,7 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 			next;
 			mes "[Jiang Xiayou]";
 			mes "The medicines you're looking for might be around here, so look around. If it weren't for the doctor, I wouldn't even let you hang around, you know that?";
-			emotion e_pif;
+			emotion ET_HNG;
 			set ch_par,4;
 			changequest 11045,11050;
 			close;
@@ -1874,7 +1874,7 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 				mes "[Jin Chiyuan]";
 				mes "I mean...";
 				mes "How dare you bribe an officer of the law! I hope other outsiders are not like you! Please leave immediately!";
-				emotion e_pif;
+				emotion ET_HNG;
 				close;
 			}
 			else {
@@ -1913,7 +1913,7 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 					mes "[Jin Chiyuan]";
 					mes "I mean...";
 					mes "How dare you bribe an officer of the law! I hope other outsiders are not like you! Please leave immediately!";
-					emotion e_pif;
+					emotion ET_HNG;
 					close;
 				}
 			}
@@ -1970,7 +1970,7 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 		mes "Hahaha...";
 		mes "Enjoy your stay";
 		mes "in Louyang!";
-		emotion e_heh;
+		emotion ET_SMILE;
 		close;
 	}
 	mes "[Jin Chiyuan]";
@@ -1980,7 +1980,7 @@ lou_in02,210,47,0	script	City Hall Officer#lou	825,{
 	mes "[Jin Chiyuan]";
 	mes "If you have nothing to ask of me, please leave. This place is not";
 	mes "a playground for adventurers.";
-	emotion e_pif;
+	emotion ET_HNG;
 	close;
 }
 
@@ -2066,7 +2066,7 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 			next;
 			mes "^3355FF*Rummage rummage...*";
 			mes ".........^000000";
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			close;
 		}
 		mes "[Huang Zhishu]";
@@ -2147,7 +2147,7 @@ lou_in02,156,38,0	script	Studying Officer#lou	822,{
 	mes "[Huang Zhishu]";
 	mes "Hmmm...?";
 	mes "Do you think I need to go outside more often? Well, I guess for some reason, I don't feel well. I guess I really should get some fresh air. ^666666*Yawn...*^000000";
-	emotion e_ok;
+	emotion ET_OK;
 	next;
 	mes "[Huang Zhishu]";
 	mes "But you should get out more often yourself! It's not a good idea to always stay home. If you don't get some exercise when you're young,";
@@ -2191,7 +2191,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 			mes "[Jiang Xiayou]";
 			mes "Hey, hey...";
 			mes "I told you! It's not too late, why don't you do me the favor I asked? I'm only asking you once!";
-			emotion e_an,0,"Storage Keeper#lou";
+			emotion ET_FRET, getnpcid(0, "Storage Keeper#lou");
 			close;
 		}
 		mes "^3355FF*Rummage rummage*";
@@ -2253,7 +2253,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 	next;
 	mes "[Jiang Xiayou]";
 	mes "Hey, don't touch anything! If you mess anything up, you've gotta pile it up again, got it? If you don't want to clean up after yourself, don't make a mess!";
-	emotion e_rock,0,"Storage Keeper#lou";
+	emotion ET_ROCK, getnpcid(0, "Storage Keeper#lou");
 	close;
 }
 
@@ -2282,7 +2282,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 				mes "You found it...?!";
 				mes "I can't believe it!";
 				mes "You just lucked out.";
-				emotion e_wah,0,"Storage Keeper#lou";
+				emotion ET_KEK, getnpcid(0, "Storage Keeper#lou");
 				close;
 			}
 			mes "^3355FF*Rummage rummage*";
@@ -2347,7 +2347,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 			mes "It's not too late for you";
 			mes "to do the favor I asked.";
 			mes "I'm only asking you once!";
-			emotion e_gg,0,"Storage Keeper#lou";
+			emotion ET_KIK, getnpcid(0, "Storage Keeper#lou");
 			close;
 		}
 		mes "^3355FF*Rummage rummage*";
@@ -2395,7 +2395,7 @@ lou_in02,192,170,0	script	Supply Stack#2	111,{
 			next;
 			mes "[Jiang Xiayou]";
 			mes "I told you! Now stop bugging me and leave now! I don't wanna deal with someone who won't trust me.";
-			emotion e_pif,0,"Storage Keeper#lou";
+			emotion ET_HNG, getnpcid(0, "Storage Keeper#lou");
 			close;
 		}
 		mes "^3355FF*Rummage rummage*";
@@ -3303,7 +3303,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "You did?!";
 		mes "Oh~ thank you,";
 		mes "thank you so much!";
-		emotion e_an;
+		emotion ET_FRET;
 		next;
 		mes "[Nagash Arses]";
 		mes "Thank God I've";
@@ -3709,7 +3709,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 		close;
 	}
 	else if (ch_par > 9 && ch_poison == 8) {
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "[Song Zhi Du]";
 		mes "Ah, hello.";
 		mes "Please give me a minute,";
@@ -3754,14 +3754,14 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "Now, I've got to do this just right. This is a very delicate procedure...";
 			next;
 			specialeffect EF_MAGNUMBREAK;
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "[Song Zhi Du]";
 			mes "No!! I failed again! ^666666*Sigh...*^000000 And I spent a long time preparing all of those materials...";
 			set ch_poison,10;
 			changequest 11074,11075;
 			close;
 		}
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "[Song Zhi Du]";
 		mes "Ah, hello.";
 		mes "Please give me a minute,";
@@ -3826,7 +3826,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 				next;
 				specialeffect EF_PATTACK;
 				specialeffect EF_POISONHIT; 
-				emotion e_omg;
+				emotion ET_HUK;
 				mes "[Song Zhi Du]";
 				mes "Hahaha~!";
 				mes "Success! ";
@@ -3872,7 +3872,7 @@ lou_in02,253,45,0	script	Employee#poison	822,{
 			mes "Did I make it?";
 			next;
 			specialeffect EF_MAGNUMBREAK;
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "[Song Zhi Du]";
 			mes "NO! I... I've failed again! And I spent a long time getting everything ready...";
 			close;
@@ -4110,7 +4110,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "entrance of Louyang.";
 			mes "I hope you enjoy";
 			mes "your stay here~";
-			emotion e_kis;
+			emotion ET_CHUP;
 			close;
 		}
 		mes "[Lady]";
@@ -4133,7 +4133,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 		}
 		mes "[Lady]";
 		mes "Hmpf...!";
-		emotion e_dots;
+		emotion ET_THINK;
 		close;
 	}
 	else if (ch_poison == 8) {
@@ -4192,7 +4192,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 				mes "[Lady]";
 				mes "Errr...";
 				mes "You don't have enough zeny for the fee. I can't give you the package unless the delivery fee is paid!";
-				emotion e_an;
+				emotion ET_FRET;
 				close;
 			}
 			mes "[Lady]";
@@ -4217,7 +4217,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 			mes "You're at the";
 			mes "entrance of Louyang.";
 			mes "I hope you have a good time~";
-			emotion e_kis;
+			emotion ET_CHUP;
 			close;
 		}
 		mes "[Lady]";
@@ -4243,7 +4243,7 @@ lou_fild01,224,348,0	script	Lady#delivery	817,{
 		}
 		mes "[Lady]";
 		mes "Hmpf...!";
-		emotion e_dots;
+		emotion ET_THINK;
 		close;
 	}
 }

npc/quests/quests_lutie.txt

@@ -39,18 +39,18 @@ xmas,117,295,4	script	Vending Machine Man	704,{
 		next;
 		mes "[Titicupe]";
 		mes "Oh, this creation of mine is so magnificent!";
-		emotion e_kis2;
+		emotion ET_CHUPCHUP;
 		next;
 		mes "[Titicupe]";
 		mes "And the headgears--! I... I can't contain myself!";
 		next;
 		mes "^3355FFToy factory manager Titicupe jumps and convulses with joy. Clearly he's insane, but it may be possible that he may be brilliant.^000000";
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		close;
 	case 2:
 		mes "[Titicupe]";
 		mes "Oh right! You need to know what kind of items to put into the Vending Machine to get what you want, yes? Go ahead... Ask me~";
-		emotion e_ic;
+		emotion ET_AHA;
 		next;
 		switch(select("Raccoon Hat:Spore Hat:Wonder Nutshell:Ranbow Eggshell:Blush:Chef Hat:Candle:Cake Hat:End Conversation")) {
 		case 1:
@@ -133,7 +133,7 @@ xmas,117,295,4	script	Vending Machine Man	704,{
 		mes "I love you";
 		mes "Mister Snowman";
 		mes "Vending Machine.";
-		emotion e_kis2;
+		emotion ET_CHUPCHUP;
 		next;
 		mes "^3355FFToy factory manager Titicupe begins to jump around and emit screams of unbridled ecstacy. At this point, it's not difficult to doubt his sanity, as well as his genius.";
 		close;
@@ -171,7 +171,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 1036,20;  //Dragon_Scale
 			delitem 7012,200;  //Tough_Scalelike_Stem
 			delitem 7065,300;  //Sea_Otter_Leather
-			emotion e_Oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -192,7 +192,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 7033,850;  //Poison_Spore
 			delitem 7068,300;  //Burn_Tree
 			delitem 1015,1;  //Thin_N'_Long_Tongue
-			emotion e_oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -218,7 +218,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			mes "*Kapang!*";
 			mes "*BeepBoopBeepBoop*";
 			mes "*Beeeeeeoop*^000000";
-			emotion e_oh;
+			emotion ET_O;
 			getitem 5050,1; // Mystery_Fruit_Shell
 			next;
 			mes "[Audi]";
@@ -235,7 +235,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 5015,1;  //Egg_Shell
 			delitem 978,1;  //Cobaltblue_Dyestuffs
 			delitem 7030,50;  //Claw_Of_Desert_Wolf
-			emotion e_oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -254,7 +254,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
 			next;
 			delitem 7047,100;  //Alice's_Apron
-			emotion e_oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -280,7 +280,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 982,1;  //White_Dyestuffs
 			delitem 949,330;  //Feather
 			delitem 1036,450;  //Dragon_Scale
-			emotion e_oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -302,7 +302,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 2279,1;  //Bomb_Wick
 			delitem 7035,50;  //Matchstick
 			delitem 526,100;  //Royal_Jelly
-			emotion e_oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -325,7 +325,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 			delitem 538,15;  //Well_Baked_Cookie
 			delitem 539,20;  //Piece_Of_Cake
 			delitem 999,10;  //Steel
-			emotion e_oh;
+			emotion ET_O;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
 			mes "*choogachooga*";
@@ -346,7 +346,7 @@ xmas,115,297,4	script	Vending Machine	111,{
 		mes "Items.^000000";
 		close;
 	}
-	emotion e_x;
+	emotion ET_X;
 	mes "[Audi]";
 	mes "^555555Error Error!";
 	mes "Incorrect items!^000000";

npc/quests/quests_morocc.txt

@@ -880,7 +880,7 @@ que_job01,70,84,1	script	Girl#moc_ex002	882,{
 	mes "Oh, the world.. the world is doomed..";
 	mes "-sobbing-";
 	mes "Nothing seems to be working now..";
-	emotion e_sob;
+	emotion ET_CRY;
 	next;
 	mes "["+ strcharinfo(0) +"]";
 	mes "....Tsk..tsk...";
@@ -2115,14 +2115,14 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "^660000Watching him makes you giggle, he looks no better than the dried corpses in the pyramid, but he is obviously alive and doesn't appear to be a monster. Somehow, you find yourself compelled to approach this interesting looking man.^000000";
 			next;
-			emotion e_lv;
+			emotion ET_THROB;
 			mes "[Book-Touching Man]";
 			mes "Ah... Mammi...";
 			next;
 			mes "[Book-Touching Man]";
 			mes "Your healthy golden skin is glowing under the blessed sunlight of Morroc.";
 			next;
-			emotion e_sob;
+			emotion ET_CRY;
 			mes "[Book-Touching Man]";
 			mes "Your smile outshines the aura of the gods of Valhalla. You are a living gospel. Your smile even makes Goddess Freya hide in the shadows in shame! Ah.... Mammi, my Mammi!";
 			next;
@@ -2133,7 +2133,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "["+ strcharinfo(0) +"]";
 				mes "Are you talking to yourself?";
 				next;
-				emotion e_omg;
+				emotion ET_HUK;
 				mes "[Book-Touching Man]";
 				mes "Wah! Oh, my god, you must be a messenger of the devil trying to interrupt me from feeling Mammi!";
 				mes "I'm not afraid of you, so bring it on!";
@@ -2144,11 +2144,11 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "["+ strcharinfo(0) +"]";
 				mes "Who's Mammi?";
 				next;
-				emotion e_omg;
+				emotion ET_HUK;
 				mes "[Book-Touching Man]";
 				mes "What? Don't you know Mammi, one of the three greatest Rune-Midgart's idols?";
 				next;
-				emotion e_sigh;
+				emotion ET_OHNO;
 				mes "[Book-Touching Man]";
 				mes "Man, you don't know anything, do you?! Well, judging by the stupid look on your face, I guess you're an adventurer running around on meaningless errands for others. Heh heh!";
 				next;
@@ -2161,7 +2161,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "[Book-Touching Man]";
 				mes "She even mentioned in an interview in 'Morroc Times' that she wants to meet a man that loves books.";
 				next;
-				emotion e_awsm;
+				emotion ET_COOL;
 				mes "[Book-Touching Man]";
 				mes "That means... She's waiting for someone like me. Hehehe!";
 				mes "You see, every book in Rune-Midgart's Library has the name Benjamin written on them... That's me!";
@@ -2182,7 +2182,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "[Benjamin]";
 				mes "I really need to read that book and tell her that I'm here for her, but I don't even have the time to regain my breath because of this situation in our hands!";
 				next;
-				emotion e_sob;
+				emotion ET_CRY;
 				mes "[Benjamin]";
 				mes "My Mammi pillow cover is buried under debris... Gasp!";
 				mes "Mammi, I'm coming! Don't you die yet!";
@@ -2191,13 +2191,13 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				next;
 				mes "^660000He inhaled deeply, and then suddenly turned his head toward you.^000000";
 				next;
-				emotion e_ic;
+				emotion ET_AHA;
 				mes "[Benjamin]";
 				mes "....Ye... Yes, you!";
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Huh?";
-				emotion e_swt2,1;
+				emotion ET_PROFUSELY_SWEAT, playerattached();
 				next;
 				mes "[Benjamin]";
 				mes "You look bored. You must be waiting for someone to give you something to do!";
@@ -2259,7 +2259,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "^660000You carefully approached him, and then gave him a pat on the shoulder.^000000";
 			next;
-			emotion e_omg;
+			emotion ET_HUK;
 			mes "[Benjamin]";
 			mes "Grrrr! Who dares touch me?!";
 			next;
@@ -2291,12 +2291,12 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 			next;
 			mes "[Benjamin]";
 			mes "Grrrr... Mammi! Here I am, following your noble tastes to read such a rare book! Mammi...!";
-			emotion e_lv2;
+			emotion ET_BIGTHROB;
 			next;
 			mes "[Benjamin]";
 			mes "I feel so excited to think about having a deep conversation with Mammi about literature! Yay!";
 			mes "I should go read this book right away. Hehehe!";
-			emotion e_ho;
+			emotion ET_DELIGHT;
 			next;
 			mes "[Benjamin]";
 			mes "Oops, I must not forget to repay you. You know, I'm a polite man.";
@@ -2501,7 +2501,7 @@ prt_in,179,92,3	script	Library Curator#garas	57,{
 				}
 				break;
 			}
-			emotion e_ic;
+			emotion ET_AHA;
 			mes "[Curator Guys]";
 			mes "Oh, right! I think I know the book:";
 			next;
@@ -2640,7 +2640,7 @@ yuno,333,210,5	script	Library Master#garas	57,{
 		mes "I gurantee you that you'll get better quickly.";
 		next;
 		mes "^660000He sounded sincere, but it doesn't sound like that kind of broth would even be effective...^000000";
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		set barmunt_crow,3;
 		close;
 	}
@@ -2739,7 +2739,7 @@ OnTouch:
 		mes "I gurantee you that you'll get better quickly.";
 		next;
 		mes "^660000He sounded sincere, but it doesn't sound like that kind of broth would even be effective...^000000";
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		set barmunt_crow,3;
 		close;
 	}
@@ -2767,7 +2767,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	862,{
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "I'm looking for a book called <The Crow of the Fate> written by Oliver Hilpert... Ahchoo!";
-		emotion e_wah,1;
+		emotion ET_KEK, playerattached();
 		specialeffect2 EF_VENOMDUST;
 		next;
 		mes "[Library Part-Timer]";
@@ -3152,7 +3152,7 @@ yuno_in04,169,123,3	script	Suspicious Man#oliver_h	407,{
 		case 2:
 			mes "[Oliver Hilpert]";
 			mes "Okay... I see...";
-			emotion e_sob;
+			emotion ET_CRY;
 			close2;
 			cutin "",255;
 			end;
@@ -3233,13 +3233,13 @@ yuno_in04,169,123,3	script	Suspicious Man#oliver_h	407,{
 		mes "What's happened to this feather?";
 		next;
 		mes "[Oliver Hilpert]";
-		emotion e_wah;
+		emotion ET_KEK;
 		mes "Wah! Did I do this?";
 		mes "Oh my god, I'm sorry! I'm so sorry!";
 		next;
 		mes "^660000He changed back to himself, and started apologizing to you for his sudden rage.^000000";
 		next;
-		emotion e_sob;
+		emotion ET_CRY;
 		mes "[Oliver Hilpert]";
 		mes "I... I don't know how to apologize...";
 		mes "It's just that... I became so angry that I--! Argh, I'm sorry!";
@@ -3423,7 +3423,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "[Oliver Hilpert]";
 		mes "Wah!";
 		mes "Isn't that over there?!";
-		emotion e_omg;
+		emotion ET_HUK;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Huh?";
@@ -3445,10 +3445,10 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		cutin "oliver_smile",2;
 		mes "[Oliver Hilpert]";
 		mes "Lady Mammi!";
-		emotion e_lv2;
+		emotion ET_BIGTHROB;
 		next;
 		mes "^660000Yes, it was the picture book of Mammi, an idol whom Benjamin of Morroc insists to be one of the three greatest idols in the Rune-Midgart Kingdom. That must be why Oliver is squealing in delight.^000000";
-		emotion e_dots,1;
+		emotion ET_THINK, playerattached();
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Ahchoo! Are you also a Mammi fan?";
@@ -3472,12 +3472,12 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "[Oliver Hilpert]";
 		mes "...Oh!";
 		cutin "mami01",4;
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		mes "[Oliver Hilpert]";
 		mes "...Ooooh!";
 		cutin "mami02",4;
-		emotion e_lv;
+		emotion ET_THROB;
 		next;
 		cutin "oliver_smile",2;
 		mes "[Oliver Hilpert]";
@@ -3499,7 +3499,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		mes "["+ strcharinfo(0) +"]";
 		mes "...............";
 		mes "I... I see...";
-		emotion e_swt,1;
+		emotion ET_SWEAT, playerattached();
 		next;
 		mes "[Oliver Hilpert]";
 		mes "Umm...";
@@ -3521,7 +3521,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
 		case 2:
 			mes "[Oliver Hilpert]";
 			mes "Okay... I see...";
-			emotion e_sob;
+			emotion ET_CRY;
 			set barmunt_crow,13;
 			close2;
 			cutin "",255;
@@ -3926,7 +3926,7 @@ cave,82,97,3	script	Cave Settler#g1	996,3,3,{
 				mes "Hmm...";
 				mes "Wait here.";
 				next;
-				emotion e_com;
+				emotion ET_COMEON;
 				mes "[Cave Settler]";
 				mes "Hey, Jaeda!";
 				enablenpc "Jaeda#garas1";
@@ -4014,7 +4014,7 @@ OnTouch:
 				mes "Hmm...";
 				mes "Wait here.";
 				next;
-				emotion e_com;
+				emotion ET_COMEON;
 				mes "[Cave Settler]";
 				mes "Hey, Jaeda!";
 				enablenpc "Jaeda#garas1";
@@ -4333,7 +4333,7 @@ prontera,153,353,4	script	Messenger#prince1	105,{
 				next;
 				switch(select("Passed away?:Came for a celebration again?")) {
 				case 1:
-					emotion e_gasp;
+					emotion ET_SURPRISE;
 					mes "[Messenger]";
 					mes "You already know about that...";
 					mes "Then, I don't need to give";
@@ -5457,7 +5457,7 @@ prt_castle,274,372,4	script	Servant#hans	48,{
 			mes "That's all I can say about this.";
 			mes "Huh...~";
 			next;
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			mes "[Hans]";
 			mes "Ah, Prince!";
 			mes "You can cut your finger!";
@@ -6276,7 +6276,7 @@ prt_castle,314,373,4	script	Prince#eisen	983,{
 			mes "take it the wrong way.";
 			mes "I have been acting for Brother and Kingdom, and I will be the same ever after.";
 			next;
-			emotion e_gasp;
+			emotion ET_SURPRISE;
 			mes "[Ahrum]";
 			mes "Ah, the appraiser has come.";
 			mes "How could you appear so suddenly? Ern and I were in the middle of conversation.";
@@ -6615,7 +6615,7 @@ prt_castle,314,373,4	script	Prince#eisen	983,{
 				mes "Although all these";
 				mes "status system fade away";
 				mes "I will be the king, with my sole capability and aptitude! Hahaha.";
-				emotion e_heh;
+				emotion ET_SMILE;
 				next;
 				mes "[Ahrum]";
 				mes "I know quite well about";
@@ -6931,7 +6931,7 @@ OnTouch:
 		mes "All the glory for Rune-Midgarts...";
 		mes "Hmm?";
 		next;
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "[A man of Walter Family]";
 		mes "Quiet... Someone comes.";
 		mes "Ok... take care.";
@@ -7091,7 +7091,7 @@ prt_castle,314,371,0	script	Prince#another_ern	985,{
 		mes "take it the wrong way.";
 		mes "I have been acting for Brother and Kingdom, and I will be the same ever after.";
 		next;
-		emotion e_gasp;
+		emotion ET_SURPRISE;
 		mes "[Ahrum]";
 		mes "Ah, the appraiser has come.";
 		mes "How could you appear so suddenly? Ern and I were in the middle of conversation.";