From 43be9c571a28a91e83b51d6d77186a967504dafa Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Fri, 4 May 2012 14:43:09 +0200 Subject: Small fix in Sage Nikolai's dialogue logic, reported by Johanne and Nard. Also submodule pointer updated. --- client-data | 2 +- world/map/npc/048-2/sageNikolai.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client-data b/client-data index d1bbb6c0..176a7995 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit d1bbb6c049e82cb718b900ba7db9af01ad52c193 +Subproject commit 176a799531f2bb9265239e6ec2238f3a687fbddc diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt index 620e66f0..6374b973 100644 --- a/world/map/npc/048-2/sageNikolai.txt +++ b/world/map/npc/048-2/sageNikolai.txt @@ -82,7 +82,7 @@ L_NoBookpages: set @choices_nr, @choices_nr + 1; L_NoStartMaterials: - if ((@material == 0) || (@material == 255)) + if ((@material == 0) || (@material == 15)) goto L_NoMaterials; set @choice_idx[@choices_nr], @C_materials; set @choice$[@choices_nr], "I brought some material to repair the books."; @@ -278,11 +278,13 @@ L_Close: // 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; -- cgit v1.2.3-70-g09d2