From 22ba2aba6568eca4f2ef731fe841d1a646969ba6 Mon Sep 17 00:00:00 2001 From: CandyCurt Date: Sat, 28 Dec 2013 14:24:12 +0100 Subject: Fix Christmas Annual --- world/map/npc/annuals/xmas/config.txt | 2 +- world/map/npc/annuals/xmas/core.txt | 1 + world/map/npc/annuals/xmas/list.txt | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'world/map/npc/annuals/xmas') diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index d723073f..caf4ad77 100644 --- a/world/map/npc/annuals/xmas/config.txt +++ b/world/map/npc/annuals/xmas/config.txt @@ -20,7 +20,7 @@ // 13: 021-1.gat,155,25,0|script|Ghada|265 // 14: 025-1.gat,80,88,0|script|Rossy|114 // 15: 001-2.gat,76,59,0|script|Kadiya|174 -// Helper Bits +// Helper Bit // 16: Bedding End // 17: Bedding Starts // 18: Glitter End diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt index f8454088..8d1960d1 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -160,6 +160,7 @@ L_LevelingReward: L_XmasLevel: gmcommand "@blvl 1"; + gmcommand "@l I was a good kid this year."; return; L_XmasExp: diff --git a/world/map/npc/annuals/xmas/list.txt b/world/map/npc/annuals/xmas/list.txt index a03db395..c6adf4b6 100644 --- a/world/map/npc/annuals/xmas/list.txt +++ b/world/map/npc/annuals/xmas/list.txt @@ -55,7 +55,7 @@ function|script|XmasList|, goto L_Return; L_QuestTime: - if(XMASTIME & $@xmas_child_list[$@child_number]) + if(XMASTIME & $@xmas_child_list[@child_number]) goto L_Return; goto L_GetList; @@ -65,11 +65,11 @@ L_GetList: "Oh sorry, what were you going to say?", L_Return; L_List: - mes "[" + $@xmas_child_list_name$[$@child_number] + "]"; + mes "[" + $@xmas_child_list_name$[@child_number] + "]"; mes "Here is my list. Make sure it gets delivered, please!"; next; - mes "You store " + $@xmas_child_list_name$[$@child_number] + "'s wish list carefully in a hidden pocket of your backpack."; - set XMASTIME, XMASTIME | $@xmas_child_list[$@child_number]; + mes "You store " + $@xmas_child_list_name$[@child_number] + "'s wish list carefully in a hidden pocket of your backpack."; + set XMASTIME, XMASTIME | $@xmas_child_list[@child_number]; callfunc "XmasXpReward"; menu "I really should be going.", L_Return; -- cgit v1.2.3-60-g2f50