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

5 files changed, 61 insertions, 78 deletions

diff --git a/world/map/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index 799e5dd0..ba9fdeff 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -1,7 +1,6 @@
-// Map 011-3: Hermit's cave
+// Map 011-3: Hermit's Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-3.gat
 npc: npc/011-3/_mobs.txt
 npc: npc/011-3/_warps.txt
 npc: npc/011-3/hermit.txt
-npc: npc/011-3/monsters.txt
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index d17c348d..ef4ef58c 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -1,8 +1,20 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hermit's cave mobs
+// Hermit's Cave mobs
 
+011-3.gat,0,0,0,0|monster|Bat|1017,10,0,0,Mob011-3::On1017
+011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000,30000,Mob011-3::On1035
 
 
 011-3.gat,0,0,0|script|Mob011-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index 69cc183d..7107a3a2 100644
--- a/world/map/npc/011-3/_warps.txt
+++ b/world/map/npc/011-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hermit's cave warps
+// Hermit's Cave warps
 
-011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,11
+011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,9
diff --git a/world/map/npc/011-3/hermit.txt b/world/map/npc/011-3/hermit.txt
index f9533e56..698ae0c5 100644
--- a/world/map/npc/011-3/hermit.txt
+++ b/world/map/npc/011-3/hermit.txt
@@ -1,62 +1,55 @@
 //
 
-011-3.gat,30,23,0	script	Arkim	116,{
-        mes "[Arkim the Hermit]";
-        mes "\"Do you want to go back outside?\"";
-        menu
-        	"Yes, please!", L_Sure,
-        	"Not yet.", -,
-		"Actually... Why do you live here?", L_Interested;
-        close;
+011-3.gat,30,23,0|script|Arkim|116,{
+    mes "[Arkim the Hermit]";
+    mes "\"Do you want to go back outside?\"";
+    menu
+        "Yes, please!", L_Sure,
+        "Not yet.", -,
+        "Actually... Why do you live here?", L_Interested;
+    close;
 
 L_Sure:
-        warp "011-1.gat", 60, 95;
-        close;
+    warp "011-1.gat", 60, 95;
+    close;
 
 L_Interested:
-	mes "[Arkim the Hermit]";
-	mes "\"Oh my, never really thought about it!\"";
-	next;
-	mes "[Arkim the Hermit]";
-	mes "\"I guess mostly I enjoy experimenting with the bats here.\"";
-
-	menu
-		"I see...", -,
-		"What type of experimenting?", L_Experiment;
-	close;
+    mes "[Arkim the Hermit]";
+    mes "\"Oh my, never really thought about it!\"";
+    next;
+    mes "[Arkim the Hermit]";
+    mes "\"I guess mostly I enjoy experimenting with the bats here.\"";
+    menu
+        "I see...", -,
+        "What type of experimenting?", L_Experiment;
+    close;
 
 L_Experiment:
-	mes "[Arkim the Hermit]";
-	mes "\"Never really thought about it either...\"";
-
-	next;
-
-	mes "You watch as the hermit's old, lazy eyes open wide, and the old man comes alive with energy.";
-
-	next;
-
-	mes "[Arkim the Hermit]";
-	mes "\"I GUESS I REALLY LIKE CUTTING THEM UP TO SEE HOW THEY WORK!!  HAHAHA!\"";
-
-	menu
-		"YOU'RE CRAZY!", -,
-		"Right... me too!  Can I help?", L_Quest;
-	close;
+    mes "[Arkim the Hermit]";
+    mes "\"Never really thought about it either...\"";
+    next;
+    mes "You watch as the hermit's old, lazy eyes open wide, and the old man comes alive with energy.";
+    next;
+    mes "[Arkim the Hermit]";
+    mes "\"I GUESS I REALLY LIKE CUTTING THEM UP TO SEE HOW THEY WORK!!  HAHAHA!\"";
+    menu
+        "YOU'RE CRAZY!", -,
+        "Right... me too!  Can I help?", L_Quest;
+    close;
 
 L_Quest:
-	set @dq_level, 20;
-	set @dq_cost, 4;
-	set @dq_count, 3;
-	set @dq_name$, "BatWing";
-	set @dq_friendly_name$, "bat wings";
-	set @dq_money, 600;
-	set @dq_exp, 100;
-
-	callfunc "DailyQuest";
-
-	next;	
-
-	mes "[Arkim the Hermit]";
-	mes "\"And remember: never lend your toothbrush to a slime!\"";
-	close;
-}
+    set @dq_level, 20;
+    set @dq_cost, 4;
+    set @dq_count, 3;
+    set @dq_name$, "BatWing";
+    set @dq_friendly_name$, "bat wings";
+    set @dq_money, 600;
+    set @dq_exp, 100;
+
+    callfunc "DailyQuest";
+
+    next;
+    mes "[Arkim the Hermit]";
+    mes "\"And remember: never lend your toothbrush to a slime!\"";
+    close;
+}
\ No newline at end of file
diff --git a/world/map/npc/011-3/monsters.txt b/world/map/npc/011-3/monsters.txt
deleted file mode 100644
index 37da9f40..00000000
--- a/world/map/npc/011-3/monsters.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// Map: 011-3
-// This is the Hermit's Cave -- level 1.
-//
-
-011-3.gat,0,0,0,0	monster	Bat	1017,10,0,0,Mob4::OnBat
-
-011-3.gat,0,0,0,0	monster	SilkWorm	1035,3,60000,30000,Mob4::OnSilkWorm
-
-011-3.gat,0,0,0	script	Mob4	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}