From 637b1fee7f79c6acae420a2a1968ee55905d5b92 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 25 Jan 2019 11:47:41 -0200
Subject: Fix some regex glitches, warn player on first deaths that death
penalty is there
---
npc/001-8/hub.txt | 6 +++++-
npc/002-1/peter.txt | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
(limited to 'npc')
diff --git a/npc/001-8/hub.txt b/npc/001-8/hub.txt
index 061ef5061..d581659a3 100644
--- a/npc/001-8/hub.txt
+++ b/npc/001-8/hub.txt
@@ -399,7 +399,7 @@ OnPCLogoutEvent:
setq HurnscaldQuest_BloodDonor, 0, gettimetick(2)+3600; // one hour penalty
}
// Logout/Death on Nard's ship hold
- if (.@mapa$ ~= "002-2") {
+ if (.@mapa$ ~= "002-2" || .@mapa$ ~= "nard*") {
setq2 ShipQuests_Peter, 0;
setq3 ShipQuests_Peter, -1;
}
@@ -414,6 +414,10 @@ OnPCLogoutEvent:
@deathpenalty_realvalue=readparam(BaseExp);
@deathpenalty_realvaljob=readparam(JobExp);
}
+ // First death produces a warning message
+ if (PC_DIE_COUNTER <= 1 && @qhub_died) {
+ dispbottom l("Dying outside a town square will cause EXP loss.");
+ }
// This allows code to override death penalty, just once:
// @deathpenalty_override
diff --git a/npc/002-1/peter.txt b/npc/002-1/peter.txt
index 4a35c432b..41f27e260 100644
--- a/npc/002-1/peter.txt
+++ b/npc/002-1/peter.txt
@@ -69,7 +69,7 @@ L_Task:
close;
OnLowTime:
- if ((getmap() ~= "002-2") || (getmap() ~= "nard"))
+ if ((getmap() ~= "002-2") || (getmap() ~= "nard*"))
dispbottom l("Time is running out... Hurry up!");
end;
@@ -212,7 +212,7 @@ OnStartOutside:
close;
OnTimeout:
- if (!(getmap() ~= "002-2") && !(getmap() ~= "nard"))
+ if (!(getmap() ~= "002-2") && !(getmap() ~= "nard*"))
end;
warp "002-1@"+LOCATION$, 35, 26;
.@q3 = getq3(ShipQuests_Peter);
--
cgit v1.2.3-70-g09d2