summaryrefslogtreecommitdiff
path: root/world/map/npc/006-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/006-1')
-rw-r--r--world/map/npc/006-1/miriam.txt13
-rw-r--r--world/map/npc/006-1/pachua.txt3
-rw-r--r--world/map/npc/006-1/traveler.txt2
3 files changed, 6 insertions, 12 deletions
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index 6580664f..ca317181 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;
@@ -161,12 +159,11 @@ L_teach:
"I am already fast.", L_notfast;
L_Prepared:
- set @agi, readparam(bAgi);
- set @torso$, getitemname(getequipid(equip_torso));
+ set @torso$, getitemlink(getequipid(equip_torso));
set @weight, MaxWeight/Weight;
if (@weight < 3)
goto L_heavyweight;
- if (@agi < 60)
+ if (Agi < 60)
goto L_slow;
if (BaseLevel < 60)
goto L_lowlevel;
@@ -197,7 +194,7 @@ L_heavymetal:
L_slow:
mes "[Miriam]";
- mes "Oh, wait, wait... " +@agi+ " Agility? Are you serious? What do you do with all your Character points? Put them all to 'Strength'? Really... I don't even want to know... Come back here when you have a decent character points distribution!\"";
+ mes "Oh, wait, wait... " +Agi+ " Agility? Are you serious? What do you do with all your Character points? Put them all to 'Strength'? Really... I don't even want to know... Come back here when you have a decent character points distribution!\"";
close;
L_lowlevel:
@@ -216,7 +213,7 @@ L_offer:
L_TorsoNext:
mes "[Miriam]";
- mes "\"I see. I like the way you distributed your Character Points too... " +@agi+ " points to Agility! You really know how to prepare yourself for a good fight!\"";
+ mes "\"I see. I like the way you distributed your Character Points too... " +Agi+ " points to Agility! You really know how to prepare yourself for a good fight!\"";
next;
mes "\"Well... Even if you have a potential to be a good fighter, moving the way you do will not help. You need to be fast to avoid the monsters. \"";
next;
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;