summaryrefslogtreecommitdiff
path: root/world/map/npc/021-1/imec.txt
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-10-10 15:27:07 -0500
committerWushin <pasekei@gmail.com>2014-10-10 15:27:07 -0500
commit3179aed603b68d34443b718a130e4a392d4c5ae5 (patch)
tree550656ed2a414b07b5af5c1e47b602e348d551a1 /world/map/npc/021-1/imec.txt
parentffe40be3361652fc509291fa2f4c814554341957 (diff)
parent0cc087b9fd3b70706ecd5bd2b96ab14c7c1295ab (diff)
downloadserverdata-3179aed603b68d34443b718a130e4a392d4c5ae5.tar.gz
serverdata-3179aed603b68d34443b718a130e4a392d4c5ae5.tar.bz2
serverdata-3179aed603b68d34443b718a130e4a392d4c5ae5.tar.xz
serverdata-3179aed603b68d34443b718a130e4a392d4c5ae5.zip
Merge pull request #152 from wushin/quest-log-variable-clean-up
Quest log variable clean up
Diffstat (limited to 'world/map/npc/021-1/imec.txt')
-rw-r--r--world/map/npc/021-1/imec.txt15
1 files changed, 2 insertions, 13 deletions
diff --git a/world/map/npc/021-1/imec.txt b/world/map/npc/021-1/imec.txt
index 61e1fca7..07965951 100644
--- a/world/map/npc/021-1/imec.txt
+++ b/world/map/npc/021-1/imec.txt
@@ -2,20 +2,9 @@
// after finishing this, daily quest with scorpion stingers
// Using bit 8 and 9 of QUEST_NorthTulimshar (first half of nibble 2)
// author: Jenalya
-
--|script|#ImecShopConfig|-1,
-{
- end;
-
-OnInit:
- set $@ImecShopNT_MASK, 0x300;
- set $@ImecShopNT_SHIFT, 8;
- end;
-}
-
021-1.gat,120,31,0|script|Imec|162,
{
- set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
+ set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
set @money, 500;
if (@state >= 3) goto L_Stingers;
@@ -117,6 +106,6 @@ L_Close:
close;
S_Update_Mask:
- set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@ImecShopNT_MASK)) | (@state << $@ImecShopNT_SHIFT);
+ set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(TWOBIT_4_MASK)) | (@state << TWOBIT_4_SHIFT);
return;
}