diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-30 01:11:22 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-30 01:11:22 -0500 |
| commit | 49b17a120e1b9ae26ef3039219051745ff46e913 (patch) | |
| tree | 877deffe3f331b74d6af72bc0cf8f30f840736aa /world/map/npc/029-2/barrels_config.txt | |
| parent | b28709f705abf9ca0fff5bf79f95d0599722fdff (diff) | |
| parent | 3a0df71ee09f9fceb323f608638cc94d9d65124e (diff) | |
| download | classic-serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.tar.gz classic-serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.tar.bz2 classic-serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.tar.xz classic-serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.zip | |
Merge pull request #336 from mekolat/new-builtins
Use the new builtins
Diffstat (limited to 'world/map/npc/029-2/barrels_config.txt')
| -rw-r--r-- | world/map/npc/029-2/barrels_config.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt index 1b83d25b..1d356a08 100644 --- a/world/map/npc/029-2/barrels_config.txt +++ b/world/map/npc/029-2/barrels_config.txt @@ -20,7 +20,7 @@ function|script|CountBarrels set @count_tmp, 0; goto L_Loop; -L_Loop: +L_Loop: if (STARTAREA & $@BarrelBits[@barrel_count]) goto L_AddOne; goto L_LoopAgain; @@ -40,9 +40,8 @@ L_BarrelTally: } function|script|CheckBarrel { + set @npc_distance, 2; callfunc "PCtoNPCRange"; - if (@npc_check) - goto L_Range; if (!(QL_ZEGAS == 2)) goto L_NoI; if (STARTAREA & $@BarrelBits[@barrel]) @@ -58,10 +57,6 @@ function|script|CheckBarrel goto L_Spawn; goto L_Reward; -L_Range: - message strcharinfo(0), "You'll need to get closer."; - goto L_Return; - L_NoI: message strcharinfo(0), "Nothing interesting here."; goto L_Return; @@ -79,7 +74,9 @@ L_QuestReward: L_Spawn: message strcharinfo(0), "Uck, More Maggots!"; - areamonster getmap() + "", @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath"; + setarray @npc_loc, getnpcx(), getnpcy(); + areamonster getmap(), @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath"; + cleararray @npc_loc, 0, 2; goto L_Return; L_Reward: |