From f9f1927b941baebfb7c6addd75a5ec63c9a11888 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 27 May 2021 15:26:09 -0300
Subject: Fix typos and improve enforcement at Soren's House

---
 npc/soren-2/main.txt | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/npc/soren-2/main.txt b/npc/soren-2/main.txt
index 5fbd492e0..932d8e881 100644
--- a/npc/soren-2/main.txt
+++ b/npc/soren-2/main.txt
@@ -50,6 +50,13 @@ OnCheck:
     // This doesn't works (or didn't used to), maybe because the way it's called
     if (!mobcount("soren-2", "#SorenSanctum::OnCheck"))
         setnpcdisplay "#SorenSanctum", NPC_SUMMONING_CIRC;
+    else
+        setnpcdisplay "#SorenSanctum", NPC_NO_SPRITE;
+    // Repeat if possible
+    if (!playerattached())
+        end;
+    if (getmap() == "soren-2")
+        addtimer2(10000, "#SorenSanctum::OnCheck");
     end;
 
 OnSanctum:
@@ -80,13 +87,13 @@ OnSanctum:
         .@bonus=1;
     }
 
-    // Generate which monster/item would be dropped, depending on your (un)luck at ODDS
+    // Generate which monster/item would be dropped, depending on your (un)luck at ODDS (FIXME - Mobs not on par with everything else or players level)
     .@mid=rand(1,10)+.@bonus;
     switch (.@mid) {
         case 1:
                 .@monsterId = AngryRedScorpion ; break;
         case 2:
-                .@monsterId = CaveMaggot ; break;
+                .@monsterId = CaveMaggot ; break; // Replace!
         case 3:
                 .@monsterId = SeaSlime ; break;
         case 4:
@@ -116,7 +123,7 @@ OnSanctum:
         case 3:
                 .@itemId = Aquada ; break;
         case 4:
-                .@itemId = StrenghtPotion ; break;
+                .@itemId = StrengthPotion ; break;
         case 5:
                 .@itemId = Plushroom ; break;
         case 6:
@@ -178,7 +185,10 @@ OnSanctum:
         addtimer(rand(15000, 35000)+getusers(1)*5000, "#SorenSanctum::OnSanctum");
     else
         addtimer(rand(25000, 35000)+getusers(1)*5000, "#SorenSanctum::OnSanctum");
-    end;
+
+    // Enforce the policy
+    addtimer2(10000, "#SorenSanctum::OnCheck");
+    goto OnCheck;
 
 
 
-- 
cgit v1.2.3-60-g2f50