Merge branch 'jesusalva/legion' into 'master's20190422

Package Legion for travel.

Closes evol-all#25

See merge request evol/serverdata!174

6 files changed, 78 insertions, 19 deletions

diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 67936b4b..7cf4e132 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -32,11 +32,15 @@ OnUnTouch:
 
 OnTouch:
     .@enora = getq(ArtisQuests_Enora);
+    .@legion = getq(Artis_Legion_Progress);
+    .@brotherhood = getq(General_Brotherhood);
     if (.@enora < 11)
     {
         setfakecells 57, 41, 1;
         end;
     }
+    if (.@legion == 6 && !.@brotherhood)
+        addtimer 30, "Sophialla#001-1::OnLegionComplete";
     setfakecells 57, 41, 0;
     doorTouch;
 
diff --git a/npc/001-1/flags.txt b/npc/001-1/flags.txt
index 10ebf3c4..5e70c25a 100644
--- a/npc/001-1/flags.txt
+++ b/npc/001-1/flags.txt
@@ -1,25 +1,17 @@
 // Evol scripts.
 // Author:
 //    Micksha
+//    Jesusalva
 // Description:
 //    The flags supposed to mark Rowboat unmounting spots in Artis
 // THIS IS A PLACEHOLDER!
 
 001-1,200,63,0	script	Flag#1	NPC_FLAG_L,{
     OnTouch:
-        narrator S_LAST_NEXT,
-            l("You see a suspicious greenish flag. It reminds you of something you seem to have forgotten.");
-}
-
-001-1,27,101,0	script	Flag#2	NPC_FLAG_R,{
-    OnTouch:
-        narrator S_LAST_NEXT,
-            l("You see a suspicious greenish flag. It reminds you of something you seem to have forgotten.");
-}
-
-001-1,68,139,0	script	Flag#3	NPC_FLAG_R,{
-    OnTouch:
-        narrator S_LAST_NEXT,
+        narrator
             l("You see a suspicious greenish flag. It reminds you of something you seem to have forgotten.");
+        close;
 }
 
+001-1,27,101,0	duplicate(Flag#1)	Flag#2	NPC_FLAG_R
+001-1,68,139,0	duplicate(Flag#1)	Flag#3	NPC_FLAG_R
diff --git a/npc/001-1/koga.txt b/npc/001-1/koga.txt
index da0ab629..2595be63 100644
--- a/npc/001-1/koga.txt
+++ b/npc/001-1/koga.txt
@@ -9,7 +9,18 @@
     speech
         l("Ah, whom did you bring here?"),
         l("Isnt that the one Nard found on a float in the sea, with the sign of the Legion on his chest?");
-        l("I hope they know what they are doing. So, come on board. I am looking forward to go back to Woodland, haven't been there for a while.");
+    next;
+    mesc l("Travel to woodlands?");
+    if (askyesno() == ASK_YES)
+    {
+        speech
+            l("I hope they know what they are doing. So, come on board. I am looking forward to go back to Woodland, haven't been there for a while.");
+        next;
+        closeclientdialog;
+        setmount 0;
+        warp "008-1-1", 33, 63;
+        dispbottom l("After a tiring, yet fast, travel by Koga, you arrive at @@.", l("Woodlands"));
+    }
 
     close;
 
diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt
index 3c8429a4..fa95f737 100644
--- a/npc/001-1/rowboat.txt
+++ b/npc/001-1/rowboat.txt
@@ -15,9 +15,16 @@
         l("Do you have this commendatory letter?");
         closeclientdialog();
     if (askyesno() == 1) {
-        slide 204, 62;
-        movenpc("#Rowboat", 192, 25);
-        setmount 1;
+        if (getq(General_Brotherhood) >= 2)
+        {
+            slide 204, 62;
+            movenpc("#Rowboat", 192, 25);
+            setmount 1;
+        }
+        else
+        {
+            npctalk3 l("You're lying, aren't you? I heard nothing from you-know-whom!");
+        }
     close;
     }
 
diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt
index 675cfdaf..19c27be6 100644
--- a/npc/001-1/rowboathelper.txt
+++ b/npc/001-1/rowboathelper.txt
@@ -27,8 +27,9 @@
             l("Maybe you should try this phrase?"));
         if (askyesno() == ASK_YES)
         {
-            narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
-                l("'Enter strange phrase here.'"));
+            mesn strcharinfo(0);
+            mesc l("Sagratha is great.");
+            next;
 
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Hello, a rowboat is on his way to the beach. Please wait for a while for it to arrive.");
diff --git a/npc/001-1/sophialla.txt b/npc/001-1/sophialla.txt
index ad4d508a..ad0755ec 100644
--- a/npc/001-1/sophialla.txt
+++ b/npc/001-1/sophialla.txt
@@ -6,15 +6,59 @@
 // THIS IS A PLACEHOLDER!
 
 001-1,73,40,0	script	Sophialla#001-1	NPC_SOPHIALLA,{
+    .@q=getq(General_Brotherhood);
+    if (!.@q)
+    {
+        speech
+            l("Hello."),
+            l("Can't you see I am reading? Please go, please.");
+        close;
+    }
     speech
         l("Hello."),
         l("Can't you see I am reading? If you need something, tell me the secret password.");
+    // TODO: Use a token to know password or whatever
+    select
+        l("Sorry to disturb you."),
+        rif(getq(ArtisQuests_MonaDad) == 3, l("Sagratha is great.")),
+        l("I don't know the password");
+    mes "";
+    if (@menu == 2)
+    {
+        speech
+            l("If you visit the sewers again... You'll find secret passages..."),
+            l("Look for the hideout, but tell no one about this. Then, say the password again.");
+        compareandsetq General_Brotherhood, 1, 2;
+    }
+
+    speech
         lg("If you don't know it, just go, please.");
+    close;
 
+OnLegionComplete:
+    restorecam;
+    mesn "???";
+    mesc l("A strange voice seems to be calling out your name.");
+    next;
+    // NOTE: Sophialla is more than 15 tiles of distance from player
+    // Server refuses to send client data about where she is and that makes
+    // setcamnpc fail. This is why I set .alwaysVisible attribute to true.
+    // Note: you can work around with coordinates, but she won't be drawn.
+    setcamnpc "Sophialla#001-1";
+    mesn;
+    mesq l("Hey. ppst. I have something important to tell you.");
+    next;
+    mesn;
+    mesq l("I just can't remember what. But come talk to me later once devs becomes less lazy.");
+    setq General_Brotherhood, 1;
+    next;
+    restorecam;
+    closeclientdialog;
     close;
 
 OnInit:
     .sex = G_FEMALE;
     .distance = 2;
+    .alwaysVisible = true;
     end;
 }