Running 'make maps' for the changes done on 013-3, 017-1, 017-3 and 017-4.

15 files changed, 55 insertions, 28 deletions

diff --git a/client-data b/client-data
-Subproject 59a365ebdb2754607b05d562c029ddbce384a81
+Subproject 45bf706517bf4a72fa780ea2d2bbfed63c7b0fd
diff --git a/world/map/data/013-3.wlk b/world/map/data/013-3.wlk
index 4c04c00a..79e4426d 100644
--- a/world/map/data/013-3.wlk
+++ b/world/map/data/013-3.wlk
diff --git a/world/map/data/017-3.wlk b/world/map/data/017-3.wlk
new file mode 100644
index 00000000..e6b0deb2
--- /dev/null
+++ b/world/map/data/017-3.wlk
diff --git a/world/map/data/017-4.wlk b/world/map/data/017-4.wlk
new file mode 100644
index 00000000..87b34f53
--- /dev/null
+++ b/world/map/data/017-4.wlk
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index d1d34e9e..6139d30b 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -39,6 +39,8 @@
 016-1.gat#016-1.wlk#
 017-1.gat#017-1.wlk#
 017-2.gat#017-2.wlk#
+017-3.gat#017-3.wlk#
+017-4.gat#017-4.wlk#
 017-9.gat#017-9.wlk#
 018-1.gat#018-1.wlk#
 018-2.gat#018-2.wlk#
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index 830da7bb..80b8f904 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -29,12 +29,6 @@
 013-3.gat,80,33,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
 013-3.gat,75,46,2,1|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024
 013-3.gat,67,46,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
-013-3.gat,149,145,7,26|monster|Silkworm|1035,10,20000,5000,Mob013-3::On1035
-013-3.gat,117,157,6,14|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021
-013-3.gat,150,129,17,4|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021
-013-3.gat,162,138,5,5|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021
-013-3.gat,138,174,15,8|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021
-013-3.gat,146,151,62,54|monster|Bat|1017,20,15000,5000,Mob013-3::On1017
 
 
 013-3.gat,0,0,0|script|Mob013-3|-1,{
@@ -68,11 +62,6 @@ On1012:
     callfunc "MobPoints";
     end;
 
-On1017:
-    set @mobID, 1017;
-    callfunc "MobPoints";
-    end;
-
 On1021:
     set @mobID, 1021;
     callfunc "MobPoints";
@@ -88,10 +77,5 @@ On1024:
     callfunc "MobPoints";
     end;
 
-On1035:
-    set @mobID, 1035;
-    callfunc "MobPoints";
-    end;
-
     end;
 }
diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index 8448133a..a02ed07a 100644
--- a/world/map/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
@@ -28,12 +28,3 @@
 013-3.gat,62,100|warp|To Northern Mine|-1,-1,018-3.gat,174,86
 013-3.gat,68,97|warp|To Northern Mine|-1,-1,018-3.gat,102,70
 013-3.gat,160,103|warp|To Hurnscald Cave|-1,-1,009-3.gat,117,20
-013-3.gat,141,146|warp|To Woodland Hills|-1,-1,017-1.gat,76,33
-013-3.gat,173,131|warp|To Theater Hill|-1,-1,017-1.gat,98,22
-013-3.gat,162,169|warp|To Woodland Hills Labyrinth|-1,-1,017-1.gat,98,30
-013-3.gat,153,126|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,119,147
-013-3.gat,119,148|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,153,127
-013-3.gat,159,152|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,148,161
-013-3.gat,148,160|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,159,151
-013-3.gat,122,170|warp|To Woodland Hills Labyrinth|0,-1,013-3.gat,172,176
-013-3.gat,172,177|warp|To Woodland Hills Cave|1,-1,013-3.gat,122,169
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index 29db314c..d0ce12a7 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -3,6 +3,6 @@
 
 017-1.gat,46,105|warp|To Woodland Hills|2,-1,013-1.gat,45,21
 017-1.gat,43,32|warp|To Theater|-1,-1,017-2.gat,26,30
