diff --git a/doc/sample/getequipcardid.txt b/doc/sample/getequipcardid.txt index 0556eb8e77..db5cdde3db 100644 --- a/doc/sample/getequipcardid.txt +++ b/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; } diff --git a/doc/sample/instancing.txt b/doc/sample/instancing.txt index ae67468f6c..0fa082a3f1 100644 --- a/doc/sample/instancing.txt +++ b/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; -} \ No newline at end of file +} diff --git a/doc/sample/npc_live_dialogues.txt b/doc/sample/npc_live_dialogues.txt index 56941558f4..cef959d871 100644 --- a/doc/sample/npc_live_dialogues.txt +++ b/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; } diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt index 983450430d..be3db81c8b 100644 --- a/doc/sample/npc_test_duplicate.txt +++ b/doc/sample/npc_test_duplicate.txt @@ -23,7 +23,7 @@ OnInit: OnTouch: getmapxy(.map$, .x, .y, 1); - emotion e_scissors; + emotion ET_SCISSOR; end; } diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 074d449be6..0b7035f522 100644 --- a/doc/script_commands.txt +++ b/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 {,}; 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 ,; - -This command will make a display an emotion sprite. -For a full list of emotion numbers, see 'src/map/script_constants.h' under 'e_'. - ---------------------------------------- - *unitskilluseid ,,{,,}; *unitskilluseid ,"",{,,}; *unitskillusepos ,,,,{,}; diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 199962b5a2..e5800e0730 100644 --- a/npc/airports/airships.txt +++ b/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; } diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index c51869686f..bbf1230fe3 100644 --- a/npc/cities/amatsu.txt +++ b/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 "..............."; diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 2c0cd5581b..e96e3bfba7 100644 --- a/npc/cities/ayothaya.txt +++ b/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; } diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index 16364950b6..4650a8b3f1 100644 --- a/npc/cities/einbroch.txt +++ b/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; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 94380a343a..19babfd802 100644 --- a/npc/cities/geffen.txt +++ b/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."; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 447a9bcfbd..d5048dddd4 100644 --- a/npc/cities/jawaii.txt +++ b/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; } diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index cc3b7cb736..8af190d807 100644 --- a/npc/cities/lighthalzen.txt +++ b/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; diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index 6f935251a2..e659ab5cfb 100644 --- a/npc/cities/louyang.txt +++ b/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]"; diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 58d3dedb71..633798a235 100644 --- a/npc/cities/niflheim.txt +++ b/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; diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index 7c1f9592a0..90f1492388 100644 --- a/npc/cities/rachel.txt +++ b/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"; diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt index a35fd4b943..572c03f180 100644 --- a/npc/cities/splendide.txt +++ b/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; } } diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index a8681c6e22..7a734894e7 100644 --- a/npc/cities/umbala.txt +++ b/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; diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index a15aed3bfd..595056e882 100644 --- a/npc/custom/etc/marriage.txt +++ b/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; } diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt index bf3d96ddca..44610e805a 100644 --- a/npc/custom/etc/morroc_raceway.txt +++ b/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; diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index 3a9f12d39f..4ae137200a 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/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; } diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index aca0efe765..dfb7c4f995 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/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."; diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt index d00cf682fe..a582b1efbe 100644 --- a/npc/custom/etc/rpsroulette.txt +++ b/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; diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 9d375f6d86..128654963c 100644 --- a/npc/custom/events/cluckers.txt +++ b/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: diff --git a/npc/custom/events/holiday/hallow06.txt b/npc/custom/events/holiday/hallow06.txt index 361c362586..5262030f30 100644 --- a/npc/custom/events/holiday/hallow06.txt +++ b/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: diff --git a/npc/custom/events/holiday/uneasy_cemetery.txt b/npc/custom/events/holiday/uneasy_cemetery.txt index 5d8d700f67..640cb97137 100644 --- a/npc/custom/events/holiday/uneasy_cemetery.txt +++ b/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: diff --git a/npc/custom/events/holiday/xmas_rings_event.txt b/npc/custom/events/holiday/xmas_rings_event.txt index 2fc69c42ea..1eba705a90 100644 --- a/npc/custom/events/holiday/xmas_rings_event.txt +++ b/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; } diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt index 79f1015d54..429e04ee1e 100644 --- a/npc/custom/item_signer.txt +++ b/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; diff --git a/npc/custom/official/GeffenMagicTournament.txt b/npc/custom/official/GeffenMagicTournament.txt index 60156a5890..39f64b7cd0 100644 --- a/npc/custom/official/GeffenMagicTournament.txt +++ b/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"); diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index 47e76cc685..f02467cbab 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/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: diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt index f000e2f89e..9def18b511 100644 --- a/npc/custom/quests/berzebub.txt +++ b/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: diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index 8b6d0db869..7570fb30f2 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/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); diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt index a89faf3f30..8c3b9b101b 100644 --- a/npc/custom/quests/jewel_case.txt +++ b/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; } diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index 1d62613062..b72c321b07 100644 --- a/npc/custom/quests/may_hats.txt +++ b/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: diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt index 3b264156c1..6b03f62c4a 100644 --- a/npc/custom/quests/thq/THQS_GuildNPC.txt +++ b/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."; diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt index 7bb56bb498..325534c4ae 100644 --- a/npc/custom/quests/thq/THQS_QuestNPC.txt +++ b/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: diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt index 6f7e8bc1a7..5e89895137 100644 --- a/npc/custom/quests/umbalian_language.txt +++ b/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]"; diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index 5c4e93ecde..f048eebf18 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/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) { diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index f06ec60204..e8e6903074 100644 --- a/npc/events/RWC_2011.txt +++ b/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) { diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index 1b57e1f270..ab5eb75809 100644 --- a/npc/events/christmas_2005.txt +++ b/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.-"; diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 84309bd4c0..e8a5d945a0 100644 --- a/npc/events/christmas_2008.txt +++ b/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; diff --git a/npc/events/christmas_2013.txt b/npc/events/christmas_2013.txt index 5896f6b7b2..6eba818859 100644 --- a/npc/events/christmas_2013.txt +++ b/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!"; diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index 2d7136c9ed..ce0ea748ec 100644 --- a/npc/events/easter_2010.txt +++ b/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; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 3d7585cf33..f09a78a179 100644 --- a/npc/events/event_skill_reset.txt +++ b/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; } diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 22648935f0..cc0ac58ff6 100644 --- a/npc/events/gdevent_aru.txt +++ b/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^000000"; mapannounce "arug_que01", "Pierrot Pier: ",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^000000. Beep beep."; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Pierrot Pier]"; mes "Hm? You don't think so?"; next; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 89ced007a6..197141c501 100644 --- a/npc/events/gdevent_sch.txt +++ b/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^000000"; mapannounce "schg_que01", "Pierrot Pier: ",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^000000. Beep beep."; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Pierrot Pier]"; mes "Hm? You don't think so?"; next; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index e4d4151e4b..9da07d348c 100644 --- a/npc/events/halloween_2006.txt +++ b/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; } } diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index 13c74489b3..726f5da114 100644 --- a/npc/events/idul_fitri.txt +++ b/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; } } diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index 981e3c234f..2f69038ff8 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/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; diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 42d97110dc..f662e727f3 100644 --- a/npc/instances/SealedShrine.txt +++ b/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; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 37fe30b36a..7da38ab88d 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/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."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 7e3f66a06b..810ab73392 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/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!"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index a314744880..e11664b86d 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/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; } diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index c40ca0eb7a..522bfb25f3 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/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"; diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index eb47f20bd0..5dccc88675 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/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"; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 85a60e85f4..6bf9e8d853 100644 --- a/npc/kafras/functions_kafras.txt +++ b/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; } diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 1d4c9cc946..de09883df1 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/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; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index d5e5f7a8d7..096a4bc47a 100644 --- a/npc/merchants/hair_style.txt +++ b/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]"; diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index b8b4a97e51..bbb9e242c7 100644 --- a/npc/merchants/quivers.txt +++ b/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!"; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index fab6e4db3a..48a82d7fbb 100644 --- a/npc/merchants/refine.txt +++ b/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; } diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt index 356002df7d..c962af5561 100644 --- a/npc/other/acolyte_warp.txt +++ b/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."; diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt index ff03417ec7..0fd78d8e78 100644 --- a/npc/other/arena/arena_aco.txt +++ b/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!"; diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index a4c21dd48d..9d3183eecd 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/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!"; diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 77a1b3ce0a..1cb78a69fa 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/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!"; diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index fcec2922ea..f1999d5957 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/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!"; diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index 6a8b96e3e8..4e5dc514da 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/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!"; diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 4258baf702..2dc8857851 100644 --- a/npc/other/arena/arena_party.txt +++ b/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!"; diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index 6c43498173..ed44650023 100644 --- a/npc/other/arena/arena_room.txt +++ b/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 diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 011f51ea18..552712a860 100644 --- a/npc/other/comodo_gambling.txt +++ b/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: diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index a40b6befc3..2a6b1615c6 100644 --- a/npc/other/marriage.txt +++ b/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; } diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 87fa0aa76a..e1f3704036 100644 --- a/npc/other/monster_race.txt +++ b/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; } diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index f5d6b22420..ff10ac808b 100644 --- a/npc/other/poring_war.txt +++ b/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]"; diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index 09d0546ef1..24ca8bfbb0 100644 --- a/npc/other/powernpc.txt +++ b/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"; diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 757dd4c02a..247a2ccd98 100644 --- a/npc/other/turbo_track.txt +++ b/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 diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt index 6bb725d9fa..50b54642a5 100644 --- a/npc/pre-re/guides/guides_niflheim.txt +++ b/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: diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 276afea970..8aecf33a4e 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/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: diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index 01c805c621..55389f0250 100644 --- a/npc/quests/bard_quest.txt +++ b/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; } diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 3b3b13cc78..21bd65a668 100644 --- a/npc/quests/cooking_quest.txt +++ b/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~"; diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt index e28932b201..0eeec0344a 100644 --- a/npc/quests/dandelion_request.txt +++ b/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"; diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index c27ca822f7..259ebe74ce 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/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~"; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 5409619ecc..3978b2ebd9 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/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"; diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index 60ea6da590..09a1161bcd 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/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: diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index 103be5f381..9d87d233f4 100644 --- a/npc/quests/guildrelay.txt +++ b/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; diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index 8599357b30..a3d5d8ddd2 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/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) { diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 8b889f9c0b..010f24bb30 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/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; } } diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index 3dc221529e..d4e7890d54 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/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"; diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt index 567fd4c71b..c0bcfc29cc 100644 --- a/npc/quests/newgears/2008_headgears.txt +++ b/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]"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 8b2c347a73..4f60b23d8e 100644 --- a/npc/quests/quests_13_1.txt +++ b/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."; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index f89005bc50..bba86c50cb 100644 --- a/npc/quests/quests_13_2.txt +++ b/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."; diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index 536331cba3..179ceb01a1 100644 --- a/npc/quests/quests_airship.txt +++ b/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"; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 21d789a385..0cae4fc565 100644 --- a/npc/quests/quests_alberta.txt +++ b/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"; diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index 19502f3953..325f4616eb 100644 --- a/npc/quests/quests_amatsu.txt +++ b/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) { diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index 1d1126968a..e94f5e5472 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/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"; diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 79733d0470..68749dc738 100644 --- a/npc/quests/quests_ein.txt +++ b/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."; diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 7ab6ab1fc4..40cd630292 100644 --- a/npc/quests/quests_gonryun.txt +++ b/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; } diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index 1ad5a2fb2a..99b8b42af9 100644 --- a/npc/quests/quests_hugel.txt +++ b/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) { diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 077a88bd66..efbfd9e0c6 100644 --- a/npc/quests/quests_juperos.txt +++ b/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"; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 03afe37c2a..4233949fa4 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/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? "; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 0fa94906ba..b35d754554 100644 --- a/npc/quests/quests_louyang.txt +++ b/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; } } diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 182d746789..b29f69576d 100644 --- a/npc/quests/quests_lutie.txt +++ b/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"; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 44103b4920..07c18805ab 100644 --- a/npc/quests/quests_morocc.txt +++ b/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 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."; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 1b3f7a86ec..0b574816e6 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -38,7 +38,7 @@ //---------------------------------------------------------------------------- moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{ if (!mos_whale_edq) { - emotion e_an; + emotion ET_FRET; mes "[Berbayeff]"; mes "This..and..that..."; mes "All guys...are distrustful."; @@ -70,7 +70,7 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{ mes "you can talk to me whenever."; close; } - emotion e_no1; + emotion ET_BEST; mes "[Berbayeff]"; mes "Good, I have been thinking that"; mes "I would tell you this story from the start."; @@ -228,12 +228,12 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{ changequest 18101,18102; close; } else if (mos_whale_edq > 2 && mos_whale_edq < 42) { - emotion e_omg; + emotion ET_HUK; mes "[Berbayeff]"; mes "Are you serious? Did you say"; mes "you've found The Moving Island?"; next; - emotion e_no1; + emotion ET_BEST; mes "[Berbayeff]"; mes "The legend is true!!"; mes "I was right, wasn't I?"; @@ -456,7 +456,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ changequest 18104,18105; close; } - emotion e_ag; + emotion ET_ANGER; mes "[Mr. Ibanoff]"; mes "You want to borrow"; mes "my ship so spontaneously??"; @@ -1698,7 +1698,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ S_AS_1: if (rand(1,getarg(0)) == 2) { soundeffect "mos_gusli1.wav",0; - emotion e_no1; + emotion ET_BEST; specialeffect2 EF_EXIT; mes "[Aged Stranger]"; mes "Oh! You are good at playing the"; @@ -2188,8 +2188,8 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,7,7,{ mes "Good, play it right away!"; next; soundeffect "mos_gusli2.wav",0; - emotion e_ag,0,"Csar Alexsay III#npc"; - emotion e_ag,0,"Prime Minister Dmitree#m"; + emotion ET_ANGER; + emotion ET_ANGER, getnpcid(0, "Prime Minister Dmitree#m"); mes "[Csar Alexsay III]"; mes "Um... What is this? Do you mock me?"; mes "You are so impudent... You...!"; @@ -2208,7 +2208,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,7,7,{ mes "[Prime Minister Dmitree]"; mes "How can I re...reward...?"; next; - emotion e_pif; + emotion ET_HNG; mes "[Csar Alexsay III]"; mes "I ordered you instead Prime"; mes "Minister, to make this poor player"; @@ -2309,8 +2309,8 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,7,7,{ mes "played, all the people in the"; mes "Csar's Palace fall in with the tune.-"; next; - emotion e_sob,0,"Csar Alexsay III#npc"; - emotion e_sob,0,"Prime Minister Dmitree#m"; + emotion ET_CRY; + emotion ET_CRY, getnpcid(0, "Prime Minister Dmitree#m"); mes "[Csar Alexsay III]"; mes "Oh! I can't hear without tears."; mes "That's a sad tune."; @@ -2751,7 +2751,7 @@ function script F_MOS_1 { mes "[Gallina]"; mes "It's because you didn't look after your brother. So you clean the house, Anna?"; next; - emotion e_sob,0,"Anna#mos"; + emotion ET_CRY, getnpcid(0, "Anna#mos"); mes "[Anna]"; mes "Oh, my................"; next; @@ -2896,11 +2896,11 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{ mes "Where is Mikhail?"; mes "Do you know where he is?"; next; - emotion e_meh; + emotion ET_MERONG; mes "[Anna]"; mes "If I had known that, I would have already found him, you fool."; next; - emotion e_swt,1; + emotion ET_SWEAT, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Hahaha, you're right."; break; @@ -2964,7 +2964,7 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{ mes "["+strcharinfo(0)+"]"; mes "Is there anyone who is close to him?"; next; - emotion e_pif; + emotion ET_HNG; mes "[Anna]"; mes "(giggle) He's a fool and has no friends."; mes "But among our villagers, the lady of ^3131FFInn 'Sticky Herb Tree'^000000 has held Mikhail dear."; @@ -3043,7 +3043,7 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{ mes "[Gallina]"; mes "Anna!"; next; - emotion e_sob; + emotion ET_CRY; mes "[Anna]"; mes "....I'm sorry."; close; @@ -3387,7 +3387,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ close; case 3: mes "[Landlord]"; - emotion e_lv; + emotion ET_THROB; mes "Oh~! You look great! Look at the "+((Sex == SEX_MALE)?"solid muscle":"fair skin")+"!"; mes "But you look tired. Is it because of a long journey?"; next; @@ -3399,7 +3399,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ mes "Oh, I'm sorry but I didn't come to stay here."; mes "I'm looking for a kid and I've got something to ask you..."; next; - emotion e_omg; + emotion ET_HUK; mes "[Landlord]"; mes "What!?!?"; next; @@ -3412,7 +3412,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ mes "If you promise me to stay overnight, I'll tell you about what you want to know. Deal?"; next; if(select("Refuse.:Stay overnight and get the info. - 5000z") == 1) { - emotion e_ag; + emotion ET_ANGER; mes "[Landlord]"; mes "Well, get the info by yourself then."; close; @@ -6443,7 +6443,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{ percentheal -50,-50; specialeffect2 EF_DARKBREATH; specialeffect2 EF_HIT2; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "- An unknown force has -"; mes "- drained your health -"; @@ -6458,7 +6458,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{ mes "- You decide to go to the left -"; next; mes "- !!!!!! -"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "- An unknown force has -"; mes "- cursed your body -"; @@ -6469,7 +6469,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{ mes "- You decide to go to the left -"; next; mes "- !!!!!! -"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "- Your trusty Pecopeco senses -"; mes "- an unknown force and tries -"; @@ -6488,7 +6488,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{ mes "- toward the middle -"; next; mes "- !!!!!! -"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); donpcevent "Gray Wolf#rus03::OnEnable"; rhea_rus_main = 2; // if (isbegin_quest(8136)) @@ -6547,7 +6547,7 @@ mosk_dun01,167,160,3 script Gray Wolf#rus03 4_RUS_DWOLF,{ mes "Unless you want to be killed, leave now."; rhea_rus_main = 3; // changequest 8137,8138; - emotion e_omg,1; + emotion ET_HUK, playerattached(); specialeffect2 EF_HIT2; percentheal -50,0; next; @@ -6637,20 +6637,20 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ if (rhea_rus_main < 5) { mes "["+ strcharinfo(0) +"]"; mes "...?!"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); close; } else if (rhea_rus_main == 5) { .@speak01 = rand(1,3); if (.@speak01 == 3) { mes "["+ strcharinfo(0) +"]"; mes "...?!"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); donpcevent "Gray Wolf#rus05::OnEnable"; next; } else { mes "["+ strcharinfo(0) +"]"; mes "...?!"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); close; } mes "[Girl's Voice]"; @@ -6819,7 +6819,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ mes "["+ strcharinfo(0) +"]"; mes "Maria?! What happened?!"; sc_start SC_CURSE,60000,0; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Koshei, the Immortal]"; mes "I really want to thank you, human. Maria was imprisoned in the wall so I couldn't do anything!"; @@ -6884,7 +6884,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ next; mes "[Gray Wolf]"; mes "No, it's not too late!"; - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); donpcevent "Gray Wolf#rus05::OnEnable"; next; mes "[Gray Wolf]"; @@ -7569,8 +7569,8 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{ mes "^ff0000Cold marsh swallowing my body^000000"; mes "^ff0000Red ring taken away^000000"; mes "^ff0000Red ring enchanted^000000"; - emotion e_omg; - emotion e_dots,1; + emotion ET_HUK; + emotion ET_THINK, playerattached(); next; mes "[Vassili Grandpapa]"; mes "...W, what is this? Ehh??"; @@ -7631,8 +7631,8 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{ mes "^ff0000Cold marsh swallowing my body^000000"; mes "^ff0000Red ring taken away^000000"; mes "^ff0000Red ring enchanted^000000"; - emotion e_dots; - emotion e_dots,1; + emotion ET_THINK; + emotion ET_THINK, playerattached(); next; mes "[Vassili Grandpapa]"; mes "It is.. It is true..."; @@ -7694,7 +7694,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{ next; mes "["+ strcharinfo(0) +"]"; mes "Ehh?! This is weird. Where is the flute?!"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); close; } else if (rhea_rus_ring == 9) { mes "[Vassili Grandpapa]"; @@ -7726,7 +7726,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ next; mes "[Ryubaba]"; mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?"; - emotion e_heh; + emotion ET_SMILE; close; } else if (rhea_rus_main == 8) { @@ -7736,7 +7736,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ next; mes "[Ryubaba]"; mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?"; - emotion e_heh; + emotion ET_SMILE; close; } else if (rhea_rus_ring == 1) { if (getequipid(EQI_SHOES) != 2429 && getequipid(EQI_SHOES) != 2430) { @@ -7772,7 +7772,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ } mes "["+ strcharinfo(0) +"]"; mes "Yes, you are really beautiful."; - emotion e_heh,1; + emotion ET_SMILE, playerattached(); next; mes "[Ryubaba]"; mes "Huhu, oh you jest. You know what you're talking about. Ah, this is a Choco drink that I have made. Give it a taste, isn't it good?"; @@ -7895,8 +7895,8 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ mes "^ff0000Cold marsh swallowing my body^000000"; mes "^ff0000Red ring taken away^000000"; mes "^ff0000Red ring enchanted^000000"; - emotion e_omg; - emotion e_dots,1; + emotion ET_HUK; + emotion ET_THINK, playerattached(); next; mes "[Ryubaba]"; mes "S, stop! You'd better stop!?"; @@ -7923,7 +7923,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ next; mes "[Ryubaba]"; mes "Please, I am begging you... Don't tell my father..."; - emotion e_sob; + emotion ET_CRY; next; mes "- Suddenly, she sheds -"; mes "- tears and kneels down -"; @@ -8007,7 +8007,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ } mes "["+ strcharinfo(0) +"]"; mes "...!? Where is the flute!?"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); close; } else if (rhea_rus_ring == 8) { mes "[Ryubaba]"; @@ -8192,8 +8192,8 @@ mosk_fild02,157,233,0 script Shepherdess#rus10 1_F_04,{ mes "^ff0000Cold marsh swallowing my body^000000"; mes "^ff0000Red ring taken away^000000"; mes "^ff0000Red ring enchanted^000000"; - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); next; mes "[Shepherdess]"; mes "W, what is this? Horrible! Why did this flute play a voice?"; @@ -8395,7 +8395,7 @@ mosk_fild02,116,202,3 script Lusalka#07russai_22 -1,3,3,{ end; OnTouch_: if (rhea_rus_main != 8 || rhea_rus_hair < 2) { - emotion e_what,1; + emotion ET_QUESTION, playerattached(); end; } if (rhea_rus_hair == 2) { @@ -8559,7 +8559,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ next; mes "[Lusalka]"; mes "Ah... but..."; - emotion e_sob; + emotion ET_CRY; donpcevent "Lusalka#rus23::OnDisable"; close; } @@ -8633,7 +8633,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ mes "Aaaaaaaah!??!?!"; sc_start SC_CURSE,60000,0; specialeffect2 EF_LORD; - emotion e_omg,1; + emotion ET_HUK, playerattached(); percentheal -30,0; next; mes "["+ strcharinfo(0) +"]"; @@ -8757,7 +8757,7 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ next; mes "[A Wanderer from a strange land]"; mes "Ah, oh yes! How could I forget?"; - emotion e_ic; + emotion ET_AHA; next; mes "[A Wanderer from a strange land]"; mes "We came here from Moscovia together. He called himself Igg. I came here with him but parted with him quite a while ago. He was sad because he couldn't forget about his lost lover."; @@ -9074,7 +9074,7 @@ OnTouch_: close; } } - emotion e_what,1; + emotion ET_QUESTION, playerattached(); end; } @@ -9107,7 +9107,7 @@ mosk_que,45,131,0 script Stone Furnace#rus28 HIDDEN_NPC,{ mes "["+ strcharinfo(0) +"]"; mes "Oops, it's hot, hot!!!"; specialeffect2 EF_FIREHIT; - emotion e_omg,1; + emotion ET_HUK, playerattached(); percentheal -5,0; close; } @@ -9123,7 +9123,7 @@ mosk_que,45,131,0 script Stone Furnace#rus28 HIDDEN_NPC,{ close; } } - emotion e_what,1; + emotion ET_QUESTION, playerattached(); end; OnMyMobDead: @@ -9163,7 +9163,7 @@ mosk_que,56,202,0 script Occult Apple Tree#rus29 HIDDEN_NPC,{ next; mes "["+ strcharinfo(0) +"]"; mes "Ahhhhhhhh!!!"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); close; } mes "- ^0000ff You get 100 Apples !!^000000 -"; @@ -9172,7 +9172,7 @@ mosk_que,56,202,0 script Occult Apple Tree#rus29 HIDDEN_NPC,{ close; } } - emotion e_what,1; + emotion ET_QUESTION, playerattached(); end; } @@ -9342,8 +9342,8 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "..........................."; mes "If you lotter around here any longer, I will make myself some tasty human soup! Hehehehehe."; - emotion e_gg; - emotion e_omg,1; + emotion ET_KIK; + emotion ET_HUK, playerattached(); close; } else if (rhea_rus_main == 9) { .@player_name$ = strcharinfo(0); @@ -9361,7 +9361,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "'Presto Change-o!!'"; mes "'Turn into a pig!!'"; specialeffect2 EF_BARRIER; - emotion e_omg; + emotion ET_HUK; next; mes "[Baba Yaga]"; mes "Hmm? You are protected by a Protection Spell?"; @@ -9586,14 +9586,14 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ next; mes "["+ strcharinfo(0) +"]"; mes "Hey, I am talking..."; - emotion e_sob,1; + emotion ET_CRY, playerattached(); next; mes "[Baba Yaga]"; mes "'In the corner...'"; next; mes "["+ strcharinfo(0) +"]"; mes "!!!!!!!!!!!!!!!!!!!!!!!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Baba Yaga]"; mes "What, child? Do you feel bad?"; @@ -9991,7 +9991,7 @@ OnTouch_: next; mes "["+ strcharinfo(0) +"]"; mes "You! Go home now!"; - emotion e_omg; + emotion ET_HUK; next; mes "- The cow seems surprised, jumps and tries to attack you !! -"; next; @@ -10019,7 +10019,7 @@ OnTouch_: next; mes "[Cow]"; mes "...Moo..."; - emotion e_dots; + emotion ET_THINK; next; mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -"; disablenpc strnpcinfo(0); @@ -10191,7 +10191,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{ next; mes "[Noisy Coffin]"; mes "................................"; - emotion e_dots; + emotion ET_THINK; next; mes "["+ strcharinfo(0) +"]"; mes "Hu, the job has been done."; @@ -10205,7 +10205,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{ next; mes "[Noisy Coffin]"; mes "................................"; - emotion e_dots; + emotion ET_THINK; next; mes "["+ strcharinfo(0) +"]"; mes "Hu, the job has been done."; @@ -10218,7 +10218,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{ next; mes "[Noisy Coffin]"; mes "................................"; - emotion e_dots; + emotion ET_THINK; next; mes "["+ strcharinfo(0) +"]"; mes "Hu, the job has been done."; @@ -10347,7 +10347,7 @@ treasure01,24,39,0 script Old Bed#rus38 HIDDEN_NPC,{ viewpoint 2,61,183,2,0x00FF00; viewpoint 2,98,118,3,0x00FF00; viewpoint 2,27,115,4,0x00FF00; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "["+ strcharinfo(0) +"]"; mes "Eek, it would be best to run away now!"; @@ -10425,7 +10425,7 @@ treasure01,27,115,0 script Opened Treasure Chest#41 HIDDEN_NPC,{ next; mes "["+ strcharinfo(0) +"]"; mes "W, what is this!?"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); close; } mes "- ^0000ffYou find the handle of a broken key in the junk !!^000000 -"; @@ -10532,7 +10532,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ mes "- You tap the jar -"; mes "- with your hand -"; specialeffect EF_SIGHTRASHER; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "- A voice laughs in the jar as -"; mes "- it shakes from right to left -"; @@ -10600,7 +10600,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ mes "[House Ghost]"; mes "Ok, first let me shuffle these cards around."; mes "Ready!"; - emotion e_loud; + emotion ET_BLABLA; next; mes "[House Ghost]"; mes "One!"; @@ -10636,21 +10636,21 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ cutin "",255; switch( .@rucard_game01 ) { case 1: - cutin "í¬ë§ì¹´ë“œ",4; // Poring Card + cutin "Æ÷¸µÄ«µå",4; // Poring Card .@win_string$ = "You are good. Can you do it next time?"; break; case 2: - cutin "엔젤ë§ì¹´ë“œ",4; // Angeling Card + cutin "¿£Á©¸µÄ«µå",4; // Angeling Card .@win_string$ = "You are pretty good at this. Ok, but can you do it again?"; break; case 3: - cutin "고스트ë§ì¹´ë“œ",4; // Ghostring Card + cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card .@win_string$ = "You are pretty good at this. Ok, but can you do it again?"; break; } - emotion e_gasp; + emotion ET_SURPRISE; if (.@rucard_game01 == .@s +1) { - emotion e_ic,1; + emotion ET_AHA, playerattached(); next; mes "[House Ghost]"; mes "You got it right."; @@ -10658,7 +10658,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ .@ruuser_score01++; } else { - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[House Ghost]"; mes "Huuu..."; @@ -10963,7 +10963,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "["+ .@player_name$ +"]"; mes "Ok! I will do it!"; next; - setarray .@emo[1],58,59,60,61,62,63; + setarray .@emo[1], ET_DICE1, ET_DICE2, ET_DICE3, ET_DICE4, ET_DICE5, ET_DICE6; while (.@rustree_turn01 < 3 && .@rususer_score01 == 0) { mes "[Ghost Tree]"; mes "I cast first."; @@ -10986,11 +10986,11 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "["+ .@player_name$ +"]"; mes "Let's see..."; next; - emotion .@emo[.@rus_dice01],1; + emotion .@emo[.@rus_dice01], playerattached(); mes "["+ .@player_name$ +"]"; if (.@rus_dice01 == .@tree_dice01) { mes "Let's see... Wow, I got it! I've got ^0000ffNumber "+ .@rus_dice01 +"^000000!"; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[Ghost Tree]"; mes "You seem lucky..."; @@ -10999,7 +10999,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "Let's see................... It is ^0000ff "+ .@rus_dice01 +" ^000000..."; mes "[Ghost Tree]"; mes "Huuu..."; - emotion e_heh; + emotion ET_SMILE; } .@rustree_turn01++; next; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 2e7d4255e5..71ba6cd440 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -1077,8 +1077,8 @@ OnTouch: mes "turned into sand."; next; hideoffnpc "Creature#Monas"; - emotion e_omg,1; - emotion e_omg,0,"Larjes#Monastery"; + emotion ET_HUK, playerattached(); + emotion ET_HUK, getnpcid(0, "Larjes#Monastery"); mes "[Larjes]"; mes "?!?!?!!!!!"; next; @@ -1874,13 +1874,13 @@ ra_temple,165,57,5 script Niren#ss 915,{ mes "..................."; mes "..................."; mes "..................."; - emotion e_dots; + emotion ET_THINK; next; mes "[Sippie]"; mes "High Priestess Niren,"; mes "you must be really tired."; mes "You look pale for some reason."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[High Priestess Niren]"; mes "I do feel rather drained."; @@ -1950,7 +1950,7 @@ ra_temple,165,57,5 script Niren#ss 915,{ mes "["+strcharinfo(0)+"]"; mes "Sure thing. You"; mes "can count on me!"; - emotion e_no1,1; + emotion ET_BEST, playerattached(); set aru_em,15; changequest 2134,2135; close2; @@ -1991,7 +1991,7 @@ ra_temple,165,57,5 script Niren#ss 915,{ mes "side twenty-fours a day."; mes "It's been like that for years."; next; - emotion e_wah; + emotion ET_KEK; mes "[Sippie]"; mes "Oh, High Priestess Niren,"; mes "I love working for you, but"; @@ -1999,13 +1999,13 @@ ra_temple,165,57,5 script Niren#ss 915,{ mes "just to see my family. Even"; mes "just once a year would be nice."; next; - emotion e_ic; + emotion ET_AHA; mes "[High Priestess Niren]"; mes "..............................."; mes "You're absolutely right."; mes "That gives me an idea."; next; - emotion e_ho; + emotion ET_DELIGHT; mes "[Sippie]"; mes "Huh? What is it?"; next; @@ -2086,7 +2086,7 @@ ra_temple,165,57,5 script Niren#ss 915,{ mes "^3355FFYou handed Niren the"; mes "file forged by Ishmael.^000000"; next; - emotion e_bzz; + emotion ET_STARE; mes "[High Priestess Niren]"; mes "Perfect! This forgery is"; mes "so well done, I'm sure"; @@ -2262,7 +2262,7 @@ ra_temple,168,54,3 script Sippie#ss 917,{ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ if (aru_vol == 27) { if (aru_em == 0) { - emotion e_dots; + emotion ET_THINK; mes "[Foreign Merchant]"; mes "I never thought the desert"; mes "would be this hot! They built"; @@ -2271,7 +2271,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "more, the crowds make things"; mes "around here so much hotter!"; next; - emotion e_dots; + emotion ET_THINK; mes "[Foreign Merchant]"; mes "I heard that I could make"; mes "a killing in Morroc, which is"; @@ -2280,7 +2280,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "is going to kill me first!"; next; select("How did you hear of Morroc?"); - emotion e_dots; + emotion ET_THINK; mes "[Foreign Merchant]"; mes "I... I just told you."; mes "I heard that Morroc is"; @@ -2288,7 +2288,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "buy things at premium prices."; mes "Ugh, but it's a burning hell!"; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Foreign Merchant]"; mes "I don't even care about making"; mes "money anymore! I just want to"; @@ -2297,8 +2297,8 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "I might just leave this town"; mes "tomorrow. Forget this desert!"; next; - emotion e_sob; - emotion e_swt,1; + emotion ET_CRY; + emotion ET_SWEAT, playerattached(); mes "[Foreign Merchant]"; mes "Ah, that's right. Don't they"; mes "sell some sweet, heavenly"; @@ -2344,7 +2344,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "^3355FF*Gulp Gulp Gulp Gulp*^000000"; mes "^3355FF*Gulp Gulp Gulp Gulp*^000000"; next; - emotion e_lv; + emotion ET_THROB; mes "[Foreign Merchant]"; mes "Ahhh! That hit the spot!"; mes "It's so refreshing and so"; @@ -2376,13 +2376,13 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes " "; mes " - Bekento^000000"; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "["+ strcharinfo(0) +"]"; mes "So... This means..."; mes "You're not really a"; mes "merchant, are you?"; next; - emotion e_meh; + emotion ET_MERONG; mes "^3355FFThe merchant quietly"; mes "looks at you with a"; mes "mischievous grin.^000000"; @@ -2391,7 +2391,7 @@ moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{ mes "So you asked me to get"; mes "you a drink as an excuse"; mes "just to talk to you?!"; - emotion e_sob,1; + emotion ET_CRY, playerattached(); next; mes "["+ strcharinfo(0) +"]"; mes "Oh well, thanks for"; @@ -2519,15 +2519,15 @@ moc_ruins,101,133,7 script Foreign Merchant#aru2 929,{ next; mes "["+ strcharinfo(0) +"]"; mes "Oh, no..."; - emotion e_otl,1; + emotion ET_OTL, playerattached(); next; mes "[Foreign Merchant]"; mes "..............................."; mes "..............................."; mes "..............................."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "[Foreign Merchant]"; mes "You know, I save a small"; mes "bottle of wine for myself"; @@ -2548,7 +2548,7 @@ moc_ruins,101,133,7 script Foreign Merchant#aru2 929,{ mes "keep an extra bottle in case"; mes "you want more next time. Take"; mes "care, and I'll see you later!"; - emotion e_korea; + emotion ET_FLAG; next; mes "^3355FFYou received a bottle"; mes "of the famous fruit wine"; @@ -2685,7 +2685,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ mes "just step away? I... I don't"; mes "like being too close to"; mes "other people. Please!"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } else if (aru_em == 17) { @@ -2695,7 +2695,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ mes "just step away? Wait, you"; mes "don't have something you"; mes "need from me, do you?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; switch(select("Give Her Niren's File:Leave Her Alone")) { case 1: @@ -2709,7 +2709,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ mes "Just toss the file over"; mes "to me. I-I don't want"; mes "you coming any closer."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Ishmael]"; mes "I'll be glad to help out"; @@ -2725,13 +2725,13 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ mes "expert at forging writing!"; mes "Just give me a moment and--"; next; - emotion e_omg; + emotion ET_HUK; mes "[Ishmael]"; mes "Dang it! I completely forgot!"; mes "Someone stole my pen yesterday!"; mes "Now how am I gonna do this...?"; next; - emotion e_sob; + emotion ET_CRY; mes "[Ishmael]"; mes "My pen was made of a very"; mes "rare gemstone called ^FF0000Sardonyx^000000."; @@ -2783,7 +2783,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ mes "I still... Uh... I don't mean"; mes "to be rude... It's just..."; mes "I'm just not good with..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Ishmael]"; mes "If you just toss the"; @@ -2818,7 +2818,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ mes "*Scribble*^000000"; specialeffect EF_COMBOATTACK4; specialeffect EF_STEAL; - emotion e_ic; + emotion ET_AHA; next; mes "[Ishmael]"; mes "There you go! I made the"; @@ -2840,7 +2840,7 @@ ra_fild03,139,355,5 script Ishmael#em 914,{ } } else { - emotion e_sob; + emotion ET_CRY; mes "[Ishmael]"; mes "If only I only had"; mes "my precious pen made"; @@ -5486,7 +5486,7 @@ geffen,128,153,3 script Leblo 883,{ mes "been asking questions about"; mes "the Diamond of Destruction."; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "[Leblo]"; mes "Don't be so suprised:"; mes "word travels fast in the"; @@ -7840,7 +7840,7 @@ payon,192,176,3 script Gooho Ahn 903,{ mes "adventurer."; mes "Um, was there"; mes "something you wanted?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; switch(select("Rogue Guild's Decoding Request")) { case 1: @@ -7857,7 +7857,7 @@ payon,192,176,3 script Gooho Ahn 903,{ mes "of heat and light, you can"; mes "read its contents. This is"; mes "some powerful encryption!"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Gooho Ahn]"; mes "So far, I've only decrypted"; @@ -7913,7 +7913,7 @@ payon,192,176,3 script Gooho Ahn 903,{ delitem 970,2; //Alchol delitem 7035,1; //Matchstick delitem 7097,10; //Burning_Heart - emotion e_ic; + emotion ET_AHA; mes "[Gooho Ahn]"; mes "Oh, what? This language..."; mes "It's ancient! Aegye hasn't"; @@ -8271,7 +8271,7 @@ moc_fild17,209,235,0 script Odd Slab 111,4,4,{ mes "^FF0000*Creak Creak*"; mes "Etner sspawrod.^000000"; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "This slab is speaking"; mes "to me! I... I think. Now"; @@ -8282,7 +8282,7 @@ moc_fild17,209,235,0 script Odd Slab 111,4,4,{ mes "^FF0000*Creak Creak*"; mes "Etner sspawrod.^000000"; next; - emotion e_ic,1; + emotion ET_AHA, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "Oh, right! This is that"; mes "trashy language, Aegye,"; @@ -9058,7 +9058,7 @@ morocc,143,63,3 script Ragged Man#nd 929,{ mes "to finding that treasure."; mes "I... I don't even have enough"; mes "money to go back home!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Ragged Man]"; mes "Won't you spare some"; @@ -9276,7 +9276,7 @@ morocc,102,298,3 script Man#zgang 98,{ next; switch(select("Tell me about the treasure.")) { case 1: - emotion e_gasp; + emotion ET_SURPRISE; mes "[Man]"; mes "What? So you're the one"; mes "I was warned about! I've"; @@ -9746,7 +9746,7 @@ comodo,339,224,3 script Man in Hiding#nd 881,{ mes "for information"; mes "about the treasure."; next; - emotion e_omg; + emotion ET_HUK; mes "[Man in Hiding]"; mes "You... You've come"; mes "looking for me?!"; @@ -10177,7 +10177,7 @@ alberta_in,70,109,5 script Shaman 788,{ mes "mind if I take a look at it?"; next; if (countitem(7725) > 0) { - emotion e_dots; + emotion ET_THINK; mes "[Shaman]"; mes "So this bauble's the"; mes "Unlucky Emerald? Yes,"; @@ -10305,7 +10305,7 @@ alberta_in,70,109,5 script Shaman 788,{ next; mes "[Shaman]"; mes "Hhhkkk... Arrrgh...!"; - emotion e_omg; + emotion ET_HUK; next; mes "[" + strcharinfo(0) +"]"; mes ".....?"; @@ -10581,7 +10581,7 @@ yuno_in04,38,48,3 script Archeologist 55,{ next; switch(select("Ask About the Jewel's Curse:Show Off Jewel")) { case 1: - emotion e_heh; + emotion ET_SMILE; mes "[Archeologist]"; mes "The jewel's curse?"; mes "Hah! You believe in that"; @@ -11205,7 +11205,7 @@ gef_fild08,182,185,0 script The Wanderer 739,{ mes "When I came back to my"; mes "senses, they were all..."; next; - emotion e_dots; + emotion ET_THINK; mes "[The Wanderer]"; mes "I'm not sure what"; mes "happened. There was"; @@ -11287,7 +11287,7 @@ gef_fild08,182,185,0 script The Wanderer 739,{ mes "When I came back to my"; mes "senses, they were all..."; next; - emotion e_dots; + emotion ET_THINK; mes "[The Wanderer]"; mes "I'm not sure what"; mes "happened. There was"; @@ -11324,7 +11324,7 @@ gef_fild08,182,185,0 script The Wanderer 739,{ mes "When I came back to my"; mes "senses, they were all..."; next; - emotion e_dots; + emotion ET_THINK; mes "[The Wanderer]"; mes "I'm not sure what"; mes "happened. There was"; @@ -12213,7 +12213,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{ mes "be talking a Rogue"; mes "agent in one of the"; mes "other towns."; - emotion e_ag; + emotion ET_ANGER; close; } else if (rumour_nd == 6) { @@ -12248,7 +12248,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{ next; mes "[Agent]"; mes "Awwww, man!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Agent]"; mes "I keep telling that"; @@ -12503,7 +12503,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{ mes "You're a lifesaver!"; mes "Detrimindexta, huh?"; next; - emotion e_gg; + emotion ET_KIK; mes "[Agent]"; mes "Don't worry, I got"; mes "that one too! All you"; @@ -12592,7 +12592,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{ close; } else if (rumour_nd == 15) { - emotion e_heh; + emotion ET_SMILE; mes "[Agent]"; mes "Heh heh! Looks like"; mes "we solved the case!"; @@ -12629,7 +12629,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{ mes "communicates solely"; mes "through doodles.^000000"; set rumour_nd,16; - emotion e_heh; + emotion ET_SMILE; close; } } @@ -12720,7 +12720,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{ next; switch(select("Yes, Sir!:...")) { case 1: - emotion e_dots; + emotion ET_THINK; mes "[Agent]"; mes "Right on, right on."; mes "Hm. Let's try that again..."; @@ -12823,9 +12823,9 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{ mes "I thought you were"; mes "here to take the Job"; mes "change test for Rogues!"; - emotion e_omg; + emotion ET_HUK; next; - emotion e_sry; + emotion ET_SORRY; mes "[Agent]"; mes "Aw man, you came all this"; mes "way to help me out, and"; @@ -12840,7 +12840,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{ mes "Consider this... I dunno,"; mes "an insider look into the"; mes "Rogue world if you would."; - emotion e_sob; + emotion ET_CRY; next; switch(select("Yes, sir!:I won't tell anyone.")) { case 1: diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt index 3561a29175..5112c885d9 100644 --- a/npc/quests/quests_niflheim.txt +++ b/npc/quests/quests_niflheim.txt @@ -310,7 +310,7 @@ prt_in,161,20,3 script Erious#nif 92,{ mes "*Cries* Wahhh...!"; mes "Elly, how could you"; mes "leave me this way..."; - emotion e_sob; + emotion ET_CRY; next; if (select("Comfort him.:Neglect him.") == 1) { mes "[Erious]"; @@ -515,7 +515,7 @@ umbala,215,181,3 script Billik 733,{ mes "future, let's meet in the"; mes "town of the dead later."; mes "Hahahaha~"; - emotion e_no1; + emotion ET_BEST; close; } if (nif_revive == 1) { @@ -614,7 +614,7 @@ niflheim,153,215,3 script Feylin 794,{ mes "town immediately. I'm sorry"; mes "but I know nothing about what"; mes "you are asking."; - emotion e_an; + emotion ET_FRET; next; if (select("But...:I am sorry.") == 1) { mes "[Feylin]"; @@ -680,7 +680,7 @@ niflheim,153,215,3 script Feylin 794,{ mes "I have failed to summon"; mes "who you wish to see. I am"; mes "really sorry for this result."; - emotion e_omg; + emotion ET_HUK; delitem 748,1; //Witherless_Rose delitem 610,10; //Leaf_Of_Yggdrasil set nif_revive,5; diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index d325483281..54e2a17fa9 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -79,11 +79,11 @@ payon_in01,18,10,4 script Mystic Lady 76,{ next; mes "[Mystic Lady]"; mes "If you plan to travel to colder regions, I suggest that you bring some ^3355FFEar Muffs^000000..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Mystic Lady]"; mes "Ear Muffs are my family's specialty, and we provide it to customers who have ^FF33551 Cursed Ruby^000000, ^3311AA1 Headset,^000000 ^3355FF 200 Feathers^000000 and ^DDDD005000 Zeny^000000."; - emotion e_dots; + emotion ET_THINK; next; switch(select("Oh Yeah? That sounds good.:No thank you, Ma'am.")) { case 1: @@ -98,14 +98,14 @@ payon_in01,18,10,4 script Mystic Lady 76,{ next; mes "[Mystic Lady]"; mes "Thank you for buying our product. You won't regret purchasing our Ear Muffs: Satisfaction guaranteed~"; - emotion e_dots; + emotion ET_THINK; close; } else { mes "[Mystic Lady]"; mes "Oh dear..."; mes "You don't have enough money or items. Unfortunately, we can't give any discounts. Please understand that we have to make a living..."; - emotion e_dots; + emotion ET_THINK; close; } case 2: @@ -114,7 +114,7 @@ payon_in01,18,10,4 script Mystic Lady 76,{ mes "I believe we"; mes "will meet again."; mes "...One of these days."; - emotion e_dots; + emotion ET_THINK; close; } } diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 87e12862c1..a964095425 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -287,7 +287,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "all of those books earlier!"; mes "Wait, you ditched me before,"; mes "so why act all concerned now?"; - emotion e_gasp; + emotion ET_SURPRISE; } else { mes "[Busy-Looking Boy]"; @@ -325,10 +325,10 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "it was a natural reflex!^000000"; next; Specialeffect EF_HITDARK; - emotion e_omg; + emotion ET_HUK; mes "^3355FF*BAM!*^000000"; next; - emotion e_omg; + emotion ET_HUK; mes "[Busy-Looking Boy]"; mes "Ack! Those books...!"; mes "It took me so long to"; @@ -340,13 +340,13 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "arrange these nicely"; mes "out of the bottom of"; mes "my freakin' heart."; - emotion e_lv,1; + emotion ET_THROB, playerattached(); next; mes "[Busy-Looking Boy]"; mes "..."; mes "......"; mes "........."; - emotion e_dots; + emotion ET_THINK; next; mes "[Busy-Looking Boy]"; mes "Huh...?"; @@ -368,7 +368,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "easily, so it scares me to"; mes "death to ride the Airship"; mes "all the way to Juno."; - emotion e_dots; + emotion ET_THINK; next; mes "[Busy-Looking Boy]"; mes "Now I'm in trouble!"; @@ -376,7 +376,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "time I just can't help it."; mes "There's nothing I can do!"; mes "Oh, I'm gonna lose this job!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Busy-Looking Boy]"; mes "Wait... You adventurers"; @@ -392,7 +392,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "It's none of your "; mes "business, I know, but"; mes "I'm just so desperate..."; - emotion e_sob; + emotion ET_CRY; set prt_curse,2; close; } @@ -404,7 +404,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "Summon all my courage..."; mes "and b-board that Airship!"; mes "Argh! No, I can't do it!"; - emotion e_dots; + emotion ET_THINK; next; callsub S_GetBooks; mes "[Busy-Looking Boy]"; @@ -413,7 +413,7 @@ prontera,248,212,3 script Busy Boy#prt 706,3,3,{ mes "That guy's been waiting"; mes "for me to deliver his books"; mes "for quite a while now..."; - emotion e_sob; + emotion ET_CRY; close; } else if (prt_curse == 3) { @@ -453,7 +453,7 @@ OnTouch: mes "Hey, look out!"; mes "Can't you be more"; mes "careful?! Geeeeez!"; - emotion e_ag; + emotion ET_ANGER; next; mes "["+strcharinfo(0)+"]"; mes "Oops, I'm so sorry."; @@ -502,7 +502,7 @@ OnTouch: mes "easily, so it scares me to"; mes "death to ride the Airship"; mes "all the way to Juno."; - emotion e_dots; + emotion ET_THINK; next; mes "[Busy-Looking Boy]"; mes "Now I'm in trouble!"; @@ -510,7 +510,7 @@ OnTouch: mes "time I just can't help it."; mes "There's nothing I can do!"; mes "Oh, I'm gonna lose this job!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Busy-Looking Boy]"; mes "Wait... You adventurers"; @@ -526,7 +526,7 @@ OnTouch: mes "It's none of your "; mes "business, I know, but"; mes "I'm just so desperate..."; - emotion e_sob; + emotion ET_CRY; set prt_curse,2; close; } @@ -621,7 +621,7 @@ yuno,311,195,3 script Historian#prt01 754,{ mes "[Historian]"; mes "GRRRRRRRRR!"; mes "Where are my books?!"; - emotion e_ag; + emotion ET_ANGER; next; select("Are you alright?"); mes "[Historian]"; @@ -652,7 +652,7 @@ yuno,311,195,3 script Historian#prt01 754,{ } else { select("Oh, I'm delivering the books for him."); - emotion e_what; + emotion ET_QUESTION; mes "[Historian]"; mes "Ah, really?"; mes "Great, you're here!"; @@ -809,7 +809,7 @@ yuno,311,195,3 script Historian#prt01 754,{ mes "ruling the kingdom, the 7 warriors agreed to hold a contest amongst"; mes "their families each generation to prevent royal corruption."; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Historian]"; mes "Oh... Not too excited"; mes "about history, huh? Well,"; @@ -955,7 +955,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{ mes "can't be good for my skin..."; mes "Ooh, I wish I were back home"; mes "in the Schwaltzvalt Republic~"; - emotion e_sob; + emotion ET_CRY; next; mes "[Historian Rodafrian]"; mes "Hello there."; @@ -1206,11 +1206,11 @@ morocc_in,45,126,3 script Historian#prt02 702,{ mes "that you have learned to"; mes "Rodafrian, choosing not"; mes "to withhold any secrets.^000000"; - emotion e_ic; + emotion ET_AHA; next; mes "[Historian Rodafrian]"; mes ".....................!"; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[Historian Rodafrian]"; mes "Thank you for sharing that"; @@ -1298,7 +1298,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{ close; } else if (prt_curse == 56) { - emotion e_an; + emotion ET_FRET; mes "[Historian Rodafrian]"; mes "I just paid a visit to"; mes "Karlomoff and gave him"; @@ -1309,7 +1309,7 @@ morocc_in,45,126,3 script Historian#prt02 702,{ close; } else if (prt_curse == 60) { - emotion e_an; + emotion ET_FRET; mes "[Historian Rodafrian]"; mes "I just aid a visit to"; mes "Karlomoff and gave him"; @@ -1995,7 +1995,7 @@ mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{ mes "with death. But the royal family and the Prontera Church took"; mes "mercy on me, and allowed"; mes "me to live here in exile."; - emotion e_dots; + emotion ET_THINK; next; mes "[Bonnie Imbullea]"; mes "I began to sing this song"; @@ -2010,7 +2010,7 @@ mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{ mes "a maid found a fragment of a"; mes "Red Gemstone while cleaning"; mes "the secret ceremonial grounds."; - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); next; mes "[Bonnie Imbullea]"; mes "I always thought it"; @@ -2312,7 +2312,7 @@ prt_church,185,106,3 script Father Bamph 60,{ mes "at a young age^000000. That is"; mes "Jormungand's curse and"; mes "the royal family's secret."; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "["+strcharinfo(0)+"]"; mes "What...?!"; @@ -2375,7 +2375,7 @@ prt_church,185,106,3 script Father Bamph 60,{ mes "complicated. Please"; mes "listen to what we have"; mes "to ask from here on..."; - emotion e_dots; + emotion ET_THINK; set prt_curse,15; close; } @@ -2387,7 +2387,7 @@ prt_church,185,106,3 script Father Bamph 60,{ mes "looking marks on their bodies."; mes "It almost looked as if they"; mes "were growing snake scales."; - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); next; mes "["+strcharinfo(0)+"]"; mes "Wait, they grew snake"; @@ -3205,7 +3205,7 @@ prt_church,21,111,5 script #prince2 887,{ mes "curse, we all failed. Those"; mes "involved have begun to believe"; mes "that Odin may have abandoned us... "; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "^3355FFYou examine the body of"; mes "the second prince and notice"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 535724c107..04318a6c45 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -2679,7 +2679,7 @@ rachel,157,183,3 script Sincere Follower Urstia 916,{ mes "foreigners, leading them here!"; next; if (select("Freya? I'd like to know more.:That's crazy talk!") == 1) { - emotion e_ok; + emotion ET_OK; mes "[Urstialla]"; mes "The day is coming when"; mes "Freya will resurrect and"; @@ -2884,7 +2884,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ } if (ice_necklace_q == 1) { cutin "ra_magic3",2; - emotion e_omg; + emotion ET_HUK; mes "[Man Stuck in Ice]"; mes "H-hello?"; mes "Hey! Hey, you!"; @@ -2921,7 +2921,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ mes "I can't even scratch it"; mes "Do you have any ideas?"; next; - emotion e_sob; + emotion ET_CRY; mes "[Man Stuck in Ice]"; mes "This is so humiliating..."; mes "Me, the greatest mage"; @@ -2933,7 +2933,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ mes "You're Maheo?"; next; cutin "ra_magic1",2; - emotion e_gg; + emotion ET_KIK; mes "[Maheo]"; mes "It's true. You're speaking to"; mes "Maheo, the greatest mage,"; @@ -3003,7 +3003,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ mes "It has the power of a million"; mes "exploding suns! But then..."; next; - emotion e_sob; + emotion ET_CRY; mes "[Maheo]"; mes "It was too powerful!"; mes "There were tremors, and"; @@ -3011,7 +3011,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ mes "all the flame caused my"; mes "clothes to catch on fire!"; next; - emotion e_flash,1; + emotion ET_SPARK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "You..."; mes "you set fire"; @@ -3100,7 +3100,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ next; mes "[Maheo]"; mes "Hey, hey! Can't you just release me first?"; - emotion e_sob; + emotion ET_CRY; close; } } @@ -3138,7 +3138,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{ mes "*CRASH!*^000000"; next; setnpcdisplay "Man Stuck in Ice#cave",937; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Maheo]"; mes "Finally...!"; mes "After all of this"; @@ -3207,8 +3207,8 @@ OnTouch: end; OnTouchNPC: - emotion e_an; - //emotion e_gg,1; //Emote on monster - unsupported + emotion ET_FRET; + emotion ET_KIK, getattachedrid(); end; OnMyMobDead: @@ -3405,7 +3405,7 @@ rachel,113,97,5 script Mohadian 929,10,10,{ mes "If you are, I've got a bit of a"; mes "business proposition for you."; next; - emotion e_ic; + emotion ET_AHA; mes "[Mohadian]"; mes "The weather around here"; mes "is naturally hot and humid,"; @@ -3787,7 +3787,7 @@ OnTouch: mes "entrance is locked.^000000"; next; select("Kick Door.:Smash Door with Weapon."); - emotion e_omg,0,"Nemma#ra_temple"; + emotion ET_HUK, getnpcid(0, "Nemma#ra_temple"); mes "[Priestess Nemma]"; mes "Please don't do that!"; close; @@ -3834,7 +3834,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "a contribution. Regardless,"; mes "we invite you to celebrate the"; mes "grace of the goddess with us."; - emotion e_ho; + emotion ET_DELIGHT; next; mes "[Priestess Nemma]"; mes "There's one High Priest that"; @@ -4053,7 +4053,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ goto L_End; } else if (ra_tem_q == 11) { - emotion e_ho; + emotion ET_DELIGHT; cutin "ra_nemma03",2; mes "[Priestess Nemma]"; mes "Hey, "+strcharinfo(0)+"~!"; @@ -5370,7 +5370,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "me like that! Saying"; mes "it like that is kind of"; mes "overdoing it, isn't it?"; - emotion e_sigh,1; + emotion ET_OHNO, playerattached(); next; mes "[High Priest Zhed]"; mes "Not at all. In fact, I'm"; @@ -5907,7 +5907,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "before the other High"; mes "Priests ruin our nation."; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Y-you're not thinking"; mes "of overthrowing the"; @@ -5915,7 +5915,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "that a bit extreme?"; next; cutin "ra_gman2",2; - emotion e_swt; + emotion ET_SWEAT; mes "[High Priest Zhed]"; mes "What? No, no!"; mes "Don't jump to conclusions"; @@ -6034,7 +6034,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "I already have someone in"; mes "mind that might help us."; next; - emotion e_flash,1; + emotion ET_SPARK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "That sounds good."; mes "Who is he?"; @@ -6047,7 +6047,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{ mes "may even think I deserve"; mes "to be excommunicated..."; next; - emotion e_no1,1; + emotion ET_BEST, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Come on, it wouldn't"; mes "hurt to try! Besides,"; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index 62add04bb1..526929c21a 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -1004,29 +1004,29 @@ um_in,139,48,5 script Phrenetan 783,{ } if (um_wind <= 3 && (MISC_QUEST & 32768) == 0) { if (um_wind) set um_wind,1; - emotion e_an; + emotion ET_FRET; mes "[Phrenetan]"; mes "Umbaumbah wooga wooga"; mes "Umbaumbabah babababah!"; mes "Umbaum!"; next; - emotion e_oh; + emotion ET_O; mes "[Phrenetan]"; mes "Umbah umbaumba umbah"; mes "Umbabababah wooga woo!"; mes "Wooga wooga umbabah umbaum!"; next; - emotion e_go; + emotion ET_GO; close; } else if (um_wind == 6 || (MISC_QUEST & 32768)) { - emotion e_an; + emotion ET_FRET; mes "[Phrenetan]"; mes "Umbabah! Umbaumbah....."; mes "Umbaum Umbaum Wooga wooga!"; mes "Wooga umumum woombababap!!!!!"; next; - emotion e_swt; + emotion ET_SWEAT; close; } end; @@ -1065,8 +1065,8 @@ um_in,144,45,5 script Umpokoriohtan 789,{ mes "..........."; mes "My back--!"; mes "Simmer down, baby, your turn is comin' in a minute~"; - emotion e_rock,0,"Phrenetan"; - emotion e_swt; + emotion ET_ROCK, getnpcid(0, "Phrenetan"); + emotion ET_SWEAT; close; } else { @@ -1094,18 +1094,18 @@ um_in,144,45,5 script Umpokoriohtan 789,{ mes "Baby, why you gotta be rough?"; mes "Hit me gently, ya dig??"; mes "I don't mean to hurt you~"; - emotion e_omg,0,"Phrenetan"; - emotion e_wah; + emotion ET_HUK, getnpcid(0, "Phrenetan"); + emotion ET_KEK; close; } } - emotion e_heh; + emotion ET_SMILE; mes "[Umpokoriohtan]"; mes "Umbaumbah..........."; mes "Umbahwooga woogawoo!"; mes "Umbah umumbabah umbawoo gaga."; next; - emotion e_an; + emotion ET_FRET; close; OnInit: @@ -1130,13 +1130,13 @@ um_in,101,73,3 script Wainatan 783,{ if (um_wind == 1) { if (gettime(DT_HOUR) > 18) { set um_wind,2; - emotion e_an; + emotion ET_FRET; mes "[Wainatan]"; mes "Umbaumbah umgagaga."; mes "Umbaumbawoogawoo gababah."; mes "Umbahumbabah gawoo."; next; - emotion e_oh; + emotion ET_O; mes "[Wainatan]"; mes "Wooga wooga woogagagah"; mes "Wogagagah woogagagah"; @@ -1174,13 +1174,13 @@ um_in,94,123,5 script Bertztan 783,{ if (um_wind == 2) { if (gettime(DT_HOUR) > 18) { set um_wind,3; - emotion e_an; + emotion ET_FRET; mes "[Bertztan]"; mes "Umbaumbah umgagaga."; mes "Umbaumbawoogawoo gababah."; mes "Umbahumbabah gawoo."; next; - emotion e_oh; + emotion ET_O; mes "[Bertztan]"; mes "Wooga umbar umbar umbah!"; mes "Umbar woogagaga woo! Woo! Woo!"; @@ -1226,13 +1226,13 @@ umbala,145,217,3 script Chabimatan 783,{ if (um_wind == 3) { if (gettime(DT_HOUR) > 18) { set um_wind,4; - emotion e_an; + emotion ET_FRET; mes "[Chabimatan]"; mes "Umbabah umbarbar woogawooga um"; mes "Umbabah umbarbar woogawooga umbah"; mes "Umumum! Wooga!"; next; - emotion e_oh; + emotion ET_O; mes "[Chabimatan]"; mes "Umbabah~~~~~~~"; mes "Woogawooga umbar umbar woo!"; @@ -1275,7 +1275,7 @@ OnTouch_: mes "Phrenetan beating a guy"; mes "mercilessly.^000000"; next; - emotion e_an; + emotion ET_FRET; mes "[Phrenetan]"; mes "Umbaumbaumbaumbah!"; mes "Umbaumbahumbah!!"; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index a54bef09ab..dfeb00b03a 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -5132,7 +5132,7 @@ ra_temin,87,133,1 script Rachel Guard#vol1 934,5,2,{ mes "["+strcharinfo(0)+"]"; mes "You know ^3131FFLamir^000000, right?"; next; - emotion e_omg; + emotion ET_HUK; mes "[Guard Karlum]"; mes "Lamir? Oh... My."; mes "Oh no! Did something"; @@ -5626,8 +5626,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "Hahahaha! Guess I look"; mes "pretty tough, don't I?"; next; - emotion e_lv,0,"Drunken Lady#1"; - emotion e_lv,0,"Drunken Lady#2"; + emotion ET_THROB, getnpcid(0, "Drunken Lady#1"); + emotion ET_THROB, getnpcid(0, "Drunken Lady#2"); mes "[Ladies]"; mes "Oh, my God!"; mes "You're so cool~!"; @@ -5656,8 +5656,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "Hahahaha! Guess I look"; mes "pretty tough, don't I?"; next; - emotion e_lv,0,"Drunken Lady#1"; - emotion e_lv,0,"Drunken Lady#2"; + emotion ET_THROB, getnpcid(0, "Drunken Lady#1"); + emotion ET_THROB, getnpcid(0, "Drunken Lady#2"); mes "[Ladies]"; mes "Oh, my God!"; mes "You're so cool~!"; @@ -5724,8 +5724,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "but duty calls."; mes "Hahahahahahha~"; next; - emotion e_lv,0,"Drunken Lady#1"; - emotion e_lv,0,"Drunken Lady#2"; + emotion ET_THROB, getnpcid(0, "Drunken Lady#1"); + emotion ET_THROB, getnpcid(0, "Drunken Lady#2"); mes "[Ladies]"; mes "Please don't go~"; next; @@ -5748,7 +5748,7 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "["+strcharinfo(0)+"]"; mes "Yes?"; next; - emotion e_no1; + emotion ET_BEST; mes "[Drunken Man]"; mes "I hereby promote you as"; mes "chief researcher of the"; @@ -5809,8 +5809,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "I should stay here and"; mes "entreat them to a lecture."; next; - emotion e_lv,0,"Drunken Lady#1"; - emotion e_lv,0,"Drunken Lady#2"; + emotion ET_THROB, getnpcid(0, "Drunken Lady#1"); + emotion ET_THROB, getnpcid(0, "Drunken Lady#2"); mes "[Ladies]"; mes "Oh~! You'll really"; mes "teach us geology?"; @@ -5982,8 +5982,8 @@ ve_in,233,116,3 script Drunken Man#vol 901,{ mes "Hahahaha! Guess I look"; mes "pretty tough, don't I?"; next; - emotion e_lv,0,"Drunken Lady#1"; - emotion e_lv,0,"Drunken Lady#2"; + emotion ET_THROB, getnpcid(0, "Drunken Lady#1"); + emotion ET_THROB, getnpcid(0, "Drunken Lady#2"); mes "[Ladies]"; mes "Oh, my God!"; mes "You're so cool~!"; @@ -6334,7 +6334,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ mes "[Sahedi]"; mes "Let's see..."; next; - emotion e_omg; + emotion ET_HUK; mes "[Sahedi]"; mes "Oh God! Why is the"; mes "temperature so high?!"; @@ -6342,7 +6342,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ mes "like this in the past, but..."; mes "Is this... How bad is this?"; next; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Oh... Oh, no!"; mes "Yikes! I guess if it's"; @@ -6424,7 +6424,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ next; } } - emotion e_omg; + emotion ET_HUK; mes "[Sahedi]"; mes "Huh? Are you serious?"; mes "Thor Volcano's gonna"; @@ -6433,7 +6433,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ mes "It'll be a disaster, just"; mes "like it happened in the past!"; next; - emotion e_flash,1; + emotion ET_SPARK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Yes, I agree. There's"; mes "a good chance of an..."; @@ -6445,7 +6445,7 @@ thor_camp,250,104,3 script Sahedi#vol 934,{ mes "How much time do we"; mes "have to evacuate?"; next; - emotion e_flash,1; + emotion ET_SPARK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Well... Uh..."; mes "According to my data..."; @@ -7113,7 +7113,7 @@ thor_camp,150,65,3 script Dummy#1::VeinsDummy 111,{ else if (aru_vol == 20) { mes "^3355FF*THUD*^000000"; specialeffect EF_HIT2; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Colonel Vito]"; mes "Soldier..."; @@ -7188,7 +7188,7 @@ thor_camp,59,79,1 script Thor Volcano Soldier#vo3 939,{ } thor_camp,143,114,1 script Thor Volcano Soldier#vo4 939,{ - emotion e_sob; + emotion ET_CRY; mes "[Soldier]"; mes "Oh Freya..."; mes "Bless this Old Blue Box"; @@ -7353,7 +7353,7 @@ ve_in,237,131,1 script Female Customer#ve1 940,{ mes "[Bartender]"; mes "Oh, come on!"; mes "I was kidding~"; - emotion e_sob; + emotion ET_CRY; close; } mes "[Bartender]"; @@ -7364,12 +7364,12 @@ ve_in,237,131,1 script Female Customer#ve1 940,{ next; mes "["+strcharinfo(0)+"]"; mes "Meee?"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "[Female Customer]"; mes "Mmm..."; mes "Not my style."; - emotion e_dots,1; + emotion ET_THINK, playerattached(); close; } diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 1ecfc91466..cc078d97eb 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -914,7 +914,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{ mes "Why are you still here?"; mes "I asked you to go find Alfrik."; mes "Ah~ I cannot wait..."; - emotion e_flash; + emotion ET_SPARK; close; } else if (god_brising == 47) { @@ -954,7 +954,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{ mes "Of course!"; mes "That's a great idea! I'll wait here while you go and ask Alfrik. You're my only hope in completing this research!"; next; - emotion e_hmm,1; + emotion ET_SCRATCH, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "(^333333I shouldn't have said anything...^000000)"; next; @@ -2709,7 +2709,7 @@ gef_dun01,89,192,0 script #lowentrace 111,3,3,{ OnTouch_: if ((god_brising > 9) && (god_brising < 34)) { - emotion e_gasp; + emotion ET_SURPRISE; } end; } @@ -2841,7 +2841,7 @@ gef_dun01,203,48,0 script #lowentrace1 111,3,3,{ OnTouch_: if ((god_brising > 9) && (god_brising < 34)) { - emotion e_gasp; + emotion ET_SURPRISE; } end; } @@ -3199,10 +3199,10 @@ OnTouch_: mapannounce "que_god02","Everyone, stay calm! Get into your positions!",0,0x9CFF00; mes "^4E2F2F[Crusader Commander]"; mes "Everyone, get into your positions! Front line, block its movement! Rear line, support the defense!^000000"; - emotion e_go,0,"#knight1"; - emotion e_go,0,"#knight2"; - emotion e_go,0,"#knight3"; - emotion e_gasp,0,"#doppelganger1"; + emotion ET_GO, getnpcid(0, "#knight1"); + emotion ET_GO, getnpcid(0, "#knight2"); + emotion ET_GO, getnpcid(0, "#knight3"); + emotion ET_SURPRISE, getnpcid(0, "#doppelganger1"); next; mes "[Lowen Ellenen]"; mes "N-no!"; @@ -3218,10 +3218,10 @@ OnTouch_: mapannounce "que_god02","Mwahaha! Mortals are such fools...",0,0xA8A8A8; donpcevent "#brisinsummon::OnDoppel1Off"; donpcevent "#brisinsummon::OnDoppel2On"; - emotion e_gasp,0,"#knight1"; - emotion e_gasp,0,"#knight2"; - emotion e_gasp,0,"#knight3"; - emotion e_gasp,0,"#lowen"; + emotion ET_SURPRISE, getnpcid(0, "#knight1"); + emotion ET_SURPRISE, getnpcid(0, "#knight2"); + emotion ET_SURPRISE, getnpcid(0, "#knight3"); + emotion ET_SURPRISE, getnpcid(0, "#lowen"); mes "[" + strcharinfo(0) + "]"; mes " ??!!!"; next; @@ -3662,7 +3662,7 @@ xmas,38,105,0 script #brisindwarf1 111,3,3,{ close; case 3: mes "^3355FFYou use your finger to poke the pile of snow. However, you hurt your finger a little bit after hitting something really solid.^000000"; - emotion e_ag,1; + emotion ET_ANGER, playerattached(); percentheal -20,0; close; case 4: @@ -3678,7 +3678,7 @@ xmas,38,105,0 script #brisindwarf1 111,3,3,{ OnTouch_: if (god_brising > 39) { - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); } end; } @@ -4000,7 +4000,7 @@ prt_fild02,185,269,0 script #brisindwarf2 111,3,3,{ end; case 2: mes "^3355FFAs you sweep away the moss with your hand, you scratch your palm from the sharp edges of the rock.^000000"; - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); next; mes "[" + strcharinfo(0) + "]"; mes "Damn...!"; @@ -4145,7 +4145,7 @@ prt_fild02,185,269,0 script #brisindwarf2 111,3,3,{ OnTouch_: if (god_brising > 41) { - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); } end; } @@ -4339,7 +4339,7 @@ mjolnir_09,85,129,0 script #brisindwarf3 111,3,3,{ OnTouch_: if (god_brising > 42) { - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); } end; } @@ -4589,7 +4589,7 @@ OnTouch_: close; } if (god_brising == 44) { - emotion e_gasp,1; + emotion ET_SURPRISE, playerattached(); mes "[Male Voice]"; mes "Don't come any closer!"; mes "How the hell do I feel"; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 3145e71b98..084152bfe4 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -2041,7 +2041,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{ mes "^3355FF*Clang Clang!*^000000"; successrefitem .@part; next; - emotion e_heh; + emotion ET_SMILE; mes "[Vestri]"; mes "Mwahahaha~"; mes "I've still got it!"; @@ -2055,7 +2055,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{ mes "^3355FF*Clang Clang!*^000000"; failedrefitem .@part; next; - emotion e_omg; + emotion ET_HUK; mes "[Vestri]"; mes "Waaahhhhh!"; mes "Dear God, no!"; @@ -2252,7 +2252,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{ mes "^3355FF*Clang Clang!*^000000"; successrefitem .@part; next; - emotion e_heh; + emotion ET_SMILE; mes "[Vestri]"; mes "Mwahahaha~"; mes "I've still got it!"; @@ -2266,7 +2266,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{ mes "^3355FF*Clang Clang!*^000000"; failedrefitem .@part; next; - emotion e_omg; + emotion ET_HUK; mes "[Vestri]"; mes "Waaahhhhh!"; mes "Dear God, no!"; diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt index e1dcb006d4..d0af43bab1 100644 --- a/npc/quests/seals/sleipnir_seal.txt +++ b/npc/quests/seals/sleipnir_seal.txt @@ -74,7 +74,7 @@ que_god01,98,98,4 script Manager#G 69,{ mes "Wait...!"; mes "I can't even remember the last"; mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } if ($God1 < $@god_check2) { @@ -86,7 +86,7 @@ que_god01,98,98,4 script Manager#G 69,{ mes "Wait...!"; mes "I can't even remember the last"; mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } else if (god_sl_1 == 1) { @@ -472,7 +472,7 @@ que_god01,98,98,4 script Manager#G 69,{ mes "Wait...!"; mes "I can't even remember the last"; mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close2; } else if (god_sl_1 < 51) { @@ -567,12 +567,12 @@ que_god01,66,125,6 script Researcher#G1 89,{ mes "[Hallandaute]"; mes "A mad scientist?"; mes "That doesn't sound right. In my wildest dreams, I never would have suspected Metto of turning out that way..."; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "[Hallandaute]"; mes "Huh. That's..."; mes "That's too bad. I don't know what to say. We used to go watch movies and celebrate our birthdays together. P-please give me a moment..."; - emotion e_dots; + emotion ET_THINK; set god_sl_2,2; close; } diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index 3948877d87..6f2030b339 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -633,7 +633,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{ mes "the one who invented this"; mes "skill, is also... He's a man"; mes "amongst men, I must say."; - emotion e_lv; + emotion ET_THROB; next; break; case 2: @@ -715,7 +715,7 @@ in_moc_16,23,27,5 script Assassin#realgirl 885,{ mes "Have you heard about"; mes "the latest news from"; mes "the Assassin Guild?"; - emotion e_heh; + emotion ET_SMILE; next; select("News from the Assassin Guild?"); mes "[Assassin]"; @@ -761,7 +761,7 @@ OnTouch_: mes "hand really hard!^000000"; sc_start SC_Poison,30000,0; sc_start SC_Bleeding,10000,0; - emotion e_omg,1; + emotion ET_HUK, playerattached(); close; case 2: mes "^3355FFYou try to peek"; @@ -833,7 +833,7 @@ OnTouch_: mes "hand really hard!^000000"; sc_start SC_Poison,30000,0; sc_start SC_Bleeding,10000,0; - emotion e_omg,1; + emotion ET_HUK, playerattached(); close; } else { @@ -946,7 +946,7 @@ OnTouch_: mes "all gas in your lungs in time"; mes "to escape its effects. Sadly,"; mes "all you found was broken glass.^000000"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); } close; } diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index f24c31c357..2f8f2b57fe 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -29,7 +29,7 @@ prontera,174,328,3 script Young Man#bard_q1 89,3,3,{ if (BaseJob == Job_Bard) { - emotion e_omg; + emotion ET_HUK; mes "[Timid Young Man]"; mes "Eh? Wwwaaaah--!"; mes "Y-you're--it's-it's--"; @@ -374,7 +374,7 @@ prontera,174,328,3 script Young Man#bard_q1 89,3,3,{ OnTouch: if (BaseJob == Job_Bard) { - emotion e_omg; + emotion ET_HUK; } end; } @@ -654,7 +654,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ mes "[Riott]"; mes "Hmmrmpf!"; mes "Eh heh heh heh!"; - emotion e_gg; + emotion ET_KIK; next; mes "[" + strcharinfo(0) + "]"; mes "Um..."; @@ -839,7 +839,7 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ mes "[Riott]"; mes "Hmmrmpf!"; mes "Eh heh heh heh!"; - emotion e_gg; + emotion ET_KIK; next; mes "[" + strcharinfo(0) + "]"; mes "Um..."; @@ -898,15 +898,15 @@ morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{ } OnTouch: - emotion e_gg; + emotion ET_KIK; end; } // Yhelle the Chicken //============================================================ niflheim,239,70,1 script Yhelle#bard_chick1 800,3,3,{ - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; mes "[Hen Yhelle]"; mes "Cluck-Cluuuck?"; mes "Cluck cluck cluck!"; @@ -938,8 +938,8 @@ OnTouch: } niflheim,185,205,3 script Yhelle#bard_chick2 800,3,3,{ - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; mes "[Hen Yhelle]"; mes "Cluck-Cluuuck?"; mes "Cluck cluck cluck!"; @@ -964,8 +964,8 @@ OnTouch: } niflheim,85,203,5 script Yhelle#bard_chick3 800,3,3,{ - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; mes "[Hen Yhelle]"; mes "Cluck-Cluuuck?"; mes "Cluck cluck cluck!"; @@ -990,8 +990,8 @@ OnTouch: } niflheim,149,81,7 script Yhelle#bard_chick4 800,3,3,{ - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; mes "[Hen Yhelle]"; mes "Cluck-Cluuuck?"; mes "Cluck cluck cluck!"; @@ -1016,8 +1016,8 @@ OnTouch: } niflheim,209,144,3 script Yhelle#bard_chick5 800,3,3,{ - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; mes "[Hen Yhelle]"; mes "Cluck-Cluuuck?"; mes "Cluck cluck cluck!"; @@ -1254,8 +1254,8 @@ function script F_BardSkillYhelle { mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge."; close; } - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; mes "[Hen Yhelle]"; mes "Cluck-Cluuuck?"; mes "Cluck cluck cluck!"; diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt index 44489c0fa0..3e6d12a34c 100644 --- a/npc/quests/skills/dancer_skills.txt +++ b/npc/quests/skills/dancer_skills.txt @@ -191,7 +191,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ next; mes "^3355FFIt figures that she'd"; mes "keep your mirror.^000000"; - emotion e_ag,1; + emotion ET_ANGER, playerattached(); set DANCER_SK,3; close; } @@ -203,7 +203,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ mes "Oh! It's you. So did my"; mes "sister in Prontera Church"; mes "teach you anything yet?"; - emotion e_go; + emotion ET_GO; close; } else if (DANCER_SK == 7) { @@ -266,7 +266,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ mes "Look at me, do it"; mes "like this. Un, deux, trois~"; mes "Now, let me see you try it."; - emotion e_no1; + emotion ET_BEST; next; switch(select("Un deux trois~-:Un, doux trois~:Un, deux, trois~")) { default: @@ -286,7 +286,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ case 3: mes "["+ strcharinfo(0) +"]"; mes "Un, deux, trois~"; - emotion e_no1,1; + emotion ET_BEST, playerattached(); specialeffect2 EF_FLASHER; next; mes "[Canell]"; @@ -296,7 +296,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ mes "of rhythm and naturalness"; mes "are absolutely essential to"; mes "this technique of enticement."; - emotion e_kis; + emotion ET_CHUP; next; mes "[Canell]"; mes "Now that you've mastered"; @@ -311,7 +311,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ mes "have that drawback. Ho-ho~"; mes "Anyway, it's time for us to part now. I hope that you grow to"; mes "become a more glamorous and charming dancer in days to come."; - emotion e_heh; + emotion ET_SMILE; next; mes "^3355FFYou have finally learned"; mes "the Charming Wink skill.^000000"; @@ -329,7 +329,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ mes "ask me? Ah, you must"; mes "be mesmerized by my"; mes "beauty, aren't you?"; - emotion e_pif; + emotion ET_HNG; next; mes "[Canell]"; mes "Oh, to be so beautiful"; @@ -389,7 +389,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{ mes "Hey there,"; mes "handsome~"; mes "^333333*Wink~*^000000"; - emotion e_kis; + emotion ET_CHUP; specialeffect2 EF_VALLENTINE2; next; mes "^3355FFStrangely enough,"; @@ -540,7 +540,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{ mes "I do it! Wink, j-just"; mes "like this, okay? Y' see?"; mes "^333333*Wiiiiiiiiiiiiiink*^000000"; - emotion e_no1; + emotion ET_BEST; next; mes "["+ strcharinfo(0) +"]"; mes "Wh-whoa..."; @@ -555,7 +555,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{ mes "*Urp* It'sh in the--"; mes "Bwahahahaahah!"; mes "It's all spinning!"; - emotion e_heh; + emotion ET_SMILE; next; mes "^3355FFIn her drunken stupor,"; mes "Aelle pummels you with"; @@ -563,7 +563,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{ mes "maniacally to herself.^000000"; percentheal -10,0; specialeffect2 EF_HIT2; - emotion e_dots,1; + emotion ET_THINK, playerattached(); delitem 970,1; //Alchol delitem 512,1; //Apple delitem 513,3; //Banana @@ -644,7 +644,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{ mes "[Sober Aelle]"; mes "Ohhh..."; mes "H-headache..."; - emotion e_an; + emotion ET_FRET; next; mes "[Aelle]"; mes "Oh, wow, look at you!"; @@ -681,14 +681,14 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{ mes "Oh crap, it's the pastor!"; mes "Shhh, if anybody asks you,"; mes "I wasn't doing anything!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Aelle]"; mes "Thanks, hon..."; mes "I know you can"; mes "keep my contraband"; mes "our little secret. ^333333*Wink*^000000"; - emotion e_no1; + emotion ET_BEST; close; } } @@ -711,14 +711,14 @@ prontera,183,333,1 script Aelle#qsk_dan02 79,{ mes "Oh crap, it's the pastor!"; mes "Shhh, if anybody asks you,"; mes "I wasn't doing anything!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Aelle]"; mes "Thanks, hon..."; mes "I know you can"; mes "keep my contraband"; mes "our little secret. ^333333*Wink*^000000"; - emotion e_no1; + emotion ET_BEST; close; } } diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt index 1b73a138aa..a86214efb4 100644 --- a/npc/quests/skills/hunter_skills.txt +++ b/npc/quests/skills/hunter_skills.txt @@ -39,7 +39,7 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "old man! You were"; mes "just scared! Me, on"; mes "the other hand..."; - emotion e_gg,"Reidin Corse#tu"; + emotion ET_KIK, getnpcid(0, "Reidin Corse#tu"); next; mes "[Arpesto]"; mes "You little"; @@ -104,7 +104,7 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "Didn't you call it"; mes "Arpesto's 3rd Form"; mes "or something at first?"; - emotion e_swt,"Reidin Corse#tu"; + emotion ET_SWEAT, getnpcid(0, "Reidin Corse#tu"); next; mes "[Arpesto]"; mes "Er, yes, Arpesto's"; @@ -120,9 +120,9 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "That's the old name you"; mes "gave that skill, right?"; mes "Didn't you change it?"; - emotion e_omg; + emotion ET_HUK; next; - emotion e_omg; + emotion ET_HUK; mes "[Arpesto]"; mes "What the hell"; mes "are you talkin--"; @@ -133,12 +133,12 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "was too cheesy. What"; mes "did we call it now? Um..."; mes "''Phantasmic Arrow?''"; - emotion e_dots; + emotion ET_THINK; next; mes "[Arpesto]"; mes "..."; mes "......"; - emotion e_sob; + emotion ET_CRY; next; mes "[Reidin Corse]"; mes "Umm...."; @@ -149,7 +149,7 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "''^3131FFPhantasmic Arrow^000000'' sounds"; mes "soooo much cooler than that"; mes "other name you came up with!"; - emotion e_ic,"Reidin Corse#tu"; + emotion ET_AHA, getnpcid(0, "Reidin Corse#tu"); next; mes "[Arpesto]"; mes "You can be pretty handy"; @@ -180,8 +180,8 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "^3355FF*Swwwwwww!*"; mes "*Bang!*^000000"; specialeffect EF_HIT2; - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); next; mes "[Arpesto]"; mes "^333333*Pant Pant*"; @@ -190,7 +190,7 @@ pay_arche,109,169,3 script Arpesto 712,{ next; mes "[Arpesto]"; mes "WHHHHHHHY MEEEEE?!"; - emotion e_omg,"Reidin Corse#tu"; + emotion ET_HUK, getnpcid(0, "Reidin Corse#tu"); next; mes "^3355FF*Thump*^000000"; next; @@ -293,9 +293,9 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "skill when you were bored"; mes "and just messing around"; mes "with one of the Bows!"; - emotion e_gg,"Reidin Corse#tu"; + emotion ET_KIK, getnpcid(0, "Reidin Corse#tu"); next; - emotion e_omg; + emotion ET_HUK; mes "[Arpesto]"; mes "^333333*Ahem*^000000 Please Reidin,"; mes "don't entertain unfounded"; @@ -340,7 +340,7 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "......"; mes "........."; mes "......Riiiight."; - emotion e_dots,"Reidin Corse#tu"; + emotion ET_THINK, getnpcid(0, "Reidin Corse#tu"); set qskill_hunter,1; close; case 2: @@ -359,14 +359,14 @@ pay_arche,109,169,3 script Arpesto 712,{ mes "[Arpesto]"; mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune."; next; - emotion e_pif,"Reidin Corse#tu"; + emotion ET_HNG, getnpcid(0, "Reidin Corse#tu"); mes "[Reidin Corse]"; mes "So..."; mes "Danger's coming?"; mes "Heh! Chill, gramps~"; mes "I got it covered!"; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Arpesto]"; mes "Ho ho..."; mes "Energetic, but"; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 4c9f9f6c45..30cafb3445 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -1050,7 +1050,7 @@ prt_in,248,23,0 script Maid#sign2 111,{ mes "so my body aches. Oh, what"; mes "am I saying? Please ignore"; mes "that--! Ho ho ho~"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } else if (sign_q < 15) { @@ -1066,7 +1066,7 @@ prt_in,248,23,0 script Maid#sign2 111,{ mes "easily. Hmph, there's not"; mes "too many boys I like out"; mes "there, anyway."; - emotion e_pif; + emotion ET_HNG; close; } else if (sign_q < 20) { @@ -1093,7 +1093,7 @@ prt_in,248,23,0 script Maid#sign2 111,{ mes "much! Ahhhhhhh~"; delitem 504,1; //White_Potion close2; - emotion e_kis2; + emotion ET_CHUPCHUP; end; } end; @@ -1110,7 +1110,7 @@ prt_in,248,23,0 script Maid#sign2 111,{ mes "be smarter than me,"; mes "but maybe I can become"; mes "more beautiful than her..."; - emotion e_dots; + emotion ET_THINK; close; } else if (sign_q < 35) { @@ -1146,7 +1146,7 @@ prt_in,248,23,0 script Maid#sign2 111,{ close; } else if (sign_q == 54) { - emotion e_ho; + emotion ET_DELIGHT; mes "La la la~~"; mes "Oh, hello."; mes "Long time no see."; @@ -1199,7 +1199,7 @@ prt_in,248,23,0 script Maid#sign2 111,{ mes "visiting Master Metz."; mes "Why can't they leave their"; mes "dirt outside of the manor?"; - emotion e_pif; + emotion ET_HNG; close; } } @@ -1212,7 +1212,7 @@ morocc_in,115,154,5 script Rogue#sign 810,{ close; } if (sign_q < 3) { - emotion e_dots; + emotion ET_THINK; end; } else if (sign_q == 3) { @@ -1530,7 +1530,7 @@ morocc_in,115,154,5 script Rogue#sign 810,{ mes "I'm thinking about"; mes "solving world hunger"; mes "here! Or somethin' like that."; - emotion e_dots; + emotion ET_THINK; close; } } @@ -1545,7 +1545,7 @@ morocc_in,114,162,4 script Young Man#sign 118,{ mes "trying to live here. Do you"; mes "know a nice and cool place"; mes "where I can work?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } else if (sign_q == 11) { @@ -1768,7 +1768,7 @@ payon,154,170,3 script Hagin#sign 78,{ mes "a flower's life is brief."; mes "I better snag Daewoon"; mes "while I still can~"; - emotion e_an; + emotion ET_FRET; close; } } @@ -1907,7 +1907,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "you and reveal it to"; mes "Daewoon's roving eyes.^000000"; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Daewoon]"; mes "Eh? Why that's..."; mes "I see now, Arian must"; @@ -1939,7 +1939,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ case 1: set .@pay_point,.@pay_point+2; mes "[Daewoon]"; - emotion e_dots; + emotion ET_THINK; mes "Mmm...?"; mes "Handy? If you truly"; mes "understood, I don't"; @@ -1949,7 +1949,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ break; case 2: set .@pay_point,.@pay_point+4; - emotion e_pif; + emotion ET_HNG; mes "[Daewoon]"; mes "Really?"; mes "Mm. At least you"; @@ -1960,7 +1960,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ break; case 2: mes "[Daewoon]"; - emotion e_dots; + emotion ET_THINK; mes "..."; mes "A rather crass way"; mes "of speaking, but perhaps"; @@ -2012,7 +2012,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ break; case 2: set .@pay_point,.@pay_point+7; - emotion e_ok; + emotion ET_OK; mes "[Daewoon]"; mes "Mwah ah hah!"; mes "That's exactly what"; @@ -2023,13 +2023,13 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ next; break; case 3: - emotion e_an; + emotion ET_FRET; set .@pay_point,.@pay_point+2; mes "[Daewoon]"; mes "E..."; mes "Excuse me?"; next; - emotion e_ag; + emotion ET_ANGER; mes "[Daewoon]"; mes "How can you be"; mes "so ridiculous at"; @@ -2042,7 +2042,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ break; case 4: set .@pay_point,.@pay_point+4; - emotion e_dots; + emotion ET_THINK; mes "[Daewoon]"; mes "Hmm. That kind of half-hearted"; mes "attitude won't get you very far on your adventures. Still, so long as you don't get overly negative, you should have a decent chance of surviving your challenges."; @@ -2055,7 +2055,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "but that really isn't my style. For this test, why don't we just talk?"; mes "Just answer me honestly and"; mes "light heartedly, alright?"; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "[Daewoon]"; mes "So..."; @@ -2066,7 +2066,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ switch(select("Yes, I do.:I prefer soloing.:I am lonely.")) { case 1: set .@pay_point,.@pay_point+5; - emotion e_omg; + emotion ET_HUK; mes "[Daewoon]"; mes "Oh, that's great~!"; mes "To have many friends"; @@ -2121,7 +2121,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ next; switch(select("Awesome~!:I hate people who do that.:I do it sometimes...")) { case 1: - emotion e_an; + emotion ET_FRET; mes "[Daewoon]"; mes "But..."; mes "Wouldn't that be really"; @@ -2130,7 +2130,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "it would even interfere with"; mes "someone else's gameplay..."; next; - emotion e_an; + emotion ET_FRET; mes "[Daewoon]"; mes "Perhaps you should try"; mes "to consider other people's"; @@ -2150,7 +2150,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "heard some ruffians boasting"; mes "of their mob training activities. But personally, I feel they were compensating for their own shortcomings. "; next; - emotion e_an; + emotion ET_FRET; mes "[Daewoon]"; mes "Such behavior truly"; mes "bothers me. Although I have"; @@ -2159,7 +2159,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "myself irked when encountering"; mes "such troublemakers."; next; - emotion e_no1; + emotion ET_BEST; mes "[Daewoon]"; mes "When you face obstacles"; mes "in your own training, never give in to weakness. Assert yourself and find the determination to overcome your tribulations with honor!"; @@ -2319,7 +2319,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ switch(select("Yes:No")) { case 1: mes "[Daewoon]"; - emotion e_heh; + emotion ET_SMILE; mes "I'm glad."; mes "When you don't live"; mes "with zeal, it's easy to"; @@ -2352,7 +2352,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "It's important to look forward,"; mes "but first you must find what is truly precious to you before you can define your happiness. That's why I think it's good to experience new things as well as reflect."; next; - emotion e_no1; + emotion ET_BEST; mes "[Daewoon]"; mes "Now, what's precious to me?"; mes "Three things, actually..."; @@ -2379,7 +2379,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ else if (BaseLevel < 90) getexp 13000,0; else getexp 18000,0; } - emotion e_heh; + emotion ET_SMILE; mes "[Daewoon]"; mes "Well, I must say that I've"; mes "grown quite fond of you. Of"; @@ -2483,7 +2483,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ close; } else if (sign_q == 99) { - emotion e_gasp; + emotion ET_SURPRISE; mes "[Daewoon]"; mes "Oh~! It's you!"; mes "It has been a while since"; @@ -2511,7 +2511,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ mes "Mwah ah hah~!"; close; case 2: - emotion e_hmm; + emotion ET_SCRATCH; mes "[Daewoon]"; mes "Eh...?"; mes "That's quite a surprise."; @@ -2573,14 +2573,14 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ mes "["+ strcharinfo(0) +"]"; mes "Excuse me..."; next; - emotion e_omg; + emotion ET_HUK; mes "^313FFF*Clink*^000000"; next; mes "[Sir Jore]"; mes "..."; mes "......"; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Sir Jore]"; mes "..."; mes "......"; @@ -2588,14 +2588,14 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ mes "Look what"; mes "you made me do!"; next; - emotion e_sob; + emotion ET_CRY; mes "[Sir Jore]"; mes "I've been fiddling"; mes "with this sample for"; mes "five hours. And now"; mes "it's ruined! ^333333*Sob*^000000"; next; - emotion e_sob; + emotion ET_CRY; mes "[Sir Jore]"; mes "^333333*Sob*^000000"; mes "I came to this town"; @@ -2606,7 +2606,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ next; switch(select("Daewoon sent me.:Oops, sorry. Later~")) { case 1: - emotion e_swt; + emotion ET_SWEAT; mes "[Sir Jore]"; mes "O-oh!"; mes "That's right."; @@ -2614,7 +2614,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ mes "tested for the piece"; mes "of the Sobbing Starlight."; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Sir Jore]"; mes "So..."; mes "Er. Then, what..."; @@ -2674,7 +2674,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ mes "Yggdrasil. They can be used"; mes "to revive the dead, after all."; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Sir Jore]"; mes "Oh, and make sure to"; mes "bring those things to me"; @@ -2684,7 +2684,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ mes "schedule, you know."; close; case 2: - emotion e_sob; + emotion ET_CRY; mes "[Sir Jore]"; mes "I spent five hours"; mes "observing the changes"; @@ -2700,7 +2700,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ delitem 610,2; //Leaf_Of_Yggdrasil delitem 511,10; //Green_Herb set sign_q,17; - emotion e_thx; + emotion ET_THANKS; mes "[Sir Jore]"; mes "Ah! Th-thank you for"; mes "bringing what I need."; @@ -2926,11 +2926,11 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{ OnTouch_: if (rand(2)) { - emotion e_ic; + emotion ET_AHA; specialeffect EF_PHARMACY_OK; } else { - emotion e_omg; + emotion ET_HUK; specialeffect EF_PHARMACY_FAIL; } end; @@ -2941,7 +2941,7 @@ aldeba_in,156,118,4 script Piru Piru#sign 102,{ mes "[Piru Piru]"; if ((gettime(DT_HOUR) >= 12) && (gettime(DT_HOUR) <= 24)) { //235959 if (sign_q == 17) { - emotion e_sob; + emotion ET_CRY; mes "Oh, I'm sooo tired~"; mes "But we can't sleep yet."; mes "*Sob* Master, can't we"; @@ -2995,7 +2995,7 @@ aldeba_in,156,118,4 script Piru Piru#sign 102,{ } } else { - emotion e_sob; + emotion ET_CRY; mes "Oh, I'm sooo tired~"; mes "But we can't sleep yet."; mes "*Sob* Master, can't we"; @@ -3131,16 +3131,16 @@ prt_maze02,16,183,3 script Pleur#sign 91,{ close; OnHo: - emotion e_ho; + emotion ET_DELIGHT; end; OnKis2: - emotion e_kis2; + emotion ET_CHUPCHUP; end; OnGasp: - emotion e_gasp; + emotion ET_SURPRISE; end; OnOmg: - emotion e_omg; + emotion ET_HUK; end; } @@ -3148,7 +3148,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ callfunc "F_UpdateSignVars"; mes "[Gordon]"; if (sign_q < 18) { - emotion e_ho; + emotion ET_DELIGHT; mes "Hello darling."; mes "What did you do today?"; next; @@ -3158,7 +3158,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ mes "with a white bear and a"; mes "blue bear, father."; next; - emotion e_ho; + emotion ET_DELIGHT; mes "[Gordon]"; mes "Darling..."; mes "Aren't you tired"; @@ -3170,7 +3170,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ mes "[Pleur]"; mes "Don't worry father, I understand. For now, this is the only place where we can relax and live inpeace. I think we deserve to rest after accomplishing our goals..."; next; - emotion e_sob; + emotion ET_CRY; mes "[Gordon]"; mes "Thank you, Pluer."; mes "I have no regrets about"; @@ -3184,7 +3184,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ case 1: set sign_q,18; donpcevent "#skill::OnEnable"; - emotion e_omg; + emotion ET_HUK; donpcevent "Pleur#sign::OnOMG"; mes "[Pleur]"; mes "No no no!"; @@ -3195,7 +3195,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ mes "Summon... Marine Sphere!"; close; case 2: - emotion e_gasp; + emotion ET_SURPRISE; donpcevent "Pleur#sign::OnGasp"; mes "[Gordon]"; mes "Eh?! Don't you know"; @@ -3303,7 +3303,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ } } else if (sign_q == 18) { - emotion e_pif; + emotion ET_HNG; mes "Oh...!"; mes "You scared us!"; mes "Roaring like some"; @@ -3414,12 +3414,12 @@ prt_maze02,14,183,4 script Gordon#sign 51,{ mes "would put all those newbie"; mes "scientists to shame~"; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Pleur]"; mes "D..."; mes "D...Daddy!!"; next; - emotion e_heh; + emotion ET_SMILE; mes "[Gordon]"; mes "Heh heh~"; mes "Am I being"; @@ -3448,14 +3448,14 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ switch(select("I've never heard of you.:Oh gosh, it's Jesqurienne!")) { case 1: mes "[Jesqurienne]"; - emotion e_swt; + emotion ET_SWEAT; mes "Ho ho ho~!"; mes "Surely you"; mes "must be joking~"; next; switch(select("You got me, you got me.:Nope. Doesn't ring a bell.")) { case 1: - emotion e_pif; + emotion ET_HNG; mes "[Jesqurienne]"; mes "Ohohohohoho~!"; mes "I knew it! I knew it!"; @@ -3472,7 +3472,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ next; break; case 2: - emotion e_dots; + emotion ET_THINK; mes "[Jesqurienne]"; mes "..."; mes "......"; @@ -3524,7 +3524,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ next; switch(select("^333333Stuck-up chick.^000000:Take it easy on the drinks...")) { case 1: - emotion e_an; + emotion ET_FRET; mes "[Jesqurienne]"; mes "What...?"; mes "What did you say?"; @@ -3533,7 +3533,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ mes "that to me before!"; mes "H-how dare you..."; next; - emotion e_ag; + emotion ET_ANGER; mes "[Jesqurienne]"; mes "Prove that you can"; mes "hold a candle to my"; @@ -3549,8 +3549,8 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ mes "ask us the questions?"; next; donpcevent "Aaron#sign::onSmile"; - emotion e_gasp; - emotion e_gasp,1; + emotion ET_SURPRISE; + emotion ET_SURPRISE, playerattached(); mes "[Aaron]"; mes "Did someone say"; mes "''Quiz Challenge?''"; @@ -3558,7 +3558,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ mes "of assistance."; next; set sign_q,21; - emotion e_gg; + emotion ET_KIK; mes "[Jesqurienne]"; mes "Professor Aaron?"; mes "Ho ho~ If he's asking"; @@ -3608,11 +3608,11 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ mes "never had a chance! Of course,"; mes "I did, but you know, I guess you had to learn for yourself."; next; - emotion e_an; + emotion ET_FRET; mes "[Jesqurienne]"; mes "I'd insult you if it weren't for the fact that you embarassed yourself enough during the Quiz Challenge. As a matter of fact, I'll even forgive you for wounding my pride earlier."; next; - emotion e_gg; + emotion ET_KIK; mes "[Jesqurienne]"; mes "Can you believe it?"; mes "Even drunk I can beat"; @@ -3708,11 +3708,11 @@ geffen_in,59,74,4 script Jesqurienne#sign 803,{ } OnOmg: - emotion e_omg; + emotion ET_HUK; end; OnHo: - emotion e_ho; + emotion ET_DELIGHT; end; } @@ -3724,7 +3724,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{ mes "we begin, let me"; mes "tell you the rules..."; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Aaron]"; mes "I'm going to give you"; mes "ten multiple choice questions."; @@ -4344,7 +4344,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{ next; if (.@npc_p > .@user_p) { set sign_q,23; - emotion e_gg; + emotion ET_KIK; mes "[Jesqurienne]"; mes "Bwahahaha!"; mes "I win! I knew it!"; @@ -4375,7 +4375,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{ close; } else { - emotion e_omg; + emotion ET_HUK; mes "Goodness...!"; mes "Either these beer"; mes "goggles are on too tight,"; @@ -4384,7 +4384,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{ next; if (Sex == SEX_MALE) { select("Um, I'm a dude..."); - emotion e_sob; + emotion ET_CRY; mes "[Aaron]"; mes "N-no...!"; mes "M-maybe I should"; @@ -4394,14 +4394,14 @@ geffen_in,61,72,7 script Aaron#sign 754,{ } else { select("Why, thank you~"); - emotion e_no1; + emotion ET_BEST; mes "[Aaron]"; mes "Ah, yes. Your"; mes "sense of style, your"; mes "magnificent body. Everything"; mes "about you is beautiful! Not just that, but you're also intelligent!"; next; - emotion e_lv2; + emotion ET_BIGTHROB; mes "[Aaron]"; mes "I should know!"; mes "Not only do I teach"; @@ -4413,7 +4413,7 @@ geffen_in,61,72,7 script Aaron#sign 754,{ close; } OnSmile: - emotion e_heh; + emotion ET_SMILE; end; } @@ -4431,7 +4431,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ mes "like you want something from"; if (Zeny < 10000) { mes "me. Hah! You are poor!"; - emotion e_pif; + emotion ET_HNG; mes "It also looks like you're low on cash~! Well, this is what guys like me to do to shameless"; mes "moochers like you!"; percentheal -10,0; @@ -4807,7 +4807,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ if (Zeny < 10000) { mes "me. It also looks like you're low on cash~! Well, this is what guys like me to do to shameless"; mes "moochers like you!"; - emotion e_pif; + emotion ET_HNG; percentheal -10,0; close; } @@ -4827,14 +4827,14 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ mes "other, I'm borrowing some"; mes "cash. You know, for old"; mes "time's sake. ^FF0000Yoink!^000000"; - emotion e_gg; + emotion ET_KIK; set Zeny, Zeny-10000; } else { mes "I got nothin' for you and"; mes "you obviously have nothing"; mes "for me! Now lemme gamble!"; - emotion e_pif; + emotion ET_HNG; } close; } @@ -4845,7 +4845,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ mes "It's over. Not get outta"; mes "here before I jack some"; mes "more of your cash!"; - emotion e_gg; + emotion ET_KIK; next; switch(select("Okay.:I want to take Part Two again.")) { case 1: @@ -4854,7 +4854,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ mes "Geez, why do"; mes "these guys always"; mes "come and bother me?"; - emotion e_pif; + emotion ET_HNG; close; case 2: mes "[Dearles]"; @@ -5772,7 +5772,7 @@ alberta_in,154,171,5 script Maid#s10 758,{ mes "You see, it'll be my brother's"; mes "birthday, but I'm so busy with"; mes "work that I can't see him."; - emotion e_thx; + emotion ET_THANKS; next; mes "[Seylin]"; mes "The last time I saw him,"; @@ -5845,7 +5845,7 @@ alberta_in,154,171,5 script Maid#s10 758,{ mes "I just thought"; mes "that maybe..."; close2; - emotion e_dots; + emotion ET_THINK; end; case 2: mes "[Seylin]"; @@ -5962,7 +5962,7 @@ alberta_in,154,171,5 script Maid#s10 758,{ set sign_q,51; getitem 525,3; //Panacea next; - emotion e_kis2; + emotion ET_CHUPCHUP; close; } } @@ -6058,7 +6058,7 @@ prt_castle,107,58,5 script Soldier#s11 105,{ mes "Wow, I wonder what she"; mes "got for me this year?"; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Maruin]"; mes "Th-this is--!"; mes "Oh. Snap. That's right."; @@ -6947,7 +6947,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{ mes "I wonder"; mes "how my pickled"; mes "cabbage will turn out?"; - emotion e_ho; + emotion ET_DELIGHT; close; } else { @@ -6987,7 +6987,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{ mes "how he's doing. Still, he should"; mes "be doing a better job of keeping"; mes "in touch with us. ^333333*Sigh*^000000"; - emotion e_dots; + emotion ET_THINK; close; } else if (sign_q < 62) { @@ -7008,7 +7008,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{ else { mes "Liana's daddy needs to come home more often. ^333333*Sigh*^000000 Even though he's away for long periods of time, I suppose it's for the best..."; close2; - emotion e_dots; + emotion ET_THINK; end; } } @@ -7046,14 +7046,14 @@ geffen_in,171,42,3 script Cute Girl 703,{ mes "coming home?!"; mes "I... I miss him so much~"; mes "*Cries*"; - emotion e_sob; + emotion ET_CRY; close; } else if (sign_q == 54) { mes "Oh, my mom said she's gonna cook me something good today."; mes "I wonder what she's gonna make?"; mes "I hope it's pickled cabbage again!"; - emotion e_heh; + emotion ET_SMILE; close; } else if (sign_q == 55) { @@ -7087,7 +7087,7 @@ geffen_in,171,42,3 script Cute Girl 703,{ mes "time to come home and"; mes "see me. Sooooooooo~"; mes "I wrote this letter!"; - emotion e_dots; + emotion ET_THINK; next; switch(select("....:I'll bring this to him.")) { case 1: @@ -7104,7 +7104,7 @@ geffen_in,171,42,3 script Cute Girl 703,{ mes "Okay then, don't"; mes "forget to give this to"; mes "my dad, okay? Promise?"; - emotion e_ho; + emotion ET_DELIGHT; set sign_q,56; getitem 7276,1; //Picture_Letter close; @@ -7179,14 +7179,14 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{ mes "I suppose I understand."; mes "However, you're lucky that I don't kick you out of my forge right here and right now~"; close2; - emotion e_pif; + emotion ET_HNG; end; } } else { mes "I hope you understand that"; mes "this forge isn't really open to the public. I'm doing some intensive training,so I'd appreciate it if you would just leave now."; - emotion e_pif; + emotion ET_HNG; close2; warp "mjo_dun02",372,346; end; @@ -7196,7 +7196,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{ mes "I hope you understand that"; mes "this forge isn't really open to the public. I'm doing some intensive training,so I'd appreciate it if you would just leave now."; close2; - emotion e_pif; + emotion ET_HNG; end; } else if (sign_q == 56) { @@ -7388,7 +7388,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{ case 67: mes "You've returned?"; mes "Well, I don't know how to put this, but once you hear it, don't take it the wrong way..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Engel]"; mes "^333333*Ahem*^000000"; @@ -7418,7 +7418,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{ mes "I've got some bad news,"; mes "so please don't overreact~"; mes "Um, are you ready?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Engel]"; mes "While I was trying to restore the "; @@ -7658,7 +7658,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{ mes "Sometimes, you can only"; mes "improve yourself by training in solitude. But don't ever forget about the ones who really care about you. It's those people who make everything worth it."; close2; - emotion e_dots; + emotion ET_THINK; end; } } @@ -7672,7 +7672,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{ mes "What could possibly be"; mes "the answer I'm looking"; mes "for? ^333333*Sigh...*^000000"; - emotion e_pif; + emotion ET_HNG; close; } else if (sign_q == 72) { @@ -7686,7 +7686,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{ mes "Why bother climbing this tower?"; } mes "What are you doing here?!"; - emotion e_pif; + emotion ET_HNG; next; input .@input$; if ((.@input$ == "Metz Brayde") || (.@input$ == "Sobbing Starlight")) { @@ -7702,18 +7702,18 @@ gef_tower,118,36,4 script Annoyed Man 64,{ next; mes "[Dhota]"; mes "..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Dhota]"; mes "..."; mes "......"; - emotion e_dots; + emotion ET_THINK; next; mes "[Dhota]"; mes "..."; mes "......"; mes "BWAAAAH~!"; - emotion e_ag; + emotion ET_ANGER; next; mes "[Dhota]"; mes "Right, he wants that guy"; @@ -7723,7 +7723,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{ mes "near Comodo to investigate some"; mes "tribal people or whatever."; set sign_q,73; - emotion e_pif; + emotion ET_HNG; close; } else { @@ -7742,7 +7742,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{ mes "What could possibly be"; mes "the answer I'm looking"; mes "for? ^333333*Sigh...*^000000"; - emotion e_pif; + emotion ET_HNG; close; } } @@ -7758,7 +7758,7 @@ umbala,163,256,3 script Native#_s 781,{ mes "one of those? Well, I'd"; mes "be happy if I had some"; mes "Meat to eat, I guess!"; - emotion e_ho; + emotion ET_DELIGHT; close; } else if (sign_q == 73) { @@ -7836,7 +7836,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "then that and then..."; mes "Ooh, these calculations"; mes "are absolutely perfect!"; - emotion e_gg; + emotion ET_KIK; next; mes "[Cyon]"; mes "Wh-what?!"; @@ -7844,7 +7844,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "H-how did you get"; mes "in here? I demand"; mes "that you leave, right now!"; - emotion e_an; + emotion ET_FRET; close2; warp "umbala",111,121; end; @@ -7856,7 +7856,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "then that and then..."; mes "Ooh, these calculations"; mes "are absolutely perfect!"; - emotion e_gg; + emotion ET_KIK; next; mes "[Cyon]"; mes "Wh-what?!"; @@ -7864,7 +7864,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "H-how did you get"; mes "in here? I demand"; mes "that you leave, right now!"; - emotion e_an; + emotion ET_FRET; next; switch(select("I'm here for Metz Brayde.:My apologies.:Would you look at this?:...")) { case 1: @@ -7881,7 +7881,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "then hurry up and get"; mes "out of here! Not just anyone"; mes "is allowed here! Leave!"; - emotion e_pif; + emotion ET_HNG; close; case 3: mes "[Cyon]"; @@ -7891,7 +7891,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "Fine, you've piqued my"; mes "scientific curiosity..."; next; - emotion e_omg; + emotion ET_HUK; next; mes "[Cyon]"; mes "Sweet lord..."; @@ -8550,7 +8550,7 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "I really don't want to fight you,"; mes "but I've come too far to give up now. If you insist on interfering, then you leave me no choice..."; next; - emotion e_gg,0,"Dark Lord#serin"; + emotion ET_KIK, getnpcid(0, "Dark Lord#serin"); mes "[Dark Lord]"; mes "^330033Insolent mortal!"; mes "Do you really think"; @@ -8733,7 +8733,7 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "[Serin]"; mes "..."; mes "......"; - emotion e_dots; + emotion ET_THINK; close; } else if (sign_q == 124) { @@ -9351,7 +9351,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "At least we both agree that"; mes "somehow I don't really belong"; mes "here in Niflheim."; - emotion e_dots; + emotion ET_THINK; set sign_q,93; close; } @@ -9374,7 +9374,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "but it seems like Angrboda"; mes "has been sealed away in the"; mes "world of Rune-Midgard..."; - emotion e_dots; + emotion ET_THINK; set sign_q,94; close; } @@ -9542,7 +9542,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "you for giving back my ring,"; mes "my most precious possession."; mes "Thank you, thank you..."; - emotion e_sob; + emotion ET_CRY; next; mes "^3355FFThe sound of Serin's voice"; mes "softened and when it grew silent, her eyes blankly stared ahead as"; @@ -9557,31 +9557,31 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ getexp (checkre(3))?50000:500000,0; close; case 2: - emotion e_sob; + emotion ET_CRY; close; } } else { - emotion e_sob; + emotion ET_CRY; close; } } else if (sign_q == 130) { mes "[Serin]"; mes "..........."; - emotion e_sob; + emotion ET_CRY; next; mes "[Serin]"; mes "..........."; - emotion e_dots; + emotion ET_THINK; next; mes "[Serin]"; mes "..........."; - emotion e_dots; + emotion ET_THINK; next; mes "[Serin]"; mes "..........."; - emotion e_sob; + emotion ET_CRY; close; } else if (sign_q == 131) { @@ -9710,7 +9710,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "......"; mes "W-who..."; mes "Who are you?"; - emotion e_dots; + emotion ET_THINK; close; } else if (sign_q > 199) { @@ -9734,7 +9734,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ if (countitem(2642) > 0) { mes "[Serin]"; mes "Thank you..."; - emotion e_sob; + emotion ET_CRY; delitem 2642,1; //Serin's_Gold_Ring next; mes "^3355FFYou returned"; @@ -9744,7 +9744,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "[Serin]"; mes "..."; mes "......"; - emotion e_dots; + emotion ET_THINK; close; } } @@ -9911,7 +9911,7 @@ que_sign01,122,141,4 script Witch#s 792,{ mes "Why haven't you"; mes "brought my books"; mes "back to me yet?"; - emotion e_pif; + emotion ET_HNG; close; } } @@ -10008,7 +10008,7 @@ que_sign01,122,141,4 script Witch#s 792,{ mes "side! Well, I won't take the"; mes "symbol against your will, but"; mes "you better think this over..."; - emotion e_dots; + emotion ET_THINK; close; } } @@ -10674,7 +10674,7 @@ OnTouch_: mes "[Kirkena]"; mes "..."; mes "Hrrmmmpf..."; - emotion e_pif; + emotion ET_HNG; close; case 2: mes "[Kirkena]"; @@ -11300,7 +11300,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ mes "for me to enjoy myself"; mes "if my soul ends up getting"; mes "busted by the gods."; - emotion e_pif; + emotion ET_HNG; close; } else { @@ -11401,7 +11401,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ mes "Hehehehe~"; close; } - emotion e_pif; + emotion ET_HNG; close; case 2: if (Zeny < 60000) { @@ -11409,7 +11409,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ mes "What is this?"; mes "You tryin to welch"; mes "me or somethin'?"; - emotion e_pif; + emotion ET_HNG; close; } else { @@ -11504,7 +11504,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ mes "[Laichin]"; mes "Whatever, dude!"; mes "Freakin' cheapskate..."; - emotion e_pif; + emotion ET_HNG; close; } } @@ -11867,7 +11867,7 @@ OnTouch_: mes "^333333*Cries*^000000"; mes "Where am I?"; mes "I... I wanna go home~"; - emotion e_sob; + emotion ET_CRY; close; } else if (sign_sq == 1) { @@ -11893,7 +11893,7 @@ OnTouch_: mes "N-no..."; mes "I wanna go home..."; close2; - emotion e_sob; + emotion ET_CRY; end; } } @@ -11902,7 +11902,7 @@ OnTouch_: mes "^333333*Cries*^000000"; mes "Where am I?"; mes "I... I wanna go home~"; - emotion e_sob; + emotion ET_CRY; close; } else if ((sign_sq == 3) || (sign_sq == 4)) { @@ -11923,7 +11923,7 @@ OnTouch_: mes "who knows how to"; mes "get me back home..."; mes "^333333*Cries*^000000"; - emotion e_sob; + emotion ET_CRY; close; } } @@ -11934,7 +11934,7 @@ OnTouch_: mes "anything! I-I'm still here"; mes "in this scary place! ^333333*Cries*^000000"; set sign_sq,6; - emotion e_sob; + emotion ET_CRY; close; } else { @@ -11944,7 +11944,7 @@ OnTouch_: mes "but you didn't help me"; mes "at all. Y-you lied to me!"; mes "I... I hate you! ^333333*Wah~!*^000000"; - emotion e_sob; + emotion ET_CRY; close; } } @@ -11953,7 +11953,7 @@ OnTouch_: mes "^333333*Cries*^000000"; mes "Where am I?"; mes "I... I wanna go home~"; - emotion e_sob; + emotion ET_CRY; close; } end; diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 6b0ea9ef73..8309b6efd8 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -208,13 +208,13 @@ OnTouch: mes "[Lazy Young Man]"; mes "Arrgg~ I'm thirsty~~ so thirsty~~"; mes "Give me Palm juice... Palm Juuiice~~"; - emotion e_an; + emotion ET_FRET; next; - emotion e_an; + emotion ET_FRET; next; - emotion e_an; + emotion ET_FRET; next; - emotion e_an; + emotion ET_FRET; close; } end; @@ -227,11 +227,11 @@ dewata,159,81,4 script Tourist#dew-1 881,{ next; mes "[Nasolo]"; mes "If only I had one..."; - emotion e_sob; + emotion ET_CRY; next; mes "[Nasolo]"; mes "I wonder when my princess will come..."; - emotion e_sigh; + emotion ET_OHNO; close; } @@ -324,12 +324,12 @@ dewata,147,107,6 script Gourmet#dew 85,{ mes "[Gourmet]"; mes "Oh... it's like a party in my"; mes "mouth... and everyone's invited!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Gourmet]"; mes "Master~ One more please~"; - emotion e_no1; - emotion e_ok,0,"Restauranteur#dew"; + emotion ET_BEST; + emotion ET_OK, getnpcid(0, "Restauranteur#dew"); next; mes "[Gourmet]"; mes "You must try this! The Food here is succulent~"; @@ -340,7 +340,7 @@ dewata,154,107,4 script Sightseer#dew 86,{ mes "[Tourist]"; mes "Wow..."; mes "How many has he already eaten?"; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "[Tourist]"; mes "He must be big eater, not the gourmet..."; @@ -355,19 +355,19 @@ dewata,95,203,6 script Travel Guide#dew 536,{ mes "This temple behind me is called Borobudur."; mes "Borobudur temple was built in the 9th century"; mes "to venerate the Great Buddha, an ancient religious figure."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Guide]"; mes "This temple is made with 6 square platforms and 3 round platforms, and 2672 hand carved relief panels as well as 504 statue of various Buddhas."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Guide]"; mes "The central stupa, or shrine is located at the center of high platform, which is surrounded by 72 more statues."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Guide]"; mes "Even in modern times Borobudur temple is a pilgimage site for many monks worshiping the Buddha. It's also a major tourist attraction, as you can imagine."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Guide]"; mes "That is all I have on Borobudur temple, are there any questions?"; @@ -383,11 +383,11 @@ dewata,97,207,4 script Tourist#dew1 803,{ mes "[Tourist]"; mes "This hombre is a real snooze..."; mes "Why make it longer.."; - emotion e_spin; + emotion ET_CONFUSE; next; mes "[Tourist]"; mes "I need to change my travel agent..."; - emotion e_sigh; + emotion ET_OHNO; close; } @@ -415,7 +415,7 @@ dewata,99,203,4 script Tourist#dew4 755,{ mes "[Tourist]"; mes "Oh~ This is very interesting. A"; mes "temple that worships the Buddha..."; - emotion e_ok; + emotion ET_OK; next; mes "[Tourist]"; mes "But I don't really get all the"; @@ -653,7 +653,7 @@ dewata,245,244,4 script Lodge Employee#dew 536,2,3,{ OnTouch: mes "[Lodge employee]"; mes "Argg~ This is really ticking me off!"; - emotion e_an; + emotion ET_FRET; next; mes "[Lodge employee]"; mes "How come more and more couples come here?"; @@ -670,17 +670,17 @@ dewata,233,263,8 script Sweet Married Couple#1 828,2,3,{ OnTouch: mes "[Sweet Husband]"; mes "You are the most beautiful thing in the world baby~"; - emotion e_kis; + emotion ET_CHUP; next; mes "[Sweet Wife]"; mes "Really? I'm that beautiful? I love you, honey~"; - emotion e_kis2,0,"Sweet Married Couple#dew2"; + emotion ET_CHUPCHUP, getnpcid(0, "Sweet Married Couple#dew2"); next; mes "[Sweet Married Couple]"; mes "Hahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahaha"; mes "Hohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohoho"; - emotion e_heh; - emotion e_heh,0,"Sweet Married Couple#dew2"; + emotion ET_SMILE; + emotion ET_SMILE, getnpcid(0, "Sweet Married Couple#dew2"); next; mes "Come on now, I'm growing tired of this. Let's go."; close; @@ -690,28 +690,28 @@ dewata,234,263,8 script Sweet Married Couple#2 727,2,3,{ OnTouch: mes "[Sweet Wife]"; mes "Baby~ You know what flower that is~?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Sweet Husband]"; mes "Hmm? I don't know. But it's really pretty."; next; mes "[Sweet Wife]"; mes "Baby~ Who's prettier, me or the flower?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Sweet Husband]"; mes "No matter how pretty the flower is, you are always more beautiful~"; - emotion e_kis,0,"Sweet Married Couple#dew1"; + emotion ET_CHUP, getnpcid(0, "Sweet Married Couple#dew1"); next; mes "[Sweet Wife]"; mes "Really? I'm that pretty? I love you, sweetie~"; - emotion e_kis2; + emotion ET_CHUPCHUP; next; mes "[Sweet Married Couple]"; mes "Hahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahaha"; mes "Hohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohohoho"; - emotion e_heh,0,"Sweet Married Couple#dew1"; - emotion e_heh; + emotion ET_SMILE, getnpcid(0, "Sweet Married Couple#dew1"); + emotion ET_SMILE; next; mes "Come on now, this bores me. Let's move on."; close; @@ -731,7 +731,7 @@ OnTouch: next; mes "[Reclining Tourist]"; mes "That's why I haven't moved in a whole week! Hahahaha~"; - emotion e_heh; + emotion ET_SMILE; close; } @@ -745,7 +745,7 @@ OnTouch: next; mes "[Kid]"; mes "Who IS that man?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Kid]"; mes "I don't want to be a lazybones like him when I grow up."; @@ -782,14 +782,14 @@ OnTouch: next; mes "[Sarr]"; mes "I found Siyak!! Come out, come out!!"; - emotion e_gg,0,"Sarr#dew"; - emotion e_omg; - emotion e_gg,0,"Sipo#dew"; - emotion e_omg,1; + emotion ET_KIK, getnpcid(0, "Sarr#dew"); + emotion ET_HUK; + emotion ET_KIK, getnpcid(0, "Sipo#dew"); + emotion ET_HUK, playerattached(); next; mes "[Siyak]"; mes "Arrgg!! This is all your fault~!!"; - emotion e_an; + emotion ET_FRET; close; } @@ -800,10 +800,10 @@ OnTouch: next; mes "[Sarr]"; mes "I found Siyak!! Come out come out!!"; - emotion e_gg,0,"Sarr#dew"; - emotion e_omg,0,"Siyak#dew"; - emotion e_gg; - emotion e_omg,1; + emotion ET_KIK, getnpcid(0, "Sarr#dew"); + emotion ET_HUK, getnpcid(0, "Siyak#dew"); + emotion ET_KIK; + emotion ET_HUK, playerattached(); next; mes "[Sipo]"; mes "Hehe~ Now Siyak is IT~ I'll just keep hiding in here."; @@ -817,7 +817,7 @@ OnTouch: next; mes "[Majya]"; mes "I've been just standing here, and they haven't found me for 3 hours..."; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "[Majya]"; mes "What should I do? Come out? I don't want to be IT..."; @@ -828,24 +828,24 @@ dewata,278,100,4 script Missing Child#dew 703,2,3,{ OnTouch: mes "[Ukki]"; mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~"; - emotion e_sob; - emotion e_swt2; + emotion ET_CRY; + emotion ET_PROFUSELY_SWEAT; next; mes "["+strcharinfo(0)+"]"; mes "Hey, kid..."; next; mes "[Ukki]"; mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~"; - emotion e_sob; + emotion ET_CRY; next; mes "[Ukki]"; mes "Mama~ Papa~ Where are youuu~ Waa~"; - emotion e_sob; - emotion e_swt2; + emotion ET_CRY; + emotion ET_PROFUSELY_SWEAT; next; mes "["+strcharinfo(0)+"]"; mes "... ... ..."; - emotion e_dots,1; + emotion ET_THINK, playerattached(); close; } @@ -853,14 +853,14 @@ dewata,249,87,4 script Mum#dew 101,2,3,{ OnTouch: mes "[Mum]"; mes "Ukki~ Ukki~ Where did she go?"; - emotion e_wah; + emotion ET_KEK; next; mes "[Mum]"; mes "I can't take my eyes of her for a second..."; next; mes "[Mum]"; mes "Ukki~"; - emotion e_wah; + emotion ET_KEK; close; } @@ -868,20 +868,20 @@ dewata,251,85,6 script Poppa#dew 97,2,3,{ OnTouch: mes "[Poppa]"; mes "Honey, is Ukki lost again?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Poppa]"; mes "Arrgg... I can't go anywhere with her... How many times already?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Daddy]"; mes "She's gotten lost in Louyang, Amatsu, Moscovia, Brasilis, Kunlun,"; mes "and in Ayothaya..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Daddy]"; mes "What!! It's already been 7 times including this time in Dewata... 7 times!!!!!!"; - emotion e_otl; + emotion ET_OTL; close; } @@ -897,7 +897,7 @@ dewata,278,281,4 script Happily Married Grandpa 534,{ mes "[Happily Married Grandpa]"; mes "It makes me love her even more."; mes "You can't imagine the wonderful flavor!"; - emotion e_lv; + emotion ET_THROB; close; } @@ -906,7 +906,7 @@ dewata,280,277,4 script Happily Married Grandma 535,{ mes "In my younger days,"; mes "there were many gentleman callers"; mes "who wanted to court me."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Happily Married Grandma]"; mes "Yet, I met just the right guy,"; @@ -925,7 +925,7 @@ dewata,280,277,4 script Happily Married Grandma 535,{ mes "I always think it was lucky"; mes "to be growing old with a guy"; mes "who loves what I cook."; - emotion e_lv; + emotion ET_THROB; close; } @@ -1077,7 +1077,7 @@ dewata,204,230,6 script Dieting Lady#dew 537,{ mes "too much of a good thing is bad..."; mes "I should stick with my diet."; mes "Sorry, I'll give it back to you."; - emotion e_sob; + emotion ET_CRY; close; case 2: mes "[Dieting Lady]"; @@ -1085,7 +1085,7 @@ dewata,204,230,6 script Dieting Lady#dew 537,{ mes "Since you don't want to share."; mes "Anyway, I shouldn't cheat on my diet"; mes "even for something that looks and smells so good..."; - emotion e_pif; + emotion ET_HNG; close; } } @@ -1145,7 +1145,7 @@ dewata,127,248,6 script Wishing Kid#dew 539,{ mes "But, what should I do...?"; mes "I've forgotten how many ^FF0000nights^000000"; mes "I've already slept... boo hoo!"; - emotion e_sob; + emotion ET_CRY; close; } diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index 96200cbc64..606a4f86d0 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -22,7 +22,7 @@ dicastes01,194,159,5 script Excited Galten#a 492,{ if (isequipped(2782)) { mes "I can't get beautiful"; mes "Ahat's image out of my head."; - emotion e_lv; + emotion ET_THROB; mes "As long as we have him,"; mes "it will only be a matter of time before Sapha"; mes "will rule this land."; @@ -301,14 +301,14 @@ dic_in01,149,104,5 script Tired Piom#b 455,{ mes "I will need another dose of Bradium."; mes "I think the effects are weaker than before,"; mes "or is it just me?"; - emotion e_what; + emotion ET_QUESTION; close; } mes "¡ð¡Ð¡ú ¡ø ¢²"; mes "¡ö¡õ¡ó ¢¤ ¡ò¡ò¢³ ¡ô ¡ô¡ó¡ñ"; mes "¢£¡ñ¡þ ¡ü ¢²¡û¡ó ¡ò ¡ð¡þ"; mes "¡ö¡ú¡ñ ¢³"; - emotion e_what; + emotion ET_QUESTION; close; } @@ -324,7 +324,7 @@ dic_in01,341,113,3 script Tired Piom#a 491,{ mes "[Tired Piom]"; mes "..."; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Tired Piom]"; mes "I'll be rejected again, right?"; close; @@ -337,7 +337,7 @@ dic_in01,341,113,3 script Tired Piom#a 491,{ mes "[Tired Piom]"; mes "¡þ"; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Tired Piom]"; mes "¡ø¡ú¡ø ¢± ¡ö¡ò"; close; @@ -547,13 +547,13 @@ dicastes01,235,245,4 script Excited Piom#a 490,{ if (isequipped(2782)) { mes "[Excited Piom]"; mes "Have you seen Ahat?"; - emotion e_ho; + emotion ET_DELIGHT; mes "His popularity here in El Discastes is phenomenal!"; close; } mes "[Excited Piom]"; mes "¡ú¡þ¡ó ¢³ ¡ü¢²¡ñ ¢±"; - emotion e_ho; + emotion ET_DELIGHT; mes "¢³¡ó¡ñ ¡õ ¡ð¡ô¡þ ¡÷ ¡ú¡ò¡õ ¡ø ¢² ¡ø"; close; } @@ -584,7 +584,7 @@ dicastes01,164,180,4 script Limpy Piom#a 489,{ mes "I hope everything goes well."; mes "I hope it doesn't come all"; mes "the way to the capital city here."; - emotion e_dots; + emotion ET_THINK; close; } mes "¢²¡ô¡þ ¡ù ¡õ¡Ð"; @@ -592,7 +592,7 @@ dicastes01,164,180,4 script Limpy Piom#a 489,{ mes "¢³¡þ¢¤ ¡ó ¡õ¡÷¡Ð"; mes "¡ñ¡ò¡ü ¡ü ¡ù¡þ¢±"; mes "¢¤¡ò¡þ ¢¤ ¢£¡ñ ¢¤ ¢£¡ñ"; - emotion e_dots; + emotion ET_THINK; close; } @@ -612,13 +612,13 @@ dicastes01,191,202,4 script Complaining Galten#fihs 450,{ mes "Then, I don't know what to talk about with you."; close; } - emotion e_gg,0,"Crazy Venknick#fihsing1"; + emotion ET_KIK, getnpcid(0, "Crazy Venknick#fihsing1"); mes "[Complaining Galten]"; mes "You also fell for that crazy man."; next; mes "[" + strcharinfo(0) + "]"; mes "Yes"; - emotion e_sob,1; + emotion ET_CRY, playerattached(); next; mes "[Complaining Galten]"; mes "Just forget about it quickly for your own good."; @@ -658,19 +658,19 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{ set Zeny, Zeny-5000; mes "[Crazy Venknick]"; mes "Thanks."; - emotion e_gg,0,"Complaining Galten#fihs"; + emotion ET_KIK, getnpcid(0, "Complaining Galten#fihs"); next; mes "["+strcharinfo(0)+"]"; mes "What is the sad legend?"; next; - emotion e_dots; + emotion ET_THINK; mes "["+strcharinfo(0)+"]"; mes "I asked what the sad legend is about!"; next; mes "[Crazy Venknick]"; mes "I don't believe in legends."; next; - emotion e_dots,1; + emotion ET_THINK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Was I tricked?"; sc_start SC_Blind,20000,0; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 04d6769778..d55077e62b 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -304,7 +304,7 @@ malangdo,147,117,3 script Innkeeper#malang 554,{ specialeffect2 EF_HEALSP; mes "[Innkeeper]"; mes "Now relax."; - emotion e_kis; + emotion ET_CHUP; next; warp "malangdo",140,121; close; @@ -362,20 +362,20 @@ OnTouch: soundeffect "assassin_of_sunset.wav",0; break; case 4: - emotion e_ho; - emotion e_ho,0,"Wandering Minstrel#mal"; + emotion ET_DELIGHT; + emotion ET_DELIGHT, getnpcid(0, "Wandering Minstrel#mal"); break; } end; } malangdo,216,168,3 script Cat Trainer#mal1 558,0,8,{ - emotion e_awsm; + emotion ET_COOL; mes "[Cat Trainer]"; mes "Ooo~ their soft puffy tails and soft fur~"; mes "I can't stand it, this is heaven~~!!"; next; - emotion e_gg; + emotion ET_KIK; mes "[Cat Trainer]"; mes "My hidden card, ^FF0000Silvervine Fruit^000000, can make all cats in Malangdo my slaves~ haha!"; next; @@ -390,24 +390,24 @@ malangdo,216,168,3 script Cat Trainer#mal1 558,0,8,{ mes "Why would I tell you when I can barely get it?"; mes "I wouldn't even tell you for all the zeny in the world~!"; next; - emotion e_gg; + emotion ET_KIK; mes "[Cat Trainer]"; mes "All the Malangdo cats are mine~!"; mes "Muahahahaha~"; mes "With enough ^FF0000Silvervine Fruit^000000 I can be a queen in Malangdo~ ohhhh!!!"; close; OnTouch: - emotion e_flash; + emotion ET_SPARK; end; } malangdo,164,203,3 script Cat Trainer#mal2 853,{ - emotion e_awsm; + emotion ET_COOL; mes "[Cat Trainer]"; mes "Ooo~ their soft puffy tails and soft fur~"; mes "I can't stand it, this is heaven~~!!"; next; - emotion e_gg; + emotion ET_KIK; mes "[Cat Trainer]"; mes "This is my little secret called"; mes "^FF0000Silvervine Fruit^000000. I can use"; @@ -427,7 +427,7 @@ malangdo,164,203,3 script Cat Trainer#mal2 853,{ mes "[Cat Trainer]"; mes "Hey, you almost made me tell my secret."; next; - emotion e_gg; + emotion ET_KIK; mes "[Cat Trainer]"; mes "One day these cats will be mine."; mes "I can be a king in Malangdo~ ohhh~!"; diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index d6f0683e54..d16c877583 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -325,11 +325,11 @@ malaya,227,311,4 script Grandma#ma01 575,{ malaya,189,263,4 script Drumming Young Man#ma02 578,{ if (malaya_hi < 10) { - emotion e_omg; + emotion ET_HUK; mes "[Drumming Young Man]"; mes "Ugh... it's just like that time before..."; next; - emotion e_omg; + emotion ET_HUK; mes "[Drumming Young Man]"; mes "When the moon was swallowed. Argh!"; close; @@ -337,7 +337,7 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{ mes "[Drumming Young Man]"; mes "I think the village was saved by a nameless adventurer."; next; - emotion e_sigh; + emotion ET_OHNO; mes "[Drumming Young Man]"; mes "Phew... I thought Bakonawa appeared again."; close; @@ -354,7 +354,7 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{ mes "But I know that Bakonawa could also 'swallow people', too."; next; select("Huk! Then isn't it dangerous?"); - emotion e_gg; + emotion ET_KIK; mes "[Drumming Young Man]"; mes "Ha ha ha. There is a way to stop Bakonawa from swallowing a person."; next; @@ -378,12 +378,12 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{ malaya,270,59,4 script Port Guard#ma03 570,{ if (malaya_hi < 10) { - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Port Guard]"; mes "The village is chaotic these days. Is it okay for me to be off like this?"; close; } else if (malaya_hi < 20) { - emotion e_no; + emotion ET_STARE_ABOUT; mes "[Port Guard]"; mes "The village is somewhat stable now but you should still be careful walking around at night."; close; @@ -393,7 +393,7 @@ malaya,270,59,4 script Port Guard#ma03 570,{ mes getd("$ma_name0"+rand(1,6)+"$")+" is said to escape from Buwaya alive after being captured. This person must be powerful."; close; } - emotion e_omg; + emotion ET_HUK; mes "[Port Guard]"; mes "What!! Port all clear!!"; next; @@ -422,7 +422,7 @@ malaya,270,59,4 script Port Guard#ma03 570,{ mes "[Port Guard]"; mes "And you should run into the nearest building when you hear Wokwoks wings fluttering from afar."; next; - emotion e_hmm; + emotion ET_SCRATCH; mes "[Port Guard]"; mes "But if the fluttering sound is small or if you don't hear anything, let's just say you should prepare for attack and wish for luck."; close; diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index 9b86ae914f..a127ebe2a6 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -37,12 +37,12 @@ mora,160,123,3 script Nemnem#p 517,{ case 1: mes "[Nemnem]"; mes "Bra~vo!"; - emotion e_awsm; + emotion ET_COOL; close; case 2: mes "[Nemnem]"; mes "If not, never mind!"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; } } @@ -71,7 +71,7 @@ mora,105,104,3 script Boaster#podo 514,{ mes "So the situation got"; mes "more and more serious..."; mes "Now give me some more coins."; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; } @@ -232,7 +232,7 @@ mora,174,171,0 script Warehouse Worker#mo1 518,{ mes "[Shortffle]"; mes "I want to climb the ladder,"; mes "but my legs are too short to do that."; - emotion e_sob; + emotion ET_CRY; next; mes "[Shortffle]"; mes "I wonder who brought it here."; @@ -314,7 +314,7 @@ mora,113,185,4 script Reading Raffle#ep14_1 516,{ mes "[Reading Rafflesia]"; mes "*gasp* Who are you? How long"; mes "were you standing there? How rude."; - emotion e_omg; + emotion ET_HUK; next; mes "The Rafflesia closed the book hastily."; mes "You're curious what will happen next,"; @@ -338,13 +338,13 @@ mora,99,65,6 script Banana Rafflesia#ep14_1 516,{ mes "[Banana Rafflesia]"; mes "Take it if you can."; mes "If you are successful, you can have it for free."; - emotion e_ok; + emotion ET_OK; close; case 2: mes "[Banana Rafflesia]"; mes "Well, I was going to give it for free,"; mes "but if you don't want it, it's fine with me."; - emotion e_pif; + emotion ET_HNG; close; } } @@ -359,7 +359,7 @@ mora,30,128,4 script Relaxing Traveler#ep14_1 514,{ select("... ... ..."); mes "[Traveler]"; mes "Sorry... maybe it's just me..."; - emotion e_sry; + emotion ET_SORRY; close; } @@ -402,7 +402,7 @@ mora,168,161,4 script Warehouse Worker#mo2 513,{ next; mes "[Lively]"; mes "Ahhh... I'd like to make money..."; - emotion e_sob; + emotion ET_CRY; close; } @@ -415,12 +415,12 @@ mora,175,161,6 script Warehouse Worker#mo3 518,{ mes "and the blush on its cheeks..."; mes "and its wings, ready to take off"; mes "any moment..."; - emotion e_shy; + emotion ET_SHY; next; mes "[Kuorita]"; mes "I want to have it badly..."; mes "What would happen if I stole it?"; - emotion e_rice; + emotion ET_HUNGRY; close; } @@ -911,17 +911,17 @@ mora,140,186,3 script Raffle Philosopher 517,{ - script #mora_traveler -1,{ mes "[Upset Traveler]"; mes "You... you dare play a game with me?"; - emotion e_ag,0,"Traveler#ep14_1_1"; + emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1"); next; mes "[Traveler That Posed the Question]"; mes "What...? Do you have proof?"; mes "Do you have proof?!!"; - emotion e_an,0,"Traveler#ep14_1_2"; + emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_2"); next; mes "[Traveler Trying to Stop the Fight]"; mes "Look, stop it, just stop it!"; mes "I'm afraid it will turn into a big fight..."; - emotion e_swt2,0,"Traveler#ep14_1_3"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Traveler#ep14_1_3"); next; mes "[Traveler Trying to Stop the Fight]"; mes "Oh! Why don't we ask"; @@ -931,7 +931,7 @@ mora,140,186,3 script Raffle Philosopher 517,{ mes "Oh, yes! That's a great idea."; mes "Well~ Hello there~"; mes "You there, traveler!"; - emotion e_ic,0,"Traveler#ep14_1_1"; + emotion ET_AHA, getnpcid(0, "Traveler#ep14_1_1"); next; mes "They seem to be calling out to you."; next; @@ -942,7 +942,7 @@ mora,140,186,3 script Raffle Philosopher 517,{ } mes "["+strcharinfo(0)+"]"; mes "What's happening here?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Upset Traveler]"; mes "I'll tell you what."; @@ -952,20 +952,20 @@ mora,140,186,3 script Raffle Philosopher 517,{ mes "the third Rosethree..."; mes "the ninth Rosenine..."; mes "you get how it works, right?"; - emotion e_ag,0,"Traveler#ep14_1_1"; + emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1"); next; mes "[Traveler That Posed the Question]"; mes "Right, that's how it works."; mes "So I asked what the youngest one would be called,"; mes "and when I told him the answer,"; mes "he got all upset and started cursing me."; - emotion e_an,0,"Traveler#ep14_1_2"; + emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_2"); next; mes "[Upset Traveler]"; mes "You... you bastard!"; mes "Hey there, what do you think"; mes "the answer to the question is?"; - emotion e_ag,0,"Traveler#ep14_1_1"; + emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1"); next; switch(select("Roseten.:Rose.:How would I know that?")) { case 1: @@ -977,11 +977,11 @@ mora,140,186,3 script Raffle Philosopher 517,{ mes "See? Even this traveler says"; mes "Roseten is the answer."; mes "How dare you try to play tricks on me?"; - emotion e_gg,0,"Traveler#ep14_1_1"; + emotion ET_KIK, getnpcid(0, "Traveler#ep14_1_1"); next; mes "[Traveler That Posed the Question]"; mes "You idiot... you don't have the slightest clue!"; - emotion e_an,0,"Traveler#ep14_1_2"; + emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_2"); break; case 2: mes "["+strcharinfo(0)+"]"; @@ -996,12 +996,12 @@ mora,140,186,3 script Raffle Philosopher 517,{ mes "That's exactly what I mean!"; mes "I can't hang around with him."; mes "I guess we live in two different worlds."; - emotion e_ok,0,"Traveler#ep14_1_2"; + emotion ET_OK, getnpcid(0, "Traveler#ep14_1_2"); next; mes "[Upset Traveler]"; mes "You bastard... What did you"; mes "get from this guy...?"; - emotion e_ag,0,"Traveler#ep14_1_1"; + emotion ET_ANGER, getnpcid(0, "Traveler#ep14_1_1"); break; case 3: mes "["+strcharinfo(0)+"]"; @@ -1011,7 +1011,7 @@ mora,140,186,3 script Raffle Philosopher 517,{ mes "[Traveler Trying to Stop the Fight]"; mes "You good-for-nothing bastard,"; mes "you're trying to leave this mess to me?"; - emotion e_an,0,"Traveler#ep14_1_3"; + emotion ET_FRET, getnpcid(0, "Traveler#ep14_1_3"); break; } next; @@ -1147,7 +1147,7 @@ mora,43,127,3 script Innkeeper#mora_inn 522,{ mes "[Innkeeper]"; mes "What's worse is that whoever takes medicine made out of Savages will come back for more!"; mes "And he will wander around looking for the tower, and eventually turn into an enormous Savage!"; - emotion e_no,1; + emotion ET_STARE_ABOUT, playerattached(); next; } else { mes "[Innkeeper]"; diff --git a/npc/re/custom/lasagna/lasagna_npcs.txt b/npc/re/custom/lasagna/lasagna_npcs.txt index 46dbfde564..4e53b2bda0 100644 --- a/npc/re/custom/lasagna/lasagna_npcs.txt +++ b/npc/re/custom/lasagna/lasagna_npcs.txt @@ -161,8 +161,8 @@ OnTouch: sleep2 2000; npctalk "You have no idea! DEX comes first if you want your attack to be successful!!", "Applicant MacCarnie#doramt13", bc_self; sleep2 1000; - emotion 36,0,"Applicant Paul#doramt13"; - emotion 54,0,"Applicant MacCarnie#doramt13"; + emotion ET_STARE, getnpcid(0, "Applicant Paul#doramt13"); + emotion ET_OHNO, getnpcid(0, "Applicant MacCarnie#doramt13"); } end; OnInit: @@ -1675,11 +1675,11 @@ OnInit: } lasagna,171,105,5 script Emergency Patient#dorco 4_M_DIEMAN,5,5,{ - emotion 26; + emotion ET_HELP; npctalk "S-someone help me... Dorams, they're so cute I'm going to die...", "", bc_self; end; OnTouch: - emotion 26; + emotion ET_HELP; end; } @@ -1907,7 +1907,7 @@ lasagna,184,234,5 script Youngster meow#dorcon04 4_M_BABYCAT,{ } lasagna,186,231,3 script Youngster meow#dorcon05 4_DR_KID_01,{ - emotion 28; + emotion ET_CRY; npctalk "Why Isn't this rolling- Make it roll-", "", bc_self; end; } @@ -1987,10 +1987,10 @@ lasagna,230,192,3 script Perky Doram#do_hint03 4_CAT_ADV2,{ lasagna,235,193,3 script Customer#dorcon02 4_DR_TORTEL,{ npctalk "Always right-click when it comes to information! Right-click a human, item and cat to know more about them!", "", bc_self; sleep2 1000; - emotion 3; + emotion ET_THROB; npctalk "Ha- ppi- ness-", "", bc_self; sleep2 2000; - emotion 45; + emotion ET_SLEEPY; npctalk "We're full, so there's only one thing to do. Sleep.", "", bc_self; end; } @@ -2052,7 +2052,7 @@ lasagna,236,179,5 script Meow goon#dorcon01 4_DR_M_01,{ mes "Right! They're Aglio and Oligo!"; npctalk "Aglio and Oligo!", "", bc_self; next; - emotion 4,0,"Goon meow#dorcon01"; + emotion ET_SWEAT, getnpcid(0, "Goon meow#dorcon01"); mes "[Goon meow]"; mes "Hey, That's not it... No..."; next; @@ -2083,8 +2083,8 @@ lasagna,235,178,5 script Goon meow#dorcon01 4_DR_M_02,{ mes "[Meow goon]"; mes "Kah... The poltergeist that had been sleeping inside my bag is raging!"; next; - emotion 21; - emotion 21,0,"Meow goon#dorcon01"; + emotion ET_BEST; + emotion ET_BEST, getnpcid(0, "Meow goon#dorcon01"); mes "[Goon meow]"; mes "Good! This should be enough to keep me from getting snubbed in the new world."; npctalk "We're thoroughly prepared all right!", "Meow goon#dorcon01"; @@ -2123,32 +2123,32 @@ lasagna,131,245,5 script The diligent second son 4_CAT_3COLOR,{ mes "[Yota Chara]"; mes "...My parents keep going out into the dangerous areas. I'm still a child to help them, so what I do is to make these amulets for them."; next; - emotion 19; + emotion ET_PROFUSELY_SWEAT; mes "[Yota Chara]"; mes "What if some bad news reach us even if I try hard making these amulets for their safety?"; next; mes "[Yota Chara]"; mes "I get startled each time some mail arrives..."; next; - emotion 28,0,"The skittish fourth#wea"; + emotion ET_CRY, getnpcid(0, "The skittish fourth#wea"); mes "[Dandi Chara]"; mes "Whatever happened to our parents? ~Bursting into crying~"; next; - emotion 21,0,"The brave third#weapon"; + emotion ET_BEST, getnpcid(0, "The brave third#weapon"); mes "[Jogi Chara]"; mes "Well, then. I'll be your dad!!"; next; - emotion 28,0,"The skittish fourth#wea"; - emotion 19; + emotion ET_CRY, getnpcid(0, "The skittish fourth#wea"); + emotion ET_PROFUSELY_SWEAT; mes "[Dandi Chara]"; mes "~Keeps crying uncontrollably~ No way!! Mom!! Dad!!"; next; mes "[Goma Chara]"; - emotion 6,0,"The sensitive-minded ela"; - emotion 19; + emotion ET_FRET, getnpcid(0, "The sensitive-minded ela"); + emotion ET_PROFUSELY_SWEAT; mes "Both will be totally fine and return to us soon. So quit it! Did you really have to make him cry, huh?!"; next; - emotion 9; + emotion ET_THINK; mes "- Yota became disheartened and started making another amulet, quietly. -"; close; } @@ -2232,30 +2232,30 @@ lasagna,131,250,5 script The brave third#weapon 4_DR_M_02,{ mes "What should we do next?"; next; if (select( "Exchange tokens for a weapon.", "About the Family" ) == 2) { - emotion 21; + emotion ET_BEST; mes "[Jogi Chara]"; mes "My sister told me my parents are warriors! They left for a huge adventure!!"; next; - emotion 21; + emotion ET_BEST; mes "[Jogi Chara]"; mes "I'll join the Militia and become great like my parents!"; mes "I'm still too young to join the Militia, but, I'm positive that I can be the ace of the band once I join it because I'm committed to training myself."; next; - emotion 32; + emotion ET_HNG; mes "[Jogi Chara]"; mes "My family members are very lazy. Unless I train them based on my strong belief, they can never become warriors."; mes "Most notoriously, my elder and younger brother can be a real pain in my neck!"; next; - emotion 18; + emotion ET_SMILE; mes "[Jogi Chara]"; mes "Dandi! Today's training is to Get over here!"; next; - emotion 28,0,"The skittish fourth#wea"; + emotion ET_CRY, getnpcid(0, "The skittish fourth#wea"); mes "[Dandi Chara]"; mes "~Bursting into crying~ Goma Chara!!"; close; } - emotion 52; + emotion ET_SPARK; mes "[Jogi Chara]"; mes "Whoa, a new weapon! New power!"; mes "What are you going to give me? Do you have a lot of weapons? Can I search into them? Will you exchange it for Doram Token 25142?"; @@ -2317,7 +2317,7 @@ lasagna,140,250,3 script The skittish fourth#wea 4_DR_F_01,{ mes "- and try again. -"; close; } - emotion 23; + emotion ET_HUK; mes "[Dandi Chara]"; mes "~Shrieks~ Hi...Hiya..."; mes "You really startled me...I thought it was Jogi."; @@ -2327,20 +2327,20 @@ lasagna,140,250,3 script The skittish fourth#wea 4_DR_F_01,{ mes "She gets angry easily but makes new clothes for me, saying I deserve pretty ones."; mes "I like her..."; next; - emotion 28; + emotion ET_CRY; mes "[Dandi Chara]"; mes "My brothers can be pretty mean. So I try my best to obey what Dandi tells me to."; mes "Still, Yota would never show his smiles, while Jogi would bring me hideous stuff like an earthworm, saying I should be tougher. ~Makes a sobbing sound~"; next; - emotion 28; + emotion ET_CRY; mes "[Dandi Chara]"; mes "What's more, Jogi keeps wandering near the forest, saying He's going for the Militia. Mom said it's dangerous..."; next; - emotion 28; + emotion ET_CRY; mes "[Dandi Chara]"; mes "What if a monster takes my brother away? That monster's gotta hurt a lot..."; next; - emotion 0; + emotion ET_SURPRISE; mes "[Dandi Chara]"; mes "Do you happen to have any piece of armor to spare for my brother? Would you give it to me? I'll pay for it..."; close; @@ -2436,15 +2436,15 @@ lasagna,140,245,3 script The sensitive-minded el 4_CAT_SAILOR3,{ mes "[Goma Chara]"; mes "So taking care of these bratty brothers has become my responsibility! I wonder why I was born the eldest! I've almost had it!"; next; - emotion 6; + emotion ET_FRET; mes "[Goma Chara]"; mes "Yota! Tidy up your place after making amulets! Pick up the scales of horse mackerels there. Oh, my days..."; next; - emotion 6; + emotion ET_FRET; mes "[Goma Chara]"; mes "Jogi, Dandi is about to burst into crying. Please behave yourself, will you?"; next; - emotion 7; + emotion ET_ANGER; mes "[Goma Chara]"; mes "~Signs deeply~ My head is spinning!"; mes "I'm sorry but our chit-chat ends here. Time flies when you're busy taking care of little brothers."; @@ -3800,7 +3800,7 @@ lasagna,85,93,5 script Shaman meow#dorcon 4_DR_KID_01,{ mes "[" + strcharinfo(0) + "]"; mes "Uh, that boatswain is the person who had asked for my help."; next; - emotion 23; + emotion ET_HUK; mes "[Shaman meow]"; mes "Indeed, who else would do such an idiotic thing? I can't help him, so please leave."; next; @@ -5328,8 +5328,8 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{ mes "[" + strcharinfo(0) + "]"; mes "Well... The Purser has sent me to take care of the problem."; next; - emotion 0; - emotion 0,0,"Captain Gamberi#dorcon0"; + emotion ET_SURPRISE; + emotion ET_SURPRISE, getnpcid(0, "Captain Gamberi#dorcon0"); mes "[Stello]"; mes "There is."; next; @@ -5343,7 +5343,7 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{ mes "In front of us."; npctalk "Yes, there is.", "", bc_self; next; - emotion 4,1; + emotion ET_SWEAT, playerattached(); mes "[Stello]"; mes "Good. Consider it as the last training before sailing off."; next; @@ -5411,8 +5411,8 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{ next; mes "[Captain Gamberi]"; mes "We were wondering if we had to go down there to recover your dead body..."; - emotion 23; - emotion 23,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); next; mes "[" + strcharinfo(0) + "]"; mes "What? Was it such a dangerous mission?"; @@ -5475,7 +5475,7 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{ next; mes "[Stello]"; mes "Oh! How did you know?"; - emotion 23; + emotion ET_HUK; next; mes "[" + strcharinfo(0) + "]"; mes "I have received a handful. I don't need more."; @@ -5509,7 +5509,7 @@ conch_in,24,62,5 script Stello#dorcon 4_DR_STELO,{ next; mes "[Stello]"; mes "I'll give you some ^0000cdKahlugna Milk^000000 which all Dorams who have ever visited Lasagna crave. Thank you so much for your effort."; - emotion 2; + emotion ET_DELIGHT; next; mes "[Captain Gamberi]"; mes "Well then. It is the time to issue the sailing signal."; @@ -5565,7 +5565,7 @@ conch_in,26,64,5 script Captain Gamberi#dorcon0 4_DR_GAMBERI,{ mes "[Captain Gamberi]"; mes "You need to overcome the inconvenience to have a correct posture. The correct posture is your first step to become a gentleman. Do you get it, Stello?"; next; - emotion 33; + emotion ET_OK; mes "[Captain Gamberi]"; mes "Stello, say it again."; npctalk "Stello?", "", bc_self; @@ -5670,7 +5670,7 @@ conch_in,26,64,5 script Captain Gamberi#dorcon0 4_DR_GAMBERI,{ mes "[Captain Gamberi]"; mes "You need to overcome the inconvenience to have a correct posture. The correct posture is your first step to become a gentleman. Do you get it, Stello?"; next; - emotion 33,0,"Stello#dorcon"; + emotion ET_OK, getnpcid(0, "Stello#dorcon"); mes "[Captain Gamberi]"; mes "Stello, say it again."; npctalk "Stello?", "", bc_self; @@ -5932,7 +5932,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{ mes "[Recorder]"; mes "The dirt and grass on your feet... You are not a neat person... Oh, never mind. I am not writing down your faults... This is enough."; next; - emotion 23; + emotion ET_HUK; mes "[" + strcharinfo(0) + "]"; mes "How do you know such things in detail?"; next; @@ -5942,7 +5942,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{ mes "[Recorder]"; mes "Let's see, you must have met the Captain and the Chief Officer. This place must be your second stop."; next; - emotion 23; + emotion ET_HUK; mes "[" + strcharinfo(0) + "]"; mes "That's right!"; next; @@ -6056,7 +6056,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{ next; mes "[Recorder]"; mes "It is consisted not only of the events which have happened on the ship but also of the history of almost every person who has anything to do with Con-Chliina."; - emotion 4,1; + emotion ET_SWEAT, playerattached(); next; mes "[Recorder]"; mes "The future can be seen through the past."; @@ -6156,7 +6156,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{ next; mes "[When you told the story you heard from Captain Gamberi and about how Stello interrupted, the Recorder started writing it down.]"; next; - emotion 20; + emotion ET_SCRATCH; mes "[Recorder]"; mes "That is strange. I cannot remember all the records, but the story told by Captain Gamberi ^0000cdis different^000000 from the part of the record I do remember."; npctalk "It wasn't supposed to be lengthy like this.", "", bc_self; @@ -6283,7 +6283,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{ mes "[Recorder]"; mes "Dear captain, what are you doing here?"; next; - emotion 23,0,"Captain Gamberi#dorcon0"; + emotion ET_HUK, getnpcid(0, "Captain Gamberi#dorcon0"); mes "[Captain Gamberi]"; mes "You were in place. I am just checking if everyone is in the right place prior to the voyage."; npctalk "Hum! Hum! I thought there was no one around here.", "Captain Gamberi#dorcon0_2", bc_self; @@ -6294,7 +6294,7 @@ conch_in,96,29,5 script Recorder#dorcon 4_CAT_MERMASTER,{ mes "[Captain Gamberi]"; mes "As an experienced crew of Con-Chliina, one must be able to cope with any situation whenever they need to."; next; - emotion 23,1; + emotion ET_HUK, playerattached(); mes "[Recorder]"; mes "I see. ^0000cdIt must be the duty of the captain to tear and burn the document as well^000000, I guess."; npctalk "Did you really think that I wouldn't find out? You have left a long trail od evidence after you.", "", bc_self; @@ -6937,7 +6937,7 @@ conch_in,181,61,5 script Boatswain#dorcon 4_M_BOSSCAT,{ next; mes "[" + strcharinfo(0) + "]"; mes "I knew it!"; - emotion 6,1; + emotion ET_FRET, playerattached(); next; mes "[Boatswain]"; mes "I will reward you handsomely. However, you haven't been able to solve the problem permanently so I don't have to keep the promise I have made."; @@ -7118,9 +7118,9 @@ conch_in,179,64,5 script Cow#dorcon01_bis 4_WHITE_COW,{ mes "[Boatswain]"; mes "So? What! I won her on a bet. Every time I call her name, it reminds me of that moment of victory. It's beautiful."; npctalk "Moo -", "", bc_self; - emotion 14; + emotion ET_BIGTHROB; npctalk "Right?", "Boatswain#dorcon", bc_self; - emotion 3; + emotion ET_THROB; next; mes "[" + strcharinfo(0) + "]"; mes "Anyway, why is there a cow on this ship?"; @@ -7144,7 +7144,7 @@ conch_in,179,64,5 script Cow#dorcon01_bis 4_WHITE_COW,{ } conch_in,189,63,3 script Head Chef#dorcon 4_DR_TORTEL,{ - emotion 45; + emotion ET_SLEEPY; mes "[Head Chef]"; mes "*Snore*"; npctalk "*Snore*", "", bc_self; @@ -7218,8 +7218,8 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{ next; mes "[" + strcharinfo(0) + "]"; mes "I mean, ^0000cdhere comes the newbie!^000000"; - emotion 23,0,"Boatswain#dorcon"; - emotion 23,0,"Helmsman#dorcon"; + emotion ET_HUK, getnpcid(0, "Boatswain#dorcon"); + emotion ET_HUK, getnpcid(0, "Helmsman#dorcon"); next; mes "[Sous Chef]"; mes "What are you doing? Is it a new way to get yourself killed? I am not afraid of challenges. Draw your weapon."; @@ -7313,14 +7313,14 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{ mes "[Sous Chef]"; mes "There are two main functions of cooking."; next; - emotion 0; + emotion ET_SURPRISE; mes "[Sous Chef]"; mes "Firstly, it ^0000cdenhances status^000000."; next; mes "[Sous Chef]"; mes "There are six types of cooking. Each enhances ^0000cdStr, Agi, Vit, Int, Dex or Luk^000000. The amount of status enhancement depends on the level of cooking."; next; - emotion 0; + emotion ET_SURPRISE; mes "[Sous Chef]"; mes "Secondly, it ^0000cdrecovers HP and SP^000000. The amount of recovery also depends on the level of cooking, and some food only recovers HP."; next; @@ -7330,14 +7330,14 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{ mes "[Sous Chef]"; mes "There are two steps for the preparation."; next; - emotion 0; + emotion ET_SURPRISE; mes "[Sous Chef]"; mes "First! You need a ^0000cdCookbook^000000."; next; mes "[Sous Chef]"; mes "You need a Cookbook to learn how to prepare the ingredients and cook. You can get this Cookbook from a ^0000cdquest^000000 or a ^0000cdmonster^000000."; next; - emotion 0; + emotion ET_SURPRISE; mes "[Sous Chef]"; mes "Once you get a Cookbook, you need to collect the ^0000cdingredients^000000. It doesn't help to lick the pages if the Cookbook without preparing the ingredients. Even the eggrings know better than that."; next; @@ -7555,7 +7555,7 @@ conch_in,186,57,3 script Sous Chef#dorcon 4_CAT_CHEF,{ next; mes "[Sous Chef]"; mes "Look over there. The man sleeping on the floor who seems so far from being a gentleman. ^0000cdHe is our Head Chef^000000. The captain has always said how we have to do our best at what we do. But no use."; - emotion 45,0,"Head Chef#dorcon"; + emotion ET_SLEEPY, getnpcid(0, "Head Chef#dorcon"); npctalk "*Snore*","Head Chef#dorcon", bc_self; next; mes "[Sous Chef]"; @@ -7769,7 +7769,7 @@ S_Check: mes "Bring me " + .@string$ + " now!"; close; } - emotion 52; + emotion ET_SPARK; mes "Oh, you have brought them all! Let me cook them for you right away."; next; mes "[Sous Chef]"; @@ -8022,7 +8022,7 @@ lasa_dun01,153,103,3 script Vigilante#dorcon02 4_DR_SOLDIER,{ next; mes "[Vigilante]"; mes "I think the adventurer knows what the problem is already."; - emotion 4; + emotion ET_SWEAT; next; mes "[Machie]"; mes "You don't have to say it like that."; @@ -9584,26 +9584,26 @@ lasagna,195,235,3 script Cute Baby#dorcon 4_F_KR_TIGER,{ mes "Okay, I'm sitting now."; npctalk "Sitting now.", "Daldal#dorcon02", bc_self; next; - emotion 1,0,"Cute Baby#dorcon"; + emotion ET_QUESTION; mes "[Daldal]"; mes "Sitting."; npctalk "Sitting.", "Gopara#dorcon02", bc_self; next; - emotion 1,0,"Cute Baby#dorcon"; + emotion ET_QUESTION; mes "[Gopara]"; mes "Patiently sitting."; npctalk "Patiently -", "Daldal#dorcon02", bc_self; next; - emotion 1,0,"Cute Baby#dorcon"; + emotion ET_QUESTION; mes "[Daldal]"; mes "Sitting."; npctalk "Sitting.", "Daldal#dorcon02", bc_self; next; - emotion 28,0,"Cute Baby#dorcon"; + emotion ET_CRY; mes "[Baby]"; mes "Waa. Waa!"; next; - emotion 4,1; + emotion ET_SWEAT, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "G-guys? didn't you want me to find you a babysitting job?"; next; @@ -9624,7 +9624,7 @@ lasagna,195,235,3 script Cute Baby#dorcon 4_F_KR_TIGER,{ mes "[Daldal]"; mes "That was what babysitting was about? I didn't know. If I did, I wouldn't have done it."; next; - emotion 28,0,"Cute Baby#dorcon"; + emotion ET_CRY; mes "[Baby]"; mes "Waa. Waa."; next; @@ -9842,11 +9842,11 @@ lasagna,139,299,3 script Captain of Anchovy Fish 4_CAT_SAILOR5,{ mes "Captain of Anchovy Fishing Boat"; mes "No need to know about your past. I just need you to do a good job on the ship. Since this is the first time on a boat for both of you, looks like there's a long bumpy road ahead."; next; - emotion 28,0,"Daldal#dorcon04"; + emotion ET_CRY, getnpcid(0, "Daldal#dorcon04"); mes "[Daldal]"; mes "So mean. I shared my painful past and you couldn't care any less."; next; - emotion 33,0,"Gopara#dorcon04"; + emotion ET_OK, getnpcid(0, "Gopara#dorcon04"); mes "[Gopara]"; mes "It's okay. I care."; next; @@ -9860,7 +9860,7 @@ lasagna,139,299,3 script Captain of Anchovy Fish 4_CAT_SAILOR5,{ mes "[Daldal]"; mes "Not really interested."; next; - emotion 7,0,"Gopara#dorcon04"; + emotion ET_ANGER, getnpcid(0, "Gopara#dorcon04"); mes "[Gopara]"; mes "Let's fight!"; next; @@ -10101,10 +10101,10 @@ conch_in,59,29,5 script Engineer#dorcon01 4_CAT_SAILOR5,{ sleep2 2000; npctalk "Hundreds of hamsters are running on treadmills on the bottom of this ship. The ship moves forward because this area is connected to the main part of the engine.", "", bc_self; sleep2 1000; - emotion 23; + emotion ET_HUK; unittalk getcharid(3), "" + strcharinfo(0) + " : Pardon???", bc_self; sleep2 1000; - emotion 4; + emotion ET_SWEAT; npctalk "Oh, wait. You're not taking me seriously, are you? It's a joke, a joke!", "", bc_self; end; } diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index 8e2c5b9416..db8dc8a07c 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -87,6 +87,6 @@ dicastes01,189,191,5 script Traveler Ichack#info 481,2,2,{ } OnTouch: if (ep13_3_invite == 6) - emotion e_gasp,0; + emotion ET_SURPRISE; end; } diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt index 4864be674c..1a37e3a81e 100644 --- a/npc/re/guild/invest_main.txt +++ b/npc/re/guild/invest_main.txt @@ -1329,9 +1329,9 @@ malangdo,218,123,1 script Namis#invest 545,4,4,{ mes "- lose some weight. -"; close; } - emotion e_omg; - emotion e_an; - emotion e_ag; + emotion ET_HUK; + emotion ET_FRET; + emotion ET_ANGER; mes "[Namis]"; mes "Purr-Purr-Purrr-Purrrr-Pur~ Meow!!"; mes "Wh-- What? How rude. You scared me."; @@ -1453,7 +1453,7 @@ L_Check: close; OnTouch: if (rand(2)) - emotion e_yawn; + emotion ET_SLEEPY; else specialeffect EF_SLEEPATTACK; end; diff --git a/npc/re/instances/SaraMemory.txt b/npc/re/instances/SaraMemory.txt index aaf6b34a9a..40f1bfa513 100644 --- a/npc/re/instances/SaraMemory.txt +++ b/npc/re/instances/SaraMemory.txt @@ -1414,8 +1414,8 @@ OnEnable: unittalk $@mobid[0],"For Payon !!"; monster .@map$,161,217,"Payon Soldier",2544,1,instance_npcname("#BossSara01")+"::OnMyMobDead"; unittalk $@mobid[0],"For Payon !!"; - areamobuseskill .@map$,155,225,10,2544,"NPC_EMOTION",1,0,0,e_go,0; - areamobuseskill .@map$,159,236,1,2543,"NPC_EMOTION",1,0,0,e_swt,0; + areamobuseskill .@map$,155,225,10,2544,"NPC_EMOTION",1,0,0,ET_GO,0; + areamobuseskill .@map$,159,236,1,2543,"NPC_EMOTION",1,0,0,ET_SWEAT,0; set 'Sara_Mobs,8; end; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index e3875ca462..12ee8d3cbe 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -24,7 +24,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ if (lhz_boss > 30) { if (!lght_duk01) { if (Sex == SEX_MALE) { - emotion e_pif, "Giacomo Girolamo#kiup2"; + emotion ET_HNG; mes "[Giacomo Girolamo]"; mes "....a guy....?"; next; @@ -32,33 +32,33 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ mes "Ah! Hey! Man!"; next; select("What's up?"); - emotion e_what, 1; + emotion ET_QUESTION, playerattached(); mes "[Giacomo Girolamo]"; mes "Have you ever heard of horrific human experimentation committed in Rekenber Corporation whose head office is here in Lighthalzen?"; next; select("Whaaat?! human experimentation?"); - emotion e_omg, 1; + emotion ET_HUK, playerattached(); mes "[Giacomo Girolamo]"; mes "Yea! human experimentation!!"; mes "There are a lot of rumors that horrible human experimentation is actually performed, but these people in the slum....don't want to believe that due to the welfare movement from Rekenber."; next; - emotion e_swt2, "Giacomo Girolamo#kiup2"; + emotion ET_PROFUSELY_SWEAT; mes "[Giacomo Girolamo]"; mes "Well! and those rich people, seem to know something but they never mention that..."; next; mes "[Giacomo Girolamo]"; mes "Ahh!! And this is a secret that just SOME PEOPLE know. I heard that from Rekenber Lab.,.. a person named...um...Wol...."; next; - emotion e_hmm, "Giacomo Girolamo#kiup2"; + emotion ET_SCRATCH; mes "[Giacomo Girolamo]"; mes "Anyway!! A scientist named Wolf.. something suddenly got sacked. and he must be related with this rumor, I think..."; next; select("You mean... Wolfchev?"); - emotion e_gasp, "Giacomo Girolamo#kiup2"; + emotion ET_SURPRISE; mes "[Giacomo Girolamo]"; mes "Ohhhh?! yeah Wolfchev!! That's right, the name was Wolfchev.. The mad scientist.."; next; - emotion e_ok, "Giacomo Girolamo#kiup2"; + emotion ET_OK; mes "[Giacomo Girolamo]"; mes "I suppose you can then understand the story faster... I am sure that he's involved in the rumor. I swear."; next; @@ -76,16 +76,16 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ mes "["+ strcharinfo(0) +"]"; mes "He happens to research into Human 'Homunculus' without telling that to Rekenber Corp., and there was a whistle-blower who reported to the corp. so he was fired."; next; - emotion e_no1, "Giacomo Girolamo#kiup2"; + emotion ET_BEST; mes "[Giacomo Girolamo]"; mes "Oh! Man..! You seem to know pretty much! By any chance, are you concerned with Rekenber??"; next; - emotion e_dots; + emotion ET_THINK; mes "["+ strcharinfo(0) +"]"; mes "... .... ..."; next; } - emotion e_hmm, "Giacomo Girolamo#kiup2"; + emotion ET_SCRATCH; mes "[Giacomo Girolamo]"; mes "Don't worry. I didn't mean anything."; next; @@ -99,11 +99,11 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ mes "Should investigate the lab where the experiment was carried out."; close; } else { - emotion e_lv, "Giacomo Girolamo#kiup2"; + emotion ET_THROB; mes "[Giacomo Girolamo]"; mes "Oh! What a beautiful lady!!"; next; - emotion e_what, "Giacomo Girolamo#kiup2"; + emotion ET_QUESTION; mes "[Giacomo Girolamo]"; mes "How come a beauty is here, in a place with dangerous rumor?"; next; @@ -129,12 +129,12 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ mes "[Giacomo Girolamo]"; mes "Well, how dare I ask you and be interested in what the lady does..."; next; - emotion e_ok, "Giacomo Girolamo#kiup2"; + emotion ET_OK; mes "[Giacomo Girolamo]"; mes "I just hope that the lady gets out of this town with dangerous rumors.."; next; select("Dangerous rumors?"); - emotion e_what, 1; + emotion ET_QUESTION, playerattached(); mes "[Giacomo Girolamo]"; mes "Ah... Lady may not have heard of the rumor."; next; @@ -145,7 +145,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ mes "and then the rumor came up, since disappearance cases happen pretty often, that Rekenber is committing a horrible human experimentation in their secret lab."; next; select("Excuse me?! human experimentation?"); - emotion e_omg, 1; + emotion ET_HUK, playerattached(); mes "[Giacomo Girolamo]"; mes "Yea! human experimentation!!"; mes "There are a lot of rumors that horrible human experimentation is actually performed, but these people in the slum....don't want to believe that due to the welfare movement from Rekenber."; @@ -167,33 +167,33 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ } else { mes "[Giacomo Girolamo]"; if (Sex == SEX_MALE) { - emotion e_paper, "Giacomo Girolamo#kiup2"; + emotion ET_WRAP; mes "Take care yourself and don't disappear!"; } else { - emotion e_lv2, "Giacomo Girolamo#kiup2"; + emotion ET_BIGTHROB; mes "Be careful, Lady."; } close; } } else { if (Sex == SEX_MALE) { - emotion e_ho, "Giacomo Girolamo#kiup2"; + emotion ET_DELIGHT; mes "[Giacomo Girolamo]"; mes "Only those beautiful ladies are the reason of my life~!"; mes "I, Giacomo Girolamo Casanova de Seingalt am never interested in guys like you though!!"; next; - emotion e_an, "Giacomo Girolamo#kiup2"; + emotion ET_FRET; mes "[Giacomo Girolamo]"; mes "but I can listen to you...you wanna say anything to me?"; next; switch(select("No..?", "About ladies..", "You Womanizer!!", "Envy you...", "What's the rumor lately?")) { case 1: - emotion e_hmm, "Giacomo Girolamo#kiup2"; + emotion ET_SCRATCH; mes "[Giacomo Girolamo]"; mes "Hey you, get out of my way then.."; close; case 2: - emotion e_an, "Giacomo Girolamo#kiup2"; + emotion ET_FRET; mes "[Giacomo Girolamo]"; mes "I don't feel like talking about my precious ladies making fun of them. You do it with your friends."; close; @@ -201,19 +201,19 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ mes "[Giacomo Girolamo]"; mes "Hey.. Excuse me!!! but I'm not a 'Womanizer', I am just a person who adores ladies."; next; - emotion e_ok, "Giacomo Girolamo#kiup2"; + emotion ET_OK; mes "[Giacomo Girolamo]"; mes "Of course..... Yea... If I'm a womanizer, all the men on earth are too! I'm just Casanova. umhahahaha."; close; case 4: - emotion e_what, "Giacomo Girolamo#kiup2"; + emotion ET_QUESTION; mes "[Giacomo Girolamo]"; mes "Haa.. Do you....? not have any woman but your sister and mother around you?"; next; mes "[Giacomo Girolamo]"; mes "... .... ..."; next; - emotion e_swt2, "Giacomo Girolamo#kiup2"; + emotion ET_PROFUSELY_SWEAT; mes "[Giacomo Girolamo]"; mes "Oh...... sorry.. I got your point...."; close; @@ -229,7 +229,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ close; } } else { - emotion e_what, "Giacomo Girolamo#kiup2"; + emotion ET_QUESTION; mes "[Giacomo Girolamo]"; mes "Hey, lady?"; next; @@ -276,7 +276,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ next; break; } - emotion e_lv2, "Giacomo Girolamo#kiup2"; + emotion ET_BIGTHROB; mes "[Giacomo Girolamo]"; mes "Today is the first day we met, but I love you, Lady <3 "; next; @@ -288,7 +288,7 @@ lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{ OnTouch: if (!lght_duk01) - emotion (Sex == SEX_MALE? e_pif : e_lv2), "Giacomo Girolamo#kiup2"; + emotion (Sex == SEX_MALE? ET_HNG : ET_BIGTHROB), "Giacomo Girolamo#kiup2"; end; } @@ -371,11 +371,11 @@ que_lhz,206,74,4 script Researcher#02 4_LGTSCIENCE,3,3,{ OnTouch: if (lght_duk01 == 2) { - emotion e_omg, 1; + emotion ET_HUK, playerattached(); mes "["+ strcharinfo(0) +"]"; mes "You!!!! are Wolfchev?"; next; - emotion e_gg, "Researcher#02"; + emotion ET_KIK; mes "[Wolfchev]"; mes "A Human! kaahaha. People tend to hate this place, why are you here?"; next; @@ -385,7 +385,7 @@ OnTouch: mes "["+ strcharinfo(0) +"]"; mes "And I see that you are still committing that!!!"; next; - emotion e_gg, "Researcher#02"; + emotion ET_KIK; mes "[Wolfchev]"; mes "Kihihihi. I can see that you know something about me. Is that you who accused me?"; mes "How dare you come back to me after you did that. Kihihih"; @@ -399,7 +399,7 @@ OnTouch: erasequest 5109; setquest 5110; lght_duk01 = 3; - emotion e_omg, 1; + emotion ET_HUK, playerattached(); mes "["+ strcharinfo(0) +"]"; mes "Whoa! Wolfchev, stop!"; close2; @@ -414,7 +414,7 @@ que_lhz,94,119,4 script Researcher#03 4_LGTSCIENCE,{ close; } if (lght_duk01 == 3) { - emotion e_swt2, "Researcher#03"; + emotion ET_PROFUSELY_SWEAT; mes "[Wolfchev]"; mes "(Gasping) Pshaw... you are still following me. Hey, why do you keep following me?"; next; @@ -427,7 +427,7 @@ que_lhz,94,119,4 script Researcher#03 4_LGTSCIENCE,{ mes "["+ strcharinfo(0) +"]"; mes "But, your experiment seem really dangerous. How come this is what everybody wants?"; next; - emotion e_gg, "Researcher#03"; + emotion ET_KIK; mes "[Wolfchev]"; mes "Everyone has a desire to be stronger and wants to dominate others so those other people obey and admire you. Do you not have that desire?"; next; @@ -457,7 +457,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{ mes "[Wolfchev]"; mes "You are pretty persistent, aren't you? Or I think.......that you like me, huh? Kihihii."; next; - emotion e_dots; + emotion ET_THINK; mes "["+ strcharinfo(0) +"]"; mes "... .... ..."; next; @@ -469,7 +469,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{ mes "[Wolfchev]"; mes "Again.. it's time to say goodbye."; next; - emotion e_gasp, "Researcher#04"; + emotion ET_SURPRISE; mes "[Wolfchev]"; mes "Well! May be...."; next; @@ -478,7 +478,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{ next; donpcevent "#Eventctrl::OnEnable"; progressbar "FF00FF", 5; - emotion e_omg, "Researcher#04"; + emotion ET_HUK; mes "[Wolfchev]"; mes "Oh my,... What happened?"; next; @@ -501,7 +501,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{ mes "- Hit him to wake him up -"; next; specialeffect EF_DARKBREATH; - emotion e_no; + emotion ET_STARE_ABOUT; mes "["+ strcharinfo(0) +"]"; mes "Hey Dude! Anyway let's get out of here first! Isn't there any place where they cannot reach?"; next; @@ -520,7 +520,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{ mes "Go to '^0000FFWolfchev's Lab^000000' at the 12 o'clock direction..."; close; } else { - emotion e_spin, "Researcher#04"; + emotion ET_CONFUSE; mes "Wolfchev is confused and has no idea now since those monsters are attacking him too."; close; } @@ -688,7 +688,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "[Wolfchev]"; mes "Urr.. I think they will ruin my whole laboratory!"; next; - emotion e_loud, 1; + emotion ET_BLABLA, playerattached(); mes "["+ strcharinfo(0) +"]"; mes "Hey! Wolfchev!!"; next; diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index bf3d05204b..9937039953 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -1054,7 +1054,7 @@ function script F_KO_Survival_dice { } set job_kagero_lp, job_kagero_lp - getarg(1,1); set .@dice, rand(1,6); - emotion 57 + .@dice,1; + emotion ET_OTL + .@dice, playerattached(); mes "The dice came out as " + .@dice + "."; if (getarg(2,0)) return .@dice; @@ -1081,25 +1081,25 @@ function script F_KO_Survival_dice2 { mes "< Used " + getarg(1,2) + " LP >"; next; set @job_ko_dice1, rand(1,6); - emotion 57 + @job_ko_dice1,1; + emotion ET_OTL + @job_ko_dice1, playerattached(); mes "First dice result is " + @job_ko_dice1 + ". Do you want to roll the second dice?"; next; select("Roll the second dice."); set @job_ko_dice2, rand(1,6); - emotion 57 + @job_ko_dice2,1; + emotion ET_OTL + @job_ko_dice2, playerattached(); return; } //Return: 1:win, 0:draw, -1:lose function script F_KO_Survival_rps { setarray .@rps$[1], "Scissors", "Rock", "Paper"; - setarray .@emote[1], e_scissors, e_rock, e_paper; //might be iRO custom(?) + setarray .@emote[1], ET_SCISSOR, ET_ROCK, ET_WRAP; //might be iRO custom(?) mes "Rock! Paper! Scissors!"; next; set .@pc, select("Give scissors.:Give rock.:Give paper."); set .@npc, rand(1,3); - emotion .@emote[.@pc],1; + emotion .@emote[.@pc], playerattached(); emotion .@emote[.@npc]; mes "=Game Results="; mes "Machine: " + .@rps$[.@npc] + "."; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 5bad20bf6b..bfcb32d060 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -193,7 +193,7 @@ umbala,139,227,3 script Priest#arch 60,{ mes "Is that... right?"; mes "Hmm... so..."; mes "Um...ma? Umau...ma?"; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Utan Boy]"; mes "..............."; @@ -1261,7 +1261,7 @@ OnTouch: mes "- Shoooo -"; specialeffect EF_CLOAKING,AREA,"Valkyrie Anguhilde#end"; hideonnpc "Valkyrie Anguhilde#end"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Valkyrie of the heavens]"; mes "Set your mind at ease."; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 405135c203..9570ae84ce 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -2439,7 +2439,7 @@ OnTouch_: mes "May the goddess bless you eternally..."; npcskill "AL_BLESSING",10,0,0; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[A man with black clothes]"; mes "Who... who are you?!"; mes "A... Assassin Guild?!"; diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 3d9b79b954..5328c804f2 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -515,7 +515,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 732,{ mes "[Test Instructor, Teardrop]"; mes "Aha... You've failed the middle!"; mes "You are such a fool."; - emotion e_gg; + emotion ET_KIK; next; mes "[Test Instructor, Teardrop]"; mes "So what are you going to do? Try again?"; @@ -1188,7 +1188,7 @@ job3_rang02,111,56,3 script Staff Rust#jr_09 89,{ close; } next; - emotion e_an; + emotion ET_FRET; mes "[Staff Rust]"; mes "And the mission is.... to deliver these documents to the supervisor, Caution. He won't take what I give..."; setquest 8260; @@ -1305,7 +1305,7 @@ OnTouch_: next; mes "[Test Supervisor, Caution]"; mes "What are those documents?"; - emotion e_no; + emotion ET_STARE_ABOUT; next; select("Mr. Rust asked me to give this to you."); mes "[Test Supervisor, Caution]"; @@ -1316,7 +1316,7 @@ OnTouch_: next; mes "[Test Supervisor, Caution]"; mes "I've never imagined this could be a test..."; - emotion e_sob; + emotion ET_CRY; next; mes "[Test Supervisor, Caution]"; mes "Anyway you've passed the 2nd test very well."; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 83103f3daa..35758570c1 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -659,7 +659,7 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{ mes "[Yoop]"; mes "Yup, Master."; mes "Please follow me."; - emotion e_ic,0,"Assistant#Warlock2"; + emotion ET_AHA, getnpcid(0, "Assistant#Warlock2"); set job_wl,6; changequest 11108,11109; close; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index d7b39b6d53..21a8e63ae2 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -132,7 +132,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "My village is very big, everyone there speaks like this."; break; case 2: - emotion e_lv; + emotion ET_THROB; mes "[Devries]"; mes "Really! That's why I felt some kind of familiar atmosphere around you."; mes "Meeting a hometown person in Schwaltzvalt, it's my pleasure to meet you!"; @@ -141,7 +141,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{ next; mes "- Thump!! -"; next; - emotion e_ag; + emotion ET_ANGER; mes "[Devries]"; mes "Ughhhhh! That woman started again!"; next; @@ -150,7 +150,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "That's the sound of an experiment being carried out by my roommate, Demi Calberine.."; mes "Demi's a fire shell technician so she's always noisy like that."; next; - emotion e_sob; + emotion ET_CRY; mes "[Devries]"; mes "Look at that!"; mes "My spores and plants are all freaked out!"; @@ -226,13 +226,13 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "Ah, The sweet buttery taste remains at the end of my tongue."; mes "This really gives me peace of mind."; next; - emotion e_pif; + emotion ET_HNG; mes "[Devries]"; mes "Demi is studying hard today as well"; mes "Huhuhu. She's really a hard worker."; next; mes "- That cookie changed her mood quick. -"; - emotion e_no1,1; + emotion ET_BEST, playerattached(); next; mes "[Devries]"; mes "You came here with a love for Alchemy?"; @@ -323,7 +323,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{ next; mes "- Boom, Boom, Boom -"; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Devries]"; mes "Ah, please tell me Demi Calberine is not starting again?"; mes "Please let my expectation be wrong ... Please... Demi, please..."; @@ -337,17 +337,17 @@ job3_gen01,25,58,3 script Devries#gen 865,{ next; mes "- Boom!! Boom!! Boom!! Boom!! -"; next; - emotion e_dots; + emotion ET_THINK; mes "[Devries]"; mes "......................."; next; - emotion e_dots; + emotion ET_THINK; mes "[Devries]"; mes "Techniques, plants are relatively easy to..."; next; mes "- Boom!!!!!! -"; next; - emotion e_dots; + emotion ET_THINK; mes "[Devries]"; mes "Crossbreed..."; next; @@ -356,15 +356,15 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "- Boooooooooooooom!!!! -"; mes "- Boom!! Boom!! Boom!! -"; next; - emotion e_dots; + emotion ET_THINK; mes "[Devries]"; mes "......................."; next; - emotion e_dots; + emotion ET_THINK; mes "[Devries]"; mes "Popo."; next; - emotion e_dots; + emotion ET_THINK; mes "[Devries]"; mes "I'll give you the test to become a Geneticist."; next; @@ -881,13 +881,13 @@ job3_gen01,91,48,3 script Demi Calberine#gen 982,{ mes "[Demi Calberine]"; mes "Miss Devries seems to be studying childish experiments downstairs."; mes "I don't understand why those research papers get so popular."; - emotion e_pif; + emotion ET_HNG; next; mes "[Demi Calberine]"; mes "See this mini-mini cannon."; mes "This is the smallest and the lightest cannon in the world."; mes "This is what I made but isn?t this so cute? Yipee~"; - emotion e_awsm; + emotion ET_COOL; next; select("Can I get my cart remodeled?"); mes "[Demi Calberine]"; @@ -1028,7 +1028,7 @@ job3_gen01,24,32,0 script The gaze of Devries 139,2,2,{ OnTouch: if (checkquest(2223,HUNTING) == 2) { mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0 - emotion e_omg,1; + emotion ET_HUK, playerattached(); warp "job3_gen01",21,38; } end; diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index ad6e562148..5d5edc8a93 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -30,7 +30,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{ mes "[Soy]"; mes "Don't make fun of me Mimi~"; mes "I have dreamed of being at Dancer Kim's stage for a very long time!"; - emotion e_shy,0,"Aspiring Wanderer, Soy"; + emotion ET_SHY, getnpcid(0, "Aspiring Wanderer, Soy"); next; mes "[Soy]"; mes "I might lose my senses if I really see her dancing like a beautiful angel sent from above."; @@ -45,7 +45,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{ if (BaseJob != Job_Dancer || BaseLevel < 99) close; next; select("Dancer Kim?:Wanderer?"); - emotion e_omg,0,"Aspiring Wanderer, Soy"; + emotion ET_HUK, getnpcid(0, "Aspiring Wanderer, Soy"); mes "[Soy]"; mes "What? You don't know the famous Wanderer, Dancer Kim?"; mes "Oh my, oh my!!!"; @@ -66,7 +66,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{ mes "If you are a true Dancer, you must be struck with her Dance!"; mes "Will I ever meet a Maestro like Guitar Song someday, Mimi?"; next; - emotion e_heh,0,"Aspiring Wanderer, Soy"; + emotion ET_SMILE, getnpcid(0, "Aspiring Wanderer, Soy"); mes "[Mimi]"; mes "Just hang in there, Soy. Ha ha."; next; @@ -123,7 +123,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{ mes "Oh, what should I do?"; mes "Why did they do this?"; next; - emotion e_shy,0,"Aspiring Wanderer, Soy"; + emotion ET_SHY, getnpcid(0, "Aspiring Wanderer, Soy"); mes "[Performance Manager]"; mes "Hey, you there!"; mes "Please listen to my story."; @@ -148,7 +148,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{ set .@loop,1; break; case 3: - emotion e_ag; + emotion ET_ANGER; mes "[Performance Manager]"; mes "I told you that I'm overwhelmed!"; mes "You don't understand me!"; @@ -166,7 +166,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{ mes "People will throw snowballs!"; mes "Maybe they will even throw a big snowman, no!"; next; - emotion e_wah; + emotion ET_KEK; mes "[Performance Manager]"; mes "People might grab me by the collar!!"; mes "Swing swing, dangling dangling!!"; @@ -238,7 +238,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{ mes "^3131FF" + .@inputstr$ + "^000000"; mes "......"; next; - emotion e_ag; + emotion ET_ANGER; mes "[Performance Manager]"; mes "What the hell are you talking about?"; mes "Are you teasing me because I'm emotionally unstable?"; @@ -253,7 +253,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{ case 1: break; case 2: - emotion e_an; + emotion ET_FRET; mes "[Performance Manager]"; mes "You're asking me why!?"; mes "Ahh, no....."; @@ -323,13 +323,13 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "- What a weird person, I better stay away. -"; close; } - emotion e_omg; + emotion ET_HUK; mes "[Cheerless Maestro]"; mes "What?!"; mes "Are you ignoring my immortal masterpiece ? You are the first person who's ever slapped me in the face."; next; select("I didn't slap you."); - emotion e_gasp; + emotion ET_SURPRISE; mes "[Cheerless Maestro]"; mes "Oh! Lady, looking at your appearance you must be a dancer, right?"; next; @@ -345,7 +345,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "It has an edgy kind of name So I think that it will be a very popular group."; next; select("Are you Guitar Song?"); - emotion e_shy; + emotion ET_SHY; mes "[Guitar Song]"; mes "Huh... I'm a bit disappointed that you finally recognize me now."; mes "Yes, I am the handsome Guitar Song in the famous group ."; @@ -388,7 +388,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "[Guitar Song]"; mes "Wh...what!! What are you doing?!?"; mes "You almost damaged my eardrum."; - emotion e_an; + emotion ET_FRET; next; mes "[" + strcharinfo(0) + "]"; mes "Hey, cheer up!!!"; @@ -432,28 +432,28 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "- You cannot use this skill without learning it. -"; close; } - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "Ah, ah my Guitar Song~"; next; mes "[Guitar Song]"; mes "What? I've got goose bumps."; next; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "I've been watching for years."; next; mes "[Guitar Song]"; mes "I know that we are that popular! Ha ha ha!"; next; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "I've seen other Maestro's performances but there was no one better then Guitar Song."; next; mes "[Guitar Song]"; mes "He he he! Yes, I know I am super great!"; next; - emotion e_no1,1; + emotion ET_BEST, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "Oh... When I hear Guitar Song's performance for the first time I has a crush on you immediately."; next; @@ -468,7 +468,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "So I was looking forward to seeing your performance in Lutie this time."; mes "But after I heard the performance got cancelled, I felt so sad."; next; - emotion e_sob,1; + emotion ET_CRY, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "Now I can't hear Guitar Song's melody~~"; mes "I wanted to dance to your music like a beautiful butterfly."; @@ -477,22 +477,22 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "[Guitar Song]"; mes "Huh huh! No, that is not..."; next; - emotion e_sob,1; + emotion ET_CRY, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "I am really happy to meet you in person, but I hope to see your performance in the beautiful snowy town, Lutie.. Sob sob..."; next; - emotion e_sob,1; + emotion ET_CRY, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "Why in the world don't you show us the performance, Guitar Song?"; mes "Don't you like me? Sob sob.."; next; - emotion e_omg; + emotion ET_HUK; mes "[Guitar Song]"; mes "No, it's not that kind of reason!"; next; mes "[" + strcharinfo(0) + "]"; mes "Then please tell me, I really love your music... but now I feel so blue..."; - emotion e_what; + emotion ET_QUESTION; next; break; } @@ -501,7 +501,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "I want to have a performance, too!"; mes "But I cannot do it all by myself!"; next; - emotion e_ag; + emotion ET_ANGER; mes "[Guitar Song]"; mes "It's all because of Dancer Kim!"; mes "One day, she suddenly got mad and told me that she would quit !"; @@ -513,7 +513,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "[" + strcharinfo(0) + "]"; mes "Why did she get mad so suddenly?"; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Guitar Song]"; mes "I don't know! She must be holding a grudge for something."; mes "That's what she's like."; @@ -527,7 +527,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "I guess she might be back at her hometown."; mes "That's where I met her for the first time."; next; - emotion e_dots; + emotion ET_THINK; mes "[Guitar Song]"; mes "Although she loses her temper easily, her dance is so wonderful...."; mes "I don't know what I am doing wrong."; @@ -545,7 +545,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{ mes "Back in the day when she was addicted to the monster races, who do you think got her out of it?"; close; } else if (job_wan == 8) { - emotion e_gasp; + emotion ET_SURPRISE; mes "- You tell him what happened in Hugel and ask him to go back to Lutie. -"; next; mes "[Guitar Song]"; @@ -577,7 +577,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "Sob... sob..."; next; select("Why are you crying?"); - emotion e_sob; + emotion ET_CRY; mes "[Vacant Looking Lady]"; mes "I gave up my dream..."; mes "*Sob *Sob."; @@ -587,7 +587,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "I said goodbye to my partner who had been working with me for a long time."; next; select("Why did you say goodbye?"); - emotion e_sob; + emotion ET_CRY; mes "[Vacant Looking Lady]"; mes "it's because... sob... sob!"; next; @@ -614,7 +614,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "[Vacant Looking Lady]"; mes "The following morning, I woke up and washed my fave and was looking for something to eat in my room.."; next; - emotion e_omg; + emotion ET_HUK; mes "[Vacant Looking Lady]"; mes "Then Guitar Song suddenly opened the door of my room for some reason and said ^3131FFHey! What the hell are.. you doing here?^000000 and then he threw me out of my room!"; next; @@ -622,14 +622,14 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "We've been together for a long time but how can he do such a thing to me?"; mes "At first, I thought he was kidding around with me! But when he kicked me out of my room..."; next; - emotion e_sob; + emotion ET_CRY; mes "[Vacant Looking Lady]"; mes "Why didn't he recognize my face?"; mes "Do you think he doesn't want to see my face without makeup?"; mes "Boo hoo hoo!"; next; select("So you disbanded the team?"); - emotion e_sob; + emotion ET_CRY; mes "[Vacant Looking Lady]"; mes "Are you also ignoring my wounded self-respect as a woman?"; next; @@ -646,7 +646,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "After that day, I went to my hometown, Hugel and I just stayed indoors."; mes "It was then when Shide comforted me with sweet cakes."; next; - emotion e_shy; + emotion ET_SHY; mes "[Vacant Looking Lady]"; mes "Shide's cake is so wonderful!"; mes "It is the most famous cake in Hugel with soft sponge cake and fresh fruits and sweet chocolate cream!"; @@ -658,7 +658,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "So I ate it every morning and every night."; next; select("Oh, you wouldn't..."); - emotion e_sob; + emotion ET_CRY; mes "[Vacant Looking Lady]"; mes "The angel of happiness took back my sadness and gave me a lot of belly fat!"; mes "Boo hoo hoo hoo!!"; @@ -681,7 +681,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ set job_wan,5; close; } else if (job_wan == 5) { - emotion e_sob; + emotion ET_CRY; mes "[Vacant Looking Lady]"; mes "Not long ago, I was like a beautiful dove, but now I am just a fat chicken."; mes "Sob sob...!"; @@ -715,7 +715,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{ mes "No dreams and no hope..."; close; } - emotion e_omg; + emotion ET_HUK; mes "[Dancer Kim]"; mes "Will you exercise together with me?"; mes "Really?"; @@ -798,7 +798,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ mes "I want to start dancing again."; next; select("How about dancing in Lutie?"); - emotion e_gasp; + emotion ET_SURPRISE; mes "[Dancer Kim]"; mes "Ah! Christmas Village! Yes! Yes!"; mes "My dream to dance in Lutie will finally come true."; @@ -915,20 +915,20 @@ xmas,147,135,5 script Dancer Kim#xmas 485,{ } mes "- is performing. -"; next; - emotion e_ho,0,"Guitar Song#xmas"; - emotion e_ho; + emotion ET_DELIGHT, getnpcid(0, "Guitar Song#xmas"); + emotion ET_DELIGHT; mes "[Guitar Song]"; mes "One! Two! Three!"; mes "Blue fish dancing~"; mes "Fan! Fan! Fan! I am your fan~"; mes "With a strong mind and strong will, I complete fishing~"; next; - emotion e_ho,0,"Spectator#xmas1"; - emotion e_ho,0,"Spectator#xmas2"; - emotion e_ho,0,"Spectator#xmas3"; - emotion e_ho,0,"Spectator#xmas4"; - emotion e_ho,0,"Soy#xmas"; - emotion e_ho,0,"Mimi#xmas"; + emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas1"); + emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas2"); + emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas3"); + emotion ET_DELIGHT, getnpcid(0, "Spectator#xmas4"); + emotion ET_DELIGHT, getnpcid(0, "Soy#xmas"); + emotion ET_DELIGHT, getnpcid(0, "Mimi#xmas"); mes "[Spectators]"; mes "AAAAhhhhhhhhh - - !!!"; mes "So cool! Nollio is the best!!!"; @@ -936,28 +936,28 @@ xmas,147,135,5 script Dancer Kim#xmas 485,{ mes "[Guitar Song]"; mes "Hello, ladies and gentlemen!"; next; - emotion e_lv,0,"Spectator#xmas1"; - emotion e_lv,0,"Spectator#xmas2"; - emotion e_lv,0,"Spectator#xmas3"; - emotion e_lv,0,"Spectator#xmas4"; - emotion e_lv,0,"Soy#xmas"; - emotion e_lv,0,"Mimi#xmas"; + emotion ET_THROB, getnpcid(0, "Spectator#xmas1"); + emotion ET_THROB, getnpcid(0, "Spectator#xmas2"); + emotion ET_THROB, getnpcid(0, "Spectator#xmas3"); + emotion ET_THROB, getnpcid(0, "Spectator#xmas4"); + emotion ET_THROB, getnpcid(0, "Soy#xmas"); + emotion ET_THROB, getnpcid(0, "Mimi#xmas"); mes "[Spectators]"; mes "Hello!!!!!"; next; mes "[Guitar Song]"; mes "We are the romantic Wanderer team who stroll along the world following love and wind!"; next; - emotion e_lv,0,"Spectator#xmas1"; - emotion e_lv,0,"Spectator#xmas2"; - emotion e_lv,0,"Spectator#xmas3"; - emotion e_lv,0,"Spectator#xmas4"; - emotion e_lv,0,"Soy#xmas"; - emotion e_lv,0,"Mimi#xmas"; + emotion ET_THROB, getnpcid(0, "Spectator#xmas1"); + emotion ET_THROB, getnpcid(0, "Spectator#xmas2"); + emotion ET_THROB, getnpcid(0, "Spectator#xmas3"); + emotion ET_THROB, getnpcid(0, "Spectator#xmas4"); + emotion ET_THROB, getnpcid(0, "Soy#xmas"); + emotion ET_THROB, getnpcid(0, "Mimi#xmas"); mes "[Spectators]"; mes "Wowwwww~!"; next; - emotion e_no1; + emotion ET_BEST; mes "[Dancer Kim]"; mes "It's so fascinating that I can dance in a snowy, beautiful village,"; mes "I'm so glad that I came here, Lutie."; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index e5cc99c6dc..e4fefec285 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -32,13 +32,13 @@ OnTimer9000: end; OnTimer18000: mapannounce strnpcinfo(4), "[Tip] You can leave through the bluish warp gate.", bc_map,0xFF0000; - emotion 0,0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" ); + emotion ET_SURPRISE, getnpcid(0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" )); end; OnTimer21000: - emotion 0,0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" ); + emotion ET_SURPRISE, getnpcid(0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" )); end; OnTimer24000: - emotion 0,0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" ); + emotion ET_SURPRISE, getnpcid(0, "#room_out" + replacestr( strnpcinfo(4), "iz_int", "" )); end; OnTimer27000: mapannounce strnpcinfo(4), "[Tip] Leave this area to continue.", bc_map,0xFF0000; @@ -800,9 +800,9 @@ OnInit: OnTouch: if (Class == Job_Novice && BaseLevel < 15 && !isbegin_quest(4269)) - emotion e_gasp; + emotion ET_SURPRISE; else - emotion e_heh; + emotion ET_SMILE; end; } @@ -967,7 +967,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "[the Academy building]iz_ac01,100,39."; mes "Anybody can enroll, so take advantage of it."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2)); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dffif you need location info, please ask me.^000000"; @@ -989,7 +989,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "If there are more adventurers like you, the future will be brighter."; mes "Hahahaha."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2)); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dffif you need location info, please ask me.^000000"; @@ -1008,7 +1008,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "[the academy building]iz_ac01,100,39."; mes "What is well, is well- isn't it?"; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2)); mes "[Information Staff]"; mes "You are correct."; mes "Preperation is the key."; @@ -1043,7 +1043,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "[the Academy building]iz_ac01,100,39."; mes "Anybody can enroll, so take advantage of it."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2)); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dffif you need location info, please ask me.^000000"; @@ -1065,7 +1065,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "If there are more adventurers like you, the future will be brighter."; mes "Hahahaha."; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2)); mes "[Information Staff]"; mes "Sorry to interrupt."; mes "But ^4d4dffif you need location info, please ask me.^000000"; @@ -1084,7 +1084,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{ mes "[the academy building]iz_ac01,100,39."; mes "What is well, is well- isn't it?"; next; - emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Information Staff#"+strnpcinfo(2)); mes "[Information Staff]"; mes "You are correct."; mes "Preperation is the key."; @@ -1121,9 +1121,9 @@ OnInit: OnTouch: if (!isbegin_quest(4269)) - emotion e_gasp; + emotion ET_SURPRISE; else - emotion e_heh; + emotion ET_SMILE; end; } @@ -1781,7 +1781,7 @@ OnInit: OnTouch: if (isbegin_quest(7474) == 1 && !isbegin_quest(7475)) - emotion e_gasp; + emotion ET_SURPRISE; end; } @@ -1924,7 +1924,7 @@ OnInit: OnTouch: if (isbegin_quest(7474) == 1 && !isbegin_quest(7476)) - emotion e_gasp; + emotion ET_SURPRISE; end; } @@ -2067,7 +2067,7 @@ OnInit: OnTouch: if (isbegin_quest(7474) == 1 && !isbegin_quest(7477)) - emotion e_gasp; + emotion ET_SURPRISE; end; } @@ -2293,8 +2293,8 @@ izlude,141,251,0 script Cultivated Red Plant#0 1078,3,3,{ OnTouch: if (isbegin_quest(7478) == 1 && !isbegin_quest(7479)) { specialeffect EF_STEAL; - emotion e_heh, 0, "Academy Student#"+strnpcinfo(2); - emotion e_gasp, 1; + emotion ET_SMILE, getnpcid(0, "Academy Student#"+strnpcinfo(2)); + emotion ET_SURPRISE, playerattached(); donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable"; } end; @@ -2326,8 +2326,8 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{ if (isbegin_quest(7478) == 1 && !isbegin_quest(7479)) { specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(2); donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable"; - emotion e_gasp, 1; - emotion e_heh; + emotion ET_SURPRISE, playerattached(); + emotion ET_SMILE; mes "[Lumin]"; mes "Hey there Turtle"; mes "You are really slow."; @@ -2461,12 +2461,12 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{ mes "Yawn. Who are you making so much noise next to me..."; next; select("You aren't dead?"); - emotion e_omg, 1; + emotion ET_HUK, playerattached(); mes "[Instructor Argos]"; mes "Dead?! Who....?"; mes "me? Pu ha ha ha!!"; next; - emotion e_heh; + emotion ET_SMILE; mes "[Instructor Argos]"; mes "Sorry for laughing. Ha ha ha!"; mes "I was just taking a nap because the weather is good."; @@ -2501,7 +2501,7 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{ mes "[Instructor Argos]"; mes "You made a right decision!"; mes "I want to teach you for good."; - emotion e_no1; + emotion ET_BEST; next; mes "[Instructor Argos]"; mes "A novice does not know the potential power of himself nor how strong the enemy is."; @@ -2523,7 +2523,7 @@ izlude,140,260,3 script Instructor Argos#iz 4_M_LIEMAN,{ mes "[Instructor Argos]"; mes "I was faced with the risk of death, because I was not good at pretending to be dead."; mes "Even when I look back at that time. it is still thrilling..."; - emotion e_wah; + emotion ET_KEK; next; mes "[Instructor Argos]"; mes "let's continue to talk"; @@ -2892,7 +2892,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "[Mainz]"; mes "Imagine that you are in that status and monsters are rushing to you..."; mes "Believe me it'll happen."; - emotion e_wah; + emotion ET_KEK; next; mes "[Mainz]"; mes "This time, I will teach you about <^FF0000Sleep^000000>."; @@ -2924,7 +2924,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ next; mes "[Mainz]"; mes "Sleep is good for recovery but not necessarily good while you're in the middle of a battle."; - emotion e_flash; + emotion ET_SPARK; next; mes "[Mainz]"; mes "Lastly, I will teach you about <^FF0000 Silence ^000000>."; @@ -2979,7 +2979,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "[Mainz]"; mes "Hey, you there!"; mes "By any chance, are you a training beginner?"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Mainz]"; mes "I'm Trainer Mainz; and I'm in charge of education at this Academy."; @@ -3019,13 +3019,13 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "[Mainz]"; mes "Should I just take it for myself then?"; close2; - emotion e_sigh; + emotion ET_OHNO; end; } mes "[Mainz]"; mes "Yes... You made a right decision."; mes "Please keep in mind that I really wanted to have it but since you look exhausted I offered it to you first!"; - emotion e_no1; + emotion ET_BEST; next; mes "- You open the lunchbox and there is some type of food inside -"; next; @@ -3044,7 +3044,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "[Mainz]"; mes "Oh... what happened to you?"; mes "You don't look too good!"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Mainz]"; mes "Oh, man..."; @@ -3068,7 +3068,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ next; mes "- You roll your eyes at Mainz -"; mes "- Mainz turns his head as if he doesn't notice -"; - emotion e_bzz; + emotion ET_STARE; next; mes "[Mainz]"; mes "Ehem! Anyway, I am sorry."; @@ -3086,7 +3086,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ next; mes "[Mainz]"; mes "Understand that I didn't intend to pass my wife's lunchbox as if it was a present. It was just another lesson from the Criatura Academy."; - emotion e_otl; + emotion ET_OTL; next; mes "[Mainz]"; mes "As an apology, I would like to inform you of several abnormal statuses you might experience in the Rune Midgard Continent."; @@ -3095,7 +3095,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "Don't decline it! Being ready to learn so speak to me again."; setquest 15000; close2; - emotion e_sry; + emotion ET_SORRY; end; } else { mes "[Mainz]"; @@ -3170,7 +3170,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "[Mainz]"; mes "Imagine that you are in that status and monsters are rushing to you..."; mes "Believe me it'll happen."; - emotion e_wah; + emotion ET_KEK; next; mes "[Mainz]"; mes "What else are you anxious about?"; @@ -3207,7 +3207,7 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ next; mes "[Mainz]"; mes "Sleep is good for recovery but not necessarily good while you're in the middle of a battle."; - emotion e_flash; + emotion ET_SPARK; next; mes "[Mainz]"; mes "What else are you anxious about?"; @@ -3258,14 +3258,14 @@ iz_ac01,134,47,5 script Trainer Mainz#ac 4_M_KY_KNT,4,4,{ mes "Haaaaa..."; mes "What should I do with this lunchbox?"; close2; - emotion e_sigh; + emotion ET_OHNO; end; } } } OnTouch_: - emotion e_otl; + emotion ET_OTL; end; } @@ -3903,19 +3903,19 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "["+strcharinfo(0)+"]"; mes ""+strcharinfo(0)+", hello."; next; - emotion e_no1; + emotion ET_BEST; mes "[Dacquoise]"; mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000."; next; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; mes "And we are also club members of Sir Orleans' ^0000cdfan club- Loverleans^000000."; next; - emotion e_lv,"Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "Orlean belongs to all of us!"; next; - emotion e_sob; + emotion ET_CRY; mes "[Dacquoise]"; mes "Ah, what do all the fools of the land eat?"; next; @@ -3934,7 +3934,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Eclaire]"; mes "You, do you want to know more about cooking?"; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "Will you exeprience the various spectrums of cooking?"; next; @@ -3949,15 +3949,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "Don't forget to pound your chest if you choke on sweet potato!"; close; } - emotion e_no1; + emotion ET_BEST; mes "[Dacquoise]"; mes "Ok, we will be kind guides to the journey of cooking!!"; next; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; mes "It's ok with me, asking me everthing you want to know."; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "Kindness is our spice~"; next; @@ -3966,7 +3966,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "Aha! You want to know about the benefits of cooking? Cooked meals have two benefits!"; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Dacquoise]"; mes "First, ^0000cdincreased stats!^000000 Baaam!!"; next; @@ -3976,7 +3976,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Mille Feuille]"; mes "The amount of the stat increase changes depending on the level of cooking."; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Dacquoise]"; mes "And the next benefit? Babam!"; next; @@ -4011,24 +4011,24 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "Preparation can also be split into two stages."; next; - emotion e_gasp; + emotion ET_SURPRISE; break; case 2: mes "[Dacquoise]"; mes "Right, cooking needs some preparation. This can also be divided into two catagories."; next; - emotion e_gasp,"Dacquoise#"+strnpcinfo(2); + emotion ET_SURPRISE, getnpcid(0, "Dacquoise#"+strnpcinfo(2)); break; case 3: - emotion e_an; + emotion ET_FRET; mes "[Dacquoise]"; mes "What is this? What a waste of time!"; next; - emotion e_ag, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_ANGER, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; mes "I thought we were going to get more members!"; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "Never show up again!!"; close; @@ -4051,7 +4051,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Mille Feuille]"; mes "Cookbook can be earned ^0000cdthrough Quest^000000s or can be found by hunting ^0000cdmonster^000000s."; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Dacquoise]"; mes "After getting the Cookbook, next preperation is!"; mes "The ^0000cdingredients!^000000."; @@ -4073,7 +4073,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "That's the spirit! Let's cook for real!"; mes "Get prepared and come back!"; - emotion e_no1; + emotion ET_BEST; } else { mes "[Eclaire]"; mes "We are not responsible even if it fails!"; @@ -4089,15 +4089,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "I used my valuable time to introduce the cooking world to you."; mes "Then you just give up?"; - emotion e_an; + emotion ET_FRET; next; mes "[Eclaire]"; mes "You have insulted us!"; - emotion e_ag, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_ANGER, getnpcid(0, "Eclaire#"+strnpcinfo(2)); next; mes "[Mille Feuille]"; mes "Come back again, if you want to learn later~ I guess..."; - emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THINK, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); close2; if (isbegin_quest(14154) == 1) erasequest 14154; @@ -4116,16 +4116,16 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "You brough what I need! Okay, then I will cook for you as I promised."; mes "Time to move like greased lightning!!!!"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Eclaire]"; mes "Go hunting after eating this. You will feel your power enhanced."; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); next; mes "[Mille Feuille]"; mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!!"; mes "Kya... Sir Orleans!!"; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); close2; delitem 705,1;// Clover delitem 511,1;// Green_Herb @@ -4138,15 +4138,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "You brough what I need! Okay, then I will cook for you as I promised."; mes "Time to move like greased lightning!!!!"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Eclaire]"; mes "Try this. It will make you run like you are a flying bee."; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); next; mes "[Mille Feuille]"; mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!"; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); close2; delitem 512,1;// Apple delitem 515,2;// Carrot @@ -4158,15 +4158,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "You brough what I need! Okay, then I will cook for you as I promised."; mes "Time to move like greased lightning!!!!"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Eclaire]"; mes "Can you feel unknown power coursing through your veins? You're eating it!"; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); next; mes "[Mille Feuille]"; mes "If you are really curious about the cooking, go seek Sir. Charles Orleans at the basement of Prontera Castle."; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); close2; delitem 909,1;// Jellopy delitem 914,1;// Fluff @@ -4179,17 +4179,17 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Dacquoise]"; mes "You brough what I need! Okay, then I will cook for you as I promised."; mes "Time to move like greased lightning!!!!"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Eclaire]"; mes "If you eat this. You will never miss your target!"; mes "In fact, never miss the target for level 1!"; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); next; mes "[Mille Feuille]"; mes "Go and see Sir. Charles Orleans at the basement of Prontera castle!!"; mes "You can learn real cooking from him!"; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); close2; delitem 512,1;// Apple delitem 705,1;// Clover @@ -4221,34 +4221,34 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ mes "[Mille Feuille]"; mes "The cooking we are about to show you requires a recipe and cooking equipment but it is difficult for novices so I will cook for you."; next; - emotion e_bzz; + emotion ET_STARE; mes "[Dacquoise]"; mes "Why are you saying you will make them?"; next; - emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_SCRATCH, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "Ah, Why not?"; next; mes "[Dacquoise]"; mes "I am the leader of this flame cooking trio chefs!"; next; - emotion e_omg, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_HUK, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; mes "What?!! When was that decided?"; next; - emotion e_no; + emotion ET_STARE_ABOUT; mes "[Dacquoise]"; mes "Is there anyone who is older than me?"; next; - emotion e_omg, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_HUK, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; mes "Age! There is nothing I can do with it."; next; - emotion e_ok,"Mille Feuille#"+strnpcinfo(2); + emotion ET_OK, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "Just because you're one year older, you want to automatically be rejected. Anyone have an objection?"; next; - emotion e_an; + emotion ET_FRET; mes "[Dacquoise]"; mes "Quiet!"; next; @@ -4367,15 +4367,15 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{ end; } } else { - emotion e_no1; + emotion ET_BEST; mes "[Dacquoise]"; mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000."; next; - emotion e_no1, 0, "Eclaire#"+strnpcinfo(2); + emotion ET_BEST, getnpcid(0, "Eclaire#"+strnpcinfo(2)); mes "[Eclaire]"; mes "Steaks not only increase stats but also recover both your HP and SP."; next; - emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Mille Feuille#"+strnpcinfo(2)); mes "[Mille Feuille]"; mes "If you really want to cook, go and see^0000cd Sir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!"; close; @@ -5132,29 +5132,29 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ next; mes "[Ghostring]"; mes "Oi you lot! Tell me wot I want to hear!"; - emotion e_gasp, 0, "Ghostring#cupet"; + emotion ET_SURPRISE, getnpcid(0, "Ghostring#cupet"); next; mes "[Unskilled Poring]"; mes "Ghostring's the strongest in the world!"; - emotion e_paper, 0, "Cowardly Poring#pet_1"; - emotion e_paper, 0, "Unskilled Poring#pet_2"; - emotion e_paper, 0, "Foolish Poring#pet_3"; + emotion ET_WRAP, getnpcid(0, "Cowardly Poring#pet_1"); + emotion ET_WRAP, getnpcid(0, "Unskilled Poring#pet_2"); + emotion ET_WRAP, getnpcid(0, "Foolish Poring#pet_3"); next; mes "[Ghostring]"; mes "What kind of monster I am?"; - emotion e_gasp, 0, "Ghostring#cupet"; + emotion ET_SURPRISE, getnpcid(0, "Ghostring#cupet"); next; mes "[Unskilled Poring]"; mes "Ghostring's da Boss!"; - emotion e_paper, 0, "Cowardly Poring#pet_1"; - emotion e_paper, 0, "Unskilled Poring#pet_2"; - emotion e_paper, 0, "Foolish Poring#pet_3"; + emotion ET_WRAP, getnpcid(0, "Cowardly Poring#pet_1"); + emotion ET_WRAP, getnpcid(0, "Unskilled Poring#pet_2"); + emotion ET_WRAP, getnpcid(0, "Foolish Poring#pet_3"); next; mes "[Ghostring]"; mes "Bwa ha ha ha~"; - emotion e_heh, 0, "Ghostring#cupet"; + emotion ET_SMILE, getnpcid(0, "Ghostring#cupet"); next; - emotion e_sob, 0, "Friendly Poring#ac"; + emotion ET_CRY; mes "[Poring]"; mes "Bleedin' shame..."; mes "Little Porings takin' up with a git like that and not bein' cute anymore."; @@ -5176,14 +5176,14 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ mes "[Unskilled Poring]"; mes "Wot's Dat? Onna them Poring's talkin' to a huumie."; mes "Shall we beat him up?"; - emotion e_paper, 0, "Cowardly Poring#pet_1"; - emotion e_paper, 0, "Unskilled Poring#pet_2"; - emotion e_paper, 0, "Foolish Poring#pet_3"; + emotion ET_WRAP, getnpcid(0, "Cowardly Poring#pet_1"); + emotion ET_WRAP, getnpcid(0, "Unskilled Poring#pet_2"); + emotion ET_WRAP, getnpcid(0, "Foolish Poring#pet_3"); next; mes "[Poring]"; mes "Blimey!"; mes "Help me! Save me!"; - emotion e_omg, 0, "Friendly Poring#ac"; + emotion ET_HUK; next; select("What can I do to help?"); mes "[Poring]"; @@ -5228,7 +5228,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ mes "["+strcharinfo(0)+"]"; mes "I used the unripe apples that you gave me, then they turned into eggs."; next; - emotion e_sob, 0, "Friendly Poring#ac"; + emotion ET_CRY; mes "[Poring]"; mes "Oh, guess I didn't expect they'd be turned into pets so easily!"; next; @@ -5631,7 +5631,7 @@ izlude,102,150,5 script Wedding Secretary#iz 1_F_LIBRARYGIRL,{ next; break; case 4: - emotion e_omg; + emotion ET_HUK; mes "[Wedding Secretary]"; mes "Your mother didn't teach you right?"; mes "Mercy on you. You are ignorant of the beauty of love!!!"; @@ -5660,14 +5660,14 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{ mes "[Dad]"; mes "Nope~~"; next; - emotion e_an; + emotion ET_FRET; mes "[Mom]"; mes "He's out again? Never stays in the house!! Shall I use it?"; next; mes "[Dad]"; mes "Leave him alone~ He may be playing somewhere."; next; - emotion e_an; + emotion ET_FRET; mes "[Mom]"; mes "You spoil him too much!"; next; @@ -5682,7 +5682,7 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{ mes "[Mom]"; mes "Here!"; next; - emotion e_ag, 0, "Etinifni#"+strnpcinfo(2); + emotion ET_ANGER, getnpcid(0, "Etinifni#"+strnpcinfo(2)); mes "[Etinifni]"; mes "Ah... Again!! I have been out hunting Orcs."; next; @@ -5695,12 +5695,12 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{ mes "[Mom]"; mes "What? This moron?!"; next; - emotion e_sigh, 0, "Etinifni#"+strnpcinfo(2); + emotion ET_OHNO, getnpcid(0, "Etinifni#"+strnpcinfo(2)); mes "[Etinifni]"; mes "OK. I will do it."; next; disablenpc "Etinifni#"+strnpcinfo(2); - emotion e_sob, 0, "Dad#"+strnpcinfo(2); + emotion ET_CRY, getnpcid(0, "Dad#"+strnpcinfo(2)); mes "[Dad]"; mes "I am sorry... Dad has no power over your mom."; close; @@ -5753,23 +5753,23 @@ izlude_d,97,144,1 duplicate(Etinifni#iz) Etinifni#iz_d 4_M_DEWBOY // - Romantic Male // ----------------------------------------------------------------------------- izlude,99,138,3 script Romantic Male#iz 4_M_SITDOWN,{ - emotion e_ho; + emotion ET_DELIGHT; mes "[Romantic Male]"; mes "Let's go~~ together hand in hand~~ Put everything aside ~~ in the dark blue night of Jawaii~~ under the stars~~"; next; mes "[Romantic Male]"; mes "We are leaving for Jawaii-the place of our honeymoon to celebrate our 10th wedding anniversary!"; next; - emotion e_lv; + emotion ET_THROB; mes "[Romantic Male]"; mes "Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?"; next; specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2); - emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2); + emotion ET_CHUP, getnpcid(0, "Romantic Female#"+strnpcinfo(2)); mes "[Romantic Male]"; mes "Honey~~ I love you!! Sweetheart~"; next; - emotion e_kis2; + emotion ET_CHUPCHUP; mes "[Romantic Male]"; mes "No!! I love you more than you do!!"; close; @@ -5786,7 +5786,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes "[Romantic Female]"; mes "Shout like this when I miss you, honey!!"; next; - emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Romantic Female#"+strnpcinfo(2)); mes "[Romantic Female]"; mes "^0000cd[I miss you.]^000000"; next; @@ -5800,7 +5800,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes "You are tired of sitting, aren't you?"; next; specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2); - emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2); + emotion ET_CHUP, getnpcid(0, "Romantic Female#"+strnpcinfo(2)); mes "[Romantic Female]"; mes "My sweetheart!!! I love you!!!"; next; @@ -5808,11 +5808,11 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{ mes "Yes, thank you for sharing your SP! You are also tired, aren't you?"; next; specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(2); - emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(2); + emotion ET_CHUPCHUP, getnpcid(0, "Romantic Male#"+strnpcinfo(2)); mes "[Romantic Male]"; mes "My sweetheart!! I love you!!!"; next; - emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2); + emotion ET_THROB, getnpcid(0, "Romantic Female#"+strnpcinfo(2)); mes "[Romantic Female]"; mes "Kia~ You are Coolest!!!"; close; @@ -5839,10 +5839,10 @@ izlude,93,143,3 script Manufacturing Maniac#0 -1,{ OnTimer30000: if (rand(1,2) == 1) { - emotion e_no1; + emotion ET_BEST; specialeffect EF_PHARMACY_OK; } else { - emotion e_omg; + emotion ET_HUK; specialeffect EF_PHARMACY_FAIL; } end; @@ -6287,7 +6287,7 @@ iz_ac01,138,69,3 script Lady#ac 1_F_ORIENT_02,{ next; mes "[Lady]"; mes "You have a pretty name... Anonymous... I am attacted by your work."; - emotion e_lv; + emotion ET_THROB; close; } @@ -6312,7 +6312,7 @@ iz_ac01_d,149,46,3 duplicate(Eclaire#ac) Eclaire#ac_d 4_F_KAFRA7 // - Mille Feuille // ----------------------------------------------------------------------------- iz_ac01,150,50,3 script Mille Feuille#ac 4_F_KAFRA8,{ - emotion e_lv; + emotion ET_THROB; mes "[Mille Feuille]"; mes "Ahh. Hey is Sir. Orleons doing well?"; close; @@ -6351,7 +6351,7 @@ iz_ac01,159,32,3 script Hungry Trainee#ac 4_M_SIT_NOVICE,{ mes "Wonder when my order will get taken... it's already been an hour..."; mes "Look at the helpers lingering on the side..."; next; - emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(2); + emotion ET_FRET, getnpcid(0, "Scholarship Trainee#"+strnpcinfo(2)); mes "[Scholarship Trainee]"; mes "Ugh... this guy..."; mes "I already told you eight hundred times! It's buffet style! Ah!"; @@ -6360,7 +6360,7 @@ iz_ac01,159,32,3 script Hungry Trainee#ac 4_M_SIT_NOVICE,{ mes "Buffet? What's that? Can you eat it?"; mes "You look down on me because I'm from the country, don't you?"; next; - emotion e_ag; + emotion ET_ANGER; mes "[Hungry Trainee]"; mes "Don't tell me it's not difficult to understand! Explain it to me!"; close; @@ -6626,7 +6626,7 @@ pay_fild08,153,83,1 script Lady Harvesting Herbs#2 1_F_ORIENT_02,{ next; mes "[Lady]"; mes "Payon is the wonderful city. There you can be transferred to an Archer or to a Taekwon. And a nice Dungeon there. If you have time, please make a visit."; - emotion e_heh; + emotion ET_SMILE; close; } @@ -6743,12 +6743,12 @@ iz_ac02_d,107,180,3 duplicate(ac_board) [Principal's Office]#ad 2_BULLETIN_BOARD iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ cutin "choucream_n.bmp", 2; if (Class == Job_Novice) { - emotion e_what; + emotion ET_QUESTION; mes "[Cream Puff]"; mes "You are a novice? right?"; next; } else { - emotion e_sigh; + emotion ET_OHNO; mes "[Cream Puff]"; mes "Class aptitude test is nonsense for those who already have a job."; close2; @@ -6760,7 +6760,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ next; if (select("No... how did you know?", "I decided.") == 2) { cutin "choucream_d.bmp",2; - emotion e_sigh; + emotion ET_OHNO; mes "[Cream Puff]"; mes "Have you already decided? Ok then."; next; @@ -6771,7 +6771,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ end; } cutin "choucream_e.bmp",2; - emotion e_flash; + emotion ET_SPARK; mes "[Cream Puff]"; mes "Oh, that is good."; mes "What is the ^0000FFClass aptitude test^000000."; @@ -6787,7 +6787,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ mes "[Cream Puff]"; mes "It has 3 types of test and each one give 30 minutes to finish."; next; - emotion e_what; + emotion ET_QUESTION; mes "[Cream Puff]"; mes "If you have free time and have not decided your job... how about taking this test?"; next; @@ -6796,7 +6796,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ break; case 3: cutin "choucream_d.bmp",2; - emotion e_pif; + emotion ET_HNG; mes "[Cream Puff]"; mes "All right. Good bye."; close2; @@ -7244,7 +7244,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ end; } next; - emotion e_no1; + emotion ET_BEST; mes "[Cream Puff]"; mes "^8014EB"+.@job_name$+"^000000 is a good matching job for you."; next; @@ -7255,7 +7255,7 @@ iz_ac02,143,55,3 script Cream Puff#ac 4_M_KID1,{ mes "[Cream Puff]"; mes "You do not have to choose the job from Class aptitude test. That is only just for fun."; next; - emotion e_what; + emotion ET_QUESTION; mes "[Cream Puff]"; mes "If you want, I will send it to the class that was recommended by the aptitude result."; next; @@ -7336,7 +7336,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{ if (isequippedcnt(.@manuals[.@i]) || countitem(.@manuals[.@i])) .@has_manual = 1; } - emotion e_awsm; + emotion ET_COOL; mes "[Lusa]"; mes "Gosh Darnit! You are cuter then a piglet! Are ya trying ta learn to be a ^ff0000Gunslinger^000000?"; next; @@ -7347,7 +7347,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{ } switch(select(.@menu$)) { case 1: - emotion e_lv; + emotion ET_THROB; mes "[Lusa]"; mes "You're so cute! A ^ff0000Gunslinger^000000 who has true grit wield his weapons bringing justice in these wild times."; next; @@ -7442,7 +7442,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{ end; case 3: if (Upper == 2) { - emotion e_slur; + emotion ET_SEXY; mes "[Lusa]"; mes "Oh, sorry! Children cannot become Gunslingers!"; next; @@ -7591,7 +7591,7 @@ iz_ac02,142,85,6 script Lusa#ac 4_F_GUNSLINGER,{ cutin "", 255; end; } else if (nov_3_guns == 7) { - emotion e_ok; + emotion ET_OK; mes "[Lusa]"; mes "Ah you're back, and now wearing lovely Gunslinger clothing! It suits you well, congratulations!"; next; @@ -8394,7 +8394,7 @@ iz_ac02_d,162,86,4 duplicate(Guild Staff#ac) Guild Staff#ac_d 4W_M_02 iz_ac02,70,85,5 script Arang#ac 4_F_TAEKWON,{ mes "[Arang]"; mes "Hi, Good morning!"; - emotion e_ho; + emotion ET_DELIGHT; cutin "arang03.bmp", 0; next; if (Class == Job_Novice) { @@ -8509,19 +8509,19 @@ iz_ac02,70,85,5 script Arang#ac 4_F_TAEKWON,{ mes "[Arang]"; mes "Is that so!? You are!? Yaho! Now I am a teacher! Now, ask me whatever!"; nov_3_taekwon = 1; - emotion e_heh; + emotion ET_SMILE; close2; cutin "", 255; end; } mes "[Arang]"; mes "Hahaha.. You are interested in me?"; - emotion e_an; + emotion ET_FRET; cutin "arang03.bmp", 0; next; mes "Suddenly, you see Arang's foot flying towards you."; specialeffect2 EF_TRIPLEATTACK; - emotion e_wah, 1; + emotion ET_KEK, playerattached(); next; cutin "", 255; mes "All you see are stars..."; @@ -12252,7 +12252,7 @@ iz_ac02,156,169,5 script Acolyte Leader Alice#2 4_F_ACOLYTE,{ mes "[Alice Yisha]"; mes "Ask ^ff0000if you want to experience skills of an Acolyte, ask the sister next to you^000000."; mes "Now I am reading an introductory skill."; - emotion e_omg, 0, "A Nun#"+strnpcinfo(2); + emotion ET_HUK, getnpcid(0, "A Nun#"+strnpcinfo(2)); close2; cutin "", 255; end; @@ -12633,7 +12633,7 @@ izlude,153,126,1 script Refinery Owner Han#iz 4_M_02,{ mes "Are you interested in ^3E86C3refining^000000 to make your items strong?"; next; if (select("I have no interest.", "refining? Is it edible?") == 1) { - emotion e_sry; + emotion ET_SORRY; mes "[Refinery Owner Han]"; mes "Ah, I am sorry. I caught a busy man."; close; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 11f9919ce6..8cee1e6163 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -2273,7 +2273,7 @@ S_Warp: end; OnTouch: - emotion e_gasp; + emotion ET_SURPRISE; end; } new_1-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv1 729,5,5 diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index e2e5782554..348cd9628c 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -79,17 +79,17 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "Why are you disrupting my fishing?"; next; select("I have a delivery from Esseray..."); - emotion e_hmm; + emotion ET_SCRATCH; mes "[Fishing Novice]"; mes "What? Esseray? Esseray?"; mes "Hmm! I know him..."; mes "Esseray... Esseray... hmm."; next; - emotion e_dots,1; - emotion e_dots; + emotion ET_THINK, playerattached(); + emotion ET_THINK; mes ".................."; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Fishing Novice]"; mes "Ahhhh --- !! ----- Ahhhh ---!!"; mes "Got it! --- Got it!"; @@ -108,8 +108,8 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "What?! He isn't?"; mes "Then where is Esseray from?"; next; - emotion e_dots,1; - emotion e_dots; + emotion ET_THINK, playerattached(); + emotion ET_THINK; mes ".... .... .... ...."; next; mes "[Fishing Novice]"; @@ -123,13 +123,13 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ next; mes "- You explain why you're here. -"; next; - emotion e_hmm; + emotion ET_SCRATCH; mes "[Fishing Novice]"; mes "Hmm... it is an easy and hard question at the same time."; next; mes "- You hear a voice complaining about something. -"; next; - emotion e_an; + emotion ET_FRET; mes "[Fishing Novice]"; mes "Esseray! Such a son of a %@&$# spoiling my vacation..."; next; @@ -138,7 +138,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "My poor life~"; mes "Ahhh~ so many problems."; next; - emotion e_what; + emotion ET_QUESTION; mes "[Fishing Novice]"; mes "Too ~ hard. Hey, little kid!"; mes "What's your name?"; @@ -216,7 +216,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "You don't know how to be stronger. Right?"; next; select("Yes, I can't get stronger."); - emotion e_hmm; + emotion ET_SCRATCH; mes "[Nodor]"; mes "Hhhmmm ~!"; mes "There's a way to do it..."; @@ -237,7 +237,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "I will give you a tip."; mes "You can't always be right."; mes "Sometimes you need to check your ego and listen to others."; - emotion e_an; + emotion ET_FRET; close; } mes "[Nodor]"; @@ -274,7 +274,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "["+strcharinfo(0)+"]"; mes "Hey, Nodor!"; next; - emotion e_omg; + emotion ET_HUK; mes "[Nodor]"; mes "Oh my god!"; mes "So frightened... let me see?"; @@ -307,7 +307,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ close; } changequest 5094+.@i,5098; - emotion e_heh; + emotion ET_SMILE; mes "[Nodor]"; mes "keheheheheheh~"; next; @@ -332,7 +332,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "you need to learn patience."; close; } - emotion e_gg; + emotion ET_KIK; mes "[Nodor]"; mes "Hhhhhhhhhh~"; next; @@ -440,17 +440,17 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "[Nodor]"; mes "Eh-hem! I was not just killing time after I sent you!!"; next; - emotion e_omg; + emotion ET_HUK; mes "[Nodor]"; mes "What the? --- ah? --- !!"; next; select("??????"); - emotion e_swt; + emotion ET_SWEAT; mes "[Nodor]"; mes "Watch out!! A bunch of Golems are running after us!"; mes "We... have to run...!!!"; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); if(select("What?!:Um?") == 2) { mes "- You look around, and -"; mes "- there is nothing behind you. -"; @@ -480,14 +480,14 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ callfunc "F_ClearJobVar"; // -- Clears all job variables for the current player jobchange roclass(eaclass()|EAJL_THIRD); set EXSUPNOV_Q,5; - emotion e_heh; + emotion ET_SMILE; mes "[Nodor]"; mes "Puhahahahahahahahahahah!!"; mes "Good! You scared yet?"; next; select("... ... ..."); - emotion e_dots,1; - emotion e_sry; + emotion ET_THINK, playerattached(); + emotion ET_SORRY; mes "[Nodor]"; mes "Sorry for scaring you!"; mes "I think our duty and mission as Novices is to make days joyful."; @@ -498,11 +498,11 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ mes "Or more powerful?"; next; select("...? ...? ...?"); - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[Nodor]"; mes "Oh--- My--- (tut,tut,tut)!!"; next; - emotion e_hmm; + emotion ET_SCRATCH; mes "[Nodor]"; mes "Mr. Sieu Ngu --"; mes "Not to be mean, but"; diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt index f89d76cd94..574ca76030 100644 --- a/npc/re/merchants/advanced_refiner.txt +++ b/npc/re/merchants/advanced_refiner.txt @@ -153,7 +153,7 @@ malangdo,221,174,6 script Holink#mal_cash 559,{ mes "[Holink]"; mes "Me~ Me~ Meow! Fun fun refining~"; next; - emotion e_kis; + emotion ET_CHUP; mes "[Holink]"; mes "Perfect!! Perfect, meow!!"; mes "I am the disciple of the refining wizard Aragam~"; @@ -166,11 +166,11 @@ malangdo,221,174,6 script Holink#mal_cash 559,{ mes "Meo~ Meow~ Kyaaak!!"; next; switch(rand(1,5)) { - case 1: emotion e_sob; break; - case 2: emotion e_swt2; break; - case 3: emotion e_wah; break; - case 4: emotion e_hmm; break; - case 5: emotion e_lv2; break; + case 1: emotion ET_CRY; break; + case 2: emotion ET_PROFUSELY_SWEAT; break; + case 3: emotion ET_KEK; break; + case 4: emotion ET_SCRATCH; break; + case 5: emotion ET_BIGTHROB; break; } mes "[Holink]"; mes "Meow!! Aaaaakk~~!!!!"; diff --git a/npc/re/merchants/bio4_reward.txt b/npc/re/merchants/bio4_reward.txt index ceef2d88a1..325fe3fbbe 100644 --- a/npc/re/merchants/bio4_reward.txt +++ b/npc/re/merchants/bio4_reward.txt @@ -370,7 +370,7 @@ L_Reward: mes "Okay.."; close; } - emotion e_swt2, "Weird old man#Bio4Reward"; + emotion ET_PROFUSELY_SWEAT; progressbar "FF00FF", 2; delitem 6469, .@amount[0]; //Will_Of_Warrior delitem 6470, .@amount[1]; //Blood_Thirst @@ -396,7 +396,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ next; switch(select("Umba umba humbaa", "What are you doing here?", "Which are the equipments found so far?", "Here you are, Sir.")) { case 1: - emotion e_an; + emotion ET_FRET; mes "[Pudding]"; mes "Hey, excuse me, but I'm not from Umbala! You are so rude."; close; @@ -405,11 +405,11 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ mes "As you can see, I'm a training Sorcerer, and my name is Pudding."; next; select("....?"); - emotion e_an; + emotion ET_FRET; mes "[Pudding]"; mes "... What's that face? I'm starting to feel unpleasant.."; next; - emotion e_ok; + emotion ET_OK; mes "[Pudding]"; mes "Couple of days ago, while I was undergoing discipline, I felt a strange, bizzare tinge. So I followed that and it brought me here."; next; @@ -423,20 +423,20 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ mes "[Pudding]"; mes "From those monsters, I could find rare items like '^F2766EWill of Warrior^000000' '^952420Thirst for Blood^000000' '^88C6F7Chill of the Dead^000000' which you cannot find from any other place."; next; - emotion e_what, "Sorcerer#Bio4Reward"; + emotion ET_QUESTION; mes "[Pudding]"; mes "And after many hours of research on my own, I finally figured out a way to use those items. Do you wanna know?"; next; switch(select("Oh....pardon?!", "Of course, I really wanna know.")) { case 1: - emotion e_omg, 1; - emotion e_an, "Sorcerer#Bio4Reward"; + emotion ET_HUK, playerattached(); + emotion ET_FRET; mes "[Pudding]"; mes "Oh my! You fell asleep after you asked me something? Well, anyway I feel lazy to explain again so I will just continue."; next; break; case 2: - emotion e_heh, "Sorcerer#Bio4Reward"; + emotion ET_SMILE; mes "[Pudding]"; mes "Good, I am content that you are listening to my story carefully. Then I will keep explaining."; next; @@ -463,8 +463,8 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ mes "Since those materials can only be found from the monsters in the Lab., the special power also can be dwelt into certain equipments which can be obtained from the Lab."; next; select("So what's the conclusion?"); - emotion e_what, 1; - emotion e_an; + emotion ET_QUESTION, playerattached(); + emotion ET_FRET; mes "[Pudding]"; mes "Gee.. I told you not to cut while I talk, didn't I? Well, I will answer that becuase that's important."; next; @@ -536,7 +536,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ } close; case 4: - emotion e_flash; + emotion ET_SPARK; mes "[Pudding]"; mes "Ohhhhh Have you brought them?"; next; @@ -664,12 +664,12 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ specialeffect2 EF_SPHERE; progressbar "ffff00", 2; specialeffect2 EF_SUI_EXPLOSION; - emotion e_sob; + emotion ET_CRY; mes "[Pudding]"; mes "Hm.... This equipment cannot accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'."; close; } - emotion e_ho; + emotion ET_DELIGHT; mes "[Pudding]"; mes "OHHH.. This equipment could accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'."; next; @@ -969,14 +969,14 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ if (.@enchant == 0){ specialeffect2 EF_SUI_EXPLOSION; - emotion e_otl; + emotion ET_OTL; mes "[Pudding]"; mes "...Well....the equipment could not accept the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" and it got destroyed."; close; } else { specialeffect2 EF_FIREHIT; getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3]; - emotion e_ho; + emotion ET_DELIGHT; mes "[Pudding]"; mes "Fortunately the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" has been dwelt well in your equipment..."; close; diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index 838b1f04e8..a3736d4d3d 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -150,7 +150,7 @@ specialeffect EF_CURSEATTACK; specialeffect2 EF_SUI_EXPLOSION; next; - emotion (!rand(5))?e_ag:e_omg; + emotion (!rand(5))?ET_ANGER:ET_HUK; mes "[Blacksmith Dister]"; mes "Oh my goodness!!!!"; next; diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index 2a36632997..879549addc 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -60,7 +60,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 704,{ mes "The trade has been stopped!"; mes "I don't know what to do next..."; mes "What should I do?"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; } else if (.@input < 1 || .@input > 50) { mes "It should be less than 50 pieces."; @@ -88,7 +88,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 704,{ mes "explain again? I don't know"; mes "what to do next..."; mes "What should I do?"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; case 3: mes "[Catalog Magician]"; diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index 5ecbe8ff4f..73bc123a32 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -953,13 +953,13 @@ ecl_in01,64,97,5 script Slot Expert Nattuer#ecl 436,{ delitem 6081,5; //Splendide_Coin .@luckyday = rand(1,100); if (.@luckyday % 20){ - emotion e_dots; + emotion ET_THINK; delitem .@choice,1; mes "Shoot, I'm sorry. It failed."; mes "But I'm sure it will work next time. I have a feeling."; close; } - emotion e_no1; + emotion ET_BEST; delitem .@choice,1; getitem (.@choice+6),1; mes "My eyes feel like they're gonna pop out."; @@ -1038,13 +1038,13 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "You have too many items to continue."; close; } - emotion e_lv; + emotion ET_THROB; mes "[Paltu]"; mes "Woohoo- Greetings. What are you looking for? Lots of goods here."; next; switch (select("No thanks.:Replication?:I know you got lots up your sleeve!")) { case 1: - emotion e_an; + emotion ET_FRET; mes "[Paltu]"; mes "Really? Hmm?"; close; @@ -1056,20 +1056,20 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "I'll give you a good price whatever it is. Just trust me."; next; select("Could you do something for me?"); - emotion e_no1; + emotion ET_BEST; mes "[Paltu]"; mes "Hey, I like your attitude."; next; mes "[Paltu]"; mes "Ah- you know the hat you're wearing?"; next; - emotion e_what; + emotion ET_QUESTION; mes "[Paltu]"; mes "Don't you have any of those hats lying around in storage that are solid but too ugly to wear? You do, right?"; next; select("........."); - emotion e_dots,1; - emotion e_heh; + emotion ET_THINK, playerattached(); + emotion ET_SMILE; mes "[Paltu]"; mes "See! I knew it. I knew it from the first minute."; next; @@ -1085,7 +1085,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "I need 1 ^0571B0hat to replicate^000000 and"; mes "I need ^E1281E 4 Crystal Mirrors^000000 for magic resistance, ^E1281E 1 Fairy Magic Powder^000000 as the catalyst, and ^E1281E Emerald, Ruby, Sapphire, Topaz, and Zircon, 10 of each^000000, to be used for amplifying the magic power."; next; - emotion e_no; + emotion ET_STARE_ABOUT; mes "[Paltu]"; mes "There's quite a lot of ingredients, right? Well, I can't do anything about that. Dealing with magic power is not a joke."; next; @@ -1102,7 +1102,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "What do you think? I'll make it happen as long as I have the ingredients and the compensation."; next; if (select("I'll do it later.:Show me what you got!") == 1) { - emotion e_dots; + emotion ET_THINK; mes "[Paltu]"; mes "What? Are you kidding me? Please tell me you are!"; close; @@ -1110,7 +1110,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ break; } disable_items; - emotion e_lv2; + emotion ET_BIGTHROB; mes "[Paltu]"; mes "Oh wow."; mes "You made the right call. I thought I was going to starve to death because the Laphines have no interest in pretty hats."; @@ -1136,7 +1136,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "Is ^0571B0"+getitemname(.@items[.@i])+"^000000 what you wanted?"; next; if (.@item_check == 0 || countitem(.@items[.@i]) == 0) { - emotion e_sob; + emotion ET_CRY; mes "[Paltu]"; mes "Ay... Credit purchases are difficult for me."; next; @@ -1148,17 +1148,17 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "I'm in a tight spot myself. Please consider my situation also."; close; } - emotion e_what; + emotion ET_QUESTION; mes "[Paltu]"; mes "Yes, this is more than enough. Should I make it now?"; next; if (select("Please make it now.:Oops, I have to take care of something...") == 2) { - emotion e_omg; + emotion ET_HUK; mes "[Paltu]"; mes "Hey.. Hey! Hey! Where you going?"; close; } - emotion e_omg; + emotion ET_HUK; mes "[Paltu]"; mes "I got it. Oh right! Almost forgot again."; next; @@ -1176,17 +1176,17 @@ ecl_in01,67,39,4 script Replication Expert Paltu 445,{ mes "Yeah, please make sure!"; close; } - emotion e_gg; + emotion ET_KIK; mes "[Paltu]"; mes "Woohoo- Got it."; mes "It's finally time for me to use my skills again."; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Paltu]"; mes "Do this thing here, and do that thing there, and then do this thing here again..."; next; - emotion e_dots; - emotion e_swt2; + emotion ET_THINK; + emotion ET_PROFUSELY_SWEAT; mes "[Paltu]"; mes "... .. ..."; specialeffect EF_BEGINSPELL; diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index d182ab2093..1478980379 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -36,7 +36,7 @@ mes "You can give the diamond as a gift to your lover."; mes "The receiver of the ^FF82FF'17 Carat Diamond'^000000 will cherish it"; mes "and treasure you in their heart."; - emotion e_loud; + emotion ET_BLABLA; next; mes .@npc$; @@ -63,7 +63,7 @@ mes "is one of the highest quality 17 carat diamonds."; mes "Comparing it to any pea-sized, colorless rock you may have"; mes "dug up from Morroc is unspeakable!"; - emotion e_omg; + emotion ET_HUK; next; mes .@npc$; @@ -143,7 +143,7 @@ mes "Calculating the price and service fee.."; mes "501,000,000 zeny."; mes "Amount has been confirmed."; - emotion e_loud; + emotion ET_BLABLA; set Zeny, Zeny - 501000000; getitem 6024, 1; next; @@ -152,7 +152,7 @@ mes "You may exchange the diamond back for zeny at any time."; mes "However, there will be a 1,000,000z service fee."; mes "Thank you for your business."; - emotion e_thx; + emotion ET_THANKS; close; } else { @@ -161,7 +161,7 @@ mes "I'm sorry, but you don't have sufficient funds."; mes "Including the service fee, a total of 501,000,000z is required."; mes "Please check your zeny balance and try again."; - emotion e_hmm; + emotion ET_SCRATCH; close; } } @@ -175,13 +175,13 @@ case 2: mes .@npc$; mes "AAH. You would like to exchange your ^FF82FF'17 Carat Diamond'^000000 for zeny?"; - emotion e_gasp; + emotion ET_SURPRISE; next; if (select("Yes:No") == 2) { mes .@npc$; mes "Then, what is it you desire?.."; mes ". . . . . ...."; - emotion e_dots; + emotion ET_THINK; close; } @@ -222,7 +222,7 @@ mes "Thank you for your business."; mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,"; mes "come back anytime with 500 million zeny."; - emotion e_thx; + emotion ET_THANKS; delitem 6024, 1; set Zeny, Zeny + 499000000; close; diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 01b3a36612..80db547757 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -1172,7 +1172,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{ close; } disable_items; - emotion e_ho; + emotion ET_DELIGHT; mes "Those Mora Artifacts look so perfect!"; mes "But I know you want them to be even better!"; next; @@ -1183,7 +1183,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{ case 1: break; case 2: - emotion e_ok; + emotion ET_OK; mes "[Artifact Collector]"; mes "You seem like a pretty good judge of character."; next; @@ -1191,35 +1191,35 @@ mora,124,82,4 script Artifact Collector#blan 522,{ mes "For over 200 years I've been working with Artifacts here in Mora. Toiling to get the perfect +9!"; next; select("Gulp... +9?!"); - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "[Artifact Collector]"; mes "My business is collecting the old relics and refining them to their essence!"; next; - emotion e_sob; + emotion ET_CRY; mes "[Artifact Collector]"; mes "Finding the perfect Artifact for me to experiment on is my life's work."; mes "Plus seeing the wonder of our ancestor's legacy is also gratifying."; next; select("I can see how that could be fun."); - emotion e_pat; + emotion ET_GOODBOY; mes "[Artifact Collector]"; mes "Thank you human."; next; mes "[Artifact Collector]"; mes "I've been doing this for over 200 years, and honestly the readily available supply is gone, and Artificer and Artifact Crafter won't trade me anymore..."; next; - emotion e_dots; + emotion ET_THINK; mes "[Artifact Collector]"; mes "But maybe the Humans that are starting to visit can bring in some new stock!"; next; select("Humans... Stock?"); - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[Artifact Collector]"; mes "Yes! If the humans can bring me new artifacts I can work on my ultimate achievement!"; next; select("Ultimate Achievement?"); - emotion e_what,1; - emotion e_ok; + emotion ET_QUESTION, playerattached(); + emotion ET_OK; mes "[Artifact Collector]"; mes "Patience, we'll get to that..."; next; @@ -1230,24 +1230,24 @@ mora,124,82,4 script Artifact Collector#blan 522,{ mes "[Artifact Collector]"; mes "You might just be the human to help me complete my plan."; next; - emotion e_otl; + emotion ET_OTL; mes "[Artifact Collector]"; mes "Oh how I love how fate works sometimes..."; next; mes "[Artifact Collector]"; mes "+1, +2, +3, +4, +5, +6 those refinements are not strong enough to work on my craft."; next; - emotion e_otl,0; + emotion ET_OTL; mes "[Artifact Collector]"; mes "But +7! +7 is rare and just barely strong enough to work in my crafting attempts."; next; select("I'm gonna be abused again..."); - emotion e_hmm,1; + emotion ET_SCRATCH, playerattached(); mes "[Artifact Collector]"; mes "Right you are! I know it is natural for you Humans to help a friend, even without the friend asking..."; next; select("I'm not sure if..."); - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[Artifact Collector]"; mes "Of course I'll accept your help! Find me..."; next; @@ -1259,7 +1259,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{ mes "- Mace of Judgement -"; next; select("Anything else?"); - emotion e_what,1; + emotion ET_QUESTION, playerattached(); mes "[Artifact Collector]"; mes "Well aside from the +7, there are very specific enchantments that need to be on the artifact that help catalyze the process."; next; @@ -1267,15 +1267,15 @@ mora,124,82,4 script Artifact Collector#blan 522,{ mes "If either the +7 or the specific enchantment is missing I can't do it."; next; select("So the Refining will be preserved?"); - emotion e_omg,1; - emotion e_an; + emotion ET_HUK, playerattached(); + emotion ET_FRET; mes "[Artifact Collector]"; mes "No, but what you'll get back is so much better!"; next; mes "[Artifact Collector]"; mes "By now you are wondering more about the artifacts I'm looking for?"; next; - emotion e_what; + emotion ET_QUESTION; mes "[Artifact Collector]"; mes "Go ahead and ask!"; next; @@ -1284,7 +1284,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{ while(1) { set .@i, select("I don't think I'm interested:Staff of Mercy:Mace of Judgement:Golden Rod Staff:Aqua Staff:Crimson Staff:Forest Staff")-2; if (.@i == -1) { - emotion e_what; + emotion ET_QUESTION; mes "[Artifact Collector]"; mes "Ok, well maybe someday you will be."; close; @@ -1320,12 +1320,12 @@ mora,124,82,4 script Artifact Collector#blan 522,{ mes "Have yourself a great day. Bye~"; close; } - emotion e_flash; + emotion ET_SPARK; mes "[Artifact Collector]"; mes "Let me take a look at what you have brought me."; next; if (!getequipisequiped(EQI_HAND_R)) { - emotion e_an; + emotion ET_FRET; mes "[Artifact Collector]"; mes "I don't know what you are trying to do... I can't enhance what you don't have."; close; @@ -1354,29 +1354,29 @@ mora,124,82,4 script Artifact Collector#blan 522,{ set .@empowered,16018; //Mace_Of_Judgement2 break; default: - emotion e_an; + emotion ET_FRET; mes "[Artifact Collector]"; mes "The weapon you have isn't one of the Artifacts I can work with."; close; } if (getequiprefinerycnt(EQI_HAND_R) < 7) { - emotion e_an; + emotion ET_FRET; mes "[Artifact Collector]"; mes "I must insist that the refine level of the Artifact be at least +7!"; close; } if (!.@empowered) { - emotion e_an; + emotion ET_FRET; mes "[Artifact Collector]"; mes "These attributes just won't do for my research process, try re-randoming them."; close; } - emotion e_slur; + emotion ET_SEXY; mes "[Artifact Collector]"; mes "I'm tingling with excitement!"; mes "You've brought me everything I need!!"; next; - emotion e_ok; + emotion ET_OK; mes "[Artifact Collector]"; mes "If you are ready I am about to show you what I can do with your +"+getequiprefinerycnt(EQI_HAND_R)+" Artifact!"; next; @@ -1385,7 +1385,7 @@ mora,124,82,4 script Artifact Collector#blan 522,{ next; switch(select("NOOO!:Yes, I'm ready!:What will it be after?")) { case 1: - emotion e_an; + emotion ET_FRET; mes "[Artifact Collector]"; mes "You've got to be kidding... you got my hopes up..."; close; @@ -1397,14 +1397,14 @@ mora,124,82,4 script Artifact Collector#blan 522,{ mes "Surely you want to go on?"; next; if(select("No, I don't.:Yes, do it!") == 1) { - emotion e_an; + emotion ET_FRET; mes "[Artifact Collector]"; mes "You've got to be kidding... you got my hopes up..."; close; } break; } - emotion e_heh; + emotion ET_SMILE; delequip EQI_HAND_R; getitem .@empowered,1; mes "[Artifact Collector]"; diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index 64aa698566..533bba6d36 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -110,7 +110,7 @@ if (getequippercentrefinery(.@part, true) > rand(100)) { successrefitem .@part; next; - emotion e_no1; + emotion ET_BEST; mes "[Blacksmith Mighty Hammer]"; mes "The sound refreshes my mind everytime I hear it."; mes "Here, have it. Refine succeeded flawlessly!"; @@ -118,7 +118,7 @@ } downrefitem .@part; next; - emotion e_omg; + emotion ET_HUK; mes "[Blacksmith Mighty Hammer]"; mes "Oops!!"; next; @@ -257,7 +257,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826 if (getequippercentrefinery(.@part, true) > rand(100)) { successrefitem .@part; next; - emotion e_no1; + emotion ET_BEST; mes "[Basta]"; mes "Great! Nicely done!!"; mes "I really am the best blacksmith in the whole wide world!"; @@ -265,7 +265,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826 } downrefitem .@part; next; - emotion (!rand(5))?e_cash:e_omg; + emotion (!rand(5))?ET_MONEY:ET_HUK; mes "[Basta]"; mes "Aaaaaaaaaaak!!!"; next; diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 5491ef3731..81d8a34e09 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -77,7 +77,7 @@ function script refinenew { mes "You're not wearing"; mes "anything there that"; mes "I can refine."; - emotion e_an; + emotion ET_FRET; close; } if (!getequipisenableref(.@part)) { @@ -158,7 +158,7 @@ function script refinenew { 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!"; @@ -169,7 +169,7 @@ function script refinenew { mes "Clang! Clang! Clang! Clang!"; successrefitem .@part; next; - emotion e_no1; + emotion ET_BEST; mes "["+ .@npc_name$ +"]"; mes "Good! Succes!!!"; mes "I am the best Armsmith."; @@ -180,7 +180,7 @@ function script refinenew { mes "Clang! Clang! Clang! Clang!"; downrefitem .@part,3; // Failed refine attempts decrease the item's refine level by 3 next; - emotion (!rand(5))?e_cash:e_omg; + emotion (!rand(5))?ET_MONEY:ET_HUK; mes "["+ .@npc_name$ +"]"; mes "Ahhh!!!"; next; @@ -192,7 +192,7 @@ function script refinenew { mes "Clang! Clang! Clang!"; failedrefitem .@part; next; - emotion (!rand(5))?e_cash:e_omg; + emotion (!rand(5))?ET_MONEY:ET_HUK; mes "["+ .@npc_name$ +"]"; mes "Hmmm!"; next; @@ -289,7 +289,7 @@ function script refinenew { mes "Clang! Clang! Clang! Clang!"; downrefitem .@part,3; // Failed refine attempts decrease the item's refine level by 3 next; - emotion (!rand(5))?e_cash:e_omg; + emotion (!rand(5))?ET_MONEY:ET_HUK; mes "["+ .@npc_name$ +"]"; mes "Ahhh!!!"; next; @@ -301,7 +301,7 @@ function script refinenew { mes "Clang! Clang! Clang!"; failedrefitem .@part; next; - emotion (!rand(5))?e_cash:e_omg; + emotion (!rand(5))?ET_MONEY:ET_HUK; mes "["+ .@npc_name$ +"]"; mes "Hmmm!"; next; @@ -317,7 +317,7 @@ function script refinenew { close; } } - emotion e_no1; + emotion ET_BEST; mes "["+ .@npc_name$ +"]"; mes "Good! Succes!!!"; mes "I am the best Blacksmith."; @@ -508,11 +508,11 @@ malangdo,224,172,6 script Clink#mal_normal 544,{ mes "Cry Hammer!! Cry!!!"; next; switch(rand(1,5)) { - case 1: emotion e_sob; break; - case 2: emotion e_swt2; break; - case 3: emotion e_wah; break; - case 4: emotion e_hmm; break; - case 5: emotion e_lv2; break; + case 1: emotion ET_CRY; break; + case 2: emotion ET_PROFUSELY_SWEAT; break; + case 3: emotion ET_KEK; break; + case 4: emotion ET_SCRATCH; break; + case 5: emotion ET_BIGTHROB; break; } mes "[Clink]"; mes "Huh?! I failed?!"; @@ -530,7 +530,7 @@ malangdo,224,172,6 script Clink#mal_normal 544,{ mes "[Clink]"; mes "Cry Hammer!! Cry!!!"; next; - emotion e_kis; + emotion ET_CHUP; mes "[Clink]"; mes "Ok!! Perfect!!"; mes "There's nothing I can't refine"; diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt index 73ea943f7c..1e173135d4 100644 --- a/npc/re/merchants/ticket_refiner.txt +++ b/npc/re/merchants/ticket_refiner.txt @@ -44,7 +44,7 @@ prontera,184,177,6 script Refine Master 851,{ close; } } - emotion e_gasp; + emotion ET_SURPRISE; mes "[Refine Master]"; mes "Greetings!"; mes "I can refine an item up to the ^006400same level as your ticket^000000."; @@ -70,7 +70,7 @@ prontera,184,177,6 script Refine Master 851,{ close; } if (!getequipisenableref(.@part)) { - emotion e_otl; + emotion ET_OTL; mes "[Refine Master]"; mes "Oh, I'm sorry."; mes "This item is impossible to refine."; @@ -95,7 +95,7 @@ prontera,184,177,6 script Refine Master 851,{ break; } if (!.@check) { - emotion e_dots; + emotion ET_THINK; mes "[Refine Master]"; mes "If you want to refine this ^006400"+.@type$+"^000000, please come along with ^006400"+.@type$+" Refine Ticket^000000."; mes "See you later!"; @@ -111,7 +111,7 @@ prontera,184,177,6 script Refine Master 851,{ set .@ticket_lv, .@levels[.@select]; set .@ticket_id, .@tickets[.@select]; if (countitem(.@ticket_id) == 0) { - emotion e_what; + emotion ET_QUESTION; mes "[Refine Master]"; mes getitemname(.@ticket_id)+" is not in your inventory. Did you put it in your storage?"; mes "Please check again."; @@ -119,7 +119,7 @@ prontera,184,177,6 script Refine Master 851,{ close; } if (getequiprefinerycnt(.@part) >= .@ticket_lv) { - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Refine Master]"; mes "^8B4513This item is already refined as much as your deed.^000000"; mes "Please come along with an item refined less than your ticket."; @@ -130,7 +130,7 @@ prontera,184,177,6 script Refine Master 851,{ mes "May I proceed?"; next; if(select("No.:Yes.") == 1) { - emotion e_dots; + emotion ET_THINK; mes "[Refine Master]"; mes "Oh, you changed your mind."; mes "Ok."; @@ -153,7 +153,7 @@ prontera,184,177,6 script Refine Master 851,{ } successrefitem .@part, .@ticket_lv - getequiprefinerycnt(.@part); next; - emotion e_ho; + emotion ET_DELIGHT; mes "[Refine Master]"; mes "Alright, here it is~"; mes "Well, ^0000FF"+strcharinfo(0)+"^000000!"; diff --git a/npc/re/other/adven_boards.txt b/npc/re/other/adven_boards.txt index 79d6bb3794..73b0679a00 100644 --- a/npc/re/other/adven_boards.txt +++ b/npc/re/other/adven_boards.txt @@ -2490,7 +2490,7 @@ tha_t01,142,78,0 script Guide#Thanatos1 CLEAR_NPC,{ next; mes "[Public Announcement]"; mes "Please don't touch it. Only those that have a contract with '^0000FFRenkenber^000000' can progress."; - emotion 23; + emotion ET_HUK; close; } mes "Thanatos Tower is comprised of 12 floors, but only 3 floors are open to the public. If you wish to progress, you must have signed a contract with'^0000FFRenkenber^000000'."; diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt index 22263628d7..6b9e5f4b9b 100644 --- a/npc/re/other/dimensional_gap.txt +++ b/npc/re/other/dimensional_gap.txt @@ -172,7 +172,7 @@ OnTimer18000: npctalk "I just saw a street trader passing by... Where is he?", "Party Member#GUILL"; end; OnTimer19500: - emotion e_yawn, 0, "Party Member#SURA"; + emotion ET_SLEEPY, getnpcid(0, "Party Member#SURA"); npctalk "Huh? What is this? You still haven't entered?", "Party Member#SURA"; end; OnTimer20000: @@ -186,7 +186,7 @@ OnTimer22500: npctalk "Are you awake?", "Party Member#SHADOW"; end; OnTimer24000: - emotion e_an, 0, "Party Member#SURA"; + emotion ET_FRET, getnpcid(0, "Party Member#SURA"); npctalk "Why are you still here?", "Party Member#SURA"; end; OnTimer24500: @@ -211,18 +211,18 @@ OnTimer32000: npctalk "Cough~ Cough~", "Party Member#EINOLD"; end; OnTimer33000: - emotion e_an, 0, "Party Member#SURA"; + emotion ET_FRET, getnpcid(0, "Party Member#SURA"); end; OnTimer34000: npctalk "Damn! I am pissed off! I came here because I heard only a party is allowed to get in!", "Party Member#SURA"; end; OnTimer36000: npctalk "Are you going to hit me? Do it!", "Party Member#MONK"; - emotion e_ag, 0, "Party Member#MONK"; + emotion ET_ANGER, getnpcid(0, "Party Member#MONK"); npctalk "You pay for your food.", "Party Member#CRU"; end; OnTimer37500: - emotion e_an, 0, "Party Member#SURA"; + emotion ET_FRET, getnpcid(0, "Party Member#SURA"); end; OnTimer39000: npctalk "Whatever, I'm not eating.", "Party Member#WANDERER"; @@ -230,22 +230,22 @@ OnTimer39000: npctalk "Right.. I should have entered with another group!", "Party Member#SHADOW"; end; OnTimer40500: - emotion e_gg, 0, "Party Member#CRU::OnChat24"; + emotion ET_KIK, getnpcid(0, "Party Member#CRU::OnChat24"); npctalk "Hey. Are you pissed off?", "Party Member#CRU::OnChat24"; end; OnTimer42000: npctalk "Not at all.", "Party Member#GUILL"; end; OnTimer43500: - emotion e_gg, 0, "Party Member#MONK"; + emotion ET_KIK, getnpcid(0, "Party Member#MONK"); npctalk "Look at him snoozing. Hehe.", "Party Member#MONK"; end; OnTimer45000: - emotion e_yawn, 0, "Party Member#SURA"; + emotion ET_SLEEPY, getnpcid(0, "Party Member#SURA"); npctalk "Bah, I don't care. I'm gonna take a nap, so wake me up when we're ready."; end; OnTimer46500: - emotion e_gg, 0, "Party Member#CRU"; + emotion ET_KIK, getnpcid(0, "Party Member#CRU"); npctalk "You are upset!!", "Party Member#CRU"; npctalk "Can I get back before I die...", "Party Member#WANDERER"; npctalk "What? You, we gotta talk! I've been too nice to you!", "Party Member#EINOLD"; @@ -254,12 +254,12 @@ OnTimer48000: npctalk "Excuse me..... everyone.............?", "Party Leader#dali2"; end; OnTimer49500: - emotion e_ag, 0, "Party Member#GUILL"; + emotion ET_ANGER, getnpcid(0, "Party Member#GUILL"); npctalk "No!!!!!!!!!", "Party Member#GUILL"; npctalk "Whatever~", "Party Member#MONK"; end; OnTimer51000: - emotion e_sob, 0, "Party Leader#dali2"; + emotion ET_CRY, getnpcid(0, "Party Leader#dali2"); npctalk "Please listen to me....", "Party Leader#dali2"; npctalk "He's angry all right....", "Party Member#WANDERER"; npctalk "Take a nap. I am sleepy too, so we'll take shifts.", "Party Member#SHADOW"; diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index a9a511deb2..fe571f1d33 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -114,7 +114,7 @@ geffen,103,42,5 script Sponiac 99,{ mes "[Sponiac]"; mes "Wow, you must be a beginner, right?"; mes "What an innocent face! Ha~ hahaha."; - emotion e_gg; + emotion ET_KIK; next; mes "[Sponiac]"; mes "Why don't you do some hunting outside instead of walking around and wasting your time?"; @@ -667,7 +667,7 @@ L_Reward: next; mes "[Dashia]"; mes "Thank you very much. God bless you!"; - emotion e_heh; + emotion ET_SMILE; next; mes "[Dashia]"; mes "Ha~! Ha~!"; diff --git a/npc/re/quests/eden/eden_100_111.txt b/npc/re/quests/eden/eden_100_111.txt index c76ef11cf2..10e8189ef6 100644 --- a/npc/re/quests/eden/eden_100_111.txt +++ b/npc/re/quests/eden/eden_100_111.txt @@ -42,7 +42,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ else if (BaseLevel < 111) { if (para_100lv01 == 0) { mes "Adventurers!"; - emotion e_heh; + emotion ET_SMILE; next; cutin "gelca03",2; mes "[Gelkah]"; @@ -117,7 +117,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ cutin "rote01",2; mes "[Rohtert]"; mes "Hmm..."; - emotion e_pif,0,"Rohtert#12"; + emotion ET_HNG, getnpcid(0, "Rohtert#12"); next; cutin "gelca01",2; mes "[Gelkah]"; @@ -199,7 +199,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ } else if (checkquest(13005,HUNTING) == 2) { mes "You did a great job."; - emotion e_no1; + emotion ET_BEST; callsub S_Quest,13005,13006,106000,148000; } else { @@ -679,7 +679,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ next; mes "[Gelkah]"; mes "He was almost crying when I first met him. It was difficult to pretend to lose to him. Please keep it a secret."; - emotion e_heh; + emotion ET_SMILE; break; case 2: if (Sex == SEX_MALE) @@ -690,7 +690,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ case 3: cutin "gelca04",2; mes "Oh no... Please don't do that. I am sorry please keep it as a secret to a master. I was careless."; - emotion e_shy; + emotion ET_SHY; break; } next; @@ -719,7 +719,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ cutin "gelca02",2; mes "[Gelkah]"; mes "I am sorry... It must be popular only in our village. Throw, heat and let it fly it."; - emotion e_sry; + emotion ET_SORRY; next; } cutin "gelca01",2; @@ -824,8 +824,8 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ mes "One time, master and I went to the cave west of Comodo and when we saw the Medusa monster..."; next; mes "Oh boy the look on his face was priceless!"; - emotion e_lv2; - emotion e_dots,1; + emotion ET_BIGTHROB; + emotion ET_THINK, playerattached(); .@exp = 180000; .@jexp = 168000; } @@ -853,7 +853,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ mes "Once I found a secret route to get to Jawaii... It's only for couples but some of us know how to get there still."; next; mes "Kind of useless to be there without a partner but oh well."; - emotion e_lv; + emotion ET_THROB; .@exp = 550000; .@jexp = 340000; } @@ -1165,7 +1165,7 @@ moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ cutin "rote04",2; mes "[Rohtert]"; mes "Yeah yeah potato po-tah-toh!"; - emotion e_pif; + emotion ET_HNG; next; cutin "gelca02",2; mes "[^FF0000Gelkah^000000]"; @@ -1174,7 +1174,7 @@ moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ cutin "rote04",2; mes "[Rohtert]"; mes "We realized when we faced the eyes of the beast that it looked like a lion but it isn't any normal animal."; - emotion e_pif; + emotion ET_HNG; next; mes "[Rohtert]"; mes "^8008F8I knew that it was kill or be killed.^000000"; diff --git a/npc/re/quests/eden/eden_111_120.txt b/npc/re/quests/eden/eden_111_120.txt index e73ca43e6f..d4a1ff54fe 100644 --- a/npc/re/quests/eden/eden_111_120.txt +++ b/npc/re/quests/eden/eden_111_120.txt @@ -25,7 +25,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ else if (para_110lv01 == 0) { cutin "min02",0; mes "......"; - emotion e_dot; + emotion ET_THINK; next; mes "[Mingmin]"; mes "(Wow...)"; @@ -43,17 +43,17 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ next; mes "["+ strcharinfo(0) +"]"; mes "(What's this lady talking about?)"; - emotion e_dot,1; + emotion ET_THINK, playerattached(); next; mes "[Mingmin]"; mes "Answer me!"; mes "Art thou my servant?"; - emotion e_dot; + emotion ET_THINK; next; select( "I am not.", "You be trippin'?" ); mes "[Mingmin]"; mes "Thou art not? Splendid...because I deigned that any servant of mine would have more dignity."; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Mingmin]"; mes "Well, non-servant...What are you looking for here?"; @@ -61,7 +61,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ if (select( "Nothing in particular.", "Quests! Who are you?" ) == 1) { mes "[Mingmin]"; mes "That is acceptable, I hope ye find what ye seek."; - emotion e_ok; + emotion ET_OK; } else { mes "[Mingmin]"; @@ -85,11 +85,11 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ select("No~ I'm "+ strcharinfo(0) +" remember?"); mes "[Mingmin]"; mes "Oh I have met you before, living in a house full of fungus seems to cause memory loss."; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[Mingmin]"; mes "Who were you again?"; - emotion e_what; + emotion ET_QUESTION; next; select("Eden Group requests and research"); mes "[Mingmin]"; @@ -112,7 +112,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ next; mes "[Mingmin]"; mes "Well, after all this talking I need to take a rest. My feet are rather tired."; - emotion e_yawn; + emotion ET_SLEEPY; para_110lv01 = 2; } else if (para_110lv01 == 2) { @@ -131,7 +131,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ select("Sounds dangerous... when can I start?"); mes "[Mingmin]"; mes "Talk to me in a second and we'll get going."; - emotion e_yawn; + emotion ET_SLEEPY; para_110lv01 = 3; } else if (para_110lv01 == 3) { @@ -142,7 +142,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "[Mingmin]"; mes "Oh...sorry, I meant squire..."; mes "I mean adventurer..."; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[Mingmin]"; mes "Sorry, the fungus in my home has been getting quite rampant."; @@ -173,7 +173,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ cutin "min02",0; mes "[Mingmin]"; mes " For some reason there aren't many people lining up to assist me yet."; - emotion e_dot,1; + emotion ET_THINK, playerattached(); next; mes "[Mingmin]"; mes "I think it requires ^ff0000bravery^000000 to take a new request."; @@ -218,19 +218,19 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ while(select( "Make a heart with two hands.", "Dance around like a crazy person", "Wink at her", "Whistle at her." ) != 2) { mes "[Mingmin]"; mes "What's that for?"; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "Hmm, she didn't go for that."; next; } mes "[Mingmin]"; mes "This signal!?"; - emotion e_flash; + emotion ET_SPARK; next; cutin "min01",0; mes "[Mingmin]"; mes "^FF0000..................now?^000000"; - emotion e_flash; + emotion ET_SPARK; next; select("Say nothing and nod..."); mes "[Mingmin]"; @@ -279,7 +279,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ cutin "min03",0; mes "[Mingmin]"; mes "Haha! I feel much better now."; - emotion e_loud; + emotion ET_BLABLA; next; mes "[Mingmin]"; mes "Thank you for accepting the strange contract. Looking forward to working with thee."; @@ -415,7 +415,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ if (select( "Take the request.", "Quit" ) == 1) { mes "[Mingmin]"; mes "Please tell me the story after dealing with them one by one. They will be important documents..."; - emotion e_no1; + emotion ET_BEST; callsub S_Quest,13072,13071; } } @@ -456,7 +456,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ if (select( "Take the request.", "Quit" ) == 1) { mes "[Mingmin]"; mes "If you possibly get a good drop from them, you know right? Do not forget about me!"; - emotion e_flash; + emotion ET_SPARK; callsub S_Quest,13074,13073; } } @@ -674,7 +674,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ cutin "¼¾Æ¼Æäµ¥À¯ÃæÄ«µå",3; //centipede_larva_card mes "Oh... No Lets take a deep breath. For me, I want to exterminate more than 20 for research."; next; - emotion e_sob; + emotion ET_CRY; mes "[Mingmin]"; mes "Be careful. And they're east of the expedition station."; cutin "min02",0; @@ -682,7 +682,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ else if (checkquest(13087,HUNTING) == 2) { cutin "min02",0; mes "Oh. Okay. You do not need to explain."; - emotion e_otl; + emotion ET_OTL; callsub S_Quest,13087,13088,700000,180000; } else { @@ -738,7 +738,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ if (countitem(6023) > 19) {// Mystic_Horn cutin "min03",0; mes "Yes this one! It is worth doing. Thank you for taking this request."; - emotion e_thx; + emotion ET_THANKS; delitem 6023,20; callsub S_Quest,13091,13092,700000,180000; } @@ -851,7 +851,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ else if (checkquest(13097,HUNTING) == 2) { cutin "min03",0; mes "You are not confused? I still do not know yet. What is the difference? Anyway good job."; - emotion e_loud; + emotion ET_BLABLA; callsub S_Quest,13097,13098,700000,300000; } else { @@ -879,7 +879,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ if (countitem(7094) > 9 && countitem(7317) > 19) { cutin "min03",0; mes "Thank you. You will appreciate me if my research is completed."; - emotion e_loud; + emotion ET_BLABLA; delitem 7094,10;// Mystery_Piece delitem 7317,20;// Screw callsub S_Quest,13099,13100,700000,200000; @@ -954,7 +954,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ cutin "min03",0; mes "[Mingmin]"; mes "Do not worry, I will treat you like a slave if we meet outside of Eden Group or if you tell anyone I was nice to you."; - emotion e_loud; + emotion ET_BLABLA; next; cutin "min01",0; mes "[Mingmin]"; @@ -1056,7 +1056,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ cutin "min03",0; mes "[Mingmin]"; mes "...hee hee..."; - emotion e_heh; + emotion ET_SMILE; next; mes "[Mingmin]"; mes "Hmmph, You are so naive. Did you believe it? Sticky.. some kind of mushroom is growing in your body? Hahaha"; @@ -1067,7 +1067,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "[Mingmin]"; mes "I am sorry if you are upset. You made it too easy..."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Mingmin]"; mes "You are funnier than I thought. Do not worry. That mushroom does not exist."; } diff --git a/npc/re/quests/eden/eden_121_130.txt b/npc/re/quests/eden/eden_121_130.txt index ac08c6b4ff..213281c1b2 100644 --- a/npc/re/quests/eden/eden_121_130.txt +++ b/npc/re/quests/eden/eden_121_130.txt @@ -191,7 +191,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{ if (select( "Take the request.", "Stop." ) == 1) { mes "[Melody-Jack]"; mes "Dying flowers fall down by rain and wind. That is what you have to do."; - emotion e_no1; + emotion ET_BEST; callsub S_Quest,13124,13123; } } @@ -264,7 +264,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{ if (select( "Take the request.", "Stop." ) == 1) { mes "[Melody-Jack]"; mes "Clear all as quickly as you can."; - emotion e_flash; + emotion ET_SPARK; callsub S_Quest,13128,13127; } } @@ -554,7 +554,7 @@ S_Erasequest: return; OnTouch_: if (para_120lv01 == 1) { - emotion e_gasp; + emotion ET_SURPRISE; mes "[Melody-Jack]"; mes "Hey there! ... Wait.?"; close; diff --git a/npc/re/quests/eden/eden_131_140.txt b/npc/re/quests/eden/eden_131_140.txt index aa11618f5b..a57bced8ed 100644 --- a/npc/re/quests/eden/eden_131_140.txt +++ b/npc/re/quests/eden/eden_131_140.txt @@ -148,7 +148,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ if (select( "Take the request", "Quit." ) == 1) { mes "[Ragi]"; mes "It will be more dangerous than you think. But the story must be conveyed."; - emotion e_no1; + emotion ET_BEST; callsub S_Quest,13148,13147; } } @@ -287,7 +287,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ if (select( "Take the request", "Quit." ) == 1) { mes "[Ragi]"; mes "Be sure to get at least 30 Angel looking Incarnations of Morocc."; - emotion e_wah; + emotion ET_KEK; callsub S_Quest,13156,13155; } } diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 6e167708d3..1c0c73bd9e 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -96,7 +96,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ mes "Your name is ^3131FFBo"+.@input$+"Ba^000000...? Is that right?"; mes "Huh? Isn't it??"; next; - emotion e_swt; + emotion ET_SWEAT; mes "[Lime Evenor]"; mes "Hmm, that isn't what you wrote?"; mes "Ok, hmm, it seems a bit hard to read."; @@ -109,7 +109,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ mes "Ah~ ha. You are ^3131FF"+strcharinfo(0)+"^000000."; mes "I got it right this time."; next; - emotion e_no1; + emotion ET_BEST; mes "[Lime Evenor]"; mes "We already put your name on the list."; mes "Welcome to Eden's group new member!"; @@ -168,11 +168,11 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ mes "[Lime Evenor]"; mes "Hum.. huh??.................."; next; - emotion e_dots; + emotion ET_THINK; mes "[Lime Evenor]"; mes "I think you should complete one of our missions first before you take up a new mission."; next; - emotion e_pif; + emotion ET_HNG; mes "[Lime Evenor]"; mes "^3131FFClient: Lime Evenor^000000"; mes "^3131FFMission: Practice your handwriting for one month.^000000"; @@ -357,16 +357,16 @@ moc_para01,182,48,3 script Eden's Chief#eden 886,{ mes "[Eden's Chief]"; mes ""+.@eggf+".. "+.@eggf_1+"... "+.@eggf_2+".... "+.@eggf_6+"..?"; next; - emotion e_sob; + emotion ET_CRY; mes "[Eden's Chief]"; mes "Oh, Shoot! How many eggs have I done?"; mes "Aww!!! I totally forgot! I have to count again!"; next; - emotion e_sob; + emotion ET_CRY; mes "[Eden's Chief]"; mes "Why have you asked me to do this? What kind of mission is that?"; next; - emotion e_sob; + emotion ET_CRY; mes "[Eden's Chief]"; mes "What are you going to with all of those fried eggs? I am sure you can't eat all of them. You just want to bother me, right?"; close; @@ -402,7 +402,7 @@ moc_para01,20,35,5 script Office Assistant Neede 814,{ mes "[Neede]"; mes "And, do you see the ^3131FFgymnasium^000000 on the cross of ^3131FFthe north side of the lobby^000000? They always shout when they exercise, I can even hear them from here!"; next; - emotion e_ag; + emotion ET_ANGER; mes "[Neede]"; mes "Besides, the weird girl from ^3131FFthe second floor^000000 is crying all the time. Her cries drive me crazy."; next; @@ -412,20 +412,20 @@ moc_para01,20,35,5 script Office Assistant Neede 814,{ mes "[Neede]"; mes "I don't know what she has been up to. But she cries and shouts all the time. Oh, sometimes I hear 'Bang!', loud booming sounds... I don't know where it came from."; next; - emotion e_omg; + emotion ET_HUK; mes "[Neede]"; mes "Wait!"; mes "Shh! It is a secret, you can't tell anybody!"; next; mes "[Neede]"; - emotion e_sigh; + emotion ET_OHNO; mes "I don't trust Evenor. She never shows her feelings... she's going to snitch on me to my boss."; next; - emotion e_pif,0,"Secretary Lime Evenor"; + emotion ET_HNG, getnpcid(0, "Secretary Lime Evenor"); mes "[Lime Evenor]"; mes "I am not that kind of guy."; next; - emotion e_wah; + emotion ET_KEK; mes "[Neede]"; mes "Huh? Did you hear that? Gosh~!"; close; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 3e85cfb3ef..3904ed0959 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -30,7 +30,7 @@ moc_para01,14,32,5 script Aperture#acolytewarp 90,{ mes "[Aperture]"; 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 "[Aperture]"; mes "That's right! And..."; diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index b0a577ea9b..0b37031807 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -43,7 +43,7 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{ } enable_items; } else if (Class == Job_Novice_High || Class == Job_Merchant_High || Class == Job_Alchemist || Class == Job_Creator) { - emotion e_what; + emotion ET_QUESTION; mes "[Viorel]"; mes "I don't know what's going on, but the way I remember it you were supposed to be qualified to research ^FF4800Homunculus^000000."; next; @@ -164,21 +164,21 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{ next; switch(select("Nope. Good bye.:Please, I'm busy.:That's exactly what I wanted to hear.:Why are you always standing there?")) { case 1: - emotion e_heh; + emotion ET_SMILE; mes "[Viorel]"; mes "Okay."; mes "Good seeing you."; mes "Good bye then~!"; close; case 2: - emotion e_omg; + emotion ET_HUK; mes "[Viorel]"; mes "!!!!"; mes "I... I see."; mes "I thought you were here to see me."; close; case 3: - emotion e_ic; + emotion ET_AHA; mes "[Viorel]"; mes "Just as I thought."; mes "Let's have a look at the notes my dear friend Jeyna left."; @@ -193,7 +193,7 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{ playbgm "08.mp3"; // Theme of Prontera end; case 4: - emotion e_swt; + emotion ET_SWEAT; mes "[Viorel]"; mes "No, I do not stand here every day."; mes "But why do YOU stand there every day?"; @@ -242,7 +242,7 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 542,{ mes "Now, if you'll excuse me~!"; close; case 3: - emotion e_swt; + emotion ET_SWEAT; mes "[Viorel]"; mes "What, is it so strange to see an Alchemist in their own lab?"; mes "How so?"; @@ -261,7 +261,7 @@ L_CheckHomunculus: mes " "; mes "(Seems to be thinking about something.)"; next; - emotion e_heh; + emotion ET_SMILE; mes "[Viorel]"; mes "Ha ha~"; mes "I think I've mistaken you for someone else."; @@ -273,7 +273,7 @@ L_CheckHomunculus: que_house_s,24,47,3 script Viorel#homun_s 542,{ if (checkquest(4155) > -1) { - emotion e_dum; + emotion ET_HUM; mes "[Viorel]"; mes "Good."; mes "I see that you mean business."; @@ -292,7 +292,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ next; switch(select("Like, biological experiments...?!:Well, yeah, naturally.:I don't want to hurt my Homunculus!")) { case 1: - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; mes "[Viorel]"; mes "Don't look so surprised."; mes "Ethics in biology are kind of blurry right now, right?"; @@ -306,7 +306,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ next; break; case 2: - emotion e_sigh; + emotion ET_OHNO; mes "[Viorel]"; mes "Yes."; mes "I'm glad you're not upset."; @@ -323,7 +323,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ next; break; case 3: - emotion e_swt; + emotion ET_SWEAT; mes "[Viorel]"; mes "I understand your concern."; mes "But I want to assure you that this Mutation does not harm or hurt your ^FF4800Homunculus^000000."; @@ -356,14 +356,14 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ mes "^006400The truth is not in a single form~!^000000"; mes "Ha ha."; next; - emotion e_flash; + emotion ET_SPARK; mes "[Viorel]"; mes "I know it's a little abrupt, but..."; mes "How about changing your ^FF4800Homunculus^000000 into something incredible with my marvelous achievement, the ^006400Homunculus Mutation System^000000?"; next; switch(select("Explore the ^006400Homunculus Mutation System^000000.:Cancel.")) { case 1: - emotion e_no1; + emotion ET_BEST; mes "[Viorel]"; mes "Good choice."; mes "Success lurks outside the box of conventional thinking, right?"; @@ -378,7 +378,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ warp "que_house_s",63,41; end; case 2: - emotion e_dots; + emotion ET_THINK; mes "[Viorel]"; mes "I don't see why you hesitate."; mes "I am not trying to deceive you."; @@ -390,7 +390,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ mes "We'll talk in a bit then."; close; case 2: - emotion e_otl; + emotion ET_OTL; mes "[Viorel]"; mes "Shame."; mes "However, I respect your opinion."; @@ -457,7 +457,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ end; } } - emotion e_no1; + emotion ET_BEST; playbgm "19.mp3"; // Under the Ground mes "[Viorel]"; mes "Good choice."; @@ -516,7 +516,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ hommutate .@Homunculus; break; case 2: - emotion e_hmm; + emotion ET_SCRATCH; mes "[Viorel]"; mes "So, your choice is the Unstable Mutation Process."; mes "You believe in destiny?"; @@ -531,14 +531,14 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ mes "Give it more time to think."; close; } - emotion e_dots; + emotion ET_THINK; mes "[Viorel]"; mes "Hmm..."; mes "The exploration of knowledge"; mes "is full of surprises."; mes "......."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Viorel]"; mes "Ha ha."; mes "Hey, I feel like a Blacksmith!"; @@ -564,7 +564,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ } erasequest 4160; erasequest 4154; - emotion e_ho; + emotion ET_DELIGHT; playbgm "64.mp3"; // One Fine Day mes "[Viorel]"; mes "Okay, Mutation Complete."; @@ -609,12 +609,12 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{ que_house_s,80,42,3 script Jeyna#homun_s 558,{ if (checkquest(4156) > -1) { playbgm "28.mp3"; // You're in Ruins - emotion e_gasp; + emotion ET_SURPRISE; mes "[Jeyna]"; mes "Welcome."; mes "I just got word from ^005DFFViorel^000000 that you were coming."; next; - emotion e_hmm; + emotion ET_SCRATCH; mes "[Jeyna]"; mes "By the way..."; mes "Did he convince you to do something...?"; @@ -622,13 +622,13 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ next; mes "[Jeyna]"; mes "He needs them because Alchemists are such awkward people."; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Jeyna]"; mes "Anyways~"; mes "^0000FF"+strcharinfo(0)+"^000000 and ^005DFFViorel^000000 seem like two peas in a pod."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Jeyna]"; mes "Hahaha~ No offense."; mes "I think it's a good thing."; @@ -640,11 +640,11 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ mes "why don't you take a look at that board?"; mes "The ^006400Homunculus Mutation System^000000 has ^0000FF5 different types^000000 of new mutations."; next; - emotion e_gasp,0,"Magic Board#homun_s"; + emotion ET_SURPRISE, getnpcid(0, "Magic Board#homun_s"); mes "[Jeyna]"; mes "Your ^FF4800Homunculus^000000 can mutate into any of the 5 different forms."; next; - emotion e_ic; + emotion ET_AHA; mes "[Jeyna]"; mes "Let's see..."; mes "The ^006400Homunculus Mutation System^000000 includes new evolutions of the normal ^0000FFHomunculus^000000."; @@ -656,7 +656,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ mes "skills such as Caprice will be"; mes "^006400retained and usable even after Mutation^000000."; next; - emotion e_gasp,0,"Magic Board#homun_s"; + emotion ET_SURPRISE, getnpcid(0, "Magic Board#homun_s"); mes "[Jeyna]"; mes "Take a look at the Magic Board behind me and decide for yourself."; close2; @@ -664,11 +664,11 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ erasequest 4156; end; } else if (checkquest(4157) > -1) { - emotion e_what; + emotion ET_QUESTION; mes "[Jeyna]"; mes "Take a look at the board behind me, on the right."; close2; - emotion e_gasp,0,"Magic Board#homun_s"; + emotion ET_SURPRISE, getnpcid(0, "Magic Board#homun_s"); end; } else if (checkquest(4158) > -1) { playbgm "28.mp3"; // You're in Ruins @@ -720,7 +720,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ mes "Come back after you've done that."; close; } - emotion e_no1; + emotion ET_BEST; mes "[Jeyna]"; mes "Good thinking."; mes "It is unacceptable for Alchemists like us to fear challenge."; @@ -748,12 +748,12 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ morphembryo; setquest 4159; erasequest 4158; - emotion e_ho; + emotion ET_DELIGHT; mes "[Jeyna]"; mes "Phew~ All done."; mes "Hmm, its state is a little strange."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Jeyna]"; mes "I guess it'll be just fine."; mes "Don't lose that ^0000FFStrange Embryo^000000."; @@ -769,7 +769,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 558,{ close; case 2: playbgm "28.mp3"; // You're in Ruins - emotion e_sigh; + emotion ET_OHNO; mes "[Jeyna]"; mes "Maybe I shouldn't have asked in the first place."; close; @@ -1315,10 +1315,10 @@ OnInit: initnpctimer; end; OnTimer6000: - emotion e_gasp; + emotion ET_SURPRISE; end; OnTimer7000: - emotion e_gasp,0,"#04homun_s"; + emotion ET_SURPRISE, getnpcid(0, "#04homun_s"); stopnpctimer; initnpctimer; end; @@ -1335,7 +1335,7 @@ que_house_s,24,46,3 script Jonathan#homun_s 6002,{ } que_house_s,23,46,3 script #05homun_s 111,{ - emotion e_no,0,"Jonathan#homun_s"; + emotion ET_STARE_ABOUT, getnpcid(0, "Jonathan#homun_s"); if (gethominfo(1) < 6048 || gethominfo(1) > 6052) { // Not mutated Homunculus-S mes "[Jonathan]"; mes "Hwang~ Hwang!"; @@ -1350,7 +1350,7 @@ que_house_s,23,46,3 script #05homun_s 111,{ mes "[Jonathan]"; mes "Hwang~?!"; next; - emotion e_swt2,0,"Jonathan#homun_s"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Jonathan#homun_s"); mes "[Jonathan]"; mes "*Sniff* ..."; next; diff --git a/npc/re/quests/newgears/2010_headgears.txt b/npc/re/quests/newgears/2010_headgears.txt index 63c139f880..15605ca5ec 100644 --- a/npc/re/quests/newgears/2010_headgears.txt +++ b/npc/re/quests/newgears/2010_headgears.txt @@ -59,7 +59,7 @@ gonryun,149,189,0 script Yotang#Flower_Of_Fairy 50,{ mes "You're speedy!"; mes "You deserve to be a master of the fanclub for the next term."; next; - emotion e_swt; + emotion ET_SWEAT; mes "Combining... ... ..."; next; if (countitem(7165) > 99 && countitem(7166) > 99 && countitem(745) > 0 && countitem(981) > 0 && countitem(2211) > 0) { @@ -72,7 +72,7 @@ gonryun,149,189,0 script Yotang#Flower_Of_Fairy 50,{ delitem 981,1; //Violet_Dyestuffs delitem 2211,1; //Bandana getitem 5437,1; //Flower_Of_Fairy - emotion e_no1; + emotion ET_BEST; next; mes "[Yotang]"; mes "See you on the fan meeting!"; @@ -172,7 +172,7 @@ lhz_in02,276,281,1 script Drunken Man#Necktie 748,{ mes "[Drunken Man]"; mes "What... you're weaker than me."; mes "Go and reach the higher level!"; - emotion e_go; + emotion ET_GO; close; } mes "[Drunken Man]"; @@ -200,11 +200,11 @@ lhz_in02,276,281,1 script Drunken Man#Necktie 748,{ mes "Great, wait for a moment!"; next; mes "Combining... ch...ch... ..."; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Drunken Man]"; mes "Drunk...drunk.... Zzzzz..."; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; if (countitem(978) > 0 && countitem(7151) > 29 && countitem(1059) > 99 && countitem(7217) > 19) { callsub L_CheckWeight; @@ -243,7 +243,7 @@ lhz_in02,276,281,1 script Drunken Man#Necktie 748,{ mes "[Drunken Man]"; mes "^FF00001 Cobaltblue Dyestuff, 30 Oil Papers, 100 Fabrics, 20 Spools^000000!"; mes "Hurry! I'll be futzing around with others."; - emotion e_go; + emotion ET_GO; close; L_CheckWeight: @@ -271,7 +271,7 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 69,{ if(select("I still prefer hairbands!:Hat is the best!") == 1) { mes "[Hat Girl]"; mes "Wear your boring hairband for the whole lifetime!"; - emotion e_pif; + emotion ET_HNG; close; } mes "[Hat Girl]"; @@ -292,7 +292,7 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 69,{ if(select("I think the hairband is better...:Yes, please make it!") == 1) { mes "[Hat Girl]"; mes "Wear your boring hairband for the whole lifetime!"; - emotion e_pif; + emotion ET_HNG; close; } callsub L_CheckWeight; @@ -300,7 +300,7 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 69,{ mes "Okay, I'll do it right away!"; next; mes "Ch ch ch... combining...ch ch."; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "[Hat Girl]"; mes "Here, it's done!"; @@ -395,7 +395,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{ callsub L_CheckWeight; mes "[Bebete]"; mes "Wow, you already know all the materials, angel."; - emotion e_lv2; + emotion ET_BIGTHROB; next; mes "[Bebete]"; mes "You're lucky. I have one statue on going."; @@ -413,7 +413,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{ next; mes "[Bebete]"; mes "See you again, my angel~!"; - emotion e_thx; + emotion ET_THANKS; next; mes "[" + strcharinfo(0) + "]"; mes "... ..."; @@ -425,7 +425,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{ mes "[Bebete]"; mes "Hey, I don't see"; mes "any materials in your bag.."; - emotion e_sob; + emotion ET_CRY; close; } mes "[Bebete]"; @@ -433,7 +433,7 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{ next; mes "[Bebete]"; mes "Wow, the angel!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bebete]"; mes "Are you a real angel? Have you been to heaven?"; @@ -444,11 +444,11 @@ alberta,151,78,0 script Bebete#Baby_Angel 96,{ next; mes "[" + strcharinfo(0) + "]"; mes "There's nothing. Everything is lie!"; - emotion e_gg,1; + emotion ET_KIK, playerattached(); next; mes "[Bebete]"; mes "You're a devil! a monster! an idiot!"; - emotion e_sigh; + emotion ET_OHNO; close; } mes "[" + strcharinfo(0) + "]"; @@ -584,7 +584,7 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap 1012,1,1,{ next; mes "[King Froggie VII]"; mes "Thank you so much, " + strcharinfo(0) + "."; - emotion e_thx; + emotion ET_THANKS; next; mes "[King Froggie VII]"; mes "By the way, we have another urgent matter. So I would ask you one more help."; @@ -629,7 +629,7 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap 1012,1,1,{ next; mes "[King Froggie VII]"; mes "You became an example for the young frogs. Thank you again."; - emotion e_thx; + emotion ET_THANKS; next; mes "[King Froggie VII]"; mes "Therefore, I'm considering adding your outstanding exploit to our frog's history book. But I need your evidence for your work."; @@ -782,7 +782,7 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap 1012,1,1,{ } else if (hat_2009 == 6) { mes "[King Froggie VII]"; mes "All the frogs in the world, praise " + strcharinfo(0) + ", our eternal hero!"; - emotion e_thx; + emotion ET_THANKS; close2; donpcevent "Roda Frog#Frog_Cap::OnDisable"; end; @@ -820,13 +820,13 @@ OnTouch: case 2: donpcevent "Roda Frog#Frog_Cap::OnEnable"; if (hat_2009 > 0) { - emotion e_dots,1; + emotion ET_THINK, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "It's so amazing to see"; mes "the frog which transforms itself."; close; } else { - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "[" + strcharinfo(0) + "]"; mes "Oh my.. the frog transformed into a child..."; close; @@ -1078,7 +1078,7 @@ alberta,120,206,3 script Alonie#Solo_Play_Box 787,{ mes "you're the best lonely being!"; next; mes "[Alonie]"; - emotion e_no1; + emotion ET_BEST; mes "Fight back your tears!"; mes "Huhu, Yapyap!"; completequest 1106; diff --git a/npc/re/quests/quests_aldebaran.txt b/npc/re/quests/quests_aldebaran.txt index baa609ff2f..a8ce459a39 100644 --- a/npc/re/quests/quests_aldebaran.txt +++ b/npc/re/quests/quests_aldebaran.txt @@ -62,7 +62,7 @@ c_tower1,232,222,5 script Belljamin Button#ct 968,{ case 3: mes "[Belljamin Button]"; mes "I am here all day for the safety of adventurers. I always alert them about the danger. That's why I need some form of payment."; - emotion e_swt; + emotion ET_SWEAT; close; } break; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 248a18b807..311383da65 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -86,7 +86,7 @@ OnTimer10000: end; OnGo: - emotion e_gasp; + emotion ET_SURPRISE; initnpctimer; end; } @@ -165,7 +165,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ mes "the south beach."; mes "I hope some experienced adventurers"; mes "will come to help."; - emotion e_sigh; + emotion ET_OHNO; close; } .@nQState1 = checkquest(9028); @@ -211,7 +211,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ mes "volunteer for this job."; mes " "; mes "I really hate Hydra!"; - emotion e_sob; + emotion ET_CRY; close; } } @@ -308,7 +308,7 @@ OnInit: end; OnTimer7000: - emotion e_gasp; + emotion ET_SURPRISE; stopnpctimer; initnpctimer; end; @@ -716,7 +716,7 @@ brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{ next; mes "- You get closer and pretend to take caution. -"; next; - emotion e_kis; + emotion ET_CHUP; mes "(kiss~)"; next; mes "- The kid laughs again lightly then puts something in your hand. -"; @@ -729,8 +729,8 @@ brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{ mes "["+strcharinfo(0)+"]"; mes "Oops, guarana berry?"; mes "Ah! Thank you very much!"; - emotion e_kis2,1; - emotion e_heh; + emotion ET_CHUPCHUP, playerattached(); + emotion ET_SMILE; next; mes "["+strcharinfo(0)+"]"; mes "If I have this, I can make a guarana candy."; @@ -874,7 +874,7 @@ OnTouch_: mes "Somewhere, a human!"; mes "I got it. You are!!!"; specialeffect EF_HIT1,AREA,"Jaguar#bra"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Jaguar]"; mes "Don't be afraid human."; @@ -1275,7 +1275,7 @@ brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{ mes "who is Jasi?"; mes "Your.... lover?"; next; - emotion e_omg; + emotion ET_HUK; mes "[Jasira]"; mes "l...o...v...e...lover??!!"; mes "No way~"; @@ -1301,7 +1301,7 @@ brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{ mes "[Jasira]"; mes "Cuz' Jasi is really gorgeous and the most important thing is he is taking care of the water lily in Brasilis."; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "Brasilis water lily??!!"; mes "Isn't it the uniqe flower?"; @@ -1486,7 +1486,7 @@ brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{ OnTouch: if (brazil_regia == 2) - emotion e_an; + emotion ET_FRET; end; } @@ -1659,7 +1659,7 @@ bra_dun02,71,200,3 script Water lily#bra HIDDEN_NPC,{ mes "[Jasi]"; mes "It makes me miss my childhood."; next; - emotion e_omg,0,"Recluse#bra"; + emotion ET_HUK, getnpcid(0, "Recluse#bra"); mes "[Jasi]"; mes "Hoho!!!!"; mes "I've been here for as long as I can remember..."; @@ -1836,7 +1836,7 @@ brasilis,185,246,5 script Pedro#bra 1_M_SIZ,{ mes "[Pedro]"; mes "What else are we supposed to do? If we don't do it someone else will."; next; - emotion e_an,0,"Mariana#bra"; + emotion ET_FRET, getnpcid(0, "Mariana#bra"); mes "[Mariana]"; mes "Argh~ Boys are so frustrating sometimes."; next; @@ -2361,7 +2361,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ mes "Behind you..."; enablenpc "Ghost#bra"; next; - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "["+strcharinfo(0)+"]"; mes "The stories about the ghost are true~!"; next; @@ -2390,8 +2390,8 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ .@cpudice = rand(1,6); .@pcdice = rand(1,6); if (.@cpudice != .@pcdice) { - emotion (57+.@cpudice),0,"Ghost#bra"; - emotion (57+.@cpudice),1; + emotion (ET_OTL+.@cpudice), getnpcid(0, "Ghost#bra"); + emotion (ET_OTL+.@pcdice), playerattached(); break; } } @@ -2408,7 +2408,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ end; } else { - emotion e_bzz,1; + emotion ET_STARE, playerattached(); mes "[Ghost]"; mes "^FF0000Ahh!^000000"; mes "The Ghost disappeared into the toilet."; diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index 9c5b7be64e..6ba12f2fe9 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -778,19 +778,19 @@ dewata,109,262,4 script Memo#dew_drink 534,{ if (rand(3)) { mes "[Memo]"; mes "Oh god! We don't have a message from the Jaty tribe yet."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Memo]"; mes "They have never broken a promise for 10 years, I do not know the reason. What's happening?"; next; mes "[Memo]"; mes "I might spoil all the liquid if it is going on like this."; - emotion e_sob; + emotion ET_CRY; close; } mes "[Memo]"; mes "What should I do? I still don't have any news from the Jaty tribe."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Memo]"; mes "Oh no~ All the liquid is going to spoil..."; @@ -798,7 +798,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{ select("What happened?"); mes "[Memo]"; mes "Who are you?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Memo]"; mes "You are an adventurer, right?"; @@ -821,9 +821,9 @@ dewata,109,262,4 script Memo#dew_drink 534,{ next; mes "[Memo]"; mes "... ..."; - emotion e_dots; + emotion ET_THINK; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Memo]"; mes "Ah, right! Are you busy now?"; next; @@ -831,7 +831,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{ mes "[Memo]"; mes "Hmm, I have no choice."; mes "You don't care that others are in trouble. What has this world come to?"; - emotion e_pif; + emotion ET_HNG; close; } mes "[Memo]"; @@ -859,7 +859,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{ next; mes "[Memo]"; mes "... ... ... ..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Memo]"; mes "You didn't find out what happened?"; @@ -918,7 +918,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{ if (checkquest(5043,PLAYTIME) == 0) { mes "[Memo]"; mes "... ... ..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "- Memo is making an ark. -"; close; @@ -956,7 +956,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{ mes "[Memo]"; mes "In other words, it's easy to say that we'll help others but it's hard to actually do the action."; next; - emotion e_thx; + emotion ET_THANKS; mes "[Memo]"; mes "You really did a great job. I like you because you are different from today's youngins."; changequest 5043,5044; @@ -1080,18 +1080,18 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "[Lero]"; mes "Oh no! I have so many orders and I'm running out of ingredients."; mes "Not yet? What's going on, Poby? Where did he go?"; - emotion e_an; + emotion ET_FRET; next; select("Excuse me, but are you Lero?"); mes "[Lero]"; mes "When Poby gets back here, I'm gonna give him a beating he'll never forget!"; - emotion e_ag; + emotion ET_ANGER; next; mes "- Lero seems pretty mad at someone and ignores you -"; next; mes "[Lero]"; mes "Oops. Who are you?"; - emotion e_what; + emotion ET_QUESTION; next; select("Memo sent me here."); mes "[Lero]"; @@ -1123,7 +1123,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ } else if (dew_drink == 2) { mes "[Lero]"; mes "Did you find Poby?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Lero]"; mes "... ... ..."; @@ -1135,7 +1135,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "[Lero]"; mes "You're back... and... Poby..."; mes "How is Poby?"; - emotion e_what; + emotion ET_QUESTION; next; select("Poby....."); mes "[Lero]"; @@ -1196,7 +1196,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "[Lero]"; mes "60 pieces of nuts, exactly. I will press the oil right now."; next; - emotion e_sry; + emotion ET_SORRY; mes "[Lero]"; mes "It takes some time, so go back to Mr. Memo and tell him the situation. Also tell him that I'm sorry for the delay."; delitem 6402,60; //Oil_Palm_F @@ -1220,7 +1220,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "[Lero]"; mes "It is heavier than you might think, so be careful when carrying it."; next; - emotion e_sry; + emotion ET_SORRY; mes "[Lero]"; mes "Oh, tell Mr. Memo that I'm sorry for the late delivery, and explain that it wasn't my fault."; changequest 5041,5042; @@ -1232,7 +1232,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "[Lero]"; mes "It is heavier than you might think, so be careful when carrying it."; next; - emotion e_sry; + emotion ET_SORRY; mes "[Lero]"; mes "Oh, tell Mr. Memo that I'm sorry for the late delivery, and explain that it wasn't my fault."; close; @@ -1247,7 +1247,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "I clearly remembered giving you 30 bottles of palm tree oil, did you lose it all?"; next; select("Sorry, it's my fault..."); - emotion e_an; + emotion ET_FRET; mes "[Lero]"; mes "This is the palm tree oil which was in short supply. Be careful pease. It was really hard to get this..."; getitem 6401,.@num; //Palm_O @@ -1256,15 +1256,15 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ } else if (dew_drink == 8) { mes "[Lero]"; mes "What did Mr. Memo say?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; - emotion e_loud,1; + emotion ET_BLABLA, playerattached(); mes "... ... ... ..."; next; mes "[Lero]"; mes "Ah... I understand..."; - emotion e_ok; + emotion ET_OK; close; } else if (dew_drink == 10) { for(set .@i,0; .@i<7; set .@i,.@i+1) @@ -1346,7 +1346,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ if (dew_drink == 2) { mes "[Poby]"; mes "Ah~ backache..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; select("Are you Poby?"); mes "[Poby]"; @@ -1359,7 +1359,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ next; mes "[Poby]"; mes "You here for my autograph?"; - emotion e_what; + emotion ET_QUESTION; next; select("Lero made me come here."); mes "[Poby]"; @@ -1367,14 +1367,14 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ next; mes "[Poby]"; mes "!#@$*&%!@$&!$%!$#*&!@#$"; - emotion e_sob; + emotion ET_CRY; next; mes "[Poby]"; mes "And I've still never had a girlfriend..."; next; mes "[Poby]"; mes "!#@$*&%!@$&!$%!$#*&!@#$"; - emotion e_sob; + emotion ET_CRY; next; mes "[Poby]"; mes "Ah! Sorry. Tell Mr. Lero that I will go back if I can find a way to move."; @@ -1390,7 +1390,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ next; mes "[Poby]"; mes "I can't move at all 'cuz of this backache..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } else if (dew_drink == 4) { if (checkquest(5039) > -1) { @@ -1412,14 +1412,14 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ } mes "[Poby]"; mes "Ah~ backache..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Poby]"; mes "Oh!! You're-- Let me guess..."; next; mes "[Poby]"; mes "... ... ... ..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Poby]"; mes "...you're back! You plan to catch ^0000FFPalm Oil Fruit^000000 instead of me, right?"; @@ -1436,7 +1436,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ next; mes "[Poby]"; mes "Ok! Gather ^FF000060^0000FF ^0000FFPalm Oil Fruit^000000 and bring that amount to Mr. Lero."; - emotion e_gasp; + emotion ET_SURPRISE; close; } else if (dew_drink == 10) { mes "[Poby]"; @@ -1493,7 +1493,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ } mes "[Poby]"; mes "Ah~ my freakin' back is killing me."; - emotion e_sob; + emotion ET_CRY; close; } @@ -1573,7 +1573,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 538,{ specialeffect2 EF_BASH; if (isequipped(5009)) { //Safety_Helmet mes "something falls on your head, but since you're wearing a Safety Helmet you're safe and sound."; - emotion e_no1,1; + emotion ET_BEST, playerattached(); break; } else { mes "something smashes down on your head, right where that soft spot is, $#*@! that's a one in a million shot."; @@ -1988,7 +1988,7 @@ dew_fild01,127,240,4 script Gatti#weapon 813,{ next; specialeffect2 EF_REPAIRWEAPON; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Gatti]"; mes "I finished making the weapon. This is called Caress according to the blueprint."; @@ -2032,7 +2032,7 @@ dew_fild01,127,240,4 script Gatti#weapon 813,{ next; specialeffect2 EF_REPAIRWEAPON; next; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Gatti]"; mes "Here is the Caress! Ask me any time."; @@ -2207,7 +2207,7 @@ dew_fild01,127,240,4 script Gatti#weapon 813,{ if (.@s3 == 0 && .@s4 == 0) { mes "[Gatti]"; mes "Oh my~~ Almost succeeded... But failed. Sorry, sorry..."; - emotion e_omg; + emotion ET_HUK; close; } getitem2 13067,1,1,0,0,0,0,.@s3,.@s4; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 0fb285c3c3..bd7bc0337e 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -1333,7 +1333,7 @@ OnTouch: mes "You hold up your head at the sound of Ahat's voice"; mes "But you see a human in high-ranking Sapha clothing in front of you."; sc_end SC_Blind; - emotion e_omg,1; + emotion ET_HUK, playerattached(); set ep13_3_secret, 14; erasequest 7198; close2; @@ -1538,7 +1538,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 493,{ mes "You hold up your head at the sound of Ahat's voice"; mes "But you see a human in high-ranking Sapha clothing in front of you."; SC_End SC_Blind; - emotion e_omg,1; + emotion ET_HUK, playerattached(); set ep13_3_secret, 14; erasequest 7198; close2; @@ -4594,7 +4594,7 @@ dic_fild01,231,174,5 script BK#ep133_18 496,{ mes "What do you want."; mes "Why are you harassing me."; mes "Bully... sob"; - emotion e_sob; + emotion ET_CRY; next; mes "[BK]"; mes "Okay. I will cooperate."; @@ -5073,7 +5073,7 @@ dic_in01,165,104,0 script Frede#13_3_in 454,{ mes "[Frede]"; mes "Oh my!! Why are you sweating so much!"; mes "You look a little pale too......"; - emotion e_omg; + emotion ET_HUK; next; mes "[" + strcharinfo(0) + "]"; mes "No, it's nothing."; @@ -6424,7 +6424,7 @@ function script eldicastes_c { mes "Commander!"; mes "You've come at such short notice."; mes "Is there a situation?"; - emotion e_omg,0,"Hound#ep133_is06"; + emotion ET_HUK, getnpcid(0, "Hound#ep133_is06"); next; mes "[Hibba Agip]"; mes "Huh? Nothing."; @@ -6489,8 +6489,8 @@ function script eldicastes_c { setquest 7185; next; disablenpc "Hibba Agip#ep133_is07"; - emotion e_swt2,0,"Hound#ep133_is06"; - emotion e_swt2,0,"Sapha from Manuk"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Hound#ep133_is06"); + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Sapha from Manuk"); mes "Commander Hibba Agip quickly left the room after saying what he wanted to say."; mes "First, let's listen to Vyhannus's story."; close; @@ -7471,7 +7471,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 496,{ mes "It breaks my heart to think my colleagues will be shivering in the blizzard. I hope I don't get into trouble since I can't do anything about it, right?"; next; if (select ("Why don't you collect it yourself?:I'm sorry to hear that.") == 1) { - emotion e_omg; + emotion ET_HUK; mes "[Cat Hand Agent]"; mes "Human!! You're a genius!!"; mes "How did you come up with that?"; @@ -7598,7 +7598,7 @@ moc_fild20,368,197,3 script Cat#to22 876,{ mes "The small body isn't as tall as your ankle and its small but thick paws look like little cushions. The ears that bent backwards when it looked at how big you were stirred up your protective instinct."; next; mes "You don't seem to have the nerve to step on the Cat Hand Agent."; - emotion e_sob; + emotion ET_CRY; close; } mes "You look at the Cat Hand Agent's small back and climb over the wall as quick as possible so that it wouldn't notice your weight."; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 2b29c9da8d..a4e3be60c4 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -183,17 +183,17 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ if (ep14_2_oliver == 0) { mes "What do you need?"; mes "As you can see, I'm really busy here, so unless you need something, please don't bother me."; - emotion e_an; + emotion ET_FRET; } else if (ep14_2_oliver == 1) { if (checkquest(11310,PLAYTIME) != 2) { mes "There's still a lot of people before you. Could you please wait until your turn?"; mes "It won't be too long."; - emotion e_sob; + emotion ET_CRY; close; } mes "Whew! I'm sorry to have kept you waiting."; mes "There are just too many visitors."; - emotion e_wah; + emotion ET_KEK; next; mes "[Immigration Officer]"; mes "So if you will place your forms here..."; @@ -203,12 +203,12 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ mes "This time it's all good, right?"; mes "Let me through quick!"; cutin "bu_du1",2; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; cutin "",255; mes "[Immigration Officer]"; mes "I'm taking care of visitors in the order they arrived, so please wait for your turn."; - emotion e_swt; + emotion ET_SWEAT; next; mes "[???]"; mes "What are you talking about!"; @@ -218,7 +218,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ cutin "",255; mes "[Immigration Officer]"; mes "Well, your turn was delayed because you had to fill out your forms, so you have to wait until later."; - emotion e_ag; + emotion ET_ANGER; next; mes "[???]"; mes "What?! You just said you take care of visitors in the order they arrived!!!"; @@ -285,7 +285,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ mes "Oh wow, this is just so crazy."; mes strcharinfo(0) +" Here, your documents are processed."; mes "You may enter the city when you go talk to the security guard."; - emotion e_go; + emotion ET_GO; next; mes "[???]"; mes "Shuffle, shuffle"; @@ -294,7 +294,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ cutin "",255; mes "[Immigration Officer]"; mes "And Mr. Deu Lean, please take your group and enter. It's just way too noisy."; - emotion e_an; + emotion ET_FRET; next; mes "[Du Lian]"; mes "Mwahah!!"; @@ -329,7 +329,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ next; mes "[Mark Esha]"; mes "My goodness......"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); ep14_2_oliver = 2; changequest 11310,11311; close2; @@ -340,7 +340,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ mes "Oh wow, this is just so crazy."; mes strcharinfo(0) +" Here, your documents are processed."; mes "You may enter the city when you go talk to the security guard."; - emotion e_go; + emotion ET_GO; } else { mes "Alright, next person in line please!"; @@ -350,7 +350,7 @@ ecl_fild01,111,320,3 script Immigration Officer#ep14 4_M_FAIRYKID4,{ mes "[Immigration Officer]"; mes "Ack..."; mes "I don't think it's all for the best to have so many visitors."; - emotion e_sob; + emotion ET_CRY; } close; } @@ -359,20 +359,20 @@ ecl_fild01,92,316,5 script Tourist#ep14_2f2 4_CAT_SAILOR2,{ mes "[Tourist]"; mes "I can't believe I have to wait this long......"; mes "When is it going to be my turn?"; - emotion e_sob; + emotion ET_CRY; close; } ecl_fild01,106,312,5 script Tourist#ep14_2f3 4_F_RAFLE_VI,{ mes "[Tourist]"; mes "I'm actually done with my documentation, but I'm just sticking around to appreciate all of these flowers."; - emotion e_lv2; + emotion ET_BIGTHROB; next; mes "[Tourist]"; mes "I'm just getting through the night with my sleeping bag!"; mes "It's alright as long as you can withstand the security guard's annoyance with you."; - emotion e_swt,0,"Security Guard#ep14_2"; - emotion e_swt,0,"Security Guard#ep14_2_2"; + emotion ET_SWEAT, getnpcid(0, "Security Guard#ep14_2"); + emotion ET_SWEAT, getnpcid(0, "Security Guard#ep14_2_2"); close; } @@ -380,18 +380,18 @@ ecl_fild01,108,320,7 script Tourist#ep14_2f4 4_F_DST_CHILD,{ mes "[Tourist]"; mes "I wonder how beautiful of a city Eclage would be."; mes "It just makes my heart beat thinking about it."; - emotion e_lv; + emotion ET_THROB; close; } ecl_fild01,105,320,2 script Tourist#ep14_2f5 4_F_FAIRYKID,{ mes "[Tourist]"; mes "No, I'm not a visitor. I'm an Eclage citizen!"; - emotion e_an; + emotion ET_FRET; next; mes "[Tourist]"; mes "I can't believe I can't even enter because of all these tourists!"; - emotion e_omg; + emotion ET_HUK; close; } @@ -401,7 +401,7 @@ ecl_fild01,103,319,5 script Tourist#ep14_2f6 4_M_HUMERCHANT,{ next; mes "[Tourist]"; mes "You could probably make the world's best acorn jello."; - emotion e_no1; + emotion ET_BEST; close; } @@ -414,7 +414,7 @@ ecl_fild01,110,316,3 script Tourist#ep14_2f7 4_M_HUBOY,{ next; mes "[Tourist]"; mes "Perhaps you could consider it as the weight of life?"; - emotion e_awsm; + emotion ET_COOL; close; } @@ -431,7 +431,7 @@ ecl_fild01,93,318,5 script Tourist#ep14_2f9 1_M_PAY_ELDER,{ mes "[Tourist]"; mes "Err.... No....."; mes "Curry.... Curry rice.... Snorrreeeee"; - emotion e_hlp; + emotion ET_HELP; close; } @@ -441,7 +441,7 @@ ecl_fild01,94,313,5 script Tourist#ep14_2f10 4_M_PIERROT,{ next; mes "[Tourist]"; mes "It's encouraging to see so many Midgard people nowadays."; - emotion e_com; + emotion ET_COMEON; close; } @@ -449,7 +449,7 @@ ecl_fild01,101,320,5 script Tourist#ep14_2f11 4_M_RAFLE_OR,{ mes "[Tourist]"; mes "Ow.... My legs..."; mes "You're saying I have to wait after all this traveling through Bifrost?!"; - emotion e_an; + emotion ET_FRET; close; } @@ -460,7 +460,7 @@ ecl_fild01,88,315,5 script Tourist#ep14_2f12 4_WHITE_COW,{ next; mes "[Tourist]"; mes "I want to be alone......Sniff!"; - emotion e_otl; + emotion ET_OTL; close; } @@ -475,7 +475,7 @@ OnTouch: mes "[Fairy Carpenter]"; mes "Hey!!!!!!!"; mes "Be careful over there!!"; - emotion e_omg,0,"Fairy Carpenter#ep14_2"; + emotion ET_HUK, getnpcid(0, "Fairy Carpenter#ep14_2"); close; } if (ep14_2_oliver <= 6) { @@ -492,11 +492,11 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ mes "Wait!!!!!"; mes "That's an unregistered visitor!!!!!!!"; mes "Security!!! Security!!!"; - emotion e_omg; + emotion ET_HUK; } else { mes "Did you talk to the security guard before coming into the city?"; - emotion e_go; + emotion ET_GO; } close2; warp "ecl_fild01",100,317; @@ -505,7 +505,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ if (BaseLevel < 120) { mes "[Fairy Carpenter]"; mes "The bridge is kind of broken so please be careful."; - emotion e_sob; + emotion ET_CRY; } else if (ep14_2_oliver == 3) { mes "[Fairy Carpenter]"; @@ -523,7 +523,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ close; case 2: mes "Oh, just a minute ago, there was a human being who took a misstep and broke a tree branch while falling."; - emotion e_an; + emotion ET_FRET; next; mes "[Fairy Carpenter]"; mes "Being close to the entrance and all, this really needs to be fixed soon."; @@ -538,16 +538,16 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ mes "Wow!!!"; mes "You are going to help me?!"; mes "So... so kind..."; - emotion e_omg; + emotion ET_HUK; next; mes "[Fairy Carpenter]"; mes "I can't believe there's still this kind of kindness left in the world... Hmm, sweaty eyes..."; - emotion e_sob; + emotion ET_CRY; next; mes "[Fairy Carpenter]"; mes "Would you then bring me a new bridge to use for repair?"; mes "Since other people can get hurt, I'll use my magic to maintain this bridge in the meantime."; - emotion e_go; + emotion ET_GO; ep14_2_oliver = 4; setquest 11312; close; @@ -575,32 +575,32 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ next; mes "[Fairy Carpenter]"; mes "and this broken bridge... from here to there it's about 19 meters and the prepieces come in 3 meters = 5 meters, and 10 meters......"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Fairy Carpenter]"; mes "Hmm......."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Fairy Carpenter]"; mes "Hmm......"; mes "......"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Fairy Carpenter]"; mes "......Hmm........."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "- It's probably just my imagination that smoke is coming out of his head, right? -"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "[Fairy Carpenter]"; mes "Oh ho!"; mes "What do you think?"; - emotion e_heh; + emotion ET_SMILE; next; mes "[Fairy Carpenter]"; mes "To make a bridge of 19 meters in length with the fewest number of pieces possible, how many of each 3, 5, or 10 meter length pieces would I need?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Fairy Carpenter]"; mes "Please write the number of pieces necessary for each length. If no pieces for that length are necessary, please write 0."; @@ -610,13 +610,13 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ mes "[Fairy Carpenter]"; mes "Hmm that's kind of...."; mes "Would there be a better way?"; - emotion e_swt; + emotion ET_SWEAT; close; } mes "[Fairy Carpenter]"; mes "Yeah, that sounds good, right?"; mes "Especially since there wouldn't be a need to make them so straight."; - emotion e_ic; + emotion ET_AHA; next; mes "[Fairy Carpenter]"; mes "Okay, if you talk to [Golie] who works outside the city near the tower, he will give you the new bridge pieces."; @@ -643,8 +643,8 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ mes "[Du Lian]"; mes "Ah!"; mes "Thank goodness!"; - emotion e_omg,1; - emotion e_omg; + emotion ET_HUK, playerattached(); + emotion ET_HUK; cutin "bu_du2",2; next; mes "[Du Lian]"; @@ -658,11 +658,11 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ cutin "",255; mes "[Carpenter Fon]"; mes "..."; - emotion e_swt; + emotion ET_SWEAT; next; mes "["+ strcharinfo(0) +"]"; mes "..."; - emotion e_swt,1; + emotion ET_SWEAT, playerattached(); next; mes "[Du Lian]"; mes "No way!"; @@ -680,7 +680,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ mes "[Carpenter Fon]"; mes "Well, I'm going to let it pass this time around, but if you break the bridge again, I'm going to put you in jail!"; mes "You should know that I am pretty busy myself."; - emotion e_an; + emotion ET_FRET; next; mes "[Mark Esha]"; mes "I'm sorry."; @@ -694,12 +694,12 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ next; cutin "",255; mes "- SNAP -"; - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); next; mes "[Carpenter Fon]"; mes "......"; - emotion e_otl; + emotion ET_OTL; next; mes "[Mark Esha]"; mes "Oh dear...."; @@ -725,21 +725,21 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ cutin "",255; mes "[Carpenter Fon]"; mes "......"; - emotion e_dots; + emotion ET_THINK; next; mes "[Carpenter Fon]"; mes "Sigh..."; - emotion e_an; + emotion ET_FRET; next; mes "[Carpenter Fon]"; mes "Shoot................................."; mes "...................................."; mes "............"; - emotion e_omg; + emotion ET_HUK; next; mes "[Carpenter Fon]"; mes "Get out of here you troublemaker!!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Mark Esha]"; mes "I am so sorry."; @@ -750,23 +750,23 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ mes "[Carpenter Fon]"; mes "Don't come back!"; mes "Don't EVER come back!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Carpenter Fon]"; mes "Oy........"; mes "I thought today I might be able to see my friends after finishing up my work....."; mes "Looks like a long night again."; - emotion e_otl; + emotion ET_OTL; next; mes "[Carpenter Fon]"; mes "Since it's not a big fix, I'm sure I can take care of this somehow."; mes "Sigh..."; - emotion e_sob; + emotion ET_CRY; next; mes "[Carpenter Fon]"; mes strcharinfo(0) +" Well, you should get going to Eclage."; mes "You just need to follow this path to the northern part of the city."; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Carpenter Fon]"; mes "You'll find the main plaza as soon as you enter Eclage, and I'm sure you'll have easy time getting information from all the people there."; @@ -782,7 +782,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ } mes "[Carpenter Fon]"; mes "I really ask you this favor because I'm supposed to meet with my friends to discuss a birthday coming up, but I can't just keep them waiting."; - emotion e_sry; + emotion ET_SORRY; delitem 6553,2;// Leaf_Made_Wood ep14_2_oliver = 7; changequest 11314,11315; @@ -793,12 +793,12 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ next; mes "[Carpenter Fon]"; mes "I really ask you this favor because I'm supposed to meet with my friends to discuss a birthday coming up, but I can't just keep them waiting."; - emotion e_sry; + emotion ET_SORRY; } else { mes "[Carpenter Fon]"; mes "I wanna see my friends real soon."; - emotion e_sob; + emotion ET_CRY; } close; } @@ -891,7 +891,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "Why... why do I have so much time at hand...?"; mes "Am I the only one with so much free time?"; mes "Am I really the only one?"; - emotion e_omg; + emotion ET_HUK; } else if (ep14_2_oliver == 7) { mes "Hmm..."; @@ -909,11 +909,11 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[Glaces]"; mes "Um... This is sort of awkward for me..."; - emotion e_wah,1; + emotion ET_KEK, playerattached(); next; mes "["+ strcharinfo(0) +"]"; mes "No, that's not what I mean..."; - emotion e_swt,1; + emotion ET_SWEAT, playerattached(); next; mes "[Glaces]"; mes "Hmm..."; @@ -922,26 +922,26 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[Glaces]"; mes "This is why I don't like to be kept waiting for long. My popularity just doesn't let me go anywhere without being noticed."; - emotion e_an; - emotion e_swt2,1; + emotion ET_FRET; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "["+ strcharinfo(0) +"]"; mes "No, I mean... Mr. Fon told me to let you know that he won't be able to make it because of his work..."; next; mes "[Glaces]"; mes "..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Glaces]"; mes "Oh, I see."; next; mes "[Glaces]"; mes "Yeah, I feel like I should hide somewhere."; - emotion e_dots; + emotion ET_THINK; next; mes "[Glaces]"; mes "Anyways, Fon can't make it?"; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "Moreng's birthday is not long from now, and without being able to meet all this time, it might turn out to be a terrible party."; @@ -949,12 +949,12 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "[Glaces]"; mes "Yube even flew here from Splendide for Moreng's birthday..."; mes "Speaking of which, where did that guy go?!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "He was the one who suggested that we should meet at his own place."; mes "The least he could do is opening the door before disappearing!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "Well, I can't leave this place since others might arrive, so if you see a fairy with a yellow, tangerine-stem-like head, please tell him Glaces is looking for him."; @@ -967,8 +967,8 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "That"; mes "favor!"; mes "I will take care of it!"; - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); cutin "bu_du1",2; next; cutin "",255; @@ -1002,7 +1002,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ cutin "",255; mes "[Glaces]"; mes "Who are you calling a girl? You got my name wrong too!"; - emotion e_an; + emotion ET_FRET; next; mes "[Du Lian]"; mes "Heh heh, don't you worry, baby girl."; @@ -1020,7 +1020,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[Glaces]"; mes "And also please tell him that if he doesn't get back right away, I will pluck off that stem."; - emotion e_omg; + emotion ET_HUK; } else if (ep14_2_oliver == 9) { mes "Oh..."; @@ -1028,13 +1028,13 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[Glaces]"; mes "Hmm... I think we are apart by about 30 years..."; - emotion e_hmm; + emotion ET_SCRATCH; next; select("Then what's Glaces' age?"); mes "[Glaces]"; mes "How dare you ask a lady's age!!!"; mes "We aren't exactly the same age, but since Murah is also 30 years apart from Moreng, ask Murah."; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "Murah is probably at the Eclage plaza."; @@ -1044,7 +1044,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ else if (ep14_2_oliver == 10) { mes "How dare you ask a lady's age!!!"; mes "We aren't exactly the same age, but since Murah is also 30 years apart from Moreng, ask Murah."; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "Murah is probably at the Eclage plaza."; @@ -1059,7 +1059,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "A king lives in Eclage."; mes "He is super good looking."; mes "Hehe"; - emotion e_shy; + emotion ET_SHY; } else if (ep14_2_oliver == 14) { mes "To think of it, I should probably visit Fon and Golie as well..."; @@ -1073,7 +1073,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ } mes "Whoa!"; mes "We would need an enormous cake to fit all these candles..."; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "Hmm... Since everyone seems so busy, I'm going to give up meeting them today and just go to bake a cake big enough to fit the candles."; @@ -1084,18 +1084,18 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "[Du Lian]"; mes "Baby girl!"; mes "I brought the guy named Yube!"; - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); cutin "bu_du2",2; next; cutin "",255; mes "[Glaces]"; mes "..."; - emotion e_dots; + emotion ET_THINK; next; mes "["+ strcharinfo(0) +"]"; mes "..."; - emotion e_dots,1; + emotion ET_THINK, playerattached(); next; mes "[Yube]"; mes "What, who is this fool?"; @@ -1106,7 +1106,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "[Glaces]"; mes "Do you mind not treating my friend like a piece of luggage?"; mes "And it's too late anyways!"; - emotion e_an; + emotion ET_FRET; next; mes "[Du Lian]"; mes "What?!"; @@ -1121,7 +1121,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ cutin "",255; mes "["+ strcharinfo(0) +"]"; mes "Two?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Du Lian]"; mes "What do you mean?"; @@ -1131,7 +1131,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ cutin "",255; mes "["+ strcharinfo(0) +"]"; mes "Huh?!"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Du Lian]"; mes "Sure, he's kind of cute too, but we have our cutest Maggi to beat them all!!!"; @@ -1147,7 +1147,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[???]"; mes "Can you see me?"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); cutin "bu_oliver3",0; next; mes "[Du Lian]"; @@ -1170,7 +1170,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ cutin "",255; mes "[Glaces]"; mes "Maybe it's because he doesn't have much presence to begin with."; - emotion e_dots; + emotion ET_THINK; next; mes "[Alp Ocart]"; mes "..."; @@ -1231,7 +1231,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ cutin "",255; mes "[Glaces]"; mes "Who are those guys?They even took Yube with them!"; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Glaces]"; mes "Well, I'm sure Yube will take care of himself."; @@ -1240,7 +1240,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ } else if (ep14_2_oliver == 16) { mes "Who are those guys? They even took Yube with them?!"; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Glaces]"; mes "Well... I'm sure Yube will take care of himself."; @@ -1249,13 +1249,13 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ } else if (ep14_2_oliver < 22) { mes "I wonder what's better, cream or chocolate..."; - emotion e_shy; + emotion ET_SHY; next; mes "- She seems really busy making the cake. Let's not bother her. -"; } else if (ep14_2_oliver == 22) { mes "I wonder what's better, cream or chocolate?"; - emotion e_shy; + emotion ET_SHY; next; mes "[Glaces]"; mes "Oh you're back."; @@ -1263,13 +1263,13 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[Glaces]"; mes "..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Glaces]"; mes "Huh!!!"; mes "The legend of the great bird?!"; mes "It's been close to a hundred years since I've known Moreng, and he's never talked about it before!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Glaces]"; mes "If he really seems like he might leave soon, we should grab him before he leaves and at least throw him a farewell party."; @@ -1278,7 +1278,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "So sudden..."; mes "I'm going to try to talk with Moreng, so would you ask Yube for me?"; mes "He went inside to look for something, so I'm sure he's still inside."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; ep14_2_oliver = 23; changequest 11330,11331; } @@ -1289,7 +1289,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ mes "So sudden..."; mes "I'm going to try to talk with Moreng, so would you ask Yube for me?"; mes "He went inside to look for something, so I'm sure he's still inside."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; } else { mes "It's going to feel really empty if Moreng leaves for Midgard."; @@ -1297,7 +1297,7 @@ eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{ next; mes "[Glaces]"; mes "Well, I should first decide on what present to get him!"; - emotion e_no1; + emotion ET_BEST; } close2; cutin "",255; @@ -1319,7 +1319,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "[Yube]"; mes "Whoa!"; mes "Who are you?!"; - emotion e_omg; + emotion ET_HUK; cutin "war_y1",2; next; if (Class == Job_Warlock || Class == Job_Warlock_T) { @@ -1327,7 +1327,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "Whoa! Who's this? It's"; mes strcharinfo(0) +"?"; mes "You seem more like a Warlock now!"; - emotion e_heh; + emotion ET_SMILE; cutin "war_y4",2; next; mes "[Yube]"; @@ -1339,7 +1339,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "[Yube]"; mes "I told her I'll be looking for materials to make candles with, but as expected, she wasn't listening."; mes "She always loses her mind looking at herself through a mirror."; - emotion e_sigh; + emotion ET_OHNO; cutin "war_y3",2; next; mes "[Yube]"; @@ -1366,7 +1366,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "Oh!"; mes "You gathered enough already?"; mes "I also made enough wicks just in time!"; - emotion e_ho; + emotion ET_DELIGHT; cutin "war_y4",2; delitem 6561,128;// Dustball ep14_2_oliver = 15; @@ -1385,7 +1385,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "And also..."; mes "To return the favor, I'll let you use my house!"; mes "You can stay over whenever you want as long as you are in Eclage."; - emotion e_no1; + emotion ET_BEST; next; mes "[Yube]"; mes "I work at Splendide for the most part anyways, so I don't come to Eclage very often."; @@ -1423,21 +1423,21 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ else if (ep14_2_oliver == 13) { mes "Huh?!"; mes "So no one knows how old Moreng is?"; - emotion e_omg; + emotion ET_HUK; cutin "war_y3",2; next; mes "[Yube]"; mes "Hmm, at least to summarize what everyone has said..."; mes "He's younger than me; 30 years age gap wtih both Glaces and Murah but Glaces and Murah are not the same age,"; mes "Shul's age is to add Moreng's age to my age of 100 years before; Shul is 2 years older than Glaces; the average age of me and Shul is Tato and Tato's age is 146, right?"; - emotion e_dots; - emotion e_dots,1; + emotion ET_THINK; + emotion ET_THINK, playerattached(); cutin "war_y2",2; next; mes "[Yube]"; mes "..."; mes "Then how old is he?"; - emotion e_what; + emotion ET_QUESTION; cutin "war_y3",2; next; input .@inputnum; @@ -1452,13 +1452,13 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "That's right!"; mes "Now I remember!!!"; mes "I think that's what it was!"; - emotion e_ic; + emotion ET_AHA; cutin "war_y4",2; next; mes "[Yube]"; mes "Hmm that means I still have to make more than a hundred candles..."; mes "Oy......"; - emotion e_wah; + emotion ET_KEK; cutin "war_y3",2; next; mes "[Yube]"; @@ -1481,7 +1481,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ else { mes "Wha.. You lost the candles?"; mes "I still have some wicks left, so if you bring me the clump of dust again, I'll remake them for ya."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; cutin "war_y3",2; next; cutin "",255; @@ -1559,7 +1559,7 @@ ecl_in01,73,51,4 script Murah#ep14_2 4_M_FAIRYKID,{ } else mes "Hmm... What amazing present should I give?"; - emotion e_flash; + emotion ET_SPARK; close; } @@ -1570,7 +1570,7 @@ eclage,265,166,4 script Shul#ep14_2 4_M_FAIRYKID2,{ mes "Hmm..."; mes "It's been awhile since I kept track of everyone's age."; mes "I just remember that Glaces was two years younger than me."; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "[Shul]"; mes "Come to think of it, not too long ago, Tato said that his age was the same as the average between my age and Yube's age."; @@ -1598,12 +1598,12 @@ eclage,137,169,4 script Tato#ep14_2 4_F_FAIRYKID4,{ next; mes "[Tato]"; mes "But why is it that they don't know their own age either?!"; - emotion e_omg; + emotion ET_HUK; next; select("What's Tato's age?"); mes "[Tato]"; mes "I am 146 years old."; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "- Although the exact information regarding Moreng's age is still unknown, let's return to Yube first."; ep14_2_oliver = 13; @@ -1630,7 +1630,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ mes "[Moreng]"; mes "Yai actually signifies an egg."; mes "And to Laphines, Yai could even signify what is beyond a home..."; - emotion e_shy; + emotion ET_SHY; } else if (ep14_2_oliver == 16) { mes "Eclage is a really nice place to live"; @@ -1638,7 +1638,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ next; mes "[Moreng]"; mes "If there were a beautiful Yai of my own, it would truly be a paradise!"; - emotion e_shy; + emotion ET_SHY; next; mes "[Oliver]"; mes "Oh, so you call those round houses a Yai."; @@ -1651,12 +1651,12 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ next; mes "[Moreng]"; mes "While I spent time and effort as much as putting my life into it, my Yai is nothing more than a fake."; - emotion e_an; + emotion ET_FRET; next; mes "[Moreng]"; mes "It's called an egg and looks like an egg, but it's really not an egg!"; mes "It's just something else that just looks like an egg!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Moreng]"; mes "Hey, wait a minute!"; @@ -1685,7 +1685,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ cutin "",255; mes "[Moreng]"; mes "......"; - emotion e_dots; + emotion ET_THINK; next; mes "[Moreng]"; mes "When I first heard of that legend, I was so excited that I couldn't sleep for days."; @@ -1693,7 +1693,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ mes "[Moreng]"; mes "But as time went by, and as I aged more, I gradually forgot about it."; mes "Isn't that how all childhood dreams are like?"; - emotion e_sob; + emotion ET_CRY; next; mes "[Moreng]"; mes "But not too long ago when I went to the plaza, I met my old neighbor who told me about a traveler from Midgard holding an incredibly enormous feather..."; @@ -1701,7 +1701,7 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ mes "[Moreng]"; mes "Ever since I heard about it, I can't seem to put my mind on anything else."; mes "Could that legend possibly be true?"; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Moreng]"; mes "Truthfully, when I heard that story, I went searching all over the town but couldn't find anyone with a huge feather."; @@ -1709,19 +1709,19 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ mes "[Moreng]"; mes "Do you think that old man's story is real? Or do you think it's a lie?"; mes "I used to think of it as a forgotten legend, but now I am even afraid to find out whether it is real or fake. "; - emotion e_wah; + emotion ET_KEK; next; mes "[Du Lian]"; mes "If you are a real man, don't be so meek!"; mes "Face it head on! And if you must, you can crash and burn afterwards!"; - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); cutin "bu_du2",2; next; cutin "",255; mes "[Moreng]"; mes "Don't crash and burn anything..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Du Lian]"; mes "For something like that-!"; @@ -1770,8 +1770,8 @@ eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{ mes "I feel like I can't just stay here anymore."; mes "I have to quickly pack my bags and leave for Midgard!"; if (ep14_2_oliver == 22) { - emotion e_omg; - emotion e_omg,1; + emotion ET_HUK; + emotion ET_HUK, playerattached(); } next; mes "- Moreng seems like he's really about to leave soon. I should let Glaces know. -"; @@ -1803,15 +1803,15 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{ mes "[Old Man]"; mes "Nowadays, things are way more convenient with de-regulation and all."; mes "And with the warps and flying to all these places, where's all the romance in adventures anymore?"; - emotion e_pif; + emotion ET_HNG; next; mes "[Old Man]"; mes "Young people nowadays probably don't even know how frog eggs taste like."; - emotion e_pif; + emotion ET_HNG; next; mes "[Old Man]"; mes "It seems like yesterday when I saved enough Jellopies to buy a Tsurugi, but even that Tsurugi is deserted somewhere in the storage."; - emotion e_sob; + emotion ET_CRY; next; mes "[Old Man]"; mes "Time really is merciless... If I had known this then, I would have..."; @@ -1853,11 +1853,11 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{ next; mes "[Du Lian]"; mes "But old man, would you happen to know anything about a legend regarding the great bird in Midgard? "; - emotion e_omg,1; + emotion ET_HUK, playerattached(); cutin "bu_du1",2; next; cutin "",255; - emotion e_shy,1; + emotion ET_SHY, playerattached(); next; mes "[Old Man]"; mes "Oh!"; @@ -1865,7 +1865,7 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{ next; mes "[Old Man]"; mes "For that, there's probably no one who knows it better than I in Eclage."; - emotion e_flash; + emotion ET_SPARK; next; mes "[Old Man]"; mes "Well, it wasn't too long after Light Standard arrived in Midgard."; @@ -1893,7 +1893,7 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{ cutin "",255; mes "[Old Man]"; mes "Huh? But I haven't even begun to talk about a monster he met in Midgard who can break any kind of metal!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Du Lian]"; mes "We will hear about it later~"; @@ -1924,14 +1924,14 @@ ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{ mes "Old Man#ep14_2"; mes "Nowadays, things are much more convenient with de-regulation and all."; mes "And with the warps and flying to all these places, where's all the romance in adventures anymore?"; - emotion e_pif; + emotion ET_HNG; next; mes "[Old Man]"; mes "Young people nowadays probably don't even know how frog eggs taste like."; next; mes "[Old Man]"; mes "It seems like yesterday when I saved enough Jellopies to buy a Tsurugi, but even that Tsurugi is deserted somewhere in storage."; - emotion e_sob; + emotion ET_CRY; } close2; cutin "",255; @@ -1947,7 +1947,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "[Traveler]"; mes "Oh, you came to ask me about the feather, too?"; mes "It's just a plain old decoration, but everyone really likes to bother me about it."; - emotion e_flash; + emotion ET_SPARK; next; mes "[Traveler]"; mes "If you are thinking about selling it, you should just give up."; @@ -1970,11 +1970,11 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "[Traveler]"; mes "But I am not one to give up so easily."; mes "If I think about it, it was a very long fight."; - emotion e_shy; + emotion ET_SHY; next; mes "[Du Lian]"; mes "That's weird. The old man earlier said that he saw it in Midgard."; - emotion e_omg; + emotion ET_HUK; cutin "bu_du1",2; next; cutin "",255; @@ -1982,7 +1982,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "Eck!"; mes "No... No way."; mes "I definitely saw it at Midgard."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Traveler]"; mes "I didn't want to show you this, but this scar is the proof."; @@ -1992,7 +1992,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "Hmm..."; mes "For a fight not too long ago, the scar seems very old."; mes "From how the scar looks, it doesn't even seem like it's been treated by magic..."; - emotion e_omg; + emotion ET_HUK; cutin "bu_mark4",0; next; cutin "",255; @@ -2000,23 +2000,23 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "Eeck!!!!"; mes "If... If I really think about, it might be awhile back actually."; mes "I can't remember too well having so many memoirs and souvenirs."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Oliver]"; mes "But how did you travel to other places when you can't even enter Eclage?"; - emotion e_omg; + emotion ET_HUK; cutin "bu_oliver2",0; next; mes "[Maggi Steen]"; mes "If it came near here somewhere, there's no way others haven't seen it..."; - emotion e_omg; + emotion ET_HUK; cutin "bu_maggi1",2; next; cutin "",255; mes "[Traveler]"; mes "Keeeek!!!!"; mes "Yes!"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Traveler]"; mes "Actually, this isn't my first time here, but I had the opportunity to go to other places during when deregulation was at its peak awhile back."; @@ -2024,12 +2024,12 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "[Alp Ocart]"; mes "Hmm... But this feather..."; mes "If I look at it very closely, the shaft is too thick for its size"; - emotion e_omg; + emotion ET_HUK; cutin "bu_alp3",2; next; mes "[Alp Ocart]"; mes "And doesn't the end of it seem really jagged?"; - emotion e_omg; + emotion ET_HUK; cutin "bu_alp4",2; next; cutin "",255; @@ -2038,11 +2038,11 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "Wait! Let me see!!!!"; mes "Oh my, that's really true!"; mes "How dare that cat sell me a fake?!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Du Lian]"; mes "Oh.... You bought it, didn't you?"; - emotion e_dots,1; + emotion ET_THINK, playerattached(); cutin "bu_du2",2; next; mes "[Oliver]"; @@ -2057,7 +2057,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "[Traveler]"; mes "Hu...."; mes "You have no idea how expensive this was!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Traveler]"; mes "Hey you guys, you can get into Eclage, right?"; @@ -2072,7 +2072,7 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "At least hold him until I can get into Eclage!"; mes "I ask you!"; mes "Please!"; - emotion e_sob; + emotion ET_CRY; ep14_2_oliver = 20; changequest 11327,11328; } @@ -2089,13 +2089,13 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{ mes "At least hold him until I can get into Eclage!"; mes "I ask you!"; mes "Please!"; - emotion e_sob; + emotion ET_CRY; } else if (ep14_2_oliver > 20) { mes "Oh dear, my money..."; mes "I can't believe it was a fake..."; mes "Oy oy...."; - emotion e_sob; + emotion ET_CRY; } else { mes "Who are you?"; @@ -2128,7 +2128,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{ mes "[Sack Merchant]"; mes "That's not trueow~!"; mes "I'm seriouseow~!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Sack Merchant]"; mes "That's definitely a precious item from Midgardeow."; @@ -2141,7 +2141,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{ mes "[Sack Merchant]"; mes "Meoweoweow!!!"; mes "I...I can't believe you noticedeow...Pretty sharpeow..."; - emotion e_omg; + emotion ET_HUK; next; mes "[Sack Merchant]"; mes "Actually..."; @@ -2219,13 +2219,13 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ if (ep14_2_oliver < 15) { mes "How did you get in here?"; mes "Uninvited guests are not very welcome, you know?"; - emotion e_omg; + emotion ET_HUK; cutin "war_y2",2; } else if (ep14_2_oliver == 23) { mes "Hmm, the legend of a great bird?"; mes "I think there was one, but since I don't believe in myths, I didn't pay much attention."; - emotion e_dum; + emotion ET_HUM; cutin "war_y3",2; next; mes "[Yube]"; @@ -2234,7 +2234,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ mes "[Yube]"; mes "I guess if you look at Glaces' Yai..."; mes "When I first saw the crack, I was reminded of Glace's Yai."; - emotion e_spin; + emotion ET_CONFUSE; cutin "war_y2",2; next; mes "[Yube]"; @@ -2248,7 +2248,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ mes "[Yube]"; mes "It's always exciting to place seeds in a box..."; mes "One mistake can lead to immense consequences."; - emotion e_flash; + emotion ET_SPARK; cutin "war_y2",2; next; mes "[Yube]"; @@ -2260,7 +2260,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ mes "Whew..."; mes "Done..."; mes "The ones I took last time couldn't be used because of a mistake, and I was scolded so much for that..."; - emotion e_sob; + emotion ET_CRY; cutin "war_y3",2; next; mes "[Yube]"; @@ -2269,7 +2269,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ next; mes "[Yube]"; mes "Maybe it's an underlying statement that I would be eliminated if it's not sent right away..."; - emotion e_dots; + emotion ET_THINK; cutin "war_y2",2; if (ep14_2_oliver == 24) { ep14_2_oliver = 25; @@ -2282,7 +2282,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ next; mes "[Yube]"; mes "I will be on my way so I'll catch you later~"; - emotion e_heh; + emotion ET_SMILE; next; mes "[Maggi Steen]"; mes "Be safe now~"; @@ -2360,14 +2360,14 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ mes "[Oliver]"; mes "Hmm..."; mes "I'm hungry."; - emotion e_rice,0,"Oliver#ep14_2"; + emotion ET_HUNGRY, getnpcid(0, "Oliver#ep14_2"); cutin "bu_oliver3",0; next; mes "[Oliver]"; mes "Acorns!"; mes "I saw many acorns just outside the city!"; mes "I want them!"; - emotion e_slur,0,"Oliver#ep14_2"; + emotion ET_SEXY, getnpcid(0, "Oliver#ep14_2"); cutin "bu_oliver4",0; next; mes "[Du Lian]"; @@ -2383,7 +2383,7 @@ ecl_in04,182,224,4 script Yube#ep14_2in 4_M_FAIRYKID5,{ mes "[Oliver]"; mes "Hey hey hey!"; mes "I told you not to pull on my cheeks!!"; - emotion e_an,0,"Oliver#ep14_2"; + emotion ET_FRET, getnpcid(0, "Oliver#ep14_2"); cutin "bu_oliver7",0; next; mes "[Mark Esha]"; @@ -2411,7 +2411,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ if (!countitem(6558)) {// Pile_Of_Acorn mes "Acorns~~!!!"; mes "I thought you said you'll bring a whole bunch of acorns~~"; - emotion e_sob; + emotion ET_CRY; cutin "bu_oliver7",0; next; mes "[Du Lian]"; @@ -2422,7 +2422,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ else { mes "Whoa, what a delicious looking acorn!"; mes "Thanks!"; - emotion e_slur; + emotion ET_SEXY; cutin "bu_oliver4",0; next; mes "[Oliver]"; @@ -2436,7 +2436,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ mes "[Oliver]"; mes "Yay!! What a feast!!"; mes "I'm full now."; - emotion e_kis; + emotion ET_CHUP; mes "Ugh..."; cutin "bu_oliver81",0; next; @@ -2449,7 +2449,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ mes "Yawn..."; mes "I'm full..."; mes "I'm sleepy..."; - emotion e_yawn; + emotion ET_SLEEPY; cutin "bu_oliver82",0; next; mes "[Du Lian]"; @@ -2471,7 +2471,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ next; mes "[Oliver]"; mes "..."; - emotion e_dots,1; + emotion ET_THINK, playerattached(); cutin "bu_oliver86",0; next; mes "[Oliver]"; @@ -2484,7 +2484,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ next; mes "[Du Lian]"; mes "AHHHHHHHH!!!!!!!!!!"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); cutin "bu_du5",2; delitem 6558,1;// Pile_Of_Acorn ep14_2_oliver = 28; @@ -2496,7 +2496,7 @@ ecl_in04,179,226,4 script Oliver#ep14_2 4_M_OLIVER,{ else { mes "Yawnnn... so sleepy..."; mes "I'm going to take a nap, so wake me up when we're leaving... Don't leave without me now~"; - emotion e_yawn; + emotion ET_SLEEPY; cutin "bu_oliver6",0; close2; } @@ -2515,7 +2515,7 @@ ecl_in01,44,53,4 script Delivery Man#ep14_2 4_M_DOGTRAVELER,{ next; mes "[Delivery Man]"; mes "I don't know why people can't just make small amounts of pickled Poring for themselves instead of mailing them..."; - emotion e_sob; + emotion ET_CRY; ep14_2_oliver = 26; changequest 11333,11334; } @@ -2527,7 +2527,7 @@ ecl_in01,44,53,4 script Delivery Man#ep14_2 4_M_DOGTRAVELER,{ mes "Wait a minute..."; mes "Is it actually better to deliver it later..."; mes "I remember seeing so many boxes of pickled Poring in the storage waiting to be delivered..."; - emotion e_sob; + emotion ET_CRY; } close; } @@ -2545,7 +2545,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ mes "[Du Lian]"; mes "Hmm... Where did he go...?"; mes "Could he be... a ghost?!"; - emotion e_omg,0,"Du Lian#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du5",2; next; mes "[Maggi Steen]"; @@ -2554,36 +2554,36 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ next; mes "[Maggi Steen]"; mes "Wait! Here's the hood that Oliver was wearing..."; - emotion e_omg,0,"Maggi Steen#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Maggi Steen#ep14_2in2"); cutin "bu_maggi4",2; next; mes "[Maggi Steen]"; mes "And... doesn't it feel like this room is different from before?"; - emotion e_swt2,0,"Mark Esha#ep14_2in2"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Mark Esha#ep14_2in2"); cutin "bu_mark4",0; next; mes "[Du Lian]"; mes "Hey stop that!!"; mes "It's scaring me!!!"; - emotion e_omg,0,"Du Lian#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du5",2; next; mes "[Maggi Steen]"; mes "Arrrrr~~"; - emotion e_sob,0,"Maggi Steen#ep14_2in2"; + emotion ET_CRY, getnpcid(0, "Maggi Steen#ep14_2in2"); cutin "bu_maggi4",2; next; mes "[Alp Ocart]"; mes "Oh!!! I just remembered..."; mes "Oliver..."; - emotion e_flash,0,"Alp Ocart#ep14_2in2"; + emotion ET_SPARK, getnpcid(0, "Alp Ocart#ep14_2in2"); cutin "bu_alp2",2; next; mes "[Alp Ocart]"; mes "..."; mes "Oliver Hilpert..."; mes ".........is also known as the dreaming novelist..."; - emotion e_dots,0,"Alp Ocart#ep14_2in2"; + emotion ET_THINK, getnpcid(0, "Alp Ocart#ep14_2in2"); cutin "bu_alp3",2; next; mes "[Alp Ocart]"; @@ -2594,23 +2594,23 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ mes "[Du Lian]"; mes "Hey..."; mes "Did you just take that book out from your bag?"; - emotion e_dots,0,"Du Lian#ep14_2in2"; + emotion ET_THINK, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du5",2; next; mes "[Alp Ocart]"; mes "Yeah, that's because I'm a fan..."; - emotion e_shy,0,"Alp Ocart#ep14_2in2"; + emotion ET_SHY, getnpcid(0, "Alp Ocart#ep14_2in2"); cutin "bu_alp4",2; next; mes "[Du Lian]"; mes "Why didn't you remember the book when you are such a fan..?"; mes "Not only that, do people usually carry books with them when they're fans?? Especially hardcover books?"; - emotion e_omg,0,"Du Lian#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du5",2; next; mes "[Alp Ocart]"; mes "......"; - emotion e_shy,0,"Alp Ocart#ep14_2in2"; + emotion ET_SHY, getnpcid(0, "Alp Ocart#ep14_2in2"); cutin "bu_alp4",2; next; mes "[Du Lian]"; @@ -2620,32 +2620,32 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ mes "[Mark Esha]"; mes "More importantly... The title of this book..."; mes "is [The City of Fairies]?"; - emotion e_omg,0,"Mark Esha#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Mark Esha#ep14_2in2"); cutin "bu_mark4",0; next; mes "[Mark Esha]"; mes "And..."; mes "It's been many years since this book was published..."; - emotion e_omg,0,"Mark Esha#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Mark Esha#ep14_2in2"); next; mes "[Du Lian]"; mes "...This is getting kind of scary...?"; - emotion e_omg,0,"Du Lian#ep14_2in2"; + emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du1",2; next; mes "[Mark Esha]"; mes "......"; - emotion e_dots,0,"Mark Esha#ep14_2in2"; + emotion ET_THINK, getnpcid(0, "Mark Esha#ep14_2in2"); cutin "bu_mark4",0; next; mes "[Maggi Steen]"; mes "......"; - emotion e_dots,0,"Maggi Steen#ep14_2in2"; + emotion ET_THINK, getnpcid(0, "Maggi Steen#ep14_2in2"); cutin "bu_maggi4",2; next; mes "[Alp Ocart]"; mes "......"; - emotion e_dots,0,"Alp Ocart#ep14_2in2"; + emotion ET_THINK, getnpcid(0, "Alp Ocart#ep14_2in2"); cutin "bu_alp2",2; ep14_2_oliver = 30; getitem 19543,1;//Oliver_Wolf_Hood @@ -2660,61 +2660,61 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ case 0: mes "[Du Lian]"; mes "But this is Volume 1. Does that mean there's more?"; - emotion e_dots; + emotion ET_THINK; cutin "bu_du1",2; next; mes "[Alp Ocart]"; mes "It has a total of 3 volumes."; - emotion e_no1,0,"Alp Ocart#ep14_2in2"; + emotion ET_BEST, getnpcid(0, "Alp Ocart#ep14_2in2"); cutin "bu_alp1",2; next; mes "[Du Lian]"; mes "Wow, how many are you carrying with you..."; mes "Why are you bringing all of them around..."; - emotion e_omg; + emotion ET_HUK; cutin "bu_du5",2; break; case 1: mes "[Mark Esha]"; mes "Everybody calm down!!!"; mes "This has to be some kind of a dream!"; - emotion e_omg; - emotion e_omg,0,"Du Lian#ep14_2in2"; + emotion ET_HUK; + emotion ET_HUK, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_mark2",0; next; mes "[Du Lian]"; mes "Why are you hitting me, calling it a dream and all!"; mes "It hurts!"; - emotion e_swt2,0,"Du Lian#ep14_2in2"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du4",2; next; mes "[Mark Esha]"; mes "Ahhhh maybe it really isn't a dream after all!!!"; - emotion e_omg; - emotion e_an,0,"Du Lian#ep14_2in2"; + emotion ET_HUK; + emotion ET_FRET, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_mark3",0; break; case 2: mes "[Maggi Steen]"; mes "...A...A...Aaaaahhhhhhhhh!!!!!"; - emotion e_sob; + emotion ET_CRY; cutin "bu_maggi4",2; next; mes "[Du Lian]"; mes "Don't cry, Maggi~"; - emotion e_swt2,0,"Du Lian#ep14_2in2"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "Du Lian#ep14_2in2"); cutin "bu_du4",2; break; case 3: mes "[Alp Ocart]"; mes "I wonder..."; mes "Why didn't I remember this...?"; - emotion e_omg; + emotion ET_HUK; cutin "bu_alp5",2; next; mes "[Alp Ocart]"; mes "I... I should have.. I should have gotten his autograph!!!"; - emotion e_omg; + emotion ET_HUK; } } close2; @@ -2760,7 +2760,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "[Wuhari]"; mes "Wow! The name sure sounds like it has defeated many in the mountains, seas, and skies! It's amazing!"; next; - emotion e_shy,1; + emotion ET_SHY, playerattached(); mes "["+ strcharinfo(0) +"]"; mes "It's not much."; mes "I am not really all that great."; @@ -2773,13 +2773,13 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "[Wuhari]"; mes "Really? Oh well..."; next; - emotion e_sob; + emotion ET_CRY; mes "[Wuhari]"; mes "Sorry to bother you."; close; } mes "[Wuhari]"; - emotion e_heh; + emotion ET_SMILE; mes "Really?"; mes "Thank you so much!"; next; @@ -2842,7 +2842,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "["+ strcharinfo(0) +"]"; mes "I just couldn't pass by without doing something about it."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Wuhari]"; mes "Does that mean you would meet up with my brother?"; mes "Thank you so much!!!"; @@ -2858,7 +2858,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "[Wuhari]"; mes "So you might have to be a bit patient with him. Please give this ^0000cdletter^000000 to him."; next; - emotion e_go; + emotion ET_GO; mes "[Wuhari]"; mes "Well, you must have a long way to go, so please be on your way."; ep14_2_big = 2; @@ -2931,7 +2931,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "[Wuhari]"; mes "Thanks to that, many gave us lots of good things to eat, heh heh."; next; - emotion e_heh; + emotion ET_SMILE; mes "["+ strcharinfo(0) +"]"; mes "......"; next; @@ -3096,7 +3096,7 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "[Wuhari]"; mes "But I guess it's still too much."; mes "It must be too much..."; - emotion e_sob; + emotion ET_CRY; ep14_2_big = 16; erasequest 14131; close; @@ -3534,7 +3534,7 @@ ecl_in02,149,117,4 script Wuhuru#eclbig 4_M_FAIRYFREAK,{ eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{ WeightBigQuest; - emotion e_omg; + emotion ET_HUK; mes "[Masione]"; mes "Whoa! Hey!"; if (ep14_2_big != 9) { @@ -3794,7 +3794,7 @@ eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{ mes "["+ strcharinfo(0) +"]"; mes "That's not it. I was just curious about the Laphine you saw in the field."; next; - emotion e_omg; + emotion ET_HUK; mes "[Pompe]"; mes "Oy! That Laphine?"; next; @@ -3868,7 +3868,7 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{ mes "You really seem like you have an impressive aura."; next; select("Do you know the way?"); - emotion e_sob; + emotion ET_CRY; mes "[Giranni]"; mes "I'm sorry? Do I know the way...?"; mes "No, no, I'm not someone like that."; @@ -4080,7 +4080,7 @@ ecl_in01,54,91,2 script Dandy#eclbig 4_M_FAIRYKID2,{ mes "[Dandy]"; mes "A Laphine can freely change in between different clothes, but not any Laphine looks this great!"; next; - emotion e_pif,0,"Lafiki#eclbig"; + emotion ET_HNG, getnpcid(0, "Lafiki#eclbig"); mes "[Lafiki]"; mes "What nonsensical nonsense are you saying? No matter who looks at it, this region's best looker is me!"; close; @@ -4090,12 +4090,12 @@ ecl_in01,53,92,4 script Lafiki#eclbig 4_M_FAIRYKID3,{ mes "[Lafiki]"; mes "My fashion sense today is excellent as usual. Heh-"; next; - emotion e_lv2; + emotion ET_BIGTHROB; mes "[Lafiki]"; mes "Hello~ My beautiful body~"; mes "Every strand of hair is so beautiful!"; next; - emotion e_gg,0,"Dandy#eclbig"; + emotion ET_KIK, getnpcid(0, "Dandy#eclbig"); mes "[Dandy]"; mes "Yes, it's definitely your garbage fashion sense that wreaks of trash as usual."; close; @@ -4109,7 +4109,7 @@ eclage,101,130,5 script Wutapoa#eclbig 4_F_FAIRY,{ mes "[Wutapoa]"; mes "I'm going to make it the most decorative, beautiful Yai in Eclage!"; next; - emotion e_heh; + emotion ET_SMILE; mes "[Wutapoa]"; mes "Yay, woohoo!!!"; close; @@ -4132,7 +4132,7 @@ eclage,106,61,4 script Markoza#eclbig 4_M_FAIRYKID3,{ mes "[Markoza]"; mes "But would foreigners leave me be when I am this adorable?"; next; - emotion e_pif; + emotion ET_HNG; mes "[Markoza]"; mes "Man, wherever I go, my cuteness just complicates everything..."; close; @@ -4142,7 +4142,7 @@ ecl_in02,168,41,2 script Pambo#eclbig 4_F_FAIRYKID3,{ mes "[Pambo]"; mes "Do you like things that twinkle?"; next; - emotion e_lv2; + emotion ET_BIGTHROB; mes "[Pambo]"; mes "I love them so much!"; next; @@ -4160,7 +4160,7 @@ ecl_in02,168,41,2 script Pambo#eclbig 4_F_FAIRYKID3,{ mes "Heh heh heh~ Huhuhe~ Hoho~"; mes "Kehehe~ Halala~ Fufu~"; next; - emotion e_sob; + emotion ET_CRY; mes "[Pambo]"; mes "But there's nothing twinkling here..."; close; @@ -4173,7 +4173,7 @@ ecl_fild01,134,109,4 script Warao#eclbig 4_M_FAIRYKID5,{ mes "[Warao]"; mes "Come to think of it, I wonder how this foreigner will taste?"; next; - emotion e_gg; + emotion ET_KIK; mes "[Warao]"; mes "Hey hey, you know I'm kidding, right?"; close; @@ -4186,7 +4186,7 @@ ecl_in01,38,37,4 script A kneeling boy#eclbig 4_F_FAIRYKID6,{ mes "[A kneeling boy]"; mes "At first, it was because it was comfortable. Now it's because I can't stretch my legs out anymore."; next; - emotion e_sob; + emotion ET_CRY; mes "[A kneeling boy]"; mes "I try to stretch them out, and my legs are all asleep!!"; mes "Does that mean I have to fly around with my legs flexed like this?"; @@ -4198,27 +4198,27 @@ ecl_fild01,183,190,4 script Catering#eclbig 4_M_FAIRYSOLDIER,{ mes "Wahahaha! How do you do!"; mes "It's perfect weather for a picnic, no?"; next; - emotion e_wah; + emotion ET_KEK; mes "[Catering]"; mes "You say it's hard to pack for a picnic?"; next; - emotion e_no1; + emotion ET_BEST; mes "[Catering]"; mes "Don't you worry!"; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Catering]"; mes "This is a specialty combining acorns with 7 different kinds and 7 different levels of flavor collected by squirrels of Eclage!"; next; - emotion e_cash; + emotion ET_MONEY; mes "[Catering]"; mes "This specialty to-go box is only 2,999 coins!!!"; next; - emotion e_omg; + emotion ET_HUK; mes "[Catering]"; mes "Such a remarkable price!"; next; - emotion e_lv; + emotion ET_THROB; mes "[Catering]"; mes "If you order now, we also give you a disposable fork that feels like new even with a hundred uses!"; close; @@ -4229,7 +4229,7 @@ ecl_in01,41,103,1 script A blushing girl#eclbig 4_F_FAIRYKID4,{ mes "Do you see this balcony up top?"; mes "Mayor Jun appears there everytime there is an important occasion!"; next; - emotion e_lv2; + emotion ET_BIGTHROB; mes "[A blushing girl]"; mes "He's so handome!! Ahhh~"; close; @@ -4243,29 +4243,29 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{ mes "[Choir conductor]"; mes "Hello foreigner, we'll give you a taste of our harmony~"; next; - emotion e_ho; + emotion ET_DELIGHT; mes "[Choir]"; mes "Aaa~"; next; - emotion e_ho,0,"Choir member#eclbig01"; + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig01"); mes "[Choir]"; mes "Aaa~~"; mes "Aaa~"; next; - emotion e_ho,0,"Choir member#eclbig02"; + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig02"); mes "[Choir]"; mes "Aaa~~~"; mes "Aaa~~"; mes "Aaa~"; next; - emotion e_ho,0,"Choir member#eclbig03"; + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig03"); mes "[Choir]"; mes "Aaa~~~~"; mes "Aaa~~~"; mes "Aaa~~"; mes "Aaa~"; next; - emotion e_ho,0,"Choir member#eclbig04"; + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig04"); mes "[Choir]"; mes "Aaa~~~~~"; mes "Aaa~~~~"; @@ -4273,7 +4273,7 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{ mes "Aaa~~"; mes "Aaa~"; next; - emotion e_ho,0,"Choir member#eclbig05"; + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig05"); mes "[Choir]"; mes "Aaa~~~~~~"; mes "Aaa~~~~~"; @@ -4282,12 +4282,12 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{ mes "Aaa~~"; mes "Aaa~"; next; - emotion e_ho; - emotion e_ho,0,"Choir member#eclbig01"; - emotion e_ho,0,"Choir member#eclbig02"; - emotion e_ho,0,"Choir member#eclbig03"; - emotion e_ho,0,"Choir member#eclbig04"; - emotion e_ho,0,"Choir member#eclbig05"; + emotion ET_DELIGHT; + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig01"); + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig02"); + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig03"); + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig04"); + emotion ET_DELIGHT, getnpcid(0, "Choir member#eclbig05"); mes "[Choir]"; mes "Uhhurukukuruhuuhhurukukuruhuuh"; mes "Try to feel this~ The melody that flows~"; @@ -4300,7 +4300,7 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{ ecl_in01,51,103,4 script Choir member#eclbig01 4_M_FAIRYKID,{ mes "[Choir member]"; mes "Aaa~"; - emotion e_ho; + emotion ET_DELIGHT; close; } ecl_in01,53,103,4 duplicate(Choir member#eclbig01) Choir member#eclbig02 4_M_FAIRYKID @@ -7087,7 +7087,7 @@ ecl_in02,160,36,4 script Eirinn#nk 4_F_FAIRYKID6,{ mes "[Eirinn]"; mes "Something serious? Like, something untreatable??"; mes "Am I going to be like the leading actress who plays a tragic role in a soap opera?"; - emotion e_what; + emotion ET_QUESTION; } else if (isbegin_quest(4257) == 1) { if (checkquest(4258) == 2) { @@ -7480,7 +7480,7 @@ ecl_in01,26,88,5 script Cecilia#nk 4_F_FAIRYKID5,{ mes "No matter how many times I check some items are missing..."; mes "Is it because of the wanderers randomly showing up in town nowadays?"; next; - emotion e_gasp; + emotion ET_SURPRISE; mes "[Cecilia]"; mes "Hey~ hey~ listen!"; mes "Hey you, what are you doing over there?"; @@ -7494,7 +7494,7 @@ ecl_in01,26,88,5 script Cecilia#nk 4_F_FAIRYKID5,{ mes "[Cecilia]"; mes "For that reason you, who knows that our supplies are missing and who happens to be an outsider as well."; mes "Must be a thief!"; - emotion e_heh; + emotion ET_SMILE; next; mes "[Cecilia]"; mes "You have the right to have an attorney present and... no, never mind."; @@ -10672,7 +10672,7 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ next; cutin "EP14_etran1",1; mes "[Etran]"; - mes "Welcome welcomeow~! We are cat merchants, always serving guests as our kingeow~! Special sale! One piece of meat for 200제니!!"; + mes "Welcome welcomeow~! We are cat merchants, always serving guests as our kingeow~! Special sale! One piece of meat for 200 Zeny!!"; next; cutin "EP14_robert1",1; mes "[Robert]"; @@ -10938,11 +10938,11 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ mes "[Fili]"; if (BaseLevel < 100) { mes "Looking at this beautiful field, the song sings itself~"; - emotion e_ho; + emotion ET_DELIGHT; } else if (ep14_2_nines > 2) { mes "It's always so beautiful with flowers blooming everywhere."; - emotion e_ho; + emotion ET_DELIGHT; next; switch( select("Start a conversation:Laphine that loves the earth:Asking after adventurers") ) { mes "[Fili]"; @@ -10970,7 +10970,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ mes "There are four in the work group. Don't forget to tell everyone."; else { mes "Thanks. Can you hear the earth singing? The sound of flowers and trees dancing in the wind. You'll hear it someday."; - emotion e_lv; + emotion ET_THROB; changequest 13050,13059; getexp 300000,300000; getitem 6081,1;// Splendide_Coin @@ -11004,7 +11004,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ } else if (checkquest(13060,PLAYTIME) == 0) { mes "Should I say it's a relief that they're all alive...? Well...at least it's good that they're still alive."; - emotion e_dots; + emotion ET_THINK; } else if (isbegin_quest(13055) == 1) { if (isbegin_quest(13056) == 1 || isbegin_quest(13057) == 1 || isbegin_quest(13058) == 1) { @@ -11015,7 +11015,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ } else { mes "I'm glad they're all safe and sound. I'll be relieved if they finish their business quickly and go back...Thanks anyway!"; - emotion e_sigh; + emotion ET_OHNO; changequest 13055,13060; getexp 300000,300000; getitem 6081,1;// Splendide_Coin @@ -11054,7 +11054,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ select("......"); mes "[Fili]"; mes "Hmm...I can't just ignore them though..."; - emotion e_dots; + emotion ET_THINK; next; select("The adventurer on the third floor is starving!"); mes "[Fili]"; @@ -11080,7 +11080,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ next; mes "[Fili]"; mes "But you know, travelers...they want to go even more if it's dangerous."; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Fili]"; mes "^FF0000three adventurers^000000went into the tower recently. I'm not sure if they're still alive..."; @@ -11197,7 +11197,7 @@ ecl_fild01,222,290,5 script Singing Laphine#1 4_F_FAIRYKID,{ if (ep14_2_nines > 2) { if (checkquest(13059,PLAYTIME) == 0) { mes "Whew, did I sing too much? I'm so thirsty. A glass of rice wine sounds great, hah~"; - emotion e_spin; + emotion ET_CONFUSE; close; } } @@ -11206,11 +11206,11 @@ ecl_fild01,222,290,5 script Singing Laphine#1 4_F_FAIRYKID,{ mes "Did the great Fili send you? Man, he's got skills for sure! I shall start singing then!?"; else { mes "I suppose you came to tell me to start working? Don't worry, my voice will touch the earth~"; - emotion e_ho; + emotion ET_DELIGHT; } next; mes "As soon as the Laphine started singing, it began to warm my heart."; - emotion e_ho; + emotion ET_DELIGHT; erasequest 13051; } else if (isbegin_quest(13050) == 1) @@ -11263,7 +11263,7 @@ ecl_fild01,163,196,5 script Dancing Laphine#1 4_F_FAIRYKID3,{ mes "I would love to see the great Fili next time..."; else if (isbegin_quest(13050) == 1 && isbegin_quest(13053) == 1) { mes "Ah, it's you again! You're so insensitive. Anyway, you're here to tell me to start working, right? I see, I see. You can go now."; - emotion e_pif; + emotion ET_HNG; erasequest 13053; } else if (isbegin_quest(13050) == 1) @@ -11309,16 +11309,16 @@ ecl_fild01,237,181,5 script Cute Laphine#1 4_M_FAIRYKID5,{ mes "It takes a cute person like me to bring joy to the earth...Too bad that you'll never be able to do so!"; else if (isbegin_quest(13050) == 1 && isbegin_quest(13054) == 1) { mes "You're new, right? Tell him I'll start the work."; - emotion e_heh; + emotion ET_SMILE; erasequest 13054; } else if (isbegin_quest(13050) == 1) { mes "You might think smiling to the earth always is nothing, but it's not that easy actually. I mean, it's hard to be cute like me in the first place~"; - emotion e_heh; + emotion ET_SMILE; } else { mes "I hope someday the flowers, trees, grasses, and little creatures on this earth will smile with joy."; - emotion e_heh; + emotion ET_SMILE; } } else if (ep14_2_nines == 1) { @@ -11355,7 +11355,7 @@ ecl_fild01,237,181,5 script Cute Laphine#1 4_M_FAIRYKID5,{ mes "Anyway, you should find some work for the earth as well. Tell Fili that I'll start working."; next; mes "As soon as he finished talking, he put on a bright smile."; - emotion e_heh; + emotion ET_SMILE; erasequest 13054; } else @@ -11506,14 +11506,14 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ if (.@playtime_13062 == 0 && .@playtime_13064 == 0 && .@playtime_13066 == 0) { cutin "nines02",2; mes "No need to worry about me! ^FF0000I'll definitely go home this time!^000000 Thanks for everything! I'll take you out for a nice meal next time!"; - emotion e_thx; + emotion ET_THANKS; if (isbegin_quest(13058)) erasequest 13058; } else if (.@playtime_13062 == 2 || .@playtime_13064 == 2 || .@playtime_13066 == 2) { cutin "nines01",2; mes "Ah...What a relief...I'm so glad you're here. I was about to leave this tower alone! But I think I'm lost."; - emotion e_gasp; + emotion ET_SURPRISE; if (.@playtime_13062 == 2) { next; cutin "nines04",2; @@ -11555,7 +11555,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ else { cutin "nines04",2; mes "I'm starving to death though... Could you please help me, my friend?"; - emotion e_wah; + emotion ET_KEK; } if (isbegin_quest(13058)) erasequest 13058; @@ -11569,11 +11569,11 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ if (countitem(517) > 9 && countitem(6558) > 9) { cutin "nines02",2; mes "Ah, how long has it been since the last time I saw food! Yummm! Thank goodness it's meat! I think it's a little tough...and not warm enough...but still, it's meat!!"; - emotion e_thx; + emotion ET_THANKS; next; mes "[New Oz]"; mes "Thank you so much!! Yum yum. You're such a good friend! Munch munch."; - emotion e_no1; + emotion ET_BEST; next; mes "[New Oz]"; mes "I should get a hustle on and find a way out now! I feel like I can get out of here this time!"; @@ -11621,14 +11621,14 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ select("Why don't you just eat whatever I get you!"); mes "[New Oz]"; mes "As long as I'm getting something to eat, I was just hoping for a good one. I'm sorry, but do me a favor please. I couldn't forget the taste of the meat."; - emotion e_slur; + emotion ET_SEXY; if (.@playtime_13062 == 2) erasequest 13062; setquest 13061; break; case 2: mes "Okay...I see. I'll try to find another way then. If you meet that muscular Laphine on your way out, tell him I won't be able to see him again..."; - emotion e_wah; + emotion ET_KEK; } } break; @@ -11640,7 +11640,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ else if (checkquest(13063,HUNTING) == 2) { cutin "nines02",2; mes "Hey, you really are a good adventurer! I'm actually starting to like you even more."; - emotion e_flash; + emotion ET_SPARK; next; mes "[New Oz]"; mes "I'll take care of the rest. I can't just keep bothering you, right? Hahaha."; @@ -11650,7 +11650,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ } else if (checkquest(13063,HUNTING) == 1) { mes "These guys are not really visible and they're so annoying. Ah...I asked you to clean up, but it's not because I'm lazy or anything. Hahaha..."; - emotion e_no; + emotion ET_STARE_ABOUT; } else { cutin "nines03",2; @@ -11662,14 +11662,14 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ cutin "nines04",2; mes "[New Oz]"; mes "Of course I can do it on my own~ But if I do it alone, then I'll end up using too much of my energy, and then I'll get hungry again..."; - emotion e_dots; + emotion ET_THINK; next; switch( select("So you want me to help you brushing off the dust?:Do it yourself then!") ) { mes "[New Oz]"; case 1: cutin "nines02",2; mes "How did you know? I think we're really clicking! If I have a chance, I'll let you join my guild later."; - emotion e_ok; + emotion ET_OK; next; mes "[New Oz]"; mes "Fight off some Cherenes then. You don't have to eliminate that many because I'll start fighting soon, too! Haha."; @@ -11698,7 +11698,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ next; mes "[New Oz]"; mes "I'll make sure to give my friends all the souvenirs you collected for me, and I'll tell them about you, too!"; - emotion e_thx; + emotion ET_THANKS; delitem 6560,20;// Leaf_Bookmark changequest 13065,13066; getexp 300000,300000; @@ -11715,7 +11715,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ next; mes "[New Oz]"; mes "Would you mind helping me with that? What are friends for! Hahaha! Thanks!!"; - emotion e_otl; + emotion ET_OTL; erasequest 13065; } else { @@ -11806,7 +11806,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ next; mes "[New Oz]"; mes "If you look at the books scattered all over the tower, there are bookmarks inside. I think it'll be a great gift for my friends even though it has someone else's memories."; - emotion e_flash; + emotion ET_SPARK; next; mes "[New Oz]"; mes "^FF0000A good melody^000000 just came across my mind, and I think I should start writing a song now. You should collect souvenirs for me in the meantime."; @@ -11827,7 +11827,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ next; mes "[New Oz]"; mes "I should bring some souvenirs to make them feel better. Is there anything I could use?"; - emotion e_what; + emotion ET_QUESTION; next; switch( select("Jellopy:Lucky Egg:Loots from local monsters") ) { case 1: @@ -11838,7 +11838,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ cutin "nines04",2; mes "[New Oz]"; mes "Hey... but it's not something we can get around here."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; select("Loots from local monsters"); } @@ -11846,7 +11846,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ case 2: mes "[New Oz]"; mes "Hmm? What's that for? I guess new items came out while I was travelling."; - emotion e_what; + emotion ET_QUESTION; next; mes "[New Oz]"; mes "I can't get them unless I know what they are. Is there anything else?"; @@ -11862,7 +11862,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ cutin "nines01",2; mes "[New Oz]"; mes "Loots from local monsters...hmm, that sounds interesting!"; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[New Oz]"; mes "I'm sure they haven't made it here yet. So it's something new for them, too! Right?"; @@ -11892,7 +11892,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ select("I don't see anything."); mes "[New Oz]"; mes "No, you have to see them carefully. Those Dustballs over there are covering my eyes, and when I can't see clearly, I get sleepy and hungry..."; - emotion e_wah; + emotion ET_KEK; next; select("I think it's just your imagination!"); cutin "nines03",2; @@ -12322,7 +12322,7 @@ ecl_tdun04,26,39,1 script Professor Worm#worm 4_M_PROFESSORWORM,{ mes "Wait, there are no more spaces on the wall!"; mes "Who doodled so much on the walls?"; mes "Is it you, monster?"; - emotion e_swt,1; + emotion ET_SWEAT, playerattached(); next; mes "[Professor Worm]"; mes "I guess I would have to write a diary then..."; @@ -12650,7 +12650,7 @@ ecl_tdun03,21,69,5 script Diary Frog No.3#worm 4_FROG,{ case 3: mes "I used to have more, but unfortunately, the fuel I need to live is the recordings themselves, so part of it got digested away."; mes "It's the way I work so I can't do much about it."; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; } } @@ -13036,7 +13036,7 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ mes "Moreover, the biggest reason why Eclage is so crowded recently is...!!!"; next; select("It is...?!"); - emotion e_loud; + emotion ET_BLABLA; mes "[Fome]"; mes "A new Mayor Jun was born!"; next; @@ -13139,9 +13139,9 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ OnTouch: if (ep14_2_mylord == 0 && BaseLevel > 98) { mes "A group of travelers of Alpheim are having a conversation."; - emotion e_loud; - emotion e_loud,0,"Traveler Litrip#tl02"; - emotion e_loud,0,"Traveler Chiba#tl03"; + emotion ET_BLABLA; + emotion ET_BLABLA, getnpcid(0, "Traveler Litrip#tl02"); + emotion ET_BLABLA, getnpcid(0, "Traveler Chiba#tl03"); next; switch( select("Avoid them.:Join the group.") ) { case 1: @@ -15464,7 +15464,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ case 0: mes "[Leo]"; mes "Hi, how are you?"; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[Leo]"; mes "How are you, really!"; @@ -15535,7 +15535,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ mes "I'll be counting on you!"; close; } - emotion e_flash; + emotion ET_SPARK; mes "Ohhhhh look at that!!!"; mes "Sweet pickled fruits and honey jam that is even sweeter!!!"; mes "You saved my life."; @@ -15791,7 +15791,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ close; S_Setquest7423: select("You don't like the king?"); - emotion e_dots; + emotion ET_THINK; mes "[Leo]"; mes "No, it's not that I don't like him. I'm rather concerned...or having trouble trusting him...something like that."; mes "Since he didn't do anything wrong, I don't have any reason to hate him, but.."; @@ -15817,7 +15817,7 @@ ecl_fild01,205,86,3 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{ mes "It's hard."; mes "It really is hard."; mes "The more I think about it, I feel like Shenime has a nasty temper."; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "[Roy]"; mes "You, who appeared in this time of crisis."; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 4e8c719920..767afc798b 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -382,7 +382,7 @@ mal_in02,28,56,5 script Samuel#mal 495,{ mes "Kha~ It was nice!!!!"; mes "I was fascinated by that attraction and took the ship, Navi!"; mes "This thing is called the romance of a guy. Hoo hoo~"; - emotion e_shy; + emotion ET_SHY; next; mes "[Samuel]"; mes "Well... His cuticle seems to have gone bad a bit with his village chief duty, since he settled in Malangdo. But his eyes are still the same."; @@ -420,7 +420,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Samuel]"; mes "Yes, Admiral!"; mes "Moved all 3 thousand boxes, including the one I just received, to the storage. The next boxes are expected to be delivered in 5 hours!"; - emotion e_omg,0,"Samuel#mal"; + emotion ET_HUK, getnpcid(0, "Samuel#mal"); next; mes "[Tomas, Village Chief]"; mes "Samuel!"; @@ -429,7 +429,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Samuel]"; mes "Sorry! Village Chief!"; mes "I will correct myself!"; - emotion e_omg,0,"Samuel#mal"; + emotion ET_HUK, getnpcid(0, "Samuel#mal"); next; mes "[Tomas, Village Chief]"; mes "Hmm, hmm!"; @@ -441,22 +441,22 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Samuel]"; mes "Yes! Village Chief!"; mes "Seaweed, Sea cucumbers, sea squirts, sea anemones to the right! Seaweed and glasses downstairs! Send anchovies and drums to the gathering place! Let the rest stack assortatively in the corner!"; - emotion e_omg,0,"Samuel#mal"; + emotion ET_HUK, getnpcid(0, "Samuel#mal"); next; mes "[Tomas, Village Chief]"; mes "It it not."; mes "Sea cucumbers, sea squirts, sea anemones to the right. Seaweed and kelp downstairs. Anchovies and drums to the gathering place. Let the rest stack assortatively in the corner."; - emotion e_dots; + emotion ET_THINK; next; mes "[Samuel]"; mes "Yes!!"; - emotion e_omg,0,"Samuel#mal"; + emotion ET_HUK, getnpcid(0, "Samuel#mal"); next; mes "[Tomas, Village Chief]"; mes "Huuu..."; mes "It doesn't seem to end."; mes "There are still piles of paperwork to do... I will be in trouble unless I finish them up before the next boxes arrive."; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Tomas, Village Chief]"; mes "So, the amount of the next boxes is 1300...."; @@ -473,7 +473,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ case 1: mes "[Tomas, Village Chief]"; mes "...So I told you your face was not familiar."; - emotion e_dots; + emotion ET_THINK; next; mes "[Tomas, Village Chief]"; mes "Hmm... Sorry, but as I told you before, would you talk to the other cats if it's not that urgent, since I have plenty of work left undone and no time to talk with you."; @@ -482,7 +482,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Tomas, Village Chief]"; mes "...Anyway all are always good to leave me with the work."; mes "Pitiless ones..."; - emotion e_an; + emotion ET_FRET; next; mes "[Tomas, Village Chief]"; mes "Umm... Having said that, would you talk to the other cats if it's not that urgent, since I got plenty of work to do left undone and no time to talk with you?"; @@ -531,11 +531,11 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "Admiral!"; mes "Sea bass, sea jelly, sea sponge are well arranged on the right!"; mes "Seaweed and kiwi downstairs! Anchovies and cod to the gathering place! Let the rest stack assortatively in the corner?"; - emotion e_omg,0,"Samuel#mal"; + emotion ET_HUK, getnpcid(0, "Samuel#mal"); next; mes "[Tomas, Village Chief]"; mes "...."; - emotion e_dots; + emotion ET_THINK; next; mes "[Tomas, Village Chief]"; mes "...."; @@ -550,7 +550,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "You!!"; mes "How many times did I tell you! Mew~"; mes "Huh?!"; - emotion e_an; + emotion ET_FRET; cutin "ma_tomas03",2; next; mes "[Tomas, Village Chief]"; @@ -558,7 +558,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ next; mes "[Tomas, Village Chief]"; mes "Huh?! If you really want to put Sea bass to the right that much, let yourself stand there all day long! Mew~"; - emotion e_omg,0,"Samuel#mal"; + emotion ET_HUK, getnpcid(0, "Samuel#mal"); next; mes "[Tomas, Village Chief]"; mes "I'm busy enough without you. You're getting on my nerves! Mew~"; @@ -567,14 +567,14 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Tomas, Village Chief]"; mes "Ooops!!!"; mes "!!!!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Tomas, Village Chief]"; mes "Hmm, hmm..."; mes "Well... what are you still doing here?"; mes "Go to the regular meeting being held now at the end of the corridor."; mes "Ahem...."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; cutin "ma_tomas02",2; close2; cutin "",255; @@ -585,7 +585,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "Well... what are you still doing here?"; mes "Go to the regular meeting being held now at the end of the corridor."; mes "Ahem...."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; cutin "ma_tomas02",2; close2; cutin "",255; @@ -594,7 +594,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Tomas, Village Chief]"; mes "How is the meeting going on?"; mes "It's been a long time since I visited, since I'm busy... Tsk..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; cutin "ma_tomas02",2; close2; cutin "",255; @@ -603,13 +603,13 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "[Tomas, Village Chief]"; mes "Hoh!"; mes "There have been such issues!"; - emotion e_ic; + emotion ET_AHA; cutin "ma_tomas04",2; next; mes "[Tomas, Village Chief]"; mes "I felt uneasy since I couldn't take care of you, being so busy."; mes "You already got used to Malangdo well enough by yourself."; - emotion e_heh; + emotion ET_SMILE; next; mes "[Tomas, Village Chief]"; mes "Then, as village chief and the admiral of the cat association, I'd like you to get along with me as well!"; @@ -624,7 +624,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{ mes "Ha ha ha!"; mes "How are you doing?"; mes "Come to me if anything difficult happens."; - emotion e_heh; + emotion ET_SMILE; cutin "ma_tomas04",2; close2; cutin "",255; @@ -655,27 +655,27 @@ mal_in02,182,61,3 script President of Meeting#mal 421,{ mes "Umm... Yes. Then, please say first, ^6666ccScottfold^000000."; set ma_tomas,2; changequest 11209,11210; - emotion e_paper,0,"Scottfold#mal"; + emotion ET_WRAP, getnpcid(0, "Scottfold#mal"); close; } else if (ma_tomas == 2) { mes "[President of Meeting]"; mes "Umm... Yes. Please speak first, ^6666ccScottfold^000000."; - emotion e_paper,0,"Scottfold#mal"; + emotion ET_WRAP, getnpcid(0, "Scottfold#mal"); close; } else if (ma_tomas == 3) { mes "[President of Meeting]"; mes "Please speak, Koon.... next."; - emotion e_paper,0,"Koon#mal"; + emotion ET_WRAP, getnpcid(0, "Koon#mal"); close; } else if (ma_tomas == 4) { mes "[President of Meeting]"; mes "There will be a presentation by Dr. Devore on his study continuously."; - emotion e_paper,0,"Linguist Devore#mal"; + emotion ET_WRAP, getnpcid(0, "Linguist Devore#mal"); close; } else if (ma_tomas == 5) { mes "[President of Meeting]"; mes "Please speak next, Dr. Mali."; - emotion e_paper,0,"Geologist Mali#mal"; + emotion ET_WRAP, getnpcid(0, "Geologist Mali#mal"); close; } else if (ma_tomas == 6) { mes "[President of Meeting]"; @@ -693,7 +693,7 @@ mal_in02,182,61,3 script President of Meeting#mal 421,{ next; mes "[President of Meeting]"; mes "I feel really sick sometimes when the meeting is prolonged."; - emotion e_sob; + emotion ET_CRY; close; } @@ -723,7 +723,7 @@ mal_in02,178,66,5 script Scottfold#mal 422,{ mes "Then for the next... yes, Koon please speak now."; set ma_tomas,3; changequest 11210,11211; - emotion e_paper,0,"Koon#mal"; + emotion ET_WRAP, getnpcid(0, "Koon#mal"); close; } mes "[Scottfold]"; @@ -764,7 +764,7 @@ mal_in02,177,58,7 script Koon#mal 546,{ mes "Yes. Carry on please."; set ma_tomas,4; changequest 11211,11212; - emotion e_paper,0,"Linguist Devore#mal"; + emotion ET_WRAP, getnpcid(0, "Linguist Devore#mal"); close; } mes "[Koon]"; @@ -789,7 +789,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ next; mes "[Linguist Devore]"; mes "Let me say the definite conclusion first. Since ^0000FFthe study on the Starfish language^000000 started from the time we settled in Malangdo, there's been no remarkable outcome yet."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Linguist Devore]"; mes "Of course it is possible to talk with ^6666ccBiscuit^000000 somehow, but this is not close to the result we expected to solve the situation."; @@ -823,7 +823,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "Then, let's wrap up the progress of the language study, and listen to Geologist, Dr. Mali."; set ma_tomas,5; changequest 11212,11213; - emotion e_paper,0,"Geologist Mali#mal"; + emotion ET_WRAP, getnpcid(0, "Geologist Mali#mal"); close; } else if (ma_tomas < 18) { mes "[Linguist Devore]"; @@ -833,7 +833,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "I should solve the puzzling Starfish language soon."; mes "I'm ashamed to see you all like this as a result."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; close; } else if (ma_tomas == 18) { mes "[Linguist Devore]"; @@ -850,7 +850,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "But this Starfish is just mysterious."; mes "I cannot understand it at all."; mes "I am rather doubtful to say it's actual 'language'."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Linguist Devore]"; mes "I have no clue, though I study it in various ways."; @@ -867,7 +867,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "Wooaaa wooaaa ahhh!!!!"; mes "I don't see what's wrong here!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Linguist Devore]"; mes "Why are they here and what do they want!"; @@ -879,7 +879,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "Wooaaa wooaaa ahhh!!!!"; mes "I don't see what's wrong here!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Linguist Devore]"; mes "Why are they here and what do they want!"; @@ -890,7 +890,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "What?! What did you say?!"; mes "Fluently said!"; mes "How come!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Linguist Devore]"; mes "I can't believe it unless I see it with my own eyes."; @@ -905,7 +905,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "The study by this time was just making a totally wrong guess!"; mes "But before you're disappointed, I'd rather be happy enough to get the answer."; - emotion e_no1; + emotion ET_BEST; next; mes "[Linguist Devore]"; mes "Once we get the answer, it's only a matter of time before understanding the Starfish language."; @@ -914,7 +914,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "Is it true?!"; mes "Did Biscuit say so?!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Linguist Devore]"; mes "Ah, ah! Thanks to you, "+strcharinfo(0)+"!"; @@ -927,7 +927,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "Ah, and I really want to tell this happy news to our chief, Tomas."; mes "Please!!"; - emotion e_hlp; + emotion ET_HELP; set ma_tomas,35; changequest 11236,11237; getitem 6422,30; //Egrade_Coin @@ -936,14 +936,14 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{ mes "[Linguist Devore]"; mes "Ah, and I really want to tell this happy news to our chief, Tomas."; mes "Please!!"; - emotion e_hlp; + emotion ET_HELP; close; } mes "[Linguist Devore]"; mes "Ah, ah!!"; mes "The study on Starfish is going well."; mes "It could've really been a disaster, if you, "+strcharinfo(0)+", didn't help us."; - emotion e_thx; + emotion ET_THANKS; close; } @@ -952,7 +952,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "[Geologist Mali]"; mes "Malangdo is named because the ground here is so soft, mew~"; mes "It gets hard when you touch it, mew~"; - emotion e_slur; + emotion ET_SEXY; close; } else if (ma_tomas == 5) { mes "[Geologist Mali]"; @@ -969,25 +969,25 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ next; mes "[Geologist Mali]"; mes "As everyone has their own work to do, I understand that we all must be busy. But I'd like to participate in this repairing, since it's related to our life."; - emotion e_hlp; + emotion ET_HELP; next; mes "[Brie]"; mes "Wait!"; mes "It's not something to be done only with instant repairs!"; mes "My father was seriously injured from the earthquake some time ago!"; - emotion e_omg,0,"Brie#mal"; + emotion ET_HUK, getnpcid(0, "Brie#mal"); next; mes "[President of Meeting]"; mes "Mr. Brie!! I understand what your situation is, but please clam dowm, since we're having a meeting."; set ma_tomas,6; changequest 11213,11214; - emotion e_paper,0,"Brie#mal"; + emotion ET_WRAP, getnpcid(0, "Brie#mal"); close; } else if (ma_tomas < 13) { mes "[Geologist Mali]"; mes "You attended to the meeting instead of your father today, Brie."; mes "He's quite unfriendly but devoted to his parents, mew~"; - emotion e_heh; + emotion ET_SMILE; next; mes "[Geologist Mali]"; mes "Mr. Brie was not a member of our group at first, but he joined in after getting the news that his father, Rican, joined in with the new trade course development, mew~"; @@ -1009,12 +1009,12 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "[Geologist Mali]"; mes "Soft and sticky feeling like this..."; mes "Haha~ it gets you addicted to it..."; - emotion e_shy; + emotion ET_SHY; next; mes "[Geologist Mali]"; mes "Oops!!"; mes "I was about to be sunk into this softness, mew~!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Geologist Mali]"; mes "Though it's got the risk of making you lose your mind, it helped the ship Navi not to break, mew~"; @@ -1025,7 +1025,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "[Geologist Mali]"; mes "Moreover!!"; mes "How come it's been ^0000FFcracked with this softness^000000, mew~!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Geologist Mali]"; mes "If this ^0000FFcrack goes on, the underground support may collapse^000000, mew..."; @@ -1043,7 +1043,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "Khhh!!!"; mes "What a beatiful young person in this hard world!!!"; mes "Whenever I come across a person like you, I feel this life is still good to live, mew~"; - emotion e_sob; + emotion ET_CRY; next; mes "[Geologist Mali]"; mes "Please listen to ^6666ccmy assistant, Bob^000000 in detail, mew~"; @@ -1055,7 +1055,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "[Geologist Mali]"; mes "Woohoohoo."; mes "I~will~be~waiting~for~you~~"; - emotion e_lv2; + emotion ET_BIGTHROB; close; } } else if (ma_tomas == 14) { @@ -1063,7 +1063,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "Khhh!!!"; mes "What a beatiful young person in this hard world!!!"; mes "Whenever I come across a person like you, I feel this life is still good to live, mew~"; - emotion e_sob; + emotion ET_CRY; next; mes "[Geologist Mali]"; mes "Please listen to ^6666ccmy assistant, Bob^000000 in detail, mew~"; @@ -1079,17 +1079,17 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "[Geologist Mali]"; mes "Ah! Bob complimented you so much on your great job, mew~"; mes "Please help us next time again when you can, mew~"; - emotion e_no1; + emotion ET_BEST; next; mes "[Linguist Devore]"; mes "I made this, since the Starfish study was well finished and you didn't need to do such hard work like this!"; mes "Sob sob!!!"; - emotion e_sob,0,"Linguist Devore#mal"; + emotion ET_CRY, getnpcid(0, "Linguist Devore#mal"); next; mes "[Geologist Mali]"; mes "Ohhh! What are you talking about Dr. Devore, mew~!!!!"; mes "I don't think that way at~~all, mew~!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Geologist Mali]"; mes "Everyone knows how you, Dr. Devore, are studying hard, mew~!!!"; @@ -1144,7 +1144,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{ mes "[Geologist Mali]"; mes "Soft and sticky feeling like this..."; mes "Haha~ it gets you addicted to it..."; - emotion e_slur; + emotion ET_SEXY; close; } @@ -1153,7 +1153,7 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "[Bob]"; mes "You bow-wow! bow! wow! I mew! mew! mew!"; mes "I'm into juice from delicious fish, mew~"; - emotion e_ho; + emotion ET_DELIGHT; close; } else if (ma_tomas == 14) { // Dialogue in repeatable quest is identical. @@ -1165,12 +1165,12 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "[Bob]"; mes "You bow-wow! bow! wow! I mew! mew! mew!"; mes "I'm into juice from delicious fish, mew~"; - emotion e_ho; + emotion ET_DELIGHT; next; mes "[Bob]"; mes "Ah ahhh!!!!!!!!!!!"; mes "Are you here for voluntary service?!"; - emotion e_omg; + emotion ET_HUK; next; if (checkweight(1201,1) == 0) { mes "[Bob]"; @@ -1191,14 +1191,14 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "Impressed!!!"; mes "I am impressed!!!"; mes "The impressive mind is dancing in my heart!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bob]"; mes "I treated the people like I looked down on them and had a prejudice against human beings!!!"; mes "I feel like crying with scales!!!!"; mes "Impressed!!!"; mes "Impression Pegasus Hurricane!!!"; - emotion e_omg; + emotion ET_HUK; next; select("Stop it! Tell me how to repair the cracks."); mes "[Bob]"; @@ -1232,7 +1232,7 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "I see..."; mes "Disappointed..."; mes "Hoohoot shh shh~"; - emotion e_otl; + emotion ET_OTL; close; } } else if (ma_tomas == 15) { @@ -1271,7 +1271,7 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "[Bob]"; mes "Khhh~~~~~~~~~~~~~~~~~~~~~~"; mes "That was perfect!"; - emotion e_no1; + emotion ET_BEST; next; mes "[Bob]"; mes "The adhesive filled in just right!!"; @@ -1282,7 +1282,7 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "Impressed!"; mes "Mysterious!"; mes "Shocked!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bob]"; mes "You did a great job indeed!!!"; @@ -1302,7 +1302,7 @@ mal_in02,140,94,0 script Bob#mal 553,{ mes "[Bob]"; mes "You bow-wow! bow! wow! I mew! mew! mew!"; mes "I'm into juice from delicious fish, mew~"; - emotion e_ho; + emotion ET_DELIGHT; close; } @@ -1569,7 +1569,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "Woo waa hoohoo..."; mes "Woowaa ahhh ahh ahh..."; mes "I'm impatient... to stay home like this!!"; - emotion e_yawn; + emotion ET_SLEEPY; next; mes "[Rican]"; mes "When will my legs recover, when?!"; @@ -1582,7 +1582,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "All I can do is press the button all day long~"; mes "This is not exciting at all~"; mes "I'm not willing to do anything more and more~ Doobie dooba~"; - emotion e_yawn; + emotion ET_SLEEPY; next; select("Excuse me. Is this Rican's house?"); mes "[Rican]"; @@ -1591,7 +1591,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "I am Rican!"; mes "It's good to see you, since I'm so bored now..."; mes "Tell me what's happening right now! Now!"; - emotion e_omg; + emotion ET_HUK; next; select("Ask about Yggdrasil Berry."); mes "[Rican]"; @@ -1599,7 +1599,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "You... you know something!"; mes "Umm, hahaha!"; mes "Only a few cats know about Yggdrasil Berry!"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Rican]"; mes "Well, before I traded them with human beings like you, Yggdrasil Berry was not thought to be a very remarkable fruit."; @@ -1607,7 +1607,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "[Rican]"; mes "It used to be spread out here and there in my old town. It doesn't have a good taste and causes indigestion, mew~"; mes "Cats need to eat fishes, naturally."; - emotion e_slur; + emotion ET_SEXY; next; mes "[Rican]"; mes "But if human beings eat this, it gets you fully recharged."; @@ -1622,14 +1622,14 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "[Rican]"; mes "Very long ago..."; mes "Our group left the town for a new course to trade."; - emotion e_shy; + emotion ET_SHY; next; mes "[Rican]"; mes "Actually, we dominated the areas around our town, and it was like a challenge to find unexplored areas."; next; mes "[Rican]"; mes "But discovering the unknown is the romance of a man, isn't it?"; - emotion e_awsm; + emotion ET_COOL; next; mes "[Rican]"; mes "Well, the beginning was quite nice, anyway."; @@ -1637,7 +1637,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ next; mes "[Rican]"; mes "The sea has enough fishes in it, but it made me bored. I wanted to eat seasoning, like radish with chicken the most."; - emotion e_rice; + emotion ET_HUNGRY; next; mes "[Rican]"; mes "Though we drifted for a very long time, we couldn't land on any island. Rather, we met storms."; @@ -1653,7 +1653,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "Khhh khhh!"; mes "Can you believe it?"; mes "^0000FFThat enormous ship just flied, vroom~~ like an airship and was dropped here in the middle of this island!^000000"; - emotion e_omg; + emotion ET_HUK; next; mes "[Rican]"; mes "Anyhow, I survived, but most of the goods in the ship were swept and we were left with only Yggdrasil Berry."; @@ -1661,7 +1661,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "[Rican]"; mes "Huh? Why did we load them, if we don't eat them?"; mes "It... it's the secret..."; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Rican]"; mes "Well, it's not important. As we sent reconnaissance groups there, we found out that there's a land where the other kind lives, not like us."; @@ -1684,12 +1684,12 @@ mal_in01,114,169,5 script Rican#mal 547,{ next; mes "[Rican]"; mes "Since it disappears as we prepare, it's definately the best for our group."; - emotion e_pat; + emotion ET_GOODBOY; next; mes "[Rican]"; mes "By the way, as I got injured in this important season, it harms my credibility if I don't meet the deadline to deliver the amount ordered!"; mes "Trading is credibility!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Rican]"; mes "For this reason, would you like to help me?"; @@ -1704,25 +1704,25 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "[Rican]"; mes "Harvesting Yggdrasil Berry is very easy."; mes "You can get it when you just dig the ground, mew~"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; select("?!"); mes "[Rican]"; mes "Huh?"; mes "Doesn't it originally come from the ground?"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; select("Doesn't it grow on trees?"); mes "[Rican]"; mes "Well, the Yggdrasil Berry in Midgard could do so."; mes "But ^6666ccwe dig our Yggdrasil Berry here from the ground^000000."; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Rican]"; mes "You can get it on Malangdo Island easily. Bring me about 30."; mes "Ah! Keep the secret to my son for sure~"; mes "Then please^ff99cc!!!^000000 please^ff99cc!!!^000000 please~~~"; - emotion e_kis; + emotion ET_CHUP; set ma_tomas,9; changequest 11216,11217; close; @@ -1738,7 +1738,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "You can get it on Malangdo Island easily. Bring me about 30."; mes "Ah! Keep the secret to my son for sure~"; mes "Then please^ff99cc!!!^000000 please^ff99cc!!!^000000 please~~~"; - emotion e_kis; + emotion ET_CHUP; close; } mes "[Rican]"; @@ -1840,7 +1840,7 @@ mal_in01,114,169,5 script Rican#mal 547,{ mes "30 Yggdrasil Berry. You can easily find it in Malangdo!!"; mes "Ah! Keep the secret to my son for sure~"; mes "Then please^ff99cc!!!^000000 please^ff99cc!!!^000000 please~~~"; - emotion e_kis; + emotion ET_CHUP; setquest 11238; close; case 2: @@ -1873,7 +1873,7 @@ mal_in01,116,168,0 script Dry Machine#mal 563,{ case 1: mes "[Rican]"; mes "I'll press the button by myself!!!"; - emotion e_omg,0,"Rican#mal"; + emotion ET_HUK, getnpcid(0, "Rican#mal"); next; mes "- The machine starts operating -"; mes "- when he presses the button. -"; @@ -1911,7 +1911,7 @@ mal_in01,116,168,0 script Dry Machine#mal 563,{ mes "- I feel like I'm touching -"; mes "- something bad. -"; mes "- Ah, ah! Feels bad... -"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); } set .off,1; donpcevent "Water Sand"+strnpcinfo(2)+"#mal::OnEnable"; @@ -1998,12 +1998,12 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "[Biscuit]"; mes "Star Candy sacrifices herself like this, but those fellows are setting the pillars around her for themselves only."; mes "Hewww!!!"; - emotion e_ag; + emotion ET_ANGER; next; mes "[Biscuit]"; mes "They talk to her, but ignore me when I talk to her."; mes "I don't like them at all!!!"; - emotion e_ag; + emotion ET_ANGER; next; mes "- Unlike the words of Dr. Devore, Biscuit appears fluent in speaking. -"; next; @@ -2026,7 +2026,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "[Linguist Devore]"; mes "Ummm? What do you mean?"; mes "I cannot hear anything."; - emotion e_what,0,"Linguist Devore#mald"; + emotion ET_QUESTION, getnpcid(0, "Linguist Devore#mald"); next; mes "["+strcharinfo(0)+"]"; mes "Huh? Biscuit said 'Well, that fellow is often the one ignoring my words. He wavers with words to say and makes me uncomfortable.'?"; @@ -2034,29 +2034,29 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "[Linguist Devore]"; mes "What? What are you taling about?"; mes "I cannot hear anything."; - emotion e_what,0,"Linguist Devore#mald"; + emotion ET_QUESTION, getnpcid(0, "Linguist Devore#mald"); next; mes "["+strcharinfo(0)+"]"; mes "Huh?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Linguist Devore]"; mes "Ah?!"; mes "Ah?!?!?!?!?!?"; mes "Ah!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; - emotion e_omg,0,"Linguist Devore#mald"; + emotion ET_HUK, getnpcid(0, "Linguist Devore#mald"); next; mes "[Linguist Devore]"; mes "If... if that's the cause!"; mes "We may have totally misunderstood!"; - emotion e_omg,0,"Linguist Devore#mald"; + emotion ET_HUK, getnpcid(0, "Linguist Devore#mald"); next; mes "[Linguist Devore]"; mes "Oh my, we couldn't have known, since we live here only with ourselves."; next; mes "[Linguist Devore]"; mes "Each living thing has its own area for audibility and vocalization. But we and Biscuit were in slightly different areas!"; - emotion e_omg,0,"Linguist Devore#mald"; + emotion ET_HUK, getnpcid(0, "Linguist Devore#mald"); next; mes "[Linguist Devore]"; mes "In such conditions, we cannot hear any language properly!"; @@ -2076,7 +2076,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "["+strcharinfo(0)+"]"; mes "Wait, Dr. Devore, what on earth is next...?"; mes "What should I do...?"; - emotion e_dots,1; + emotion ET_THINK, playerattached(); next; mes "[Linguist Devore]"; mes "Hahaha~ You are the kind who can have conversations with Biscuit. Please try to talk with him."; @@ -2084,7 +2084,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ next; mes "[Biscuit]"; mes "Hey... Don't look down on me!"; - emotion e_ag; + emotion ET_ANGER; donpcevent "Linguist Devore#mald::OnDisable"; set ma_tomas,22; completequest 11228; @@ -2101,7 +2101,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "Star Candy?"; mes "Tsk tsk!"; mes "It's no go, the lowly fellows."; - emotion e_ag; + emotion ET_ANGER; next; mes "[Biscuit]"; mes "You shouldn've recognized the previous and mysterious feeling from Star Candy!"; @@ -2111,12 +2111,12 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "How gorgeous she is that... umm..."; mes "Just gorgeous."; mes "She is so gorgeous... but I don't know how to explaing it..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Biscuit]"; mes "Khummm..."; mes "That's why the kinds speaking with sound are irritating."; - emotion e_ag; + emotion ET_ANGER; next; select("Speaking with sound?"); mes "[Biscuit]"; @@ -2138,7 +2138,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "[Biscuit]"; mes "Me?"; mes "I'm an assistant to Star Candy, a new star in the Starfish race with multi-faceted talents!"; - emotion e_flash; + emotion ET_SPARK; next; mes "[Biscuit]"; mes "Ah, ah..."; @@ -2148,7 +2148,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "[Biscuit]"; mes "But if the elderly see this, they'll dry me out in the sun..."; mes "It was a life like a flame... Sob sob sob sob"; - emotion e_sob; + emotion ET_CRY; if (ma_tomas == 23) set ma_tomas,24; if (ma_tomas == 25) @@ -2192,14 +2192,14 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ next; mes "[Biscuit]"; mes "How rude..."; - emotion e_ag; + emotion ET_ANGER; next; mes "[Biscuit]"; mes "You're not my subordinate, so I can't order you by force. But if Star Candy can't have her meal on time, you have to remember that this island will collapse completely."; next; mes "["+strcharinfo(0)+"]"; mes "...It's not a request, but a threat..."; - emotion e_dots,1; + emotion ET_THINK, playerattached(); close; } } else if (ma_tomas == 26) { @@ -2266,7 +2266,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "What's this!!!"; mes "Her skin is!!!!"; mes "She got an abscess on her skin that used to shine like a jewel!!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Biscuit]"; mes "She got in trouble with her dried skin, since she's here!"; @@ -2274,7 +2274,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ next; mes "[Biscuit]"; mes "Ah, ah! She's so kind that she sacrifices herself to save such things. Sob sob."; - emotion e_sob; + emotion ET_CRY; next; mes "[Biscuit]"; mes "Ah, ah..."; @@ -2328,7 +2328,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ next; mes "[Biscuit]"; mes "For such enormous skin as Star Candy's, it's full of barnacles, oysters, and mussels!!!"; - emotion e_omg; + emotion ET_HUK; close; } } else if (ma_tomas < 33) { @@ -2358,12 +2358,12 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ mes "[Biscuit]"; mes "Well done!"; mes "Now I see that her beautiful face has recovered."; - emotion e_awsm; + emotion ET_COOL; next; mes "[Biscuit]"; mes "The skin will go bad if you don't clean it every day."; mes "There's a saying... cleansing your skin is much more important than using makeup."; - emotion e_no1; + emotion ET_BEST; next; mes "[Biscuit]"; mes "You did a good job."; @@ -2378,7 +2378,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{ next; mes "[Biscuit]"; mes "This is not for you... and all of you, either. It's rather for Star Candy to get rest as soon as possible, you know!"; - emotion e_pif; + emotion ET_HNG; set ma_tomas,34; erasequest 11235; setquest 11236; @@ -2526,7 +2526,7 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{ mes "["+strcharinfo(0)+"]"; mes "?!"; mes "You can talk!"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Biscuit]"; mes "What?"; @@ -2540,7 +2540,7 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{ mes "[Biscuit]"; mes "Our precious Star Candy humbly supports them, and they treat her like this."; mes "They don't know how to express thanks!"; - emotion e_ag,0,"Biscuit#mal"; + emotion ET_ANGER, getnpcid(0, "Biscuit#mal"); next; select("Support?"); mes "[Biscuit]"; @@ -2567,7 +2567,7 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{ mes "[Biscuit]"; mes "Star Candy sacrifices herself like this, but those fellows are setting the pillars around her for themselves only."; mes "Hewww!!!"; - emotion e_ag,0,"Biscuit#mal"; + emotion ET_ANGER, getnpcid(0, "Biscuit#mal"); next; mes "[Biscuit]"; mes "They talk to her, but ignore me when I talk to her."; @@ -2940,7 +2940,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{ mes "nice colthes."; mes "I can't let you go,"; mes "that hurts me so badly!"; - emotion e_sob; + emotion ET_CRY; next; switch(select("You deserve the pain!:Need help?")) { case 1: @@ -2981,7 +2981,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{ mes "If I am usual, I will engrave something"; mes "with your tear..."; mes "Let your bag be here instead!"; - emotion e_sob; + emotion ET_CRY; close; } } else if (malang_bad_guys == 1) { @@ -3018,7 +3018,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{ mes "[Gobonge]"; mes "How do you know the source of bad can?"; mes "Do you have time to do slow at the moment?"; - emotion e_sob; + emotion ET_CRY; close; } else if (malang_bad_guys == 8) { mes "[Gobonge]"; @@ -3064,7 +3064,7 @@ malangdo,175,206,3 script Gobonge#ml 561,{ mes "Instead of us, you did bad behavior."; mes "Good to hear that?"; mes "This is what teacher see best pupil?"; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Gobonge]"; mes "You deserve a reward!"; @@ -3297,7 +3297,7 @@ malangdo,171,163,3 script Awfully Suspious Dealer 543,{ mes "[Awfully Suspious Dealer]"; mes "It just looks wonderful."; mes "There's nothing more to have?"; - emotion e_ho; + emotion ET_DELIGHT; close; case 2: mes "[Awfully Suspious Dealer]"; @@ -3459,15 +3459,15 @@ malangdo,125,147,3 script Patrol Leader#ml 545,{ next; mes "[Crime Prevention Staff]"; mes "Captain, we have work again, right?"; - emotion e_sob; - emotion e_sob,0,"Crime Prevention Staff#ml"; + emotion ET_CRY; + emotion ET_CRY, getnpcid(0, "Crime Prevention Staff#ml"); next; mes "[Patrol Leader]"; mes "Hide your tears and save your tears!"; mes "You should cry when having a clue for bad activity"; mes "at crime spot!"; - emotion e_sob; - emotion e_sob,0,"Crime Prevention Staff#ml"; + emotion ET_CRY; + emotion ET_CRY, getnpcid(0, "Crime Prevention Staff#ml"); next; mes "[Patrol Leader]"; mes "I will scold you once the investigation is over!"; @@ -3585,13 +3585,13 @@ mal_in02,76,63,7 script Cleanyang 544,{ } if (mal_qook == 0) { mes "Sailor cat is crying sadly."; - emotion e_sob; + emotion ET_CRY; next; mes "[Cleanyang]"; mes "Meow meow meoooow~"; mes "What is going on... Heu... heuk..."; mes "You don't have to know. Heu... heuk..."; - emotion e_sob; + emotion ET_CRY; next; mes "Could not continue talk."; next; @@ -3599,7 +3599,7 @@ mal_in02,76,63,7 script Cleanyang 544,{ case 1: mes "I comforted his wounded heart just standing by him."; next; - emotion e_sob; + emotion ET_CRY; mes "[Cleanyang]"; mes "This is unjust... Heuheuk..."; mes "The chef... He always gives me scolding."; @@ -3627,7 +3627,7 @@ mal_in02,76,63,7 script Cleanyang 544,{ next; switch(select("Don't ask anymore.:Asking for the place of vermin came.")) { case 1: - emotion e_sob; + emotion ET_CRY; mes "[Cleanyang]"; mes "...what's wrong with your face?"; mes "Are you afraid of sending on an errand?"; @@ -3656,14 +3656,14 @@ mal_in02,76,63,7 script Cleanyang 544,{ } } else if (mal_qook == 1) { if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { - emotion e_omg; + emotion ET_HUK; mes "[Cleanyang]"; mes "Uh. What is that? Meow."; mes "This is cat's ship biscuit... It might be left for a long time..."; mes "No way...!"; next; select("Yeah, this is it."); - emotion e_hmm; + emotion ET_SCRATCH; mes "[Cleanyang]"; mes "There were infested with insects because sailors hided and left the cat's ship biscuit.."; mes "I got a scolding cause of just teeth grinder?"; @@ -3977,7 +3977,7 @@ mal_in02,29,67,0 script #CaptainRoom3 844,{ mes "Ignoring Thomas and search under the junk."; mes "And at that time..."; next; - emotion e_omg; + emotion ET_HUK; mes "The place where the black shadow just passed, I don't how long been it is left."; mes "Find a cat's ship biscuit."; switch(rand(3)) { @@ -4009,7 +4009,7 @@ mal_in02,29,67,0 script #CaptainRoom3 844,{ next; mes "And at that time..."; mes "The place where the dark shadow just passed, find a cat's ship biscuit that is hided recently."; - emotion e_omg; + emotion ET_HUK; switch(rand(3)) { case 0: monster "mal_in02",30,67,"Quick Dark Shadow",2209,1; case 1: monster "mal_in02",30,65,"Quick Dark Shadow",2209,1; @@ -4048,7 +4048,7 @@ mal_in02,183,49,0 script #MeetingFloor4 844,{ next; mes "The place where the dark shadow just passed, I don't how long been it is left."; mes "Find a cat's ship biscuit."; - emotion e_omg; + emotion ET_HUK; switch(rand(2)) { case 0: monster "mal_in02",182,50,"Quick Dark Shadow",2209,1; case 1: monster "mal_in02",184,50,"Quick Dark Shadow",2209,1; @@ -4091,7 +4091,7 @@ mal_in02,103,22,0 script #MalBed5 844,{ next; mes "The place where the dark shadow just passed, I don't how long been it is left."; mes "Find a cat's ship biscuit."; - emotion e_omg; + emotion ET_HUK; monster "mal_in02",102,23,"Quick Dark Shadow",2209,1; setquest 7262; getitem 11536,1; //Cat_Hard_Biscuit @@ -4136,7 +4136,7 @@ malangdo,141,178,0 script #Darkweed6 844,{ next; mes "From the place where Dark shadow just passed and someone hided recently."; mes "Find a cat's ship biscuit."; - emotion e_omg; + emotion ET_HUK; monster "malangdo",141,178,"Quick Dark Shadow",2209,1; setquest 7269; getitem 11536,1; //Cat_Hard_Biscuit @@ -4183,7 +4183,7 @@ malangdo,133,134,0 script Strange Pile of Sand#7 557,{ mes "Find a some chips of cat's ship biscuit."; setquest .@quest; if (!rand(3)) { - emotion e_omg; + emotion ET_HUK; getmapxy(.@map$,.@x,.@y,UNITTYPE_NPC); monster .@map$,.@x,.@y,"Quick Dark Shadow",2209,1; } else @@ -4217,7 +4217,7 @@ malangdo,232,131,0 script #UnderStairs8 844,{ mes "Find a some chips of cat's ship biscuit."; setquest 7271; if (!rand(3)) { - emotion e_omg; + emotion ET_HUK; monster "malangdo",231,130,"Quick Dark Shadow",2209,1; } else getitem 11536,1; //Cat_Hard_Biscuit @@ -4251,7 +4251,7 @@ mal_in01,74,20,0 script #CornerTower9 844,{ mes "Find a some chips of cat's ship biscuit."; setquest 7272; if (!rand(3)) { - emotion e_omg; + emotion ET_HUK; monster "mal_in01",73,19,"Quick Dark Shadow",2209,1; } else getitem 11536,1; //Cat_Hard_Biscuit @@ -4282,7 +4282,7 @@ mal_in01,159,225,0 script #CornerLocker10 844,{ mes "Find a some chips of cat's ship biscuit."; setquest 7273; if (!rand(3)) { - emotion e_omg; + emotion ET_HUK; monster "mal_in01",159,225,"Quick Dark Shadow",2209,1; } else getitem 11536,1; //Cat_Hard_Biscuit @@ -4313,7 +4313,7 @@ mal_in01,24,72,0 script #FootholdTower11 844,{ mes "Find a some chips of cat's ship biscuit."; setquest 7274; if (!rand(3)) { - emotion e_omg; + emotion ET_HUK; monster "mal_in01",24,71,"Quick Dark Shadow",2209,1; } else getitem 11536,1; //Cat_Hard_Biscuit @@ -4894,7 +4894,7 @@ malangdo,211,203,4 script [Meow Team] Charo#nya_11 560,{ mes "[Charo]"; mes "We fixed the Duruduru compass, we only need a visitor now..."; mes "Hey, do you want to be a visitor?"; - emotion e_gasp; + emotion ET_SURPRISE; next; select("A visitor?"); mes "[Charo]"; @@ -6260,8 +6260,8 @@ L_ShowLights: mes "The speed of spinning is getting faster after pressing the buttons."; mes "After all..."; specialeffect EF_BEGINSPELL6; - emotion e_gasp,0,"Cat Detective#nya_14"; - emotion e_gasp,0,"Friend of Detective#mal"; + emotion ET_SURPRISE, getnpcid(0, "Cat Detective#nya_14"); + emotion ET_SURPRISE, getnpcid(0, "Friend of Detective#mal"); next; cutin "mal_homnya_s",2; mes "[Homnya]"; @@ -6539,7 +6539,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "[Cat Gamers Director]"; mes "Man! 10 losses in a row..."; - emotion e_sigh; + emotion ET_OHNO; next; mes "[Cat Gamers Director]"; mes "We are the 'Cat Gamers' Association."; @@ -6587,7 +6587,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "[Cat Gamers Director]"; mes "Now that I know the reason,"; mes "there should be a solution to that."; - emotion e_hmm; + emotion ET_SCRATCH; next; select("Umm... Mr. Cat..."); mes "[Cat Gamers Director]"; @@ -6604,7 +6604,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "[Cat Gamers Director]"; mes "So good to see you!!"; mes "What is your name by the way?"; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "["+strcharinfo(0)+"]"; mes "My name is "+strcharinfo(0)+", Mr. Cat."; @@ -6621,7 +6621,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "["+strcharinfo(0)+"]"; mes "A weakness is no longer a weakness when you say it out loud."; - emotion e_no1,1; + emotion ET_BEST, playerattached(); next; mes "[Cat Gamers Director]"; mes "Hahahaha I like that phrase."; @@ -6642,7 +6642,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "How can a person call themself stupid."; mes "Now I can see how stupid you are."; mes "Good bye~"; - emotion e_hmm; + emotion ET_SCRATCH; close; case 2: mes "[Cat Gamers Director]"; @@ -6665,7 +6665,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ } else if (malang_gamer == 4) { mes "[Cat Gamers Director]"; mes "Ok Ok. So what did the manager cat say about the atmosphere these days?~"; - emotion e_what; + emotion ET_QUESTION; next; mes "You tell him exactly what the Manager Cat said."; next; @@ -6674,14 +6674,14 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "[Cat Gamers Director]"; mes "Do not hesitate... Just tell me everything~"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "Umm... the player cats are afraid of you..."; next; mes "[Cat Gamers Director]"; mes "What... What did you say?"; - emotion e_omg; + emotion ET_HUK; next; mes "Cat Gamers Director seems to be in shock. Let's give him some time to calm down."; set malang_gamer,5; @@ -6696,12 +6696,12 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "[Cat Gamers Director]"; mes "That is impossible!"; mes "There is no other cat that's nicer than I am!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Cat Gamers Director]"; mes "Am I really that scary?"; mes "Are those players who bailed on the practice afraid of me too?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Cat Gamers Director]"; mes "It can't be, right? ehehehehe~"; @@ -6715,7 +6715,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes strcharinfo(0)+", will you help me out?"; mes "There are 4 players who ran away from practice saying they were too tired."; mes "Could you check if they ran away because of me? ehehehe~"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Cat Gamers Director]"; mes "Their names are Eryu, Stew, Ketchup, and Eff."; @@ -6740,11 +6740,11 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "[Cat Gamers Director]"; mes "What good is it to scam innocent cats?~"; - emotion e_gg; + emotion ET_KIK; next; mes "["+strcharinfo(0)+"]"; mes "Yes, I think that you're right."; - emotion e_hmm,1; + emotion ET_SCRATCH, playerattached(); next; mes "[Cat Gamers Director]"; mes "Oh, so you met Eryu, Stew, Ketchup, and Eff."; @@ -6836,7 +6836,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "[Cat Gamers Director]"; mes "Well, I kind of was eavesdropping when "+strcharinfo(0)+" and Manager Cat were talking together. Heh~"; - emotion e_heh; + emotion ET_SMILE; next; mes "["+strcharinfo(0)+"]"; mes "............"; @@ -6866,7 +6866,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "[Cat Gamers Director]"; mes "Heh~ Let me see... 'Stupid Cat lea...de...'"; - emotion e_an; + emotion ET_FRET; next; mes "- Crumpling the paper -"; mes "Cat Gamers Director has crumpled the paper and thrown it away."; @@ -6887,7 +6887,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "Heh~ I see."; mes "I can take this positively."; mes "Heh~ Let's move on to another one."; - emotion e_ok; + emotion ET_OK; next; mes "~Reading~"; next; @@ -6898,7 +6898,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "[Cat Gamers Director]"; mes "Heh~ This one also sounds productive."; mes "Heh~ Petition letters are good, I guess... Heh~"; - emotion e_ok; + emotion ET_OK; next; mes "Reading...~"; next; @@ -6910,7 +6910,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "Heh~ Our team is absolutely"; mes "like a family here~ Someone is"; mes "playing here, you know. Heh~"; - emotion e_gasp; + emotion ET_SURPRISE; next; mes "Reading...~"; next; @@ -6956,7 +6956,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "I didn't expect a refusal from a person like you, "+strcharinfo(0)+"."; mes "But still, here's some coins for you~"; mes "Heh~"; - emotion e_sob; + emotion ET_CRY; next; mes "[Cat Gamers Director]"; mes "We will always welcome you, "+strcharinfo(0)+", as a guest member of the Cat Gamers."; @@ -6972,7 +6972,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "[Cat Gamers Director]"; mes "Heh~ Good choice."; mes "I knew you would help us Cat Gamers... Heh~"; - emotion e_no1; + emotion ET_BEST; next; mes "[Cat Gamers Director]"; mes "Heh~ Thank you for your help."; @@ -7012,7 +7012,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ mes "Heh~ At last!!"; mes strcharinfo(0)+" will become our honorable member!!"; mes "I shall make a '^0000FFCat Gamers Certificate^000000' right away. Heh~"; - emotion e_ho; + emotion ET_DELIGHT; next; mes "[Cat Gamers Director]"; mes "Come back in an hour and I will get you a '^0000FFCat Gamers Certificate^000000'."; @@ -7028,7 +7028,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ next; mes "[Cat Gamers Director]"; mes "So, it's a bit tricky... Heh~ Please come later. Heh~"; - emotion e_ho; + emotion ET_DELIGHT; close; } mes "[Cat Gamers Director]"; @@ -7069,7 +7069,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ } mes "[Cat Gamers Director]"; mes "Heh~ Hello, "+strcharinfo(0)+". How is it going practicing with the players?"; - emotion e_what; + emotion ET_QUESTION; next; switch(select("How are the players doing?:Just stopped by to say hi~:Here's the current status...")) { case 1: @@ -7126,7 +7126,7 @@ mal_in01,31,210,2 script Cat Gamers Director 549,{ case 3: mes "[Cat Gamers Director]"; mes "Heh~ What happened to your face, "+strcharinfo(0)+"? Guess you lost from the practice, right? Heh~"; - emotion e_gg; + emotion ET_KIK; next; mes "[Cat Gamers Director]"; mes "Heh~ I saw players puting notes in the 'Petition box'. Heh~ Guess that was your work. Let me see..."; @@ -7304,7 +7304,7 @@ L_CompleteQuest: next; mes "[Cat Gamers Director]"; mes "Heh~ Thanks for coming by, "+strcharinfo(0)+". Heh~ Keep up the good work. Heh~"; - emotion e_thx; + emotion ET_THANKS; close; } @@ -7329,25 +7329,25 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{ next; mes "[Manager Cat]"; mes "What do you want?"; - emotion e_what; + emotion ET_QUESTION; next; set .@cat_gam, rand(1,10); select("Ask about the team's attitude..."); if (.@cat_gam == 5) { mes "[Manager Cat]"; mes "Do not lie to me! How can I trust you and reveal our team secret? Aren't you a spy from the doggy team?"; - emotion e_ag; + emotion ET_ANGER; next; select("Aww, come on..."); mes "You play with a foxtail nearby and then ask again."; next; select("Cat Gamers Director says..."); mes "The Manager Cat seems to be interested in the foxtail and starts answering."; - emotion e_awsm; + emotion ET_COOL; next; mes "[Manager Cat]"; mes "Players are afraid of the Cat Gamers Director. When they see Cat Gamers Director at the game, they get nervous."; - emotion e_lv; + emotion ET_THROB; next; mes "[Manager Cat]"; mes "Can you give me that?"; @@ -7364,7 +7364,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{ mes "and give our team information?"; mes "Aren't you a spy from doggy team...?"; mes "Go away."; - emotion e_ag; + emotion ET_ANGER; next; mes "This cat might hit you."; close; @@ -7372,59 +7372,59 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{ } else if (malang_gamer < 8) { mes "The Manager Cat is playing with the foxtail you gave him."; mes "He seems to be liking it..."; - emotion e_lv; + emotion ET_THROB; close; } else if (malang_gamer == 8) { mes "The Manager Cat is playing with the foxtail you gave him."; mes "He seems to be liking it..."; - emotion e_lv; + emotion ET_THROB; next; switch(select("Help~ Fire~:Hey~!:Do you want to hear something?")) { case 1: mes "[Manager Cat]"; mes "Don't lie~ We don't use fire that much~"; - emotion e_an; + emotion ET_FRET; next; break; case 2: mes "The Manager Cat ignores you, and keeps on playing with the foxtail."; - emotion e_lv; + emotion ET_THROB; close; case 3: mes "[Manager Cat]"; mes "Meow~ I want to tell you a story~ Follow me meow~ Let talk over there, meow~"; - emotion e_gg; + emotion ET_KIK; next; break; } mes "["+strcharinfo(0)+"]"; mes "Haha, I was just kidding. I actually need to tell you that the Cat Gamers Director has an issue..."; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "You explain the story to the Manager Cat."; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "[Manager Cat]"; mes "Scary image... Meow, I understand... Cat Gamers Director should feel peace by giving up things."; - emotion e_hmm; + emotion ET_SCRATCH; next; mes "["+strcharinfo(0)+"]"; mes "... ... ..."; - emotion e_dots,1; + emotion ET_THINK, playerattached(); next; mes "[Manager Cat]"; mes "Meow! Go tell him this, meow~ Prepare a box, meow~"; next; mes "["+strcharinfo(0)+"]"; mes "A box?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Manager Cat]"; mes "Petition it is, meow!! There is some place where humans do such things, I think it will help us~"; next; mes "["+strcharinfo(0)+"]"; mes "Ok, I will go tell it to the Games Director~"; - emotion e_ok,1; + emotion ET_OK, playerattached(); set malang_gamer,9; erasequest 5066; setquest 5067; @@ -7462,7 +7462,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{ case 1: mes "[Manager Cat]"; mes "Oh, hi meow~"; - emotion e_heh; + emotion ET_SMILE; close; case 2: switch(rand(1,7)) { @@ -7475,7 +7475,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{ mes "Heh~ >> Normal"; mes "lol Heh~ >> Happy"; mes "lol lol Heh~ >> Crazy meow"; - emotion e_ok; + emotion ET_OK; close; case 2: mes "[Manager Cat]"; @@ -7621,13 +7621,13 @@ malangdo,161,197,4 script Eryu#gamer 876,{ mes "[Eryu]"; mes "Arrgg. Go away..."; mes "I don't know who you're talking about."; - emotion e_an; + emotion ET_FRET; break; case 2: mes "[Eryu]"; mes "Umm? 'Human' magazine?"; mes "Is there such a thing?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "We've been publishing for 10 years."; @@ -7639,7 +7639,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ next; mes "[Eryu]"; mes "Hmm... ok. But, what can I do for you?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "I am in the middle of writing an article named 'Game Playing Cats'...'"; @@ -7648,7 +7648,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ next; mes "[Eryu]"; mes "'Dog n Waltz'?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "Oh! Yes!"; @@ -7659,7 +7659,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ next; mes "[Eryu]"; mes "I don't remember anyone from 'Dog n Waltz' that much."; - emotion e_dots; + emotion ET_THINK; next; mes "["+strcharinfo(0)+"]"; mes "The person isn't important."; @@ -7668,7 +7668,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ mes "Just answer a few questions for me, ok?"; mes "Be yourself and you'll do just fine."; mes "Ok, first question: How much do you practice a day?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Eryu]"; mes "Usually for about 8 hours, but I have to tell you that I'm not on the team anymore..."; @@ -7676,7 +7676,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ mes "["+strcharinfo(0)+"]"; mes "Wait, what?"; mes "You are not with the team now? How come...?"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "[Eryu]"; mes "Well..."; @@ -7704,7 +7704,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ mes "[Eryu]"; mes "Oh..."; mes "Sorry to make you waste your time."; - emotion e_sry; + emotion ET_SORRY; next; mes "["+strcharinfo(0)+"]"; mes "Oh, don't worry."; @@ -7732,7 +7732,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ mes "Sorry, I was trying to interview another cat..."; mes "And came back to you by mistake."; mes "I'm sorry."; - emotion e_sry,1; + emotion ET_SORRY, playerattached(); next; mes "[Eryu]"; mes "Ah... I see. Take care of yourself."; @@ -7758,7 +7758,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ mes "[Eryu]"; mes "What is this? What do you mean by '"+.@inputstr$+"'...?"; mes "Ah... aren't you the writer?"; - emotion e_an; + emotion ET_FRET; next; mes "["+strcharinfo(0)+"]"; mes "Huh... Who is that..?"; @@ -7784,7 +7784,7 @@ malangdo,161,197,4 script Eryu#gamer 876,{ } else { mes "[Eryu]"; mes "Aren't you the writer?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "Huh... Who is that..?"; @@ -7831,7 +7831,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ next; mes "[Stew]"; mes "Meow...? Who are you, meow?"; - emotion e_what; + emotion ET_QUESTION; next; switch(select("The 'Cat Gamers' Manager sent me.:Meow~ Grrr~:I'm with the 'Boom Can' Company.")) { case 1: @@ -7846,7 +7846,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ case 3: mes "[Stew]"; mes "'Boom Can' Company, meow?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "You don't know 'Boom Can' food?"; @@ -7855,7 +7855,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ next; mes "[Stew]"; mes "Yes meow~ Stew likes canned food very much meow~"; - emotion e_lv; + emotion ET_THROB; next; mes "["+strcharinfo(0)+"]"; mes "Ah! Ok then."; @@ -7880,7 +7880,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ mes "[Stew]"; mes "Dogs are natually like that~"; mes "You humans know animals~"; - emotion e_ok; + emotion ET_OK; next; mes "["+strcharinfo(0)+"]"; mes "Thank you! I'm flattered.~"; @@ -7916,7 +7916,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ mes "Ah! I see."; mes "Ok, the survey is over now."; mes "Thank you for your opinion on our survey for the 'Boom Can' company."; - emotion e_thx,1; + emotion ET_THANKS, playerattached(); next; mes "[Stew]"; mes "Meow? Did you aks anything meow?"; @@ -7925,13 +7925,13 @@ malangdo,230,197,4 script Stew#gamer 555,{ mes "I already asked you everything..."; mes "Don't you remember?"; mes "There were 10 questions!"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Stew]"; mes "Really meow? Strange meow."; mes "Sorry meow? Don't remember meow."; mes "It didn't felt like an interview meow."; - emotion e_sry; + emotion ET_SORRY; next; mes "["+strcharinfo(0)+"]"; mes "Well you did way better than those dogs."; @@ -7955,12 +7955,12 @@ malangdo,230,197,4 script Stew#gamer 555,{ mes "[Stew]"; mes "Aren't you from the 'Boom Can' Company?"; mes "Another survey meow?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "Oops! I should be meeting other cats."; mes "I am very sorry..."; - emotion e_sry,1; + emotion ET_SORRY, playerattached(); next; mes "[Stew]"; mes "It's ok meow~ Good bye meow~"; @@ -7973,7 +7973,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ } else if (checkquest(5085) == 0 || checkquest(5085) == 1) { mes "[Stew]"; mes "Who are you meow?"; - emotion e_what; + emotion ET_QUESTION; next; mes "What do you want to say?"; next; @@ -7987,7 +7987,7 @@ malangdo,230,197,4 script Stew#gamer 555,{ mes "[Stew]"; mes "What is this? What do you mean by '"+.@inputstr$+"'? Meow..."; mes "And... Aren't you from the 'Boom Can' Company, meow?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "Huh? What's that?"; @@ -8060,7 +8060,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ next; mes "[Ketchup]"; mes "Meow...? Who are you?"; - emotion e_what; + emotion ET_QUESTION; next; switch(select("Grrr~ Bow wow~:The Game Director cat sent me.:I'm from 'Cans for Kittens'.")) { case 1: @@ -8074,16 +8074,16 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ case 3: mes "[Ketchup]"; mes "Oh yeah? 'Cans for Kittens'?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "I want to share some of our philosophy with you."; mes "Do you believe in giving to others?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Ketchup]"; mes "Umm I guess so..."; - emotion e_slur; + emotion ET_SEXY; next; mes "["+strcharinfo(0)+"]"; mes "'Cans for Kittens' is a religion that embraces all felines."; @@ -8113,16 +8113,16 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ mes "[Ketchup]"; mes "I am sorry. Really sorry."; mes "Please forgive me Lord of Cans."; - emotion e_sob; + emotion ET_CRY; next; mes "[Ketchup]"; mes "That Director Cat was so scary~!"; mes "I said so many bad things when I left the Cat Gamers..."; mes "Please forgive."; - emotion e_sob; + emotion ET_CRY; next; - emotion e_dots; - emotion e_dots,1; + emotion ET_THINK; + emotion ET_THINK, playerattached(); next; mes "["+strcharinfo(0)+"]"; mes "The Lord of Cans forgives Ketchup's sins."; @@ -8142,7 +8142,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ } else if (checkquest(5064) == 2) { mes "[Ketchup]"; mes "You are..."; - emotion e_omg; + emotion ET_HUK; next; mes "Ketchup gives you an apologetic look and runs away."; mes "He probably did something bad already."; @@ -8155,7 +8155,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ } else if (checkquest(5087) == 0 || checkquest(5087) == 1) { mes "[Ketchup]"; mes "Who are you?"; - emotion e_what; + emotion ET_QUESTION; next; mes "What do you want to say?"; next; @@ -8166,8 +8166,8 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ mes "[Ketchup]"; mes "What is this? What do you mean by 'Come back'...?"; mes "Can... 'Cans for Kittens'?"; - emotion e_omg; - emotion e_what; + emotion ET_HUK; + emotion ET_QUESTION; next; mes "Ketchup recognized you and ran away."; mes "You've delivered the message."; @@ -8176,7 +8176,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ mes "[Ketchup]"; mes "What is this? What do you mean by '"+.@inputstr$+"'...?"; mes "Can... 'Cans for Kittens'?"; - emotion e_omg; + emotion ET_HUK; next; mes "["+strcharinfo(0)+"]"; mes "Huh? What's that?"; @@ -8188,7 +8188,7 @@ malangdo,244,144,4 script Ketchup#gamer 546,{ } else if (checkquest(5088) == 0 || checkquest(5088) == 1) { mes "[Ketchup]"; mes "Can... 'Cans for Kittens'?"; - emotion e_omg; + emotion ET_HUK; next; mes "Ketchup ran away once again."; close2; @@ -8249,14 +8249,14 @@ malangdo,181,119,7 script Eff#gamer 560,{ next; mes "[Eff]"; mes "Who are you meow?"; - emotion e_what; + emotion ET_QUESTION; next; switch(select("I have some good investment news...:A... Cat?:The 'Cat Gamers' Director sent me...")) { case 1: mes "[Eff]"; mes "Investment info? Meow~?"; mes "What is that? Meow~?"; - emotion e_what; + emotion ET_QUESTION; next; mes "["+strcharinfo(0)+"]"; mes "Interested, huh?"; @@ -8266,7 +8266,7 @@ malangdo,181,119,7 script Eff#gamer 560,{ mes "["+strcharinfo(0)+"]"; mes "Haha! You are lucky today."; mes "You heard that land can be a good investment, right?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Eff]"; mes "Oh oh~ I think so. Meow~"; @@ -8276,7 +8276,7 @@ malangdo,181,119,7 script Eff#gamer 560,{ next; mes "[Eff]"; mes "Prontera meow? Yes, I know about it. Meow~"; - emotion e_heh; + emotion ET_SMILE; next; mes "["+strcharinfo(0)+"]"; mes "There are some locations where"; @@ -8289,7 +8289,7 @@ malangdo,181,119,7 script Eff#gamer 560,{ mes "Hmm, this is top secret."; mes "Something that must not be revealed at all..."; mes "Can you really keep this secret...?"; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Eff]"; mes "Well... I've always been known for being a good keeper of secrets meow."; @@ -8301,7 +8301,7 @@ malangdo,181,119,7 script Eff#gamer 560,{ next; mes "[Eff]"; mes "I got it. Meow~"; - emotion e_ok; + emotion ET_OK; next; mes "["+strcharinfo(0)+"]"; mes "Well, I heard that there is a location in Juno where underground big shots will be investing about 10,000,000,000 zeny."; @@ -8320,17 +8320,17 @@ malangdo,181,119,7 script Eff#gamer 560,{ next; mes "[Eff]"; mes "Woot!! 100 Cans~ Meow~"; - emotion e_omg; + emotion ET_HUK; next; mes "["+strcharinfo(0)+"]"; mes "So, how many cans do you want to invest?"; mes "You'll be a part owner so make sure to invest the max that you can afford."; - emotion e_what,1; + emotion ET_QUESTION, playerattached(); next; mes "[Eff]"; mes "I want to invest."; mes "But, I don't have cans with me. Meow~"; - emotion e_sob; + emotion ET_CRY; next; mes "["+strcharinfo(0)+"]"; mes "You can always get a loan!!"; @@ -8350,7 +8350,7 @@ malangdo,181,119,7 script Eff#gamer 560,{ next; mes "["+strcharinfo(0)+"]"; mes "What!! Why would you quit such good a gig!! Are you crazy?"; - emotion e_omg,1; + emotion ET_HUK, playerattached(); next; mes "["+strcharinfo(0)+"]"; mes "Let's say we invest 1,000 cans after getting that loan."; @@ -8574,18 +8574,18 @@ mal_in01,91,216,4 script Ser#gamer 544,{ next; mes "[Ser]"; mes "Scissors beats Paper,"; - emotion e_scissors; - emotion e_paper,1; + emotion ET_SCISSOR; + emotion ET_WRAP, playerattached(); next; mes "[Ser]"; mes "Paper beats Rock,"; - emotion e_paper; - emotion e_rock,1; + emotion ET_WRAP; + emotion ET_ROCK, playerattached(); next; mes "[Ser]"; mes "And Rock beats Scissors."; - emotion e_rock; - emotion e_scissors,1; + emotion ET_ROCK; + emotion ET_SCISSOR, playerattached(); next; mes "[Ser]"; mes "Ok? Got it now?"; @@ -8602,7 +8602,7 @@ mal_in01,91,216,4 script Ser#gamer 544,{ close; } setarray .@rps$[0], "Rock", "Paper", "Scissors"; - setarray .@emote[0], e_rock, e_paper, e_scissors; + setarray .@emote[0], ET_ROCK, ET_WRAP, ET_SCISSOR; setarray .@count$[0],"First","Second","Third","Fourth","Last"; while(1) { mes "[Ser]"; @@ -8619,7 +8619,7 @@ mal_in01,91,216,4 script Ser#gamer 544,{ set .@pc, select("Rock:Paper:Scissors")-1; set .@npc, rand(3); - emotion .@emote[.@pc],1; + emotion .@emote[.@pc], playerattached(); emotion .@emote[.@npc]; mes "["+strcharinfo(0)+"] "+.@rps$[.@pc]; mes "--------------------------------"; @@ -8934,7 +8934,7 @@ mal_in01,86,222,4 script Paa#gamer 544,{ close; } setarray .@rps$[0], "Rock", "Paper", "Scissors"; - setarray .@emote[0], e_rock, e_paper, e_scissors; + setarray .@emote[0], ET_ROCK, ET_WRAP, ET_SCISSOR; setarray .@count$[0],"First","Second","Third","Fourth","Last"; while(1) { mes "[Paa]"; @@ -8951,7 +8951,7 @@ mal_in01,86,222,4 script Paa#gamer 544,{ set .@pc, select("Rock:Paper:Scissors")-1; set .@npc, rand(3); - emotion .@emote[.@pc],1; + emotion .@emote[.@pc], playerattached(); emotion .@emote[.@npc]; mes "["+strcharinfo(0)+"] "+.@rps$[.@pc]; mes "--------------------------------"; @@ -9592,9 +9592,9 @@ mal_in01,134,221,4 script KungKung#gamer 422,{ set .@npc_dic, rand(6); // Emote[58-63]: - // e_dice1, e_dice2, e_dice3, e_dice4, e_dice5, e_dice6 - emotion 58+.@pc_dic,1; - emotion 58+.@npc_dic; + // ET_DICE1, ET_DICE2, ET_DICE3, ET_DICE4, ET_DICE5, ET_DICE6 + emotion ET_DICE1+.@pc_dic, playerattached(); + emotion ET_DICE1+.@npc_dic; if (.@pc_dic > .@npc_dic) { mes "[KungKung]"; @@ -9624,18 +9624,18 @@ mal_in01,134,221,4 script KungKung#gamer 422,{ next; mes "[KungKung & "+strcharinfo(0)+"]"; mes "Kong!"; - emotion e_loud,1; - emotion e_loud; + emotion ET_BLABLA, playerattached(); + emotion ET_BLABLA; next; mes "[KungKung & "+strcharinfo(0)+"]"; mes "Kong! Nyang!"; - emotion e_loud,1; - emotion e_loud; + emotion ET_BLABLA, playerattached(); + emotion ET_BLABLA; next; mes "[KungKung & "+strcharinfo(0)+"]"; mes "Kong! Nyang! Kong!"; - emotion e_loud,1; - emotion e_loud; + emotion ET_BLABLA, playerattached(); + emotion ET_BLABLA; next; set .@cat_hand, rand(1,10); switch(.@attack_turn) { @@ -9741,7 +9741,7 @@ mal_in01,134,221,4 script KungKung#gamer 422,{ cutin "cat_g_lose",4; mes "[KungKung]"; mes "Sob..."; - emotion e_sob; + emotion ET_CRY; next; cutin "",255; mes "[KungKung]"; @@ -10017,7 +10017,7 @@ mal_in01,133,214,6 script Leader#gamer 546,{ // Emotions displayed when cats' flags not waved. setarray .@cat_emote[1], - e_ho,e_no,e_an,e_no1,e_spin; + ET_DELIGHT,ET_STARE_ABOUT,ET_FRET,ET_BEST,ET_CONFUSE; // .@cat_action[] when cats' flags are not waved. setarray .@cat_emotes$[1], @@ -10123,15 +10123,15 @@ mal_in01,133,214,6 script Leader#gamer 546,{ set .@rounds_nowave, .@rounds_nowave+1; if (.@you_flag == 1) { set .@you_flag$, "You waved the flag"; - set .@emotion[0], e_korea; + set .@emotion[0], ET_FLAG; } else { set .@you_flag$, "You didn't wave the flag"; - set .@emotion[0], e_swt2; + set .@emotion[0], ET_PROFUSELY_SWEAT; } for(set .@i,1; .@i<=5; set .@i,.@i+1) { if (.@flag_point_cat[.@i] == 0) { set .@cat_flag$[.@i], "Not enough Flag Points, could not wave"; - set .@emotion[.@i], e_ho; + set .@emotion[.@i], ET_DELIGHT; } else { if (compare(.@cat_emotes$[.@i],""+.@cat_action[.@i])) { set .@cat_flag$[.@i], "Didn't wave"; @@ -10140,7 +10140,7 @@ mal_in01,133,214,6 script Leader#gamer 546,{ set .@cat_flag$[.@i], "Did wave"; set .@flag_point_cat[.@i], .@flag_point_cat[.@i]-1; set .@cat_flags_waved, .@cat_flags_waved+1; - set .@emotion[.@i], e_korea; + set .@emotion[.@i], ET_FLAG; } } } @@ -10151,14 +10151,14 @@ mal_in01,133,214,6 script Leader#gamer 546,{ mes "~ Flag Game challenger "+strcharinfo(0)+" ~"; mes "^FF0000"+.@you_flag$+"^000000 for game ^C1653E"+.@round+"^000000."; mes .@flag_point+" Flag Point remaining."; - emotion .@emotion[0],1; + emotion .@emotion[0], playerattached(); next; for(set .@i,1; .@i<=5; set .@i,.@i+1) { mes "[Leader]"; mes "~ "+.@cat_name$[.@i]+.@cat_desc$[.@i]+" ~"; mes "^FF0000"+.@cat_flag$[.@i]+"^000000 the flag for game ^C1653E"+.@round+"^000000."; mes .@flag_point_cat[.@i]+" Flag Point remaining for "+.@cat_name$[.@i]+"."; - emotion .@emotion[.@i],0,.@npc_name$[.@i]; + emotion .@emotion[.@i], getnpcid(0, .@npc_name$[.@i]); next; } if (.@you_flag == 1) { @@ -10292,7 +10292,7 @@ mal_in01,136,216,2 script Seichi#gamer 553,{ next; mes "[Seichi]"; mes "Hey, why don't you look around? Who knows? Maybe we can find a delicious canned food~"; - emotion e_no; + emotion ET_STARE_ABOUT; next; mes "[Seichi]"; mes "Then, you can give me one. Hehe~"; @@ -10300,7 +10300,7 @@ mal_in01,136,216,2 script Seichi#gamer 553,{ } else { mes "[Seichi]"; mes "I am hungry~ Any leftover canned food there?"; - emotion e_no; + emotion ET_STARE_ABOUT; close; } end; @@ -10319,7 +10319,7 @@ mal_in01,136,215,2 script Row#gamer 559,{ next; mes "[Row]"; mes "But, you know you can never beat me, the great Row."; - emotion e_gg; + emotion ET_KIK; close; } else { mes "[Row]"; @@ -10340,7 +10340,7 @@ mal_in01,136,214,2 script Debong#gamer 876,{ next; mes "[Debong]"; mes "Come here, you, meow. I'll pick your hair meow."; - emotion e_lv; + emotion ET_THROB; close; } else { mes "The cat is picking your hair."; @@ -10353,7 +10353,7 @@ mal_in01,136,213,2 script Libs#gamer 421,{ if (malang_gamer == 20) { mes "[Libs]"; mes "Arrgg!! Why should I play this stupid flag waving game here?"; - emotion e_an; + emotion ET_FRET; next; mes "[Libs]"; mes "Hey you. What do you think? I know you've hearing me!"; @@ -10363,11 +10363,11 @@ mal_in01,136,213,2 script Libs#gamer 421,{ next; mes "[Libs]"; mes "Well, I'm sure you won't have a clue why this is happening. I forgive you."; - emotion e_ok; + emotion ET_OK; next; mes "[Libs]"; mes "How can a human understand the overwhelming heart of cats."; - emotion e_pif; + emotion ET_HNG; close; } else { mes "[Libs]"; @@ -10384,19 +10384,19 @@ mal_in01,136,212,2 script YongYong#gamer 554,{ if (malang_gamer == 20) { mes "[YongYong]"; mes "Meow~ I'm annoyed meow~"; - emotion e_an; + emotion ET_FRET; next; mes "[YongYong]"; mes "Annoying meow~"; - emotion e_an; + emotion ET_FRET; next; mes "[YongYong]"; mes "You're annoying meow~"; - emotion e_an; + emotion ET_FRET; next; mes "[YongYong]"; mes "What are you, a dog? Meow~!"; - emotion e_an; + emotion ET_FRET; specialeffect EF_SONICBLOW2; next; mes "[YongYong]"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 9cec96a7a2..c4e0a00cea 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -174,7 +174,7 @@ malaya,266,76,3 script Rodel the Guard#malaya 570,4,4,{ close; } OnTouch: - emotion e_gasp; + emotion ET_SURPRISE; end; OnInit: @@ -3891,8 +3891,8 @@ malaya,305,281,3 script Guard#buwaya 570,7,7,{ close; OnTouch: if ((malaya_hi > 19) && (malaya_buwaya == 0)) { - emotion e_gasp; - emotion e_gasp,1; + emotion ET_SURPRISE; + emotion ET_SURPRISE, playerattached(); } end; } @@ -3901,16 +3901,16 @@ malaya,276,288,5 script Port Malaya Villager::buwaya_A 582,{ mes "- Look at you warily while whispering to each other. -"; close; } else if (malaya_buwaya == 1) { - emotion e_gasp,0,"buwaya_A"; + emotion ET_SURPRISE, getnpcid(0, "buwaya_A"); mes "[Port Malaya Villager]"; mes "No, I heard they got lost in the woods."; mes "Who would hide such a treasure from a small village like ours?"; next; - emotion e_swt2,0,"buwaya_B"; + emotion ET_PROFUSELY_SWEAT, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "Could it been a monster? My grandma said there is a dragon with a huge head living deep inside the woods."; next; - emotion e_no,0,"buwaya_C"; + emotion ET_STARE_ABOUT, getnpcid(0, "buwaya_C"); mes "[Port Malaya Villager]"; mes "No. Listen to me."; next; @@ -3918,70 +3918,70 @@ malaya,276,288,5 script Port Malaya Villager::buwaya_A 582,{ mes "You all know ^3131FFTotoy^000000? The kid living at the ^3131FFInn^000000."; mes "Well, did you know Totoy came back from the woods recently?"; next; - emotion e_omg,0,"buwaya_A"; - emotion e_omg,0,"buwaya_B"; + emotion ET_HUK, getnpcid(0, "buwaya_A"); + emotion ET_HUK, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "Really??? He came back alive?"; next; - emotion e_gasp,0,"buwaya_C"; + emotion ET_SURPRISE, getnpcid(0, "buwaya_C"); mes "[Port Malaya Villager]"; mes "Yeah. But the strange part is that the troublemaker ^3131FFTotoy^000000 now quietly stays home and never comes out."; next; - emotion e_what,0,"buwaya_B"; + emotion ET_QUESTION, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "Why?"; next; - emotion e_gasp,0,"buwaya_C"; + emotion ET_SURPRISE, getnpcid(0, "buwaya_C"); mes "[Port Malaya Villager]"; mes "Don't you get it? Totoy must have found the treasure."; next; - emotion e_omg,0,"buwaya_A"; - emotion e_omg,0,"buwaya_B"; + emotion ET_HUK, getnpcid(0, "buwaya_A"); + emotion ET_HUK, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "What!!!! Then ^3131FFTotoy^000000 is rich now?"; next; - emotion e_no,0,"buwaya_C"; + emotion ET_STARE_ABOUT, getnpcid(0, "buwaya_C"); mes "[Port Malaya Villager]"; mes "I don't think so."; mes "I saw ^3131FFTotoy^000000 come back home, but Totoy wasn't carrying anything."; mes "But then, I must have missed it because I ran back home right away."; next; - emotion e_what,0,"buwaya_B"; + emotion ET_QUESTION, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "Then what is ^3131FFTotoy^000000 doing at home?"; next; - emotion e_dots,0,"buwaya_C"; + emotion ET_THINK, getnpcid(0, "buwaya_C"); mes "[Port Malaya Villager]"; mes "I think Totoy is making a plan to bring the treasure back without us knowing it."; mes "To have the whole treasure for himself, that greedy kid."; next; - emotion e_what,0,"buwaya_A"; + emotion ET_QUESTION, getnpcid(0, "buwaya_A"); mes "[Port Malaya Villager]"; mes "Is that true?"; next; - emotion e_lv2,0,"buwaya_B"; + emotion ET_BIGTHROB, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "The treasure would be in better hands with me ~"; mes "I would clean it every day so it shined and would use it as a beautiful ornament. Ah~~~"; next; - emotion e_dots,0,"buwaya_C"; + emotion ET_THINK, getnpcid(0, "buwaya_C"); mes "[Port Malaya Villager]"; mes "Then how about we talk to ^3131FFTotoy^000000 to spill the beans on where the treasure is?"; next; - emotion e_what,0,"buwaya_A"; + emotion ET_QUESTION, getnpcid(0, "buwaya_A"); mes "[Port Malaya Villager]"; mes "Wow. That is an awesome idea. No wonder you're the leader!"; next; - emotion e_dots,0,"buwaya_A"; + emotion ET_THINK, getnpcid(0, "buwaya_A"); mes "[Port Malaya Villager]"; mes "But will ^3131FFTotoy^000000 give up the information easily?"; mes "Because Totoy was sneaky enough to think of getting away with taking the whole treasure."; next; - emotion e_sob,0,"buwaya_B"; + emotion ET_CRY, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "Then we should convince ^3131FFTotoy^000000 to tell us where the treasure is instead of looking for it ourselves."; next; - emotion e_sob,0,"buwaya_B"; + emotion ET_CRY, getnpcid(0, "buwaya_B"); mes "[Port Malaya Villager]"; mes "Ah~~~ it is so hard to get something pretty these days ~~~!!!!"; set malaya_buwaya,2; @@ -4009,7 +4009,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ next; if (select("Tap him on the shoulder.:Ignore him.") == 2) close; - emotion e_omg; + emotion ET_HUK; mes "[Totoy]"; mes "Wah! No! Go away! Leave me alone!"; next; @@ -4060,13 +4060,13 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ } close; } else if (malaya_buwaya == 4) { - emotion e_gasp; + emotion ET_SURPRISE; mes "[Totoy]"; mes "I can see!! My eyes work!!!"; mes "Yay! I feel better now!"; next; - emotion e_dots,1; - emotion e_no1; + emotion ET_THINK, playerattached(); + emotion ET_BEST; mes "[Totoy]"; mes "Wow! You look better than you sounded. Ha ha."; next; @@ -4076,16 +4076,16 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "What is that about?"; next; select("Tell him what the people are talking about."); - emotion e_heh; + emotion ET_SMILE; mes "[Totoy]"; mes "WHAT?"; mes "Puhaha! Totoy is rich! Became rich overnight! Chief Ed!"; next; - emotion e_pif; + emotion ET_HNG; mes "[Totoy]"; mes "Sorry but I went to the woods to collect bugs. Wish I saw a treasure while I was at it. Hmph!"; next; - emotion e_dots; + emotion ET_THINK; mes "[Totoy]"; mes "I did go deep in the woods because I wasn't getting anywhere with collecting bugs. But who would have thought I'd get into this mess?"; next; @@ -4093,7 +4093,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "[Totoy]"; mes "I only wanted to show people my collection of cute bugs. Ha ha."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Totoy]"; mes "Dropping ice or bugs down peoples clothes is just like a daily greeting, isn't it?"; next; @@ -4107,7 +4107,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "[Totoy]"; mes "Ah, Ed is my cute puppy. He's very nice and cuddly. My best friend in the whole wide world."; next; - emotion e_dots; + emotion ET_THINK; mes "[Totoy]"; mes "Ed usually barks a lot but I should have looked around when he barked and pulled on my sleeves."; next; @@ -4124,7 +4124,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "[Totoy]"; mes "The scariest part is that the monster has two heads. You won't believe it till you see it."; next; - emotion e_sob; + emotion ET_CRY; mes "[Totoy]"; mes "Ed bit the monsters leg with all his might to let me get away. But I don't know what happened to him afterwards. Sniff~"; next; @@ -4176,7 +4176,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "Poor Ed. I miss Ed. Wail!!!!"; close; } else if (malaya_buwaya == 12) { - emotion e_sob; + emotion ET_CRY; mes "[Totoy]"; mes "Poor Ed. I miss Ed. Wail!!!!"; next; @@ -4184,7 +4184,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "[Dog]"; mes "Bark bark!!"; next; - emotion e_omg; + emotion ET_HUK; mes "[Totoy]"; mes "Ed!!"; mes "Ed!!! You're alive!!!"; @@ -4217,7 +4217,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ mes "Um... hey!"; next; select("You are a " + ((Sex == SEX_MALE) ? "boy" : "girl") + ", aren't you?"); - emotion e_omg,1; + emotion ET_HUK, playerattached(); mes "[Totoy]"; mes "Huh?"; if (Sex == SEX_FEMALE) { @@ -4279,7 +4279,7 @@ ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{ close; } OnTouch_: - emotion e_omg; + emotion ET_HUK; end; } @@ -4754,7 +4754,7 @@ ma_fild02,312,259,3 script Dog#buwaya 81,{ mes "[" + strcharinfo(0) + "]"; mes "You didn't get killed by Buwaya. You lucky little dog. Let's go back to your owner."; next; - emotion e_ho; + emotion ET_DELIGHT; mes "[Dog]"; mes "Bark bark!!"; next; @@ -6371,7 +6371,7 @@ OnTouch_: mes "[Cowardly Worker]"; mes "Go up and you will"; mes "find the Gloomy Worker."; - emotion e_swt,1; + emotion ET_SWEAT, playerattached(); close; } end; @@ -6467,7 +6467,7 @@ ma_scene01,175,170,5 script Sentimental Worker#bako2 578,{ mes "I'm secretly guarding the trap!"; mes "I want to hear out loud."; mes "I have a trap in front of me! Ha ha ha ha~"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; } end; @@ -6613,7 +6613,7 @@ function script F_Malaya_Nurse { mes "Yes!"; mes "I have an idea."; mes "How about we stick that one over the one we saw on the 2nd floor door?"; - emotion e_ic; + emotion ET_AHA; next; mes "[Nurse Las]"; mes "Maybe it will block the bad energy it's giving out."; @@ -6625,7 +6625,7 @@ function script F_Malaya_Nurse { mes "Yes!"; mes "I have an idea."; mes "How about we stick that one over the one we saw on the 2nd floor door?"; - emotion e_ic; + emotion ET_AHA; cutin "malaya_nurseA01",2; next; mes "[Nurse Las]"; @@ -6640,7 +6640,7 @@ function script F_Malaya_Nurse { next; mes "[Nurse Maenne]"; mes "I didn't think you'd do something like this."; - emotion e_dots; + emotion ET_THINK; next; mes "[Nurse Maenne]"; mes "We were just about to enter Bangungot's room, before we were thrown out..."; @@ -6837,7 +6837,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ if (malaya_hi < 20) { mes "[Nurse]"; mes "People of this town are too cautious of outsiders."; - emotion e_ag; + emotion ET_ANGER; cutin "malaya_nurseA01",2; next; mes "[Nurse]"; @@ -6874,7 +6874,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ next; mes "[Nurse]"; mes "I heard it was just built, but it seems so creepy...."; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Nurse]"; mes "I was surprised when I got here too."; @@ -6891,7 +6891,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse]"; mes "Not even a soul to welcome me, let alone a party!"; mes "Shocking!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Nurse]"; mes "What's more, I made it here after being lost and now I'm facing a creepy and locked hospital!"; @@ -6909,7 +6909,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse]"; mes "Not even a soul to welcome me, let alone a party!"; mes "Shocking!"; - emotion e_sob; + emotion ET_CRY; next; mes "[Nurse]"; mes "What's more, I made it here after being lost and now I'm facing a creepy and locked hospital!"; @@ -6921,7 +6921,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ next; mes "[Nurse]"; mes "I heard it was just built, but it seems so creepy...."; - emotion e_swt; + emotion ET_SWEAT; next; mes "[Nurse]"; mes "I was surprised when I got here too."; @@ -6934,7 +6934,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "Oh, well."; mes "I'll let you be on your way."; mes "Don't mind me. *Sob*"; - emotion e_sob; + emotion ET_CRY; cutin "malaya_nurseA03",2; close2; cutin "",255; @@ -6944,7 +6944,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ case 2: mes "[Nurse]"; mes "Oh, I see..."; - emotion e_sob; + emotion ET_CRY; close2; cutin "",255; end; @@ -6961,7 +6961,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ next; mes "[Nurse]"; mes "If I knew this was going to happen, I would've worn ER night-shift shoes instead of first-day shoes... *sniff*"; - emotion e_sob; + emotion ET_CRY; next; switch(select("Help.:Don't help.")) { case 1: @@ -6969,7 +6969,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "*Sob*"; mes "I guess this world is still worth living in."; mes "You are too kind."; - emotion e_sob; + emotion ET_CRY; next; mes "[Nurse Las]"; mes "I'm 'Las', who's supposed to work in this hospital."; @@ -6981,7 +6981,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse Las]"; mes "Before that...."; mes "Could you get something to wrap my feet? I can't put my shoes on because I've got blisters."; - emotion e_hlp; + emotion ET_HELP; cutin "malaya_nurseA04",2; next; mes "[Nurse Las]"; @@ -6997,7 +6997,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "Oh, well."; mes "I'll let you be on your way."; mes "Don't mind me. *Sob*"; - emotion e_sob; + emotion ET_CRY; cutin "malaya_nurseA03",2; close2; cutin "",255; @@ -7030,7 +7030,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse Las]"; mes "Before that..."; mes "Could you get something to wrap my feet? I can't put my shoes on because I've got blisters."; - emotion e_hlp; + emotion ET_HELP; cutin "malaya_nurseA03",2; next; mes "[Nurse Las]"; @@ -7048,7 +7048,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse Las]"; mes "Oh...... the smell......"; mes "My new shoes will be ruined..."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Nurse Las]"; mes "Okay!!!!!!"; @@ -7069,7 +7069,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ } else if (malaya_bang == 4) { mes "["+strcharinfo(0)+"]"; mes "We pushed and pulled, but it won't budge."; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); next; mes "[Nurse Las]"; mes "Strange~"; @@ -7079,7 +7079,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse Las]"; mes "Hmmm!"; mes "I can't stand it anymore!"; - emotion e_an; + emotion ET_FRET; next; mes "[Nurse Las]"; mes "Could you ask the townsfolk about the hospital while I contact HQ?"; @@ -7107,7 +7107,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ } else if (malaya_bang == 6) { mes "[Nurse Las]"; mes "What did she say?"; - emotion e_what; + emotion ET_QUESTION; cutin "malaya_nurseA02",2; next; select("Tell her what she said."); @@ -7143,7 +7143,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "An inn?"; mes "Good gracious!"; mes "If they'd have told me earlier I wouldn't have had to stand out here for so long!"; - emotion e_pif; + emotion ET_HNG; cutin "malaya_nurseA01",2; next; mes "[Nurse Las]"; @@ -7156,7 +7156,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ next; mes "[Nurse Las]"; mes "I don't think I can move anymore because of my feet. Could you go to the inn for me?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; cutin "malaya_nurseA03",2; next; mes "[Nurse Las]"; @@ -7173,7 +7173,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ } else if (malaya_bang == 9) { mes "[Nurse Las]"; mes "I don't think I can move anymore because of my feet. Could you go to the inn for me?"; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; cutin "malaya_nurseA03",2; next; mes "[Nurse Las]"; @@ -7215,8 +7215,8 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "The door's not locked?"; mes "How can this be?????"; mes "????"; - emotion e_what; - emotion e_what,1; + emotion ET_QUESTION; + emotion ET_QUESTION, playerattached(); cutin "malaya_nurseA04",2; next; mes "[Nurse Las]"; @@ -7231,8 +7231,8 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ next; mes "[???]"; mes "*Snigger*"; - emotion e_what,1; - emotion e_what; + emotion ET_QUESTION, playerattached(); + emotion ET_QUESTION; next; mes "[???]"; mes "Hey "+((Sex == SEX_MALE)?"dude":"missy")+","; @@ -7353,7 +7353,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ next; mes "[Nurse Las]"; mes "Hey you in the bushes, I'll tell on you if you don't go home now!"; - emotion e_omg,0,"Bushes#ma"; + emotion ET_HUK, getnpcid(0, "Bushes#ma"); close2; cutin "",255; end; @@ -7375,7 +7375,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse Las]"; mes "Anyway, the first floor door is open, so let's go inside."; mes "Everything would be meaningless if the second floor door is not opened."; - emotion e_sob; + emotion ET_CRY; set malaya_bang,19; changequest 11299,11300; close2; @@ -7386,7 +7386,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{ mes "[Nurse Las]"; mes "Anyway, the first floor door is open, so let's go inside."; mes "Everything would be meaningless if the second floor door is not opened."; - emotion e_sob; + emotion ET_CRY; cutin "malaya_nurseA01",2; close2; cutin "",255; @@ -7782,11 +7782,11 @@ malaya,53,68,4 script Bushes#ma 844,{ mes "Don't come any closer!"; mes "Old "+((Sex == SEX_MALE)?"man":"lady")+"!"; mes "How'd you know I was here?"; - emotion e_omg; + emotion ET_HUK; next; mes "["+strcharinfo(0)+"]"; mes "I'm not old."; - emotion e_an,1; + emotion ET_FRET, playerattached(); next; switch(select("About entering the hospital.:About its mom.:About ???.:Ask about the old lady.:Ask about the hospital grounds.:Quit.")) { case 1: @@ -7850,7 +7850,7 @@ malaya,53,68,4 script Bushes#ma 844,{ case 6: mes "[???]"; mes "Humph!!"; - emotion e_pif; + emotion ET_HNG; close; } mes "[???]"; @@ -7866,11 +7866,11 @@ malaya,53,68,4 script Bushes#ma 844,{ mes "Don't come any closer!"; mes "Old "+((Sex == SEX_MALE)?"man":"lady")+"!"; mes "How'd you know I was here?"; - emotion e_omg; + emotion ET_HUK; next; mes "["+strcharinfo(0)+"]"; mes "I'm not old."; - emotion e_an,1; + emotion ET_FRET, playerattached(); close; } else { mes "There's a trace of a young child."; @@ -8078,19 +8078,19 @@ malaya,114,183,3 script Bent Old Lady#ma 575,{ mes "[Bent Old Lady]"; mes "What?"; mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bent Old Lady]"; mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bent Old Lady]"; mes "Arghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bent Old Lady]"; mes "Arghhhhhhhhhh!!!!!!!!!!!"; - emotion e_omg; + emotion ET_HUK; next; mes "[Bent Old Lady]"; mes "What have you done!"; @@ -8387,11 +8387,11 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ if ($malaya_pintados_01 > 999 && $malaya_pintados_02 > 999 && $malaya_pintados_03 > 299) { set $malaya_pintados_00,1; donpcevent "Pintados Manager#pin::OnEnable"; - emotion e_lv; + emotion ET_THROB; mes "[Isco]"; mes "Many adventurers helped find festival items that I returned to the village."; next; - emotion e_ho; + emotion ET_DELIGHT; mes "[Isco]"; mes "He he... Now we can hold the '^7A96E0Pintados Festival^000000'."; close; @@ -8402,7 +8402,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ mes "He he... The fun '^7A96E0Pintados Festival^000000' is in full swing."; next; if ($malaya_pintados_00 > 0 && $malaya_pintados_00 < 50) { - emotion e_ho; + emotion ET_DELIGHT; mes "[Isco]"; mes "Today's the first day of the '^7A96E0Pintados Festival^000000'. The festival is held for 7 days, so have fun."; close; @@ -8433,18 +8433,18 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ mes "Have you every seen ^FF8440Bakonawa^000000, the monster known to swallow the moon? They say he is really ferocious."; close; } else if ($malaya_pintados_00 > 245 && $malaya_pintados_00 < 295) { - emotion e_sob; + emotion ET_CRY; mes "[Isco]"; mes "I'm so sad. Many adventurers helped to hold the '^7A96E0Pintados Festival^000000' and now only one day is left."; close; } else { - emotion e_sob; + emotion ET_CRY; mes "[Isco]"; mes "Oh gosh! It's already the last day of the '^7A96E0Pintados Festival^000000'. Can't believe there won't be more festivities."; close; } } - emotion e_spin; + emotion ET_CONFUSE; mes "[Isco]"; mes "Oh no. What will we do with the festival coming to an end."; next; @@ -8454,7 +8454,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ mes "There is a traditional festival held since ancient times"; mes "in Baryo Mahiwaga called the '^7A96E0Pintados Festival^000000'."; next; - emotion e_otl; + emotion ET_OTL; mes "[Isco]"; mes "I don't think I'll make it to the festival this time."; next; @@ -8466,7 +8466,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ mes "But '^FF8440Bongisungisu^000000' appeared out of nowhere and took the items away from me."; next; select("Are you hurt?"); - emotion e_sigh; + emotion ET_OHNO; mes "[Isco]"; mes "Fortunately not."; next; @@ -8480,7 +8480,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ mes "[Isco]"; mes "Lesser Agimat "+$malaya_pintados_01+", Silver Cross "+$malaya_pintados_02+", Dyestuff "+$malaya_pintados_03+" so far."; next; - emotion e_sigh; + emotion ET_OHNO; mes "[Isco]"; mes "Sigh... We are still short of materials to start the '^7A96E0Pintados Festival^000000'."; close; @@ -8488,7 +8488,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{ set .@str$, (Sex == SEX_MALE)?"Bro":"Sis"; break; } - emotion e_lv; + emotion ET_THROB; mes "[Isco]"; mes "Oh~ Really? Wow!"; mes "Thanks! "+strcharinfo(0)+" "+.@str$+"!!"; @@ -8605,7 +8605,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "Cannot proceed because you have too many items in your possession."; close; } - emotion e_what; + emotion ET_QUESTION; mes "[Tattooist]"; mes "Why do you want a Tattoo?"; next; @@ -8742,7 +8742,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "Need 10 Ancient Grudges, 1 Piece of "+.@name$+"'s Spirit, and 1 "+.@name$+" Doll to create a ^EE1D11"+.@name$+" Agimat Tattoo^000000."; close; } - emotion e_flash; + emotion ET_SPARK; mes "[Tattooist]"; mes "The materials are full with holy energy. I'm sure we'll get a great Tattoo using these."; next; @@ -8761,7 +8761,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "And then "+.@name$+" stared intensely at the doll as if to remember every detail of it in his head."; next; if(select("Aren't you going to start?:... ... ..") == 1) { - emotion e_an; + emotion ET_FRET; delitem 6499,5; //Ancient_Grudge mes "[Tattooist]"; mes "Oh no, now you ruined it."; @@ -8770,7 +8770,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit."; close; } - emotion e_bzz; + emotion ET_STARE; mes "Think he will melt the doll with his eyes?"; next; specialeffect EF_SONICBLOWHIT; @@ -8778,12 +8778,12 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ next; mes "The "+.@name$+" Tattoo was completed almost instantly."; next; - emotion e_an; + emotion ET_FRET; mes "But he kept on looking at each corner of the drawing as if he didn't like some of its details."; next; if(select("Looks good to me.:... ... ..") == 1) { - emotion e_an; - emotion e_ag; + emotion ET_FRET; + emotion ET_ANGER; delitem 6499,5; //Ancient_Grudge mes "[Tattooist]"; mes "Ergh! I told you not to interrupt!"; @@ -8800,12 +8800,12 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ next; mes "Looks like he is satisfied with the "+.@name$+" drawing."; next; - emotion e_dum; + emotion ET_HUM; mes "But now he is staring at the sky without doing anything else. What is he waiting for?"; next; if(select("When will it be done?:... ... ..") == 1) { - emotion e_an; - emotion e_ag; + emotion ET_FRET; + emotion ET_ANGER; delitem 6499,5; //Ancient_Grudge mes "[Tattooist]"; mes "Ergh! I told you not to interrupt!"; @@ -8818,7 +8818,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "Received back 5 Ancient Grudges, "+.@name$+" Doll, and Piece of "+.@name$+"'s Spirit."; close; } - emotion e_dots; + emotion ET_THINK; mes "[Tattooist]"; mes "."; next; @@ -8828,7 +8828,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "[Tattooist]"; mes ". . ."; next; - emotion e_dots; + emotion ET_THINK; mes "[Tattooist]"; mes ". . . ."; next; @@ -8841,7 +8841,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ mes "[Tattooist]"; mes ". . . . . . ."; next; - emotion e_flash; + emotion ET_SPARK; mes "The Tattooist's eyes started to shine after staring at the sky for awhile, then he broke the Piece of "+.@name$+"'s Spirit with both his hands."; next; specialeffect EF_DETOXICATION; @@ -8850,8 +8850,8 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ if(select("Why did you break the pieces...:... ... ..") == 1) { delitem 6499,5; //Ancient_Grudge delitem .@spirit,1; - emotion e_an; - emotion e_ag; + emotion ET_FRET; + emotion ET_ANGER; mes "[Tattooist]"; mes "Ergh! I told you not to interrupt!"; next; @@ -8881,7 +8881,7 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{ next; mes "The Tattooist is finally satisfied and is all smiles."; next; - emotion e_heh; + emotion ET_SMILE; mes "[Tattooist]"; mes "Ha ha. It came out great."; next; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 6def2bf3e3..00eaff22f0 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -1863,7 +1863,7 @@ dicastes02,125,192,0 script #call_cheshir_ep14 139,0,3,{ OnTouch_: if (ep13_3_secret > 22) { if (rand(2)) { - emotion e_ho,1; + emotion ET_DELIGHT, playerattached(); mes "..........?"; mes "You sense someone moving around."; mes "There must be someone down there."; @@ -2547,12 +2547,12 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "[Raffle Researcher]"; mes "Oh no~ My research tools..."; mes "What...... What was it?"; - emotion e_sob; + emotion ET_CRY; next; select("What is your business here?"); mes "[Raffle Researcher]"; mes "Hmm?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Raffle Researcher]"; mes "You're human...? Are you human...?"; @@ -2568,14 +2568,14 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "[Raffle Researcher]"; mes "You, come here for a minute."; mes "It's a simple experiment, so there's no need to be afraid."; - emotion e_gg; + emotion ET_KIK; next; if(select("What a crazy Raffle. I must run away.:... ...") == 1) { mes "[Raffle Researcher]"; mes "You said you had made it up from the Crevice,"; mes "so I was wondering what race you were,"; mes "but a mere human? How did you get up here?"; - emotion e_lv; + emotion ET_THROB; close; } if (BaseLevel < 100) { @@ -2591,7 +2591,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ } mes "[Raffle Researcher]"; mes "... ... ..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Raffle Researcher]"; mes "You... You're not like the other humans."; @@ -2621,7 +2621,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "but you clearly care about"; mes "another person's hardship."; mes "You must be an ^FF0000extremely^000000 nice human."; - emotion e_no1; + emotion ET_BEST; next; mes "[Raffle Researcher]"; mes "I'll save my thanks for time's sake."; @@ -2664,13 +2664,13 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ next; mes "[Raffle Researcher]"; mes "Have a safe trip."; - emotion e_paper; + emotion ET_WRAP; close; } else if (ep14_1_muk == 1) { if (checkquest(5016) > -1 && countitem(6385) == 0) { mes "[Raffle Researcher]"; mes "You're back? Where are my research tools?"; - emotion e_what; + emotion ET_QUESTION; next; mes "[Raffle Researcher]"; mes "You still haven't found the research tools?"; @@ -2734,7 +2734,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "I'm still preparing for the research."; mes "Unfortunately a few research tools"; mes "were damaged."; - emotion e_an; + emotion ET_FRET; close; case 2: mes "[Raffle Researcher]"; @@ -2746,14 +2746,14 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "asks you who you are working with,"; mes "you can say ^0000FFI'm working with Researcher Inffle.^000000"; mes "That's why I'm telling you my name."; - emotion e_ok; + emotion ET_OK; close; case 3: mes "[Raffle Researcher]"; mes "Why? The inn is closed?"; mes "That's strange, it shouldn't be."; mes "Why don't you go try again?"; - emotion e_what; + emotion ET_QUESTION; close; case 4: break; @@ -2765,7 +2765,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "Can't believe I got attacked..."; mes "I just can't believe it..."; mes "What do you think?"; - emotion e_an; + emotion ET_FRET; close; } mes "[Raffle Researcher]"; @@ -2809,12 +2809,12 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "You can draw on his face,"; mes "pinch him, tickle him, or whatever."; mes "Bully him 3 times."; - emotion e_gg; + emotion ET_KIK; close; } else if (ep14_1_muk == 6) { mes "[Raffle Researcher]"; mes "So you taught him a lesson? Great. I feel avenged!"; - emotion e_heh; + emotion ET_SMILE; next; mes "[Raffle Researcher]"; mes "For a while, I couldn't sleep"; @@ -2899,7 +2899,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "The basic tests are done."; mes "As I thought..."; mes "There were many interesting substances in the bath water."; - emotion e_ho; + emotion ET_DELIGHT; next; mes "[Raffle Researcher]"; mes "The most notable is this unidentifiable DNA."; @@ -2999,7 +2999,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "[Raffle Researcher]"; mes "This is not it."; mes "The samples that you collected belonged to a normal species."; - emotion e_swt2; + emotion ET_PROFUSELY_SWEAT; next; mes "[Raffle Researcher]"; mes "Must be because so many species of creatures"; @@ -3032,8 +3032,8 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "my head is filled with even more questions."; next; mes "... ... ... ... ..."; - emotion e_dots; - emotion e_dots,1; + emotion ET_THINK; + emotion ET_THINK, playerattached(); next; mes "[Raffle Researcher]"; mes "The village elders say"; @@ -3336,7 +3336,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ next; mes "[Raffle Researcher]"; mes "... ... ... ..."; - emotion e_dots; + emotion ET_THINK; next; mes "[Raffle Researcher]"; mes "Maybe I haven't shown you."; @@ -3350,7 +3350,7 @@ mora,31,138,6 script Raffle Researcher#ep14 522,{ mes "This concludes the report of"; mes "Mora Village's mysterious bath."; mes "You want to look again?"; - emotion e_what; + emotion ET_QUESTION; next; switch(select("Look again.:Don't look again.")) { case 1: @@ -3483,7 +3483,7 @@ mora,114,79,0 script Black Shadow#ep14_muk 844,{ mes "You stop bullying me."; next; if(select("Bully anyway.:I'll stop.") == 1) { - emotion e_sob; + emotion ET_CRY; set ep14_1_goki,0; close2; donpcevent "Black Shadow#ep14_muk::OnDisable"; @@ -3510,7 +3510,7 @@ mora,114,79,0 script Black Shadow#ep14_muk 844,{ mes "You... Good. Help Fishee?"; next; if(select("Don't help.:Help.") == 1) { - emotion e_sob; + emotion ET_CRY; set ep14_1_goki,0; close2; donpcevent "Black Shadow#ep14_muk::OnDisable"; @@ -5359,6 +5359,6 @@ mora,112,161,5 script Knights Leader#mo 523,{ mes "Huh! I said the Boss is the boss!"; mes "No, the Chief is the best!"; mes "How rude you all are! I'm the Head here!"; - emotion e_swt2,1; + emotion ET_PROFUSELY_SWEAT, playerattached(); close; } diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index 72516db317..1c31e64153 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -75,7 +75,7 @@ hu_fild05,168,304,0 script Column#abyss1 111,{ mes "and the taste of these items"; mes "is surprisingly putrid.^000000"; next; - emotion e_rice,1; + emotion ET_HUNGRY, playerattached(); delitem 1035,1; delitem 1036,1; delitem 1037,1; diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 70a1b42eaf..b595821c62 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -6712,7 +6712,7 @@ ACMD_FUNC(pettalk) }; int i; ARR_FIND( 0, ARRAYLENGTH(emo), i, stricmp(message, emo[i]) == 0 ); - if( i == E_DICE1 ) i = rnd()%6 + E_DICE1; // randomize /dice + if( i == ET_DICE1 ) i = rnd()%6 + ET_DICE1; // randomize /dice if( i < ARRAYLENGTH(emo) ) { if (sd->emotionlasttime + 1 >= time(NULL)) { // not more than 1 per second @@ -7475,7 +7475,7 @@ ACMD_FUNC(hommutate) if (m_class != -1 && m_id != -1 && m_class&HOM_EVO && m_id&HOM_S && sd->hd->homunculus.level >= 99) { hom_mutate(sd->hd, homun_id); } else { - clif_emotion(&sd->hd->bl, E_SWT); + clif_emotion(&sd->hd->bl, ET_SWEAT); } return 0; } diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 7dc3a98f65..ecb632786b 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -10951,7 +10951,7 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd) int emoticon = RFIFOB(fd,packet_db[RFIFOW(fd,0)].pos[0]); if (battle_config.basic_skill_check == 0 || pc_checkskill(sd, NV_BASIC) >= 2 || pc_checkskill(sd, SU_BASIC_SKILL) >= 1) { - if (emoticon == E_MUTE) {// prevent use of the mute emote [Valaris] + if (emoticon == ET_CHAT_PROHIBIT) {// prevent use of the mute emote [Valaris] clif_skill_fail(sd, 1, USESKILL_FAIL_LEVEL, 1); return; } @@ -10966,8 +10966,8 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd) if (battle_config.idletime_option&IDLE_EMOTION) sd->idletime = last_tick; - if(battle_config.client_reshuffle_dice && emoticon>=E_DICE1 && emoticon<=E_DICE6) {// re-roll dice - emoticon = rnd()%6+E_DICE1; + if(battle_config.client_reshuffle_dice && emoticon>=ET_DICE1 && emoticon<=ET_DICE6) {// re-roll dice + emoticon = rnd()%6+ET_DICE1; } clif_emotion(&sd->bl, emoticon); @@ -11973,7 +11973,7 @@ static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_sess if( !hd ) return; if( skill_isNotOk_hom(hd, skill_id, skill_lv) ) { - clif_emotion(&hd->bl, E_DOTS); + clif_emotion(&hd->bl, ET_THINK); return; } if( hd->bl.id != target_id && skill_get_inf(skill_id)&INF_SELF_SKILL ) @@ -11981,7 +11981,7 @@ static void clif_parse_UseSkillToId_homun(struct homun_data *hd, struct map_sess if( hd->ud.skilltimer != INVALID_TIMER ) { if( skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST ) return; } else if( DIFF_TICK(tick, hd->ud.canact_tick) < 0 ) { - clif_emotion(&hd->bl, E_DOTS); + clif_emotion(&hd->bl, ET_THINK); if (hd->master) clif_skill_fail(hd->master, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0); return; @@ -12000,13 +12000,13 @@ static void clif_parse_UseSkillToPos_homun(struct homun_data *hd, struct map_ses if( !hd ) return; if( skill_isNotOk_hom(hd, skill_id, skill_lv) ) { - clif_emotion(&hd->bl, E_DOTS); + clif_emotion(&hd->bl, ET_THINK); return; } if( hd->ud.skilltimer != INVALID_TIMER ) { if( skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST ) return; } else if( DIFF_TICK(tick, hd->ud.canact_tick) < 0 ) { - clif_emotion(&hd->bl, E_DOTS); + clif_emotion(&hd->bl, ET_THINK); if (hd->master) clif_skill_fail(hd->master, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0); return; diff --git a/src/map/clif.hpp b/src/map/clif.hpp index e03f35d89a..f6ce01e1f5 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -236,96 +236,96 @@ enum broadcast_flags : uint8_t { }; enum emotion_type { - E_GASP = 0, // /! - E_WHAT, // /? - E_HO, - E_LV, - E_SWT, - E_IC, - E_AN, - E_AG, - E_CASH, // /$ - E_DOTS, // /... - E_SCISSORS, // /gawi --- 10 - E_ROCK, // /bawi - E_PAPER, // /bo - E_KOREA, - E_LV2, - E_THX, - E_WAH, - E_SRY, - E_HEH, - E_SWT2, - E_HMM, // --- 20 - E_NO1, - E_NO, // /?? - E_OMG, - E_OH, - E_X, - E_HLP, - E_GO, - E_SOB, - E_GG, - E_KIS, // --- 30 - E_KIS2, - E_PIF, - E_OK, - E_MUTE, // red /... used for muted characters - E_INDONESIA, - E_BZZ, // /bzz, /stare - E_RICE, - E_AWSM, // /awsm, /cool - E_MEH, - E_SHY, // --- 40 - E_PAT, // /pat, /goodboy - E_MP, // /mp, /sptime - E_SLUR, - E_COM, // /com, /comeon - E_YAWN, // /yawn, /sleepy - E_GRAT, // /grat, /congrats - E_HP, // /hp, /hptime - E_PHILIPPINES, - E_MALAYSIA, - E_SINGAPORE, // --- 50 - E_BRAZIL, - E_FLASH, // /fsh - E_SPIN, // /spin - E_SIGH, - E_DUM, // /dum - E_LOUD, // /crwd - E_OTL, // /otl, /desp - E_DICE1, - E_DICE2, - E_DICE3, // --- 60 - E_DICE4, - E_DICE5, - E_DICE6, - E_INDIA, - E_LUV, // /love - E_RUSSIA, - E_VIRGIN, - E_MOBILE, - E_MAIL, - E_CHINESE, // --- 70 - E_ANTENNA1, - E_ANTENNA2, - E_ANTENNA3, - E_HUM, - E_ABS, - E_OOPS, - E_SPIT, - E_ENE, - E_PANIC, - E_WHISP, // --- 80 - E_YUT1, - E_YUT2, - E_YUT3, - E_YUT4, - E_YUT5, - E_YUT6, - E_YUT7, + ET_SURPRISE = 0, // /! + ET_QUESTION, // /? + ET_DELIGHT, + ET_THROB, + ET_SWEAT, + ET_AHA, + ET_FRET, + ET_ANGER, + ET_MONEY, // /$ + ET_THINK, // /... + ET_SCISSOR, // /gawi --- 10 + ET_ROCK, // /bawi + ET_WRAP, // /bo + ET_FLAG, + ET_BIGTHROB, + ET_THANKS, + ET_KEK, + ET_SORRY, + ET_SMILE, + ET_PROFUSELY_SWEAT, + ET_SCRATCH, // --- 20 + ET_BEST, + ET_STARE_ABOUT, // /?? + ET_HUK, + ET_O, + ET_X, + ET_HELP, + ET_GO, + ET_CRY, + ET_KIK, + ET_CHUP, // --- 30 + ET_CHUPCHUP, + ET_HNG, + ET_OK, + ET_CHAT_PROHIBIT, // red /... used for muted characters + ET_INDONESIA_FLAG, + ET_STARE, // /bzz, /stare + ET_HUNGRY, + ET_COOL, // /awsm, /cool + ET_MERONG, + ET_SHY, // --- 40 + ET_GOODBOY, // /pat, /goodboy + ET_SPTIME, // /mp, /sptime + ET_SEXY, + ET_COMEON, // /com, /comeon + ET_SLEEPY, // /yawn, /sleepy + ET_CONGRATULATION, // /grat, /congrats + ET_HPTIME, // /hp, /hptime + ET_PH_FLAG, + ET_MY_FLAG, + ET_SI_FLAG, // --- 50 + ET_BR_FLAG, + ET_SPARK, // /fsh + ET_CONFUSE, // /spin + ET_OHNO, + ET_HUM, // /dum + ET_BLABLA, // /crwd + ET_OTL, // /otl, /desp + ET_DICE1, + ET_DICE2, + ET_DICE3, // --- 60 + ET_DICE4, + ET_DICE5, + ET_DICE6, + ET_INDIA_FLAG, + ET_LUV, // /love + ET_FLAG8, + ET_FLAG9, + ET_MOBILE, + ET_MAIL, + ET_ANTENNA0, // --- 70 + ET_ANTENNA1, + ET_ANTENNA2, + ET_ANTENNA3, + ET_HUM2, + ET_ABS, + ET_OOPS, + ET_SPIT, + ET_ENE, + ET_PANIC, + ET_WHISP, // --- 80 + ET_YUT1, + ET_YUT2, + ET_YUT3, + ET_YUT4, + ET_YUT5, + ET_YUT6, + ET_YUT7, // - E_MAX + ET_MAX }; enum clr_type : uint8_t diff --git a/src/map/homunculus.cpp b/src/map/homunculus.cpp index 7ba53888f3..f093d42ebd 100644 --- a/src/map/homunculus.cpp +++ b/src/map/homunculus.cpp @@ -200,7 +200,7 @@ int hom_dead(struct homun_data *hd) //There's no intimacy penalties on death (from Tharis) struct map_session_data *sd = hd->master; - clif_emotion(&hd->bl, E_WAH); + clif_emotion(&hd->bl, ET_KEK); //Delete timers when dead. hom_hungry_timer_delete(hd); @@ -209,7 +209,7 @@ int hom_dead(struct homun_data *hd) if (!sd) //unit remove map will invoke unit free return 3; - clif_emotion(&sd->bl, E_SOB); + clif_emotion(&sd->bl, ET_CRY); //Remove from map (if it has no intimacy, it is auto-removed from memory) return 3; } @@ -564,7 +564,7 @@ int hom_evolution(struct homun_data *hd) nullpo_ret(hd); if(!hd->homunculusDB->evo_class || hd->homunculus.class_ == hd->homunculusDB->evo_class) { - clif_emotion(&hd->bl, E_SWT); + clif_emotion(&hd->bl, ET_SWEAT); return 0 ; } sd = hd->master; @@ -595,7 +595,7 @@ int hom_evolution(struct homun_data *hd) return 0; clif_spawn(&hd->bl); - clif_emotion(&sd->bl, E_NO1); + clif_emotion(&sd->bl, ET_BEST); clif_specialeffect(&hd->bl,EF_HO_UP,AREA); //status_Calc flag&1 will make current HP/SP be reloaded from hom structure @@ -626,7 +626,7 @@ int hom_mutate(struct homun_data *hd, int homun_id) m_id = hom_class2mapid(homun_id); if( m_class == -1 || m_id == -1 || !(m_class&HOM_EVO) || !(m_id&HOM_S) ) { - clif_emotion(&hd->bl, E_SWT); + clif_emotion(&hd->bl, ET_SWEAT); return 0; } @@ -646,7 +646,7 @@ int hom_mutate(struct homun_data *hd, int homun_id) return 0; clif_spawn(&hd->bl); - clif_emotion(&sd->bl, E_NO1); + clif_emotion(&sd->bl, ET_BEST); clif_specialeffect(&hd->bl,EF_HO_UP,AREA); //status_Calc flag&1 will make current HP/SP be reloaded from hom structure @@ -828,19 +828,19 @@ int hom_food(struct map_session_data *sd, struct homun_data *hd) if ( hd->homunculus.hunger >= 91 ) { hom_decrease_intimacy(hd, 50); - emotion = E_WAH; + emotion = ET_KEK; } else if ( hd->homunculus.hunger >= 76 ) { hom_decrease_intimacy(hd, 5); - emotion = E_SWT2; + emotion = ET_PROFUSELY_SWEAT; } else if ( hd->homunculus.hunger >= 26 ) { hom_increase_intimacy(hd, 75); - emotion = E_HO; + emotion = ET_DELIGHT; } else if ( hd->homunculus.hunger >= 11 ) { hom_increase_intimacy(hd, 100); - emotion = E_HO; + emotion = ET_DELIGHT; } else { hom_increase_intimacy(hd, 50); - emotion = E_HO; + emotion = ET_DELIGHT; } hd->homunculus.hunger += 10; //dunno increase value for each food @@ -856,7 +856,7 @@ int hom_food(struct map_session_data *sd, struct homun_data *hd) // Too much food :/ if(hd->homunculus.intimacy == 0) - return hom_delete(sd->hd, E_OMG); + return hom_delete(sd->hd, ET_HUK); return 0; } @@ -885,18 +885,18 @@ static int hom_hungry(int tid, unsigned int tick, int id, intptr_t data) hd->homunculus.hunger--; if(hd->homunculus.hunger <= 10) { - clif_emotion(&hd->bl, E_AN); + clif_emotion(&hd->bl, ET_FRET); } else if(hd->homunculus.hunger == 25) { - clif_emotion(&hd->bl, E_HMM); + clif_emotion(&hd->bl, ET_SCRATCH); } else if(hd->homunculus.hunger == 75) { - clif_emotion(&hd->bl, E_OK); + clif_emotion(&hd->bl, ET_OK); } if (hd->homunculus.hunger < 0) { hd->homunculus.hunger = 0; // Delete the homunculus if intimacy <= 100 if (!hom_decrease_intimacy(hd, 100)) - return hom_delete(hd, E_OMG); + return hom_delete(hd, ET_HUK); clif_send_homdata(sd,SP_INTIMATE,hd->homunculus.intimacy / 100); } diff --git a/src/map/pet.cpp b/src/map/pet.cpp index da6ebd62e1..b7f101baad 100644 --- a/src/map/pet.cpp +++ b/src/map/pet.cpp @@ -662,7 +662,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id) sd->catch_target_class = md->mob_id; if(i < 0 || sd->catch_target_class != md->mob_id) { - clif_emotion(&md->bl, E_AG); //mob will do /ag if wrong lure is used on them. + clif_emotion(&md->bl, ET_ANGER); //mob will do /ag if wrong lure is used on them. clif_pet_roulette(sd,0); sd->catch_target_class = -1; @@ -1433,7 +1433,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data) //Detoxify is chosen for now. clif_skill_nodamage(&pd->bl,&sd->bl,TF_DETOXIFY,1,1); status_change_end(&sd->bl, pd->recovery->type, INVALID_TIMER); - clif_emotion(&pd->bl, E_OK); + clif_emotion(&pd->bl, ET_OK); } pd->recovery->timer = INVALID_TIMER; diff --git a/src/map/script.cpp b/src/map/script.cpp index af0a9986a5..629bce0073 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -11469,7 +11469,7 @@ BUILDIN_FUNC(homunculus_evolution) if (sd->hd->homunculus.intimacy >= battle_config.homunculus_evo_intimacy_need) hom_evolution(sd->hd); else - clif_emotion(&sd->hd->bl, E_SWT); + clif_emotion(&sd->hd->bl, ET_SWEAT); } return SCRIPT_CMD_SUCCESS; } @@ -11504,9 +11504,9 @@ BUILDIN_FUNC(homunculus_mutate) script_pushint(st, 1); return SCRIPT_CMD_SUCCESS; } else - clif_emotion(&sd->bl, E_SWT); + clif_emotion(&sd->bl, ET_SWEAT); } else - clif_emotion(&sd->bl, E_SWT); + clif_emotion(&sd->bl, ET_SWEAT); script_pushint(st, 0); @@ -11536,16 +11536,16 @@ BUILDIN_FUNC(morphembryo) if( (i = pc_additem(sd, &item_tmp, 1, LOG_TYPE_SCRIPT)) ) { clif_additem(sd, 0, 0, i); - clif_emotion(&sd->bl, E_SWT); // Fail to avoid item drop exploit. + clif_emotion(&sd->bl, ET_SWEAT); // Fail to avoid item drop exploit. } else { hom_vaporize(sd, HOM_ST_MORPH); script_pushint(st, 1); return SCRIPT_CMD_SUCCESS; } } else - clif_emotion(&sd->hd->bl, E_SWT); + clif_emotion(&sd->hd->bl, ET_SWEAT); } else - clif_emotion(&sd->bl, E_SWT); + clif_emotion(&sd->bl, ET_SWEAT); script_pushint(st, 0); @@ -12704,38 +12704,28 @@ BUILDIN_FUNC(gvgoff3) return SCRIPT_CMD_SUCCESS; } -/*========================================== - * Shows an emoticon on top of the player/npc - * emotion emotion#, , - *------------------------------------------*/ -//Optional second parameter added by [Skotlex] +/** + * Shows an emotion on top of a NPC by default or the given GID + * emotion {,}; + */ BUILDIN_FUNC(emotion) { - int type; - int player=0; + struct block_list *bl = NULL; + int type = script_getnum(st,2); - type=script_getnum(st,2); - if(type < 0 || type > 100) - return SCRIPT_CMD_SUCCESS; + if (type < ET_SURPRISE || type >= ET_MAX) { + ShowWarning("buildin_emotion: Unknown emotion %d (min=%d, max=%d).\n", type, ET_SURPRISE, (ET_MAX-1)); + return SCRIPT_CMD_FAILURE; + } - if( script_hasdata(st,3) ) - player=script_getnum(st,3); + if (script_hasdata(st, 3) && !script_rid2bl(3, bl)) { + ShowWarning("buildin_emotion: Unknown game ID supplied %d.\n", script_getnum(st, 3)); + return SCRIPT_CMD_FAILURE; + } + if (!bl) + bl = map_id2bl(st->oid); - if (player) { - TBL_PC *sd = NULL; - - if( script_nick2sd(4,sd) ){ - clif_emotion(&sd->bl, type); - } - } else - if( script_hasdata(st,4) ) - { - TBL_NPC *nd = npc_name2id(script_getstr(st,4)); - if(nd) - clif_emotion(&nd->bl,type); - } - else - clif_emotion(map_id2bl(st->oid),type); + clif_emotion(bl, type); return SCRIPT_CMD_SUCCESS; } @@ -18498,7 +18488,7 @@ BUILDIN_FUNC(unittalk) /// /// unitemote ,; /// -/// @see e_* in db/const.txt +/// @see ET_* in script_constants.h BUILDIN_FUNC(unitemote) { int emotion; @@ -18506,7 +18496,12 @@ BUILDIN_FUNC(unitemote) emotion = script_getnum(st,3); - if(script_rid2bl(2,bl)) + if (emotion < ET_SURPRISE || emotion >= ET_MAX) { + ShowWarning("buildin_emotion: Unknown emotion %d (min=%d, max=%d).\n", emotion, ET_SURPRISE, (ET_MAX-1)); + return SCRIPT_CMD_FAILURE; + } + + if (script_rid2bl(2,bl)) clif_emotion(bl, emotion); return SCRIPT_CMD_SUCCESS; @@ -23932,7 +23927,7 @@ struct script_function buildin_func[] = { BUILDIN_DEF(pvpoff,"s"), BUILDIN_DEF(gvgon,"s"), BUILDIN_DEF(gvgoff,"s"), - BUILDIN_DEF(emotion,"i??"), + BUILDIN_DEF(emotion,"i?"), BUILDIN_DEF(maprespawnguildid,"sii"), BUILDIN_DEF(agitstart,""), // BUILDIN_DEF(agitend,""), @@ -24108,7 +24103,7 @@ struct script_function buildin_func[] = { BUILDIN_DEF(unitstopattack,"i"), BUILDIN_DEF(unitstopwalk,"i?"), BUILDIN_DEF(unittalk,"is?"), - BUILDIN_DEF(unitemote,"ii"), + BUILDIN_DEF_DEPRECATED(unitemote,"ii","20170811"), BUILDIN_DEF(unitskilluseid,"ivi??"), // originally by Qamera [Celest] BUILDIN_DEF(unitskillusepos,"iviii?"), // [Celest] // <--- [zBuffer] List of unit control commands diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index f881c4bea6..47db7f86e5 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -2621,94 +2621,184 @@ export_constant2("ATF_SKILL",ATF_MAGIC|ATF_MISC); /* emoticons */ - export_constant(E_GASP); - export_constant(E_WHAT); - export_constant(E_HO); - export_constant(E_LV); - export_constant(E_SWT); - export_constant(E_IC); - export_constant(E_AN); - export_constant(E_AG); - export_constant(E_CASH); - export_constant(E_DOTS); - export_constant(E_SCISSORS); - export_constant(E_ROCK); - export_constant(E_PAPER); - export_constant(E_KOREA); - export_constant(E_LV2); - export_constant(E_THX); - export_constant(E_WAH); - export_constant(E_SRY); - export_constant(E_HEH); - export_constant(E_SWT2); - export_constant(E_HMM); - export_constant(E_NO1); - export_constant(E_NO); - export_constant(E_OMG); - export_constant(E_OH); - export_constant(E_X); - export_constant(E_HLP); - export_constant(E_GO); - export_constant(E_SOB); - export_constant(E_GG); - export_constant(E_KIS); - export_constant(E_KIS2); - export_constant(E_PIF); - export_constant(E_OK); - export_constant(E_MUTE); - export_constant(E_INDONESIA); - export_constant(E_BZZ); - export_constant(E_RICE); - export_constant(E_AWSM); - export_constant(E_MEH); - export_constant(E_SHY); - export_constant(E_PAT); - export_constant(E_MP); - export_constant(E_SLUR); - export_constant(E_COM); - export_constant(E_YAWN); - export_constant(E_GRAT); - export_constant(E_HP); - export_constant(E_PHILIPPINES); - export_constant(E_MALAYSIA); - export_constant(E_SINGAPORE); - export_constant(E_BRAZIL); - export_constant(E_FLASH); - export_constant(E_SPIN); - export_constant(E_SIGH); - export_constant(E_DUM); - export_constant(E_LOUD); - export_constant(E_OTL); - export_constant(E_DICE1); - export_constant(E_DICE2); - export_constant(E_DICE3); - export_constant(E_DICE4); - export_constant(E_DICE5); - export_constant(E_DICE6); - export_constant(E_INDIA); - export_constant(E_LUV); - export_constant(E_RUSSIA); - export_constant(E_VIRGIN); - export_constant(E_MOBILE); - export_constant(E_MAIL); - export_constant(E_CHINESE); - export_constant(E_ANTENNA1); - export_constant(E_ANTENNA2); - export_constant(E_ANTENNA3); - export_constant(E_HUM); - export_constant(E_ABS); - export_constant(E_OOPS); - export_constant(E_SPIT); - export_constant(E_ENE); - export_constant(E_PANIC); - export_constant(E_WHISP); - export_constant(E_YUT1); - export_constant(E_YUT2); - export_constant(E_YUT3); - export_constant(E_YUT4); - export_constant(E_YUT5); - export_constant(E_YUT6); - export_constant(E_YUT7); + export_constant(ET_SURPRISE); + export_constant(ET_QUESTION); + export_constant(ET_DELIGHT); + export_constant(ET_THROB); + export_constant(ET_SWEAT); + export_constant(ET_AHA); + export_constant(ET_FRET); + export_constant(ET_ANGER); + export_constant(ET_MONEY); + export_constant(ET_THINK); + export_constant(ET_SCISSOR); + export_constant(ET_ROCK); + export_constant(ET_WRAP); + export_constant(ET_FLAG); + export_constant(ET_BIGTHROB); + export_constant(ET_THANKS); + export_constant(ET_KEK); + export_constant(ET_SORRY); + export_constant(ET_SMILE); + export_constant(ET_PROFUSELY_SWEAT); + export_constant(ET_SCRATCH); + export_constant(ET_BEST); + export_constant(ET_STARE_ABOUT); + export_constant(ET_HUK); + export_constant(ET_O); + export_constant(ET_X); + export_constant(ET_HELP); + export_constant(ET_GO); + export_constant(ET_CRY); + export_constant(ET_KIK); + export_constant(ET_CHUP); + export_constant(ET_CHUPCHUP); + export_constant(ET_HNG); + export_constant(ET_OK); + export_constant(ET_CHAT_PROHIBIT); + export_constant(ET_INDONESIA_FLAG); + export_constant(ET_STARE); + export_constant(ET_HUNGRY); + export_constant(ET_COOL); + export_constant(ET_MERONG); + export_constant(ET_SHY); + export_constant(ET_GOODBOY); + export_constant(ET_SPTIME); + export_constant(ET_SEXY); + export_constant(ET_COMEON); + export_constant(ET_SLEEPY); + export_constant(ET_CONGRATULATION); + export_constant(ET_HPTIME); + export_constant(ET_PH_FLAG); + export_constant(ET_MY_FLAG); + export_constant(ET_SI_FLAG); + export_constant(ET_BR_FLAG); + export_constant(ET_SPARK); + export_constant(ET_CONFUSE); + export_constant(ET_OHNO); + export_constant(ET_HUM); + export_constant(ET_BLABLA); + export_constant(ET_OTL); + export_constant(ET_DICE1); + export_constant(ET_DICE2); + export_constant(ET_DICE3); + export_constant(ET_DICE4); + export_constant(ET_DICE5); + export_constant(ET_DICE6); + export_constant(ET_INDIA_FLAG); + export_constant(ET_LUV); + export_constant(ET_FLAG8); + export_constant(ET_FLAG9); + export_constant(ET_MOBILE); + export_constant(ET_MAIL); + export_constant(ET_ANTENNA0); + export_constant(ET_ANTENNA1); + export_constant(ET_ANTENNA2); + export_constant(ET_ANTENNA3); + export_constant(ET_HUM2); + export_constant(ET_ABS); + export_constant(ET_OOPS); + export_constant(ET_SPIT); + export_constant(ET_ENE); + export_constant(ET_PANIC); + export_constant(ET_WHISP); + export_constant(ET_YUT1); + export_constant(ET_YUT2); + export_constant(ET_YUT3); + export_constant(ET_YUT4); + export_constant(ET_YUT5); + export_constant(ET_YUT6); + export_constant(ET_YUT7); + + /* emoticons deprecated */ + script_set_constant("E_GASP",ET_SURPRISE,false,true); + script_set_constant("E_WHAT",ET_QUESTION,false,true); + script_set_constant("E_HO",ET_DELIGHT,false,true); + script_set_constant("E_LV",ET_THROB,false,true); + script_set_constant("E_SWT",ET_SWEAT,false,true); + script_set_constant("E_IC",ET_AHA,false,true); + script_set_constant("E_AN",ET_FRET,false,true); + script_set_constant("E_AG",ET_ANGER,false,true); + script_set_constant("E_CASH",ET_MONEY,false,true); + script_set_constant("E_DOTS",ET_THINK,false,true); + script_set_constant("E_SCISSORS",ET_SCISSOR,false,true); + script_set_constant("E_ROCK",ET_ROCK,false,true); + script_set_constant("E_PAPER",ET_WRAP,false,true); + script_set_constant("E_KOREA",ET_FLAG,false,true); + script_set_constant("E_LV2",ET_BIGTHROB,false,true); + script_set_constant("E_THX",ET_THANKS,false,true); + script_set_constant("E_WAH",ET_KEK,false,true); + script_set_constant("E_SRY",ET_SORRY,false,true); + script_set_constant("E_HEH",ET_SMILE,false,true); + script_set_constant("E_SWT2",ET_PROFUSELY_SWEAT,false,true); + script_set_constant("E_HMM",ET_SCRATCH,false,true); + script_set_constant("E_NO1",ET_BEST,false,true); + script_set_constant("E_NO",ET_STARE_ABOUT,false,true); + script_set_constant("E_OMG",ET_HUK,false,true); + script_set_constant("E_OH",ET_O,false,true); + script_set_constant("E_X",ET_X,false,true); + script_set_constant("E_HLP",ET_HELP,false,true); + script_set_constant("E_GO",ET_GO,false,true); + script_set_constant("E_SOB",ET_CRY,false,true); + script_set_constant("E_GG",ET_KIK,false,true); + script_set_constant("E_KIS",ET_CHUP,false,true); + script_set_constant("E_KIS2",ET_CHUPCHUP,false,true); + script_set_constant("E_PIF",ET_HNG,false,true); + script_set_constant("E_OK",ET_OK,false,true); + script_set_constant("E_MUTE",ET_CHAT_PROHIBIT,false,true); + script_set_constant("E_INDONESIA",ET_INDONESIA_FLAG,false,true); + script_set_constant("E_BZZ",ET_STARE,false,true); + script_set_constant("E_RICE",ET_HUNGRY,false,true); + script_set_constant("E_AWSM",ET_COOL,false,true); + script_set_constant("E_MEH",ET_MERONG,false,true); + script_set_constant("E_SHY",ET_SHY,false,true); + script_set_constant("E_PAT",ET_GOODBOY,false,true); + script_set_constant("E_MP",ET_SPTIME,false,true); + script_set_constant("E_SLUR",ET_SEXY,false,true); + script_set_constant("E_COM",ET_COMEON,false,true); + script_set_constant("E_YAWN",ET_SLEEPY,false,true); + script_set_constant("E_GRAT",ET_CONGRATULATION,false,true); + script_set_constant("E_HP",ET_HPTIME,false,true); + script_set_constant("E_PHILIPPINES",ET_PH_FLAG,false,true); + script_set_constant("E_MALAYSIA",ET_MY_FLAG,false,true); + script_set_constant("E_SINGAPORE",ET_SI_FLAG,false,true); + script_set_constant("E_BRAZIL",ET_BR_FLAG,false,true); + script_set_constant("E_FLASH",ET_SPARK,false,true); + script_set_constant("E_SPIN",ET_CONFUSE,false,true); + script_set_constant("E_SIGH",ET_OHNO,false,true); + script_set_constant("E_DUM",ET_HUM,false,true); + script_set_constant("E_LOUD",ET_BLABLA,false,true); + script_set_constant("E_OTL",ET_OTL,false,true); + script_set_constant("E_DICE1",ET_DICE1,false,true); + script_set_constant("E_DICE2",ET_DICE2,false,true); + script_set_constant("E_DICE3",ET_DICE3,false,true); + script_set_constant("E_DICE4",ET_DICE4,false,true); + script_set_constant("E_DICE5",ET_DICE5,false,true); + script_set_constant("E_DICE6",ET_DICE6,false,true); + script_set_constant("E_INDIA",ET_INDIA_FLAG,false,true); + script_set_constant("E_LUV",ET_LUV,false,true); + script_set_constant("E_RUSSIA",ET_FLAG8,false,true); + script_set_constant("E_VIRGIN",ET_FLAG9,false,true); + script_set_constant("E_MOBILE",ET_MOBILE,false,true); + script_set_constant("E_MAIL",ET_MAIL,false,true); + script_set_constant("E_CHINESE",ET_ANTENNA0,false,true); + script_set_constant("E_ANTENNA1",ET_ANTENNA1,false,true); + script_set_constant("E_ANTENNA2",ET_ANTENNA2,false,true); + script_set_constant("E_ANTENNA3",ET_ANTENNA3,false,true); + script_set_constant("E_HUM",ET_HUM2,false,true); + script_set_constant("E_ABS",ET_ABS,false,true); + script_set_constant("E_OOPS",ET_OOPS,false,true); + script_set_constant("E_SPIT",ET_SPIT,false,true); + script_set_constant("E_ENE",ET_ENE,false,true); + script_set_constant("E_PANIC",ET_PANIC,false,true); + script_set_constant("E_WHISP",ET_WHISP,false,true); + script_set_constant("E_YUT1",ET_YUT1,false,true); + script_set_constant("E_YUT2",ET_YUT2,false,true); + script_set_constant("E_YUT3",ET_YUT3,false,true); + script_set_constant("E_YUT4",ET_YUT4,false,true); + script_set_constant("E_YUT5",ET_YUT5,false,true); + script_set_constant("E_YUT6",ET_YUT6,false,true); + script_set_constant("E_YUT7",ET_YUT7,false,true); /* send targets */ export_constant(ALL_CLIENT); diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 8ecb3f1ed2..6441295584 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -1126,7 +1126,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1 if (dmg_lv == ATK_BLOCK && skill_id == AM_ACIDTERROR) { sc_start2(src,bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv)); if (skill_break_equip(src,bl, EQP_ARMOR, 100*skill_get_time(skill_id,skill_lv), BCT_ENEMY)) - clif_emotion(bl,E_OMG); + clif_emotion(bl,ET_HUK); } } } @@ -1295,7 +1295,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1 case AM_ACIDTERROR: sc_start2(src,bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv)); if (skill_break_equip(src,bl, EQP_ARMOR, 100*skill_get_time(skill_id,skill_lv), BCT_ENEMY)) - clif_emotion(bl,E_OMG); + clif_emotion(bl,ET_HUK); break; case AM_DEMONSTRATION: @@ -5229,7 +5229,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint break; case NPC_DARKBREATH: - clif_emotion(src,E_AG); + clif_emotion(src,ET_ANGER); case SN_FALCONASSAULT: case PA_PRESSURE: case CR_ACIDDEMONSTRATION: @@ -6376,7 +6376,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui status_kill(src); break; case SA_QUESTION: - clif_emotion(src,E_WHAT); + clif_emotion(src,ET_QUESTION); case SA_GRAVITY: clif_skill_nodamage(src,bl,skill_id,skill_lv,1); break; @@ -16797,7 +16797,7 @@ void skill_weaponrefine(struct map_session_data *sd, int idx) achievement_update_objective(sd, AG_REFINE_FAIL, 1, 1); pc_delitem(sd,idx,1,0,2, LOG_TYPE_OTHER); clif_misceffect(&sd->bl,2); - clif_emotion(&sd->bl, E_OMG); + clif_emotion(&sd->bl, ET_HUK); } } } diff --git a/src/map/status.cpp b/src/map/status.cpp index 57e32e828f..595256b310 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -2141,7 +2141,7 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui if (sc->data[SC_WINKCHARM] && target && !flag) { // Prevents skill usage if (unit_bl2ud(src) && (unit_bl2ud(src))->walktimer == INVALID_TIMER) unit_walktobl(src, map_id2bl(sc->data[SC_WINKCHARM]->val2), 3, 1); - clif_emotion(src, E_LV); + clif_emotion(src, ET_THROB); return false; } @@ -9376,7 +9376,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty case SC_SIGNUMCRUCIS: val2 = 10 + 4*val1; // Def reduction tick = -1; - clif_emotion(bl,E_SWT); + clif_emotion(bl, ET_SWEAT); break; case SC_MAXIMIZEPOWER: tick_time = val2 = tick>0?tick:60000; @@ -9625,7 +9625,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty case SC_CONFUSION: if (!val4) - clif_emotion(bl,E_WHAT); + clif_emotion(bl,ET_QUESTION); break; case SC_S_LIFEPOTION: case SC_L_LIFEPOTION: @@ -10824,7 +10824,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty case SC_REBOUND: tick_time = 2000; val4 = tick / tick_time; - clif_emotion(bl, E_SWT); + clif_emotion(bl, ET_SWEAT); break; case SC_KINGS_GRACE: val2 = 3 + val1; //HP Recover rate @@ -12794,7 +12794,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) break; } } - clif_emotion(bl, E_HEH); + clif_emotion(bl, ET_SMILE); } } break; @@ -13001,7 +13001,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) case SC_OBLIVIONCURSE: if( --(sce->val4) >= 0 ) { - clif_emotion(bl,E_WHAT); + clif_emotion(bl,ET_QUESTION); sc_timer_next(3000 + tick, status_change_timer, bl->id, data ); return 0; } @@ -13156,7 +13156,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) case SC_VOICEOFSIREN: if( --(sce->val4) >= 0 ) { - clif_emotion(bl,E_LV); + clif_emotion(bl,ET_THROB); sc_timer_next(2000 + tick, status_change_timer, bl->id, data); return 0; } @@ -13346,7 +13346,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) break; case SC_TEARGAS_SOB: if( --(sce->val4) >= 0 ) { - clif_emotion(bl, E_SOB); + clif_emotion(bl, ET_CRY); sc_timer_next(3000 + tick, status_change_timer, bl->id, data); return 0; } @@ -13410,7 +13410,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) break; case SC_REBOUND: if( --(sce->val4) >= 0 ) { - clif_emotion(bl, E_SWT); + clif_emotion(bl, ET_SWEAT); sc_timer_next(2000 + tick, status_change_timer, bl->id, data); return 0; } diff --git a/src/map/unit.cpp b/src/map/unit.cpp index dcbddb59ea..4e0596b727 100644 --- a/src/map/unit.cpp +++ b/src/map/unit.cpp @@ -3022,7 +3022,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file, if( !hd->homunculus.intimacy && !(hd->master && !hd->master->state.active) ) { // If logging out, this is deleted on unit_free - clif_emotion(bl, E_SOB); + clif_emotion(bl, ET_CRY); clif_clearunit_area(bl,clrtype); map_delblock(bl); unit_free(bl,CLR_OUTSIGHT);