Inital rework of desert monsters

4 files changed, 48 insertions, 34 deletions

diff --git a/npc/006-3_Desert_mountain_caves/_import.txt b/npc/006-3_Desert_mountain_caves/_import.txt
index f3a4690c..36f898bc 100644
--- a/npc/006-3_Desert_mountain_caves/_import.txt
+++ b/npc/006-3_Desert_mountain_caves/_import.txt
@@ -1,4 +1,3 @@
 map: 006-3.gat
 npc: npc/006-3_Desert_mountain_caves/_mobs.txt
 npc: npc/006-3_Desert_mountain_caves/_warps.txt
-npc: npc/006-3_Desert_mountain_caves/monsters.txt
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
index fd6e317b..1c7bf5e9 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -1,7 +1,36 @@
 // 006-3 Desert mountain caves mobs
 
+006-3.gat,108,25,36,8	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
+006-3.gat,99,50,14,13	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
+006-3.gat,89,63,14,11	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
+006-3.gat,86,90,29,9	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
+006-3.gat,109,78,12,9	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
+006-3.gat,119,117,15,14	monster	Mountain Snake	1026,7,0,0,Mob006-3::On1026
+006-3.gat,57,105,27,30	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
+006-3.gat,73,120,16,5	monster	Mountain Snake	1026,6,0,0,Mob006-3::On1026
+006-3.gat,117,54,11,9	monster	Mountain Snake	1026,7,0,0,Mob006-3::On1026
+006-3.gat,123,62,10,5	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
+006-3.gat,84,27,5,7	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
+006-3.gat,40,40,36,28	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
+006-3.gat,34,60,27,11	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
+006-3.gat,87,74,26,9	monster	Red Slime	1008,1,0,0,Mob006-3::On1008
+006-3.gat,120,76,9,21	monster	Red Slime	1008,6,0,0,Mob006-3::On1008
+006-3.gat,101,85,14,8	monster	Red Slimes	1008,7,0,0,Mob006-3::On1008
+006-3.gat,44,124,29,7	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
+006-3.gat,90,125,17,7	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
+006-3.gat,30,88,13,20	monster	Red Slime	1008,5,0,0,Mob006-3::On1008
 
 
 006-3.gat,0,0,0	script	Mob006-3	-1,{
+On1008:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+On1026:
+	set @mobID, 1026;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3_Desert_mountain_caves/_warps.txt
index 25e7ee54..bbcc2492 100644
--- a/npc/006-3_Desert_mountain_caves/_warps.txt
+++ b/npc/006-3_Desert_mountain_caves/_warps.txt
@@ -1,21 +1,21 @@
 // 006-3 Desert mountain caves warps
 
-006-3.gat,40,26	warp	CavesExit	-1,-1,006-1.gat,40,27
-006-3.gat,55,27	warp	CavesExit	-1,-1,006-1.gat,55,28
-006-3.gat,62,30	warp	CavesExit	-1,-1,006-1.gat,62,31
-006-3.gat,86,24	warp	CavesExit	-1,-1,006-1.gat,86,25
-006-3.gat,91,24	warp	CavesExit	-1,-1,006-1.gat,91,25
-006-3.gat,122,24	warp	CavesExit	-1,-1,006-1.gat,122,25
-006-3.gat,114,49	warp	CavesExit	-1,-1,006-1.gat,114,50
-006-3.gat,104,44	warp	CavesExit	-1,-1,006-1.gat,104,45
-006-3.gat,77,44	warp	CavesExit	-1,-1,006-1.gat,77,45
-006-3.gat,60,68	warp	CavesExit	-1,-1,006-1.gat,60,59
-006-3.gat,92,63	warp	CavesExit	-1,-1,006-1.gat,92,64
-006-3.gat,112,74	warp	CavesExit	-1,-1,006-1.gat,112,75
-006-3.gat,110,56	warp	CavesExit	-1,-1,006-1.gat,110,57
-006-3.gat,125,59	warp	CavesExit	-1,-1,006-1.gat,125,60
-006-3.gat,74,90	warp	CavesExit	-1,-1,006-1.gat,74,91
-006-3.gat,51,90	warp	CavesExit	-1,-1,006-1.gat,51,91
-006-3.gat,38,121	warp	CavesExit	-1,-1,006-1.gat,38,122
-006-3.gat,79,120	warp	CavesExit	-1,-1,006-1.gat,79,121
-006-3.gat,121,110	warp	CavesExit	-1,-1,006-1.gat,121,111
+006-3.gat,40,26	warp	ToOutside	-1,-1,006-1.gat,40,27
+006-3.gat,55,27	warp	ToOutside	-1,-1,006-1.gat,55,28
+006-3.gat,62,30	warp	ToOutside	-1,-1,006-1.gat,62,31
+006-3.gat,86,24	warp	ToOutside	-1,-1,006-1.gat,86,25
+006-3.gat,91,24	warp	ToOutside	-1,-1,006-1.gat,91,25
+006-3.gat,122,24	warp	ToOutside	-1,-1,006-1.gat,122,25
+006-3.gat,114,49	warp	ToOutside	-1,-1,006-1.gat,114,50
+006-3.gat,104,44	warp	ToOutside	-1,-1,006-1.gat,104,45
+006-3.gat,77,44	warp	ToOutside	-1,-1,006-1.gat,77,45
+006-3.gat,60,68	warp	ToOutside	-1,-1,006-1.gat,60,59
+006-3.gat,92,63	warp	ToOutside	-1,-1,006-1.gat,92,64
+006-3.gat,112,74	warp	ToOutside	-1,-1,006-1.gat,112,75
+006-3.gat,110,56	warp	ToOutside	-1,-1,006-1.gat,110,57
+006-3.gat,125,59	warp	ToOutside	-1,-1,006-1.gat,125,60
+006-3.gat,74,90	warp	ToOutside	-1,-1,006-1.gat,74,91
+006-3.gat,51,90	warp	ToOutside	-1,-1,006-1.gat,51,91
+006-3.gat,38,121	warp	ToOutside	-1,-1,006-1.gat,38,122
+006-3.gat,79,120	warp	ToOutside	-1,-1,006-1.gat,79,121
+006-3.gat,121,110	warp	ToOutside	-1,-1,006-1.gat,121,111
diff --git a/npc/006-3_Desert_mountain_caves/monsters.txt b/npc/006-3_Desert_mountain_caves/monsters.txt
deleted file mode 100644
index 5aee03a4..00000000
--- a/npc/006-3_Desert_mountain_caves/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 006-3
-// This is the Desert Mountains Caves.
-//
-
-006-3.gat,0,0,0,0	monster	MountainSnake	1026,50,0,0,Mob25::OnMountainSnake
-
-006-3.gat,0,0,0	script	Mob25	-1,{
-OnMountainSnake:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}