Merge pull request #370 from mekolat/close-end

remove close builtin from functions

1 files changed, 24 insertions, 23 deletions

diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt
index dee7df5d..a5c56049 100644
--- a/world/map/npc/027-1/graves.txt
+++ b/world/map/npc/027-1/graves.txt
@@ -1,19 +1,9 @@
 // Easter egg graves
 
-function|script|GraveTooFar
-{
-    if (isin("027-1",89,54,122,76))
-        goto L_Return;
-    mes "You are too far away to read the grave.";
-    close;
-
-L_Return:
-    return;
-}
-
 027-1,89,62,0|script|Grave#1|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ FotherJ ~";
     mes "The mad sprite making genius who made all the creepy undead monster graphics.";
     close;
@@ -21,7 +11,8 @@ L_Return:
 
 027-1,118,54,0|script|Grave#2|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Yosuhara ~";
     mes "Contributed some of the tombstones.";
     close;
@@ -29,7 +20,8 @@ L_Return:
 
 027-1,111,62,0|script|Grave#3|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Feline Monstrosity ~";
     mes "Made the background music you are hearing.";
     close;
@@ -37,7 +29,8 @@ L_Return:
 
 027-1,112,76,0|script|Grave#4|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Superkoop ~";
     mes "Mapped the swamp to the south.";
     close;
@@ -45,7 +38,8 @@ L_Return:
 
 027-1,120,76,0|script|Grave#5|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Aroleon ~";
     mes "Mapped the swamp to the southeast.";
     close;
@@ -53,7 +47,8 @@ L_Return:
 
 027-1,100,68,0|script|Grave#6|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ John P ~";
     mes "Wrote the graveyard backstory and the dialog for the caretaker quest.";
     close;
@@ -61,7 +56,8 @@ L_Return:
 
 027-1,94,70,0|script|Grave#7|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Spit23 ~";
     mes "Made those freakin awesome cemetery gates.";
     close;
@@ -69,7 +65,8 @@ L_Return:
 
 027-1,106,60,0|script|Grave#8|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Black Don ~";
     mes "Contributed those cool gargoyle statues.";
     close;
@@ -77,7 +74,8 @@ L_Return:
 
 027-1,92,54,0|script|Grave#9|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Jaxad0127 ~";
     mes "Did all the scripting work for the graveyard. Made Caretaker's house.";
     close;
@@ -85,7 +83,8 @@ L_Return:
 
 027-1,122,64,0|script|Grave#10|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Ces Vargavind ~";
     mes "Scripted caretaker's daughter.";
     close;
@@ -93,7 +92,8 @@ L_Return:
 
 027-1,102,62,0|script|Grave#11|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Crush ~";
     mes "Organizer of the whole graveyard project, graveyard fence graphics, mapping of the graveyard itself.";
     close;
@@ -101,7 +101,8 @@ L_Return:
 
 027-1,104,76,0|script|Grave#12|400
 {
-    callfunc "GraveTooFar";
+    set @npc_distance, 1;
+    callfunc "PCtoNPCRange";
     mes "~ Freeyorp ~";
     mes "Planned out monster stats and placements.";
     close;