Halloween 2020 Bugfix Patchv2020.09.30

Add Halloween 2020 drops. Update news. Submodule update.
Allow runners to receive EXP share at DD5. Use Ledmitz SFX for boss spawning.
Nerf Rubber Bat. Nerf Zax. Nerf De'Kagen's spawns.
Allow Game Masters to repeat Halloween 2020 fight. Partly tested.

5 files changed, 67 insertions, 24 deletions

diff --git a/client-data b/client-data
-Subproject a1ee26ca97fdb4d2a58cbf05d2b5055a276858d
+Subproject c43ba590d036b53144d8338554da0e42877152e
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index 568260e2..94fa91dd 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -37,9 +37,9 @@
 1132,   LavaSlime,              LavaSlime,              135,    4144,   0,      6000,   1111,   2,      105,    260,    75,     80,     30,     15,     35,     10,     70,     250,    1,      1,      1,      0,      43,     135,    900,    1300,   672,    100,    904,    10000,  703,    2500,   640,    1000,   701,    1000,   4001,   1000,   825,    500,    0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      3,      40
 1133,   Anne,                   Anne,                   110,    12000,  0,      1100,   889,    1,      200,    300,    20,     40,     60,     40,     40,     30,     60,     40,     1,      1,      1,      0,      29,     133,    380,    872,    672,    900,    838,    6000,   839,    6000,   840,    6000,   1229,   200,    1230,   500,    1231,   500,    1232,   500,    1281,   20,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
 1134,   SUSAN,                  SUSAN,                  255,    696969, 0,     69000,   1400,   1,      0,      0,      69,     69,     69,     69,     69,     69,     69,     69,     1,      1,      1,      0,      29,     161,    1500,   1872,   672,    480,    838,    6000,   839,    6000,   840,    6000,   1229,   200,    1230,   500,    1231,   500,    1232,   500,    1281,   20,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      30
-1135,   LovelyMaggot,           LovelyMaggot,           1,      50,     0,      1,      1,      1,      69,     6969,   0,      5,      5,      5,      1,      0,      6,      5,      1,      1,      1,      3,      21,     133,    200,    1872,   672,    480,    505,    400,    501,    70,     518,    200,    533,    75,     502,    30,     0,      0,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
+1135,   LovelyMaggot,           LovelyMaggot,           1,      50,     0,      1,      1,      1,      69,     6969,   0,      5,      5,      5,      1,      0,      6,      5,      1,      1,      1,      3,      21,     133,    200,    1872,   672,    480,    505,    400,    501,    70,     518,    200,    533,    75,     502,    30,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1136,   LesserGhost,            LesserGhost,            1,      1,      0,      1,      1,      0,      150,    300,    0,      0,      0,      0,      0,      0,      0,      0,      2,      2,      1,      1,      29,     131,    340,    1800,   672,    950,    0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      4,      20
-1137,   Tormenta,               Tormenta,               200,    18000,  60, 500000,     5000,   5,      360,    374,    48,     90,     1,      32,     60,     255,    255,    255,    31,     30,     1,      0,      69,     181,    210,    1200,   672,    50,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
+1137,   Tormenta,               Tormenta,               200,    18000,  60,     500000, 5000,   5,      360,    374,    48,     90,     1,      32,     60,     255,    255,    255,    31,     30,     1,      0,      69,     181,    210,    1200,   672,    50,     5258,   15,     5257,   5,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 //ID,   Name,                   Jname,                  LV,     HP,     SP,     EXP,    JEXP,   Range1, ATK1,   ATK2,   DEF,    MDEF,   STR,    AGI,    VIT,    INT,    DEX,    LUK,    Range2, Range3, Scale,  Race,   Element,Mode,   Speed,  Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1,  Item2,  MEXP,   ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength
 1138,  ManaGuard,               ManaGuardian,           180,    20000,  280,    27000,  5000,   2,      280,    324,    22,     67,     31,     22,     90,     127,    255,    95,    31,      30,     1,      0,      69,     181,    210,    1200,   672,    50,     759,    1,      5237,   20,     1253,   5,      720,    100,    825,    500,    868,   20,      1172,   15,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1139,  Virus,                   Virus,                  170,    5000,   0,      0,      721,    6,      45,     75,     37,     12,     30,     30,     20,     20,     25,     60,    1,       1,      1,      3,      25,     175,    600,    1872,   672,    480,    787,    500,    743,    1100,   5236,   11,     0,      0,      0,      0,      0,     0,       0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      4,      20
