summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNo Name <remoit(DOT)nane(AT)gmail(DOT)com>2010-02-14 17:48:48 -0800
committerJared Adams <jaxad0127@gmail.com>2010-02-14 18:50:44 -0700
commit6728378e57caa14d811e515891ccbbef07dc1110 (patch)
treef565531050e6d5afd26d20f3c44aca79ddbcb3f4
parent269fcf66456f214975f9dfb2a53d4f104de01d96 (diff)
downloadserverdata-6728378e57caa14d811e515891ccbbef07dc1110.tar.gz
serverdata-6728378e57caa14d811e515891ccbbef07dc1110.tar.bz2
serverdata-6728378e57caa14d811e515891ccbbef07dc1110.tar.xz
serverdata-6728378e57caa14d811e515891ccbbef07dc1110.zip
Close some long-standing issues in Hurnscald's Waitress NPC.
This moves the GP and item checks to immediately precede transactions and addresses a few typographical errors.
-rw-r--r--npc/009-2_Hurnscald/waitress.txt60
1 files changed, 41 insertions, 19 deletions
diff --git a/npc/009-2_Hurnscald/waitress.txt b/npc/009-2_Hurnscald/waitress.txt
index 4bf018ee..265cd234 100644
--- a/npc/009-2_Hurnscald/waitress.txt
+++ b/npc/009-2_Hurnscald/waitress.txt
@@ -1,47 +1,69 @@
// Waitress
009-2.gat,60,52,0 script Melinda 140,{
- if (zeny < 180) goto L_NoMoney;
- getinventorylist;
- set @beerCount, countitem("Beer");
- if (@inventorylist_count == 100 && beerCount == 0) goto L_TooMany;
mes "[Melinda]";
- mes "\"Hi sweety! Want a fresh beer for 170gp?\"";
+ mes "\"Hi, sweetie! Want a fresh beer for 170 GP?\"";
next;
menu
- "\"Sure! [don't tip]\"", -,
- "Sure! [tip 5gp]", L_5Tip,
- "Sure! [tip 10gp]", L_10Tip,
+ "\"Sure! [don't tip]\"", L_NoTip,
+ "Sure! [tip 5 GP]", L_5Tip,
+ "Sure! [tip 10 GP]", L_10Tip,
"Nah, maybe later.", L_No;
+ close;
+
+L_NoTip:
+ if (zeny < 170)
+ goto L_NoMoney;
+
+ getinventorylist;
+ if (@inventorylist_count == 100 && countitem("Beer") == 0)
+ goto L_TooMany;
- mes "[Melinda]";
- mes "Pff... nickel nurser!";
- next;
set zeny, zeny - 170;
getitem "Beer", 1;
+
+ mes "[Melinda]";
+ mes "Pff... nickel nurser!";
close;
L_5Tip:
- mes "[Melinda]";
- mes "\"Here you go, sweethearth!\"";
- next;
+ if (zeny < 175)
+ goto L_NoMoney;
+
+ getinventorylist;
+ if (@inventorylist_count == 100 && countitem("Beer") == 0)
+ goto L_TooMany;
+
set zeny, zeny - 175;
getitem "Beer", 1;
+
+ mes "[Melinda]";
+ mes "\"Here you go, sweetheart!\"";
close;
L_10Tip:
- mes "[Melinda]";
- mes "\"Thank you, sweety! Want me to hear a secret?\"";
- next;
+ if (zeny < 180)
+ goto L_NoMoney;
+
+ getinventorylist;
+ if (@inventorylist_count == 100 && countitem("Beer") == 0)
+ goto L_TooMany;
+
set zeny, zeny - 180;
getitem "Beer", 1;
+
+ mes "[Melinda]";
+ mes "\"Thank you, sweetie! Want to hear a secret?\"";
+ next;
+
menu
- "What's it, darling?", -,
+ "What is it, darling?", -,
"Nah, I don't feel like chatting.", L_No;
+
mes "[Melinda]";
- mes "\"The bowmaking master in this village used to construct exceptional bows. When you want one you should go and ask him.\"";
+ mes "\"The master bowyer in this village used to construct exceptional bows. When you want one you should go and ask him.\"";
close;
L_No: