From f68508302fa805965779878e403d1528424898b1 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Tue, 20 Dec 2011 17:55:13 +0100
Subject: Client-data: Submodule pointer updated.

Map fixes including collision, new graphics added and some graphics added.
---
 client-data                        |   2 +-
 world/map/data/005-3.wlk           | Bin 13924 -> 13924 bytes
 world/map/data/006-3.wlk           | Bin 22504 -> 22504 bytes
 world/map/data/030-1.wlk           | Bin 17668 -> 17668 bytes
 world/map/data/045-1.wlk           | Bin 40004 -> 40004 bytes
 world/map/npc/xmas/2011/badguy.txt |   2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-data b/client-data
index 49628a31..cdeb451f 160000
--- a/client-data
+++ b/client-data
@@ -1 +1 @@
-Subproject commit 49628a319bfb1cc1952c871a80dc3d1396331db7
+Subproject commit cdeb451f518aa69e4f4c6ac34283017c2203be4a
diff --git a/world/map/data/005-3.wlk b/world/map/data/005-3.wlk
index 3e0a2d0a..46b38e57 100644
Binary files a/world/map/data/005-3.wlk and b/world/map/data/005-3.wlk differ
diff --git a/world/map/data/006-3.wlk b/world/map/data/006-3.wlk
index beb50f81..7b269208 100644
Binary files a/world/map/data/006-3.wlk and b/world/map/data/006-3.wlk differ
diff --git a/world/map/data/030-1.wlk b/world/map/data/030-1.wlk
index b50bdc0b..3491b6a7 100644
Binary files a/world/map/data/030-1.wlk and b/world/map/data/030-1.wlk differ
diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk
index 24f006d3..f48c4ee3 100644
Binary files a/world/map/data/045-1.wlk and b/world/map/data/045-1.wlk 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))
-- 
cgit v1.2.3-60-g2f50