diff options
| author | Wushin <pasekei@gmail.com> | 2014-10-10 15:27:07 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-10-10 15:27:07 -0500 |
| commit | 3179aed603b68d34443b718a130e4a392d4c5ae5 (patch) | |
| tree | 550656ed2a414b07b5af5c1e47b602e348d551a1 /world/map/npc/042-2/morgan.txt | |
| parent | ffe40be3361652fc509291fa2f4c814554341957 (diff) | |
| parent | 0cc087b9fd3b70706ecd5bd2b96ab14c7c1295ab (diff) | |
| download | serverdata-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/042-2/morgan.txt')
| -rw-r--r-- | world/map/npc/042-2/morgan.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/world/map/npc/042-2/morgan.txt b/world/map/npc/042-2/morgan.txt index 3ea1a2e8..20cc34c1 100644 --- a/world/map/npc/042-2/morgan.txt +++ b/world/map/npc/042-2/morgan.txt @@ -6,12 +6,12 @@ function|script|MorganState|, { callfunc "ClearVariables"; - set @morgan, ((TUTORIAL & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT); + set @morgan, ((STARTAREA & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); return; } function|script|SetMorganMask|, { - set TUTORIAL, (TUTORIAL & ~(NIBBLE_6_MASK) | (@morgan_tmp << NIBBLE_6_SHIFT)); + set STARTAREA, (STARTAREA & ~(NIBBLE_3_MASK) | (@morgan_tmp << NIBBLE_3_SHIFT)); set @morgan_tmp, 0; return; } @@ -23,7 +23,7 @@ function|script|SetMorganMask|, "Yes.", L_Reset, "No.", L_End; L_Reset: - set TUTORIAL, (TUTORIAL & ~(NIBBLE_6_MASK) | (0 << NIBBLE_6_SHIFT)); + set STARTAREA, (STARTAREA & ~(NIBBLE_3_MASK) | (0 << NIBBLE_3_SHIFT)); mes "Reset!"; goto L_End; @@ -37,6 +37,10 @@ OnInit: } 042-2,101,57,0|script|Morgan|355, { + setarray @npc_loc, 101, 57, 4; + callfunc "PCtoNPCRange"; + if (@npc_check) + goto L_Close; callfunc "MorganState"; if (readparam(bInt) >= 5) goto L_Learn; |