summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-25 11:44:48 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-25 11:49:14 +0200
commite404455027c4d2a0461da19143fb67864768ed90 (patch)
treed323bbf73a1b75a109b707694d62e97ac982f1e5
parent9ebe97f14fbff7bf0496e2a1a63ca30cd0965d68 (diff)
downloadserverdata-e404455027c4d2a0461da19143fb67864768ed90.tar.gz
serverdata-e404455027c4d2a0461da19143fb67864768ed90.tar.bz2
serverdata-e404455027c4d2a0461da19143fb67864768ed90.tar.xz
serverdata-e404455027c4d2a0461da19143fb67864768ed90.zip
Adding new maps 044-1 and 044-3.
Some changes on other maps related to the new maps. Warp to new maps disabled until release. Converter ran. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/031-3.wlkbin102404 -> 102404 bytes
-rw-r--r--world/map/data/044-1.wlkbin0 -> 45004 bytes
-rw-r--r--world/map/data/044-3.wlkbin0 -> 32004 bytes
-rw-r--r--world/map/data/resnametable.txt2
-rw-r--r--world/map/npc/044-1/_import.txt5
-rw-r--r--world/map/npc/044-1/_mobs.txt8
-rw-r--r--world/map/npc/044-1/_warps.txt13
-rw-r--r--world/map/npc/044-3/_import.txt5
-rw-r--r--world/map/npc/044-3/_mobs.txt8
-rw-r--r--world/map/npc/044-3/_warps.txt12
-rw-r--r--world/map/npc/_import.txt2
12 files changed, 55 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject be28cc4642abe5139bd3cf58a4d7e49dd2020af
+Subproject 493ffd423dd8e88709da6cfa8e9a738a22063b4
diff --git a/world/map/data/031-3.wlk b/world/map/data/031-3.wlk
index 47f4bf64..24df9251 100644
--- a/world/map/data/031-3.wlk
+++ b/world/map/data/031-3.wlk
Binary files differ
diff --git a/world/map/data/044-1.wlk b/world/map/data/044-1.wlk
new file mode 100644
index 00000000..6e38faac
--- /dev/null
+++ b/world/map/data/044-1.wlk
Binary files differ
diff --git a/world/map/data/044-3.wlk b/world/map/data/044-3.wlk
new file mode 100644
index 00000000..0d063360
--- /dev/null
+++ b/world/map/data/044-3.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index a86a624d..33dc179d 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -82,4 +82,6 @@
041-1.gat#041-1.wlk#
042-1.gat#042-1.wlk#
042-2.gat#042-2.wlk#
+044-1.gat#044-1.wlk#
+044-3.gat#044-3.wlk#
botcheck.gat#botcheck.wlk#
diff --git a/world/map/npc/044-1/_import.txt b/world/map/npc/044-1/_import.txt
new file mode 100644
index 00000000..85578d2d
--- /dev/null
+++ b/world/map/npc/044-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 044-1: Snow Hills
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 044-1.gat
+npc: npc/044-1/_mobs.txt
+npc: npc/044-1/_warps.txt
diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt
new file mode 100644
index 00000000..af6fcffe
--- /dev/null
+++ b/world/map/npc/044-1/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow Hills mobs
+
+
+
+044-1.gat,0,0,0|script|Mob044-1|-1,{
+ end;
+}
diff --git a/world/map/npc/044-1/_warps.txt b/world/map/npc/044-1/_warps.txt
new file mode 100644
index 00000000..5bc84dba
--- /dev/null
+++ b/world/map/npc/044-1/_warps.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow Hills warps
+
+044-1.gat,108,165|warp|To Small Cave|-1,-1,044-3.gat,110,102
+044-1.gat,108,156|warp|To Small Cave|-1,-1,044-3.gat,119,94
+044-1.gat,102,111|warp|To Small Cave|-1,-1,044-3.gat,119,58
+044-1.gat,102,107|warp|To Small Cave|-1,-1,044-3.gat,128,45
+044-1.gat,154,92|warp|To Ice Labyrinth|-1,-1,031-3.gat,115,76
+044-1.gat,101,143|warp|To Snow Hills Cave|-1,-1,044-3.gat,126,180
+044-1.gat,37,173|warp|To Snow Hills Cave|-1,-1,044-3.gat,33,175
+044-1.gat,45,73|warp|To Snow Hills Cave|-1,-1,044-3.gat,46,76
+044-1.gat,78,109|warp|To Snow Hills Cave|-1,-1,044-3.gat,35,41
+044-1.gat,83,123|warp|To Snow Hills Cave|-1,-1,044-3.gat,108,165
diff --git a/world/map/npc/044-3/_import.txt b/world/map/npc/044-3/_import.txt
new file mode 100644
index 00000000..3242ba6c
--- /dev/null
+++ b/world/map/npc/044-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 044-3: Snow Hills Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 044-3.gat
+npc: npc/044-3/_mobs.txt
+npc: npc/044-3/_warps.txt
diff --git a/world/map/npc/044-3/_mobs.txt b/world/map/npc/044-3/_mobs.txt
new file mode 100644
index 00000000..cc8b2b9f
--- /dev/null
+++ b/world/map/npc/044-3/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow Hills Cave mobs
+
+
+
+044-3.gat,0,0,0|script|Mob044-3|-1,{
+ end;
+}
diff --git a/world/map/npc/044-3/_warps.txt b/world/map/npc/044-3/_warps.txt
new file mode 100644
index 00000000..763feb7d
--- /dev/null
+++ b/world/map/npc/044-3/_warps.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow Hills Cave warps
+
+044-3.gat,46,74|warp|To Snow Hills|-1,-1,044-1.gat,45,75
+044-3.gat,33,176|warp|To Snow Hills|-1,-1,044-1.gat,37,174
+044-3.gat,126,181|warp|To Snow Hills|-1,-1,044-1.gat,101,144
+044-3.gat,35,42|warp|To Snow Hills|-1,-1,044-1.gat,78,110
+044-3.gat,108,163|warp|To Snow Hills|-1,-1,044-1.gat,83,125
+044-3.gat,110,103|warp|To Snow Hills|-1,-1,044-1.gat,108,166
+044-3.gat,119,95|warp|To Snow Hills|-1,-1,044-1.gat,108,157
+044-3.gat,119,59|warp|To Snow Hills|-1,-1,044-1.gat,102,112
+044-3.gat,128,46|warp|To Snow Hills|-1,-1,044-1.gat,102,108
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 0ca266d1..ee2f07c8 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -81,4 +81,6 @@ import: npc/034-1/_import.txt
import: npc/041-1/_import.txt
import: npc/042-1/_import.txt
import: npc/042-2/_import.txt
+import: npc/044-1/_import.txt
+import: npc/044-3/_import.txt
import: npc/botcheck/_import.txt