make PCtoNPCRange smarter

6 files changed, 3 insertions, 38 deletions

diff --git a/world/map/npc/029-1/aahna.txt b/world/map/npc/029-1/aahna.txt
index e9da0d20..92f7ff6b 100644
--- a/world/map/npc/029-1/aahna.txt
+++ b/world/map/npc/029-1/aahna.txt
@@ -3,10 +3,8 @@
 // Npc
 029-1,71,52,0|script|Aahna|404
 {
-    setarray @npc_loc, 71, 52, 3;
+    set @npc_distance, 3;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Range;
     goto L_Meet;
 
 L_Meet:
@@ -14,10 +12,6 @@ L_Meet:
     mes "\"Hello, What a lovely day for a stroll.\"";
     goto L_Close;
 
-L_Range:
-    message strcharinfo(0), "Whats that? Come closer I can't hear you.";
-    goto L_Close;
-
 L_Close:
     close;
 }
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index 99e5ea1e..8d35da8b 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -8,10 +8,7 @@
 
 029-1,35,33,0|script|Scared Man|160
 {
-    setarray @npc_loc, 35, 33, 4;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_End;
     if (QL_BEGIN >= 13)
         goto L_TutDone;
     message strcharinfo(0), "He looks too afraid to say anything.";
@@ -26,10 +23,7 @@ L_End:
 }
 029-1,33,33,0|script|Hasan|189,3,3
 {
-    setarray @npc_loc, 33, 33, 4;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Close;
     goto L_Main;
 
 L_Main:
diff --git a/world/map/npc/029-1/kaan.txt b/world/map/npc/029-1/kaan.txt
index 57ab1d4c..297849fa 100644
--- a/world/map/npc/029-1/kaan.txt
+++ b/world/map/npc/029-1/kaan.txt
@@ -3,10 +3,7 @@
 
 029-1,46,95,0|script|Kaan|160
 {
-    setarray @npc_loc, 46, 97, 4;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_OutOfRange;
 
     set @kaan_talked, (STARTAREA & $@SpokeToKaan);
     if (!(@kaan_talked)) goto L_Tanisha;
@@ -17,10 +14,6 @@
     if (QL_BEGIN == 9) goto L_Hasan;
     goto L_Out;
 
-L_OutOfRange:
-    message strcharinfo(0), "Come closer!";
-    goto L_Close;
-
 L_Tanisha:
     set STARTAREA, STARTAREA | $@SpokeToKaan;
     mes "[Young Man]";
diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
index 4e4a78a6..0aa37749 100644
--- a/world/map/npc/029-1/liana.txt
+++ b/world/map/npc/029-1/liana.txt
@@ -2,10 +2,7 @@
 
 029-1,62,96,0|script|Liana|205
 {
-    setarray @npc_loc, 62, 96, 4;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_End;
     goto L_Talk;
 
 L_Talk:
@@ -38,10 +35,6 @@ L_Next:
     callfunc "SetTutorialMask";
     goto L_Close;
 
-L_End:
-    mes "You'll have to move closer";
-    goto L_Close;
-
 L_Close:
     close;
 }
diff --git a/world/map/npc/029-1/valon.txt b/world/map/npc/029-1/valon.txt
index 89398635..f4034ec9 100644
--- a/world/map/npc/029-1/valon.txt
+++ b/world/map/npc/029-1/valon.txt
@@ -64,10 +64,7 @@ OnInit:
 }
 029-1,72,86,0|script|Valon|156
 {
-    setarray @npc_loc, 72, 86, 4;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Close;
     callfunc "ValonCount";
     if (QL_VALON >= 6)
         goto L_QuestComplete;
diff --git a/world/map/npc/029-1/zegas.txt b/world/map/npc/029-1/zegas.txt
index 49b9a5c5..a350447d 100644
--- a/world/map/npc/029-1/zegas.txt
+++ b/world/map/npc/029-1/zegas.txt
@@ -3,10 +3,8 @@
 // Npc
 029-1,45,85,0|script|Zegas|165
 {
-    setarray @npc_loc, 45, 85, 2;
+    set @npc_distance, 2;
     callfunc "PCtoNPCRange";
-    if (@npc_check)
-        goto L_Range;
 
     if (QL_ZEGAS == 1)
         goto L_Find;
@@ -18,10 +16,6 @@
         goto L_Thanks;
     goto L_Meet;
 
-L_Range:
-    message strcharinfo(0), "Whats that? Come closer I can't hear you.";
-    goto L_Close;
-
 L_Meet:
     mes "[Zegas]";
     mes "\"Hey do you have a second?\"";
@@ -59,7 +53,7 @@ L_Looking:
 L_QuestEnd:
     mes "[Zegas]";
     mes "\"From the smell I can see you found the bug bomb!\"";
-    mes "\"Thanks once again, I know it's not much but here is 50 GP for your troubles.\""; 
+    mes "\"Thanks once again, I know it's not much but here is 50 GP for your troubles.\"";
     getexp 50, 0;
     set Zeny, (Zeny + 50);
     set QL_ZEGAS, 4;