3 files changed, 20 insertions, 27 deletions
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index 31adafe1..8fe3add8 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -13,7 +13,6 @@ npc: npc/001-1_Tulimshar/guide.txt
 npc: npc/001-1_Tulimshar/man.txt
 npc: npc/001-1_Tulimshar/merchant.txt
 npc: npc/001-1_Tulimshar/monster_guide.txt
-npc: npc/001-1_Tulimshar/monsters.txt
 npc: npc/001-1_Tulimshar/rewards_master.txt
 npc: npc/001-1_Tulimshar/rules.txt
 npc: npc/001-1_Tulimshar/sandra.txt
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
index db1ae2e8..a24fe7c5 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -1,7 +1,27 @@
 // 001-1 Tulimshar mobs
 
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,30000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,60000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,90000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,180000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,270000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,360000,0,Mob001-1::On1003
+001-1.gat,82,30,9,8	monster	Maggot	1002,5,0,0,Mob001-1::On1002
+001-1.gat,115,25,8,4	monster	Maggot	1002,3,0,0,Mob001-1::On1002
+001-1.gat,124,53,15,13	monster	Maggot	1002,10,0,0,Mob001-1::On1002
+001-1.gat,120,64,15,13	monster	Maggot	1002,11,0,0,Mob001-1::On1002
 
 
 001-1.gat,0,0,0	script	Mob001-1	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/001-1_Tulimshar/monsters.txt b/npc/001-1_Tulimshar/monsters.txt
deleted file mode 100644
index e5e19a0d..00000000
--- a/npc/001-1_Tulimshar/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: 001-1
-// This is Tulimshar the city -- southern part with market and casino/inn.
-//
-
-001-1.gat,0,0,0,0	monster	Maggot		1002,35,2000,0,Mob3::OnMaggot
-001-1.gat,0,0,0,0	monster	Scorpion	1003,25,2500,0,Mob3::OnScorpion
-001-1.gat,0,0,0,0	monster	Firegoblin	1011,20,2500,0,Mob3::OnFireGoblin
-
-001-1.gat,0,0,0	script	Mob3	-1,{
-OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-OnScorpion:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-OnFireGoblin:
-	set @mobID, 1011;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}