Npcs remaining script fixes

Npcs changed for travel
Npcs changed for new maps
Npcs changed for basic crypts

1 files changed, 8 insertions, 11 deletions

diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index bd28a0a5..05c887cd 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -55,15 +55,12 @@ L_Favor:
 L_Receive:
     set QUEST_Graveyard_Caretaker, 2;
     mes "You receive the letter and put it in a special place so it doesn't get lost in your inventory.";
-    if (@menu == 2)
-        goto L_Location;
-    close;
-
-L_Location:
     next;
-    goto L_Location_Real;
+    if (@menu != 2)
+        close;
+    goto L_Location;
 
-L_Location_Real:
+L_Location:
     mes "[Caretaker]";
     mes "\"Her name is Airlia. She works at the town hall in Hurnscald. Thank you for your help.\"";
     close;
@@ -75,7 +72,7 @@ L_Has_Letter:
     menu
         "Not yet.", L_Close,
         "I'll get there when I get there.", L_Close,
-        "Where did you say I could find her?", L_Location_Real;
+        "Where did you say I could find her?", L_Location;
 
 L_Delivered_Letter:
     mes "[Caretaker]";
@@ -106,6 +103,9 @@ L_Give_New_Letter_Real:
     mes "\"Thank you.\"";
     close;
 
+L_Close:
+    close;
+
 OnTimer3000:
     monster "027-2.gat", 29, 21, "Caretaker's Wife", 1044, 1, "Caretaker::OnWifeDeath";
     stopnpctimer;
@@ -122,7 +122,4 @@ OnWifeDeath:
     gmcommand "@ban +5mn " + strcharinfo(0);
     initnpctimer;
     end;
-
-L_Close:
-    close;
 }