1 files changed, 51 insertions, 40 deletions

diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index e7aa3336..331f9dba 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -45,42 +45,12 @@
         .@size_good_translated *= 7;
         if (.@k >= .@size_good  || .@k_translated >= .@size_good_translated)
         {
-            debugmes .@k + " " + .@k_translated;
             return 1;
         }
         return 0;
     }
 
-    function enora_quest {
-        speech 5,
-            l("She wants? What if I don't want?"),
-            l("I'm not a pawn of the Legion, I don't have to obey you!"),
-            l("Oh and guess what, I'm soon out of potions anyway.");
-
-        switch (select (l("And where can I find these potions?"),
-                        l("You bored me, see you later.")))
-        {
-            case 1:
-                break;
-            case 2:
-                return;
-        }
-
-        speech 5,
-            l("You don't seem to be from the Legion, let's do a game."),
-            l("If you find the correct answer, I will give you these potions..."),
-            l("But if you fail, you will have to get them from the alchemist."),
-            l("Deal?");
-
-        switch (select (l("[Yes]"),
-                        l("[No]")))
-        {
-            case 1:
-                break;
-            case 2:
-                return;
-        }
-
+    function riddle_enigma {
         speech 5,
             l("Ok fine, you have up to 3 tries, here is the riddle:"),
             l("What is growing and shrinking in same time?");
@@ -96,7 +66,10 @@
 
             if (verify_riddle_answer (.@answer$, "life"))
             {
-                // setq (ArtisQuests_Enora, 9);
+                if (getq (ArtisQuests_Enora) == 7)
+                {
+                    setq (ArtisQuests_Enora, 9);
+                }
                 speech 5,
                     l("Oh..."),
                     l("You seem more cultivated than what you look like."),
@@ -112,7 +85,10 @@
             }
             else
             {
-                // setq (ArtisQuests_Enora, 8);
+                if (getq (ArtisQuests_Enora) == 7)
+                {
+                    setq (ArtisQuests_Enora, 8);
+                }
                 speech 5,
                     l("You failed!"),
                     l("Ivan is the one that you should look at now."),
@@ -123,7 +99,39 @@
             }
         } while (1);
 
+        return;
+    }
+
+    function enora_quest {
+        speech 5,
+            l("She wants? What if I don't want?"),
+            l("I'm not a pawn of the Legion, I don't have to obey you!"),
+            l("Oh and guess what, I'm soon out of potions anyway.");
 
+        switch (select (l("And where can I find these potions?"),
+                        l("You bored me, see you later.")))
+        {
+            case 1:
+                break;
+            case 2:
+                return;
+        }
+
+        speech 5,
+            l("You don't seem to be from the Legion, let's do a game."),
+            l("If you find the correct answer, I will give you these potions..."),
+            l("But if you fail, you will have to get them from the alchemist."),
+            l("Deal?");
+
+        switch (select (l("[Yes]"),
+                        l("[No]")))
+        {
+            case 1:
+                riddle_enigma;
+                break;
+            case 2:
+                break;
+        }
         return;
     }
 
@@ -163,11 +171,11 @@
 
         menuint
             //rif (.@enora == 7, l("Enora wants her potions.")), 0,
-            l("Enora wants her potions."), 0,
             l("[Trade]"), 1,
-            l("How do you do your potions?"), 2,
-            l("What are you reading?"), 3,
-            l("[Quit]"), 4;
+            rif (.@enora > 7, l("What was your riddle?")), 2,
+            l("How do you do your potions?"), 3,
+            l("What are you reading?"), 4,
+            l("[Quit]"), 5;
 
         switch (@menuret)
         {
@@ -179,18 +187,21 @@
                 shop "Store#Potion001-1";
                 close;
             case 2:
-                alchemist_information;
+                riddle_enigma;
                 break;
             case 3:
+                alchemist_information;
+                break;
+            case 4:
                 speech 5,
                     l("It's a poem, about poems... Why are you asking that?"),
                     l("Because I am an orc I can't read such things? That's rubbish."),
                     l("I borrowed it from the library, you should try to cultivate yourself more instead of insunuate such things to people you don't know!");
                 break;
-            case 4:
+            case 5:
                 break;
         }
-    } while (@menuret != 4);
+    } while (@menuret != 5);
 
     closedialog;
     goodbye;