Possibly final pass of reviewing Poppet DLC

1 files changed, 39 insertions, 16 deletions

diff --git a/npc/082-3/poppet.txt b/npc/082-3/poppet.txt
index 84e760cf..c3ef1301 100644
--- a/npc/082-3/poppet.txt
+++ b/npc/082-3/poppet.txt
@@ -71,7 +71,7 @@ L_Summon:
         l("Begin normal mode [15 min]"),
         l("Begin hard mode [20 min]"),
         l("Begin Polish Warmachine mode [30 min]"),
-        rif(gettime(GETTIME_DAYOFYEAR) >= 357, l("Begin Nuclear Winter mode [45 min]"));
+        rif(gettime(GETTIME_DAYOFYEAR) >= 357 || is_admin(), l("Begin Nuclear Winter mode [45 min]"));
     mes "";
     if (.tick >= gettimetick(2)) { closeclientdialog; close; }
     switch (@menu) {
@@ -82,7 +82,7 @@ L_Summon:
         monster("082-3", 155,  40, "Beta",  UndeadWitch, 1);
         monster("082-3",  45, 155, "Gamma", UndeadWitch, 1);
         monster("082-3", 157, 157, "Delta", UndeadWitch, 1);
-        monster("082-3",  95,  85, "Omega", Scythe, 1);
+        monster("082-3",  95,  85, "Omega", ScytheMob, 1);
         break;
     case 3:
         .diff = 2;
@@ -117,7 +117,7 @@ L_Summon:
         monster("082-3",  52,  48, "Alpha", Reaper, 1);
         monster("082-3", 155,  40, "Beta",  Tormenta, 1);
         monster("082-3",  45, 155, "Gamma", Luvia, 1);
-        monster("082-3", 157, 157, "Delta", GreatDragon, 1);
+        monster("082-3", 157, 157, "Delta", Dragon, 1);
         monster("082-3",  95,  85, "Omega", SUSAN, 1);
         break;
     }
@@ -137,10 +137,28 @@ OnTimer480000: // 8.0 min (final)
     .@msg$ = any("I'm having fun, what about you?",
                  "I'm spawning more monsters, watch out.",
                  "Lemme see if I remember how to summon more monsters...",
-                 "Here, more practice dummies, have fun.");
+                 "Here, more practice dummies, have fun.",
+                 "I am no longer able to rotate fast, so I'm summoning again.",
+                 "This won't nuke ManaMarket but should get you running.",
+                 "If you don't like this, try migrating with the Mouboos.",
+                 "I always miss the summons, in every sense possible...",
+                 "Are you related to the monsters I'm about to summon?",
+                 "If you don't want to die, start running.",
+                 "It's never too early to eat frozen pizza. Or to kill new mobs.",
+                 "Hocus would hide now, I'm spawning monsters.",
+                 "I have no motivation for nothing but spawning again.",
+                 "Welcome back from your exile, my summoned monsters.",
+                 "These new monsters won't drop cookies, but maybe tickets.",
+                 "Wushin wanted to paint all my monsters in pink and purle.",
+                 "Watching you killing my spawns has certainly been amusing so far.",
+                 "I should add new evil dumpling mobs to development list.",
+                 "I am liberal about what I spawn. Consider this fact canon.",
+                 "I'm taking new mobs from the locker room, gimme a few.",
+                 "Let's make The Mana World great again: Bringing more mobs.");
     mapannounce "082-3", "Poppet : "+.@msg$, 0;
+    sleep(500); // Give you enough time to RUN AWAY
     switch (.diff) {
-    case 1: // Easy
+    case 1: // Easy (145 mobs)
         spawn(Bandit, 7);
         spawn(CrotcherScorpion, 7);
         spawn(Archant, 5);
@@ -148,7 +166,7 @@ OnTimer480000: // 8.0 min (final)
         spawn(BlackScorpion, 3);
         spawn(Snake, 2);
         break;
-    case 2: // Normal
+    case 2: // Normal (189 mobs)
         spawn(FeyElement, 1);
         spawn(CandiedSlime, 8);
         spawn(RedSlime, 9);
@@ -157,7 +175,7 @@ OnTimer480000: // 8.0 min (final)
         spawn(Skeleton, 4);
         spawn(UndeadWitch, 2);
         break;
-    case 3: // Hard
+    case 3: // Hard (280 mobs)
         spawn(LadySkeleton, 10);
         spawn(Skeleton, 10);
         spawn(UndeadWitch, 8);
@@ -169,32 +187,37 @@ OnTimer480000: // 8.0 min (final)
         spawn(Yeti, 2);
         spawn(Thug, 2);
         break;
-    case 4: // WarriorWorld
-        spawn(RedBone, 9);
+    case 4: // WarriorWorld (302 mobs)
+        spawn(RedBone, 7);
         spawn(SeaSlimeMother, 3);
-        spawn(Wight, 9);
-        spawn(GreenSlimeMother, 3);
-        spawn(IceElement, 5);
+        spawn(Wight, 7);
+        spawn(GreenSlimeMother, 2);
+        spawn(IceElement, 4);
         spawn(Yeti, 3);
         spawn(Zombie, 4);
         spawn(Terranite, 5);
         spawn(Fallen, 5);
-        spawn(Thug, 4);
+        spawn(Thug, 3);
         spawn(Stalker, 3);
-        spawn(Swashbuckler, 3);
+        spawn(Swashbuckler, 2);
         spawn(Grenadier, 2);
         spawn(JackO, 1);
         break;
     default:
-    case 5: // Gumi
+    case 5: // Gumi (270 mobs)
         spawn(Anne, 10);
         spawn(JackO, 8);
-        spawn(ManaGuardian, 6);
+        spawn(ManaGuard, 6);
         spawn(Tengu, 4);
         spawn(Sasquatch, 4);
         spawn(ManaSlayer, 4);
         spawn(DoomGolem, 3);
         spawn(Enchanter, 3);
+        // Gumi mode probably would not be worth it without this buff
+        spawn(Swashbuckler, 1);
+        spawn(Grenadier, 1);
+        spawn(Thug, 1);
+        spawn(Yeti, 1);
         break;
     }
     end;