From 0daf11a75304af002e99d645b5519a54b72ceb7e Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 23 Feb 2021 22:39:38 -0300
Subject: Fix typos on Lightbringer NPC

---
 npc/functions/gmbot.txt | 20 ++++++++++++++------
 npc/functions/util.txt  |  1 +
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 898f636b8..4f65857af 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -7,12 +7,12 @@
 boss,45,42,0	script	Lightbringer	NPC_LIGHTBRINGER,{
     function movelb;
     function matrixlb;
+    function notAvailable;
 
-    if ($GAME_STORYLINE >= 3) goto L_Today;
-    npctalkonce l("It still isn't time to awake the King Of Holy Swords, Light Bringer.");
-    end;
+    if ($GAME_STORYLINE < 3) notAvailable();
+    if (islegendary()) notAvailable();
+    if ($LIGHT_HOLDER$ != "") notAvailable();
 
-L_Today:
     .@q=getq(General_Narrator);
     // Prologue missed - straight refusal
     if (.@q < 19) {
@@ -56,12 +56,20 @@ L_Today:
     if ($GAME_STORYLINE < 5)
         .@btime+=$MK_TEMPVAR;
 
+    // TODO: If (@lbscore > 100 && $GAME_STORYLINE > 3 && !holder) goto L_Perma;
+
     rentitem Lightbringer, (.@btime*(@lbscore-60));
     dispbottom l("This live sword drafts itself to your hand. You can wield it for a while.");
     disablenpc .name$;
     .busy=gettimetick(2)+(.@btime*(@lbscore-60))*3/2;
     end;
 
+function notAvailable {
+    npctalkonce l("It still isn't time to awake the King Of Holy Swords, Light Bringer.");
+    end;
+    return;
+}
+
 OnInit:
     .sex = G_OTHER;
     .distance = 2;
@@ -77,8 +85,8 @@ OnInit:
     // We should jump straight to loop (it runs every 5 minutes)
 OnTimer300000:
     .users=getusers(1);
-    // If $LIGHTBRINGER_OWNER$ is set, we die here
-    if ($LIGHTBRINGER_OWNER$ != "")
+    // If $LIGHT_HOLDER$ is set, we die here
+    if ($LIGHT_HOLDER$ != "")
         end;
 
     // Proccess busy time
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 3ea88524b..80071b375 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -637,6 +637,7 @@ function	script	alignment	{
 // islegendary( {strcharinfo} )
 function	script	islegendary	{
     .@you$ = getarg(0, strcharinfo(0));
+    // TODO: countitem(Lightbringer) => Because rent time?
     return (.@you$ == $LIGHT_HOLDER$ ||
             .@you$ == $AEGIS_HOLDER$ ||
             .@you$ == $TYRAN_HOLDER$ ||
-- 
cgit v1.2.3-60-g2f50