1 files changed, 33 insertions, 5 deletions

diff --git a/npc/018-5/town.txt b/npc/018-5/town.txt
index 1c3ffa8fd..8a9d07369 100644
--- a/npc/018-5/town.txt
+++ b/npc/018-5/town.txt
@@ -6,7 +6,6 @@
 
 // .@q = LilitQuest_Access
 // 0 - Access not granted
-//      q2 - Number of attempts
 // 1 - Access granted
 // 2 - Tree Minigame complete.
 
@@ -49,9 +48,13 @@ L_AccessDenied:
     if (@menu == 1) {
         mesn ("???");
         mesc l("DIE, FILTHY @@!",  strtoupper(get_race()));
+        movecam rand(-20,20), rand(-20,20);
+        sleep2(60);
+        restorecam;
         percentheal -30, -30;
         next;
     } else {
+        closeclientdialog;
         warp "018-5-1", 77, 53;
         end;
     }
@@ -79,7 +82,7 @@ L_AccessDenied:
     mesq l("I am the Yetifly, guardian of butter and fairies.");
     next;
     mesn l("Yetifly the Mighty");
-    mesq l("AND YOU ARE NOT WELCOME HERE!!"), 1;
+    mesc l("AND YOU ARE NOT WELCOME HERE!!"), 1;
     movecam rand(-20,20), rand(-20,20);
     sleep2(60);
     movecam rand(-20,20), rand(-20,20);
@@ -100,7 +103,7 @@ L_AccessDenied:
     mesc l("How will you respond?!"), 1;
     select
         l("Bring it on!"),
-        l("Nah I am a chicken :b");
+        l("Nah, I am a chicken.");
     mes "";
     if (@menu == 2) {
         closeclientdialog;
@@ -117,14 +120,39 @@ L_AccessDenied:
     next;
     mesn l("Yetifly the Mighty");
     mesq l("So, you just need to survive for one minute, and I'll consider you are good enough.");
+    mesc l("Word of the wise: You can freely challenge the Yetifly later.", 2);
     if (getskilllv(NV_TRICKDEAD)) mesc l("WARNING: Fake Death skill is disabled on the fight."), 1;
     next;
     mesc l("Click \"Next\" to begin the fight."), 1;
     next;
     closeclientdialog;
-    //addtimer(1000, "ready? + 1s GO! spawn and keep flowing timers every 10s to check if map is OK + finish.");
+
     // Create instance.
-    warp "018-5-boss", 0, 0;
+    .@ID=getcharid(0);
+    @MAP_NAME$="lilt@"+str(.@ID); // Max 4 chars for map name
+    .@INSTID = instance_create("lilt@a"+(.@ID), getcharid(3), IOT_CHAR);
+    .@instanceMapName$ = instance_attachmap("018-5-boss", .@INSTID, 0, @MAP_NAME$);
+
+    // Instance already exists, or something went wrong
+    if (.@instanceMapName$ == "") {
+        mesn l("Yetifly the Mighty");
+        mesc l("*put his glasses on*");
+        next;
+        mesn l("Yetifly the Mighty");
+        mesq l("Whaaaaaat, you are that noob from earlier! Vanish! Be gone! Don't bore me!");
+        next;
+        warp "018-5-1", 77, 53;
+        closeclientdialog;
+        close;
+    }
+
+    // Everything went right, create the instance, it expires after 2 minutes
+    instance_set_timeout(120, 120, .@INSTID);
+    instance_init(.@INSTID);
+
+    YETIFLY_INSTANCE=.@INSTID;
+    addtimer(1000, "#YetiFlyChallengeCtrl::OnWarn1");
+    warp @MAP_NAME$, 31, 41;
     end;
 }