Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 84 insertions, 0 deletions

diff --git a/npc/048-2/helperMSilk.txt b/npc/048-2/helperMSilk.txt
new file mode 100644
index 00000000..58d3f899
--- /dev/null
+++ b/npc/048-2/helperMSilk.txt
@@ -0,0 +1,84 @@
+
+048-2,104,103,0	script	Janika	NPC363,{
+    @silk_amount = 80;
+    @silk_exp = 10000;
+
+    if (QUEST_BlueSage & $@Q_BlueSageMaterialSilk) goto L_Done;
+    if (BaseLevel >= $@Q_BlueSageMinimumLevel) goto L_Quest;
+
+    mes "[Janika]";
+    mes "\"This is going to be difficult... oh, hello. I'm working on recreating some of the books that were destroyed.\"";
+    goto L_close;
+
+L_Quest:
+    mes "[Janika]";
+    mes "\"This is going to be difficult...";
+    mes "Oh, hello. You don't have " + @silk_amount + " Silk Cocoons with you, do you? I need them for the book covers and binding of some of the more valuable books we're trying to recreate.\"";
+    menu
+        "I have!",L_TurnIn,
+        "I haven't, but I can try to get some.",L_Investigate,
+        "No.",L_Investigate;
+
+L_TurnIn:
+    if(countitem("SilkCocoon") < @silk_amount)
+        goto L_NoItem;
+    delitem "SilkCocoon", @silk_amount;
+    getexp @silk_exp, 0;
+    QUEST_BlueSage = (QUEST_BlueSage | $@Q_BlueSageMaterialSilk);
+    mes "[Janika]";
+    mes "\"Excellent! This is exactly what I need. Thanks a lot. I'll tell Nikolai about your generosity.\"";
+    goto L_Investigate;
+
+L_Done:
+    mes "[Janika]";
+    mes "\"Thanks for the Silk Cocoons. With these the new books are going to be exquisite.\"";
+    goto L_Investigate;
+
+L_NoItem:
+    mes "[Janika]";
+    mes "\"Are you kidding? You don't have it!\"";
+    goto L_close;
+
+L_Investigate:
+    if ((QL_BSAGE_INVESTIGATE == 3) || (QL_BSAGE_INVESTIGATE == 4)) goto L_Ask_Visitor;
+    if ((QL_BSAGE_INVESTIGATE == 5) || (QL_BSAGE_INVESTIGATE == 8)) goto L_Ask_Helper;
+    if ((QL_BSAGE_INVESTIGATE == 6) || (QL_BSAGE_INVESTIGATE == 7) || (QL_BSAGE_INVESTIGATE == 9) || (QL_BSAGE_INVESTIGATE == 10)) goto L_Ask_Both;
+    goto L_close;
+
+L_Ask_Visitor:
+    menu
+        "Can you tell me anything about the visitor with the mask?",L_Visitor,
+        "I need to leave.",L_close;
+
+L_Ask_Helper:
+    menu
+        "What's your opinion of Peetu and how he does his work?",L_Helper,
+        "See you later.",L_close;
+
+L_Ask_Both:
+    menu
+        "Can you tell me anything about the visitor with the mask?",L_Visitor,
+        "What's your opinion of Peetu and how he does his work?",L_Helper,
+        "Bye.",L_close;
+
+L_Visitor:
+    mes "[Janika]";
+    mes "\"Oh, I know who you mean! That impertinent person came over in the workshop area and fiddled about with all kinds of things here! Such a rude person! Didn't he understand that we had delicate things going on here? We had to send him back to the library area several times.\"";
+    next;
+    mes "She shakes her head.";
+    mes "\"Sometimes I think it'd be better not to allow visitors here. But the sages set a high value on keeping contact with the population. Politics.\"";
+    if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9))
+        goto L_close;
+    QL_BSAGE_INVESTIGATE = QL_BSAGE_INVESTIGATE + 1;
+    goto L_close;
+
+L_Helper:
+    mes "[Janika]";
+    mes "\"Mh, I don't know him closely.\"";
+    goto L_close;
+
+L_close:
+    @silk_amount = 0;
+    @silk_exp = 0;
+    close;
+}