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

5 files changed, 30 insertions, 11 deletions

diff --git a/client-data b/client-data
-Subproject 0dbab9653b747f296ba298b0851003f5a413433
+Subproject b70a1ea84cfed191c786ae3cf55fae881f8cd6a
diff --git a/world/map/npc/030-2/avalia.txt b/world/map/npc/030-2/avalia.txt
index 1cb58e37..2b04add5 100644
--- a/world/map/npc/030-2/avalia.txt
+++ b/world/map/npc/030-2/avalia.txt
@@ -49,7 +49,7 @@ L_ListReturn:
     mes "\"I wanted to show Santa and ask to if he knew how to help make it permanent, but Someone didn't approve. Took away our central spell power core. Now all the nutcrackers are back to being mindless automatons. Now the Christmas Sages must use magic to animate them.\"";
     next;
     mes "\"Please you must help me find a way to restore our power core before Christmas. I want to show Santa Millis, so he can give him life permanently for me.\"";
-    mes "\"First I need time to do some more reaserch. Which means I need to spend less time helping with the holidays. Can you check with the helpers and make sure everything is going smoothly.\"";
+    mes "\"First I need time to do some more research. Which means I need to spend less time helping with the holidays. Can you check with the helpers and make sure everything is going smoothly?\"";
     menu
         "Sure.", L_Start;
 
@@ -115,8 +115,8 @@ L_CheckReagents:
     mes "\"Stand back, this spell could backfire.\"";
     next;
     mes "You watch as she puts equal amounts of emerald powder into each of the empty bottles.";
-    mes "She methodically crushes up the shock sweet and speads it amongst the empty bottles.";
-    mes "She posisitions the four bottles in a stand so all the openings are mostly facing each other.";
+    mes "She methodically crushes up the shock sweet and spreads it amongst the empty bottles.";
+    mes "She positions the four bottles in a stand so all the openings are mostly facing each other.";
     mes "She Begins to chant.";
     next;
     mes "[Avalia]";
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index bc7ad575..7a6977e8 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -112,7 +112,6 @@ L_StartBadHard:
     goto L_Start;
 
 L_Start:
-    set $@XmasBattleStatusClone, $@XmasBattleStatus;
     mes "You struggle a little with your task, since the mana battery doesn't seem to fit in as smooth as you expected it.";
     next;
     mes "W00t!";
@@ -122,6 +121,7 @@ L_Start:
     mes "it seems like this will not turn out as planned, Look this Guard of Honour is going crazy!";
     next;
     npctalk "The Guards are out of control!";
+    set $@XmasBattleStatusClone, $@XmasBattleStatus;
     set $@XmasBossRound, 0;
     set $@XmasBossPlayerCount, getmapusers("030-4.gat");
     areamonster "030-4.gat", 20, 21, 40, 40, "", 1114, 1, "AniManOMat::OnGuardDeath";
@@ -213,7 +213,7 @@ L_NextWave:
     //Obliatory Guard Of Honour in the Southern Hallway
     areamonster "030-4.gat", 30, 43, 39, 49, "", 1114, $@GuardAmount, "AniManOMat::OnGuardDeath";
     //CopperSlimes, I love Copper Slimes anywhere anytime
-    areamonster "030-4.gat", 20, 21, 49, 49, "", 1098, rand(2,7), "AniManOMat::All1";
+    areamonster "030-4.gat", 20, 21, 49, 49, "", 1098, rand(2,7), "AniManOMat::OnGuardDeath";
     //IceSkulls for hard mode in room 3 and 4
     if ($@XmasBattleStatus == 2 || $@XmasBattleStatus == 4)
         areamonster "030-4.gat", 20, 32, 28, 39, "", 1085, $@SkullAmount / 2, "AniManOMat::OnGuardDeath";
@@ -252,9 +252,6 @@ OnTick:
     set $@XmasBossPlayerCount, $@XmasBossPlayerCount + 1;
     end;
 
-OnAll1:
-    end;
-
 OnGuardDeath:
     end;
 
@@ -313,7 +310,23 @@ L_EndNice:
     callsub S_ClearVariables;
     end;
 
+OnCommandChamberReset:
+    areatimer "030-4.gat", 0, 0, 50, 50, 10, "AniManOMat::OnReward";
+    set $@XmasBattleStatus, 0;
+    set $@XmasBossPlayerCount, 0;
+    set $@XmasBossRound, 0;
+    set $@BombTimer, 0;
+    set $@GuardAmount, 0;
+    set $@SkullAmount, 0;
+    killmonster "030-4.gat", "AniManOMat::OnGuardDeath";
+    stopnpctimer;
+    setnpctimer 0;
+    goto L_Restart;
+
 OnInit:
+    goto L_Restart;
+
+L_Restart:
     set $@XmasBattleStatus, 0;
     setarray $@XmasBossMes$,
     "", // unused
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;