Move some woodland spawns to TMX format

3 files changed, 49 insertions, 54 deletions

diff --git a/npc/010-1_Woodland/_import.txt b/npc/010-1_Woodland/_import.txt
index 3b2aca90..4c0bc6f4 100644
--- a/npc/010-1_Woodland/_import.txt
+++ b/npc/010-1_Woodland/_import.txt
@@ -1,4 +1,3 @@
 map: 010-1.gat
 npc: npc/010-1_Woodland/_mobs.txt
 npc: npc/010-1_Woodland/_warps.txt
-npc: npc/010-1_Woodland/monsters.txt
diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt
index b90691aa..42ddea6f 100644
--- a/npc/010-1_Woodland/_mobs.txt
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -2,7 +2,16 @@
 
 010-1.gat,82,63,19,19	monster	Scorpion	1003,1,100000,30000,Mob010-1::On1003
 010-1.gat,49,71,31,19	monster	Shroom	1019,1,100000,30000,Mob010-1::On1019
+010-1.gat,0,0,0,0	monster	Flower	1014,30,50,0,Mob010-1::On1014
+010-1.gat,0,0,0,0	monster	Fluffy	1018,20,50,0,Mob010-1::On1018
+010-1.gat,0,0,0,0	monster	SpikyMushroom	1019,45,50,0,Mob010-1::On1019
+010-1.gat,0,0,0,0	monster	LogHead	1025,40,100,0,Mob010-1::On1025
+010-1.gat,0,0,0,0	monster	Mouboo	1028,15,0,10,Mob010-1::On1028
+010-1.gat,0,0,0,0	monster	Mauve	1029,3,270000,180000,Mob010-1::On1029
+010-1.gat,0,0,0,0	monster	Cobalt	1030,1,2700000,1800000,Mob010-1::On1030
+010-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob010-1::On1035
 010-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob010-1::On1037
+010-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob010-1::On1038
 
 
 010-1.gat,0,0,0	script	Mob010-1	-1,{
@@ -11,15 +20,55 @@ On1003:
 	callfunc "MobPoints";
 	break;
 
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1018:
+	set @mobID, 1018;
+	callfunc "MobPoints";
+	break;
+
 On1019:
 	set @mobID, 1019;
 	callfunc "MobPoints";
 	break;
 
+On1025:
+	set @mobID, 1025;
+	callfunc "MobPoints";
+	break;
+
+On1028:
+	set @mobID, 1028;
+	callfunc "MobPoints";
+	break;
+
+On1029:
+	set @mobID, 1029;
+	callfunc "MobPoints";
+	break;
+
+On1030:
+	set @mobID, 1030;
+	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/010-1_Woodland/monsters.txt b/npc/010-1_Woodland/monsters.txt
deleted file mode 100644
index a1745c88..00000000
--- a/npc/010-1_Woodland/monsters.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-// Map: 010-1
-// This is South Woodland.
-//
-
-010-1.gat,0,0,0,0	monster	Scorpion	1003,50,0,0,Mob14::OnScorpion
-010-1.gat,0,0,0,0	monster	SpikyMushroom	1019,50,0,0,Mob14::OnSpikyMushroom
-010-1.gat,0,0,0,0	monster	LogHead		1025,50,0,0,Mob14::OnLogHead
-
-010-1.gat,0,0,0,0	monster	Cobalt		1030,1,2700000,1800000,Mob14::OnCobalt
-010-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob14::OnMauve
-
-010-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob14::OnSilkWorm
-
-010-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob14::OnSquirrel
-
-010-1.gat,0,0,0	script	Mob14	-1,{
-OnScorpion:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-OnLogHead:
-	set @mobID, 1025;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnCobalt:
-	set @mobID, 1030;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}