Fix Event Master, and minor improvement

2 files changed, 140 insertions, 134 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 2f616018a..8e2f4b93b 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -225,7 +225,7 @@ quest_db: (
 // ID 131 to 150: Frostia Quests
 // ID 151 to 170: Artis Quests
 // ID 171 to 190: Esperia Quests
-// ID 191 to 300: Dungeon Quests - Saulc ???? dungeon ??
+// ID 191 to 300: Dungeon Quests
 {
     Id: 191
     Name: "MineQuest_Tycoon"
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index b3313fe71..d504baa4d 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -3,11 +3,12 @@
 //  Jesusalva, Saulc
 // Description:
 //  This GM NPC controls spawns and item drops on Aeros
-// Monsters are sorted alphabetically, except bif 
+// Monsters are sorted alphabetically, except bif
 
 001-1,250,20,0	script	Mana Being#001-1	NPC_ALIGE_OUTSIDE_BARREL,{
-    function spawner { // (name, ID, amount)
-        areamonster("001-1", 171, 0, 339, 158, getarg(0), getarg(1), getarg(2), "Mana Being#001-1::OnAerosMobDeath");
+    function spawner { // (memo, ID, amount)
+        // First argument is a memorand for Script Writers, usually name. It must be present, but can have whatever value you want. (Unused)
+        areamonster("001-1", 171, 0, 339, 158, strmobinfo(1, getarg(1)), getarg(1), getarg(2), "Mana Being#001-1::OnAerosMobDeath");
     }
 
     if (!is_gm()) goto L_Unauthorized;
@@ -26,8 +27,8 @@ L_Menu:
         "Start/End Event", L_EventHandler,
         "Spawn",L_Spawn,
         rif(countitem(StrangeCoin) >= 10, "Drop a Toothbrush! (10x Coins)"),L_Drop,
-        "Drop a Bronze Gift", L_Bgif,
-        "Drop a Silver Gift", L_Sgif,
+        rif(countitem(StrangeCoin) >= 10, "Drop a Bronze Gift (10x Coins)"), L_Bgif,
+        rif(countitem(StrangeCoin) >= 10, "Drop a Silver Gift (10x Coins)"), L_Sgif,
         "Adjust coins drop rate",L_Rate;
 
 L_Unauthorized:
@@ -51,7 +52,7 @@ L_Spawn:
         "Slime", L_Sli,
         "Plants", L_Plants,
         "Aggressive", L_Agr,
-        "GM", L_Gm,
+        "GM Event Only", L_EventOnly,
         "Boss", L_Boss;
 
 
@@ -194,7 +195,7 @@ L_Norm:
         "Golden Scorpion",                       // 18
         "Iced Fluffy",                           // 19
         "LogHead",                              // 20
-        "Maggot",                               // 21    
+        "Maggot",                               // 21
         "Magic Goblin",                          // 22
         "Mana Bug",                              // 23
         "Mana Ghost"                             // 24
@@ -223,83 +224,83 @@ L_Norm:
             goto L_Spawn;
             break;
         case 2:
-            spawner(l("AlphaMouboo"), AlphaMouboo, .@c);
+            spawner(("AlphaMouboo"), AlphaMouboo, .@c);
         case 3:
-            spawner(l("Bat"), Bat, .@c);
+            spawner(("Bat"), Bat, .@c);
         case 4:
-            spawner(l("Bee"), Bee, .@c);
+            spawner(("Bee"), Bee, .@c);
         case 5:
-            spawner(l(Blub""), Blub, .@c);
+            spawner(("Blub"), Blub, .@c);
         case 6:
-            spawner(l("CandorScorpion"), CandorScorpion, .@c);
+            spawner(("CandorScorpion"), CandorScorpion, .@c);
         case 7:
-            spawner(l("CaveSnake"), CaveSnake, .@c);
+            spawner(("CaveSnake"), CaveSnake, .@c);
         case 8:
-            spawner(l("Crafty"), Crafty, .@c);
+            spawner(("Crafty"), Crafty, .@c);
          case 9:
-            spawner(l("Croc"), Croc, .@c);
+            spawner(("Croc"), Croc, .@c);
         case 10:
-            spawner(l("DesertLoghead"), DesertLoghead, .@c);
+            spawner(("DesertLoghead"), DesertLoghead, .@c);
         case 11:
-            spawner(l("DesertMaggot"), DesertMaggot, .@c);
+            spawner(("DesertMaggot"), DesertMaggot, .@c);
         case 12:
-            spawner(l("Duck"), Duck, .@c);
+            spawner(("Duck"), Duck, .@c);
         case 13:
-            spawner(l("FireGoblin"), FireGoblin, .@c);
+            spawner(("FireGoblin"), FireGoblin, .@c);
         case 14:
-            spawner(l("Fluffy"), Fluffy, .@c);
+            spawner(("Fluffy"), Fluffy, .@c);
         case 15:
-            spawner(l("ForestMushroom"), ForestMushroom, .@c);
+            spawner(("ForestMushroom"), ForestMushroom, .@c);
         case 16:
-            spawner(l("LittleBlub"), LittleBlub, .@c);
+            spawner(("LittleBlub"), LittleBlub, .@c);
         case 17:
-            spawner(l("GiantMaggot"), GiantMaggot, .@c);
+            spawner(("GiantMaggot"), GiantMaggot, .@c);
         case 18:
-            spawner(l("GoldenScorpion"), GoldenScorpion, .@c);
+            spawner(("GoldenScorpion"), GoldenScorpion, .@c);
         case 19:
-            spawner(l("IcedFluffy"), IcedFluffy, .@c);
+            spawner(("IcedFluffy"), IcedFluffy, .@c);
         case 20:
-            spawner(l("LogHead"), LogHead, .@c);
+            spawner(("LogHead"), LogHead, .@c);
         case 21:
-            spawner(l(Maggot"), Maggot, .@c);
+            spawner(("Maggot"), Maggot, .@c);
         case 22:
-            spawner(l("MagicGoblin"), MagicGoblin, .@c);
+            spawner(("MagicGoblin"), MagicGoblin, .@c);
         case 23:
-            spawner(l("ManaBug"), ManaBug, .@c);
+            spawner(("ManaBug"), ManaBug, .@c);
         case 24:
-            spawner(l("ManaGhost"), ManaGhost, .@c);
+            spawner(("ManaGhost"), ManaGhost, .@c);
         case :25
-            spawner(l("Moggun"), Moggun, .@c);
+            spawner(("Moggun"), Moggun, .@c);
         case 26:
-            spawner(l("Mouboo"), Mouboo, .@c);
+            spawner(("Mouboo"), Mouboo, .@c);
         case 27:
-            spawner(l("OceanCroc"), OceanCroc, .@c);
+            spawner(("OceanCroc"), OceanCroc, .@c);
         case 28:
-            spawner(l("Pinkie"), Pinkie, .@c);
+            spawner(("Pinkie"), Pinkie, .@c);
         case 29:
-            spawner(l("Piou"), Piou, .@c);
+            spawner(("Piou"), Piou, .@c);
         case 30:
-            spawner(l("Piousse"), Piousse, .@c);
+            spawner(("Piousse"), Piousse, .@c);
         case 31:
-            spawner(l("PoisonSpikyMushroom"), PoisonSpikyMushroom, .@c);
+            spawner(("PoisonSpikyMushroom"), PoisonSpikyMushroom, .@c);
         case 32:
-            spawner(l("Ratto"), Ratto, .@c);
+            spawner(("Ratto"), Ratto, .@c);
         case 33:
-            spawner(l("RedButterfly"), RedButterfly, .@c);
+            spawner(("RedButterfly"), RedButterfly, .@c);
         case 34:
-            spawner(l("RedMushroom"), RedMushroom, .@c);
+            spawner(("RedMushroom"), RedMushroom, .@c);
         case 35:
-            spawner(l("RedScorpion"), RedScorpion, .@c);
+            spawner(("RedScorpion"), RedScorpion, .@c);
         case 36:
-            spawner(l("Squirrel"), Squirrel, .@c);
+            spawner(("Squirrel"), Squirrel, .@c);
         case 37:
-            spawner(l("Squirrel"), Squirrel, .@c);
+            spawner(("Squirrel"), Squirrel, .@c);
         case 38:
-            spawner(l("Tipiou"), Tipiou, .@c);
+            spawner(("Tipiou"), Tipiou, .@c);
         case 39:
-            spawner(l("ToppyBlub"), ToppyBlub, .@c);
+            spawner(("ToppyBlub"), ToppyBlub, .@c);
         case 40:
-            spawner(l("Tortuga"), Tortuga, .@c);                                                                                                                                                                                                                                                                                                                                                                                                                       
+            spawner(("Tortuga"), Tortuga, .@c);
     }
 
     @log_spawns=@log_spawns+.@c;
@@ -332,31 +333,31 @@ L_Sli:
             goto L_Spawn;
             break;
         case 2:
-            spawner(l("AzulSlime"), AzulSlime, .@c);
+            spawner(("AzulSlime"), AzulSlime, .@c);
         case 3:
-            spawner(l("BlueSlime"), BlueSlime, .@c);
+            spawner(("BlueSlime"), BlueSlime, .@c);
         case 4:
-            spawner(l("CandiedSlime"), CandiedSlime, .@c);
+            spawner(("CandiedSlime"), CandiedSlime, .@c);
         case 5:
-            spawner(l("CopperSlime"), CopperSlime, .@c);
+            spawner(("CopperSlime"), CopperSlime, .@c);
         case 6:
-            spawner(l("GreenSlime"), GreenSlime, .@c);
+            spawner(("GreenSlime"), GreenSlime, .@c);
         case 7:
-            spawner(l("LavaSlime"), LavaSlime, .@c);
+            spawner(("LavaSlime"), LavaSlime, .@c);
         case 8:
-            spawner(l("RudolphSlime"), RudolphSlime, .@c);
+            spawner(("RudolphSlime"), RudolphSlime, .@c);
         case 9:
-            spawner(l("RedSlime"), RedSlime, .@c);
+            spawner(("RedSlime"), RedSlime, .@c);
         case 10:
-            spawner(l("SantaSlime"), SantaSlime, .@c);
+            spawner(("SantaSlime"), SantaSlime, .@c);
         case 11:
-            spawner(l("SeaSlime"), SeaSlime, .@c);
+            spawner(("SeaSlime"), SeaSlime, .@c);
         case 12:
-            spawner(l("SlimeBlast"), SlimeBlast, .@c);
+            spawner(("SlimeBlast"), SlimeBlast, .@c);
         case 13:
-            spawner(l("WhiteSlime"), WhiteSlime, .@c);
+            spawner(("WhiteSlime"), WhiteSlime, .@c);
         case 14:
-            spawner(l("YellowSlime"), YellowSlime, .@c);
+            spawner(("YellowSlime"), YellowSlime, .@c);
 
         }
 
@@ -365,14 +366,14 @@ L_Sli:
     mes "Completed.";
     mes "Total spawns: "+str(@log_spawns);
     next;
-    goto L_Sli;        
+    goto L_Sli;
 
 
 L_Plants:
     select
         "Abort",                                // 1
         "Chagashroom Field",                     // 2
-        "Clover Patch",                          // 3  
+        "Clover Patch",                          // 3
         "Cobalt Plant",                          // 4
         "Dummy",                                // 5
         "Gamboge Plant",                          // 6
@@ -388,8 +389,8 @@ L_Plants:
         "Ruby Bif",                              // 16
         "Topaz  Bif",                             // 17
         "Emerald Bif",                           // 18
-        "Diamond Bif",                           // 19   
-        "Amethyst Bif",                          // 20   
+        "Diamond Bif",                           // 19
+        "Amethyst Bif",                          // 20
         "Sapphire Bif",                          // 21
         "Big Ruby Bif",                            // 22
         "Big Topaz Bif",                          // 23
@@ -405,57 +406,57 @@ L_Plants:
             goto L_Spawn;
             break;
         case 2:
-            spawner(l("ChagashroomField"), ChagashroomField, .@c);    
+            spawner(("ChagashroomField"), ChagashroomField, .@c);
         case 3:
-            spawner(l("CloverPatch"), CloverPatch, .@c);   
+            spawner(("CloverPatch"), CloverPatch, .@c);
         case 4:
-            spawner(l("CobaltPlant"), CobaltPlant, .@c);   
+            spawner(("CobaltPlant"), CobaltPlant, .@c);
         case 5:
-            spawner(l("Dummy"), Dummy, .@c);   
+            spawner(("Dummy"), Dummy, .@c);
         case 6:
-            spawner(l("GambogePlant"), GambogePlant, .@c);   
+            spawner(("GambogePlant"), GambogePlant, .@c);
         case 7:
-            spawner(l("MananaTree"), MananaTree, .@c);   
+            spawner(("MananaTree"), MananaTree, .@c);
         case 8:
-            spawner(l("MauvePlant"), MauvePlant, .@c);   
+            spawner(("MauvePlant"), MauvePlant, .@c);
         case 9:
-            spawner(l("PlushroomField"), PlushroomField, .@c);   
+            spawner(("PlushroomField"), PlushroomField, .@c);
         case 10:
-            spawner(l("SmallRubyBif"), SmallRubyBif, .@c);   
+            spawner(("SmallRubyBif"), SmallRubyBif, .@c);
         case 11:
-            spawner(l("SmallTopazBif"), SmallTopazBif, .@c);   
+            spawner(("SmallTopazBif"), SmallTopazBif, .@c);
         case 12:
-            spawner(l("SmallEmeraldBif"), SmallEmeraldBif, .@c);   
+            spawner(("SmallEmeraldBif"), SmallEmeraldBif, .@c);
         case 13:
-            spawner(l("SmallDiamondBif"), SmallDiamondBif, .@c);   
+            spawner(("SmallDiamondBif"), SmallDiamondBif, .@c);
         case 14:
-            spawner(l("SmallAmethystBif"), SmallAmethystBif, .@c);   
+            spawner(("SmallAmethystBif"), SmallAmethystBif, .@c);
         case 15:
-            spawner(l("SmallSapphireBif"), SmallSapphireBif, .@c);   
+            spawner(("SmallSapphireBif"), SmallSapphireBif, .@c);
         case 16:
-            spawner(l("RubyBif"), RubyBif, .@c);   
+            spawner(("RubyBif"), RubyBif, .@c);
         case 17:
-            spawner(l("TopazBif"), TopazBif, .@c);   
+            spawner(("TopazBif"), TopazBif, .@c);
         case 18:
-            spawner(l("EmeraldBif"), EmeraldBif, .@c);   
+            spawner(("EmeraldBif"), EmeraldBif, .@c);
         case 19:
-            spawner(l("DiamondBif"), DiamondBif, .@c);   
+            spawner(("DiamondBif"), DiamondBif, .@c);
         case 20:
-            spawner(l("AmethystBif"), AmethystBif, .@c);   
+            spawner(("AmethystBif"), AmethystBif, .@c);
         case 21:
-            spawner(l("SapphireBif"), SapphireBif, .@c);   
+            spawner(("SapphireBif"), SapphireBif, .@c);
         case 22:
-            spawner(l("BigRubyBif"), BigRubyBif, .@c);   
+            spawner(("BigRubyBif"), BigRubyBif, .@c);
         case 23:
-            spawner(l("BigTopazBif"), BigTopazBif, .@c);   
+            spawner(("BigTopazBif"), BigTopazBif, .@c);
         case 24:
-            spawner(l("BigEmeraldBif"), BigEmeraldBif, .@c);   
+            spawner(("BigEmeraldBif"), BigEmeraldBif, .@c);
         case 25:
-            spawner(l("BigDiamondBif"), BigDiamondBif, .@c);   
+            spawner(("BigDiamondBif"), BigDiamondBif, .@c);
         case 26:
-            spawner(l("BigAmethystBif"), BigAmethystBif, .@c);   
+            spawner(("BigAmethystBif"), BigAmethystBif, .@c);
         case 27:
-            spawner(l("BigSapphireBif"), BigSapphireBif, .@c);   
+            spawner(("BigSapphireBif"), BigSapphireBif, .@c);
 
             }
 
@@ -464,7 +465,7 @@ L_Plants:
     mes "Completed.";
     mes "Total spawns: "+str(@log_spawns);
     next;
-    goto L_Plant;    
+    goto L_Plant;
 
 
 L_Agr:
@@ -478,9 +479,9 @@ L_Agr:
         "Centaur",                                  // 7
         "Dark Lizard",                               // 8
         "Desert Bandit",                             // 9
-        "Fallen Guard",                              // 10   
+        "Frista Guard",                              // 10
         "Forain",                                   // 11
-        "Frostia Guard",                             // 12
+        "Halin Guard",                             // 12
         "House Maggot",                               // 13
         "Magic Goblin",                              // 14
         "Mountain Snake",                            // 15
@@ -489,8 +490,8 @@ L_Agr:
         "Skeleton",                                 // 18
         "Snake",                                    // 19
         "Tipiu",                                    // 20
-        "Vampire Bat",                               // 21        
-        "Wolvern",                                  // 22    
+        "Vampire Bat",                               // 21
+        "Wolvern",                                  // 22
         "Yeti",                                     // 23
 
 
@@ -502,49 +503,49 @@ L_Agr:
             goto L_Spawn;
             break;
         case 2:
-            spawner(l("AngryRedScorpion"), AngryRedScorpion, .@c);   
+            spawner(("AngryRedScorpion"), AngryRedScorpion, .@c);
         case 3:
-            spawner(l("AngryScorpion"), AngryScorpion, .@c);    
+            spawner(("AngryScorpion"), AngryScorpion, .@c);
         case 4:
-            spawner(l("Bandit"), Bandit, .@c);    
+            spawner(("Bandit"), Bandit, .@c);
         case 5:
-            spawner(l("BlackScorpion"), BlackScorpion, .@c);    
+            spawner(("BlackScorpion"), BlackScorpion, .@c);
         case 6:
-            spawner(l("CaveMaggot"), CaveMaggot, .@c);    
+            spawner(("CaveMaggot"), CaveMaggot, .@c);
         case 7:
-            spawner(l("Centaur"), Centaur, .@c);    
+            spawner(("Centaur"), Centaur, .@c);
         case 8:
-            spawner(l("DarkLizard"), DarkLizard, .@c);    
+            spawner(("DarkLizard"), DarkLizard, .@c);
         case 9:
-            spawner(l("DesertBandit"), DesertBandit, .@c);    
+            spawner(("DesertBandit"), DesertBandit, .@c);
         case 10:
-            spawner(l("FallenGuard"), FallenGuard, .@c);    
+            spawner(("Frostia Guard"), FallenGuard1, .@c);
         case 11:
-            spawner(l("Forain"), Forain, .@c);    
+            spawner(("Forain"), Forain, .@c);
         case 12:
-            spawner(l("FrostiaGuard"), FrostiaGuard, .@c);    
+            spawner(("Halin Guard"), FallenGuard2, .@c);
         case 13:
-            spawner(l("HouseMaggot"), HouseMaggot, .@c);    
+            spawner(("HouseMaggot"), HouseMaggot, .@c);
         case 14:
-            spawner(l("MagicGoblin"), MagicGoblin, .@c);    
+            spawner(("MagicGoblin"), MagicGoblin, .@c);
         case 15:
-            spawner(l("MountainSnake"), MountainSnake, .@c);    
+            spawner(("MountainSnake"), MountainSnake, .@c);
         case 16:
-            spawner(l("OceanPirate"), OceanPirate, .@c);    
+            spawner(("OceanPirate"), OceanPirate, .@c);
         case 17:
-            spawner(l("Sarracenus"), Sarracenus, .@c);    
+            spawner(("Sarracenus"), Sarracenus, .@c);
         case 18:
-            spawner(l("Skeleton"), Skeleton, .@c);    
+            spawner(("Skeleton"), Skeleton, .@c);
         case 19:
-            spawner(l("Snake"), Snake, .@c);    
+            spawner(("Snake"), Snake, .@c);
         case 20:
-            spawner(l("Tipiu"), Tipiu, .@c);    
+            spawner(("Tipiu"), Tipiu, .@c);
         case 21:
-            spawner(l("VampireBat"), VampireBat, .@c);    
+            spawner(("VampireBat"), VampireBat, .@c);
         case 22:
-            spawner(l("Wolvern"), Wolvern, .@c);    
+            spawner(("Wolvern"), Wolvern, .@c);
         case 23:
-            spawner(l("Yeti"), Yeti, .@c);    
+            spawner(("Yeti"), Yeti, .@c);
 
             }
 
@@ -553,7 +554,7 @@ L_Agr:
     mes "Completed.";
     mes "Total spawns: "+str(@log_spawns);
     next;
-    goto L_Agr    
+    goto L_Agr
 
 
 
@@ -565,7 +566,10 @@ L_Agr:
     next;
     goto L_Agr;
 
-L_Gm:
+L_EventOnly:
+    mes col("WARNING: Spawn these monsters with moderation!", 1);
+    mes col("Some of them have FORBIDDEN DROPS, which will be DELETED when their event starts!", 1);
+    mes "";
     select
         "Abort",                                                            // 1
         "Bhop Fluffy",                                                       // 2
@@ -586,23 +590,23 @@ L_Gm:
             goto L_Spawn;
             break;
         case 2:
-            spawner(l("BhopFluffy"), BhopFluffy, .@c);
+            spawner(("BhopFluffy"), BhopFluffy, .@c);
         case 3:
-            spawner(l("EasterMouboo"), EasterMouboo, .@c);
+            spawner(("EasterMouboo"), EasterMouboo, .@c);
         case 4:
-            spawner(l("EvilScythe"), EvilScythe, .@c);
+            spawner(("EvilScythe"), EvilScythe, .@c);
         case 5:
-            spawner(l("Jack'O"), Jack'O, .@c);    
+            spawner(("Jack'O"), Jack'O, .@c); // WUT
         case 6:
-            spawner(l("MagicRatto"), MagicRatto, .@c);   
+            spawner(("MagicRatto"), MagicRatto, .@c);
         case 7:
-            spawner(l("Moonshroom"), Moonshroom, .@c);   
+            spawner(("Moonshroom"), Moonshroom, .@c); // WUT
         case 8:
-            spawner(l("SmallMagicBif"), SmallMagicBif, .@c);   
+            spawner(("SmallMagicBif"), SmallMagicBif, .@c);
         case 9:
-            spawner(l("MagicBif"), MagicBif, .@c);   
+            spawner(("MagicBif"), MagicBif, .@c);
         case 10:
-            spawner(l("BigMagicBif"), BigMagicBif, .@c);   
+            spawner(("BigMagicBif"), BigMagicBif, .@c);
     }
 
     @log_spawns=@log_spawns+.@c;
@@ -610,7 +614,7 @@ L_Gm:
     mes "Completed.";
     mes "Total spawns: "+str(@log_spawns);
     next;
-    goto L_Gm;
+    goto L_EventOnly;
 
 L_Boss:
     select
@@ -628,15 +632,15 @@ L_Boss:
             goto L_Spawn;
             break;
         case :
-            spawner(l("GiantMutatedBat"), GiantMutatedBat, .@c);
+            spawner(("GiantMutatedBat"), GiantMutatedBat, .@c);
         case :
-            spawner(l("MurdererScorpion"), MurdererScorpion, .@c);
+            spawner(("MurdererScorpion"), MurdererScorpion, .@c);
         case :
-            spawner(l("NightScorpion"), NightScorpion, .@c);
+            spawner(("NightScorpion"), NightScorpion, .@c);
         case :
-            spawner(l("SaxsoGhost"), SaxsoGhost, .@c);
+            spawner(("SaxsoGhost"), SaxsoGhost, .@c);
         case :
-            spawner(l("TheYetiKing"), TheYetiKing, .@c);
+            spawner(("TheYetiKing"), TheYetiKing, .@c);
 
     }
 
@@ -657,6 +661,7 @@ L_Drop:
     goto L_Menu;
 
 L_Bgif:
+    delitem(StrangeCoin,10);
     makeitem(BronzeGift, 1, "001-1", rand(171,319), rand(20,138));
     mes "";
     mes "Bronze Gift Dropped.";
@@ -664,6 +669,7 @@ L_Bgif:
     goto L_Menu;
 
 L_Sgif:
+    delitem(StrangeCoin,10);
     makeitem(SilverGift, 1, "001-1", rand(171,319), rand(20,138));
     mes "";
     mes "Silver Gift Dropped.";