summaryrefslogtreecommitdiff
path: root/world/map/npc/006-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/006-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/006-1')
-rw-r--r--world/map/npc/006-1/_mobs.txt32
-rw-r--r--world/map/npc/006-1/mika.txt2
-rw-r--r--world/map/npc/006-1/pachua.txt2
-rw-r--r--world/map/npc/006-1/traveler.txt2
4 files changed, 19 insertions, 19 deletions
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index 653acd7f..7b5aaf95 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -1,24 +1,24 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Desert Mountains mobs
-006-1.gat,25,34,12,31|monster|Snake|1010,3,100000,30000,Mob006-1::On1010
-006-1.gat,36,29,9,16|monster|Snake|1010,1,100000,30000,Mob006-1::On1010
-006-1.gat,34,41,4,6|monster|MountainSnake|1026,1,30000,75000,Mob006-1::On1026
-006-1.gat,55,37,27,23|monster|MountainSnake|1026,3,150000,10000,Mob006-1::On1026
-006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000,75000,Mob006-1::On1026
-006-1.gat,118,43,22,40|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,115,49,6,3|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,88,47,36,11|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,105,72,25,16|monster|MountainSnake|1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,75,106,16,22|monster|MountainSnake|1026,4,15000,75000,Mob006-1::On1026
-006-1.gat,102,97,36,29|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,65,65,49,30|monster|MountainSnake|1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,95,120,38,13|monster|MountainSnake|1026,5,15000,75000,Mob006-1::On1026
-006-1.gat,54,120,29,7|monster|MountainSnake|1026,4,15000,75000,Mob006-1::On1026
-006-1.gat,36,98,33,35|monster|Scorpion|1003,10,100000,30000,Mob006-1::On1003
+006-1.gat,25,34,12,31|monster|Snake|1010,3,100000ms,30000ms,Mob006-1::On1010
+006-1.gat,36,29,9,16|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1.gat,34,41,4,6|monster|MountainSnake|1026,1,30000ms,75000ms,Mob006-1::On1026
+006-1.gat,55,37,27,23|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
+006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,118,43,22,40|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,115,49,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,88,47,36,11|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,105,72,25,16|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,75,106,16,22|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,102,97,36,29|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,65,65,49,30|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,95,120,38,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,54,120,29,7|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1.gat,36,98,33,35|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
-006-1.gat,0,0,0|script|Mob006-1|-1,
+006-1.gat,0,0,0|script|Mob006-1|-1
{
end;
diff --git a/world/map/npc/006-1/mika.txt b/world/map/npc/006-1/mika.txt
index d7ba11bc..82b3db85 100644
--- a/world/map/npc/006-1/mika.txt
+++ b/world/map/npc/006-1/mika.txt
@@ -1,4 +1,4 @@
-006-1.gat,39,22,0|script|Mika|114,
+006-1.gat,39,22,0|script|Mika|114
{
mes "[Mika]";
mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\"";
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index b97b0c96..a84922da 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -1,4 +1,4 @@
-006-1.gat,24,113,0|script|Pachua|143,
+006-1.gat,24,113,0|script|Pachua|143
{
setarray @npc_loc, 24, 113, 4;
callfunc "PCtoNPCRange";
diff --git a/world/map/npc/006-1/traveler.txt b/world/map/npc/006-1/traveler.txt
index 799e31e7..82b8c8a5 100644
--- a/world/map/npc/006-1/traveler.txt
+++ b/world/map/npc/006-1/traveler.txt
@@ -2,7 +2,7 @@
// Author: Wombat, wushin
// cost depending on level and adapted to new scripting guidelines: Jenalya
-006-1.gat,25,95,0|script|Rhutan the Traveler|103,
+006-1.gat,25,95,0|script|Rhutan the Traveler|103
{
set @NpcName$, "Rhutan";
set @NpcTravelBit, $@pachua_bit;