summaryrefslogtreecommitdiff
path: root/npc/002-3_Desert_mines
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-06 12:58:55 -0700
committerJared Adams <jaxad0127@gmail.com>2009-03-06 12:58:55 -0700
commit2a73e3544d6ac4d4f000c621753d70e8695e203c (patch)
treeb3784983e268ecf01a506229255116ac64fb0f57 /npc/002-3_Desert_mines
parent7464175373616085130e0d2e3b9ddc8e0322f291 (diff)
parent3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff)
downloadserverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz
serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2
serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz
serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip
Merge commit 'mainline/master'
Conflicts: conf/magic.conf
Diffstat (limited to 'npc/002-3_Desert_mines')
-rw-r--r--npc/002-3_Desert_mines/_mobs.txt31
-rw-r--r--npc/002-3_Desert_mines/_warps.txt2
2 files changed, 30 insertions, 3 deletions
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index 185351b5..e85bbc85 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -1,10 +1,27 @@
// 002-3 Desert mines mobs
-002-3.gat,38,38,9,9 monster Red Slime 1008,10,0,0,Mob002-3::On1008
-002-3.gat,82,92,9,9 monster Black Scorpion 1009,10,0,0,Mob002-3::On1009
+002-3.gat,45,38,30,19 monster Yellow Slime 1007,5,0,0,Mob002-3::On1007
+002-3.gat,91,41,17,20 monster Snake 1010,3,0,0,Mob002-3::On1010
+002-3.gat,71,35,25,17 monster Red Slime 1008,4,0,0,Mob002-3::On1008
+002-3.gat,69,100,8,5 monster Spider 1012,2,0,0,Mob002-3::On1012
+002-3.gat,68,57,26,24 monster Black Scorpion 1009,5,0,0,Mob002-3::On1009
+002-3.gat,45,61,11,28 monster Red Slime 1008,5,0,0,Mob002-3::On1008
+002-3.gat,38,76,15,22 monster Black Scorpion 1009,4,0,0,Mob002-3::On1009
+002-3.gat,58,78,6,17 monster Red Slime 1008,2,0,0,Mob002-3::On1008
+002-3.gat,89,68,11,32 monster Black Scorpion 1009,4,0,0,Mob002-3::On1009
+002-3.gat,83,93,19,17 monster Red Slime 1008,4,0,0,Mob002-3::On1008
+002-3.gat,72,77,21,14 monster Red Slime 1008,3,0,0,Mob002-3::On1008
+002-3.gat,67,91,11,12 monster Black Scorpion 1009,2,0,0,Mob002-3::On1009
+002-3.gat,58,95,6,13 monster Snake 1010,2,0,0,Mob002-3::On1010
+002-3.gat,63,100,2,5 monster Black Scorpion 1009,1,0,0,Mob002-3::On1009
002-3.gat,0,0,0 script Mob002-3 -1,{
+On1007:
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ break;
+
On1008:
set @mobID, 1008;
callfunc "MobPoints";
@@ -15,5 +32,15 @@ On1009:
callfunc "MobPoints";
break;
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ break;
+
+On1012:
+ set @mobID, 1012;
+ callfunc "MobPoints";
+ break;
+
end;
}
diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3_Desert_mines/_warps.txt
index 8f5b51c2..d750d5cd 100644
--- a/npc/002-3_Desert_mines/_warps.txt
+++ b/npc/002-3_Desert_mines/_warps.txt
@@ -1,4 +1,4 @@
// 002-3 Desert mines warps
-002-3.gat,38,30 warp CaveExit 2,-1,002-1.gat,25,95
002-3.gat,68,98 warp toLevel2 -1,-1,002-4.gat,34,98
+002-3.gat,37,29 warp Exit -1,-1,002-1.gat,25,95