Move some woodland spawns to TMX format

3 files changed, 54 insertions, 48 deletions

diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt
index 3e18f94e..e8b35152 100644
--- a/npc/011-1_Woodland/_import.txt
+++ b/npc/011-1_Woodland/_import.txt
@@ -3,5 +3,4 @@ npc: npc/011-1_Woodland/_mobs.txt
 npc: npc/011-1_Woodland/_warps.txt
 npc: npc/011-1_Woodland/alchemist.txt
 npc: npc/011-1_Woodland/auldsbel.txt
-npc: npc/011-1_Woodland/monsters.txt
 npc: npc/011-1_Woodland/oscar.txt
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt
index 0d6971cf..353f8f2d 100644
--- a/npc/011-1_Woodland/_mobs.txt
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -1,13 +1,67 @@
 // 011-1 Woodland mobs
 
+011-1.gat,0,0,0,0	monster	EvilMushroom	1013,30,0,0,Mob011-1::On1013
+011-1.gat,0,0,0,0	monster	Flower	1014,20,0,0,Mob011-1::On1014
+011-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,5,0,0,Mob011-1::On1019
+011-1.gat,0,0,0,0	monster	Fluffy	1020,1,0,0,Mob011-1::On1020
+011-1.gat,0,0,0,0	monster	Mouboo	1028,5,0,10,Mob011-1::On1028
+011-1.gat,0,0,0,0	monster	Mauve	1029,3,270000,180000,Mob011-1::On1029
+011-1.gat,0,0,0,0	monster	Alizarin	1032,1,2700000,1800000,Mob011-1::On1032
+011-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob011-1::On1035
 011-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob011-1::On1037
+011-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob011-1::On1038
 
 
 011-1.gat,0,0,0	script	Mob011-1	-1,{
+On1013:
+	set @mobID, 1013;
+	callfunc "MobPoints";
+	break;
+
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+On1020:
+	set @mobID, 1020;
+	callfunc "MobPoints";
+	break;
+
+On1028:
+	set @mobID, 1028;
+	callfunc "MobPoints";
+	break;
+
+On1029:
+	set @mobID, 1029;
+	callfunc "MobPoints";
+	break;
+
+On1032:
+	set @mobID, 1032;
+	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/011-1_Woodland/monsters.txt b/npc/011-1_Woodland/monsters.txt
deleted file mode 100644
index 15e69164..00000000
--- a/npc/011-1_Woodland/monsters.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-// Map: 011-1
-// This is Central Woodland.
-//
-
-011-1.gat,0,0,0,0	monster	EvilMushroom	1013,25,0,0,Mob9::OnEvilMushroom
-011-1.gat,0,0,0,0	monster	Flower	1014,40,0,0,Mob9::OnFlower
-
-011-1.gat,0,0,0,0	monster	Alizarin	1032,1,2700000,1800000,Mob9::OnAlizarin
-011-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob9::OnMauve
-
-011-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob9::OnSilkWorm
-
-011-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob9::OnSquirrel
-
-011-1.gat,0,0,0	script	Mob9	-1,{
-OnEvilMushroom:
-	set @mobID, 1013;
-	callfunc "MobPoints";
-	break;
-
-OnFlower:
-	set @mobID, 1014;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnAlizarin:
-	set @mobID, 1032;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}