summaryrefslogtreecommitdiff
path: root/world/map/npc/031-1
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
committerWushin <pasekei@gmail.com>2014-11-07 08:42:44 -0600
commit63c2f12d64ab327d60fc41bfa37fd12b5f7e7649 (patch)
treefd9087fa7497649a1f4defc4cf8e9b1c241fe0b0 /world/map/npc/031-1
parent95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff)
parent4cc9ace3c293a6592bcca06db2a558e01308372a (diff)
downloadclassic-serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.gz
classic-serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.bz2
classic-serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.xz
classic-serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.zip
Merge pull request #206 from wushin/AST-FIX
AST script fix
Diffstat (limited to 'world/map/npc/031-1')
-rw-r--r--world/map/npc/031-1/_mobs.txt10
-rw-r--r--world/map/npc/031-1/angelaOutside.txt2
-rw-r--r--world/map/npc/031-1/dock.txt6
-rw-r--r--world/map/npc/031-1/frozenbeard.txt2
-rw-r--r--world/map/npc/031-1/house.txt2
5 files changed, 11 insertions, 11 deletions
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index e8e6c77b..73ef1579 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Nivalis Port mobs
-031-1.gat,0,0,0,0|monster|Fluffy|1020,10,100000,30000,Mob031-1::On1020
-031-1.gat,0,0,0,0|monster|Pollett|1113,7,100000,30000,Mob031-1::On1113
-031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000,30000,Mob031-1::On1093
-031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000,30000,Mob031-1::On1095
+031-1.gat,0,0,0,0|monster|Fluffy|1020,10,100000ms,30000ms,Mob031-1::On1020
+031-1.gat,0,0,0,0|monster|Pollett|1113,7,100000ms,30000ms,Mob031-1::On1113
+031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-1::On1093
+031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob031-1::On1095
-031-1.gat,0,0,0|script|Mob031-1|-1,
+031-1.gat,0,0,0|script|Mob031-1|-1
{
end;
diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 60e156f0..bec0988b 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -4,7 +4,7 @@
// state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward
// state greater than 3: Angela invites and asks you to bring present boxes
-031-1.gat,79,24,0|script|Angela|195,
+031-1.gat,79,24,0|script|Angela|195
{
set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt
index a8711403..48d32d8e 100644
--- a/world/map/npc/031-1/dock.txt
+++ b/world/map/npc/031-1/dock.txt
@@ -1,19 +1,19 @@
// The ferry dock
// Ferry Sign
-031-1.gat,95,107,0|script|Ferry Schedule#6|398,
+031-1.gat,95,107,0|script|Ferry Schedule#6|398
{
callfunc "FerryManifest";
end;
}
-031-1.gat,110,108,0|script|Nivalis Koga|395,6,2,
+031-1.gat,110,108,0|script|Nivalis Koga|395,6,2
{
callfunc "BoardFerry";
close;
}
-031-1.gat,100,100,0|script|#NivalisDock|127,
+031-1.gat,100,100,0|script|#NivalisDock|127
{
end;
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index 6a62a104..e05b3d67 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -1,6 +1,6 @@
//
-031-1.gat,96,113,0|script|Frozenbeard|138,
+031-1.gat,96,113,0|script|Frozenbeard|138
{
mes "[Frozenbeard]";
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index 3d250e4e..e9bd33c0 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -2,7 +2,7 @@
// player can enter, if Cindy is already saved and the player has been invited, quest status > 2
// author: Jenalya
-031-1.gat,95,80,0|script|#Door|45,0,0,
+031-1.gat,95,80,0|script|#Door|45,0,0
{
set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;