summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-09-24 21:32:23 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2012-09-24 21:32:23 +0200
commitbf534bd59be8ff7fdfa3446b2741e0fb9d182e1c (patch)
treebd7159de7e471b4bcfa4c6794f487cf21c0830ee
parent6a89b2729b0493dab8143cdb9874afc3f170b318 (diff)
downloadserverdata-bf534bd59be8ff7fdfa3446b2741e0fb9d182e1c.tar.gz
serverdata-bf534bd59be8ff7fdfa3446b2741e0fb9d182e1c.tar.bz2
serverdata-bf534bd59be8ff7fdfa3446b2741e0fb9d182e1c.tar.xz
serverdata-bf534bd59be8ff7fdfa3446b2741e0fb9d182e1c.zip
Run 'make maps' for several map changes.
m---------client-data0
-rw-r--r--world/map/data/010-1.wlkbin18004 -> 18004 bytes
-rw-r--r--world/map/data/011-1.wlkbin19100 -> 19100 bytes
-rw-r--r--world/map/data/012-1.wlkbin31588 -> 31588 bytes
-rw-r--r--world/map/data/013-1.wlkbin19100 -> 19100 bytes
-rw-r--r--world/map/data/014-1.wlkbin16804 -> 16804 bytes
-rw-r--r--world/map/data/015-1.wlkbin16804 -> 16804 bytes
-rw-r--r--world/map/data/017-1.wlkbin19100 -> 19100 bytes
-rw-r--r--world/map/data/027-1.wlkbin18004 -> 18004 bytes
-rw-r--r--world/map/data/055-1.wlkbin21084 -> 21084 bytes
-rw-r--r--world/map/data/056-1.wlkbin11256 -> 11256 bytes
-rw-r--r--world/map/npc/017-1/_warps.txt2
-rw-r--r--world/map/npc/055-1/_mobs.txt6
-rw-r--r--world/map/npc/055-1/_warps.txt2
14 files changed, 5 insertions, 5 deletions
diff --git a/client-data b/client-data
-Subproject d6dc7c61a736113f7f05282a511ea03cc6f7286
+Subproject f3b23e88b7865e2c2c5789f49e96d8db790a1a2
diff --git a/world/map/data/010-1.wlk b/world/map/data/010-1.wlk
index 7002bfce..e87cfc56 100644
--- a/world/map/data/010-1.wlk
+++ b/world/map/data/010-1.wlk
Binary files differ
diff --git a/world/map/data/011-1.wlk b/world/map/data/011-1.wlk
index 481da3ea..b3089609 100644
--- a/world/map/data/011-1.wlk
+++ b/world/map/data/011-1.wlk
Binary files differ
diff --git a/world/map/data/012-1.wlk b/world/map/data/012-1.wlk
index 43ddf171..6008bfcd 100644
--- a/world/map/data/012-1.wlk
+++ b/world/map/data/012-1.wlk
Binary files differ
diff --git a/world/map/data/013-1.wlk b/world/map/data/013-1.wlk
index 6d5b36aa..52d4ea40 100644
--- a/world/map/data/013-1.wlk
+++ b/world/map/data/013-1.wlk
Binary files differ
diff --git a/world/map/data/014-1.wlk b/world/map/data/014-1.wlk
index 89c28768..9d1a55ee 100644
--- a/world/map/data/014-1.wlk
+++ b/world/map/data/014-1.wlk
Binary files differ
diff --git a/world/map/data/015-1.wlk b/world/map/data/015-1.wlk
index 792caa30..3d6b56ec 100644
--- a/world/map/data/015-1.wlk
+++ b/world/map/data/015-1.wlk
Binary files differ
diff --git a/world/map/data/017-1.wlk b/world/map/data/017-1.wlk
index 0b4029c9..831e0f18 100644
--- a/world/map/data/017-1.wlk
+++ b/world/map/data/017-1.wlk
Binary files differ
diff --git a/world/map/data/027-1.wlk b/world/map/data/027-1.wlk
index 435168cc..5fa6dcf6 100644
--- a/world/map/data/027-1.wlk
+++ b/world/map/data/027-1.wlk
Binary files differ
diff --git a/world/map/data/055-1.wlk b/world/map/data/055-1.wlk
index 5c4ace3f..bb913cd4 100644
--- a/world/map/data/055-1.wlk
+++ b/world/map/data/055-1.wlk
Binary files differ
diff --git a/world/map/data/056-1.wlk b/world/map/data/056-1.wlk
index 9ccf9311..6b70c0dc 100644
--- a/world/map/data/056-1.wlk
+++ b/world/map/data/056-1.wlk
Binary files differ
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index 8bcb722d..8c53fba4 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -6,4 +6,4 @@
017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,51,48
017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,83,33
017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,017-3.gat,72,67
-017-1.gat,135,56|warp|to Woods|-1,1,056-1.gat,24,29
+017-1.gat,135,56|warp|to Woods|-1,1,056-1.gat,24,28
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index b0320021..1ffa3243 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -3,8 +3,8 @@
055-1.gat,68,72,22,19|monster|Spawn Butterfly|1055,16,10000,85000,Mob055-1::On1055
055-1.gat,87,29,55,14|monster|Spawn Silk Worm|1035,15,10000,85000,Mob055-1::On1035
-055-1.gat,79,30,84,17|monster|Spawn Silk Worm|1038,10,10000,45000,Mob055-1::On1038
-055-1.gat,0,0,0,0|monster|Spawn Mouboo|1028,12,10000,85000,Mob055-1::On1028
+055-1.gat,79,30,84,17|monster|Spawn Squirrel|1038,10,10000,45000,Mob055-1::On1038
+055-1.gat,0,0,0,0|monster|Spawn Mouboo|1028,15,10000,85000,Mob055-1::On1028
055-1.gat,91,49,6,4|monster|Spawn Clover Patch|1037,1,10000,180000,Mob055-1::On1037
055-1.gat,103,54,5,3|monster|Spawn Clover Patch|1037,1,10000,180000,Mob055-1::On1037
055-1.gat,64,75,27,16|monster|Spawn Clover Patch|1037,1,10000,120000,Mob055-1::On1037
@@ -17,7 +17,7 @@
055-1.gat,116,60,4,2|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
055-1.gat,97,60,4,2|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
055-1.gat,64,73,23,17|monster|Spawn Pink Flower|1014,1,10000,45000,Mob055-1::On1014
-055-1.gat,0,0,0,0|monster|Spawn Spikey Mushroom|1019,5,10000,60000,Mob055-1::On1019
+055-1.gat,0,0,0,0|monster|Spawn Spikey Mushroom|1019,7,10000,60000,Mob055-1::On1019
055-1.gat,0,0,0|script|Mob055-1|-1,{
diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt
index d12f3bd4..942743e2 100644
--- a/world/map/npc/055-1/_warps.txt
+++ b/world/map/npc/055-1/_warps.txt
@@ -3,7 +3,7 @@
055-1.gat,100,82|warp|To Cave|-1,-1,055-3.gat,30,27
055-1.gat,100,89|warp|To Cave|-1,-1,055-3.gat,50,41
-055-1.gat,24,52|warp|To Woodland Hills|-1,3,013-1.gat,135,51
+055-1.gat,22,52|warp|To Woodland Hills|-1,2,013-1.gat,135,51
055-1.gat,137,96|warp|To Cave|-1,-1,055-3.gat,76,39
055-1.gat,60,93|warp|To Cave|-1,-1,055-3.gat,96,70
055-1.gat,75,20|warp|To Woods|0,-1,056-1.gat,74,75