summaryrefslogtreecommitdiff
path: root/world/map/npc/024-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/024-1
parent95c0fa59d5ab80b96500a89aa9d28fe87e544dc6 (diff)
parent4cc9ace3c293a6592bcca06db2a558e01308372a (diff)
downloadserverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.gz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.bz2
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.tar.xz
serverdata-63c2f12d64ab327d60fc41bfa37fd12b5f7e7649.zip
Merge pull request #206 from wushin/AST-FIX
AST script fix
Diffstat (limited to 'world/map/npc/024-1')
-rw-r--r--world/map/npc/024-1/_mobs.txt16
-rw-r--r--world/map/npc/024-1/ched.txt2
-rw-r--r--world/map/npc/024-1/david.txt2
-rw-r--r--world/map/npc/024-1/eomie.txt2
-rw-r--r--world/map/npc/024-1/tinris.txt2
-rw-r--r--world/map/npc/024-1/tondar.txt2
6 files changed, 13 insertions, 13 deletions
diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
index fe80f335..7df01305 100644
--- a/world/map/npc/024-1/_mobs.txt
+++ b/world/map/npc/024-1/_mobs.txt
@@ -1,16 +1,16 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Canyon mobs
-024-1.gat,89,52,3,2|monster|Maggot|1002,2,100000,30000,Mob024-1::On1002
-024-1.gat,40,45,3,2|monster|Maggot|1002,2,100000,30000,Mob024-1::On1002
-024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000,30000,Mob024-1::On1002
-024-1.gat,96,25,3,10|monster|SeaSlime|1033,1,100000,30000,Mob024-1::On1033
-024-1.gat,33,45,24,20|monster|BlackScorpion|1009,3,100000,30000,Mob024-1::On1009
-024-1.gat,93,35,5,6|monster|GiantMaggot|1006,1,100000,30000,Mob024-1::On1006
-024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000,30000,Mob024-1::On1002
+024-1.gat,89,52,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob024-1::On1002
+024-1.gat,40,45,3,2|monster|Maggot|1002,2,100000ms,30000ms,Mob024-1::On1002
+024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000ms,30000ms,Mob024-1::On1002
+024-1.gat,96,25,3,10|monster|SeaSlime|1033,1,100000ms,30000ms,Mob024-1::On1033
+024-1.gat,33,45,24,20|monster|BlackScorpion|1009,3,100000ms,30000ms,Mob024-1::On1009
+024-1.gat,93,35,5,6|monster|GiantMaggot|1006,1,100000ms,30000ms,Mob024-1::On1006
+024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000ms,30000ms,Mob024-1::On1002
-024-1.gat,0,0,0|script|Mob024-1|-1,
+024-1.gat,0,0,0|script|Mob024-1|-1
{
end;
diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt
index 6e82b58b..0137ed55 100644
--- a/world/map/npc/024-1/ched.txt
+++ b/world/map/npc/024-1/ched.txt
@@ -1,6 +1,6 @@
// Student at Tulimshar's magic academy
-024-1.gat,69,56,0|script|Ched|113,
+024-1.gat,69,56,0|script|Ched|113
{
if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden;
if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon;
diff --git a/world/map/npc/024-1/david.txt b/world/map/npc/024-1/david.txt
index e4f78a38..b3a56dc4 100644
--- a/world/map/npc/024-1/david.txt
+++ b/world/map/npc/024-1/david.txt
@@ -1,4 +1,4 @@
-024-1.gat,70,70,0|script|David|120,
+024-1.gat,70,70,0|script|David|120
{
set @Potion_EXP, 2000;
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index e14a323c..35d9acae 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -18,7 +18,7 @@
// state 14: gave present to Eomie
// state 15: reported back to Anwar and done
-024-1.gat,72,94,0|script|Eomie|164,
+024-1.gat,72,94,0|script|Eomie|164
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt
index c1d969fd..e4465cd3 100644
--- a/world/map/npc/024-1/tinris.txt
+++ b/world/map/npc/024-1/tinris.txt
@@ -17,7 +17,7 @@
// state 14: gave present to Eomie
// state 15: reported back to Anwar and done
-024-1.gat,82,64,0|script|Tinris|160,
+024-1.gat,82,64,0|script|Tinris|160
{
set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt
index 462ddc25..473c86e9 100644
--- a/world/map/npc/024-1/tondar.txt
+++ b/world/map/npc/024-1/tondar.txt
@@ -1,6 +1,6 @@
// A professor at Tulimshar's magic academy
-024-1.gat,83,51,0|script|Tondar|168,
+024-1.gat,83,51,0|script|Tondar|168
{
mes "[Tondar]";
mes "\"We're not accepting any new students right now.\"";