Rewrite event-only summon list (optimization)

1 files changed, 27 insertions, 57 deletions

diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 62cc62553..8678194b9 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -407,65 +407,35 @@ L_EventOnly:
     mesc l("WARNING: Spawn these monsters with moderation!"), 1;
     mesc l("This is just a short list to make GMs life easier!"), 1;
     mes "";
-    select
-        "Abort",                                                  // 1
-        "Bhop Fluffy",                                            // 2
-        "Easter Mouboo",                                          // 3
-        "Evil Scythe",                                            // 4
-        "Jack'O",                                                 // 5
-        "Magic Ratto",                                            // 6
-        "Moonshroom",                                             // 7
-        "Mouboo Slime",                                           // 8
-        "Small Magic Bif",                                        // 9
-        "Magic Bif",                                              // 10
-        "Bronze Chest",                                           // 11
-        "Bronze Mimic",                                           // 12
-        "Silver Chest",                                           // 13
-        "Silver Mimic",                                           // 14
-        "Evil Chest",                                             // 15
-        "Big Magic Bif"; // default
-
-
-    if (@menu != 1)
+    menuint
+        "Abort",            -1,
+        "Bhop Fluffy",      BhopFluffy,
+        "Easter Mouboo",    EasterMouboo,
+        "Evil Scythe",      EvilScythe,
+        "Jack'O",           JackO,
+        "Magic Ratto",      MagicRatto,
+        "Moonshroom",       Moonshroom,
+        "Mouboo Slime",     MoubooSlime,
+        "Small Magic Bif",  SmallMagicBif,
+        "Magic Bif",        MagicBif,
+        "Bronze Chest",     BronzeChest,
+        "Bronze Mimic",     BronzeMimic,
+        "Silver Chest",     SilverChest,
+        "Silver Mimic",     SilverMimic,
+        "Evil Chest",       EvilChest,
+        "Big Magic Bif",    BigMagicBif;
+
+    .@mobId=@menuret;
+
+    if (.@mobId > 0)
         input .@c, 0, 100;
-    if (.@c == 0 && @menu != 1)
-        @menu=99;
+    if (.@c == 0 && .@mobId > 0)
+        .@mobId = 0;
 
-    switch (@menu) {
-        case 1:
-            goto L_Spawn;
-            break;
-        case 2:
-            spawner(("BhopFluffy"), BhopFluffy, .@c); break;
-        case 3:
-            spawner(("EasterMouboo"), EasterMouboo, .@c); break;
-        case 4:
-            spawner(("EvilScythe"), EvilScythe, .@c); break;
-        case 5:
-            spawner(("Jack'O"), JackO, .@c); // WUT
-        case 6:
-            spawner(("MagicRatto"), MagicRatto, .@c); break;
-        case 7:
-            spawner(("Moonshroom"), Moonshroom, .@c); // WUT
-        case 8:
-            spawner(("MoubooSlime"), MoubooSlime, .@c); break;
-        case 9:
-            spawner(("SmallMagicBif"), SmallMagicBif, .@c); break;
-        case 10:
-            spawner(("MagicBif"), MagicBif, .@c); break;
-        case 11:
-            spawner(("BronzeChest"), BronzeChest, .@c); break;
-        case 12:
-            spawner(("BronzeMimic"), BronzeMimic, .@c); break;
-        case 13:
-            spawner(("SilverChest"), SilverChest, .@c); break;
-        case 14:
-            spawner(("SilverMimic"), SilverMimic, .@c); break;
-        case 15:
-            spawner(("EvilChest"), EvilChest, .@c); break;
-        default:
-            spawner(("BigMagicBif"), BigMagicBif, .@c); break;
-    }
+    if (.@mobId < 0)
+        goto L_Spawn;
+    else if (.@mobId > 0)
+        spawner("", .@mobId, .@c);
 
     @log_spawns=@log_spawns+.@c;
     mes "";