summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2013-12-31 10:58:45 -0600
committerwushin <pasekei@gmail.com>2013-12-31 16:42:08 -0600
commitda0efec8cbc3fb2892dacf91435f67a75b5818c4 (patch)
tree5d96828eab5ee02573ff02bec8ff8de6163ece90 /world/map/npc/annuals
parent030ec3b59b42c45b90a25fac81a6e6d87b2ac8a5 (diff)
downloadserverdata-da0efec8cbc3fb2892dacf91435f67a75b5818c4.tar.gz
serverdata-da0efec8cbc3fb2892dacf91435f67a75b5818c4.tar.bz2
serverdata-da0efec8cbc3fb2892dacf91435f67a75b5818c4.tar.xz
serverdata-da0efec8cbc3fb2892dacf91435f67a75b5818c4.zip
Xmas Battle Chamber Resetv2013.12.31
Text corrections for Avalia Fixed bug in partly setting Xmas Chamber battle Fixed year end reward from being too generous
Diffstat (limited to 'world/map/npc/annuals')
-rw-r--r--world/map/npc/annuals/xmas/core.txt6
-rw-r--r--world/map/npc/annuals/xmas/debug.txt6
2 files changed, 9 insertions, 3 deletions
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index 8d1960d1..41ec2ce5 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -127,7 +127,7 @@ L_SetRewardBonus:
set @xmas_reward_tally, (@xmas_reward_tally + $@xmas_reward_all_lists);
//formula should:
if (@xmas_reward_tally > 5)
- set @xmas_reward_lower_bound, 2 * @xmas_reward_tally - rand(5);
+ set @xmas_reward_lower_bound, 2 * @xmas_reward_tally - rand(5);
if (@xmas_reward_tally <= 5)
set @xmas_reward_lower_bound, @xmas_reward_tally;
set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((readparam(bLuk)) / 5);
@@ -198,9 +198,9 @@ L_FinalGift:
if(checkweight("Iten", 1) == 0)
goto L_FullInv;
if(@xmas_reward >= 80)
- getitem @xmas_reward_item$, 1;
+ getitem @xmas_reward_item$, 1;
if(@xmas_reward >= 40)
- getitem @xmas_reward_item1$, 1;
+ getitem @xmas_reward_item1$, 1;
getitem @xmas_reward_item2$, 1;
set @xmas_uncommon_slot1, 0;
set @xmas_uncommon_slot2, 0;
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index 0153037b..6bc0f0c2 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -13,6 +13,7 @@ L_Live:
menu
"Debug Vars", L_DebugLive,
"Xmas Time Key Change.", L_XmasTimeKey,
+ "Reset Xmas Chamber.", L_XmasChamberReset,
"Do nothing.", L_Close;
L_DebugLive:
@@ -36,6 +37,7 @@ L_Debug:
"Reset Quest State.", L_Reset,
"Set Old Event Flag.", L_LastReset,
"Xmas Time Key Change.", L_XmasTimeKey,
+ "Reset Xmas Chamber.", L_XmasChamberReset,
"Do nothing.", L_Close;
L_DebugVars:
@@ -129,6 +131,10 @@ L_SetNewKey:
cmdothernpc "#XmasConfig", "RestartQuest";
goto L_Close;
+L_XmasChamberReset:
+ cmdothernpc "AniManOMat", "ChamberReset";
+ goto L_Close;
+
L_XmasState:
mes "Quest state?";
input @xmas_state;