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

Package Legion for travel.

Closes evol-all#25

See merge request evol/serverdata!174

31 files changed, 266 insertions, 121 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 50edf2f0..1c8e62df 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -56,6 +56,7 @@ map_list: (
     "001-2-9",
     "001-3-0",
     "001-3-1",
+    "001-3-2",
     "008-1-1",
     "008-1",
     "008-2-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index 9885b94d..a0edf6c9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -53,41 +53,42 @@
 001-2-9 53
 001-3-0 54
 001-3-1 55
-008-1-1 56
-008-1 57
-008-2-0 58
-008-2-1 59
-008-2-10 60
-008-2-11 61
-008-2-12 62
-008-2-13 63
-008-2-14 64
-008-2-15 65
-008-2-16 66
-008-2-17 67
-008-2-18 68
-008-2-19 69
-008-2-2 70
-008-2-20 71
-008-2-21 72
-008-2-22 73
-008-2-23 74
-008-2-24 75
-008-2-25 76
-008-2-26 77
-008-2-27 78
-008-2-28 79
-008-2-29 80
-008-2-3 81
-008-2-30 82
-008-2-4 83
-008-2-5 84
-008-2-6 85
-008-2-7 86
-008-2-8 87
-008-2-9 88
-008-3-0 89
-008-3-1 90
-008-4-1 91
-test 92
-testbg 93
+001-3-2 56
+008-1-1 57
+008-1 58
+008-2-0 59
+008-2-1 60
+008-2-10 61
+008-2-11 62
+008-2-12 63
+008-2-13 64
+008-2-14 65
+008-2-15 66
+008-2-16 67
+008-2-17 68
+008-2-18 69
+008-2-19 70
+008-2-2 71
+008-2-20 72
+008-2-21 73
+008-2-22 74
+008-2-23 75
+008-2-24 76
+008-2-25 77
+008-2-26 78
+008-2-27 79
+008-2-28 80
+008-2-29 81
+008-2-3 82
+008-2-30 83
+008-2-4 84
+008-2-5 85
+008-2-6 86
+008-2-7 87
+008-2-8 88
+008-2-9 89
+008-3-0 90
+008-3-1 91
+008-4-1 92
+test 93
+testbg 94
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 2eef4e8d..9d87df84 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -186,6 +186,10 @@ quest_db: (
 	Name: "General_Cooking"
 },
 {
+	Id: 42
+	Name: "General_Brotherhood"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/maps/re/001-1.mcache b/maps/re/001-1.mcache
index 7795236e..6ce64adc 100644
--- a/maps/re/001-1.mcache
+++ b/maps/re/001-1.mcache
diff --git a/maps/re/001-3-1.mcache b/maps/re/001-3-1.mcache
index 1a2f1a6a..f8239cdc 100644
--- a/maps/re/001-3-1.mcache
+++ b/maps/re/001-3-1.mcache
diff --git a/maps/re/001-3-2.mcache b/maps/re/001-3-2.mcache
new file mode 100644
index 00000000..a3747e0f
--- /dev/null
+++ b/maps/re/001-3-2.mcache
diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache
index bd439b3c..6938421a 100644
--- a/maps/re/008-1.mcache
+++ b/maps/re/008-1.mcache
diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache
index 9e1e9179..5a291c6f 100644
--- a/maps/re/008-3-0.mcache
+++ b/maps/re/008-3-0.mcache
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;
 }
diff --git a/npc/001-2-11/mona.txt b/npc/001-2-11/mona.txt
index 366b658c..abec0cee 100644
--- a/npc/001-2-11/mona.txt
+++ b/npc/001-2-11/mona.txt
@@ -97,7 +97,9 @@
     }
     else if (getq(ArtisQuests_MonaDad) == 3)
     {
-        npctalkonce l("Thanks for finding daddy... I wish he spent more time with me..."); // TODO: Sophialla
+        npctalkonce any(
+            l("Thanks for finding daddy... I wish he spent more time with me..."),
+            l("Sagratha is great. Why the strange woman near the Legion building always say that to daddy...")); // TODO: Polish
     }
     else if (getq(ArtisQuests_MonaDad) == 2)
     {
diff --git a/npc/001-2-32/serena.txt b/npc/001-2-32/serena.txt
index 187a654c..fa650ef1 100644
--- a/npc/001-2-32/serena.txt
+++ b/npc/001-2-32/serena.txt
@@ -6,9 +6,7 @@
 
 001-2-32,27,27,0	script	Serena	NPC_SERENA,{
     mesn;
-    mesq lg("Oh darling, what brought you here?");
-    //          ^^^^^^^
-    // Expresses familiarity or elderliness in relation to PC.
+    mesq lg("Oh darling, what brought you here?"); // TRANSLATORS: Darling - Expresses familiarity or elderliness in relation to PC.
 
     // <scratch>
     // [ PC]: I was just looking around.
@@ -47,9 +45,6 @@
     // Alt-Siege
     // The city is being attacked. Go help the warriors and town-guard.
 
-    goto L_Close;
-
-L_Close:
     close;
 
 OnInit:
diff --git a/npc/001-2-39/qanon.txt b/npc/001-2-39/qanon.txt
index 150362c9..3a917ba9 100644
--- a/npc/001-2-39/qanon.txt
+++ b/npc/001-2-39/qanon.txt
@@ -4,15 +4,85 @@
 //    Reid
 // Description:
 //    Artis's Legion of Aemil leader.
+// Variables:
+//    Artis_Legion_Progress
+// Values:
+//    5    Sent by Lozerk.
+//    6    Train forever (Cannot resume legion, must see brotherhood first)
+//          Technically, Q'Anon wants to see if player will recover his memory.
+//          After all, player memories might have something important.
+//    7    Arrived at Hurnscald (This means we can resume legion)
 
 001-2-39,34,41,0	script	Q'Anon	NPC_Q_ANON,{
+    function legionState;
+    function notaMember;
+    .@q=getq(Artis_Legion_Progress);
     mesn;
     mesq lg("It's been a while, girl!", "It's been a while, boy!");
+    next;
+    if (.@q < 5)
+        notaMember();
 
-    goto L_Close;
+    select
+        rif(.@q == 5, l("Lozerk told me to talk to you and join the legion.")),
+        l("Thanks, sir Q'Anon.");
+    mes "";
+    switch (@menu)
+    {
+        case 1:
+            legionState();
+            break;
+        case 2:
+            mesn;
+            mesq lg("Make me proud, girl.", "Make me proud, boy.");
+            break;
+    }
+    close;
 
-L_Close:
+function notaMember {
+    mesn;
+    mesq col(l("*ahem*"), 9) + " " + l("Heh, did you saw me at the port? No?");
+    next;
+    mesn;
+    mesq l("This is how good we Legion Members are. I was informed of your arrival way before you left Drasil Island.");
+    next;
+    mesn;
+    mesq l("I usually would not care, but it is not every day a complete stranger arrives at Artis.");
+    next;
+    mesn;
+    mesq l("You're welcome to stay here as long as you wish. Just don't do anything stupid, like a riot, for example.");
     close;
+    return;
+}
+
+function legionState {
+    mesn;
+    mesq l("Oh? And do you think you have what it takes to be a proud Legion Member?");
+    next;
+    mesn;
+    mesq lg("Listen, kid. Being a legion member is not a joke.");
+    next;
+    mesn;
+    mesq l("Hmm, why don't you go train a little more? We have several training rooms here.");
+    next;
+    mesn;
+    mesq l("Yes, I am authorizing you to use them as you deem fit, until you get stronger.");
+    next;
+    mesn;
+    mesq l("Also, build a reputation with the Legion. Talk to everyone. Help everyone. Prove me your worth!");
+    next;
+    mesn;
+    mesq l("Only after you prove yourself, you may join our ranks as a proud member! Hahah!");
+    setq Artis_Legion_Progress, 6;
+    // So, we probably should use Clan System for the major guilds.
+    // I guess major guilds are: Legion, Brotherhood
+    // minor guilds: Merchants, Thieves and Mages.
+
+    // It would be the commands below:
+    // join_clan(CLAN_LEGION);
+    // clan_leave();
+    return;
+}
 
 OnInit:
     .sex = G_MALE;
diff --git a/npc/001-2-40/trozz.txt b/npc/001-2-40/trozz.txt
index df76c26f..b695f1bc 100644
--- a/npc/001-2-40/trozz.txt
+++ b/npc/001-2-40/trozz.txt
@@ -6,11 +6,13 @@
 
 001-2-40,36,46,0	script	Trozz#001-2-40	NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION,{
     mesn;
-    mesq l("Hi.");
-
-    goto L_Close;
-
-L_Close:
+    mesq l("Hi. I am Trozz, and I am the chief of legion training in Artis.");
+    next;
+    mesn;
+    mesq l("If you want to challenge someone for a friendly match, you are at the right place.");
+    next;
+    mesn;
+    mesq l("But if you need to deal with more burocratic stuff, go talk to Q'Anon. He is the boss here.");
     close;
 
 OnInit:
diff --git a/npc/001-3-0/_warps.txt b/npc/001-3-0/_warps.txt
index 65b56ff5..d192e4ef 100644
--- a/npc/001-3-0/_warps.txt
+++ b/npc/001-3-0/_warps.txt
@@ -3,6 +3,6 @@
 001-3-0,196,35,0	warp	#001-3-0_196_35	0,0,001-1,197,35
 001-3-0,172,41,0	warp	#001-3-0_172_41	0,0,001-3-1,34,58
 001-3-0,162,40,0	warp	#001-3-0_162_40	0,0,001-3-1,23,57
-001-3-0,198,61,0	warp	#001-3-0_198_61	0,0,001-1,199,61
+001-3-0,198,60,0	warp	#001-3-0_198_60	0,0,001-1,199,61
 001-3-0,152,55,0	warp	#001-3-0_152_55	0,0,001-1,152,51
 001-3-0,85,130,0	warp	#001-3-0_85_130	0,0,001-1,86,130
diff --git a/npc/001-3-1/_warps.txt b/npc/001-3-1/_warps.txt
index f0c3d747..4f79c590 100644
--- a/npc/001-3-1/_warps.txt
+++ b/npc/001-3-1/_warps.txt
@@ -2,3 +2,4 @@
 // Map 001-3-1: Rivercave warps
 001-3-1,24,58,0	warp	#001-3-1_24_58	1,0,001-3-0,162,41
 001-3-1,35,59,0	warp	#001-3-1_35_59	1,0,001-3-0,172,42
+001-3-1,30,19,0	warp	#001-3-1_30_19	0,0,001-3-2,30,116
diff --git a/npc/001-3-2/_import.txt b/npc/001-3-2/_import.txt
new file mode 100644
index 00000000..d427b6ed
--- /dev/null
+++ b/npc/001-3-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-3-2: Hideout
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-3-2/_warps.txt",
diff --git a/npc/001-3-2/_warps.txt b/npc/001-3-2/_warps.txt
new file mode 100644
index 00000000..6b35b231
--- /dev/null
+++ b/npc/001-3-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-3-2: Hideout warps
+001-3-2,30,117,0	warp	#001-3-2_30_117	0,0,001-3-1,30,20
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
index a34ccc1c..4bb14ace 100644
--- a/npc/008-1-1/_mobs.txt
+++ b/npc/008-1-1/_mobs.txt
@@ -20,47 +20,11 @@
 008-1-1,68,29,7,7	monster	Mouboo	1023,3,30000,60000
 008-1-1,126,45,0,0	monster	Beehive	1056,1,30000,100000
 008-1-1,121,45,0,0	monster	Beehive	1056,1,30000,100000
-008-1-1,94,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,38,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,93,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,93,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,95,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,40,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,93,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,95,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,96,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,96,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,97,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,97,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,99,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,99,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,94,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,44,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,96,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,44,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,98,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,99,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,98,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,94,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,95,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,96,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,96,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,97,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,99,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,97,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,95,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,94,49,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,94,39,0,0	monster	Blue Rose	1061,1,250000,100000
+008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,180000,85000
+008-1-1,95,45,0,0	monster	Red Rose	1062,1,210000,95000
+008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,195000,65000
+008-1-1,95,43,0,0	monster	Yellow Tulip	1059,1,180000,85000
+008-1-1,97,46,0,0	monster	Red Rose	1062,1,210000,95000
+008-1-1,96,49,0,0	monster	Yellow Rose	1060,1,195000,65000
+008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,195000,65000
diff --git a/npc/008-1-1/koga.txt b/npc/008-1-1/koga.txt
index f32e953c..e0a7c2b8 100644
--- a/npc/008-1-1/koga.txt
+++ b/npc/008-1-1/koga.txt
@@ -9,8 +9,15 @@
     speech
         l("So, finally, we are here."),
         l("Do you want to go back to Artis? You really should be afraid of the Legion there, now that you have been here in Woodland. They somehow smell the odor of the Brotherhood.");
-        l("Better you stay here for a while. Come back when you are stronger.");
-
+    next;
+    mesc l("Return to Artis?");
+    if (askyesno() == ASK_YES)
+    {
+        closeclientdialog;
+        setmount 0;
+        warp "001-1", 199, 91;
+        dispbottom l("After a tiring, yet fast, travel by Koga, you arrive at @@.", l("Artis"));
+    }
     close;
 
 OnInit:
diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt
index bfd1e8be..57275325 100644
--- a/npc/008-2-2/melania.txt
+++ b/npc/008-2-2/melania.txt
@@ -26,7 +26,7 @@
             lodge_check();
 
     } while (@menu != 2);
-    mesn;
+    speech S_FIRST_BLANK_LINE,
     l("I wish you a beautiful day.");
     close;
 
diff --git a/npc/008-2-7/_import.txt b/npc/008-2-7/_import.txt
index 4cb38df9..d3391d83 100644
--- a/npc/008-2-7/_import.txt
+++ b/npc/008-2-7/_import.txt
@@ -3,4 +3,6 @@
 "npc/008-2-7/_savepoints.txt",
 "npc/008-2-7/_warps.txt",
 "npc/008-2-7/mapflags.txt",
+"npc/008-2-7/shop.txt",
+"npc/008-2-7/simon.txt",
 "npc/008-2-7/wyara.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 23aef7f4..c19f2e32 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -55,6 +55,7 @@
 @include "npc/001-2-9/_import.txt"
 @include "npc/001-3-0/_import.txt"
 @include "npc/001-3-1/_import.txt"
+@include "npc/001-3-2/_import.txt"
 @include "npc/008-1-1/_import.txt"
 @include "npc/008-1/_import.txt"
 @include "npc/008-2-0/_import.txt"
diff --git a/npc/commands/debug-quest.txt b/npc/commands/debug-quest.txt
index 1c3e0b5c..96a8e290 100644
--- a/npc/commands/debug-quest.txt
+++ b/npc/commands/debug-quest.txt
@@ -130,7 +130,8 @@ function	script	GlobalQuestDebug	{
                 "Rumly", General_Rumly,
                 l("Narrator"), General_Narrator,
                 "Janus", General_Janus,
-                l("Cooking"), General_Cooking;
+                l("Cooking"), General_Cooking,
+                l("Brotherhood"), General_Brotherhood;
 
             switch (@menuret)
             {
diff --git a/npc/functions/quest-debug/033-Artis_Legion_Progress.txt b/npc/functions/quest-debug/033-Artis_Legion_Progress.txt
index c4ea5558..ff6f1d16 100644
--- a/npc/functions/quest-debug/033-Artis_Legion_Progress.txt
+++ b/npc/functions/quest-debug/033-Artis_Legion_Progress.txt
@@ -19,7 +19,8 @@ function	script	QuestDebug33	{
             l("Finished  training"), 2,
             l("Sent to battle"), 3,
             l("Finished battle"), 4,
-            l("Sent to Q'Anon"), 5;
+            l("Sent to Q'Anon"), 5,
+            l("Indefinite Traning"), 6;
 
         if (@menuret < 0)
         {
diff --git a/npc/functions/quest-debug/042-General_Brotherhood.txt b/npc/functions/quest-debug/042-General_Brotherhood.txt
new file mode 100644
index 00000000..3eb3683b
--- /dev/null
+++ b/npc/functions/quest-debug/042-General_Brotherhood.txt
@@ -0,0 +1,27 @@
+// Mona quest debug
+// Authors:
+//    gumi
+//    monwarez
+//    jesusalva
+
+function	script	QuestDebug42	{
+    do
+    {
+        clear;
+        setnpcdialogtitle l("Quest debug");
+        mes "General_Brotherhood";
+        mes "---";
+        mes l("Quest state: @@", getq(General_Brotherhood));
+        next;
+
+        GenericQuestDebug General_Brotherhood,
+            l("Does not have the quest"), 0,
+            l("Contacted by Sopiahalla"), 1;
+
+        if (@menuret < 0)
+        {
+            return;
+        }
+
+    } while (1);
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index a7f39836..ca2bf288 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -94,6 +94,7 @@
 "npc/functions/quest-debug/039-HurnscaldQuests_ForestBow.txt",
 "npc/functions/quest-debug/040-HurnscaldQuests_WoodenShield.txt",
 "npc/functions/quest-debug/041-General_Cooking.txt",
+"npc/functions/quest-debug/042-General_Brotherhood.txt",
 
 // Item functions
 "npc/items/croconut.txt",