Remove Tormenta's leftovers, as well as St. Patrick leftovers.

1 files changed, 1 insertions, 66 deletions

diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt
index e664680e..cbbbf233 100644
--- a/world/map/npc/annuals/halloween/munro.txt
+++ b/world/map/npc/annuals/halloween/munro.txt
@@ -29,73 +29,8 @@ L_Halloween:
 
 L_Exit:
     close;
-
-// 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
-OnInit:
-    goto L_Tormenta;
-
-L_Tormenta:
-    // This code is going to get removed so I'll reuse it this time...
-    if (gettime(5) != 17)
-        end;
-
-    areamonster "008-1", 20, 20, 142, 100, "", 1037, 100;
-    areamonster "007-1", 20, 20, 124, 100, "", 1037, 80;
-    areamonster "011-1", 20, 20, 130, 120, "", 1037, 80;
-    areamonster "018-1", 20, 20, 180, 100, "", 1037, 140;
-    end;
-
 }
+
 function|script|SpawnMunro
 {
     if ($@halloween_time)