@@ -51,7 +51,7 @@
 1145,  KageGolem,               KageGolem,              180,    29999,  280,    150000, 15000,  6,      140,    174,    72,     55,     31,     22,     90,     127,    255,   125,    31,      30,     1,      0,      69,     181,    410,    1000,   672,    50,     5251,   10000,  0,      0,      0,      0,      0,      0,      0,     0,      0,     0,       0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1146,  Flashmob,                Flashmob,               181,    27000,  280,    72000,  5000,   1,      40,     60,     57,     57,     31,     22,     90,     127,    255,    95,    31,      30,     1,      0,      69,     181,    160,    600,    672,    50,     649,    5,      650,    5,      653,    5,      1227,   35,     509,     10000,  1257,  2,       759,    2,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1147,  Koyntety,                Koyntety,               181,    27000,  280,    72000,  5000,   4,      220,    240,    52,     52,     31,     22,     90,     127,    255,   105,    31,      30,     1,      0,      69,     181,    240,    1400,   672,    50,     649,    5,      650,    5,      653,    5,      1227,   35,     509,     10000,  1257,  2,       759,    2,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
-1148,  DoomGolem,               DoomGolem,              180,    22000,  280,    65000,  2000,   3,      160,    180,    60,     30,     31,     22,     90,     127,    255,   105,    31,      30,     1,      0,      69,     181,    320,    1000,   672,    50,     5253,   4,      666,    30,     537,    800,    779,    150,    780,   150,     777,   70,      1198,   50,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
+1148,  DoomGolem,               DoomGolem,              180,    22000,  280,    65000,  2000,   3,      160,    180,    60,     30,     31,     22,     90,     127,    255,   105,    31,      30,     1,      0,      69,     181,    320,    1000,   672,    50,     5253,   4,      666,    30,     537,    800,    779,    150,    780,   150,     777,   70,     1198,   50,     5258,   1,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1149,  Enchanter,               Enchanter,              181,    19000,  280,    55000,  2000,   8,      140,    180,    30,     60,     31,     22,     90,     127,    255,   105,    31,      30,     1,      0,      69,     181,    240,    800,    672,    50,     1227,   2,      666,    30,     537,    800,    779,    90,     780,   80,     777,   70,      1198,   50,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 1150,  ManaTyrant,              ManaTyrant,             180,    24000,  280,    27000,  5000,   2,      300,    325,    42,     67,     31,     22,     90,     127,    255,    95,    31,      30,     1,      0,      69,     181,    180,    1050,   672,    50,     759,    1,      5237,   20,     1253,   5,      720,    100,    825,    500,    868,   20,      1172,   15,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 //ID,   Name,                   Jname,                  LV,     HP,     SP,     EXP,    JEXP,   Range1, ATK1,   ATK2,   DEF,    MDEF,   STR,    AGI,    VIT,    INT,    DEX,    LUK,    Range2, Range3, Scale,  Race,   Element,Mode,   Speed,  Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1,  Item2,  MEXP,   ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength
diff --git a/world/map/news.d/89-halloween-2020.txt b/world/map/news.d/89-halloween-2020.txt
index 28685174..0f3fc6d9 100644
--- a/world/map/news.d/89-halloween-2020.txt
+++ b/world/map/news.d/89-halloween-2020.txt
@@ -7,12 +7,16 @@ We'll have several events until early november! Keep watching the forums!
 
 Here is a short summary about them:
 
-{b}Sage's Council{/b}
+{b}Halloween 2020 - Rescuing Jande{/b}
 
-{b}Numa{/b} would like to invite every player and the sages (Sagatha, Elanore, Nikolai, Morgan, Valia, Waric, Golbenez and Numa) for a {b}Council Meeting{/b}
+{b}Jande{/b}, the Great Dragon of Earth, was kidnapped by Zax De'Kagen!
 
