Maptimers at Gak. Prevent rushers.

1 files changed, 14 insertions, 2 deletions

diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt
index a720bc26..4ac66fde 100644
--- a/npc/080-1/final.txt
+++ b/npc/080-1/final.txt
@@ -45,6 +45,11 @@ OnInit:
         closedialog;
         end;
     }
+    /* Prevent rushers */
+    if (getareausers(getmap(), 6) < getmapusers(getmap())) {
+        dispbottom l("I wait everyone reach here, first.");
+        end;
+    }
     inventoryplace Carrot, 1;
     .@gak$=instance_npcname("Gak#X21");
     .@ali$=instance_npcname("Alissa#ED2");
@@ -112,10 +117,17 @@ OnInit:
     // We're done
     'XMAS21CUTSCENE=false;
     'XMAS21ENDING=true;
-    X21ED2_DOCLEAR();
-    getitembound Carrot, 1, 4;
+    maptimer2(10, instance_npcname(.name$)+"::OnFin");
     end;
 
+OnFin:
+    // Originally not planned, but no time to finish
+    // Consider this just another corner I have cut...
+    if (!X21ED2_CLEAR()) {
+        X21ED2_DOCLEAR();
+        getitembound Carrot, 1, 4;
+    }
+    end;
 
 OnInit:
     .distance=4;