diff options
Diffstat (limited to 'world/map/npc/006-1')
| -rw-r--r-- | world/map/npc/006-1/_mobs.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/006-1/miriam.txt | 16 | ||||
| -rw-r--r-- | world/map/npc/006-1/pachua.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/006-1/spirit.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/006-1/traveler.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/006-1/tree.txt | 8 |
6 files changed, 18 insertions, 22 deletions
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt index d2a6f7f0..2288ec92 100644 --- a/world/map/npc/006-1/_mobs.txt +++ b/world/map/npc/006-1/_mobs.txt @@ -24,7 +24,7 @@ 006-1,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010 -006-1,0,0,0|script|Mob006-1|-1 +006-1,0,0,0|script|Mob006-1|32767 { end; diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index 6580664f..edcb5b63 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -20,10 +20,9 @@ 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(@npc_check) end; if (getskilllv(SKILL_SPEED)) goto L_fast; if (getequipid(equip_torso) < 0) goto L_naked; @@ -161,12 +160,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 +195,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: @@ -212,11 +210,11 @@ L_offer: if (!(getskilllv(SKILL_POOL))) goto L_noskill; menu - "Yes, I look really good in this " +@torso$+ ".",L_TorsoNext; + "Yes, I look really good in this.",L_TorsoNext; 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..f0230a7a 100644 --- a/world/map/npc/006-1/pachua.txt +++ b/world/map/npc/006-1/pachua.txt @@ -1,9 +1,7 @@ 006-1,24,113,0|script|Pachua|143 { - setarray @npc_loc, 24, 113, 4; callfunc "PCtoNPCRange"; - if (@npc_check) - goto L_Close; + if(@npc_check) end; set @halloween_npc_id, $@halloween_npc_pachua; callfunc "TrickOrTreat"; diff --git a/world/map/npc/006-1/spirit.txt b/world/map/npc/006-1/spirit.txt index ef88d7d7..ecf3a4b1 100644 --- a/world/map/npc/006-1/spirit.txt +++ b/world/map/npc/006-1/spirit.txt @@ -4,7 +4,7 @@ function|script|EarthImpTouch mes "[Well]"; mes "You hear noises from within the well."; - close; + return; L_message: set @Q_MASK, NIBBLE_0_MASK; @@ -279,7 +279,7 @@ L_Close: set @Q_STATUS_STUDENT2, 0; set @Q_STATUS_STUDENT3, 0; set @s$, ""; - close; + return; S_update_var: set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT)); @@ -289,11 +289,11 @@ S_update_var: 006-1,63,79,0|script|#EarthImp0#_M|400 { callfunc "EarthImpTouch"; - end; + close; } 006-1,64,79,0|script|#EarthImp1#_M|400 { callfunc "EarthImpTouch"; - end; + close; } 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; diff --git a/world/map/npc/006-1/tree.txt b/world/map/npc/006-1/tree.txt index ecbc3584..6740312e 100644 --- a/world/map/npc/006-1/tree.txt +++ b/world/map/npc/006-1/tree.txt @@ -39,7 +39,7 @@ L_Close: set @Q_status_lower, 0; set @Q_wr_status, 0; set @value, 0; - close; + return; S_update_var: set @Q_wr_status, (@Q_status << 2) | @Q_status_lower; @@ -151,18 +151,18 @@ L_Close: set @Q_MASK, 0; set @Q_SHIFT, 0; set @Q_status, 0; - close; + return; } 006-1,82,59,0|script|#DruidTree0#_M|400 { callfunc "QuestTreeTouch"; - end; + close; } 006-1,83,59,0|script|#DruidTree1#_M|400 { callfunc "QuestTreeTouch"; - end; + close; } |