Fix Peter's quest so you can get 2450 GP in Candor (not counting Tolchi & Beer)

5 files changed, 143 insertions, 2 deletions

diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt
index 24ee6917b..56cca9eeb 100644
--- a/npc/002-1/peter.txt
+++ b/npc/002-1/peter.txt
@@ -309,7 +309,7 @@ L_Reward:
     mesq l("Good job!") + " " + l("Here's your reward!");
     getexp 100, 0;
     Zeny = Zeny + 1000;
-    message strcharinfo(0), l("You receive @@ E!", 1000);
+    message strcharinfo(0), l("You receive @@ GP!", 1000);
 
     goto L_CleaningClose;
 
@@ -334,6 +334,6 @@ OnNoGoodTick:
 
 OnInit:
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/002-2/_import.txt b/npc/002-2/_import.txt
index c5d03ceaa..5b662cf60 100644
--- a/npc/002-2/_import.txt
+++ b/npc/002-2/_import.txt
@@ -1,2 +1,5 @@
 // Map 002-2: Hold
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/002-2/doors.txt",
+"npc/002-2/mapflags.txt",
+"npc/002-2/ratto.txt",
diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt
new file mode 100644
index 000000000..09317360d
--- /dev/null
+++ b/npc/002-2/doors.txt
@@ -0,0 +1,69 @@
+// Evol scripts.
+// Authors:
+//    Ablu
+//    Alastrim
+//    Reid
+// Description:
+//    Doors NPCs.
+
+002-2,48,29,0	script	DoorUpwards	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    if (mobcount("002-2","all") > 0) goto L_Warn;
+
+    goto L_Warp;
+
+L_Warn:
+    .@q = getq(ShipQuests_Peter);
+    if (.@q == 5) goto L_Warp;
+
+    mesn "Narrator";
+    mes col(l("There are still some rattos left! Do you want to abort the quest?"), 9);
+    next;
+
+    menu
+        l("Yes."), L_Warp,
+        l("No."), -;
+
+    warp "002-2", 48, 28;
+    closeclientdialog;
+    close;
+
+L_Warp:
+    warp "002-1", 72, 36;
+    closeclientdialog;
+    close;
+}
+
+002-2,24,31,0	script	LeftDoor	NPC_HIDDEN,0,0,{
+
+OnTouch:
+    mesn "Narrator";
+    mes col(l("It seems that you need a key to open this door."), 9);
+    next;
+    mes col(l("What do you want to do?"), 9);
+    next;
+
+    menu
+        rif(countitem(718) > 0, l("Use the key.")), L_Warp,
+        l("Break the door."), L_Break,
+        l("Go away."), -;
+
+    closeclientdialog;
+    close;
+
+L_Break:
+
+    mes "";
+    mesn "Narrator";
+    mes col(l("You hear a loud scream. It must be the creaking of the wooden door..."), 9);
+
+    close;
+
+L_Warp:
+    mes "";
+    mesn "Narrator";
+    mes col(l("Wait, it seems someone is blocking the door from the other side!"), 9);
+
+    close;
+}
diff --git a/npc/002-2/mapflags.txt b/npc/002-2/mapflags.txt
new file mode 100644
index 000000000..b2449ecd6
--- /dev/null
+++ b/npc/002-2/mapflags.txt
@@ -0,0 +1 @@
+002-2	mapflag	nosave	002-1,72,36
diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt
new file mode 100644
index 000000000..32499f437
--- /dev/null
+++ b/npc/002-2/ratto.txt
@@ -0,0 +1,68 @@
+// Evol scripts.
+// Authors:
+//    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,47,30,0	script	RattosControl	NPC_HIDDEN,{
+
+OnSpawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    close;
+
+OnRatto1Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death";
+    $@RAT_SAILOR_CONTROL[1] = 0;
+    $@RAT_SAILOR_CONTROL[5] = 0;
+    end;
+
+OnRatto2Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death";
+    $@RAT_SAILOR_CONTROL[2] = 0;
+    $@RAT_SAILOR_CONTROL[6] = 0;
+    end;
+
+OnRatto3Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death";
+    $@RAT_SAILOR_CONTROL[3] = 0;
+    $@RAT_SAILOR_CONTROL[7] = 0;
+    end;
+
+OnRatto4Respawn:
+    areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death";
+    $@RAT_SAILOR_CONTROL[4] = 0;
+    $@RAT_SAILOR_CONTROL[8] = 0;
+    end;
+
+OnRatto1Death:
+    $@RAT_SAILOR_CONTROL[1] = 1;
+    end;
+
+OnRatto2Death:
+    $@RAT_SAILOR_CONTROL[2] = 1;
+    end;
+
+OnRatto3Death:
+    $@RAT_SAILOR_CONTROL[3] = 1;
+    end;
+
+OnRatto4Death:
+    $@RAT_SAILOR_CONTROL[4] = 1;
+    end;
+}