Merge remote-tracking branch 'testing/master'v2011.09.08

4 files changed, 9 insertions, 18 deletions

diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index d2d03e67..6da1af98 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -1,6 +1,5 @@
-// Map 014-3: Cave
+// Map 014-3: Woodland Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 014-3.gat
 npc: npc/014-3/_mobs.txt
 npc: npc/014-3/_warps.txt
-npc: npc/014-3/monsters.txt
diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index bc868d9d..db5c65b2 100644
--- a/world/map/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Woodland Caves mobs
 
+014-3.gat,0,0,0,0|monster|Bat|1017,50,0,0,Mob014-3::On1017
 
 
 014-3.gat,0,0,0|script|Mob014-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/014-3/_warps.txt b/world/map/npc/014-3/_warps.txt
index 3b9e92fb..ac0d5474 100644
--- a/world/map/npc/014-3/_warps.txt
+++ b/world/map/npc/014-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Woodland Caves warps
 
 014-3.gat,35,32|warp|ToOutside|-1,-1,014-1.gat,76,39
 014-3.gat,57,173|warp|ToOutside|0,-1,014-1.gat,93,59
diff --git a/world/map/npc/014-3/monsters.txt b/world/map/npc/014-3/monsters.txt
deleted file mode 100644
index 2237ea42..00000000
--- a/world/map/npc/014-3/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 014-3
-// This is the caves beneath West Woodland.
-//
-
-014-3.gat,0,0,0,0	monster	Bat	1017,50,0,0,Mob30::OnBat
-
-014-3.gat,0,0,0	script	Mob30	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}