summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/014-5/sagratha.txt4
-rw-r--r--npc/015-8-1/campaign.txt2
-rw-r--r--npc/functions/hub.txt5
3 files changed, 9 insertions, 2 deletions
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index 847872b11..1b603064e 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -31,8 +31,8 @@ function script SaggyInstCheck {
instance_attachmap("014-5-1", .@inst, false, .@mapn$);
//instance_attachmap("015-8", .@inst, false, .@mapn$);
instance_attachmap("015-8-1", .@inst, false, .@map2$);
- // 40 minutes (2400s) inside, or 5 minutes (300s) outside
- instance_set_timeout(2400, 300, .@inst);
+ // Instance lasts one hour
+ instance_set_timeout(3600, 3600, .@inst);
instance_init(.@inst);
setq2 HurnscaldQuest_Sagratha, .@inst;
}
diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt
index 037c8c93f..4c748e9b6 100644
--- a/npc/015-8-1/campaign.txt
+++ b/npc/015-8-1/campaign.txt
@@ -76,6 +76,8 @@ OnS04:
// Objective announce
mapannounce(.@m$, "##2"+l("Victory Conditions: Defeat the assassin!"), 0);
+ mapannounce(.@m$, "##1"+l("Defeat Conditions: Your death!"), 0);
+ mapannounce(.@m$, "##1"+l("Defeat Conditions: Time run out!"), 0);
mapannounce(.@m$, "##1"+l("Defeat Conditions: Sagratha gets killed!"), 0);
// Status cleanup
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 168823cf4..81462ac40 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -61,6 +61,11 @@ function script HUB_Logout {
if (.@mapa$ == "020-7-1") {
callfunc("BSClearNest", @nestid);
}
+ // Died or logged out during Sagratha Fight
+ if (.@mapa$ ~= "sgt2*") {
+ setq1 HurnscaldQuest_Sagratha, 3;
+ setq3 HurnscaldQuest_Sagratha, 0;
+ }
// First death produces a warning message
if (PC_DIE_COUNTER <= 1 && .@dead) {
dispbottom l("Dying outside a town square will cause EXP loss.");