Run 'make maps' for map changes and additions in and around Tulimshar.

Updated submodule pointer.

39 files changed, 278 insertions, 82 deletions

diff --git a/client-data b/client-data
-Subproject 00f9a55f184532f6f88aaf3931e08fc589f02bd
+Subproject 6de854e3b43fedbf7be5c914b6f05812766ccfd
diff --git a/world/map/data/002-1.wlk b/world/map/data/002-1.wlk
index 3ab797d7..2a697715 100644
--- a/world/map/data/002-1.wlk
+++ b/world/map/data/002-1.wlk
diff --git a/world/map/data/002-2.wlk b/world/map/data/002-2.wlk
new file mode 100644
index 00000000..1de69a2b
--- /dev/null
+++ b/world/map/data/002-2.wlk
diff --git a/world/map/data/002-3.wlk b/world/map/data/002-3.wlk
index e2d05c89..35421c22 100644
--- a/world/map/data/002-3.wlk
+++ b/world/map/data/002-3.wlk
diff --git a/world/map/data/002-4.wlk b/world/map/data/002-4.wlk
index b6abb2c1..40b37e67 100644
--- a/world/map/data/002-4.wlk
+++ b/world/map/data/002-4.wlk
diff --git a/world/map/data/002-5.wlk b/world/map/data/002-5.wlk
new file mode 100644
index 00000000..738a6412
--- /dev/null
+++ b/world/map/data/002-5.wlk
diff --git a/world/map/data/003-1.wlk b/world/map/data/003-1.wlk
index 34168aed..fceedb2f 100644
--- a/world/map/data/003-1.wlk
+++ b/world/map/data/003-1.wlk
diff --git a/world/map/data/004-1.wlk b/world/map/data/004-1.wlk
index bacd8355..b48d311a 100644
--- a/world/map/data/004-1.wlk
+++ b/world/map/data/004-1.wlk
diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk
index 2e18e65f..19de30d3 100644
--- a/world/map/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
diff --git a/world/map/data/021-3.wlk b/world/map/data/021-3.wlk
new file mode 100644
index 00000000..ed3b7476
--- /dev/null
+++ b/world/map/data/021-3.wlk
diff --git a/world/map/data/043-1.wlk b/world/map/data/043-1.wlk
new file mode 100644
index 00000000..ebe46d09
--- /dev/null
+++ b/world/map/data/043-1.wlk
diff --git a/world/map/data/043-3.wlk b/world/map/data/043-3.wlk
new file mode 100644
index 00000000..1a17b2f9
--- /dev/null
+++ b/world/map/data/043-3.wlk
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index f1ebfb77..2738eb37 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -4,9 +4,6 @@ map: 002-1.gat
 npc: npc/002-1/_mobs.txt
 npc: npc/002-1/_warps.txt
 npc: npc/002-1/lieutenant_dausen.txt
-npc: npc/002-1/merchant.txt
 npc: npc/002-1/nickos.txt
 npc: npc/002-1/nomads.txt
-npc: npc/002-1/rogue.txt
-npc: npc/002-1/sandstorm_mine_barrier.txt
 npc: npc/002-1/stewen.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index feea41c1..45e83293 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -2,18 +2,18 @@
 // Sandstorm Desert mobs
 
 002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000,500,Mob002-1::On1002
-002-1.gat,96,98,19,13|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
+002-1.gat,95,97,16,9|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
 002-1.gat,94,35,11,4|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,68,59,7,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,57,86,15,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,19,94,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
+002-1.gat,27,85,7,8|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,44,35,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,38,29,3,2|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
 002-1.gat,62,91,24,6|monster|Maggot|1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,61,74,41,43|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
+002-1.gat,60,73,38,40|monster|FireGoblin|1011,15,100000,30000,Mob002-1::On1011
 002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,27,82,22,43|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
+002-1.gat,26,73,20,24|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
 002-1.gat,95,75,15,17|monster|BlackScorpion|1009,1,100000,1800000,Mob002-1::On1009
 
 
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index e238d32f..b86304b9 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -2,6 +2,9 @@
 // Sandstorm Desert warps
 
 002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86
-002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
 002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
 002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
