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

5 files changed, 28 insertions, 39 deletions

diff --git a/world/map/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index a6b8b692..f28f0dbb 100644
--- a/world/map/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
@@ -1,8 +1,7 @@
-// Map 001-3: Tulimshar arena
+// Map 001-3: Tulimshar Arena
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 001-3.gat
 npc: npc/001-3/_mobs.txt
 npc: npc/001-3/_warps.txt
 npc: npc/001-3/guards.txt
-npc: npc/001-3/monsters.txt
 npc: npc/001-3/pvpflag.txt
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index c49195bb..47156be7 100644
--- a/world/map/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar arena mobs
+// Tulimshar Arena mobs
 
+001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob001-3::On1002
 
 
 001-3.gat,0,0,0|script|Mob001-3|-1,{
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index becf90ca..b8a03519 100644
--- a/world/map/npc/001-3/_warps.txt
+++ b/world/map/npc/001-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar arena warps
+// Tulimshar Arena warps
 
 001-3.gat,72,28|warp|ToInn|-1,-1,001-2.gat,23,24
diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt
index 5b42ca4f..7ff899d0 100644
--- a/world/map/npc/001-3/guards.txt
+++ b/world/map/npc/001-3/guards.txt
@@ -1,28 +1,26 @@
 //
 
-001-3.gat,77,37,0	script	Phaet	125,{
-	mes "[Phaet the Royal Guard]";
-	mes "\"Do you want to go back?\"";
-	next;
-	
-	menu
-		"Yes", L_Sure,
-		"No", -;
-	mes "Have fun.";
-	close;
+001-3.gat,77,37,0|script|Phaet|125,{
+    mes "[Phaet the Royal Guard]";
+    mes "\"Do you want to go back?\"";
+    next;
+    menu
+        "Yes", L_Sure,
+        "No", -;
+    mes "Have fun.";
+    close;
 
 L_Sure:
-	mes "[Phaet the Royal Guard]";
-	mes "\"Ok.\"";
-	next;
-	
-	warp "001-2.gat", 25, 23;
-	close;
+    mes "[Phaet the Royal Guard]";
+    mes "\"Ok.\"";
+    next;
+    warp "001-2.gat", 25, 23;
+    close;
 }
 
-001-3.gat,69,37,0	script	Aradin	126,{
-	mes "[Aradin the Royal Guard]";
-	mes "\"Don't touch me...";
-	mes "You wouldn't enjoy the consequences.\"";
-	close;
+001-3.gat,69,37,0|script|Aradin|126,{
+    mes "[Aradin the Royal Guard]";
+    mes "\"Don't touch me...";
+    mes "You wouldn't enjoy the consequences.\"";
+    close;
 }
diff --git a/world/map/npc/001-3/monsters.txt b/world/map/npc/001-3/monsters.txt
deleted file mode 100644
index 04e6b11d..00000000
--- a/world/map/npc/001-3/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 001-3
-// This is the Tulimshar Arena -- below Tulimshar.
-//
-
-001-3.gat,0,0,0,0	monster	Maggot	1002,10,0,0,Mob6::OnMaggot
-
-001-3.gat,0,0,0	script	Mob6	-1,{
-OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
\ No newline at end of file