summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:10:26 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:23 -0600
commitbdde9cbb68af3d68e8dc56c9fac6c1eb4c4c129e (patch)
tree9dd71085bec58426420be2137daaf5305cdd6dff /world
parent0459029c8d98e5eb6d03949aece2d6f0b0b71ad3 (diff)
downloadserverdata-bdde9cbb68af3d68e8dc56c9fac6c1eb4c4c129e.tar.gz
serverdata-bdde9cbb68af3d68e8dc56c9fac6c1eb4c4c129e.tar.bz2
serverdata-bdde9cbb68af3d68e8dc56c9fac6c1eb4c4c129e.tar.xz
serverdata-bdde9cbb68af3d68e8dc56c9fac6c1eb4c4c129e.zip
NPCs on 015-* fixed
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/015-1/alice.txt2
-rw-r--r--world/map/npc/015-1/barrier.txt2
-rw-r--r--world/map/npc/015-1/sword.txt2
-rw-r--r--world/map/npc/015-3/barrier.txt2
-rw-r--r--world/map/npc/015-3/katze.txt2
-rw-r--r--world/map/npc/015-3/pot.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/world/map/npc/015-1/alice.txt b/world/map/npc/015-1/alice.txt
index 8b7255b1..4b1d0a9a 100644
--- a/world/map/npc/015-1/alice.txt
+++ b/world/map/npc/015-1/alice.txt
@@ -1,7 +1,7 @@
// A herb collector giving the players some hints about finding and brewing
// herbs.
-015-1.gat,52,53,0|script|Alice|106,
+015-1.gat,52,53,0|script|Alice|106
{
set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt
index 6b451f42..dacad6e7 100644
--- a/world/map/npc/015-1/barrier.txt
+++ b/world/map/npc/015-1/barrier.txt
@@ -1,7 +1,7 @@
// This barrier is for checking whether the player went outside after
// progressing with the cat quest.
-015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1,
+015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1
{
set @catNeedsAlone, 0;
end;
diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index 98d5f843..199066f2 100644
--- a/world/map/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
@@ -1,4 +1,4 @@
-015-1.gat,97,97,0|script|#MagicSword#_M|400,
+015-1.gat,97,97,0|script|#MagicSword#_M|400
{
if (getskilllv(SKILL_MAGIC))
goto L_message;
diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt
index a1393304..7e34aeee 100644
--- a/world/map/npc/015-3/barrier.txt
+++ b/world/map/npc/015-3/barrier.txt
@@ -1,7 +1,7 @@
// 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
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index 45a6349a..cbf48d22 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -16,7 +16,7 @@
// * 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);
diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt
index 786f0b3b..9c6ccc8f 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|400,
+015-3.gat,37,29,0|script|Pot|400
{
set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);