Simplify Marggo (the countdown went from 60s to 5s)

1 files changed, 21 insertions, 36 deletions

diff --git a/npc/005-1-1/main.txt b/npc/005-1-1/main.txt
index 93db929e2..8b3ed4a74 100644
--- a/npc/005-1-1/main.txt
+++ b/npc/005-1-1/main.txt
@@ -38,27 +38,12 @@
     end;
 
 OnStart:
-    //initnpctimer;
-    if ($@GM_OVERRIDE) {
-        addtimer(400, "Nylo#Marggo::OnTimer55000");
-        addtimer(5000, "Nylo#Marggo::OnTimer60000");
-        addtimer(5300, "Nylo#Marggo::OnBegin");
-        end;
-    }
-    addtimer(10000, "Nylo#Marggo::OnTimer10000");
-    addtimer(20000, "Nylo#Marggo::OnTimer20000");
-    addtimer(30000, "Nylo#Marggo::OnTimer30000");
-    addtimer(40000, "Nylo#Marggo::OnTimer40000");
-    addtimer(50000, "Nylo#Marggo::OnTimer50000");
-    addtimer(55000, "Nylo#Marggo::OnTimer55000");
-    addtimer(60000, "Nylo#Marggo::OnTimer60000");
-    addtimer(60300, "Nylo#Marggo::OnBegin");
     mesn;
-    mesq l("The maggots will spawn in @@ at random.", b(l("60 seconds")));
+    mesq l("The maggots will spawn in @@ at random.", b(l("5 seconds")));
     mes l("Read the instructions carefully.");
     next;
     mesn l("Time Limit");
-    mes l("Campaign starts after 60 seconds. Eight maggots will spawn on the next 100 seconds.");
+    mes l("Campaign starts after 5 seconds. Eight maggots will spawn on the next 100 seconds.");
     mes l("Four minutes after the warp, or when the last maggot die, it'll be over.");
     next;
     mesn l("Victory Conditions");
@@ -66,34 +51,33 @@ OnStart:
     mes l("If you save 90% from the crops or more, you'll also get a @@.", getitemlink(RoundLeatherShield));
     mes l("== If you decide to complete the quest you cannot repeat it.");
     next;
-    mes l("Good luck!");
+    closeclientdialog;
+    dispbottom "Nylo : " + l("Good luck!");
+    addtimer(5300, "Nylo#Marggo::OnBegin");
+    addtimer(5000, "Nylo#Marggo::OnTimer5000");
+    addtimer(4000, "Nylo#Marggo::OnTimer4000");
+    addtimer(3000, "Nylo#Marggo::OnTimer3000");
+    addtimer(2000, "Nylo#Marggo::OnTimer2000");
+    addtimer(1000, "Nylo#Marggo::OnTimer1000");
     close;
 
-OnTimer10000:
-    dispbottom "50 seconds!";
-    end;
-
-OnTimer20000:
-    dispbottom "40 seconds!";
-    end;
-
-OnTimer30000:
-    dispbottom "30 seconds!";
+OnTimer1000:
+    dispbottom "4!";
     end;
 
-OnTimer40000:
-    dispbottom "20 seconds!";
+OnTimer2000:
+    dispbottom "3!";
     end;
 
-OnTimer50000:
-    dispbottom "10 seconds!";
+OnTimer3000:
+    dispbottom "2!";
     end;
 
-OnTimer55000:
-    dispbottom "5 seconds!";
+OnTimer4000:
+    dispbottom "1!";
     end;
 
-OnTimer60000:
+OnTimer5000:
     dispbottom l("Start!");
     //stopnpctimer;
     end;
@@ -220,7 +204,8 @@ OnFinish:
     if (.@ratio >= 80) {
         inventoryplace RoundLeatherShield, 1;
         mesc l("Complete Quest?");
-        mesc l("You won't be able to aim for a better record!");
+        if (.@ratio < 90)
+            mesc l("You won't be able to aim for a better record!"), 1;
         menuint
             l("Yes, I'm done with it."), ASK_YES,
             l("No, I want to aim for a higher score."), ASK_NO;