From b1313b20dd9418c3a7d1d9780dcf862742971c38 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 14 Jan 2021 16:06:38 -0300
Subject: Broken statues are, erm, broken.

---
 npc/025-1/ctrl.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c
index 0a34871af..f9f04be01 100644
--- a/npc/025-1/ctrl.c
+++ b/npc/025-1/ctrl.c
@@ -34,15 +34,13 @@
 // FTCleanup(status)
 function	script	FTCleanup	{
     $FORTRESS_STATE=getarg(0);
-    // TODO: Magic Statues (FTStatue)
+    // Enable the Magic Statues
     $@FORTRESS_STATUE=0;
-    // TODO: NPCs
-    //enablenpc "Magic Statue#F_1";
-    //enablenpc "Magic Statue#F_2";
-    //enablenpc "Magic Statue#F_4";
-    //enablenpc "Magic Statue#F_8";
-    //enablenpc "Magic Statue#F_16";
-    // TODO: ::OnConquest
+    enablenpc "Magic Statue#1";
+    enablenpc "Magic Statue#2";
+    enablenpc "Magic Statue#4";
+    enablenpc "Magic Statue#8";
+    enablenpc "Magic Statue#16";
     // Kill stray monsters (including town gate)
     killmonsterall("025-1");
     // Main gate
@@ -70,21 +68,22 @@ function	script	FTStatue	{
     next;
     mesc l("It seems to be a defensive spell.");
     if ($FORTRESS_STATE)
-        return;
+        return false;
 
     // Break the statues?
     mesc l("Break the Statue?"), 1;
     next;
     if (askyesno() == ASK_YES) {
         if ($@FORTRESS_STATUE & .@id)
-            return;
+            return false;
         sc_start SC_STUN, 10000, 1;
         doevent("Fortress::OnStatueBreach");
         mapannounce("025-1", strcharinfo(0)+" has broken a statue!", bc_map);
         $@FORTRESS_STATUE=$@FORTRESS_STATUE|.@id;
+        return true;
     }
 
-    return;
+    return false;
 }
 
 
@@ -304,7 +303,9 @@ OnConquest:
 /////////////////////////////////////////////////////////
 // TODO: Statue NPCs
 025-1,80,115,0	script	Magic Statue#1	NPC_STATUE_WIZARD,{
-    FTStatue(strnpcinfo(2, "0"));
+    .@b=FTStatue(strnpcinfo(2, "0"));
+    if (.@b)
+        disablenpc .name$;
     close;
 
 OnInit:
-- 
cgit v1.2.3-70-g09d2