Inital rework of desert monsters

3 files changed, 13 insertions, 27 deletions

diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1_Beach/_import.txt
index 58b5145e..93b04845 100644
--- a/npc/003-1_Beach/_import.txt
+++ b/npc/003-1_Beach/_import.txt
@@ -1,4 +1,3 @@
 map: 003-1.gat
 npc: npc/003-1_Beach/_mobs.txt
 npc: npc/003-1_Beach/_warps.txt
-npc: npc/003-1_Beach/monsters.txt
diff --git a/npc/003-1_Beach/_mobs.txt b/npc/003-1_Beach/_mobs.txt
index c7daca33..6378cd4e 100644
--- a/npc/003-1_Beach/_mobs.txt
+++ b/npc/003-1_Beach/_mobs.txt
@@ -1,17 +1,24 @@
 // 003-1 Beach mobs
 
-003-1.gat,117,48,19,19	monster	Black Scorpion	1009,10,0,0,Mob003-1::On1009
-003-1.gat,105,64,19,19	monster	Snake	1010,10,0,0,Mob003-1::On1010
+003-1.gat,59,69,97,90	monster	Sea Slime	1033,15,0,0,Mob003-1::On1033
+003-1.gat,120,31,22,22	monster	Sea Slime	1033,5,0,0,Mob003-1::On1033
+003-1.gat,119,68,105,101	monster	Green Slime	1005,35,0,0,Mob003-1::On1005
+003-1.gat,134,69,76,71	monster	Red Scorpion	1004,20,0,0,Mob003-1::On1004
 
 
 003-1.gat,0,0,0	script	Mob003-1	-1,{
-On1009:
-	set @mobID, 1009;
+On1004:
+	set @mobID, 1004;
 	callfunc "MobPoints";
 	break;
 
-On1010:
-	set @mobID, 1010;
+On1005:
+	set @mobID, 1005;
+	callfunc "MobPoints";
+	break;
+
+On1033:
+	set @mobID, 1033;
 	callfunc "MobPoints";
 	break;
 
diff --git a/npc/003-1_Beach/monsters.txt b/npc/003-1_Beach/monsters.txt
deleted file mode 100644
index 248cc968..00000000
--- a/npc/003-1_Beach/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 003-1
-// This is the Desert Beach.
-//
-
-003-1.gat,0,0,0,0	monster	BlackScorpion	1009,20,0,0,Mob15::OnBlackScorpion
-003-1.gat,0,0,0,0	monster	Snake		1010,10,0,0,Mob15::OnSnake
-
-003-1.gat,0,0,0	script	Mob15	-1,{
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-OnSnake:
-	set @mobID, 1010;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}