Rewrite entirely, Peter Script (along the quest)

2 files changed, 43 insertions, 41 deletions

diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt
index 51bfc1e89..7e1dcb7a1 100644
--- a/npc/002-2/doors.txt
+++ b/npc/002-2/doors.txt
@@ -17,7 +17,7 @@ OnTouch:
 
 L_Warn:
     .@q = getq(ShipQuests_Peter);
-    if (.@q == 5) goto L_Warp;
+    if (.@q >= 4) goto L_Warp;
 
     mesn "Narrator";
     mesc l("There are still some rattos left! Do you want to abort the quest?");
diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt
index 5a5933ef3..92dd857ef 100644
--- a/npc/002-2/ratto.txt
+++ b/npc/002-2/ratto.txt
@@ -1,69 +1,71 @@
-// TMW2 Script; midly modified by Jesusalva.
-// Evol scripts.
-// Authors:
-//    Ablu
-//    Alastrim
-//    Reid
+// TMW2 Script.
+// Author:
+//      Jesusalva
+// Originally an Evol script authored by: Ablu, Alastrim, Reid
 // Description:
 //    Ratto killer.
 
-// $@RAT_SAILOR_CONTROL array explanation:
-// [1] = Shows status of ratto number 1 (1 is dead and 0 is alive).
-// [2] = Shows status of ratto number 2 (1 is dead and 0 is alive).
-// [3] = Shows status of ratto number 3 (1 is dead and 0 is alive).
-// [4] = Shows status of ratto number 4 (1 is dead and 0 is alive).
-// [5] = Shows how many seconds passed since ratto number 1 died.
-// [6] = Shows how many seconds passed since ratto number 2 died.
-// [7] = Shows how many seconds passed since ratto number 3 died.
-// [8] = Shows how many seconds passed since ratto number 4 died.
-// [9] = Shows how many seconds passed since the player started the quest.
-
 002-2,0,0,0	script	RattosControl	NPC_HIDDEN,{
-
-OnSpawn:
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto1Death";
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto2Death";
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto3Death";
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto4Death";
-    close;
+    end;
 
 OnRatto1Respawn:
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto1Death";
-    $@RAT_SAILOR_CONTROL[1] = 0;
-    $@RAT_SAILOR_CONTROL[5] = 0;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2^1;
+    areamonster @MAP_NAME$, 23, 19, 57, 40, strmobinfo(1, @pt_mob), @pt_mob, 1, "RattosControl::OnRatto1Death";
     end;
 
 OnRatto2Respawn:
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto2Death";
-    $@RAT_SAILOR_CONTROL[2] = 0;
-    $@RAT_SAILOR_CONTROL[6] = 0;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2^2;
+    areamonster @MAP_NAME$, 23, 19, 57, 40, strmobinfo(1, @pt_mob), @pt_mob, 1, "RattosControl::OnRatto2Death";
     end;
 
 OnRatto3Respawn:
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto3Death";
-    $@RAT_SAILOR_CONTROL[3] = 0;
-    $@RAT_SAILOR_CONTROL[7] = 0;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2^4;
+    areamonster @MAP_NAME$, 23, 19, 57, 40, strmobinfo(1, @pt_mob), @pt_mob, 1, "RattosControl::OnRatto3Death";
     end;
 
 OnRatto4Respawn:
-    areamonster "002-2", 23, 19, 57, 40, "Ratto", Ratto, 1, "RattosControl::OnRatto4Death";
-    $@RAT_SAILOR_CONTROL[4] = 0;
-    $@RAT_SAILOR_CONTROL[8] = 0;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2^8;
+    areamonster @MAP_NAME$, 23, 19, 57, 40, strmobinfo(1, @pt_mob), @pt_mob, 1, "RattosControl::OnRatto4Death";
     end;
 
 OnRatto1Death:
-    $@RAT_SAILOR_CONTROL[1] = 1;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2|1;
+    if (.@q2 == 15)
+        goto L_Victor;
+    addtimer(65000, "RattosControl::OnRatto1Respawn");
     end;
 
 OnRatto2Death:
-    $@RAT_SAILOR_CONTROL[2] = 1;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2|2;
+    if (.@q2 == 15)
+        goto L_Victor;
+    addtimer(65000, "RattosControl::OnRatto2Respawn");
     end;
 
 OnRatto3Death:
-    $@RAT_SAILOR_CONTROL[3] = 1;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2|4;
+    if (.@q2 == 15)
+        goto L_Victor;
+    addtimer(65000, "RattosControl::OnRatto3Respawn");
     end;
 
 OnRatto4Death:
-    $@RAT_SAILOR_CONTROL[4] = 1;
+    .@q2=getq2(ShipQuests_Peter);
+    setq2 ShipQuests_Peter, .@q2|8;
+    if (.@q2 == 15)
+        goto L_Victor;
+    addtimer(65000, "RattosControl::OnRatto4Respawn");
+    end;
+
+L_Victor:
+    warp "002-1@"+LOCATION$, 35, 26;
+    doevent("Peter::OnDone");
     end;
 }