Enhanced Peters quest

Rewrote peters quest.
Added conditional warp for check whether quest is done.
Corrected some tweaks.

3 files changed, 41 insertions, 15 deletions

diff --git a/npc/000-2-2/_import.txt b/npc/000-2-2/_import.txt
index 653897f6..cf2e566a 100644
--- a/npc/000-2-2/_import.txt
+++ b/npc/000-2-2/_import.txt
@@ -1,4 +1,4 @@
 map: 000-2-2.gat
 npc: npc/000-2-2/_mobs.txt
 npc: npc/000-2-2/_warps.txt
-npc: npc/000-2-2/area.txt
+npc: npc/000-2-2/doors.txt
diff --git a/npc/000-2-2/area.txt b/npc/000-2-2/area.txt
deleted file mode 100644
index afc2e9f3..00000000
--- a/npc/000-2-2/area.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Evol scripts.
-// Authors:
-//		Reid
-// Description:
-//    Rat killer NPC
-
-000-2-2.gat,24,31,0,1	script	AreaNPC	0,0,1,{
-
-OnTouch:
-
-	mesq l("This door seems locked");
-	close;
-
-}
\ No newline at end of file
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
new file mode 100644
index 00000000..912b3096
--- /dev/null
+++ b/npc/000-2-2/doors.txt
@@ -0,0 +1,40 @@
+// Evol scripts.
+// Authors:
+//		Reid
+// Description:
+//    Rat killer NPC
+
+000-2-2.gat,48,29,0,1	script	DoorUpwards	0,0,0,{
+
+OnTouch:
+	set @q, geta4(ShipQuests, ShipQuests_Peter);
+	if (@q == 1 || @q == 2) goto l_Check;
+	goto l_Warp;
+
+l_Check:
+	if (getmapmobs("000-2-2.gat") > 0) goto l_Warn;
+	seta4 ShipQuests, ShipQuests_Peter, @q+2;
+	goto l_Warp;
+
+l_Warn:
+	mesn;
+	mesq l("There are still some rats left! Do you want to abort the quest?");
+	menu
+	  l("Yes."), l_Warp,
+	  l("No."), -;
+	warp "000-2-2", 48, 28;
+	close;
+
+l_Warp:
+	warp "000-2-1", 61, 35;
+	close;
+}
+
+000-2-2.gat,24,31,0,1	script	AreaNPC	0,0,1,{
+
+OnTouch:
+
+	mesq l("This door seems locked");
+	close;
+
+}