summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authortux9th <mr.x@aon.at>2013-06-07 18:04:32 +0200
committertux9th <mr.x@aon.at>2013-06-07 18:04:32 +0200
commit5197641f55377872b8799c92c05793423aeab041 (patch)
tree48fed5a0587c7e2e41121282011953606e25b77d /world
parent8a6705d4f3d2d94d28f20e567689b12c199c8007 (diff)
downloadserverdata-5197641f55377872b8799c92c05793423aeab041.tar.gz
serverdata-5197641f55377872b8799c92c05793423aeab041.tar.bz2
serverdata-5197641f55377872b8799c92c05793423aeab041.tar.xz
serverdata-5197641f55377872b8799c92c05793423aeab041.zip
run 'make maps' for client-data changes.
update submodule pointer for client-data.
Diffstat (limited to 'world')
-rw-r--r--world/map/data/021-1.wlkbin29908 -> 29908 bytes
-rw-r--r--world/map/data/021-2.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/npc/021-1/_warps.txt16
-rw-r--r--world/map/npc/021-2/_warps.txt12
4 files changed, 14 insertions, 14 deletions
diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk
index 5abd6a7d..2e18e65f 100644
--- a/world/map/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
Binary files differ
diff --git a/world/map/data/021-2.wlk b/world/map/data/021-2.wlk
index ba8feff6..82581b05 100644
--- a/world/map/data/021-2.wlk
+++ b/world/map/data/021-2.wlk
Binary files differ
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 99134134..618c057a 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -7,14 +7,14 @@
021-1.gat,55,134|warp|To Government Building|-1,-1,021-2.gat,33,29
021-1.gat,57,134|warp|To Government Building|-1,-1,021-2.gat,39,29
021-1.gat,103,100|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
-021-1.gat,103,96|warp|toBakery|-1,-1,021-2.gat,122,23
+021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23
021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
-021-1.gat,53,99|warp|To Tulimshar Forge|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|To Tulimshar Forge|-1,-1,021-2.gat,23,98
+021-1.gat,53,99|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
+021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,23,98
021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
-021-1.gat,43,110|warp|to Store|-1,-1,021-2.gat,28,129
-021-1.gat,132,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,79,138
-021-1.gat,133,24|warp|to Tulimshar Forge|-1,-1,021-2.gat,75,91
-021-1.gat,125,27|warp|to Tulimshar Forge|-1,-1,021-2.gat,124,67
-021-1.gat,125,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,72,138
+021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129
+021-1.gat,132,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
+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
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index 9e910208..4614f970 100644
--- a/world/map/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
@@ -12,12 +12,12 @@
021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96
021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54
-021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111
-021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111
+021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
+021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125
021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95
-021-2.gat,79,139|warp|to Outside|-1,-1,021-1.gat,132,32
-021-2.gat,72,139|warp|to Outside|-1,-1,021-1.gat,125,32
-021-2.gat,124,69|warp|to Outside|1,-1,021-1.gat,126,28
-021-2.gat,75,93|warp|to Outside|-1,-1,021-1.gat,132,25
+021-2.gat,79,139|warp|To Outside|-1,-1,021-1.gat,132,32
+021-2.gat,72,139|warp|To Outside|-1,-1,021-1.gat,125,32
+021-2.gat,124,69|warp|To Outside|-1,-1,021-1.gat,125,28
+021-2.gat,75,93|warp|To Outside|-1,-1,021-1.gat,133,25
021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135