summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-08-02 17:24:35 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2012-08-02 17:24:35 +0200
commitc2246a792b1354b39b537c1494e54a62aed52470 (patch)
tree422b82ee1dc20c0ce4be536ca4ff903fa2d2731f
parent9f3c45160234e3941ff50d306f1995e7ae066453 (diff)
downloadserverdata-c2246a792b1354b39b537c1494e54a62aed52470.tar.gz
serverdata-c2246a792b1354b39b537c1494e54a62aed52470.tar.bz2
serverdata-c2246a792b1354b39b537c1494e54a62aed52470.tar.xz
serverdata-c2246a792b1354b39b537c1494e54a62aed52470.zip
Run 'make maps' for new maps 009-5 and 009-6.
m---------client-data0
-rw-r--r--world/map/data/009-3.wlkbin30204 -> 30204 bytes
-rw-r--r--world/map/data/009-5.wlkbin0 -> 10004 bytes
-rw-r--r--world/map/data/009-6.wlkbin0 -> 4904 bytes
-rw-r--r--world/map/data/resnametable.txt2
-rw-r--r--world/map/npc/009-5/_import.txt5
-rw-r--r--world/map/npc/009-5/_mobs.txt8
-rw-r--r--world/map/npc/009-5/_warps.txt4
-rw-r--r--world/map/npc/009-6/_import.txt5
-rw-r--r--world/map/npc/009-6/_mobs.txt8
-rw-r--r--world/map/npc/009-6/_warps.txt4
-rw-r--r--world/map/npc/_import.txt2
12 files changed, 38 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject 2900bbe3004fdf86a379a19d9fe1723fe0f0ead
+Subproject 714cc850683ae8620cf08ce5361e0d8893b7261
diff --git a/world/map/data/009-3.wlk b/world/map/data/009-3.wlk
index c5299b5d..a5c2b091 100644
--- a/world/map/data/009-3.wlk
+++ b/world/map/data/009-3.wlk
Binary files differ
diff --git a/world/map/data/009-5.wlk b/world/map/data/009-5.wlk
new file mode 100644
index 00000000..ce3fc759
--- /dev/null
+++ b/world/map/data/009-5.wlk
Binary files differ
diff --git a/world/map/data/009-6.wlk b/world/map/data/009-6.wlk
new file mode 100644
index 00000000..9f62a916
--- /dev/null
+++ b/world/map/data/009-6.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index 6139d30b..d6ea6918 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -20,6 +20,8 @@
009-2.gat#009-2.wlk#
009-3.gat#009-3.wlk#
009-4.gat#009-4.wlk#
+009-5.gat#009-5.wlk#
+009-6.gat#009-6.wlk#
010-1.gat#010-1.wlk#
010-2.gat#010-2.wlk#
011-1.gat#011-1.wlk#
diff --git a/world/map/npc/009-5/_import.txt b/world/map/npc/009-5/_import.txt
new file mode 100644
index 00000000..5d0ebce1
--- /dev/null
+++ b/world/map/npc/009-5/_import.txt
@@ -0,0 +1,5 @@
+// Map 009-5: Last man standing
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 009-5.gat
+npc: npc/009-5/_mobs.txt
+npc: npc/009-5/_warps.txt
diff --git a/world/map/npc/009-5/_mobs.txt b/world/map/npc/009-5/_mobs.txt
new file mode 100644
index 00000000..cce523f3
--- /dev/null
+++ b/world/map/npc/009-5/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Last man standing mobs
+
+
+
+009-5.gat,0,0,0|script|Mob009-5|-1,{
+ end;
+}
diff --git a/world/map/npc/009-5/_warps.txt b/world/map/npc/009-5/_warps.txt
new file mode 100644
index 00000000..5b5634a1
--- /dev/null
+++ b/world/map/npc/009-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Last man standing warps
+
+009-5.gat,53,74|warp|to Hurnscald|1,-1,009-3.gat,162,81
diff --git a/world/map/npc/009-6/_import.txt b/world/map/npc/009-6/_import.txt
new file mode 100644
index 00000000..aa9d3218
--- /dev/null
+++ b/world/map/npc/009-6/_import.txt
@@ -0,0 +1,5 @@
+// Map 009-6: Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 009-6.gat
+npc: npc/009-6/_mobs.txt
+npc: npc/009-6/_warps.txt
diff --git a/world/map/npc/009-6/_mobs.txt b/world/map/npc/009-6/_mobs.txt
new file mode 100644
index 00000000..d97492a3
--- /dev/null
+++ b/world/map/npc/009-6/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Cave mobs
+
+
+
+009-6.gat,0,0,0|script|Mob009-6|-1,{
+ end;
+}
diff --git a/world/map/npc/009-6/_warps.txt b/world/map/npc/009-6/_warps.txt
new file mode 100644
index 00000000..a1f47265
--- /dev/null
+++ b/world/map/npc/009-6/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Cave warps
+
+009-6.gat,36,48|warp|To Hurnscaldcave|-1,-1,009-3.gat,162,82
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 1d86a652..eebe2a40 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -21,6 +21,8 @@ import: npc/009-1/_import.txt
import: npc/009-2/_import.txt
import: npc/009-3/_import.txt
import: npc/009-4/_import.txt
+import: npc/009-5/_import.txt
+import: npc/009-6/_import.txt
import: npc/010-1/_import.txt
import: npc/010-2/_import.txt
import: npc/011-1/_import.txt