From 01d07d4c298d407b9d2282d5fccdee92cd93f946 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 9 Jul 2018 18:01:04 -0300
Subject: Regenerate map cache

---
 npc/012-1/ship.txt  | 13 +++++++++----
 npc/016-1/doors.txt |  2 +-
 npc/016-6/main.txt  |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'npc')

diff --git a/npc/012-1/ship.txt b/npc/012-1/ship.txt
index 01a7c7b64..7a7b15c32 100644
--- a/npc/012-1/ship.txt
+++ b/npc/012-1/ship.txt
@@ -2,17 +2,22 @@
 // Authors:
 //    Jesusalva
 // Description:
-//    This script controls access to Marine's Ship, fixing variables.
+//    This script controls access to Ships, fixing variables.
 
-012-1,0,0,0	script	HurnsShip	NPC_HIDDEN,0,0,{
+012-1,157,65,0	script	HurnsShip#M	NPC_HIDDEN,0,0,{
 
 OnTouch:
     LOCATION$="Hurns";
     goto L_Warp;
 
 L_Warp:
-    //warp "016-1", 0, 0;
-    warp "016-6@"+LOCATION$, 31, 28;
+    /* Is Hurnscald already liberated? Precendence. */
+    if (!$HURNS_LIBDATE) {
+        warp "Save", 0, 0;
+        end;
+    }
+
+    warp "016-1@"+LOCATION$, 21, 26;
     closedialog;
     close;
 }
diff --git a/npc/016-1/doors.txt b/npc/016-1/doors.txt
index 66e679803..2e947aaac 100644
--- a/npc/016-1/doors.txt
+++ b/npc/016-1/doors.txt
@@ -8,7 +8,7 @@
 
 OnTouch:
     if (LOCATION$ == "Hurns") {
-        warp "012-1", 141, 65;
+        warp "012-1", 156, 65;
         close;
     }
     if (LOCATION$ == "Tulim") {
diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt
index 522acb671..73f996f69 100644
--- a/npc/016-6/main.txt
+++ b/npc/016-6/main.txt
@@ -17,7 +17,7 @@ L_Hurns:
     PC_DEST$ = "";
     LOCATION$ = "Hurns";
     @timer_navio_running = 0;
-    warp "012-1", 141, 65;
+    warp "012-1", 156, 65;
     message strcharinfo(0), l("@@ disembarks at Hurnscald.", strcharinfo(0));
     goto L_CleanUp;
 
-- 
cgit v1.2.3-60-g2f50