From bcb88c0deaa105aa86ae7029c228210904a687fe Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 29 Apr 2019 12:50:56 -0300
Subject: The Monster King is now allowed to siege Nivalis and Halinarzo.

Today I already did 27 commits.
---
 db/constants.conf       |  2 ++
 npc/commands/event.txt  |  8 ++++++++
 npc/functions/gmbot.txt | 20 ++++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/db/constants.conf b/db/constants.conf
index d7bd41bf0..a5be50f8b 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4281,6 +4281,8 @@ constants_db: {
 	MK_LOCKED:              1
 	MK_SIEGE_TULIM:         2
 	MK_SIEGE_HURNS:         3
+	MK_SIEGE_NIVAL:         4
+	MK_SIEGE_HALIN:         5
 
 	comment__: "Being actions"
 	ACTION_STAND:  0
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 25f3e17c1..b3b556b82 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -263,10 +263,18 @@ OnCall:
             warp "003-1", 40, 49;
             specialeffect(63, AREA, getcharid(3));
             end;
+        case MK_SIEGE_HALIN:
+            warp "009-1", 27, 30;
+            specialeffect(63, AREA, getcharid(3));
+            end;
         case MK_SIEGE_HURNS:
             warp "012-1", 87, 70;
             specialeffect(63, AREA, getcharid(3));
             end;
+        case MK_SIEGE_NIVAL:
+            warp "020-1", 57, 62;
+            specialeffect(63, AREA, getcharid(3));
+            end;
         }
 
         // Aeros Events takes precedence over permanent events
diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 2d7bbc2c7..2c55f43ed 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -99,10 +99,10 @@ OnTimer90000:
 
     // Select a random map. Never shows up at Candor and cities, nor indoors. Not all maps either.
     setarray .@m$,  "boss", "boss", "001-1", "001-3", "001-4", "001-5", "001-6", "001-7", "001-10",
-                    "003-1", "003-1-3", "004-1", "004-2", "007-1", "010-1", "010-1-1", "010-2", "011-1",
+                    "003-1", "003-1-3", "004-1", "004-2", "007-1", "009-1", "010-1", "010-1-1", "010-2", "011-1",
                     "012-1", "014-1", "014-2", "014-3", "014-4", "014-5", "015-1", "015-2", "015-3", "015-5",
                     "018-1-1", "018-2", "018-3", "018-4", "018-4-1",
-                    "019-1", "019-2", "019-4", "021-1", "022-1", "023-1";
+                    "019-1", "019-2", "019-4", "020-1", "021-1", "022-1", "023-1";
     .mp$=any_of(.@m$);
 
     // Try to warp randomly, up to 30 attempts
@@ -145,12 +145,24 @@ OnTimer90000:
             $@MK_SCENE=MK_SIEGE_TULIM;
             donpcevent("Lieutenant Dausen::OnMKSiege");
         }
-        // Hurnscald (will never happen, MK doesn't visits 012-1)
-        if (.mp$ ~= "012-*") {
+        // Halinarzo
+        else if (.mp$ ~= "009-*") {
+            announce ("Monster King: I smell humans! Humans must die!"), bc_map|bc_npc;
+            $@MK_SCENE=MK_SIEGE_HALIN;
+            donpcevent("Lieutenant Jacob::OnMKSiege");
+        }
+        // Hurnscald
+        else if (.mp$ ~= "012-*") {
             announce ("Monster King: I smell humans! Humans must die!"), bc_map|bc_npc;
             $@MK_SCENE=MK_SIEGE_HURNS;
             donpcevent("#HurnscaldSiege::OnMKSiege");
         }
+        // Nivalis
+        else if (.mp$ ~= "020-*") {
+            announce ("Monster King: I smell humans! Humans must die!"), bc_map|bc_npc;
+            $@MK_SCENE=MK_SIEGE_NIVAL;
+            donpcevent("Lieutenant Joshua::OnMKSiege");
+        }
     }
 
     // If a player is nearby while the Monster King prepares, event may happen
-- 
cgit v1.2.3-70-g09d2