From 2605a9f17361f80304567f3a7cb5b9480f204221 Mon Sep 17 00:00:00 2001 From: mekolat Date: Wed, 6 May 2015 21:43:36 -0400 Subject: convert blue sage quest --- world/map/db/quest-log.txt | 1 + world/map/npc/048-2/bluesageConfig.txt | 9 --------- world/map/npc/048-2/helperAccused.txt | 23 ++++++++--------------- world/map/npc/048-2/helperBookpages1.txt | 13 +++++-------- world/map/npc/048-2/helperBookpages2.txt | 8 +++----- world/map/npc/048-2/helperBookpages3.txt | 13 +++++-------- world/map/npc/048-2/helperChief.txt | 20 +++++++------------- world/map/npc/048-2/helperCleaning1.txt | 13 +++++-------- world/map/npc/048-2/helperCleaning2.txt | 13 +++++-------- world/map/npc/048-2/helperCleaning3.txt | 13 +++++-------- world/map/npc/048-2/helperCleaning4.txt | 13 +++++-------- world/map/npc/048-2/helperCleaning5.txt | 13 +++++-------- world/map/npc/048-2/helperJanitor.txt | 15 ++++++--------- world/map/npc/048-2/helperMInk.txt | 13 +++++-------- world/map/npc/048-2/helperMReed.txt | 18 +++++++----------- world/map/npc/048-2/helperMSilk.txt | 13 +++++-------- world/map/npc/048-2/helperMYetiClaw.txt | 13 +++++-------- world/map/npc/048-2/helperResting1.txt | 13 +++++-------- world/map/npc/048-2/helperResting2.txt | 13 +++++-------- world/map/npc/048-2/sageNikolai.txt | 28 +++------------------------- 20 files changed, 95 insertions(+), 183 deletions(-) diff --git a/world/map/db/quest-log.txt b/world/map/db/quest-log.txt index 3949528c..eac7f1a1 100644 --- a/world/map/db/quest-log.txt +++ b/world/map/db/quest-log.txt @@ -20,3 +20,4 @@ 7,QL_WELL,QUEST_Nivalis_state,4,4 8,QL_CINDY,QUEST_Nivalis_state,5,4 9,QL_BAKTAR,QUEST_Nivalis_state,0,8 +10,QL_BSAGE_INVESTIGATE,QUEST_BlueSage,3,4 diff --git a/world/map/npc/048-2/bluesageConfig.txt b/world/map/npc/048-2/bluesageConfig.txt index bab552f8..9ab3e711 100644 --- a/world/map/npc/048-2/bluesageConfig.txt +++ b/world/map/npc/048-2/bluesageConfig.txt @@ -72,9 +72,6 @@ OnInit: set $@Q_BlueSageMaterialClaw, 0x400; set $@Q_BlueSageMaterialInk, 0x800; - set $@Q_BlueSageInvestigate_MASK, NIBBLE_3_MASK; - set $@Q_BlueSageInvestigate_SHIFT, NIBBLE_3_SHIFT; - set $@Q_BlueSageSlimes_MASK, BYTE_2_MASK; set $@Q_BlueSageSlimes_SHIFT, BYTE_2_SHIFT; set $@Q_BlueSageSlimesStart, 0x010000; @@ -103,12 +100,6 @@ function|script|updateBlueSageBookPages return; } -function|script|updateBlueSageInvestigate -{ - set QUEST_BlueSage, (QUEST_BlueSage & ~($@Q_BlueSageInvestigate_MASK) | (@investigate << $@Q_BlueSageInvestigate_SHIFT)); - return; -} - function|script|blueSageNumberOfClearedNests { set @slimenests, 0; diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt index 92043705..8b552914 100644 --- a/world/map/npc/048-2/helperAccused.txt +++ b/world/map/npc/048-2/helperAccused.txt @@ -4,14 +4,12 @@ // Peetu is the person who caused the accident // involved investigation subquest -048-2,25,135,0|script|Peetu|366 +048-2,25,135,0|script|Peetu|130 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); - - if (@investigate >= 12) goto L_Thank; - if (@investigate > 4) goto L_Investigate; - if (@investigate > 1) goto L_Query; - if (@investigate == 1) goto L_Help; + if (QL_BSAGE_INVESTIGATE >= 12 && QL_BSAGE_INVESTIGATE < 13) goto L_Thank; + if (QL_BSAGE_INVESTIGATE > 4 && QL_BSAGE_INVESTIGATE < 13) goto L_Investigate; + if (QL_BSAGE_INVESTIGATE > 1 && QL_BSAGE_INVESTIGATE < 13) goto L_Query; + if (QL_BSAGE_INVESTIGATE == 1) goto L_Help; mes "You see a rather stressed helper, mumbling to himself."; if (BaseLevel < $@Q_BlueSageMinimumLevel) @@ -54,8 +52,7 @@ L_Less: mes "[Peetu]"; mes "\"Well... but... I mean... I don't know... "; mes "I have an idea! Would you... ahm, would you talk to Chief Oskari for me? And ask him what he plans to do about me? I... I just don't feel capable of doing that myself right now. I'll try to pull myself together in the meanwhile.\""; - set @investigate, 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, 1; goto L_Close; L_Help: @@ -106,14 +103,13 @@ L_TextWall: next; mes "\"I never tried it, because it makes no sense to do that, but theoretically adding some Silk Cocoons could have such an effect. That's pretty basic nature magic."; mes "But... how would that have gotten into the ingredients?\""; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Investigate: mes "[Peetu]"; mes "\"Hello. Did you find out anything else yet?\""; - if (@investigate != 11) + if (QL_BSAGE_INVESTIGATE != 11) menu "I'm still collecting information.",L_Close; if (@inventorylist_count == 100) @@ -130,8 +126,6 @@ L_ReallyMore: next; mes "\"It isn't much, but please take these Silk Gloves. We use those when we have to protect our hands, but still need to perform magic.\""; getitem "SilkGloves", 1; - set @investigate, 12; - callfunc "updateBlueSageInvestigate"; goto L_Close; L_Thank: @@ -145,7 +139,6 @@ L_TooMany: goto L_Close; L_Close: - set @investigate, 0; set @inventorylist_count, 0; close; } diff --git a/world/map/npc/048-2/helperBookpages1.txt b/world/map/npc/048-2/helperBookpages1.txt index 519c6279..11dd1054 100644 --- a/world/map/npc/048-2/helperBookpages1.txt +++ b/world/map/npc/048-2/helperBookpages1.txt @@ -6,7 +6,6 @@ 048-2,104,86,0|script|Ensio|365 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); set @old_bookpage_exp, 1000; @@ -98,9 +97,9 @@ L_NoItem: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -125,10 +124,9 @@ L_Visitor: next; mes "\"He was looking around in the library a while, and then came to ask about our research. He seemed to be particularly interested in our experiments with the slimes."; mes "Heh, I wonder what he would've said if he'd have visited us a little bit later. Mh, now that I think about it, the accident with the slimes happened just the night after he was here.\""; - if ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -137,7 +135,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @bookpages, 0; set @old_bookpage_exp, 0; set @new_bookpage_exp, 0; diff --git a/world/map/npc/048-2/helperBookpages2.txt b/world/map/npc/048-2/helperBookpages2.txt index 0b37e060..17de49d5 100644 --- a/world/map/npc/048-2/helperBookpages2.txt +++ b/world/map/npc/048-2/helperBookpages2.txt @@ -6,7 +6,6 @@ 048-2,94,86,0|script|Henriikka|363 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); if (@bookpages == 31) goto L_Thank; @@ -51,9 +50,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -85,7 +84,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @bookpages, 0; close; } diff --git a/world/map/npc/048-2/helperBookpages3.txt b/world/map/npc/048-2/helperBookpages3.txt index 20d173e6..c519b139 100644 --- a/world/map/npc/048-2/helperBookpages3.txt +++ b/world/map/npc/048-2/helperBookpages3.txt @@ -6,7 +6,6 @@ 048-2,99,87,0|script|Teuvo|366 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); if (@bookpages == 31) goto L_Thank; @@ -28,9 +27,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -58,14 +57,12 @@ L_Helper: mes "[Teuvo]"; mes "\"Peetu? He's one of those magic wielders who think they can do anything. Heh, you see the result here."; mes "But to be fair, from what I've seen Peetu was always very attentive and dutiful.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @bookpages, 0; close; } diff --git a/world/map/npc/048-2/helperChief.txt b/world/map/npc/048-2/helperChief.txt index 7eae6f63..ed5b6f94 100644 --- a/world/map/npc/048-2/helperChief.txt +++ b/world/map/npc/048-2/helperChief.txt @@ -4,17 +4,15 @@ // Chief of the Blue Sage helpers // involved in investigation subquest -048-2,146,26,0|script|Oskari|365 +048-2,146,26,0|script|Oskari|134 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); - - if (@investigate >= 11) goto L_Goodjob; - if (@investigate > 1) goto L_Investigate; + if (QL_BSAGE_INVESTIGATE >= 11 && QL_BSAGE_INVESTIGATE < 13) goto L_Goodjob; + if (QL_BSAGE_INVESTIGATE > 1 && QL_BSAGE_INVESTIGATE < 13) goto L_Investigate; mes "[Oskari]"; mes "\"Hello. Welcome to the residence of the Great Nikolai."; mes "You have to excuse me, as you might have heard we're having some trouble at the moment and I, as Chief of Nikolai's helpers, have a lot to do.\""; - if (@investigate == 0) + if (QL_BSAGE_INVESTIGATE == 0) goto L_Close; menu "Peetu asked me to talk to you about his mishap.",L_Next, @@ -37,14 +35,12 @@ L_Next: mes "Oh, and please tell him that I'm not considering firing him in the current situation. You might need that to calm him down and get meaningful information.\""; next; mes "\"You should find out if someone observed anything unusual during the time before the accident happened.\""; - set @investigate, 2; - callfunc "updateBlueSageInvestigate"; - goto L_Close; + set QL_BSAGE_INVESTIGATE, 2; L_Investigate: mes "[Oskari]"; mes "\"Ah, hello. Did you get an overview over the happenings yet?\""; - if (@investigate != 10) + if (QL_BSAGE_INVESTIGATE != 10) menu "I'm still collecting information.",L_Close; next; @@ -78,8 +74,7 @@ L_Continue: mes "\"You were a great help! I'll inform Nikolai about your involvement in clarifying this matter.\""; next; mes "\"And you should also talk with Peetu, I'm sure he'll be relieved to hear about the clarification of this matter too.\""; - set @investigate, 11; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, 11; goto L_Close; L_Goodjob: @@ -123,6 +118,5 @@ L_Conflict: goto L_Close; L_Close: - set @investigate, 0; close; } diff --git a/world/map/npc/048-2/helperCleaning1.txt b/world/map/npc/048-2/helperCleaning1.txt index d60aa16f..3b5af0dc 100644 --- a/world/map/npc/048-2/helperCleaning1.txt +++ b/world/map/npc/048-2/helperCleaning1.txt @@ -7,7 +7,6 @@ 048-2,117,106,0|script|Pyry|365 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); if (@slimes == 255) goto L_Thank; if (@slimes > 0) goto L_Progress; @@ -63,9 +62,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -94,14 +93,12 @@ L_Helper: mes "\"Peetu? I have always been glad to have him on the team. He's really brought forward our work here.\""; next; mes "\"I was very surprised when I heard that he's responsible for the failed sealing spell. I'd never have expected that from him.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @slimes, 0; close; } diff --git a/world/map/npc/048-2/helperCleaning2.txt b/world/map/npc/048-2/helperCleaning2.txt index 40339364..cdd04c00 100644 --- a/world/map/npc/048-2/helperCleaning2.txt +++ b/world/map/npc/048-2/helperCleaning2.txt @@ -7,7 +7,6 @@ 048-2,123,87,0|script|Nea|363 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); if (@slimes == 255) goto L_Thank; if (@slimes > 0) goto L_Progress; @@ -32,9 +31,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -63,14 +62,12 @@ L_Helper: mes "\"Peetu? Yeah, he's the kind of person who always wants to do things perfectly. That makes it a bit difficult to work with him, since his expectations for others are as high as for himself.\""; next; mes "\"I really wonder how that accident with the sealing spell could've happened. I'd have never expected him to mess something up like that.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @slimes, 0; close; } diff --git a/world/map/npc/048-2/helperCleaning3.txt b/world/map/npc/048-2/helperCleaning3.txt index d1ed35a5..110189cc 100644 --- a/world/map/npc/048-2/helperCleaning3.txt +++ b/world/map/npc/048-2/helperCleaning3.txt @@ -7,7 +7,6 @@ 048-2,139,99,0|script|Arvo|366 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); if (@slimes == 255) goto L_Thank; if (@slimes > 0) goto L_Progress; @@ -34,9 +33,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -62,10 +61,9 @@ L_Visitor: mes "\"But when I left him to look at the books on his own, he sneaked over to the workshop area. Visitors are allowed to have a look there, but only if they don't interfere with any research and experiments. But it seems he was being rather disturbing, since they sent them back to the library part.\""; next; mes "\"I tried to keep an eye on him after that, but when I got distracted by some newly arriving visitor he went over to the workshop again! Usually I enjoy my job, because I like talking to people, but this guy... was a pain, really.\""; - if ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -74,7 +72,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @slimes, 0; close; } diff --git a/world/map/npc/048-2/helperCleaning4.txt b/world/map/npc/048-2/helperCleaning4.txt index 6b795b84..45108932 100644 --- a/world/map/npc/048-2/helperCleaning4.txt +++ b/world/map/npc/048-2/helperCleaning4.txt @@ -7,7 +7,6 @@ 048-2,131,119,0|script|Kristian|366 { set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); if (@slimes == 255) goto L_Thank; if (@slimes > 0) goto L_Progress; @@ -27,9 +26,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -53,10 +52,9 @@ L_Visitor: mes "\"Oh, there was such a visitor, yes. Strange guy, and didn't really know how to behave. He sneaked into the workshop area all the time, I think he was rather curious about the things going on there.\""; next; mes "\"But still, he can't just walk in there, fiddle with the experiments and disturb the helpers doing their work.\""; - if ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -65,7 +63,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @slimes, 0; close; } diff --git a/world/map/npc/048-2/helperCleaning5.txt b/world/map/npc/048-2/helperCleaning5.txt index 9af27425..9517fde3 100644 --- a/world/map/npc/048-2/helperCleaning5.txt +++ b/world/map/npc/048-2/helperCleaning5.txt @@ -6,7 +6,6 @@ 048-2,100,125,0|script|Mirjami|363 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); if (@slimes == 255) goto L_Thank; @@ -29,9 +28,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -55,10 +54,9 @@ L_Visitor: mes "\"Ohh, I think I know who you mean. That was a strange guy. He always came over here in the workshop, said he's very interested in the research. I suppose that's ok, but he didn't keep his hands to himself, and touched some experiments and I caught him near some storage racks.\""; next; mes "\"Visitors should keep away from those!\""; - if ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -67,7 +65,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @slimes, 0; close; } diff --git a/world/map/npc/048-2/helperJanitor.txt b/world/map/npc/048-2/helperJanitor.txt index 0d0d884b..babfa5e2 100644 --- a/world/map/npc/048-2/helperJanitor.txt +++ b/world/map/npc/048-2/helperJanitor.txt @@ -4,13 +4,11 @@ // Elias is the janitor of the mansion // part of investigation subquest, gives initial hint on the visitor with the mask -048-2,40,41,0|script|Elias|365 +048-2,40,41,0|script|Elias|110 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); - - if (@investigate == 11) goto L_Thank; - if ((@investigate == 4) || (@investigate == 7) || (@investigate == 10)) goto L_Confirmed; - if ((@investigate == 3) || (@investigate == 6) || (@investigate == 9)) goto L_Worry; + if (QL_BSAGE_INVESTIGATE == 11) goto L_Thank; + if ((QL_BSAGE_INVESTIGATE == 4) || (QL_BSAGE_INVESTIGATE == 7) || (QL_BSAGE_INVESTIGATE == 10)) goto L_Confirmed; + if ((QL_BSAGE_INVESTIGATE == 3) || (QL_BSAGE_INVESTIGATE == 6) || (QL_BSAGE_INVESTIGATE == 9)) goto L_Worry; if (QUEST_BlueSage > 0) goto L_ShortHello; mes "[Elias]"; @@ -33,7 +31,7 @@ L_ShortHello: mes "[Elias]"; mes "\"Welcome back. I heard you're helping with the cleanup efforts in the library."; mes "Thank you very much.\""; - if ((@investigate != 2) && (@investigate != 5) && (@investigate != 8)) + if ((QL_BSAGE_INVESTIGATE != 2) && (QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 8)) goto L_Close; menu "Can you tell me if there were any unusual visitors before the accident?",L_Next; @@ -48,7 +46,7 @@ L_Next: mes "[Elias]"; mes "\"Do you think he may have had something to do with the accident? We're a very hospitable house, so I didn't see a reason to deny him the entrance. I mean, his mask might have been a bit unusual, but hey, there could've been many reasons why someone would wear a mask, don't you think?\""; - set @investigate, @investigate + 1; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; callfunc "updateBlueSageInvestigate"; menu @@ -76,6 +74,5 @@ L_Thank: goto L_Close; L_Close: - set @investigate, 0; close; } diff --git a/world/map/npc/048-2/helperMInk.txt b/world/map/npc/048-2/helperMInk.txt index 220ef484..72978b03 100644 --- a/world/map/npc/048-2/helperMInk.txt +++ b/world/map/npc/048-2/helperMInk.txt @@ -6,7 +6,6 @@ 048-2,95,103,0|script|Eevert|365 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @water_amount, 5; set @spectre_amount, 3; set @poltergeist_amount, 3; @@ -60,9 +59,9 @@ L_NoItem: goto L_Close; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -91,14 +90,12 @@ L_Helper: mes "\"Ah, Peetu. I really appreciate his sense for high quality work. The requirements to become a helper of a sage are already high, but Peetu is outstanding. He has a talent for magic and combined with his diligence, it's quite remarkable.\""; next; mes "\"That's why I'm really confused about this situation, since he was the one performing the sealing of the slimes. I wonder what went wrong.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @water_amount, 0; set @spectre_amount, 0; set @poltergeist_amount, 0; diff --git a/world/map/npc/048-2/helperMReed.txt b/world/map/npc/048-2/helperMReed.txt index 50ac45c0..4cb2eaac 100644 --- a/world/map/npc/048-2/helperMReed.txt +++ b/world/map/npc/048-2/helperMReed.txt @@ -6,7 +6,6 @@ 048-2,104,78,0|script|Kullervo|366 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @reed_amount, 20; set @reed_exp, 10000; @@ -47,9 +46,9 @@ L_NoItem: goto L_Close; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -73,10 +72,9 @@ L_Visitor: mes "\"Oh, yes. There was such a guy, shortly before the accident I think. He sneaked into the workshop several times, sticking his nose into stuff that shouldn't be his business. We had to send him back to the library area at least three times.\""; next; mes "\"Maybe he was confused, not sure. He talked very strangely.\""; - if ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -85,14 +83,12 @@ L_Helper: mes "And in all these years, I've never seen him messing up anything important. He's a perfectionist. He isn't satisfied with anything less than the best possible result when doing his work.\""; next; mes "\"I don't understand what went wrong with that spell, but it just has to have another cause than Peetu. I'm worried about him. He must feel very miserable. But I can't leave my duty here.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @reed_amount, 0; set @reed_exp, 0; close; diff --git a/world/map/npc/048-2/helperMSilk.txt b/world/map/npc/048-2/helperMSilk.txt index d2db14a5..7ed3bf47 100644 --- a/world/map/npc/048-2/helperMSilk.txt +++ b/world/map/npc/048-2/helperMSilk.txt @@ -6,7 +6,6 @@ 048-2,104,103,0|script|Janika|363 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @silk_amount, 80; set @silk_exp, 10000; @@ -47,9 +46,9 @@ L_NoItem: goto L_Close; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -74,10 +73,9 @@ L_Visitor: 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 ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -86,7 +84,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @silk_amount, 0; set @silk_exp, 0; close; diff --git a/world/map/npc/048-2/helperMYetiClaw.txt b/world/map/npc/048-2/helperMYetiClaw.txt index c32b0b1e..f23b7177 100644 --- a/world/map/npc/048-2/helperMYetiClaw.txt +++ b/world/map/npc/048-2/helperMYetiClaw.txt @@ -6,7 +6,6 @@ 048-2,97,78,0|script|Santeri|366 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @claw_amount, 8; set @claw_exp, 10000; @@ -55,9 +54,9 @@ L_NoItem: goto L_Close; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -86,14 +85,12 @@ L_Helper: mes "\"Oh, that's an interesting question. I was really surprised when I heard that he was responsible for the sealing spell. I've worked together with him before, and I have to say, it really was a pleasure. He's very accurate and diligent, but also polite and helpful.\""; next; mes "\"I really wonder what went wrong with that sealing spell. I can't imagine Peetu messing up something so important.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @claw_amount, 0; set @claw_exp, 0; close; diff --git a/world/map/npc/048-2/helperResting1.txt b/world/map/npc/048-2/helperResting1.txt index 87983bc8..76e62fe2 100644 --- a/world/map/npc/048-2/helperResting1.txt +++ b/world/map/npc/048-2/helperResting1.txt @@ -6,7 +6,6 @@ 048-2,36,26,0|script|Lenita|363 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); if (@bookpages == 254) goto L_Thank; @@ -30,9 +29,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -54,10 +53,9 @@ L_Ask_Both: L_Visitor: mes "[Lenita]"; mes "\"With a mask? Yeah, I remember. That was a strange guy. He came to visit the library, but he lurked around at the workshop area and they had to send him back to the books.\""; - if ((@investigate != 3) && (@investigate != 6) && (@investigate != 9)) + if ((QL_BSAGE_INVESTIGATE != 3) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 9)) goto L_Close; - set @investigate, @investigate + 1; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 1; goto L_Close; L_Helper: @@ -66,7 +64,6 @@ L_Helper: goto L_Close; L_Close: - set @investigate, 0; set @bookpages, 0; close; } diff --git a/world/map/npc/048-2/helperResting2.txt b/world/map/npc/048-2/helperResting2.txt index eb68e554..c65bc536 100644 --- a/world/map/npc/048-2/helperResting2.txt +++ b/world/map/npc/048-2/helperResting2.txt @@ -6,7 +6,6 @@ 048-2,35,27,0|script|Miro|366 { - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); if (@slimes == 255) goto L_Thank; @@ -29,9 +28,9 @@ L_Thank: goto L_Investigate; L_Investigate: - if ((@investigate == 3) || (@investigate == 4)) goto L_Ask_Visitor; - if ((@investigate == 5) || (@investigate == 8)) goto L_Ask_Helper; - if ((@investigate == 6) || (@investigate == 7) || (@investigate == 9) || (@investigate == 10)) goto L_Ask_Both; + 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: @@ -60,14 +59,12 @@ L_Helper: mes "\"Peetu? It was his job to seal away the slimes before the night, right? I have to say I'm really surprised about what happened, because he's a very cautious person. I'd have never guessed that he'd mess up something as important as this.\""; next; mes "\"If Nikolai's helpers weren't so carefully chosen, I'd think this was some kind of a bad joke from someone.\""; - if ((@investigate != 5) && (@investigate != 6) && (@investigate != 7)) + if ((QL_BSAGE_INVESTIGATE != 5) && (QL_BSAGE_INVESTIGATE != 6) && (QL_BSAGE_INVESTIGATE != 7)) goto L_Close; - set @investigate, @investigate + 3; - callfunc "updateBlueSageInvestigate"; + set QL_BSAGE_INVESTIGATE, QL_BSAGE_INVESTIGATE + 3; goto L_Close; L_Close: - set @investigate, 0; set @slimes, 0; close; } diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt index dced46d6..fdc6e76d 100644 --- a/world/map/npc/048-2/sageNikolai.txt +++ b/world/map/npc/048-2/sageNikolai.txt @@ -8,7 +8,6 @@ set @halloween_npc_id, $@halloween_npc_nikolai; callfunc "TrickOrTreat"; - set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); set @material, ((QUEST_BlueSage & $@Q_BlueSageMaterial_MASK) >> $@Q_BlueSageMaterial_SHIFT); @@ -112,7 +111,7 @@ L_NoStartSlimes: goto L_NoSlimes; L_NoSlimes: - if (@investigate > 0) + if (QL_BSAGE_INVESTIGATE > 0 && QL_BSAGE_INVESTIGATE < 13) goto L_NoStartInvestigate; set @choice_idx[@choices_nr], @C_startInvestigate; set @choice$[@choices_nr], "How did this all happen?"; @@ -120,7 +119,7 @@ L_NoSlimes: goto L_NoStartInvestigate; L_NoStartInvestigate: - if ((@investigate < 2) || (@investigate > 11)) + if ((QL_BSAGE_INVESTIGATE < 2) || (QL_BSAGE_INVESTIGATE > 11 && QL_BSAGE_INVESTIGATE < 13)) goto L_NoInvestigate; set @choice_idx[@choices_nr], @C_investigate; set @choice$[@choices_nr], "I'm trying to find out how that accident could've happened."; @@ -128,7 +127,7 @@ L_NoStartInvestigate: goto L_NoInvestigate; L_NoInvestigate: - if (@investigate != 11) + if (QL_BSAGE_INVESTIGATE != 11) goto L_NoInvestigate2; set @choice_idx[@choices_nr], @C_investigate2; set @choice$[@choices_nr], "I told Chief Oskari what I found out about the accident."; @@ -281,28 +280,7 @@ L_Done: L_Close: set @inventorylist_count, 0; - set @investigate, 0; set @bookpages, 0; set @slimes, 0; close; } - -//048-2,100,106,0|script|Debug|160 -//{ -// set @investigate, ((QUEST_BlueSage & $@Q_BlueSageInvestigate_MASK) >> $@Q_BlueSageInvestigate_SHIFT); -// set @bookpages, ((QUEST_BlueSage & $@Q_BlueSageBookPages_MASK) >> $@Q_BlueSageBookPages_SHIFT); -// set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT); -// set @material, ((QUEST_BlueSage & $@Q_BlueSageMaterial_MASK) >> $@Q_BlueSageMaterial_SHIFT); -// -// mes "QUEST_BlueSage: " + QUEST_BlueSage; -// mes "investigate: " + @investigate; -// mes "slimes: " + @slimes; -// mes "bookpages: " + @bookpages; -// mes "material: " + @material; -// menu -// "reset quest",-, -// "close",L_Close; -// set QUEST_BlueSage, 0; -//L_Close: -// close; -//} -- cgit v1.2.3-60-g2f50