From 3e168bc5acda3c3109de0f6713ccd61e70d82fdb Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 5 May 2020 14:25:33 -0300
Subject: Minor improvements to Kamelot (REQUIRED)
---
npc/042-10/ctrl.txt | 20 ++++++++++----------
npc/042-11/boss.txt | 3 +++
2 files changed, 13 insertions(+), 10 deletions(-)
(limited to 'npc')
diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt
index 189fbcaca..bf7a9d2d7 100644
--- a/npc/042-10/ctrl.txt
+++ b/npc/042-10/ctrl.txt
@@ -428,9 +428,9 @@ function script KamelotSwitch {
.@g=getcharid(2);
if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care
if ($KAMELOT_PASSCODE[.@g] & 1)
- dispbottom l("There is power on the north");
+ dispbottom l("The power system is ##Bactive##b on the north.");
else
- dispbottom l("The north sleeps.");
+ dispbottom l("The north power system is offline.");
end;
OnInit:
@@ -441,9 +441,9 @@ OnInit:
.@g=getcharid(2);
if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care
if ($KAMELOT_PASSCODE[.@g] & 2)
- dispbottom l("There is power on the south");
+ dispbottom l("The power system is ##Bactive##b on the south.");
else
- dispbottom l("The south sleeps.");
+ dispbottom l("The south power system is offline.");
end;
OnInit:
@@ -454,9 +454,9 @@ OnInit:
.@g=getcharid(2);
if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care
if ($KAMELOT_PASSCODE[.@g] & 1)
- dispbottom l("There is power on the west");
+ dispbottom l("The power system is ##Bactive##b on the west.");
else
- dispbottom l("The west sleeps.");
+ dispbottom l("The west power system is offline.");
end;
OnInit:
@@ -467,9 +467,9 @@ OnInit:
.@g=getcharid(2);
if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care
if ($KAMELOT_PASSCODE[.@g] & 8)
- dispbottom l("There is power on the east");
+ dispbottom l("The power system is ##Bactive##b on the east.");
else
- dispbottom l("The east sleeps.");
+ dispbottom l("The east power system is offline.");
end;
OnInit:
@@ -480,9 +480,9 @@ OnInit:
.@g=getcharid(2);
if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care
if ($KAMELOT_PASSCODE[.@g] & 16)
- dispbottom l("There is power on the maze");
+ dispbottom l("The power system is ##Bactive##b on the main.");
else
- dispbottom l("The maze sleeps.");
+ dispbottom l("The main power system is offline.");
end;
OnInit:
diff --git a/npc/042-11/boss.txt b/npc/042-11/boss.txt
index a5afe9efc..e5afa07d8 100644
--- a/npc/042-11/boss.txt
+++ b/npc/042-11/boss.txt
@@ -199,6 +199,9 @@ OnKillBoss:
.@gf=$KAMELOT_PC[.@g];
areamonster(.@m$, 20, 20, 57, 40, strmobinfo(1, .@gtype), .@gtype, .@gf);
+ // Possibly, we forgot stuff in Throne Room...
+ killmonsterall("042-0@"+.@g);
+
// Guild Master Notification
.@gm$=getguildmaster(.@g);
if (!getcharid(3, .@gm$)) end;
--
cgit v1.2.3-70-g09d2