Recycle's Tormenta's code for St. Patrick. Submodule update

2 files changed, 6 insertions, 24 deletions

diff --git a/client-data b/client-data
-Subproject 6ac43a098a2171bbd4b85fb6d52d605f426e9ba
+Subproject b4f61aa06bbeea549ddf3175fcc9b7fae3f6624
diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt
index 23075a9b..6ff09fe9 100644
--- a/world/map/npc/annuals/halloween/munro.txt
+++ b/world/map/npc/annuals/halloween/munro.txt
@@ -30,11 +30,6 @@ 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;
@@ -90,27 +85,14 @@ OnTormenta:
     goto L_Tormenta;
 
 L_Tormenta:
-    // Do not summon Tormenta outside Halloween, or while they're alive
-    if (!$@halloween_time)
+    // This code is going to get removed so I'll reuse it this time...
+    if (gettime(5) != 17)
         end;
-    if (mobcount("057-1", "Munro::OnTormentaDie") >= 0)
-        end;
-
-    // Spawn Tormenta and finish
-    monster "057-1", 126, 64, "Tormenta", 1137, 1, "Munro::OnTormentaDie";
 
-    // Doomsday Untils
-    if ($DOOMSDAY == 3)
-        goto L_Doomsday;
-    end;
-
-// Doomsday Act 5 Utils
-L_Doomsday:
-    if (!$DOOMSDAY_TWARP)
-        end;
-    if ($DOOMSDAY_TJANDE)
-        end;
-    set $DOOMSDAY_CNT2, $DOOMSDAY_CNT2+1;
+    areamonster "008-1", 20, 20, 142, 100, "", 1037, 80;
+    areamonster "007-1", 20, 20, 124, 100, "", 1037, 40;
+    areamonster "011-1", 20, 20, 130, 120, "", 1037, 40;
+    areamonster "018-1", 20, 20, 180, 100, "", 1037, 100;
     end;
 
 }