summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-06-10 21:47:54 -0300
committerJesusaves <cpntb1@ymail.com>2018-06-10 21:47:54 -0300
commitb9cf2f7f9cfeaa90a80311b4b6ec9ec65915959e (patch)
tree92270590b47c9174dc26f4f5488a10c5bce905ea
parent17f52684d8dec6b08b78619a264e949ccd79bd5f (diff)
downloadserverdata-b9cf2f7f9cfeaa90a80311b4b6ec9ec65915959e.tar.gz
serverdata-b9cf2f7f9cfeaa90a80311b4b6ec9ec65915959e.tar.bz2
serverdata-b9cf2f7f9cfeaa90a80311b4b6ec9ec65915959e.tar.xz
serverdata-b9cf2f7f9cfeaa90a80311b4b6ec9ec65915959e.zip
Fix some crazy bugs. With this, travel Tulim->Hurns should be fine.
-rw-r--r--npc/016-1/doors.txt2
-rw-r--r--npc/016-6/main.txt2
-rw-r--r--npc/functions/util.txt6
3 files changed, 6 insertions, 4 deletions
diff --git a/npc/016-1/doors.txt b/npc/016-1/doors.txt
index 62759c83a..271e5fb64 100644
--- a/npc/016-1/doors.txt
+++ b/npc/016-1/doors.txt
@@ -14,7 +14,7 @@ OnTouch:
close;
}
if (LOCATION$ == "Tulim") {
- warp "003-1", 81, 68;
+ warp "003-1", 119, 25;
close;
}
mes col("Oh noes! The door is locked!! Quick! Call a GM!!!", 1);
diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt
index 8c67a59a5..8573283c6 100644
--- a/npc/016-6/main.txt
+++ b/npc/016-6/main.txt
@@ -16,7 +16,7 @@ L_Hurns:
PC_DEST$ = "";
LOCATION$ = "Hurns";
@timer_navio_running = 0;
- warp "014-1", 141, 65;
+ warp "012-1", 141, 65;
message strcharinfo(0), l("@@ disembarks at Hurnscald.", strcharinfo(0));
end;
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 1558fb4b7..5449ca97a 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -100,16 +100,18 @@ function script nard_reputation {
function script nard_time {
// Estimates time to move by ship from LOCATION$ to getarg(0)
- // Candor
+ // From Candor
if (LOCATION$ == "Candor") {
if (getarg(0) == "Tulim")
return 22000;
}
- // Candor
+ // From Tulimshar
if (LOCATION$ == "Tulim") {
if (getarg(0) == "Candor")
return 22000;
+ if (getarg(0) == "Hurns")
+ return 19000;
}