summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-06-25 17:06:08 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-25 17:06:08 +0200
commitd581987b1145cd7f0c9704ad10a526f03c87debc (patch)
tree819ec685954ad9cdcfabe36f409a0fe6e52f0b86 /world/map
parent8f99da1d21146ea7611949a7de66054d5551cda8 (diff)
downloadserverdata-d581987b1145cd7f0c9704ad10a526f03c87debc.tar.gz
serverdata-d581987b1145cd7f0c9704ad10a526f03c87debc.tar.bz2
serverdata-d581987b1145cd7f0c9704ad10a526f03c87debc.tar.xz
serverdata-d581987b1145cd7f0c9704ad10a526f03c87debc.zip
Run 'make maps' for map changes and update submodule pointer.
Diffstat (limited to 'world/map')
-rw-r--r--world/map/data/021-3.wlkbin29908 -> 29908 bytes
-rw-r--r--world/map/npc/021-1/_import.txt3
-rw-r--r--world/map/npc/021-1/_warps.txt3
-rw-r--r--world/map/npc/021-3/_warps.txt6
4 files changed, 6 insertions, 6 deletions
diff --git a/world/map/data/021-3.wlk b/world/map/data/021-3.wlk
index ed3b7476..663cfbd4 100644
--- a/world/map/data/021-3.wlk
+++ b/world/map/data/021-3.wlk
Binary files differ
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 9fa30a77..eda5518c 100644
--- a/world/map/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
@@ -14,5 +14,8 @@ npc: npc/021-1/inac.txt
npc: npc/021-1/mapflags.txt
npc: npc/021-1/north_shops.txt
npc: npc/021-1/npcs.txt
+npc: npc/021-1/sewer_east.txt
+npc: npc/021-1/sewer_north.txt
+npc: npc/021-1/sewer_west.txt
npc: npc/021-1/weellos.txt
npc: npc/021-1/workers.txt
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 6fa8ddc0..618c057a 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -18,6 +18,3 @@
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/_warps.txt b/world/map/npc/021-3/_warps.txt
index bf25a15b..192f6c95 100644
--- a/world/map/npc/021-3/_warps.txt
+++ b/world/map/npc/021-3/_warps.txt
@@ -1,6 +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
+021-3.gat,143,127|warp|To Central Tulimshar|-1,-1,021-1.gat,147,137
+021-3.gat,125,33|warp|To Central Tulimshar|-1,-1,021-1.gat,124,39
+021-3.gat,57,99|warp|To Central Tulimshar|-1,-1,021-1.gat,50,105