* Lena's quest

* Add Inn to towns
* Add Merchant Guild to towns
* Add Soul Menhir to Towns
* Add Barbers to towns
* Add General Store to towns
* Some work for blacksmith & tailoring
* Kadiya's placeholder (no quest for r1, sorry D:)
* Anwar Quest
* Joaquim Quest
* Updates on Artis Blacksmith and Julia's intro
* some work on fishing spots
* Bosses and Master Skill Book ("about" one per region)
* Asphodel Moors population (no quests and incomplete)

1 files changed, 19 insertions, 31 deletions

diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 0e95fdd9..3fb19179 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -151,37 +151,10 @@
         mesn;
         mesq l("Ok, done.");
 
-        if (getq(ShipQuests_Julia) == 2)
-        {
-            next;
-            mesq l("Do you have any other questions for me?");
-            next;
-            ynMenu;
-            return;
-        }
-
-        next;
-        mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules of proper social conduct on board.");
-
-        mesq l("Here they are.");
-        next;
-
-        narrator S_LAST_NEXT,
-            l("There is a paper with some rules written on it.");
-
-        GameRules 8 | 4;
-
-        mesn;
-        mesq l("Oh, and I almost forgot! Do not give the password of your room to anybody! I am the only one who has the other key and I won't ask for yours so keep it secret and try not to use the same password for any other room in the future.");
-        next;
-        mesq l("If you want to read this page again, there is a copy up on the left wall.");
         next;
-        mesq l("You can also read The Book of Laws at any time to see the rules.");
-        next;
-        mesq l("I think I'm done with that now. Do you have any questions?");
+        mesq l("Do you have any other questions for me?");
         next;
-
-        setq ShipQuests_Julia, 2;
+        ynMenu;
         return;
     }
 
@@ -289,9 +262,24 @@ OnTouch:
     next;
     mesq lg("I'm glad to see you're okay.");
     next;
-    mesq lg("Could I ask you what your native language is? A sailor told me you're from Ancea, but another one told me you're from Aemil because of the logo that... never mind. I'm a bit lost, if you could tell me what language you speak I will register you on the ship passenger list just after that.");
+
+    mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules of proper social conduct on board.");
+
+    narrator S_LAST_NEXT,
+        l("There is a paper with some rules written on it.");
+
+    GameRules 8 | 4;
+
+    mesn;
+    mesq l("Oh, and I almost forgot! Do not give the password of your room to anybody! I am the only one who has the other key and I won't ask for yours so keep it secret and try not to use the same password for any other room in the future.");
+    next;
+    mesq l("If you want to read this page again, there is a copy up on the left wall.");
+    next;
+    mesq l("You can also read The Book of Laws at any time to see the rules.");
+    setq ShipQuests_Julia, 2;
+    next;
+    mesq l("I think I'm done with that now. Do you have any questions?");
     next;
-    chooseLang;
     mainMenu;
     end;