summaryrefslogtreecommitdiff
path: root/world/map/npc/015-3/katze.txt
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-02 11:06:32 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-02 22:21:29 -0700
commitc0ba38cd4b68491e28e467889804ebc09c9c002e (patch)
treeaf2890e6fe20990d2a9b7c94b991be58f25a5d52 /world/map/npc/015-3/katze.txt
parent514a2f05cb335c1e9210fea58bc9a9a58478283f (diff)
downloadserverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.gz
serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.bz2
serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.tar.xz
serverdata-c0ba38cd4b68491e28e467889804ebc09c9c002e.zip
Clean up main scripts
Diffstat (limited to 'world/map/npc/015-3/katze.txt')
-rw-r--r--world/map/npc/015-3/katze.txt26
1 files changed, 10 insertions, 16 deletions
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index d90cd10c..45a6349a 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -21,9 +21,9 @@
set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
if (@cat == 1 && @catNeedsAlone == 0) goto L_NeedsFood;
- if (@cat == 1) goto L_PreNeedsFood;
+ if (@cat == 1) goto L_NeedsFood;
if (@cat == 2 && @catNeedsAlone == 0) goto L_NeedsFur;
- if (@cat == 2) goto L_PreNeedsFur;
+ if (@cat == 2) goto L_NeedsFur;
if (@cat == 3) goto L_NeedsWood;
if (@cat == 4 && @catNeedsAlone == 0) goto L_NeedsStuff;
if (@cat == 4) goto L_PreNeedsStuff;
@@ -31,14 +31,14 @@
if (@cat == 6 && @catNeedsAlone == 0) goto L_GainEars;
if (@cat == 6) goto L_PreGainEars;
if (@cat == 7) goto L_Finished;
+ goto L_NeedsMilk;
L_NeedsMilk:
mes "[Katze]";
mes "\"Meow.\"";
next;
menu "Throw a stone at the cat.", L_ThrowStone,
- "Leave the cat alone.", -;
- goto L_Close;
+ "Leave the cat alone.", L_Close;
L_ThrowStone:
set @cat, 0;
@@ -49,17 +49,13 @@ L_ThrowStone:
mes "Yikes, the cat attacked you! Your whole body is scratched. Maybe throwing a stone wasn't such a great idea...";
goto L_Close;
-L_PreNeedsFood:
L_NeedsFood:
mes "[Katze]";
mes "\"Meow, prrrr...\"";
next;
menu
"Throw a stone at the cat.", L_ThrowStone,
- "Leave the cat alone.", -;
- goto L_Close;
-
-L_PreNeedsFur:
+ "Leave the cat alone.", L_Close;
L_NeedsFur:
mes "[Katze]";
@@ -69,11 +65,11 @@ L_NeedsFur:
menu
"Make funny movements with the fur near the ground.", L_MoveFur,
"Throw a stone at the cat.", L_ThrowStone,
- "Leave the cat alone.", -;
+ "Leave the cat alone.", L_Close;
if (countitem("WhiteFur") == 0)
menu
"Throw a stone at the cat.", L_ThrowStone,
- "Leave the cat alone.", -;
+ "Leave the cat alone.", L_Close;
goto L_Close;
L_MoveFur:
@@ -93,7 +89,7 @@ L_NeedsWood:
if (countitem("RawLog") > 0)
menu
"Want this piece of wood?", L_GiveWood,
- "Ok, see you later.", -;
+ "Ok, see you later.", L_Close;
goto L_Close;
L_GiveWood:
@@ -125,8 +121,7 @@ L_NeedsStuff2:
menu
"Look here.", L_CatChecksStuff,
"What do you need again?", L_WhatsNeeded,
- "No, I haven't got everything yet.", -;
- goto L_Close;
+ "No, I haven't got everything yet.", L_Close;
L_WhatsNeeded:
mes "[Katze]";
@@ -134,8 +129,7 @@ L_WhatsNeeded:
next;
menu
"Please tell me.", L_Please,
- "Never mind.", -;
- goto L_Close;
+ "Never mind.", L_Close;
L_Please:
mes "[Katze]";