From 1a570ae3f4bbac85852252b32e39999edbc88968 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 21 Oct 2021 13:43:36 -0300
Subject: Fix Peter bugs leftovers. Attempt to correct a Sorfina bug.

---
 npc/003-4/sorfina.txt | 2 +-
 npc/003-4/warp.txt    | 3 ++-
 npc/functions/hub.txt | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt
index e9977201d..be0dbb4a0 100644
--- a/npc/003-4/sorfina.txt
+++ b/npc/003-4/sorfina.txt
@@ -42,7 +42,7 @@ L_Trouble:
     mesn;
     mesc l("Sorfina recomposes herself.");
     mesq l("There is a rare kind of scorpion, the Murderer Scorpion. Very dangerous.");
-    setq TulimsharQuest_Hasan, 3, -1;
+    setq TulimsharQuest_Hasan, 3, 0;
     next;
     goto L_Basement;
 
diff --git a/npc/003-4/warp.txt b/npc/003-4/warp.txt
index df3360fff..9a5d26ac2 100644
--- a/npc/003-4/warp.txt
+++ b/npc/003-4/warp.txt
@@ -3,7 +3,8 @@
 003-4,38,31,0	script	Mahoud Basement	NPC_HIDDEN,0,0,{
 
 OnTouch:
-    if (isinstance(getq2(TulimsharQuest_Hasan)) && getq2(TulimsharQuest_Hasan) != 0)
+    // Instance 0 is reserved by system
+    if (instanceowner(getq2(TulimsharQuest_Hasan)) == getcharid(3))
         warp "hasn@"+str(getcharid(0)), 34, 27;
     else if (getq(TulimsharQuest_Hasan) > 3)
         warp "003-4-1", 34, 27;
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 45fd8979b..831bd2e0f 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -135,7 +135,7 @@ function	script	HUB_Logout	{
     // Logout/Death on Nard's ship hold
     if (compare(.@mapa$, "002-2") || compare(.@mapa$,"nard")) {
         setq2 ShipQuests_Peter, 0;
-        setq3 ShipQuests_Peter, -1;
+        setq3 ShipQuests_Peter, 0; // Bugfix
     }
     // Logout on botcheck area
     if (compare(.@mapa$,"botcheck") && !.@dead) {
-- 
cgit v1.2.3-60-g2f50