From 9cb76fe689100b5170048bb0e167f90616930e9f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 27 Nov 2021 13:17:04 -0300 Subject: Ensure Sagratha Campaign will absolutely be cleared up correctly --- npc/015-8-1/campaign.txt | 1 + npc/functions/hub.txt | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt index 890cf2803..1736fdd2a 100644 --- a/npc/015-8-1/campaign.txt +++ b/npc/015-8-1/campaign.txt @@ -165,6 +165,7 @@ OnSagrathaReallyDie: deltimer(.@n$+"::OnW01"); deltimer(.@n$+"::OnW02"); deltimer(.@n$+"::OnW03"); + deltimer(.@n$+"::OnW04"); killmonster(.@m$, .@n$+"::OnError"); unitkill(.BOSS); mapannounce(.@m$, "##2"+l("You lose!"), 0); diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index 2a6dd9ba0..5c926ccb5 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -226,6 +226,17 @@ function script HUB_Logout { if (compare(.@mapa$, "sgt2")) { setq1 HurnscaldQuest_Sagratha, 3; setq3 HurnscaldQuest_Sagratha, 0; + deltimer("#SaggyDungeonCore::OnW01"); + deltimer("#SaggyDungeonCore::OnW02"); + deltimer("#SaggyDungeonCore::OnW03"); + deltimer("#SaggyDungeonCore::OnW04"); + if (instance_id() >= 0) { + .@n$=instance_npcname("#SaggyDungeonCore"); + deltimer(.@n$+"::OnW01"); + deltimer(.@n$+"::OnW02"); + deltimer(.@n$+"::OnW03"); + deltimer(.@n$+"::OnW04"); + } } // Died or logged out during a Boss Raid event if (compare(.@mapa$, "fyrb")) { -- cgit v1.2.3-60-g2f50