2 files changed, 77 insertions, 0 deletions
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt
index 8f3d066e..b9ca8ac3 100644
--- a/world/map/npc/annuals/halloween/debug.txt
+++ b/world/map/npc/annuals/halloween/debug.txt
@@ -13,6 +13,7 @@ L_Live:
         "Set Old Event Flag.", L_LastReset,
         "Halloween Time Key Change.", L_HalloweenTimeKey,
         "Reset NPC's mask memory", L_ResetMask,
+        "Summon Tormenta", L_Tormenta,
         "Nothing.", L_Close;
 
 L_Debug:
@@ -24,6 +25,7 @@ L_Debug:
         "Set NPC trick or treat flag", L_SetTrickOrTreats,
         "Reset my quest state", L_ResetMe,
         "Reset NPC's mask memory", L_ResetMask,
+        "Summon Tormenta", L_Tormenta,
         "Nothing.", L_Close;
 
 L_DebugTime:
@@ -129,6 +131,10 @@ L_ResetMask:
     set $@halloween_maskmemory[8 * @halloween_npc_id], 0;
     goto L_Debug;
 
+L_Tormenta:
+    donpcevent "Munro::OnTormenta";
+    goto L_Close;
+
 L_Close:
     set @tmp, 0;
     set @mask, 0;
diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt
index feb71aea..03c81477 100644
--- a/world/map/npc/annuals/halloween/munro.txt
+++ b/world/map/npc/annuals/halloween/munro.txt
@@ -29,6 +29,77 @@ L_Halloween:
 
 L_Exit:
     close;
+
+OnTormentaDie:
+    // FIXME: This announce is not working (but is it important?)
+    announce "Tormenta was pushed back to the Abyss, but at Halloween, she's sure to be back soon.", 0;
+    end;
+
+// Spawn Tormenta if not alive and HW
+OnClock0000:
+    goto L_Tormenta;
+OnClock0100:
+    goto L_Tormenta;
+OnClock0200:
+    goto L_Tormenta;
+OnClock0300:
+    goto L_Tormenta;
+OnClock0400:
+    goto L_Tormenta;
+OnClock0500:
+    goto L_Tormenta;
+OnClock0600:
+    goto L_Tormenta;
+OnClock0700:
+    goto L_Tormenta;
+OnClock0800:
+    goto L_Tormenta;
+OnClock0900:
+    goto L_Tormenta;
+OnClock1000:
+    goto L_Tormenta;
+OnClock1100:
+    goto L_Tormenta;
+OnClock1200:
+    goto L_Tormenta;
+OnClock1300:
+    goto L_Tormenta;
+OnClock1400:
+    goto L_Tormenta;
+OnClock1500:
+    goto L_Tormenta;
+OnClock1600:
+    goto L_Tormenta;
+OnClock1700:
+    goto L_Tormenta;
+OnClock1800:
+    goto L_Tormenta;
+OnClock1900:
+    goto L_Tormenta;
+OnClock2000:
+    goto L_Tormenta;
+OnClock2100:
+    goto L_Tormenta;
+OnClock2200:
+    goto L_Tormenta;
+OnClock2300:
+    goto L_Tormenta;
+
+// Debug
+OnTormenta:
+    goto L_Tormenta;
+
+L_Tormenta:
+    // Do not summon Tormenta outside Halloween, or while they're alive
+    if (!$@halloween_time)
+        end;
+    if (mobcount("057-1", "Munro::OnTormentaDie") >= 0)
+        end;
+
+    // Spawn Tormenta and finish
+    monster "057-1", 126, 64, "Tormenta", 1137, 1, "Munro::OnTormentaDie";
+    end;
+
 }
 function|script|SpawnMunro
 {