summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-12-09 11:33:23 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-12-09 11:33:23 +0100
commitb8b9efc2edbe96e34564e34c28f8a99edec92a63 (patch)
tree2d1eaa59c2d2d1fdb7b30f44dc3f612284937ad2 /world/map/npc
parentb6d55a492b58f6d57e6f94eaacab98cb1e0e97fe (diff)
downloadserverdata-b8b9efc2edbe96e34564e34c28f8a99edec92a63.tar.gz
serverdata-b8b9efc2edbe96e34564e34c28f8a99edec92a63.tar.bz2
serverdata-b8b9efc2edbe96e34564e34c28f8a99edec92a63.tar.xz
serverdata-b8b9efc2edbe96e34564e34c28f8a99edec92a63.zip
Christmas Event: some fixesv2011.12.10
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/xmas/2011/deliverPresentsHelper.txt2
-rw-r--r--world/map/npc/xmas/2011/doll.txt4
-rw-r--r--world/map/npc/xmas/2011/entranceHelpers.txt1
3 files changed, 3 insertions, 4 deletions
diff --git a/world/map/npc/xmas/2011/deliverPresentsHelper.txt b/world/map/npc/xmas/2011/deliverPresentsHelper.txt
index 5e9ed56d..62949cf7 100644
--- a/world/map/npc/xmas/2011/deliverPresentsHelper.txt
+++ b/world/map/npc/xmas/2011/deliverPresentsHelper.txt
@@ -77,7 +77,7 @@ L_NoStickReinbooBox:
set @choices_nr, @choices_nr + 1;
L_NoBall:
- if (@stickreinboo != 4)
+ if (@ball != 4)
goto L_NoBallBox;
set @choice_idx[@choices_nr], @C_ballbox;
set @choice$[@choices_nr], "I already packed this Leather Ball...";
diff --git a/world/map/npc/xmas/2011/doll.txt b/world/map/npc/xmas/2011/doll.txt
index 180f93f4..a737d963 100644
--- a/world/map/npc/xmas/2011/doll.txt
+++ b/world/map/npc/xmas/2011/doll.txt
@@ -99,11 +99,11 @@ L_Doll:
menu
"Here it is.",-,
"I don't have it yet.",L_Close;
- if ((countitem("CottonCloth") < @cotton_amount) || (countitem("LightBlueDye") < @dye_amount) || (countitem("HardSpike") < @spikes_amount))
+ if ((countitem("CottonCloth") < @cotton_amount) || (countitem("LightBlueDye") < @dye_amount) || (countitem("HardSpike") < @spike_amount))
goto L_NoItems;
delitem "CottonCloth", @cotton_amount;
delitem "LightBlueDye", @dye_amount;
- delitem "HardSpike", @spikes_amount;
+ delitem "HardSpike", @spike_amount;
set @doll, 3;
callsub S_Update_Var;
getitem "Doll", 1;
diff --git a/world/map/npc/xmas/2011/entranceHelpers.txt b/world/map/npc/xmas/2011/entranceHelpers.txt
index d698bd1a..99a501db 100644
--- a/world/map/npc/xmas/2011/entranceHelpers.txt
+++ b/world/map/npc/xmas/2011/entranceHelpers.txt
@@ -58,7 +58,6 @@ L_Close:
L_RewardTime:
mes "[Valterri]";
mes "\"Welcome to Santa's house.";
- next;
mes "We just finished the Christmas rush.\"";
goto L_Close;