summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-14 15:28:44 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-14 15:28:44 +0200
commit7e60b8c07a12da0305c120a8765b0b07ce31c9eb (patch)
tree2ad59ab72d38ec9baf051bdeeca246a5ea37e472
parentb6dc708146c3926627df405da13a352372ba10db (diff)
downloadserverdata-7e60b8c07a12da0305c120a8765b0b07ce31c9eb.tar.gz
serverdata-7e60b8c07a12da0305c120a8765b0b07ce31c9eb.tar.bz2
serverdata-7e60b8c07a12da0305c120a8765b0b07ce31c9eb.tar.xz
serverdata-7e60b8c07a12da0305c120a8765b0b07ce31c9eb.zip
Client-data: some fixes and changes on several snow maps.
Converter ran. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/019-1.wlkbin17668 -> 17668 bytes
-rw-r--r--world/map/data/020-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/data/030-1.wlkbin17668 -> 17668 bytes
-rw-r--r--world/map/data/031-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/data/031-3.wlkbin102404 -> 102404 bytes
-rw-r--r--world/map/data/034-1.wlkbin22788 -> 22788 bytes
-rw-r--r--world/map/npc/030-1/_import.txt2
-rw-r--r--world/map/npc/030-1/_mobs.txt2
-rw-r--r--world/map/npc/030-1/_warps.txt2
-rw-r--r--world/map/npc/031-3/_mobs.txt3
-rw-r--r--world/map/npc/031-3/_warps.txt2
12 files changed, 8 insertions, 3 deletions
diff --git a/client-data b/client-data
-Subproject b5c5b7669a834a347566af6195cbcef02b92db9
+Subproject 134b4b6b66d61bbb5c5551859c2d4e6a28b2c3b
diff --git a/world/map/data/019-1.wlk b/world/map/data/019-1.wlk
index 84075288..a2b11b9d 100644
--- a/world/map/data/019-1.wlk
+++ b/world/map/data/019-1.wlk
Binary files differ
diff --git a/world/map/data/020-1.wlk b/world/map/data/020-1.wlk
index 5dfb5160..a7d49cef 100644
--- a/world/map/data/020-1.wlk
+++ b/world/map/data/020-1.wlk
Binary files differ
diff --git a/world/map/data/030-1.wlk b/world/map/data/030-1.wlk
index 237bdb3c..a48a4950 100644
--- a/world/map/data/030-1.wlk
+++ b/world/map/data/030-1.wlk
Binary files differ
diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk
index c914af1f..d5ec5606 100644
--- a/world/map/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
Binary files differ
diff --git a/world/map/data/031-3.wlk b/world/map/data/031-3.wlk
index 12d1844d..47f4bf64 100644
--- a/world/map/data/031-3.wlk
+++ b/world/map/data/031-3.wlk
Binary files differ
diff --git a/world/map/data/034-1.wlk b/world/map/data/034-1.wlk
index 755435de..df7ce753 100644
--- a/world/map/data/034-1.wlk
+++ b/world/map/data/034-1.wlk
Binary files differ
diff --git a/world/map/npc/030-1/_import.txt b/world/map/npc/030-1/_import.txt
index 8f8daae4..81188a00 100644
--- a/world/map/npc/030-1/_import.txt
+++ b/world/map/npc/030-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 030-1: Snow Field
+// Map 030-1: Romantic Place
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 030-1.gat
npc: npc/030-1/_mobs.txt
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index 750bf7e5..c673289c 100644
--- a/world/map/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Field mobs
+// Romantic Place mobs
030-1.gat,0,0,0,0|monster|Santa Slime|1015,5,100000,30000,Mob030-1::On1015
030-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob030-1::On1038
diff --git a/world/map/npc/030-1/_warps.txt b/world/map/npc/030-1/_warps.txt
index 937c545c..d5a7e8c7 100644
--- a/world/map/npc/030-1/_warps.txt
+++ b/world/map/npc/030-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Field warps
+// Romantic Place warps
030-1.gat,61,27|warp|To Snow Field|2,-1,019-1.gat,61,101
030-1.gat,109,29|warp|To Snow Field|-1,-1,019-1.gat,109,103
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index 5815a10d..d9a9583a 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -61,6 +61,9 @@
031-3.gat,217,37,66,43|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
031-3.gat,39,52,64,56|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
031-3.gat,38,277,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,119,51,39,64|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
+031-3.gat,119,50,57,51|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,120,79,20,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
031-3.gat,0,0,0|script|Mob031-3|-1,{
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index 14a0f28b..ad930e89 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -48,3 +48,5 @@
031-3.gat,128,135|warp|To Ice Labyrinth|-1,-1,031-3.gat,148,151
031-3.gat,232,93|warp|To Ice Labyrinth|-1,-1,031-3.gat,234,26
031-3.gat,234,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,232,92
+031-3.gat,200,50|warp|To Ice Labyrinth|-1,-1,031-3.gat,136,30
+031-3.gat,136,29|warp|To Ice Labyrinth|-1,-1,031-3.gat,200,49