diff options
| author | wushin <pasekei@gmail.com> | 2014-11-05 11:18:36 -0600 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2014-11-05 11:47:24 -0600 |
| commit | 78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f (patch) | |
| tree | c60a8593f1372a2522689306d732e4cf37f1470d /world/map/npc/042-1/valon.txt | |
| parent | 657fa3576f1d7915b1e30264c213cfe5c7fec39d (diff) | |
| download | serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.tar.gz serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.tar.bz2 serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.tar.xz serverdata-78aa4db5d8f99b8aa2f433b5d7ed4aa90f40fa5f.zip | |
NPCs on 042-* fixed
Diffstat (limited to 'world/map/npc/042-1/valon.txt')
| -rw-r--r-- | world/map/npc/042-1/valon.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt index f4296af9..b50207a3 100644 --- a/world/map/npc/042-1/valon.txt +++ b/world/map/npc/042-1/valon.txt @@ -1,6 +1,6 @@ // This file is part of the Tutorial // Author: Jenalya, Wushin --|script|#ValonConfig|-1, +-|script|#ValonConfig|-1 { end; @@ -10,7 +10,7 @@ OnInit: setarray $@ValonMobCnt, 10,5,3,1; end; } -function|script|ValonState|, +function|script|ValonState { set @valon_state, ((STARTAREA & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); set @valon_mob, 0; @@ -19,18 +19,18 @@ function|script|ValonState|, set @valon_count, ((STARTAREA & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); return; } -function|script|setValonMask|, +function|script|setValonMask { set STARTAREA, (STARTAREA & ~(NIBBLE_1_MASK) | (@valon_tmp << NIBBLE_1_SHIFT)); set @valon_tmp, 0; return; } -function|script|ResetValonCntMask|, +function|script|ResetValonCntMask { set STARTAREA, (STARTAREA & ~(NIBBLE_2_MASK) | (0 << NIBBLE_2_SHIFT)); return; } -function|script|AddValonCntMask|, +function|script|AddValonCntMask { set @valon_tmp, (@valon_count + 1); if (@valon_tmp > $@ValonMobCnt[@valon_mob]) @@ -40,14 +40,14 @@ function|script|AddValonCntMask|, callfunc "ValonProgress"; return; } -function|script|ValonProgress|, +function|script|ValonProgress { callfunc "ValonState"; if ((@valon_state > 1) && (@valon_state < 6)) message strcharinfo(0), $@ValonMobName$[@valon_mob] + ": " + @valon_count + "/" + $@ValonMobCnt[@valon_mob]; return; } -042-1.gat,51,111,0|script|ValonDebug|156, +042-1.gat,51,111,0|script|ValonDebug|156 { mes "[Valon Debug]"; mes "Reset?"; @@ -69,7 +69,7 @@ OnInit: disablenpc "ValonDebug"; end; } -042-1.gat,48,111,0|script|Valon|156, +042-1.gat,48,111,0|script|Valon|156 { setarray @npc_loc, 48, 111, 4; callfunc "PCtoNPCRange"; |