summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-10-21 13:43:36 -0300
committerJesusaves <cpntb1@ymail.com>2021-10-21 13:43:36 -0300
commit1a570ae3f4bbac85852252b32e39999edbc88968 (patch)
treee1f7f62845c24e97abf222dce91435baf5f09c94
parentd76a9cdac049ae1d6d67bc6db015a34a6cdab113 (diff)
downloadserverdata-1a570ae3f4bbac85852252b32e39999edbc88968.tar.gz
serverdata-1a570ae3f4bbac85852252b32e39999edbc88968.tar.bz2
serverdata-1a570ae3f4bbac85852252b32e39999edbc88968.tar.xz
serverdata-1a570ae3f4bbac85852252b32e39999edbc88968.zip
Fix Peter bugs leftovers. Attempt to correct a Sorfina bug.
-rw-r--r--npc/003-4/sorfina.txt2
-rw-r--r--npc/003-4/warp.txt3
-rw-r--r--npc/functions/hub.txt2
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) {