Fixes, and some improvements and related.

3 files changed, 38 insertions, 7 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index f46b137af..fccb372a7 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -329,6 +329,12 @@ quest_db: (
 	Name: "SQuest_Paxel"
 },
 
+// ID 400+: Event Quests
+{
+	Id: 400
+	Name: "Q_NivalisLibday"
+},
+
 // ID 1000+: Test quests
 {
 	Id: 1000
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 7520d26bb..340be1d1a 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -132,6 +132,9 @@ 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");
         $NLIB_DAY=1;
+        $NLIB_HIGHTIME=0;
+        $NLIB_HIGHNAME$="";
+        addmapmask "019-3", MASK_MATTACK;
         $UPDATE=1539721040;
         debugmes "";
         debugmes "* SQL Upgrade (no effect on new installations)";
diff --git a/npc/019-2/guards.txt b/npc/019-2/guards.txt
index f4fe2dcb2..810632851 100644
--- a/npc/019-2/guards.txt
+++ b/npc/019-2/guards.txt
@@ -5,20 +5,19 @@
 //    Protect Nivalis
 
 019-2,44,54,0	script	Guard#019-2.1	NPC_GUARD1,{
-    /*
-    legiontalk;
-    end;
-    */
+    .@q=getq(Q_NivalisLibday);
+
     if ($NIVALIS_LIBDATE) {
         mesn;
         mesq l("Nivalis was liberated @@ ago.", FuzzyTime($NIVALIS_LIBDATE));
         // TODO
-        mesc l("Due town state, you cannot visit it. Do you want to cross?"), 1;
+        mesc l("Due town state, you cannot visit it. Do you want to cross to the other side?"), 1;
         next;
-        if (askyesno == ASK_YES)
+        if (askyesno() == ASK_YES)
             warp "019-1", 70, 30;
         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;
         close;
@@ -30,7 +29,10 @@
             "Yes",
             "No";
         if (@menu == 2) {
+            addmapmask "019-3", MASK_MATTACK;
             $NLIB_DAY=1;
+            $NLIB_HIGHTIME=0;
+            $NLIB_HIGHNAME$="";
             channelmes("#world", "Nivalis Liberation Day has started.");
             announce "Nivalis Liberation Day has started.", bc_all|bc_npc;
         }
@@ -46,6 +48,7 @@ L_Noob:
     next;
     mesn;
     mesq l("Are you up for the challenge?");
+
     close;
 
 L_Veteran:
@@ -56,12 +59,31 @@ L_Veteran:
 
 L_MK:
     mesn;
-    mesq l("Today at 16:30 UTC we are going to attack the Monster King by surprise. There will be no delays.");
+    mesq l("Today at 16:30 UTC we are going to attack the Monster King by surprise. There will be no delays, so be there.");
+    close;
+// Misc
+L_Delay:
+    mesn;
+    mesq l("You already helped us today. Come back tomorrow.");
     close;
 
 OnInit:
+    if ($NLIB_DAY)
+            addmapmask "019-3", MASK_MATTACK;
+
     .sex = G_MALE;
     .distance = 5;
     end;
+
+OnHour00:
+    if ($NLIB_DAY)
+        $NLIB_DAY+=1;
+    end;
+
+OnClock1830:
+    if (!$NLIB_DAY)
+        end;
+
+    end;
 }