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

5 files changed, 15 insertions, 37 deletions

diff --git a/world/map/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index f2e5264f..c3a0019a 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -1,7 +1,6 @@
-// Map 011-4: Lake cave
+// Map 011-4: Lake Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-4.gat
 npc: npc/011-4/_mobs.txt
 npc: npc/011-4/_warps.txt
 npc: npc/011-4/bl_barrier.txt
-npc: npc/011-4/monsters.txt
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index c4faef23..b9f7cab1 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,8 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Lake cave mobs
+// Lake Cave mobs
 
-011-4.gat,51,29,39,39|monster|Shroom|1019,1,100000,30000,Mob011-4::On1019
+011-4.gat,52,30,39,39|monster|SpkiyMushroom|1019,1,100000,30000,Mob011-4::On1019
 011-4.gat,93,114,39,39|monster|Lamp Snake|1021,1,100000,30000,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0,0,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob011-4::On1019
 
 
 011-4.gat,0,0,0|script|Mob011-4|-1,{
diff --git a/world/map/npc/011-4/_warps.txt b/world/map/npc/011-4/_warps.txt
index 6ebe9c8b..7771aa47 100644
--- a/world/map/npc/011-4/_warps.txt
+++ b/world/map/npc/011-4/_warps.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Lake cave warps
+// Lake Cave warps
 
-011-4.gat,73,8|warp|ToHermitsCave|0,-1,011-3.gat,31,24
+011-4.gat,73,8|warp|ToHermitsCave|0,-1,011-3.gat,31,15
 011-4.gat,129,86|warp|ToCaveBeneathHurnscald|-1,-1,009-3.gat,21,55
 011-4.gat,39,35|warp|warp|-1,-1,011-6.gat,47,183
 011-4.gat,16,57|warp|warp|-1,-1,011-6.gat,24,204
diff --git a/world/map/npc/011-4/bl_barrier.txt b/world/map/npc/011-4/bl_barrier.txt
index 07b44999..efe81d60 100644
--- a/world/map/npc/011-4/bl_barrier.txt
+++ b/world/map/npc/011-4/bl_barrier.txt
@@ -1,16 +1,13 @@
 //bandit lord barrier
 
-011-4.gat,111,121,0	script	#BL_Barrier	127,0,0,{
-
-	if (TMW_Quest >= 44) goto L_Bandit_Lord_Barrier_Open;
-
-	message strcharinfo(0), "This entrance appears to be locked.";
-	end;
+011-4.gat,111,121,0|script|#BL_Barrier|127,0,0,{
+    if (TMW_Quest >= 44) goto L_Bandit_Lord_Barrier_Open;
 
+    message strcharinfo(0), "This entrance appears to be locked.";
+    end;
 
 L_Bandit_Lord_Barrier_Open:
-	message strcharinfo(0), "You insert the silver arrow key and unlock the entrance.";
-	warp "011-6.gat",251,275;
-	end;
-
-}
+    message strcharinfo(0), "You insert the silver arrow key and unlock the entrance.";
+    warp "011-6.gat",251,275;
+    end;
+}
\ No newline at end of file
diff --git a/world/map/npc/011-4/monsters.txt b/world/map/npc/011-4/monsters.txt
deleted file mode 100644
index d3b78249..00000000
--- a/world/map/npc/011-4/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 011-4
-// This is the Lake Cave, second level of the Hermit's Cave.
-//
-
-011-4.gat,0,0,0,0	monster	CaveSnake	1021,40,0,0,Mob17::OnCaveSnake
-011-4.gat,0,0,0,0	monster	SpikyMushroom	1019,15,0,0,Mob17::OnSpikyMushroom
-
-011-4.gat,0,0,0	script	Mob17	-1,{
-OnCaveSnake:
-	set @mobID, 1021;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}