Inital rework of desert monsters

4 files changed, 62 insertions, 47 deletions

diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index aa3a86de..4b1bddea 100644
--- a/npc/006-1_Desert_mountains/_import.txt
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -2,5 +2,4 @@ map: 006-1.gat
 npc: npc/006-1_Desert_mountains/_mobs.txt
 npc: npc/006-1_Desert_mountains/_warps.txt
 npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/monsters.txt
 npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
index 0225efff..093bc3bc 100644
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -1,7 +1,37 @@
 // 006-1 Desert mountains mobs
 
+006-1.gat,25,34,12,31	monster	Snake	1010,5,0,0,Mob006-1::On1010
+006-1.gat,36,29,9,16	monster	Snake	1010,2,0,0,Mob006-1::On1010
+006-1.gat,34,41,4,6	monster	Mountain Snake	1026,1,0,0,Mob006-1::On1026
+006-1.gat,55,37,27,23	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
+006-1.gat,89,26,33,13	monster	Mountain Snake	1026,10,0,0,Mob006-1::On1026
+006-1.gat,118,43,22,40	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
+006-1.gat,115,49,6,3	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
+006-1.gat,88,47,36,11	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
+006-1.gat,105,72,25,16	monster	Mountain Snake	1026,6,0,0,Mob006-1::On1026
+006-1.gat,75,106,16,22	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
+006-1.gat,102,97,36,29	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
+006-1.gat,65,65,49,30	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
+006-1.gat,95,120,38,13	monster	Mountain Snake	1026,10,0,0,Mob006-1::On1026
+006-1.gat,54,120,29,7	monster	Mountain Snake	1026,7,0,0,Mob006-1::On1026
+006-1.gat,36,98,33,35	monster	Scorpion	1003,10,0,0,Mob006-1::On1003
 
 
 006-1.gat,0,0,0	script	Mob006-1	-1,{
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+On1026:
+	set @mobID, 1026;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt
index 6bc6e86c..823e937e 100644
--- a/npc/006-1_Desert_mountains/_warps.txt
+++ b/npc/006-1_Desert_mountains/_warps.txt
@@ -1,34 +1,34 @@
 // 006-1 Desert mountains warps
 
-006-1.gat,28,21	warp	ToSnakeDesert	-1,-1,005-1.gat,175,96
-006-1.gat,27,22	warp	ToSnakeDesert	-1,-1,005-1.gat,174,97
-006-1.gat,30,19	warp	ToSnakeDesert	-1,-1,005-1.gat,177,94
-006-1.gat,29,20	warp	ToSnakeDesert	-1,-1,005-1.gat,176,95
-006-1.gat,26,23	warp	ToSnakeDesert	-1,-1,005-1.gat,173,98
-006-1.gat,25,24	warp	ToSnakeDesert	-1,-1,005-1.gat,172,99
-006-1.gat,23,26	warp	ToSnakeDesert	-1,-1,005-1.gat,170,101
-006-1.gat,24,25	warp	ToSnakeDesert	-1,-1,005-1.gat,171,100
-006-1.gat,22,27	warp	ToSnakeDesert	-1,-1,005-1.gat,169,102
-006-1.gat,21,28	warp	ToSnakeDesert	-1,-1,005-1.gat,168,103
-006-1.gat,20,29	warp	ToSnakeDesert	-1,-1,005-1.gat,167,104
-006-1.gat,19,30	warp	ToSnakeDesert	-1,-1,005-1.gat,166,105
-006-1.gat,18,31	warp	ToSnakeDesert	-1,-1,005-1.gat,165,106
-006-1.gat,40,26	warp	ToDesertMountainCaves	-1,-1,006-3.gat,40,27
-006-1.gat,60,58	warp	ToDesertMountainCaves	-1,-1,006-3.gat,60,69
-006-1.gat,62,30	warp	ToDesertMountainCaves	-1,-1,006-3.gat,62,31
-006-1.gat,55,27	warp	ToDesertMountainCaves	-1,-1,006-3.gat,55,28
-006-1.gat,77,44	warp	ToDesertMountainCaves	-1,-1,006-3.gat,77,45
-006-1.gat,86,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,86,25
-006-1.gat,91,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,91,25
-006-1.gat,104,44	warp	ToDesertMountainCaves	-1,-1,006-3.gat,104,45
-006-1.gat,122,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,122,25
-006-1.gat,114,49	warp	ToDesertMountainCaves	-1,-1,006-3.gat,114,50
-006-1.gat,110,56	warp	ToDesertMountainCaves	-1,-1,006-3.gat,110,57
-006-1.gat,125,59	warp	ToDesertMountainCaves	-1,-1,006-3.gat,125,60
-006-1.gat,92,63	warp	ToDesertMountainCaves	-1,-1,006-3.gat,92,64
-006-1.gat,112,74	warp	ToDesertMountainCaves	-1,-1,006-3.gat,112,75
-006-1.gat,121,110	warp	ToDesertMountainCaves	-1,-1,006-3.gat,121,111
-006-1.gat,79,120	warp	ToDesertMountainCaves	-1,-1,006-3.gat,79,121
-006-1.gat,38,121	warp	ToDesertMountainCaves	-1,-1,006-3.gat,38,122
-006-1.gat,74,90	warp	ToDesertMountainCaves	-1,-1,006-3.gat,74,91
-006-1.gat,51,90	warp	ToDesertMountainCaves	-1,-1,006-3.gat,51,91
+006-1.gat,28,21	warp	ToDesert	-1,-1,005-1.gat,175,96
+006-1.gat,27,22	warp	ToDesert	-1,-1,005-1.gat,174,97
+006-1.gat,30,19	warp	ToDesert	-1,-1,005-1.gat,177,94
+006-1.gat,29,20	warp	ToDesert	-1,-1,005-1.gat,176,95
+006-1.gat,26,23	warp	ToDesert	-1,-1,005-1.gat,173,98
+006-1.gat,25,24	warp	ToDesert	-1,-1,005-1.gat,172,99
+006-1.gat,23,26	warp	ToDesert	-1,-1,005-1.gat,170,101
+006-1.gat,24,25	warp	ToDesert	-1,-1,005-1.gat,171,100
+006-1.gat,22,27	warp	ToDesert	-1,-1,005-1.gat,169,102
+006-1.gat,21,28	warp	ToDesert	-1,-1,005-1.gat,168,103
+006-1.gat,20,29	warp	ToDesert	-1,-1,005-1.gat,167,104
+006-1.gat,19,30	warp	ToDesert	-1,-1,005-1.gat,166,105
+006-1.gat,18,31	warp	ToDesert	-1,-1,005-1.gat,165,106
+006-1.gat,40,26	warp	ToCave	-1,-1,006-3.gat,40,27
+006-1.gat,60,58	warp	ToCave	-1,-1,006-3.gat,60,69
+006-1.gat,62,30	warp	ToCave	-1,-1,006-3.gat,62,31
+006-1.gat,55,27	warp	ToCave	-1,-1,006-3.gat,55,28
+006-1.gat,77,44	warp	ToCave	-1,-1,006-3.gat,77,45
+006-1.gat,86,24	warp	ToCave	-1,-1,006-3.gat,86,25
+006-1.gat,91,24	warp	ToCave	-1,-1,006-3.gat,91,25
+006-1.gat,104,44	warp	ToCave	-1,-1,006-3.gat,104,45
+006-1.gat,122,24	warp	ToCave	-1,-1,006-3.gat,122,25
+006-1.gat,114,49	warp	ToCave	-1,-1,006-3.gat,114,50
+006-1.gat,110,56	warp	ToCave	-1,-1,006-3.gat,110,57
+006-1.gat,125,59	warp	ToCave	-1,-1,006-3.gat,125,60
+006-1.gat,92,63	warp	ToCave	-1,-1,006-3.gat,92,64
+006-1.gat,112,74	warp	ToCave	-1,-1,006-3.gat,112,75
+006-1.gat,121,110	warp	ToCave	-1,-1,006-3.gat,121,111
+006-1.gat,79,120	warp	ToCave	-1,-1,006-3.gat,79,121
+006-1.gat,38,121	warp	ToCave	-1,-1,006-3.gat,38,122
+006-1.gat,74,90	warp	ToCave	-1,-1,006-3.gat,74,91
+006-1.gat,51,90	warp	ToCave	-1,-1,006-3.gat,51,91
diff --git a/npc/006-1_Desert_mountains/monsters.txt b/npc/006-1_Desert_mountains/monsters.txt
deleted file mode 100644
index 6942d2cf..00000000
--- a/npc/006-1_Desert_mountains/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 006-1
-// This is the Desert Mountains.
-//
-
-006-1.gat,0,0,0,0	monster	MountainSnake	1026,60,0,0,Mob24::OnMountainSnake
-
-006-1.gat,0,0,0	script	Mob24	-1,{
-OnMountainSnake:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}