-Scheduled to happen {b}September 26th, at 18h00 UTC{/b}.
-To take place in {b}Celestia's Manor{/b} (Hurnscald).
+According to the Sage's Council intel, Jande is currently being held in
+{b}The Underworld{/b}. But there is no way to reach the underworld, nor to rescue
+Jande from the Eternal Seals Prision...
+
+Or at least, that is what everyone thought.
+.:: HALLOWEEN 2020 - RESCUING JANDE ::.
 
 In case you missed the Doomsday Event, you can read a summary on:
 {link:https://wiki.themanaworld.org/index.php/Legacy:Doomsday}
@@ -20,10 +24,11 @@ In case you missed the Doomsday Event, you can read a summary on:
 
 {b}PVP Tournament V{/b}
 
-September's PVP Tournament will happen right after the council meeting,
-at {b}20:00 UTC{/b} in a map To Be Disclosed later.
+September's PVP Tournament was cancelled due not enough participation.
+However, we will still have a special halloween PvP Tournament in october.
+Date yet to be announced by forums.
 
-Remember you must sign up at forums to participate!
+Remember: You must sign up at forums to participate!
 
 
 {b}Hungry Fluffy Hunt V{/b}
@@ -31,10 +36,15 @@ Remember you must sign up at forums to participate!
 Crew of Red Corsair will be hosting the fifth Hunt The Hungry Fluffies event!
 
 Participate on the special scoreboard which will open from {b}Sep 18th{/b} until
-{b}Sep 27th{/b} and win prizes! Check forums for details.
+{b}Sep 30th{/b} and win prizes! Check forums for details.
 
 IMPORTANT: Scores obtained before the special event scoreboard open will {b}NOT{/b}
 be considered. The Event Scoreboard is marked as Event Scoreboard!
 
+{b}More Information{/b}
+
+More information can be obtained at the forums:
+
+{link:https://forums.themanaworld.org/viewtopic.php?f=1&t=21092}
 
 {author:Jesusalva}
diff --git a/world/map/npc/099-5/boss.txt b/world/map/npc/099-5/boss.txt
index 8929c22d..2d36a0e5 100644
--- a/world/map/npc/099-5/boss.txt
+++ b/world/map/npc/099-5/boss.txt
@@ -81,6 +81,7 @@
 //     256          - DEFCON 7 MELEE REGEN
 //     512          - DEFCON 8 GP COST
 //     1024         - DEFCON
+// NOTE: Personal score overflows at 214,000 points
 
 099-5|mapflag|nosave|099-3,72,74
 099-5|mapflag|resave|099-3,72,74
@@ -126,6 +127,9 @@ OnMTChallenge:
     getexp 40000, 0;
     set BOSS_POINTS, BOSS_POINTS + 5;
     message strcharinfo(0), "This battle experience distribution is different, and death is final. Be careful!";
+    // Give everyone some participation points simply for continued survival
+    set @dd5_score, 1000;
+    set $@DD5_PTS, $@DD5_PTS+1000;
     end;
 
 // FIXME not working for some reason
@@ -350,13 +354,13 @@ OnBlissOblivion:
     if ($@DD5_HP < 10000 && $@DD5_DEFCON > 2)
         set $@DD5_DEFCON, rand(0, 8);
     areatimer 0, "099-5", 20, 20, 75, 75, 10, "#TMWFinalExam::OnMTBlissOblivion";
-    setnpctimer 89000;
+    setnpctimer 119000;
     end;
 
 ////////////////////////////
 // Miniboss Spawning
 OnMTWarning:
-    misceffect 51, strcharinfo(0);
+    misceffect 54, strcharinfo(0);
     end;
 
 OnMTMusicOn:
@@ -451,7 +455,7 @@ OnPrologue4:
 OnRubberBat:
     if ($@DD5_STATUS != 3)
         end;
-    areamonster getmap(), getx()-5, gety()-5, getx()+5, gety()+5, "", 1155, rand(2,4), "#TMWFinalExam::OnKillWeak";
+    areamonster getmap(), getx()-5, gety()-5, getx()+5, gety()+5, "", 1155, rand(1,2), "#TMWFinalExam::OnKillWeak";
     addtimer 10, "Zax De'Kagen#0::OnAdjustBat";
     end;
 
@@ -608,7 +612,7 @@ OnShowdown5:
 
 OnShowdown6:
     set $@DD5_STATUS, 7;
-    set $@DD5_HP, 120000;
+    set $@DD5_HP, 115000;
     set $@DD5_PRIMARY, 3+getmapusers("099-5")*2;
     set $@DD5_SUPPORT, 3+getmapusers("099-4")*2;
     set $@DD5_TOTALPC, $@DD5_PRIMARY+$@DD5_SUPPORT;
@@ -955,7 +959,7 @@ OnTimer30000:
         areamonster "099-5", 20, 20, 75, 75, "", 1151, $@DD5_TOTALPC, "#TMWFinalExam::OnKillAverage";
     end;
 
-OnTimer60000:
+OnTimer75000:
     // Imperial Chamber
     areamonster "099-5", 43, 44, 56, 55, "", $@DD5MB_AVERAGE[rand(getarraysize($@DD5MB_AVERAGE))], $@DD5_PRIMARY/3+1, "#TMWFinalExam::OnKillAverage";
     // Map
@@ -966,16 +970,16 @@ OnTimer60000:
         areamonster "099-5", 20, 20, 75, 75, "", 1151, $@DD5_TOTALPC, "#TMWFinalExam::OnKillAverage";
     end;
 
-// Warn players about the 90s rule closing in
+// Warn players about the 110s rule closing in
 // They'll have 10 seconds to prepare themselves to the mini-boss spawn!
 // AND to get ready to the boss HP regeneration (which is small but anyway)
-OnTimer80000:
+OnTimer104000:
     areatimer 0, "099-5", 20, 20, 75, 75, 10, "#TMWFinalExam::OnMTWarning";
     end;
 
-OnTimer90000:
+OnTimer120000:
     // Imperial Chamber
-    areamonster "099-5", 43, 44, 56, 55, "", $@DD5MB_STRONG[rand(getarraysize($@DD5MB_STRONG))], $@DD5_PRIMARY/3, "#TMWFinalExam::OnKillStrong";
+    areamonster "099-5", 43, 44, 56, 55, "", $@DD5MB_STRONG[rand(getarraysize($@DD5MB_STRONG))], max(3, 1+$@DD5_PRIMARY/3), "#TMWFinalExam::OnKillStrong";
     areamonster "099-5", 43, 44, 56, 55, "", $@DD5MB_BOSSLV[rand(getarraysize($@DD5MB_BOSSLV))], $@DD5_STATUS/2, "#TMWFinalExam::OnKillStrong";
     // Map
     set $@DD5_MOBC, $@DD5_TOTALPC/3+1;
@@ -1209,7 +1213,7 @@ function|script|FinalExamAttack
         set @dd5_dmg, @dd5_dmg*15/10;
 
     // Boss defense
-    set @dd5_dmg, @dd5_dmg*(11-$@DD5_STATUS)/10;
+    set @dd5_dmg, @dd5_dmg*(11-$@DD5_STATUS)/9;
 
     // Consider criticals (no defense disregard, though)
     if (@dd5_crit)
@@ -1556,7 +1560,7 @@ OnTimer24000:
     initnpctimer;
     disablenpc strnpcinfo(0);
     end;
-OnTimer80000:
+OnTimer90000:
     if ($@DD5_STATUS != 7)
         end;
     initnpctimer;
diff --git a/world/map/npc/annuals/halloween/doomsday.txt b/world/map/npc/annuals/halloween/doomsday.txt
index 6af00341..1967f532 100644
--- a/world/map/npc/annuals/halloween/doomsday.txt
+++ b/world/map/npc/annuals/halloween/doomsday.txt
@@ -297,10 +297,39 @@ OnTouch:
         goto L_Check;
     if ($@HW2020_HOCUS == 3)
         end;
+    // GM Special Menu
+    if (GM < G_GM)
+        warp "009-1", 52, 40;
+    if (GM < G_GM)
+        end;
+    goto L_GMMenu;
+
+// GM Menu
+L_GMMenu:
+    mes "This event is already over.";
+    mes "However, you are a Game Master.";
+    mes "Do you want to allow the battle to happen again?";
+    next;
+    menu
+        "No, I was trying to get to Hurns", L_GMNo,
+        "YES, BEGIN THE AMBUSH", L_GMYes,
+        "No, it was an accident.", L_GMCancel;
+
+L_GMYes:
+    set $@HW2020_HOCUS, 0;
+    gmlog strcharinfo(0) + " has reset Halloween 2020 Battle.";
+    mes "* BEEEEEEEP *";
+    mes "##9(Talk to portal again to ambush)##0";
+    close;
+
+L_GMNo:
     warp "009-1", 52, 40;
-    end;
+    close;
+
+L_GMCancel:
+    close;
 
-// TODO
+// Main Event
 L_Ambush:
     set $@HW2020_HOCUS, 1;
     mapannounce "003-1", "What, did you thought it would be so easy?" , 0;