Update contributor list. Make the Monster King speech 1 hour after update

deploy. Bugfixes. Remaster Nivalis Liberation Day. Obligue NLib for locals.
NLib is now level 30+ (instead of 40+), monster list update and code.

5 files changed, 19 insertions, 64 deletions

diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 0e637368e..687d916ed 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -127,10 +127,10 @@ OnInit:
     if ($UPDATE < 1539721040) {
         query_sql("CREATE TABLE IF NOT EXISTS `discord` (`account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',`discord_id` VARCHAR(255) NOT NULL DEFAULT '',`discord_name` VARCHAR(255) NOT NULL DEFAULT '',`verified` ENUM('0', '1') NOT NULL DEFAULT '0') ENGINE=MyISAM");
         $UPDATE=1539721040;
-        $NIVALIS_LIBDATE=1539721040;
+        //$NIVALIS_LIBDATE=1539721040;
         debugmes "";
         debugmes "* SQL Upgrade (no effect on new installations)";
-        debugmes "* Nivalis Liberation Day event skipped";
+        //debugmes "* Nivalis Liberation Day event skipped";
         debugmes "";
     }
     // Current UPDATE value: Dom Nov 18 17:40:30 -02 2018
@@ -299,6 +299,7 @@ OnInit:
         debugmes "";
         debugmes "* Main Storyline system updated";
         debugmes "";
+        donpcevent "@mkdbg::OnMsg1to2";
     }
 
 
@@ -319,7 +320,7 @@ OnInit:
     htput($@CONTRIBUTORS, "saulc",      12500);
     htput($@CONTRIBUTORS, "lawncable",  1800);
     htput($@CONTRIBUTORS, "polaczka",   700);
-    htput($@CONTRIBUTORS, "crazyfefe",  671);
+    htput($@CONTRIBUTORS, "crazyfefe",  674);
     htput($@CONTRIBUTORS, "4144",       550);
     htput($@CONTRIBUTORS, "mishana",    500);
     htput($@CONTRIBUTORS, "soren",      450);
@@ -329,7 +330,7 @@ OnInit:
     htput($@CONTRIBUTORS, "acsvln",     260);
     htput($@CONTRIBUTORS, "ayruss",     210);
     htput($@CONTRIBUTORS, "dustman",    175);
-    htput($@CONTRIBUTORS, "arthur",     110);
+    htput($@CONTRIBUTORS, "arthur",     111);
     htput($@CONTRIBUTORS, "ichigoblack",100);
     htput($@CONTRIBUTORS, "gnulinux",   90);
     htput($@CONTRIBUTORS, "skydragon",  75);
@@ -338,8 +339,9 @@ OnInit:
     htput($@CONTRIBUTORS, "msawis",     30);
     htput($@CONTRIBUTORS, "xanthem",    28);
     htput($@CONTRIBUTORS, "dragonstar", 26);
-    htput($@CONTRIBUTORS, "demure",     22);
+    htput($@CONTRIBUTORS, "demure",     24);
     htput($@CONTRIBUTORS, "aisen",      8);
+    htput($@CONTRIBUTORS, "maisquestce",5);
     htput($@CONTRIBUTORS, "john h",     2);
     htput($@CONTRIBUTORS, "krists",     2);
     htput($@CONTRIBUTORS, "filhote",    1);
