2 files changed, 72 insertions, 3 deletions

diff --git a/npc/032-1/episode.txt b/npc/032-1/episode.txt
index bd0cb00dd..aa6f81e51 100644
--- a/npc/032-1/episode.txt
+++ b/npc/032-1/episode.txt
@@ -7,6 +7,14 @@
 // Elli is capable to use magic without a mana stone, which puts her on the same
 // level as the Moubootaur and the Mana Source.
 032-1,58,129,0	script	Elli	NPC_ELLI,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
+    if (!.@q && getq3(LoFQuest_EPISODE)) {
+        mesn;
+        mesq l("Hi.");
+        if (is_master())
+            setq2 LoFQuest_EPISODE, 1;
+        close;
+    }
     npctalk3 l("Hi.");
     end;
 
@@ -18,7 +26,8 @@ OnInit:
 032-1,59,126,0	script	#InnerEP	NPC_HIDDEN,0,0,{
     end;
 OnTouch:
-    if (is_master()) // FIXME
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
+    if (getq(LoFQuest_EPISODE) > 15 || .@q)
         slide 52, 127;
     else
         dispbottom l("This door is locked.");
@@ -26,6 +35,7 @@ OnTouch:
 }
 
 032-1,68,54,0	script	Adrian	NPC_PLAYER,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
     npctalk3 l("Hi. Are you here to get luggage?");
     end;
 
@@ -44,6 +54,7 @@ OnInit:
 }
 
 032-1,45,36,0	script	Marikel	NPC_PLAYER,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
     npctalk3 l("Hi. Working on the docks can be hard, but I'm glad I at least get to eat!");
     end;
 
@@ -62,6 +73,7 @@ OnInit:
 }
 
 032-1,75,46,0	script	Joelin	NPC_FEMALE,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
     npctalk3 l("Hi. My ship is about to set sail, we'll try to find somewhere better to live than this ruined place!");
     end;
 
@@ -80,6 +92,7 @@ OnInit:
 }
 
 032-1,77,46,0	script	Harper	NPC_PLAYER,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
     npctalk3 l("Hi. My captain believe the world is round, can you believe that?");
     end;
 
@@ -98,6 +111,7 @@ OnInit:
 }
 
 032-1,112,142,0	script	Banu	NPC_GLASS_OLD_LADY,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
     npctalk3 l("Hi. My back hurts!");
     end;
 
@@ -107,15 +121,69 @@ OnInit:
 }
 
 032-1,151,201,0	script	Eurni	NPC_EURNI,{
-    npctalk3 l("Hi. I have questionable items of questionable origins for you.");
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
+    if (.@q) {
+        npctalk3 l("Hi. I have questionable items of questionable origins for you.");
+        openshop;
+    } else {
+        mesn;
+        mesq l("Hi. I have questionable items of questionable origins for you.");
+        next;
+        select
+            l("Trade"),
+            l("The Queen's Party?"),
+            l("Not now.");
+        mes "";
+        if (@menu == 1) {
+            openshop;
+            closeclientdialog;
+        }
+        else if (@menu == 2) {
+            mesn;
+            mesq l("I always do shady deals. *cough cough* %s GP.", fnum(500));
+            next;
+            if (askyesno() == ASK_YES && Zeny >= 500) {
+                Zeny-=500;
+                setq3 LoFQuest_EPISODE, getq3(LoFQuest_EPISODE) | 1;
+                mesn;
+                mesq l("They are hidden in the crypts, inside a cave.");
+                next;
+                mesn;
+                mesq l("This conversation never happened.");
+            }
+        }
+        close;
+    }
     end;
 
 OnInit:
-    .distance=5;
+	sellitem Bread, getiteminfo(Bread, ITEMINFO_BUYPRICE)*16/10;
+	sellitem Cheese, getiteminfo(Cheese, ITEMINFO_BUYPRICE)*16/10;
+	sellitem ChamomileTea, getiteminfo(ChamomileTea, ITEMINFO_BUYPRICE)*18/10;
+	sellitem BugLeg, getiteminfo(BugLeg, ITEMINFO_BUYPRICE)*192/10;
+	sellitem LazuriteShard, 700;
+	sellitem MaggotSlime, getiteminfo(MaggotSlime, ITEMINFO_BUYPRICE)*192/10;
+	sellitem Coal, getiteminfo(Coal, ITEMINFO_BUYPRICE)*132/10;
+	sellitem Lockpicks, 10000;
+	sellitem IcedBottle, getiteminfo(IcedBottle, ITEMINFO_BUYPRICE)*32/10;
+	sellitem Wurtzite, getiteminfo(Wurtzite, ITEMINFO_BUYPRICE)*164/10;
+	sellitem StrangeCoin, 1000000;
+	sellitem WumpusEgg, 99999999;
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+
+// Pay your taxes!
+OnBuyItem:
+    end;
+
+OnSellItem:
     end;
 }
 
 032-1,140,213,0	script	Weellos	NPC_LEGACY_GUARD_B,{
+    .@q = (getq(LoFQuest_EPISODE) == 15 ? getq2(LoFQuest_EPISODE) : 99);
     npctalk3 l("Hi. This is a very historic building - the former residence of the red queen no less!");
     end;
 
diff --git a/npc/items/lofteleporter.txt b/npc/items/lofteleporter.txt
index ce0fa8105..eb1f9addd 100644
--- a/npc/items/lofteleporter.txt
+++ b/npc/items/lofteleporter.txt
@@ -109,6 +109,7 @@ OnUse:
         case 8:
             //atcommand("@block "+strcharinfo(0));
             setq2 LoFQuest_EPISODE, 0;
+            setq3 LoFQuest_EPISODE, 0;
             warp "032-1", 23, 25;
             TELEPORTER_TIME=loftel_time(360, .@x*2);
             @timer_navio_running=0;