diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2012-05-04 14:43:09 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2012-05-04 14:43:09 +0200 |
| commit | 43be9c571a28a91e83b51d6d77186a967504dafa (patch) | |
| tree | 2b0cd492e0fd2db3864de41680bf13bfc88e96f5 | |
| parent | eada7f973e7bdb1a107da94b436530e9ceec8c2c (diff) | |
| download | serverdata-43be9c571a28a91e83b51d6d77186a967504dafa.tar.gz serverdata-43be9c571a28a91e83b51d6d77186a967504dafa.tar.bz2 serverdata-43be9c571a28a91e83b51d6d77186a967504dafa.tar.xz serverdata-43be9c571a28a91e83b51d6d77186a967504dafa.zip | |
Small fix in Sage Nikolai's dialogue logic, reported by Johanne and Nard. Also submodule pointer updated.v2012.05.04
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/npc/048-2/sageNikolai.txt | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/client-data b/client-data -Subproject d1bbb6c049e82cb718b900ba7db9af01ad52c19 +Subproject 176a799531f2bb9265239e6ec2238f3a687fbdd 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; |