From 67cad3e5c11261cb6af6890701afb462b192dadc Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 19 Jan 2020 23:26:47 -0300
Subject: Favor for kamibroadcast()

---
 npc/006-1/crazyfefe.txt | 4 ++--
 npc/019-2/guards.txt    | 3 +--
 npc/functions/siege.txt | 7 ++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index 01c298214..deb8a65cc 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -151,8 +151,7 @@ function Challenge {
     @crazypoints=1;
     initnpctimer;
     .@msg$=$@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!";
-    announce .@msg$, bc_all|bc_npc;
-    channelmes("#world", .@msg$);
+    kamibroadcast(.@msg$);
     mesn;
     mesq l("Please wait, the fight will start in @@, as requested.", FuzzyTime($@FEFE_DELAY,2,2));
     close;
@@ -341,6 +340,7 @@ OnTimer300000:
     .@msg$=$@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!";
     announce .@msg$, bc_all|bc_npc;
     //channelmes("#world", .@msg$);
+    //kamibroadcast(.@msg$);
     initnpctimer;
     end;
 
diff --git a/npc/019-2/guards.txt b/npc/019-2/guards.txt
index 1047beea8..04ca49117 100644
--- a/npc/019-2/guards.txt
+++ b/npc/019-2/guards.txt
@@ -41,8 +41,7 @@
             disablenpc "#020-1_70_128";
             disablenpc "#020-1_107_55";
             enablenpc "Lightbringer#NLib";
-            channelmes("#world", "Nivalis Liberation Day has started.");
-            announce "Nivalis Liberation Day has started.", bc_all|bc_npc;
+            kamibroadcast("Nivalis Liberation Day has started.");
         }
         close;
     } else {
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 35b681102..1b34d02d3 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -356,7 +356,7 @@ function	script	do_siege	{
         detachrid();
     }
 
-    // No one is active, cancel the event
+    // No one is active, cancel the event (FIXME)
     if (!.@idle) {
         kamibroadcast(col(b("EVENT CANCELLED DUE TO PLAYER INACTIVITY"),1));
         $@MK_AGGRO=$@MK_AGGRO/5; // Lower aggro bar to 20%
@@ -494,10 +494,11 @@ OnCaptainDeath:
     end;
 
 OnColonelDeath:
-    if ($GAME_STORYLINE == 2)
+    if ($GAME_STORYLINE == 2) {
         $MK_TEMPVAR+=7;
+        $MOST_HEROIC$=strcharinfo(0);
+    }
     getitem StrangeCoin, rand2(15,20);
-    $MOST_HEROIC$=strcharinfo(0);
     announce("##2The Monster Colonel was defeated by "+strcharinfo(0)+"!", bc_all);
     $@EXP_EVENT=rand2(10, 12);
     $@EXP_EVENT_TIME=1;
-- 
cgit v1.2.3-60-g2f50