From a023cf16f0ec841620c975862cb5a96de99c577f Mon Sep 17 00:00:00 2001 From: The Kandiman Date: Mon, 5 Sep 2011 00:59:06 -0400 Subject: Tab conversion project. Maps 007-1 to 010-2 complete. --- world/map/npc/007-1/voltain.txt | 407 +++++++++++++++++++--------------------- 1 file changed, 195 insertions(+), 212 deletions(-) (limited to 'world/map/npc/007-1') diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index ff13d70b..380326b2 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -25,81 +25,79 @@ // # $state = 12: bring gamboge herbs // # $state = 13 bring chocolate cake -007-1.gat,37,21,0 script Voltain 103, { - -set @BOTTLE_NEEDED, 3; -set @BOTTLE_REWARD_XP, 100; -set @BOTTLE_REWARD_GOLD, 450; - -set @BLACK_SC_ST_NEEDED, 5; -set @BLACK_SC_ST_REWARD_XP, 500; -set @BLACK_SC_ST_REWARD_GOLD, 250; - -set @BUGLEG_NEEDED, 10; -set @BUGLEG_REWARD_XP, 200; -set @BUGLEG_REWARD_GOLD, 150; - -set @HERBS_NEEDED, 7; -set @HERBS_REWARD_XP, 200; -set @HERBS_REWARD_GOLD, 250; - -set @RAWLOG_NEEDED, 5; -set @RAWLOG_REWARD_XP, 330; -set @RAWLOG_REWARD_GOLD, 300; - -set @REDAPPLE_NEEDED, 7; -set @REDAPPLE_REWARD_XP, 330; -set @REDAPPLE_REWARD_GOLD, 300; - -set @STEAK_NEEDED, 2; -set @STEAK_REWARD_XP, 330; -set @STEAK_REWARD_GOLD, 280; - -set @ARROW_NEEDED, 25; -set @ARROW_REWARD_XP, 330; -set @ARROW_REWARD_GOLD, 100; - -set @SNAKETONGUE_NEEDED, 3; -set @SNAKETONGUE_REWARD_XP, 330; -set @SNAKETONGUE_REWARD_GOLD, 100; - -set @CHOCOLATECAKE_NEEDED, 3; -set @CHOCOLATECAKE_REWARD_XP, 330; -set @CHOCOLATECAKE_REWARD_GOLD, 180; - -if ($state == 1) goto state1; -if ($state == 2) goto state2; -if ($state == 3) goto state3; -if ($state == 4) goto state4; -if ($state == 5) goto state5; -if ($state == 6) goto state6; -if ($state == 7) goto state7; -if ($state == 8) goto state8; -if ($state == 9) goto state9; -if ($state == 10) goto state10; -if ($state == 11) goto state11; -if ($state == 12) goto state12; -if ($state == 13) goto state13; -// default: trap through to state0! +007-1.gat,37,21,0|script|Voltain|103,{ + + set @BOTTLE_NEEDED, 3; + set @BOTTLE_REWARD_XP, 100; + set @BOTTLE_REWARD_GOLD, 450; + + set @BLACK_SC_ST_NEEDED, 5; + set @BLACK_SC_ST_REWARD_XP, 500; + set @BLACK_SC_ST_REWARD_GOLD, 250; + + set @BUGLEG_NEEDED, 10; + set @BUGLEG_REWARD_XP, 200; + set @BUGLEG_REWARD_GOLD, 150; + + set @HERBS_NEEDED, 7; + set @HERBS_REWARD_XP, 200; + set @HERBS_REWARD_GOLD, 250; + + set @RAWLOG_NEEDED, 5; + set @RAWLOG_REWARD_XP, 330; + set @RAWLOG_REWARD_GOLD, 300; + + set @REDAPPLE_NEEDED, 7; + set @REDAPPLE_REWARD_XP, 330; + set @REDAPPLE_REWARD_GOLD, 300; + + set @STEAK_NEEDED, 2; + set @STEAK_REWARD_XP, 330; + set @STEAK_REWARD_GOLD, 280; + + set @ARROW_NEEDED, 25; + set @ARROW_REWARD_XP, 330; + set @ARROW_REWARD_GOLD, 100; + + set @SNAKETONGUE_NEEDED, 3; + set @SNAKETONGUE_REWARD_XP, 330; + set @SNAKETONGUE_REWARD_GOLD, 100; + + set @CHOCOLATECAKE_NEEDED, 3; + set @CHOCOLATECAKE_REWARD_XP, 330; + set @CHOCOLATECAKE_REWARD_GOLD, 180; + + if ($state == 1) goto state1; + if ($state == 2) goto state2; + if ($state == 3) goto state3; + if ($state == 4) goto state4; + if ($state == 5) goto state5; + if ($state == 6) goto state6; + if ($state == 7) goto state7; + if ($state == 8) goto state8; + if ($state == 9) goto state9; + if ($state == 10) goto state10; + if ($state == 11) goto state11; + if ($state == 12) goto state12; + if ($state == 13) goto state13; +// default: trap through to state0! state0: -mes "[Voltain]"; -mes "\"What are you doing bothering me? Can't you see I'm busy! Oh, I'm sorry, I thought you were my assistant. Never mind that... would you care to help me?\""; -next; - -menu - "Sure I do!", -, - "No, you creep me out.", L_NOHELP; - -mes "[Voltain]"; -mes "\"I'm working on a very special potion. I need some empty bottles to keep the ingredients in. Care to go find me " + @BOTTLE_NEEDED + " empty bottles?!\""; -next; - -menu - "I've got the bottles.", -, - "I don't feel like helping you get garbage...", L_CLOSE; - -if (countitem("EmptyBottle") < @BOTTLE_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"What are you doing bothering me? Can't you see I'm busy! Oh, I'm sorry, I thought you were my assistant. Never mind that... would you care to help me?\""; + next; + menu + "Sure I do!", -, + "No, you creep me out.", L_NOHELP; + mes "[Voltain]"; + mes "\"I'm working on a very special potion. I need some empty bottles to keep the ingredients in. Care to go find me " + @BOTTLE_NEEDED + " empty bottles?!\""; + next; + menu + "I've got the bottles.", -, + "I don't feel like helping you get garbage...", L_CLOSE; + + if (countitem("EmptyBottle") < @BOTTLE_NEEDED) + goto L_NOT_ENOUGH; delitem "EmptyBottle", @BOTTLE_NEEDED; set zeny, zeny + @BOTTLE_REWARD_GOLD; getexp @BOTTLE_REWARD_XP, 0; @@ -115,9 +113,9 @@ next; menu "I've got the stingers!", -, "I'll go search for them.", L_CLOSE; - -mes "[Voltain]"; - if (countitem("BlackScorpionStinger") < @BLACK_SC_ST_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + if (countitem("BlackScorpionStinger") < @BLACK_SC_ST_NEEDED) + goto L_NOT_ENOUGH; delitem "BlackScorpionStinger", @BLACK_SC_ST_NEEDED; set zeny, zeny + @BLACK_SC_ST_REWARD_GOLD; getexp @BLACK_SC_ST_REWARD_XP, 0; @@ -127,16 +125,15 @@ mes "[Voltain]"; state2: -mes "[Voltain]"; -mes "\"Care to to help me with my potion? I need " + @BUGLEG_NEEDED + " bug legs so that I can thicken the potion.\""; -next; - -menu - "I've got the bug legs.", -, - "I'd rather not carry around dead bugs for you.", L_NOHELP ; - -mes "[Voltain]"; - if (countitem("BugLeg") < @BUGLEG_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"Care to to help me with my potion? I need " + @BUGLEG_NEEDED + " bug legs so that I can thicken the potion.\""; + next; + menu + "I've got the bug legs.", -, + "I'd rather not carry around dead bugs for you.", L_NOHELP ; + mes "[Voltain]"; + if (countitem("BugLeg") < @BUGLEG_NEEDED) + goto L_NOT_ENOUGH; delitem "BugLeg", @BUGLEG_NEEDED; set zeny, zeny + @BUGLEG_REWARD_GOLD; getexp @BUGLEG_REWARD_XP, 0; @@ -145,16 +142,15 @@ mes "[Voltain]"; close; state3: -mes "[Voltain]"; -mes "\"I find myself in need of a black scorpion stinger... Damn mouboo are hard to kill...forget you heard that.\""; -next; - -menu - "Here's the stinger.", -, - "I DID HEAR THAT! I will not help you KILL mouboo!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("BlackScorpionStinger") < 1) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"I find myself in need of a black scorpion stinger... Damn mouboo are hard to kill...forget you heard that.\""; + next; + menu + "Here's the stinger.", -, + "I DID HEAR THAT! I will not help you KILL mouboo!", L_CLOSE; + mes "[Voltain]"; + if (countitem("BlackScorpionStinger") < 1) + goto L_NOT_ENOUGH; delitem "BlackScorpionStinger", 1; getexp @BLACK_SC_ST_REWARD_XP, 0; set $state, 4; @@ -162,35 +158,32 @@ mes "[Voltain]"; close; state4: -mes "[Voltain]"; -mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try mauve herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; -next; - -menu - "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("MauveHerb") < @HERBS_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try mauve herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; + next; + menu + "Here are the herbs.", -, + "So you want to do a venom? I will not help you!", L_CLOSE; + mes "[Voltain]"; + if (countitem("MauveHerb") < @HERBS_NEEDED) + goto L_NOT_ENOUGH; delitem "MauveHerb", @HERBS_NEEDED; getexp @HERBS_REWARD_XP, 0; set zeny, zeny + @HERBS_REWARD_GOLD; set $state, 5; mes "\"Great! Now I can thicken the potion! I will try directly.\""; close; - state5: -mes "[Voltain]"; -mes "\"Hello I am looking for " + @RAWLOG_NEEDED + " raw logs, maybe you could help me getting some? I want to try to build a mouboo trap.. Uhm actually no! I want to build a device to destroy these traps. So can you help me?\""; -next; - -menu - "Here are the raw logs.", -, - "So you want build traps for mouboos? NO WAY!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("RawLog") < @RAWLOG_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"Hello I am looking for " + @RAWLOG_NEEDED + " raw logs, maybe you could help me getting some? I want to try to build a mouboo trap.. Uhm actually no! I want to build a device to destroy these traps. So can you help me?\""; + next; + menu + "Here are the raw logs.", -, + "So you want build traps for mouboos? NO WAY!", L_CLOSE; + mes "[Voltain]"; + if (countitem("RawLog") < @RAWLOG_NEEDED) + goto L_NOT_ENOUGH; delitem "RawLog", @RAWLOG_NEEDED; getexp @RAWLOG_REWARD_XP, 0; set zeny, zeny + @RAWLOG_REWARD_GOLD; @@ -199,70 +192,66 @@ mes "[Voltain]"; close; state6: -mes "[Voltain]"; -mes "\"Hello I am looking for " + @REDAPPLE_NEEDED + " red apples, maybe I can inject some venoms.. DOH not this again! Of course I meant a strength potion. Did you hear about the new potions from Caul? He is a pretty good alchimist. He can do strength potions, can't he?\""; -next; - -menu - "Here are the red apples.", -, - "I am not sure...", L_CLOSE; - -mes "[Voltain]"; - if (countitem("RedApple") < @REDAPPLE_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"Hello I am looking for " + @REDAPPLE_NEEDED + " red apples, maybe I can inject some venoms.. DOH not this again! Of course I meant a strength potion. Did you hear about the new potions from Caul? He is a pretty good alchimist. He can do strength potions, can't he?\""; + next; + menu + "Here are the red apples.", -, + "I am not sure...", L_CLOSE; + mes "[Voltain]"; + if (countitem("RedApple") < @REDAPPLE_NEEDED) + goto L_NOT_ENOUGH; delitem "RedApple", @REDAPPLE_NEEDED; getexp @REDAPPLE_REWARD_XP, 0; set zeny, zeny + @REDAPPLE_REWARD_GOLD; set $state,7; mes "\"Very well, this will be useful.\""; close; - -state7: -mes "[Voltain]"; -mes "\"I need to thicken a veno.. Oh, a potion actually. Cobalt herbs might be good for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; -next; -menu - "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("CobaltHerb") < @HERBS_NEEDED) goto L_NOT_ENOUGH; +state7: + mes "[Voltain]"; + mes "\"I need to thicken a veno.. Oh, a potion actually. Cobalt herbs might be good for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; + next; + menu + "Here are the herbs.", -, + "So you want to do a venom? I will not help you!", L_CLOSE; + mes "[Voltain]"; + if (countitem("CobaltHerb") < @HERBS_NEEDED) + goto L_NOT_ENOUGH; delitem "CobaltHerb", @HERBS_NEEDED; getexp @HERBS_REWARD_XP, 0; set zeny, zeny + @HERBS_REWARD_GOLD; set $state, 8; mes "\"Great! Now I can go on with the ven- the experiments for the welfare of humanity, i mean.\""; close; - -state8: -mes "[Voltain]"; -mes "\"I am in need of snake tongues. They can help me getting very strong venom extracts. So I would like you to bring me " + @SNAKETONGUE_NEEDED + " snake tongues.\""; -next; -menu - "Sure, here you go!", -, - "Maybe you will find someone else, I got stuff to do on my own!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("SnakeTongue") < @SNAKETONGUE_NEEDED) goto L_NOT_ENOUGH; +state8: + mes "[Voltain]"; + mes "\"I am in need of snake tongues. They can help me getting very strong venom extracts. So I would like you to bring me " + @SNAKETONGUE_NEEDED + " snake tongues.\""; + next; + menu + "Sure, here you go!", -, + "Maybe you will find someone else, I got stuff to do on my own!", L_CLOSE; + mes "[Voltain]"; + if (countitem("SnakeTongue") < @SNAKETONGUE_NEEDED) + goto L_NOT_ENOUGH; delitem "SnakeTongue", @SNAKETONGUE_NEEDED; getexp @SNAKETONGUE_REWARD_XP, 0; set zeny, zeny + @SNAKETONGUE_REWARD_GOLD; set $state, 9; mes "\"Excellent, now I can extract the venom to- uhm, nevermind. Thanks for your help.\""; close; - -state9: -mes "[Voltain]"; -mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try alizarin herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; -next; - -menu - "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; -mes "[Voltain]"; - if (countitem("AlizarinHerb") < @HERBS_NEEDED) goto L_NOT_ENOUGH; +state9: + mes "[Voltain]"; + mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try alizarin herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; + next; + menu + "Here are the herbs.", -, + "So you want to do a venom? I will not help you!", L_CLOSE; + mes "[Voltain]"; + if (countitem("AlizarinHerb") < @HERBS_NEEDED) + goto L_NOT_ENOUGH; delitem "AlizarinHerb", @HERBS_NEEDED; getexp @HERBS_REWARD_XP, 0; set zeny, zeny + @HERBS_REWARD_GOLD; @@ -271,18 +260,17 @@ mes "[Voltain]"; close; state10: -mes "[Voltain]"; -mes "\"Oh I am hungry. Maybe I can eat some steaks. Could you bring me a steak, please?\""; -next; -mes "\"Oh, I just wonder if i can inject some ven... Forget about that! Bring me " + @STEAK_NEEDED + "steaks!\""; -next; - -menu - "Here you go.", -, - "Help yourself! In the Hurnscald Inn you can get some meals for sure!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("Steak") < @STEAK_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"Oh I am hungry. Maybe I can eat some steaks. Could you bring me a steak, please?\""; + next; + mes "\"Oh, I just wonder if i can inject some ven... Forget about that! Bring me " + @STEAK_NEEDED + "steaks!\""; + next; + menu + "Here you go.", -, + "Help yourself! In the Hurnscald Inn you can get some meals for sure!", L_CLOSE; + mes "[Voltain]"; + if (countitem("Steak") < @STEAK_NEEDED) + goto L_NOT_ENOUGH; delitem "Steak", @STEAK_NEEDED; getexp @STEAK_REWARD_XP, 0; set zeny, zeny + @STEAK_REWARD_GOLD; @@ -291,17 +279,16 @@ mes "[Voltain]"; close; state11: -mes "[Voltain]"; -mes "\"Could I have some arrows please? I have lost my hunting equipment when I was in the caves. Some dark creatures were chasing me!\""; -next; -mes "\"Acually I wonder if I can use these arrows for building a mouboo trap.... Oh wait! I need some" + @ARROW_NEEDED + " arrows for my self defence right? So do not talk about it!\""; - -menu - "Here you go.", -, - "Sorry I don't have arrows here!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("Arrow") < @ARROW_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"Could I have some arrows please? I have lost my hunting equipment when I was in the caves. Some dark creatures were chasing me!\""; + next; + mes "\"Acually I wonder if I can use these arrows for building a mouboo trap.... Oh wait! I need some" + @ARROW_NEEDED + " arrows for my self defence right? So do not talk about it!\""; + menu + "Here you go.", -, + "Sorry I don't have arrows here!", L_CLOSE; + mes "[Voltain]"; + if (countitem("Arrow") < @ARROW_NEEDED) + goto L_NOT_ENOUGH; delitem "Arrow", @ARROW_NEEDED; getexp @ARROW_REWARD_XP, 0; set zeny, zeny + @ARROW_REWARD_GOLD; @@ -310,16 +297,15 @@ mes "[Voltain]"; close; state12: -mes "[Voltain]"; -mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try gamboge herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; -next; - -menu - "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; - -mes "[Voltain]"; - if (countitem("GambogeHerb") < @HERBS_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try gamboge herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\""; + next; + menu + "Here are the herbs.", -, + "So you want to do a venom? I will not help you!", L_CLOSE; + mes "[Voltain]"; + if (countitem("GambogeHerb") < @HERBS_NEEDED) + goto L_NOT_ENOUGH; delitem "GambogeHerb", @HERBS_NEEDED; getexp @HERBS_REWARD_XP, 0; set zeny, zeny + @HERBS_REWARD_GOLD; @@ -328,16 +314,15 @@ mes "[Voltain]"; close; state13: -mes "[Voltain]"; -mes "\"Doing so many ev- good things makes me hungry. I feel in the mood for a Chocolate Cake. Can you bring me " + @CHOCOLATECAKE_NEEDED + " , please? \""; -next; - -menu - "Here it is.", -, - "I don't feel in the mood to bring you a cake.", L_CLOSE; - -mes "[Voltain]"; - if (countitem("ChocolateCake") < @CHOCOLATECAKE_NEEDED) goto L_NOT_ENOUGH; + mes "[Voltain]"; + mes "\"Doing so many ev- good things makes me hungry. I feel in the mood for a Chocolate Cake. Can you bring me " + @CHOCOLATECAKE_NEEDED + " , please? \""; + next; + menu + "Here it is.", -, + "I don't feel in the mood to bring you a cake.", L_CLOSE; + mes "[Voltain]"; + if (countitem("ChocolateCake") < @CHOCOLATECAKE_NEEDED) + goto L_NOT_ENOUGH; delitem "ChocolateCake", @CHOCOLATECAKE_NEEDED; getexp @CHOCOLATECAKE_REWARD_XP, 0; set zeny, zeny + @CHOCOLATECAKE_REWARD_GOLD; @@ -347,17 +332,15 @@ mes "[Voltain]"; close; L_NOHELP: -mes "\"If you don't want to help me, then away with you. Bothering me won't help me get my work done.\""; -mes "Voltain then mumbles something under his breath that you cannot quite make out"; -mes "\"... These damn kids. \""; -close; + mes "\"If you don't want to help me, then away with you. Bothering me won't help me get my work done.\""; + mes "Voltain then mumbles something under his breath that you cannot quite make out"; + mes "\"... These damn kids. \""; + close; L_CLOSE: -close; + close; L_NOT_ENOUGH: -mes "\"Can't you count!? I need more. \""; -close; + mes "\"Can't you count!? I need more. \""; + close; } - - -- cgit v1.2.3-60-g2f50 From 0ad99072c594ba4bae6c1477488ba8322b22ec02 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 6 Sep 2011 22:31:42 -0700 Subject: Add EMOTE_ constants Also fix an off-by-one error in the entertainer --- world/map/db/const.txt | 17 +++++++++++++++++ world/map/npc/001-1/entertainer.txt | 3 +-- world/map/npc/001-1/sarah.txt | 4 ++-- world/map/npc/007-1/voltain.txt | 2 +- world/map/npc/021-2/bakery.txt | 2 +- world/map/npc/031-2/cindyHouse.txt | 16 ++-------------- world/map/npc/042-2/tanisha.txt | 4 ++-- 7 files changed, 26 insertions(+), 22 deletions(-) (limited to 'world/map/npc/007-1') diff --git a/world/map/db/const.txt b/world/map/db/const.txt index e8ca1c31..dcabf7c6 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -214,6 +214,23 @@ sc_slowpoison 14 sc_raiseattackspeed0 37 sc_raiseattackstrength 185 +// emotions +// note, client-data/emote.xml uses the wrong numbers +EMOTE_DISGUST 1 +EMOTE_SURPRISE 2 +EMOTE_HAPPY 3 +EMOTE_SAD 4 +EMOTE_EVIL 5 +EMOTE_WINK 6 +EMOTE_ANGEL 7 +EMOTE_BLUSH 8 +EMOTE_TONGUE 9 +EMOTE_GRIN 10 +EMOTE_UPSET 11 +EMOTE_PERTURBED 12 +EMOTE_SPEECH 13 +EMOTE_BLAH 14 + // Marriage-related WEDDING_FEE 100 DIVORCE_FEE_PER_LEVEL 500 diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt index b57b97f8..5fe8cbc3 100644 --- a/world/map/npc/001-1/entertainer.txt +++ b/world/map/npc/001-1/entertainer.txt @@ -38,10 +38,9 @@ L_Close: close; OnTimer3000: - emotion rand(0,11); + emotion rand(EMOTE_DISGUST, EMOTE_PERTURBED); setnpctimer 0; OnInit: initnpctimer; - } diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt index 57793ec9..8a84df47 100644 --- a/world/map/npc/001-1/sarah.txt +++ b/world/map/npc/001-1/sarah.txt @@ -60,7 +60,7 @@ L_Progress: mes "\"Whee!\""; next; mes "You brought me Cherry Cake! Here is your new hat, as promised.\""; - emotion 9; + emotion EMOTE_TONGUE; getinventorylist; if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany; delitem "CherryCake", 1; @@ -76,7 +76,7 @@ L_NotEnough: L_Done: mes "[Sarah]"; mes "\"It was so tasty, I can't eat anything more... Thank you!\""; - emotion 9; + emotion EMOTE_TONGUE; goto L_Close; L_Close: diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index 380326b2..ba2418ff 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -328,7 +328,7 @@ state13: set zeny, zeny + @CHOCOLATECAKE_REWARD_GOLD; set $state, 0; mes "\"I love chocolate cakes. I wonder, if I can use my ven- \""; - emotion 5; + emotion EMOTE_EVIL; close; L_NOHELP: diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 8a6dbdb2..1fa60134 100644 --- a/world/map/npc/021-2/bakery.txt +++ b/world/map/npc/021-2/bakery.txt @@ -27,7 +27,7 @@ L_Begin: mes "\"Would you mind bringing me 6 acorns please? I need them to make flour for the chocolate cakes. I will be so delicious!\""; next; mes "\"Um, I mean, the cakes will be delicious...\""; - emotion 8; + emotion EMOTE_BLUSH; next; set @dq_level, 15; diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt index d92da10b..79b8704c 100644 --- a/world/map/npc/031-2/cindyHouse.txt +++ b/world/map/npc/031-2/cindyHouse.txt @@ -31,7 +31,8 @@ L_Happy_Random: "Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.", strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!"; set @random, rand(9); - if (@random != 5) emotion 3; + if (@random != 5) + emotion EMOTE_HAPPY; set @quote$, "\"" + @quote_Cindy$[@random] + "\""; mes "[Cindy]"; mes @quote$; @@ -49,16 +50,3 @@ S_Update_Mask: | (@rescue_Cindy << @Q_Nivalis_state_SHIFT); return; } - - - - - - - - - - - - - diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index 45f6e027..dd4b57ac 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -15,7 +15,7 @@ mes "[Tanisha]"; mes "\"Hey! You're up again!\""; - emotion 3; + emotion EMOTE_HAPPY; next; mes "\"Are you feeling better?\""; next; @@ -111,7 +111,7 @@ L_Advice: next; mes "\"When you go to Tulimshar, you should see Bernard. He can make a delicious soup!"; mes "Good luck!\""; - emotion 3; + emotion EMOTE_HAPPY; if (tanisha == 3) set tanisha, 4; close; -- cgit v1.2.3-60-g2f50