diff --git a/npc/019-2/guards.txt b/npc/019-2/guards.txt
index 1a4675057..2119c12a1 100644
--- a/npc/019-2/guards.txt
+++ b/npc/019-2/guards.txt
@@ -15,8 +15,8 @@
         close;
     } else if ($NLIB_DAY > 0) {
         if (.@q == $NLIB_DAY) goto L_Delay;
-        if (BaseLevel < 40) goto L_Noob;
-        if (BaseLevel >= 40) goto L_Veteran;
+        if (BaseLevel < 30) goto L_Noob;
+        if (BaseLevel >= 30) goto L_Veteran;
         close;
     } else if (is_admin()) {
         mesc "Initiate Nivalis Liberation Day?", 1;
diff --git a/npc/020-1/siege.txt b/npc/020-1/siege.txt
index d73d62f15..49b7c41af 100644
--- a/npc/020-1/siege.txt
+++ b/npc/020-1/siege.txt
@@ -14,7 +14,7 @@ OnLoop:
     @nlib_time+=5; // This is looped every 5 s
 
     // Victory conditions: All monsters dead & number of waves filled. (Or if you reach level 40)
-    if (BaseLevel >= 40 || (@nlib_wave >= 10 && mobcount("020-1", "#NLib_Siege::OnPetDeath") <= 0))
+    if (BaseLevel >= 30 || (@nlib_wave >= 10 && mobcount("020-1", "#NLib_Siege::OnPetDeath") <= 0))
         goto L_CleanUp;
 
     // New wave condition: Waves pending and A- All Mobs Dead B- 4 minutes spent
@@ -33,55 +33,10 @@ L_NextRound:
     .@amount=@nlib_wave+rand(1,2);
     freeloop(true);
 	for (.@i = 0; .@i < .@amount; ++.@i) {
-        .@mid=rand(1,22);
-        .@monsterId=Piou;
-        switch (.@mid) {
-            case 1:
-                .@monsterId = CaveMaggot ; break;
-            case 2:
-                .@monsterId = GiantMaggot ; break;
-                //.@monsterId = Wolvern ; break;
-            case 3:
-                .@monsterId = WhiteSlime ; break;
-            case 4:
-                .@monsterId = MagicGoblin ; break;
-            case 5:
-                .@monsterId = Bandit ; break;
-            case 6:
-                .@monsterId = GreenSlime ; break;
-            case 7:
-                .@monsterId = LavaSlime ; break;
-            case 8:
-                .@monsterId = CaveSnake ; break;
-            case 9:
-                .@monsterId = DesertBandit ; break;
-            case 10:
-                .@monsterId = Sarracenus ; break;
-            case 11:
-                .@monsterId = AngryRedScorpion ; break;
-            case 12:
-                .@monsterId = IcedFluffy ; break;
-            case 13:
-                .@monsterId = Scorpion ; break;
-            case 14:
-                .@monsterId = RedScorpion ; break;
-            case 15:
-                .@monsterId = BlackSlime ; break;
-            case 16:
-                .@monsterId = Piousse ; break;
-            case 17:
-                .@monsterId = CandiedSlime ; break;
-            case 18:
-                .@monsterId = BlueSlime ; break;
-            case 19:
-                .@monsterId = SlimeBlast ; break;
-            case 20:
-                .@monsterId = BlackSlime ; break;
-            case 21:
-                .@monsterId = RedSlime ; break;
-            default:
-                .@monsterId = AngryScorpion ; break;
-        }
+        .@monsterId=any(CaveMaggot, WhiteSlime, MagicGoblin, Bandit, GreenSlime,
+                        CaveSnake, LavaSlime, DesertBandit, AngryRedScorpion,
+                        Scorpion, RedScorpion, BlackSlime, Piousse, CandiedSlime,
+                        AzulSlime, BlueSlime, SlimeBlast, RedSlime, AngryScorpion);
         areamonster "020-1", 20, 20, 100, 100, strmobinfo(1, .@monsterId), .@monsterId, 1, "#NLib_Siege::OnPetDeath";
     }
     freeloop(false);
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt
index a9ff6656d..23120ba5c 100644
--- a/npc/commands/kami.txt
+++ b/npc/commands/kami.txt
@@ -55,7 +55,7 @@ function	script	kamibroadcast	{
 -	script	@mkdbg	32767,{
     end;
 OnMsg1to2:
-    detachrid();
+    sleep(3600000);
     // Game Story Change: Idle MK -> Active MK
     kamibroadcast("I can't handle it anymore! NO MORE!", "Monster King");
     sleep(2500);
@@ -67,9 +67,5 @@ OnMsg1to2:
     channelmes("#world", "##1 **GAME STORY CHANGE** - The Monster King minions will now attack cities and lay waste to them.");
     channelmes("#world", "##1 Players must defeat the lieutenants and colonels in order to prevent sieges from continuing.");
     end;
-
-OnInit:
-    bindatcmd "mkdbgjesus", "@mkdbg::OnMsg1to2", 99, 100, 0;
-    end;
 }
 
diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 1b6516d90..a1526dd87 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -13,8 +13,10 @@
 //  0 - The Monster King is inactive (leading sieges to Hurnscald and Nivalis)
 //  1 - The Monster King is known by players and is giving them a month break
 //  2 - The Monster King is currently sieging towns at random
-//  3 - The Monster King is preparing to perfom the Rite
-//  4 - The Rite is in progress. Players must walk to MK evil lair.
+//  3 - The Monster King is preparing to perfom the Rite and Lightbringer seeks
+//      a wielder
+//  4 - The Rite is in progress. Players must walk to MK evil lair and fight.
+//  5 - The Monster King is dead. Or something. Depends on players.
 //
 // $MK_TEMPVAR meaning depends on GAME STORYLINE
 //  GS 0