From 3021284f1c9fe196bf180f263bc83044fd24907e Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 4 Jan 2019 23:10:38 -0200
Subject: Some clearly buggy code on Peter and RattoControl

---
 npc/002-1/peter.txt | 5 +++--
 npc/002-2/ratto.txt | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'npc')

diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt
index 1bdcff698..c8911e9fe 100644
--- a/npc/002-1/peter.txt
+++ b/npc/002-1/peter.txt
@@ -225,20 +225,21 @@ OnStartOutside:
 OnTimeout:
     if (!(getmap() ~= "002-2") && !(getmap() ~= "nard"))
         end;
+    warp "002-1@"+LOCATION$, 35, 26;
     .@q3 = getq3(ShipQuests_Peter);
     instance_destroy(.@q3);
     setq2 ShipQuests_Peter, 0;
     setq3 ShipQuests_Peter, -1;
     mesn;
     mesq l("Hey! Be careful. You can't stay in this basement for so long, you're going to get sick. Come outside and take a break, maybe you can try again later.");
-    warp "002-1@"+LOCATION$, 35, 26;
     close;
 
 OnDone:
+    .@q3 = getq(ShipQuests_Peter);
+    instance_destroy(.@q3);
     if (@peter)
         setq ShipQuests_Peter, getq(ShipQuests_Peter)|@peter, 0, -1;
 
-    warp "002-1@"+LOCATION$, 35, 26;
     .@q = getq(ShipQuests_Peter);
     mesn;
     mesq l("Good job!") + " " + l("Here's your reward!");
diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt
index 92dd857ef..82190f2ca 100644
--- a/npc/002-2/ratto.txt
+++ b/npc/002-2/ratto.txt
@@ -33,32 +33,32 @@ OnRatto4Respawn:
     end;
 
 OnRatto1Death:
-    .@q2=getq2(ShipQuests_Peter);
     setq2 ShipQuests_Peter, .@q2|1;
+    .@q2=getq2(ShipQuests_Peter);
     if (.@q2 == 15)
         goto L_Victor;
     addtimer(65000, "RattosControl::OnRatto1Respawn");
     end;
 
 OnRatto2Death:
-    .@q2=getq2(ShipQuests_Peter);
     setq2 ShipQuests_Peter, .@q2|2;
+    .@q2=getq2(ShipQuests_Peter);
     if (.@q2 == 15)
         goto L_Victor;
     addtimer(65000, "RattosControl::OnRatto2Respawn");
     end;
 
 OnRatto3Death:
-    .@q2=getq2(ShipQuests_Peter);
     setq2 ShipQuests_Peter, .@q2|4;
+    .@q2=getq2(ShipQuests_Peter);
     if (.@q2 == 15)
         goto L_Victor;
     addtimer(65000, "RattosControl::OnRatto3Respawn");
     end;
 
 OnRatto4Death:
-    .@q2=getq2(ShipQuests_Peter);
     setq2 ShipQuests_Peter, .@q2|8;
+    .@q2=getq2(ShipQuests_Peter);
     if (.@q2 == 15)
         goto L_Victor;
     addtimer(65000, "RattosControl::OnRatto4Respawn");
-- 
cgit v1.2.3-60-g2f50