Polishing up Yeti King Summon

1 files changed, 16 insertions, 5 deletions

diff --git a/npc/003-1-1/yetiking.txt b/npc/003-1-1/yetiking.txt
index 1310e3f46..b26ffd51a 100644
--- a/npc/003-1-1/yetiking.txt
+++ b/npc/003-1-1/yetiking.txt
@@ -23,8 +23,8 @@ L_Summon:
     end;
 
 L_Die:
-    percentheal(-100, -100);
     npctalk3 l("You're playing with fire. Or ice. Or whatever.");
+    percentheal(-100, -100);
     closedialog;
     close;
 
@@ -40,6 +40,7 @@ OnTimer2000:
 OnTimer5000:
     if (getareausers("003-1-1", 5) < 2 && !$@GM_OVERRIDE) {
         npctalk("A lone adventurer? Pft. I'm back to my slumber!");
+        .inUse=2;
     } else {
         npctalk("You're courageous to summon me, I'll give you that.");
         areatimer "003-1-1", 93, 20, 97, 25,3000, "#YetiKing::OnSummonTalk";
@@ -47,13 +48,23 @@ OnTimer5000:
     }
     end;
 
-// NPC timer is stopped before reaching here, if it reaches, it means you tried
+// Now we check if time ran out (standard inUse) because cowardice, or if you tried
 // to do the quest alone. And this is a Co-Op quest with free player numbers.
 // Therefore, we must return the Yeti King to his summon circle.
 OnTimer7500:
-    setnpcdisplay .name$, NPC_SUMMONING_CIRC;
-    .inUse=0;
-    stopnpctimer;
+    if (.inUse == 2) {
+        setnpcdisplay .name$, NPC_SUMMONING_CIRC;
+        .inUse=0;
+        stopnpctimer;
+    }
+    end;
+
+OnTimer45000:
+    if (.inUse == 1) {
+        setnpcdisplay .name$, NPC_SUMMONING_CIRC;
+        .inUse=0;
+        stopnpctimer;
+    }
     end;
 
 // You can only talk to him with SummonTalk. Only one player will summon.