summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:12:45 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:23 -0600
commit45a692c1cc5c8b6b537be35c367356f7b2e067fe (patch)
tree8e154f6b445b38312096ec5223393b034c132f2f /world/map/npc
parentd221999edb023241ffe23dd59653d2cc12b78698 (diff)
downloadserverdata-45a692c1cc5c8b6b537be35c367356f7b2e067fe.tar.gz
serverdata-45a692c1cc5c8b6b537be35c367356f7b2e067fe.tar.bz2
serverdata-45a692c1cc5c8b6b537be35c367356f7b2e067fe.tar.xz
serverdata-45a692c1cc5c8b6b537be35c367356f7b2e067fe.zip
NPCs on 017-* fixed
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/017-1/flowerpentagram1.txt2
-rw-r--r--world/map/npc/017-4/orum.txt2
-rw-r--r--world/map/npc/017-4/waric.txt4
-rw-r--r--world/map/npc/017-9/announcements.txt2
-rw-r--r--world/map/npc/017-9/secret.txt8
5 files changed, 9 insertions, 9 deletions
diff --git a/world/map/npc/017-1/flowerpentagram1.txt b/world/map/npc/017-1/flowerpentagram1.txt
index 77af8b45..e925445c 100644
--- a/world/map/npc/017-1/flowerpentagram1.txt
+++ b/world/map/npc/017-1/flowerpentagram1.txt
@@ -1,6 +1,6 @@
// Author: Jenalya
-017-1.gat,95,42,0|script|#FlowerPentagram1|400,
+017-1.gat,95,42,0|script|#FlowerPentagram1|400
{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt
index 5f6ce8a3..b13f415d 100644
--- a/world/map/npc/017-4/orum.txt
+++ b/world/map/npc/017-4/orum.txt
@@ -20,7 +20,7 @@
// 31: Placed fifth flower
// 32: Got reward
-017-4.gat,211,32,0|script|Orum|158,
+017-4.gat,211,32,0|script|Orum|158
{
// first flower
set @AMOUNT_SMALLMUSHROOM, 5;
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 4c2e9710..917c93db 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -19,7 +19,7 @@
// OrumQuest State 41 - Learned Summon snake
// When extending these Quest Variable to 51 all of the other dark magic spells will be available. Keep this in mind.
-017-4.gat,216,36,0|script|Waric|153,
+017-4.gat,216,36,0|script|Waric|153
{
set @mouboo_status, ((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 3;
set @killed_mouboo, 0;
@@ -383,7 +383,7 @@ L_Close:
close;
}
-017-1.gat,74,32,0|script|DebugFlowerP|153,
+017-1.gat,74,32,0|script|DebugFlowerP|153
{
mes "Debug options for Orum's quest:";
menu
diff --git a/world/map/npc/017-9/announcements.txt b/world/map/npc/017-9/announcements.txt
index 585fbc28..f9e24e52 100644
--- a/world/map/npc/017-9/announcements.txt
+++ b/world/map/npc/017-9/announcements.txt
@@ -13,7 +13,7 @@
// $@GMSA_TICK: broadcast the message every $@GMSA_TICK hours
// $@GMSA_CURRENT_TICK: internal counter incremented every hour
-017-9.gat,26,24,0|script|Stone Board|145,
+017-9.gat,26,24,0|script|Stone Board|145
{
if (getgmlevel() < 60)
goto L_Close;
diff --git a/world/map/npc/017-9/secret.txt b/world/map/npc/017-9/secret.txt
index 43e485c7..050773a6 100644
--- a/world/map/npc/017-9/secret.txt
+++ b/world/map/npc/017-9/secret.txt
@@ -1,4 +1,4 @@
-009-1.gat,42,43,0|script|#SecretDoor|127,0,0,
+009-1.gat,42,43,0|script|#SecretDoor|127,0,0
{
if (getgmlevel() < 40 && !debug) goto L_close;
warp "017-9.gat", 26, 25;
@@ -8,7 +8,7 @@ L_close:
close;
}
-020-1.gat,60,76,0|script|#SecretDoor2|127,0,0,
+020-1.gat,60,76,0|script|#SecretDoor2|127,0,0
{
if (getgmlevel() < 40 && !debug) goto L_close;
warp "017-9.gat", 22, 22;
@@ -18,7 +18,7 @@ L_close:
close;
}
-001-1.gat,32,65,0|script|#SecretDoor3|127,0,0,
+001-1.gat,32,65,0|script|#SecretDoor3|127,0,0
{
if (getgmlevel() < 40 && !debug) goto L_close;
warp "017-9.gat", 30, 22;
@@ -28,7 +28,7 @@ L_close:
close;
}
-027-2.gat,118,111,0|script|#SecretDoor4|127,0,0,
+027-2.gat,118,111,0|script|#SecretDoor4|127,0,0
{
if (getgmlevel() < 40 && !debug) goto L_close;
warp "017-9.gat", 30, 29;