summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-12-20 17:55:13 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-12-20 17:55:13 +0100
commitf68508302fa805965779878e403d1528424898b1 (patch)
tree54fac0497dc76bc02e781009366e8285d26e77be /world/map
parent3840aa9113ba8dd505230da162a156a616019f75 (diff)
downloadserverdata-f68508302fa805965779878e403d1528424898b1.tar.gz
serverdata-f68508302fa805965779878e403d1528424898b1.tar.bz2
serverdata-f68508302fa805965779878e403d1528424898b1.tar.xz
serverdata-f68508302fa805965779878e403d1528424898b1.zip
Client-data: Submodule pointer updated.
Map fixes including collision, new graphics added and some graphics added.
Diffstat (limited to 'world/map')
-rw-r--r--world/map/data/005-3.wlkbin13924 -> 13924 bytes
-rw-r--r--world/map/data/006-3.wlkbin22504 -> 22504 bytes
-rw-r--r--world/map/data/030-1.wlkbin17668 -> 17668 bytes
-rw-r--r--world/map/data/045-1.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/npc/xmas/2011/badguy.txt2
5 files changed, 1 insertions, 1 deletions
diff --git a/world/map/data/005-3.wlk b/world/map/data/005-3.wlk
index 3e0a2d0a..46b38e57 100644
--- a/world/map/data/005-3.wlk
+++ b/world/map/data/005-3.wlk
Binary files differ
diff --git a/world/map/data/006-3.wlk b/world/map/data/006-3.wlk
index beb50f81..7b269208 100644
--- a/world/map/data/006-3.wlk
+++ b/world/map/data/006-3.wlk
Binary files differ
diff --git a/world/map/data/030-1.wlk b/world/map/data/030-1.wlk
index b50bdc0b..3491b6a7 100644
--- a/world/map/data/030-1.wlk
+++ b/world/map/data/030-1.wlk
Binary files differ
diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk
index 24f006d3..f48c4ee3 100644
--- a/world/map/data/045-1.wlk
+++ b/world/map/data/045-1.wlk
Binary files differ
diff --git a/world/map/npc/xmas/2011/badguy.txt b/world/map/npc/xmas/2011/badguy.txt
index 3827e043..6663c904 100644
--- a/world/map/npc/xmas/2011/badguy.txt
+++ b/world/map/npc/xmas/2011/badguy.txt
@@ -3,7 +3,7 @@
// Balthasar is sent by Santa's antagonist to sabotage the preparations for Christmas
// gives rewards depending on how much the player helped to sabotage
-030-2.gat,100,31,0|script|Balthasar|336,{
+030-2.gat,100,31,0|script|Balthasar|251,{
if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)
&& !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day))