Move some woodland spawns to TMX format

3 files changed, 42 insertions, 43 deletions

diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
index 3101190e..ee2463a5 100644
--- a/npc/008-1_Hurnscald_outskirts/_import.txt
+++ b/npc/008-1_Hurnscald_outskirts/_import.txt
@@ -5,4 +5,3 @@ npc: npc/008-1_Hurnscald_outskirts/andra.txt
 npc: npc/008-1_Hurnscald_outskirts/dock_worker.txt
 npc: npc/008-1_Hurnscald_outskirts/george.txt
 npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
-npc: npc/008-1_Hurnscald_outskirts/monsters.txt
diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt
index 45df49ae..ba75f159 100644
--- a/npc/008-1_Hurnscald_outskirts/_mobs.txt
+++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt
@@ -1,13 +1,55 @@
 // 008-1 Hurnscald outskirts mobs
 
+008-1.gat,0,0,0,0	monster	Flower	1014,10,20,0,Mob008-1::On1014
+008-1.gat,0,0,0,0	monster	Pinkie	1018,18,20,0,Mob008-1::On1018
+008-1.gat,0,0,0,0	monster	SpikyMushroom	1019,18,20,0,Mob008-1::On1019
+008-1.gat,0,0,0,0	monster	Fluffy	1020,5,30,0,Mob008-1::On1020
+008-1.gat,0,0,0,0	monster	Mauve	1029,2,270000,180000,Mob008-1::On1029
+008-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob008-1::On1035
 008-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob008-1::On1037
+008-1.gat,0,0,0,0	monster	Squirrel	1038,10,30,20,Mob008-1::On1038
 
 
 008-1.gat,0,0,0	script	Mob008-1	-1,{
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1018:
+	set @mobID, 1018;
+	callfunc "MobPoints";
+	break;
+
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+On1020:
+	set @mobID, 1020;
+	callfunc "MobPoints";
+	break;
+
+On1029:
+	set @mobID, 1029;
+	callfunc "MobPoints";
+	break;
+
+On1035:
+	set @mobID, 1035;
+	callfunc "MobPoints";
+	break;
+
 On1037:
 	set @mobID, 1037;
 	callfunc "MobPoints";
 	break;
 
+On1038:
+	set @mobID, 1038;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/008-1_Hurnscald_outskirts/monsters.txt b/npc/008-1_Hurnscald_outskirts/monsters.txt
deleted file mode 100644
index 8be26271..00000000
--- a/npc/008-1_Hurnscald_outskirts/monsters.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-// Map: 008-1
-// This is Woodland around Hurnscald.
-//
-
-008-1.gat,0,0,0,0	monster	Pinkie	1018,20,0,0,Mob18::OnPinkie
-008-1.gat,0,0,0,0	monster	SpikyMushroom	1019,20,0,0,Mob18::OnSpikyMushroom
-
-008-1.gat,0,0,0,0	monster	Mauve	1029,1,2700000,1800000,Mob18::OnMauve
-008-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob18::OnMauve
-
-008-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob18::OnSilkWorm
-
-008-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob18::OnSquirrel
-
-008-1.gat,0,0,0	script	Mob18	-1,{
-OnPinkie:
-	set @mobID, 1018;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}