+002-1.gat,79,99|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
+002-1.gat,20,94|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,33
+002-1.gat,104,92|warp|To Mystics House|-1,-1,002-2.gat,28,29
+002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
new file mode 100644
index 00000000..6108ea70
--- /dev/null
+++ b/world/map/npc/002-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 002-2: Sandstorm Desert Indoors
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-2.gat
+npc: npc/002-2/_mobs.txt
+npc: npc/002-2/_warps.txt
+npc: npc/002-2/rogue.txt
diff --git a/world/map/npc/002-2/_mobs.txt b/world/map/npc/002-2/_mobs.txt
new file mode 100644
index 00000000..562f2699
--- /dev/null
+++ b/world/map/npc/002-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Sandstorm Desert Indoors mobs
+
+
+
+002-2.gat,0,0,0|script|Mob002-2|-1,{
+    end;
+}
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
new file mode 100644
index 00000000..e370ad8f
--- /dev/null
+++ b/world/map/npc/002-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Sandstorm Desert Indoors warps
+
+002-2.gat,28,30|warp|To Sand Storm|-1,-1,002-1.gat,104,93
diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index 2f37b959..83f6f548 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -1,11 +1,8 @@
-// Map 002-3: Desert Mines
+// Map 002-3: Tulimshar Mining Camp
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-3.gat
 npc: npc/002-3/_mobs.txt
 npc: npc/002-3/_warps.txt
-npc: npc/002-3/mine_triggerone.txt
-npc: npc/002-3/mine_triggerthree.txt
-npc: npc/002-3/mine_triggertwo.txt
-npc: npc/002-3/naem.txt
+npc: npc/002-3/merchant.txt
+npc: npc/002-3/mining_camp_barrier.txt
 npc: npc/002-3/nathan.txt
-npc: npc/002-3/underground_palace_barrier.txt
diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index dbd06f59..4bbf4acf 100644
--- a/world/map/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
@@ -1,37 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert Mines mobs
+// Tulimshar Mining Camp mobs
 
-002-3.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000,30000,Mob002-3::On1056
-002-3.gat,91,41,17,20|monster|IceGoblin|1058,3,100000,30000,Mob002-3::On1058
-002-3.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,69,100,8,5|monster|IceGoblin|1058,2,100000,30000,Mob002-3::On1058
-002-3.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000,30000,Mob002-3::On1057
-002-3.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000,30000,Mob002-3::On1057
-002-3.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057
-002-3.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057
-002-3.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,72,77,21,14|monster|IceGoblin|1058,3,100000,30000,Mob002-3::On1058
-002-3.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000,30000,Mob002-3::On1057
-002-3.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-3::On1057
 
 
 002-3.gat,0,0,0|script|Mob002-3|-1,{
-On1056:
-    set @mobID, 1056;
-    callfunc "MobPoints";
-    end;
-
-On1057:
-    set @mobID, 1057;
-    callfunc "MobPoints";
-    end;
-
-On1058:
-    set @mobID, 1058;
-    callfunc "MobPoints";
-    end;
-
     end;
 }
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index 4f7f2198..e7ed3d83 100644
--- a/world/map/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
@@ -1,4 +1,6 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert Mines warps
+// Tulimshar Mining Camp warps
 
-002-3.gat,37,29|warp|To Outside|-1,-1,002-1.gat,20,97
+002-3.gat,22,87|warp|To Beach|-1,-1,043-1.gat,85,55
+002-3.gat,85,51|warp|To Sand Storm Upper|-1,-1,002-1.gat,79,101
+002-3.gat,51,36|warp|To Sand Storm|-1,-1,002-1.gat,20,96
diff --git a/world/map/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 4758cedf..09530371 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -1,7 +1,10 @@
-// Map 002-4: Deep Desert Mines
+// Map 002-4: Desert Mines
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-4.gat
 npc: npc/002-4/_mobs.txt
 npc: npc/002-4/_warps.txt
