summaryrefslogtreecommitdiff
path: root/npc/015-3/barrier.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/015-3/barrier.txt')
-rw-r--r--npc/015-3/barrier.txt24
1 files changed, 11 insertions, 13 deletions
diff --git a/npc/015-3/barrier.txt b/npc/015-3/barrier.txt
index 320025f6..542e945c 100644
--- a/npc/015-3/barrier.txt
+++ b/npc/015-3/barrier.txt
@@ -1,7 +1,7 @@
015-3,31,42,0 script #CatCaveBarrier NPC45,1,1,{
- @Hiss = ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
- if (getequipid(equip_head) != 1217
+ .@Hiss = ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
+ if (getequipid(equip_head) != CatEars
&& (getequipid(equip_head) > 0
|| getequipid(equip_shield) > 0
|| getequipid(equip_hand1) > 0
@@ -14,25 +14,23 @@
|| getequipid(equip_legs) > 0))
goto L_Not_Naked;
- if (@Hiss != 2)
+ if (.@Hiss != 2)
mes "\"Hissss...\"";
- @Hiss = 2;
+ .@Hiss = 2;
callsub S_Update_Hiss;
- goto L_close;
+ close;
L_Not_Naked:
warp "015-1", 60, 32;
- @Hiss = 1;
+ .@Hiss = 1;
callsub S_Update_Hiss;
- mes "\"GRAAUWL! Hissss...\"";
- mes "Scared of what you hear, you flee back outside.";
- goto L_close;
-
-L_close:
- @Hiss = 0;
+ mesn "???";
+ mesq l("GRAAUWL! Hissss...");
+ mes "";
+ mesc l("Scared of what you hear, you flee back outside.");
close;
S_Update_Hiss:
- Katze = (Katze & ~(NIBBLE_1_MASK)) | (@Hiss << NIBBLE_1_SHIFT);
+ Katze = (Katze & ~(NIBBLE_1_MASK)) | (.@Hiss << NIBBLE_1_SHIFT);
return;
}