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/006-1 | |
| parent | b28709f705abf9ca0fff5bf79f95d0599722fdff (diff) | |
| parent | 3a0df71ee09f9fceb323f608638cc94d9d65124e (diff) | |
| download | serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.tar.gz serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.tar.bz2 serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.tar.xz serverdata-49b17a120e1b9ae26ef3039219051745ff46e913.zip | |
Merge pull request #336 from mekolat/new-builtins
Use the new builtins
Diffstat (limited to 'world/map/npc/006-1')
| -rw-r--r-- | world/map/npc/006-1/miriam.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/006-1/pachua.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/006-1/traveler.txt | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index f513955b..8b7ebdb4 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -20,10 +20,8 @@ 006-1,115,111,0|script|Miriam|175 { - setarray @npc_loc, 115, 111, 2; + set @npc_distance, 2; callfunc "PCtoNPCRange"; - if (@npc_check) - goto L_Close; if (getskilllv(SKILL_SPEED)) goto L_fast; if (getequipid(equip_torso) < 0) goto L_naked; diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt index 7b39dce7..905ffcb4 100644 --- a/world/map/npc/006-1/pachua.txt +++ b/world/map/npc/006-1/pachua.txt @@ -1,9 +1,6 @@ 006-1,24,113,0|script|Pachua|143 { - setarray @npc_loc, 24, 113, 4; callfunc "PCtoNPCRange"; - if (@npc_check) - goto L_Close; set @halloween_npc_id, $@halloween_npc_pachua; callfunc "TrickOrTreat"; diff --git a/world/map/npc/006-1/traveler.txt b/world/map/npc/006-1/traveler.txt index f87cf083..7c84e040 100644 --- a/world/map/npc/006-1/traveler.txt +++ b/world/map/npc/006-1/traveler.txt @@ -4,7 +4,7 @@ 006-1,25,95,0|script|Rhutan the Traveler|103 { - set @NpcName$, "Rhutan"; + set @npcname$, "Rhutan"; set @NpcTravelBit, $@pachua_bit; callfunc "Traveler"; end; |