summaryrefslogtreecommitdiff
path: root/world/map/npc/015-3
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/015-3')
-rw-r--r--world/map/npc/015-3/barrier.txt27
-rw-r--r--world/map/npc/015-3/katze.txt58
-rw-r--r--world/map/npc/015-3/pot.txt36
3 files changed, 65 insertions, 56 deletions
diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt
index 27a18bc3..32b0a6c3 100644
--- a/world/map/npc/015-3/barrier.txt
+++ b/world/map/npc/015-3/barrier.txt
@@ -1,20 +1,23 @@
// You can only enter the cat cave naked, otherwise the cat's reaction scares
// you away. You can also get in while wearing the cat ears.
-015-3.gat,31,42,0 script #CatCaveBarrier 127,1,1,{
+015-3.gat,31,42,0|script|#CatCaveBarrier|127,1,1,{
- if (getequipid(equip_head) != 1217 && (getequipid(equip_head) > 0 ||
- getequipid(equip_shield) > 0 ||
- getequipid(equip_hand1) > 0 ||
- getequipid(equip_hand2) > 0 ||
- getequipid(equip_gloves) > 0 ||
- getequipid(equip_shoes) > 0 ||
- getequipid(equip_misc1) > 0 ||
- getequipid(equip_misc2) > 0 ||
- getequipid(equip_torso) > 0 ||
- getequipid(equip_legs) > 0)) goto L_Not_Naked;
+ if (getequipid(equip_head) != 1217
+ && (getequipid(equip_head) > 0
+ || getequipid(equip_shield) > 0
+ || getequipid(equip_hand1) > 0
+ || getequipid(equip_hand2) > 0
+ || getequipid(equip_gloves) > 0
+ || getequipid(equip_shoes) > 0
+ || getequipid(equip_misc1) > 0
+ || getequipid(equip_misc2) > 0
+ || getequipid(equip_torso) > 0
+ || getequipid(equip_legs) > 0))
+ goto L_Not_Naked;
- if (LastHiss != 2) mes "\"Hissss...\"";
+ if (LastHiss != 2)
+ mes "\"Hissss...\"";
set LastHiss, 2;
close;
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index f1433ed6..89b508b0 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -16,24 +16,18 @@
// * 2 Hard spikes
// * 2 Tiny potions
-015-3.gat,32,25,0 script Katze 172, {
+015-3.gat,32,25,0|script|Katze|172,{
if (Katze == 1 && KatzeBeenOutside == 1) goto L_NeedsFood;
if (Katze == 1) goto L_PreNeedsFood;
-
if (Katze == 2 && KatzeBeenOutside == 1) goto L_NeedsFur;
if (Katze == 2) goto L_PreNeedsFur;
-
if (Katze == 3) goto L_NeedsWood;
-
if (Katze == 4 && KatzeBeenOutside == 1) goto L_NeedsStuff;
if (Katze == 4) goto L_PreNeedsStuff;
-
if (Katze == 5) goto L_NeedsStuff2;
-
if (Katze == 6 && KatzeBeenOutside == 1) goto L_GainEars;
if (Katze == 6) goto L_PreGainEars;
-
if (Katze == 7) goto L_Finished;
L_NeedsMilk:
@@ -59,23 +53,26 @@ L_NeedsFood:
mes "[Katze]";
mes "\"Meow, prrrr...\"";
next;
- menu "Throw a stone at the cat", L_ThrowStone,
- "Leave the cat alone", -;
+ menu
+ "Throw a stone at the cat", L_ThrowStone,
+ "Leave the cat alone", -;
close;
L_PreNeedsFur:
+
L_NeedsFur:
mes "[Katze]";
mes "\"Prrr. Meow, prrr...\"";
next;
-
if (countitem("WhiteFur") > 0)
- menu "Make funny movements with the fur near the ground", L_MoveFur,
- "Throw a stone at the cat", L_ThrowStone,
- "Leave the cat alone", -;
+ menu
+ "Make funny movements with the fur near the ground", L_MoveFur,
+ "Throw a stone at the cat", L_ThrowStone,
+ "Leave the cat alone", -;
if (countitem("WhiteFur") == 0)
- menu "Throw a stone at the cat", L_ThrowStone,
- "Leave the cat alone", -;
+ menu
+ "Throw a stone at the cat", L_ThrowStone,
+ "Leave the cat alone", -;
close;
L_MoveFur:
@@ -92,8 +89,9 @@ L_NeedsWood:
next;
if (countitem("RawLog") > 0)
- menu "Want this piece of wood?", L_GiveWood,
- "Ok, see you later", -;
+ menu
+ "Want this piece of wood?", L_GiveWood,
+ "Ok, see you later", -;
close;
L_GiveWood:
@@ -121,17 +119,19 @@ L_NeedsStuff2:
mes "[Katze]";
mes "\"Did you bring what I asked you for?\"";
next;
- menu "Look here", L_CatChecksStuff,
- "What do you need again?", L_WhatsNeeded,
- "No, I haven't got everything yet", -;
+ menu
+ "Look here", L_CatChecksStuff,
+ "What do you need again?", L_WhatsNeeded,
+ "No, I haven't got everything yet", -;
close;
L_WhatsNeeded:
mes "[Katze]";
mes "\"Actually, you should have remembered yourself.\"";
next;
- menu "Please tell me", L_Please,
- "Never mind", -;
+ menu
+ "Please tell me", L_Please,
+ "Never mind", -;
close;
L_Please:
@@ -146,13 +146,13 @@ L_Please:
close;
L_CatChecksStuff:
- if (countitem("SnakeSkin") > 1 &&
- countitem("SnakeTongue") > 1 &&
- countitem("MaggotSlime") > 1 &&
- countitem("WhiteFur") > 1 &&
- countitem("HardSpike") > 1 &&
- countitem("TinyHealingPotion") > 1)
- goto L_GiveStuff;
+ if (countitem("SnakeSkin") > 1
+ && countitem("SnakeTongue") > 1
+ && countitem("MaggotSlime") > 1
+ && countitem("WhiteFur") > 1
+ && countitem("HardSpike") > 1
+ && countitem("TinyHealingPotion") > 1)
+ goto L_GiveStuff;
mes "[Katze]";
mes "\"You don't seem to have everything yet. Come back later when you do.\"";
close;
diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt
index a965223d..ae843863 100644
--- a/world/map/npc/015-3/pot.txt
+++ b/world/map/npc/015-3/pot.txt
@@ -1,6 +1,6 @@
// The pot where the player can deposit stuff for the cat.
-015-3.gat,37,29,0 script Pot 127, {
+015-3.gat,37,29,0|script|Pot|127,{
if (Katze > 0)
mes "It's that old pot again.";
@@ -8,16 +8,20 @@
mes "It's a pot.";
next;
- if (Katze == 1 && KatzeBeenOutside == 1) goto L_NeedsFood;
- if (Katze == 1) goto L_HasMilk;
-
- if (Katze == 2 && KatzeBeenOutside == 1) goto L_NeedsFur;
- if (Katze == 2) goto L_HasFood;
-
- if (Katze == 3) goto L_NeedsWood;
-
- if (Katze == 4 && KatzeBeenOutside == 0) goto L_HasWood;
- if (Katze >= 4) goto L_Finished;
+ if (Katze == 1 && KatzeBeenOutside == 1)
+ goto L_NeedsFood;
+ if (Katze == 1)
+ goto L_HasMilk;
+ if (Katze == 2 && KatzeBeenOutside == 1)
+ goto L_NeedsFur;
+ if (Katze == 2)
+ goto L_HasFood;
+ if (Katze == 3)
+ goto L_NeedsWood;
+ if (Katze == 4 && KatzeBeenOutside == 0)
+ goto L_HasWood;
+ if (Katze >= 4)
+ goto L_Finished;
L_NeedsMilk:
if (countitem("Milk") > 0)
@@ -76,8 +80,9 @@ L_NeedsFur:
next;
if (countitem("WhiteFur") > 0)
- menu "Put a white fur next to the pot", L_GiveFur,
- "Leave it alone", -;
+ menu
+ "Put a white fur next to the pot", L_GiveFur,
+ "Leave it alone", -;
close;
L_GiveFur:
@@ -86,8 +91,9 @@ L_GiveFur:
L_NeedsWood:
if (countitem("RawLog") > 0)
- menu "Put a wooden log next to the pot", L_GiveWood,
- "Leave it alone", -;
+ menu
+ "Put a wooden log next to the pot", L_GiveWood,
+ "Leave it alone", -;
close;
L_GiveWood:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 09:32:50 +0000