From 9f132a0a2b8f5d7afa11b281673c1f26ed0da95d Mon Sep 17 00:00:00 2001 From: coffee Date: Thu, 15 Sep 2011 09:19:40 -0300 Subject: Small dialog fixes and cleaning temporary variables when closing NPC window in voltain.txt. Changes tested. --- world/map/npc/007-1/voltain.txt | 96 +++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 33 deletions(-) (limited to 'world/map/npc/007-1/voltain.txt') diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index ba2418ff..d2becc5a 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -94,7 +94,7 @@ state0: next; menu "I've got the bottles.", -, - "I don't feel like helping you get garbage...", L_CLOSE; + "I don't feel like helping you get garbage...", L_Close; if (countitem("EmptyBottle") < @BOTTLE_NEEDED) goto L_NOT_ENOUGH; @@ -103,7 +103,7 @@ state0: getexp @BOTTLE_REWARD_XP, 0; set $state, 1; mes "\"Thanks for the bottles. Much easier to carry liquid in them.\""; - close; + goto L_Close; state1: mes "[Voltain]"; @@ -112,7 +112,7 @@ next; menu "I've got the stingers!", -, - "I'll go search for them.", L_CLOSE; + "I'll go search for them.", L_Close; mes "[Voltain]"; if (countitem("BlackScorpionStinger") < @BLACK_SC_ST_NEEDED) goto L_NOT_ENOUGH; @@ -121,7 +121,7 @@ menu getexp @BLACK_SC_ST_REWARD_XP, 0; set $state, 2; mes "\"Well, since you went to the trouble of getting me these here's a little something for your time...\""; - close; + goto L_Close; state2: @@ -139,7 +139,7 @@ state2: getexp @BUGLEG_REWARD_XP, 0; set $state, 3; mes "\"Great! My potion is ready to poison the moub...I mean cure scorpion stings. \""; - close; + goto L_Close; state3: mes "[Voltain]"; @@ -147,7 +147,7 @@ state3: next; menu "Here's the stinger.", -, - "I DID HEAR THAT! I will not help you KILL mouboo!", L_CLOSE; + "I DID HEAR THAT! I will not help you KILL mouboo!", L_Close; mes "[Voltain]"; if (countitem("BlackScorpionStinger") < 1) goto L_NOT_ENOUGH; @@ -155,7 +155,7 @@ state3: getexp @BLACK_SC_ST_REWARD_XP, 0; set $state, 4; mes "\"Great! Now I can really kill that monster!\""; - close; + goto L_Close; state4: mes "[Voltain]"; @@ -163,7 +163,7 @@ state4: next; menu "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; + "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; @@ -172,7 +172,7 @@ state4: set zeny, zeny + @HERBS_REWARD_GOLD; set $state, 5; mes "\"Great! Now I can thicken the potion! I will try directly.\""; - close; + goto L_Close; state5: mes "[Voltain]"; @@ -180,7 +180,7 @@ state5: next; menu "Here are the raw logs.", -, - "So you want build traps for mouboos? NO WAY!", L_CLOSE; + "So you want build traps for mouboos? NO WAY!", L_Close; mes "[Voltain]"; if (countitem("RawLog") < @RAWLOG_NEEDED) goto L_NOT_ENOUGH; @@ -189,7 +189,7 @@ state5: set zeny, zeny + @RAWLOG_REWARD_GOLD; set $state, 6; mes "\"Great! Now I can thicken the potion! I will try directly.\""; - close; + goto L_Close; state6: mes "[Voltain]"; @@ -197,7 +197,7 @@ state6: next; menu "Here are the red apples.", -, - "I am not sure...", L_CLOSE; + "I am not sure...", L_Close; mes "[Voltain]"; if (countitem("RedApple") < @REDAPPLE_NEEDED) goto L_NOT_ENOUGH; @@ -206,7 +206,7 @@ state6: set zeny, zeny + @REDAPPLE_REWARD_GOLD; set $state,7; mes "\"Very well, this will be useful.\""; - close; + goto L_Close; state7: mes "[Voltain]"; @@ -214,7 +214,7 @@ state7: next; menu "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; + "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; @@ -223,7 +223,7 @@ state7: 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; + goto L_Close; state8: mes "[Voltain]"; @@ -231,7 +231,7 @@ state8: next; menu "Sure, here you go!", -, - "Maybe you will find someone else, I got stuff to do on my own!", L_CLOSE; + "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; @@ -240,7 +240,7 @@ state8: 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; + goto L_Close; state9: mes "[Voltain]"; @@ -248,7 +248,7 @@ state9: next; menu "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; + "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; @@ -257,17 +257,17 @@ state9: set zeny, zeny + @HERBS_REWARD_GOLD; set $state, 10; mes "\"Great! Now I can thicken the potion! I will try directly.\""; - close; + goto L_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!\""; + 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; + "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; @@ -276,16 +276,16 @@ state10: set zeny, zeny + @STEAK_REWARD_GOLD; set $state, 11; mes "\"Thanks a lot. I will really enjoy my meal.\""; - close; + goto L_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!\""; + 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; + "Sorry I don't have arrows here!", L_Close; mes "[Voltain]"; if (countitem("Arrow") < @ARROW_NEEDED) goto L_NOT_ENOUGH; @@ -294,7 +294,7 @@ state11: set zeny, zeny + @ARROW_REWARD_GOLD; set $state, 12; mes "\"Thanks a lot. Now I feel more secure here in the outdoors.\""; - close; + goto L_Close; state12: mes "[Voltain]"; @@ -302,7 +302,7 @@ state12: next; menu "Here are the herbs.", -, - "So you want to do a venom? I will not help you!", L_CLOSE; + "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; @@ -311,15 +311,15 @@ state12: set zeny, zeny + @HERBS_REWARD_GOLD; set $state, 13; mes "\"Great! Now I can thicken the potion! I will try directly.\""; - close; + goto L_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? \""; + 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; + "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; @@ -329,18 +329,48 @@ state13: set $state, 0; mes "\"I love chocolate cakes. I wonder, if I can use my ven- \""; emotion EMOTE_EVIL; - close; + goto L_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; + goto L_Close; -L_CLOSE: +L_Close: + set @BOTTLE_NEEDED, 0; + set @BOTTLE_REWARD_XP, 0; + set @BOTTLE_REWARD_GOLD, 0; + set @BLACK_SC_ST_NEEDED, 0; + set @BLACK_SC_ST_REWARD_XP, 0; + set @BLACK_SC_ST_REWARD_GOLD, 0; + set @BUGLEG_NEEDED, 0; + set @BUGLEG_REWARD_XP, 0; + set @BUGLEG_REWARD_GOLD, 0; + set @HERBS_NEEDED, 0; + set @HERBS_REWARD_XP, 0; + set @HERBS_REWARD_GOLD, 0; + set @RAWLOG_NEEDED, 0; + set @RAWLOG_REWARD_XP, 0; + set @RAWLOG_REWARD_GOLD, 0; + set @REDAPPLE_NEEDED, 0; + set @REDAPPLE_REWARD_XP, 0; + set @REDAPPLE_REWARD_GOLD, 0; + set @STEAK_NEEDED, 0; + set @STEAK_REWARD_XP, 0; + set @STEAK_REWARD_GOLD, 0; + set @ARROW_NEEDED, 0; + set @ARROW_REWARD_XP, 0; + set @ARROW_REWARD_GOLD, 0; + set @SNAKETONGUE_NEEDED, 0; + set @SNAKETONGUE_REWARD_XP, 0; + set @SNAKETONGUE_REWARD_GOLD, 0; + set @CHOCOLATECAKE_NEEDED, 0; + set @CHOCOLATECAKE_REWARD_XP, 0; + set @CHOCOLATECAKE_REWARD_GOLD, 0; close; L_NOT_ENOUGH: mes "\"Can't you count!? I need more. \""; - close; + goto L_Close; } -- cgit v1.2.3-60-g2f50