Add an extra state at Halinarzo Librarian for quest log

3 files changed, 17 insertions, 10 deletions

diff --git a/npc/009-2/librarian.txt b/npc/009-2/librarian.txt
index 4f806c14c..fcdfbd7a0 100644
--- a/npc/009-2/librarian.txt
+++ b/npc/009-2/librarian.txt
@@ -7,12 +7,12 @@
 
 009-2,67,60,2	script	Book Keeper	NPC_FEMALE,{
     .@n = getq(General_Narrator);
-    if (.@n == 8) mesn;
-    if (.@n == 8) mesc l("Anyway, I think you should go to Hurnscald Townhall again, and speak with the mayor.");
-    if (.@n == 8) next;
-    if (.@n >= 8) goto L_Complete;
-    if (.@n == 7) goto L_Report;
-    if (.@n == 6) goto L_Advance;
+    if (.@n == 9) mesn;
+    if (.@n == 9) mesc l("Anyway, I think you should go to Hurnscald Townhall again, and speak with the mayor.");
+    if (.@n == 9) next;
+    if (.@n >= 9) goto L_Complete;
+    if (.@n == 8) goto L_Report;
+    if (.@n == 6 || .@n == 7) goto L_Advance;
     mesn;
     mesq l("Hello. I am the book keeper, responsible for keeping Halinarzo History.");
     // TODO: Import data from BR-002-5 (Royal Library) and make available story about TMW-BR
@@ -54,7 +54,7 @@ L_Prologue:
     next;
     mesn;
     mesq l("Alright, I'll look in the archives. I'll have an answer for you in three hours. Meanwhile, why don't you suppress the bandits on the cliff?");
-    setq2 General_Narrator, santime()+(60*60*3);
+    setq General_Narrator, 7, santime()+(60*60*3);
     close;
 
 L_Complete:
@@ -82,7 +82,7 @@ L_Complete:
     mesc l("They promised to travel to the ##BWorld Edge##b to fetch a Mana Fragment. The wisest of them said it was the only chance.");
     mesc l("They were never again seen. None of them. We burnt all records about everyone here, and blamed the Monster King.");
     mesc l("They must never know we had it. Their sacrifices must be forgotten. For the sake of all.");
-    compareandsetq General_Narrator, 6, 7;
+    compareandsetq General_Narrator, 7, 8;
     close;
 
 L_Report:
@@ -121,7 +121,7 @@ L_Report:
     mesc b(l(".:: Main Quest 2-3 ::.")), 3;
     mesc l("* Talk to Librarian in Halinarzo"), 2;
     mesc l("* Return to Hurnscald Townhall"), 9;
-    setq General_Narrator, 8;
+    setq General_Narrator, 9;
     close;
 
 OnInit:
diff --git a/npc/012-7/airlia.txt b/npc/012-7/airlia.txt
index f642fd637..2dbfbd084 100644
--- a/npc/012-7/airlia.txt
+++ b/npc/012-7/airlia.txt
@@ -19,7 +19,7 @@
     if (strcharinfo(0) == $MOST_HEROIC$) npctalk3 l("Ah, if it isn't @@? You're the talk of the town!", $MOST_HEROIC$);
     if (.@q1 == 4) goto L_Letter;
     if (.@n >= 3 && .@n < 6) goto L_Mayor;
-    if (.@n == 8) goto L_Nivalis;
+    if (.@n == 9) goto L_Nivalis;
     mesn;
     mesq l("Oh, a visitor. Welcome to the city hall. Please, enjoy your stay.");
     close;
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 32a19b0bc..26349ee39 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -69,6 +69,13 @@ function	script	checkclientversion	{
 
         dispbottom l("Your experience level has been updated.");
     }
+    // Gallery Contest and 2019-12-29 no-drop incident
+    // ter jan  8 03:52:20 -02 2019
+    if (UPDATE < 1546926740) {
+        UPDATE=1546926740;
+        skill TMW2_FAKESKILL, 1, 0;
+        skill TMW2_FAKESKILL2, 1, 0;
+    }