diff options
| author | wushin <pasekei@gmail.com> | 2014-08-24 22:09:43 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2014-08-24 22:40:01 -0500 |
| commit | 2c07459b6d045f7a510811c507533e204319473a (patch) | |
| tree | eea6c599f268ecfd86cb95aecdb19c4a2ef87805 /world/map/npc/042-2/morgan.txt | |
| parent | d8e03d3b02cd6c2964b94e3c4bc3f40dad9e9888 (diff) | |
| download | serverdata-2c07459b6d045f7a510811c507533e204319473a.tar.gz serverdata-2c07459b6d045f7a510811c507533e204319473a.tar.bz2 serverdata-2c07459b6d045f7a510811c507533e204319473a.tar.xz serverdata-2c07459b6d045f7a510811c507533e204319473a.zip | |
Quest Log Fixed STARTAREA
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; |