diff options
| author | wushin <pasekei@gmail.com> | 2014-08-24 22:11:43 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2014-08-24 22:40:14 -0500 |
| commit | 1bc2566aee188c920d96b9b42b2df6db202d67ff (patch) | |
| tree | ec5ee1455bb936a57d1fefa13bcec53a2159a7b9 /world/map/npc/021-2 | |
| parent | 2c07459b6d045f7a510811c507533e204319473a (diff) | |
| download | serverdata-1bc2566aee188c920d96b9b42b2df6db202d67ff.tar.gz serverdata-1bc2566aee188c920d96b9b42b2df6db202d67ff.tar.bz2 serverdata-1bc2566aee188c920d96b9b42b2df6db202d67ff.tar.xz serverdata-1bc2566aee188c920d96b9b42b2df6db202d67ff.zip | |
Quest Log Fix for QUEST_NorthTulimshar
Diffstat (limited to 'world/map/npc/021-2')
| -rw-r--r-- | world/map/npc/021-2/kylian.txt | 17 | ||||
| -rw-r--r-- | world/map/npc/021-2/yanis.txt | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt index 71dcb896..fc8242c5 100644 --- a/world/map/npc/021-2/kylian.txt +++ b/world/map/npc/021-2/kylian.txt @@ -38,16 +38,12 @@ OnInit: // Nibble 4 - set $@knowYanisNT, 0x10000; - set $@knowLatoyNT, 0x20000; - set $@knowWeellosNT, 0x40000; - set $@knowCasinoNT, 0x80000; - - set $@businessmanNT_MASK, NIBBLE_5_MASK; - set $@businessmanNT_SHIFT, NIBBLE_5_SHIFT; + set $@knowYanisNT, (1 << 16); + set $@knowLatoyNT, (1 << 17); + set $@knowWeellosNT, (1 << 18); + set $@knowCasinoNT, (1 << 19); end; } - 021-2.gat,25,67,0|script|#KylianOut|32767,1,1, { set @KylianNTLicense, 0; @@ -55,10 +51,9 @@ OnInit: set @KylianNTCasino, 0; end; } - 021-2.gat,89,55,0|script|Kylian|193, { - set @state, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT); + set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); set @acorn_amount, 12; set @suitcase_money, 100; @@ -307,6 +302,6 @@ L_Close: close; S_Update_Mask: - set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@businessmanNT_MASK)) | (@state << $@businessmanNT_SHIFT); + set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_5_MASK)) | (@state << NIBBLE_5_SHIFT); return; } diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/021-2/yanis.txt index bde24ec3..86c40fad 100644 --- a/world/map/npc/021-2/yanis.txt +++ b/world/map/npc/021-2/yanis.txt @@ -4,8 +4,8 @@ 021-2.gat,33,17,0|script|Yanis|107, { set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT; - set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT); - set @imec, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT); + set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT); + set @imec, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT); mes "[Yanis]"; mes "\"Welcome. I'm handling issues with trading licenses for the shop owners in Tulimshar. Can I help you?\""; @@ -24,7 +24,7 @@ L_Next: mes "[Yanis]"; mes "\"Here you have a letter of acknowledgement. You can bring that back to Imec. We will have a look at his case.\""; set @imec, 2; - set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@ImecShopNT_MASK)) | (@imec << $@ImecShopNT_SHIFT); + set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_4_MASK)) | (@imec << TWOBIT_4_SHIFT); goto L_BeforeClose; L_BeforeClose: |