-npc: npc/002-4/chest.txt
-npc: npc/002-4/miners.txt
+npc: npc/002-4/mine_triggerone.txt
+npc: npc/002-4/mine_triggerthree.txt
+npc: npc/002-4/mine_triggertwo.txt
+npc: npc/002-4/naem.txt
+npc: npc/002-4/underground_palace_barrier.txt
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 0f275e9f..a159ad23 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -1,31 +1,23 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Deep Desert Mines mobs
-
-002-4.gat,37,89,12,7|monster|IceGoblin|1058,3,100000,30000,Mob002-4::On1058
-002-4.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000,30000,Mob002-4::On1056
-002-4.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-4::On1057
-002-4.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-4::On1060
-002-4.gat,62,71,3,7|monster|IceGoblin|1058,3,100000,30000,Mob002-4::On1058
-002-4.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,68,100,12,2|monster|YellowSlime|1007,4,100000,30000,Mob002-4::On1007
-002-4.gat,92,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-4::On1060
-002-4.gat,94,71,2,6|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,91,64,8,2|monster|YellowSlime|1007,1,100000,30000,Mob002-4::On1007
-002-4.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,93,39,8,2|monster|YellowSlime|1007,2,100000,30000,Mob002-4::On1007
+// Desert Mines mobs
+
+002-4.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000,30000,Mob002-4::On1056
+002-4.gat,91,41,17,20|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-4::On1108
+002-4.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,69,100,8,5|monster|AngryFireGoblin|1108,2,100000,30000,Mob002-4::On1108
+002-4.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000,30000,Mob002-4::On1057
+002-4.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000,30000,Mob002-4::On1057
+002-4.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057
+002-4.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057
+002-4.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,72,77,21,14|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-4::On1108
+002-4.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000,30000,Mob002-4::On1057
+002-4.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000,30000,Mob002-4::On1056
+002-4.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-4::On1057
 
 
 002-4.gat,0,0,0|script|Mob002-4|-1,{
-On1007:
-    set @mobID, 1007;
-    callfunc "MobPoints";
-    end;
-
 On1056:
     set @mobID, 1056;
     callfunc "MobPoints";
@@ -36,13 +28,8 @@ On1057:
     callfunc "MobPoints";
     end;
 
-On1058:
-    set @mobID, 1058;
-    callfunc "MobPoints";
-    end;
-
-On1060:
-    set @mobID, 1060;
+On1108:
+    set @mobID, 1108;
     callfunc "MobPoints";
     end;
 
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index 4d4af370..072d2ba2 100644
--- a/world/map/npc/002-4/_warps.txt
+++ b/world/map/npc/002-4/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Deep Desert Mines warps
+// Desert Mines warps
 
-002-4.gat,34,99|warp|To First Level|-1,-1,002-3.gat,68,99
+002-4.gat,37,29|warp|To Mining camp|-1,-1,002-3.gat,82,30
diff --git a/world/map/npc/002-5/_import.txt b/world/map/npc/002-5/_import.txt
new file mode 100644
index 00000000..e12c5372
--- /dev/null
+++ b/world/map/npc/002-5/_import.txt
@@ -0,0 +1,7 @@
+// Map 002-5: Deep Desert Mines
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 002-5.gat
+npc: npc/002-5/_mobs.txt
+npc: npc/002-5/_warps.txt
+npc: npc/002-5/chest.txt
+npc: npc/002-5/sema.txt
diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt
new file mode 100644
index 00000000..2fbad511
--- /dev/null
+++ b/world/map/npc/002-5/_mobs.txt
@@ -0,0 +1,50 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Deep Desert Mines mobs
+
+002-5.gat,37,89,12,7|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-5::On1108
+002-5.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000,30000,Mob002-5::On1056
+002-5.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000,30000,Mob002-5::On1057
+002-5.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-5::On1060
+002-5.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,68,100,12,2|monster|YellowSlime|1007,4,100000,30000,Mob002-5::On1007
+002-5.gat,91,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-5::On1060
+002-5.gat,94,72,2,4|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,90,61,6,2|monster|YellowSlime|1007,1,100000,30000,Mob002-5::On1007
+002-5.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-5::On1060
+002-5.gat,93,38,8,2|monster|YellowSlime|1007,2,100000,30000,Mob002-5::On1007
+002-5.gat,62,62,5,43|monster|AngryFireGoblin|1108,3,100000,30000,Mob002-5::On1108
+
+
+002-5.gat,0,0,0|script|Mob002-5|-1,{
+On1007:
+    set @mobID, 1007;
+    callfunc "MobPoints";
+    end;
+
+On1056:
+    set @mobID, 1056;
+    callfunc "MobPoints";
+    end;
+
+On1057:
+    set @mobID, 1057;
+    callfunc "MobPoints";
+    end;
+
+On1060:
+    set @mobID, 1060;
+    callfunc "MobPoints";
+    end;
+
+On1108:
+    set @mobID, 1108;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/002-5/_warps.txt b/world/map/npc/002-5/_warps.txt
new file mode 100644
index 00000000..a7f33af9
--- /dev/null
+++ b/world/map/npc/002-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Deep Desert Mines warps
+
+002-5.gat,34,98|warp|To Second Level|-1,-1,002-4.gat,68,99
diff --git a/world/map/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt
index fc6128df..0adea8a4 100644
--- a/world/map/npc/003-1/_warps.txt
+++ b/world/map/npc/003-1/_warps.txt
@@ -5,3 +5,4 @@
 003-1.gat,141,19|warp|To Beach|1,-1,004-1.gat,37,110
 003-1.gat,48,36|warp|To Beach House|-1,-1,003-2.gat,22,28
 003-1.gat,59,29|warp|To Beach Storage|-1,-1,003-2.gat,56,28
+003-1.gat,114,117|warp|To Beach|1,-1,043-1.gat,44,20
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 618c057a..6fa8ddc0 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -18,3 +18,6 @@
 021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92
 021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68
 021-1.gat,125,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
+021-1.gat,53,105|warp|To Tulimshar Sewers|0,0,021-3.gat,51,103
+021-1.gat,146,137|warp|To Tulimshar Sewers|0,0,021-3.gat,142,131
+021-1.gat,125,42|warp|To Tulimshar Sewers|0,0,021-3.gat,124,40
diff --git a/world/map/npc/021-3/_import.txt b/world/map/npc/021-3/_import.txt
new file mode 100644
index 00000000..544afc3a
--- /dev/null
+++ b/world/map/npc/021-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 021-3: Central Tulimshar Sewers
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 021-3.gat
+npc: npc/021-3/_mobs.txt
+npc: npc/021-3/_warps.txt
diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt
new file mode 100644
index 00000000..17ddb550
--- /dev/null
+++ b/world/map/npc/021-3/_mobs.txt
@@ -0,0 +1,49 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Central Tulimshar Sewers mobs
+
+021-3.gat,120,130,20,21|monster|AngrySeaSlime|1109,6,150000,100000,Mob021-3::On1109
+021-3.gat,53,130,20,21|monster|AngrySeaSlime|1109,6,150000,100000,Mob021-3::On1109
+021-3.gat,128,69,27,7|monster|AngrySeaSlime|1109,6,150000,100000,Mob021-3::On1109
+021-3.gat,120,38,11,8|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
+021-3.gat,103,58,8,3|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
+021-3.gat,80,98,34,31|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
+021-3.gat,129,82,8,3|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
+021-3.gat,140,38,16,8|monster|AngryFireGoblin|1108,3,100000,30000,Mob021-3::On1108
+021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000,1800000,Mob021-3::On1009
+021-3.gat,52,53,2,17|monster|Snake|1010,2,40000,50000,Mob021-3::On1010
+021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000,30000,Mob021-3::On1033
+
+
+021-3.gat,0,0,0|script|Mob021-3|-1,{
+On1009:
+    set @mobID, 1009;
+    callfunc "MobPoints";
+    end;
+
+On1010:
+    set @mobID, 1010;
+    callfunc "MobPoints";
+    end;
+
+On1033:
+    set @mobID, 1033;
+    callfunc "MobPoints";
+    end;
+
+On1056:
+    set @mobID, 1056;
+    callfunc "MobPoints";
+    end;
+
+On1108:
+    set @mobID, 1108;
+    callfunc "MobPoints";
+    end;
+
+On1109:
+    set @mobID, 1109;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/021-3/_warps.txt b/world/map/npc/021-3/_warps.txt
new file mode 100644
index 00000000..bf25a15b
--- /dev/null
+++ b/world/map/npc/021-3/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Central Tulimshar Sewers warps
+
+021-3.gat,144,131|warp|To Central Tulimshar|-1,-1,021-1.gat,147,137
+021-3.gat,125,41|warp|To Central Tulimshar|-1,-1,021-1.gat,124,39
+021-3.gat,53,103|warp|To Central Tulimshar|-1,-1,021-1.gat,50,105
diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt
new file mode 100644
index 00000000..0ed2ee41
--- /dev/null
+++ b/world/map/npc/043-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 043-1: Beach
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 043-1.gat
+npc: npc/043-1/_mobs.txt
+npc: npc/043-1/_warps.txt
diff --git a/world/map/npc/043-1/_mobs.txt b/world/map/npc/043-1/_mobs.txt
new file mode 100644
index 00000000..469a4dba
--- /dev/null
+++ b/world/map/npc/043-1/_mobs.txt
@@ -0,0 +1,26 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Beach mobs
+
+043-1.gat,0,0,0,0|monster|SeaSlime|1033,17,40000,30000,Mob043-1::On1033
+043-1.gat,0,0,0,0|monster|YellowSlime|1007,15,60000,60000,Mob043-1::On1007
+043-1.gat,0,0,0,0|monster|GreenSlime|1005,20,60000,60000,Mob043-1::On1005
+
+
+043-1.gat,0,0,0|script|Mob043-1|-1,{
+On1005:
+    set @mobID, 1005;
+    callfunc "MobPoints";
+    end;
+
+On1007:
+    set @mobID, 1007;
+    callfunc "MobPoints";
+    end;
+
+On1033:
+    set @mobID, 1033;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/043-1/_warps.txt b/world/map/npc/043-1/_warps.txt
new file mode 100644
index 00000000..bbc9c47d
--- /dev/null
+++ b/world/map/npc/043-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Beach warps
+
+043-1.gat,44,19|warp|To Beach|1,-1,003-1.gat,114,116
+043-1.gat,85,54|warp|To Mining Camp|-1,-1,002-3.gat,22,85
+043-1.gat,52,38|warp|To Slime Hive|-1,-1,043-3.gat,31,34
diff --git a/world/map/npc/043-3/_import.txt b/world/map/npc/043-3/_import.txt
new file mode 100644
index 00000000..027beecc
--- /dev/null
+++ b/world/map/npc/043-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 043-3: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 043-3.gat
+npc: npc/043-3/_mobs.txt
+npc: npc/043-3/_warps.txt
diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt
new file mode 100644
index 00000000..30362328
--- /dev/null
+++ b/world/map/npc/043-3/_mobs.txt
@@ -0,0 +1,42 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Cave mobs
+
+043-3.gat,39,45,24,17|monster|CaveMaggot|1056,6,20000,20000,Mob043-3::On1056
+043-3.gat,44,60,24,17|monster|CaveMaggot|1056,6,20000,20000,Mob043-3::On1056
+043-3.gat,41,96,34,26|monster|CaveMaggot|1056,10,20000,20000,Mob043-3::On1056
+043-3.gat,52,91,6,7|monster|AngryScorpion|1057,5,30000,30000,Mob043-3::On1057
+043-3.gat,102,116,26,19|monster|AngryFireGoblin|1108,10,30000,30000,Mob043-3::On1108
+043-3.gat,33,99,6,7|monster|AngryScorpion|1057,5,30000,30000,Mob043-3::On1057
+043-3.gat,116,78,25,19|monster|AngryFireGoblin|1108,8,30000,30000,Mob043-3::On1108
+043-3.gat,113,47,30,22|monster|RedSlime|1008,15,45000,35000,Mob043-3::On1008
+043-3.gat,94,44,40,18|monster|GreenSlime|1005,5,30000,15000,Mob043-3::On1005
+
+
+043-3.gat,0,0,0|script|Mob043-3|-1,{
+On1005:
+    set @mobID, 1005;
+    callfunc "MobPoints";
+    end;
+
+On1008:
+    set @mobID, 1008;
+    callfunc "MobPoints";
+    end;
+
+On1056:
+    set @mobID, 1056;
+    callfunc "MobPoints";
+    end;
+
+On1057:
+    set @mobID, 1057;
+    callfunc "MobPoints";
+    end;
+
+On1108:
+    set @mobID, 1108;
+    callfunc "MobPoints";
+    end;
+
+    end;
+}
diff --git a/world/map/npc/043-3/_warps.txt b/world/map/npc/043-3/_warps.txt
new file mode 100644
index 00000000..244d5564
--- /dev/null
+++ b/world/map/npc/043-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Cave warps
+
+043-3.gat,32,36|warp|To Beach|0,-1,043-1.gat,52,39
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 05d7791e..9620fa64 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -4,8 +4,10 @@ import: npc/001-1/_import.txt
 import: npc/001-2/_import.txt
 import: npc/001-3/_import.txt
 import: npc/002-1/_import.txt
+import: npc/002-2/_import.txt
 import: npc/002-3/_import.txt
 import: npc/002-4/_import.txt
+import: npc/002-5/_import.txt
 import: npc/003-1/_import.txt
 import: npc/003-2/_import.txt
 import: npc/004-1/_import.txt
@@ -56,6 +58,7 @@ import: npc/020-2/_import.txt
 import: npc/020-3/_import.txt
 import: npc/021-1/_import.txt
 import: npc/021-2/_import.txt
+import: npc/021-3/_import.txt
 import: npc/022-1/_import.txt
 import: npc/024-1/_import.txt
 import: npc/024-2/_import.txt
@@ -87,6 +90,8 @@ import: npc/034-2/_import.txt
 import: npc/041-1/_import.txt
 import: npc/042-1/_import.txt
 import: npc/042-2/_import.txt
+import: npc/043-1/_import.txt
+import: npc/043-3/_import.txt
 import: npc/044-1/_import.txt
 import: npc/044-3/_import.txt
 import: npc/045-1/_import.txt