-017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,141,148
-017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,173,133
-017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,163,168
+017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,51,48
+017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,83,33
+017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,72,67
diff --git a/world/map/npc/017-3/_import.txt b/world/map/npc/017-3/_import.txt
new file mode 100644
index 00000000..22956099
--- /dev/null
+++ b/world/map/npc/017-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 017-3: Woodland Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 017-3.gat
+npc: npc/017-3/_mobs.txt
+npc: npc/017-3/_warps.txt
diff --git a/world/map/npc/017-3/_mobs.txt b/world/map/npc/017-3/_mobs.txt
new file mode 100644
index 00000000..da7b8a06
--- /dev/null
+++ b/world/map/npc/017-3/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Woodland Cave mobs
+
+
+
+017-3.gat,0,0,0|script|Mob017-3|-1,{
+    end;
+}
diff --git a/world/map/npc/017-3/_warps.txt b/world/map/npc/017-3/_warps.txt
new file mode 100644
index 00000000..6089d269
--- /dev/null
+++ b/world/map/npc/017-3/_warps.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Woodland Cave warps
+
+017-3.gat,51,46|warp|To Woodland Hills|-1,-1,017-1.gat,76,33
+017-3.gat,83,31|warp|To Theater Hill|-1,-1,017-1.gat,98,22
+017-3.gat,72,69|warp|To Woodland Hills Labyrinth|-1,-1,017-1.gat,98,30
+017-3.gat,63,26|warp|To Deeper Labyrinth|-1,-1,017-4.gat,52,24
+017-3.gat,29,48|warp|To Deeper Labyrinth|-1,-1,017-4.gat,30,48
+017-3.gat,69,52|warp|To Deeper Labyrinth|-1,-1,017-4.gat,91,27
+017-3.gat,58,60|warp|To Deeper Labyrinth|-1,-1,017-4.gat,83,40
+017-3.gat,32,70|warp|To Deeper Labyrinth|0,-1,017-4.gat,123,27
+017-3.gat,82,77|warp|To Deeper Cave|1,-1,017-4.gat,166,27
diff --git a/world/map/npc/017-4/_import.txt b/world/map/npc/017-4/_import.txt
new file mode 100644
index 00000000..bccded3b
--- /dev/null
+++ b/world/map/npc/017-4/_import.txt
@@ -0,0 +1,5 @@
+// Map 017-4: Hideout
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 017-4.gat
+npc: npc/017-4/_mobs.txt
+npc: npc/017-4/_warps.txt
diff --git a/world/map/npc/017-4/_mobs.txt b/world/map/npc/017-4/_mobs.txt
new file mode 100644
index 00000000..d0afa2fe
--- /dev/null
+++ b/world/map/npc/017-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Hideout mobs
+
+
+
+017-4.gat,0,0,0|script|Mob017-4|-1,{
+    end;
+}
diff --git a/world/map/npc/017-4/_warps.txt b/world/map/npc/017-4/_warps.txt
new file mode 100644
index 00000000..46c24dfa
--- /dev/null
+++ b/world/map/npc/017-4/_warps.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Hideout warps
+
+017-4.gat,201,25|warp|To Labyrinth|-1,-1,017-4.gat,173,46
+017-4.gat,91,26|warp|To Cave|-1,-1,017-3.gat,69,51
+017-4.gat,123,26|warp|To Cave|-1,-1,017-3.gat,32,69
+017-4.gat,166,26|warp|To Cave|-1,-1,017-3.gat,82,76
+017-4.gat,30,47|warp|To Cave|-1,-1,017-3.gat,29,47
+017-4.gat,52,25|warp|To Cave|-1,-1,017-3.gat,63,27
+017-4.gat,83,41|warp|To Cave|-1,-1,017-3.gat,58,61
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 30be69b3..1d86a652 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -40,6 +40,8 @@ import: npc/015-3/_import.txt
 import: npc/016-1/_import.txt
 import: npc/017-1/_import.txt
 import: npc/017-2/_import.txt
+import: npc/017-3/_import.txt
+import: npc/017-4/_import.txt
 import: npc/017-9/_import.txt
 import: npc/018-1/_import.txt
 import: npc/018-2/_import.txt