Inital rework of desert monsters

3 files changed, 28 insertions, 25 deletions

diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
index 14adaccf..cb6b0a78 100644
--- a/npc/002-1_Sandstorm/_import.txt
+++ b/npc/002-1_Sandstorm/_import.txt
@@ -3,6 +3,5 @@ npc: npc/002-1_Sandstorm/_mobs.txt
 npc: npc/002-1_Sandstorm/_warps.txt
 npc: npc/002-1_Sandstorm/dark_mage.txt
 npc: npc/002-1_Sandstorm/merchant.txt
-npc: npc/002-1_Sandstorm/monsters.txt
 npc: npc/002-1_Sandstorm/nomads.txt
 npc: npc/002-1_Sandstorm/rogue.txt
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
index 2ef2a902..de8532e1 100644
--- a/npc/002-1_Sandstorm/_mobs.txt
+++ b/npc/002-1_Sandstorm/_mobs.txt
@@ -1,6 +1,19 @@
 // 002-1 Sandstorm mobs
 
 002-1.gat,0,0,0,0	monster	Maggot	1002,20,1000,500,Mob002-1::On1002
+002-1.gat,97,98,18,12	monster	Maggot	1002,10,0,0,Mob002-1::On1002
+002-1.gat,90,36,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,70,57,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,63,83,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,16,97,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,44,35,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,38,29,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,72,89,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,61,74,41,43	monster	Fire Goblin	1011,15,0,0,Mob002-1::On1011
+002-1.gat,82,24,34,15	monster	Scorpion	1003,8,0,0,Mob002-1::On1003
+002-1.gat,32,35,34,33	monster	Scorpion	1003,8,0,0,Mob002-1::On1003
+002-1.gat,29,81,22,43	monster	Scorpion	1003,8,0,0,Mob002-1::On1003
+002-1.gat,100,76,6,6	monster	Black Scorpion	1009,1,0,1800000,Mob002-1::On1009
 
 
 002-1.gat,0,0,0	script	Mob002-1	-1,{
@@ -9,5 +22,20 @@ On1002:
 	callfunc "MobPoints";
 	break;
 
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1011:
+	set @mobID, 1011;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/002-1_Sandstorm/monsters.txt b/npc/002-1_Sandstorm/monsters.txt
deleted file mode 100644
index 39783382..00000000
--- a/npc/002-1_Sandstorm/monsters.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Map: 002-2
-// This is the Desert (Sandstorm) south of Tulimshar.
-//
-
-002-1.gat,0,0,0,0	monster	GreenSlime	1005,50,0,0,Mob1::OnGreenSlime
-002-1.gat,0,0,0,0	monster	GiantMaggot	1006,30,0,0,Mob1::OnGiantMaggot
-002-1.gat,0,0,0,0	monster	RedScorpion	1004,20,0,0,Mob1::OnRedScorpion
-
-002-1.gat,0,0,0	script	Mob1	-1,{
-OnGreenSlime:
-	set @mobID, 1005;
-	callfunc "MobPoints";
-	break;
-
-OnGiantMaggot:
-	set @mobID, 1006;
-	callfunc "MobPoints";
-	break;
-
-OnRedScorpion:
-	set @mobID, 1004;
-	callfunc "MobPoints";
-	break;
-}