From cf071d9846890a24d8d462f82da9b6d0f96d8fd2 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Fri, 17 May 2013 21:43:03 +0200
Subject: Run make maps to add 034-2. Submodule pointer updated.

---
 client-data                     |   2 +-
 world/map/data/034-2.wlk        | Bin 0 -> 5004 bytes
 world/map/data/resnametable.txt |   1 +
 world/map/npc/034-1/_warps.txt  |   2 ++
 world/map/npc/034-2/_import.txt |   5 +++++
 world/map/npc/034-2/_mobs.txt   |   8 ++++++++
 world/map/npc/034-2/_warps.txt  |   6 ++++++
 world/map/npc/_import.txt       |   1 +
 8 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 world/map/data/034-2.wlk
 create mode 100644 world/map/npc/034-2/_import.txt
 create mode 100644 world/map/npc/034-2/_mobs.txt
 create mode 100644 world/map/npc/034-2/_warps.txt

diff --git a/client-data b/client-data
index 8d9264bc..85e0d215 160000
--- a/client-data
+++ b/client-data
@@ -1 +1 @@
-Subproject commit 8d9264bcae8835e2ea0bc0dd1d429fb04d4dee63
+Subproject commit 85e0d215065bd09a39e88ee7a46620c748a23e81
diff --git a/world/map/data/034-2.wlk b/world/map/data/034-2.wlk
new file mode 100644
index 00000000..d5da4d31
Binary files /dev/null and b/world/map/data/034-2.wlk differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index a865b707..13e5ff4a 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -84,6 +84,7 @@
 032-3.gat#032-3.wlk#
 033-1.gat#033-1.wlk#
 034-1.gat#034-1.wlk#
+034-2.gat#034-2.wlk#
 041-1.gat#041-1.wlk#
 042-1.gat#042-1.wlk#
 042-2.gat#042-2.wlk#
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 9c0acf36..be29b7b1 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -5,3 +5,5 @@
 034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133
 034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59
 034-1.gat,95,18|warp|ToHighlands1|0,-1,046-1.gat,95,116
+034-1.gat,31,68|warp|To Trapper|-1,-1,034-2.gat,28,31
+034-1.gat,64,99|warp|To Cabin|-1,-1,034-2.gat,73,29
diff --git a/world/map/npc/034-2/_import.txt b/world/map/npc/034-2/_import.txt
new file mode 100644
index 00000000..07dfa138
--- /dev/null
+++ b/world/map/npc/034-2/_import.txt
@@ -0,0 +1,5 @@
+// Map 034-2: Trappers Huts
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 034-2.gat
+npc: npc/034-2/_mobs.txt
+npc: npc/034-2/_warps.txt
diff --git a/world/map/npc/034-2/_mobs.txt b/world/map/npc/034-2/_mobs.txt
new file mode 100644
index 00000000..9cabee2a
--- /dev/null
+++ b/world/map/npc/034-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Trappers Huts mobs
+
+
+
+034-2.gat,0,0,0|script|Mob034-2|-1,{
+    end;
+}
diff --git a/world/map/npc/034-2/_warps.txt b/world/map/npc/034-2/_warps.txt
new file mode 100644
index 00000000..2e840d68
--- /dev/null
+++ b/world/map/npc/034-2/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Trappers Huts warps
+
+034-2.gat,28,32|warp|To Outside|-1,-1,034-1.gat,31,69
+034-2.gat,73,30|warp|To Outside|-1,-1,034-1.gat,64,100
+034-2.gat,30,33|warp|To Outside|-1,-1,034-1.gat,31,69
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index c16ab26e..05d7791e 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -83,6 +83,7 @@ import: npc/032-1/_import.txt
 import: npc/032-3/_import.txt
 import: npc/033-1/_import.txt
 import: npc/034-1/_import.txt
+import: npc/034-2/_import.txt
 import: npc/041-1/_import.txt
 import: npc/042-1/_import.txt
 import: npc/042-2/_import.txt
-- 
cgit v1.2.3-60-g2f50