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/_mobs.txt3
-rw-r--r--world/map/npc/015-3/barrier.txt4
-rw-r--r--world/map/npc/015-3/katze.txt4
-rw-r--r--world/map/npc/015-3/pot.txt4
4 files changed, 8 insertions, 7 deletions
diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index 66c28a26..8faac86c 100644
--- a/world/map/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
@@ -7,7 +7,8 @@
015-3.gat,40,19,1,1|monster|Spider|1012,1,100000,30000,Mob015-3::On1012
-015-3.gat,0,0,0|script|Mob015-3|-1,{
+015-3.gat,0,0,0|script|Mob015-3|-1,
+{
On1002:
set @mobID, 1002;
callfunc "MobPoints";
diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt
index e799f8af..a1393304 100644
--- a/world/map/npc/015-3/barrier.txt
+++ b/world/map/npc/015-3/barrier.txt
@@ -1,8 +1,8 @@
// 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|45,1,1,{
-
+015-3.gat,31,42,0|script|#CatCaveBarrier|45,1,1,
+{
set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
if (getequipid(equip_head) != 1217
&& (getequipid(equip_head) > 0
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index 75e87be3..d90cd10c 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -16,8 +16,8 @@
// * 2 Hard spikes
// * 2 Tiny potions
-015-3.gat,32,25,0|script|Katze|172,{
-
+015-3.gat,32,25,0|script|Katze|172,
+{
set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
if (@cat == 1 && @catNeedsAlone == 0) goto L_NeedsFood;
diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt
index 03f2b2c8..cb38b344 100644
--- a/world/map/npc/015-3/pot.txt
+++ b/world/map/npc/015-3/pot.txt
@@ -1,7 +1,7 @@
// The pot where the player can deposit stuff for the cat.
-015-3.gat,37,29,0|script|Pot|400,{
-
+015-3.gat,37,29,0|script|Pot|400,
+{
set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
if (@cat > 0)