Merge branch 'jesusalva/petertime' into 'master'

Give players 5 seconds to pick up loot once Peter's quest is complete

See merge request evol/serverdata!195

4 files changed, 9 insertions, 5 deletions

diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index 060fa660..06825f0c 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -256,6 +256,7 @@ OnTimeout:
 // It's not _buggy_, it is just reckless. I would like a setting to restrict it
 // to destroy only instances owned by the char, or to destroy by name :p
 OnDone:
+    warp "000-2-1", 72, 36;
     .@q3 = getq3(ShipQuests_Peter);
     //instance_destroy(.@q3);
     if (@peter)
diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt
index 14f98201..d30ccd17 100644
--- a/npc/000-2-2/ratto.txt
+++ b/npc/000-2-2/ratto.txt
@@ -86,12 +86,13 @@ OnRatto4Death:
 // This label is reached when all rattos are dead. We clear the respawn timers
 // (as we are going to delete the instance map anyway), warp you outside, and
 // from there onwards, Peter handles properly rewarding you.
-L_Victor:
-    warp "000-2-1", 72, 36;
+OnVictor:
     deltimer("RattosControl::OnRatto1Respawn");
     deltimer("RattosControl::OnRatto2Respawn");
     deltimer("RattosControl::OnRatto3Respawn");
     deltimer("RattosControl::OnRatto4Respawn");
-    doevent("Peter::OnDone");
+    addtimercount("Peter::OnTimeout", 5000);
+    addtimer(5000, "Peter::OnDone");
+    dispbottom l("It looks like all monsters were killed.");
     end;
 }
diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt
index 85d80bbb..9c4402a2 100644
--- a/npc/001-2-22/peter.txt
+++ b/npc/001-2-22/peter.txt
@@ -256,6 +256,7 @@ OnTimeout:
 // It's not _buggy_, it is just reckless. I would like a setting to restrict it
 // to destroy only instances owned by the char, or to destroy by name :p
 OnDone:
+    warp "001-2-22", 72, 36;
     .@q3 = getq3(ShipQuests_Peter);
     //instance_destroy(.@q3);
     if (@peter)
diff --git a/npc/001-2-23/ratto.txt b/npc/001-2-23/ratto.txt
index 9b4130f6..24bb1e1a 100644
--- a/npc/001-2-23/ratto.txt
+++ b/npc/001-2-23/ratto.txt
@@ -87,11 +87,12 @@ OnRatto4Death:
 // (as we are going to delete the instance map anyway), warp you outside, and
 // from there onwards, Peter handles properly rewarding you.
 L_Victor:
-    warp "001-2-22", 72, 36;
     deltimer("RattosControl#Artis::OnRatto1Respawn");
     deltimer("RattosControl#Artis::OnRatto2Respawn");
     deltimer("RattosControl#Artis::OnRatto3Respawn");
     deltimer("RattosControl#Artis::OnRatto4Respawn");
-    doevent("Peter#Artis::OnDone");
+    addtimercount("Peter#Artis::OnTimeout", 5000);
+    addtimer(5000, "Peter#Artis::OnDone");
+    dispbottom l("It looks like all monsters were killed.");
     end;
 }