summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-1-1/yetiking.txt8
-rw-r--r--npc/012-7/celestia.txt1
2 files changed, 6 insertions, 3 deletions
diff --git a/npc/003-1-1/yetiking.txt b/npc/003-1-1/yetiking.txt
index 559a3d427..bda956612 100644
--- a/npc/003-1-1/yetiking.txt
+++ b/npc/003-1-1/yetiking.txt
@@ -8,7 +8,7 @@
// setnpcdisplay getarg(0), NPC_YETI_KING
-003-1-1,94,21,0 script #YetiKingSummon NPC_SUMMONING_CIRC,{
+003-1-1,94,21,0 script #YetiKing NPC_SUMMONING_CIRC,{
.@q=getq(HurnscaldQuest_Celestia);
if (.@q > 1 && .@q < 99)
setq HurnscaldQuest_Celestia, 1;
@@ -39,9 +39,11 @@ OnTimer5000:
if (getareausers("003-1-1", 5) < 2) {
npctalk("A lone adventurer? Pft. I'm back to my slumber!");
stopnpctimer;
+ setnpcdisplay .name$, NPC_SUMMONING_CIRC;
+ .inUse=0;
} else {
npctalk("You're courageous to summon me, I'll give you that.");
- areatimer 0, "003-1-1", 93, 20, 97, 25,3000, "#YetiKingSummon::OnSummonTalk";
+ areatimer 0, "003-1-1", 93, 20, 97, 25,3000, "#YetiKing::OnSummonTalk";
}
end;
@@ -92,7 +94,7 @@ OnSummonTalk:
mesn "Dah Yeti King!!";
mesq l("I'll warp you to the Cave Of Trials. Pass all trials, and meet me on Soren's House. Hahah!");
setq HurnscaldQuest_Celestia, 2;
- areatimer 0, "003-1-1", 93, 20, 97, 25, 15000, "#YetiKingSummon::OnWarper";
+ areatimer 0, "003-1-1", 93, 20, 97, 25, 15000, "#YetiKing::OnWarper";
npctalk l("Listen to me! Whoever wants to follow foolish @@ on their suicide quest, stay here for 15 seconds!", strcharinfo(0));
close;
diff --git a/npc/012-7/celestia.txt b/npc/012-7/celestia.txt
index cb176320e..facdfd7d2 100644
--- a/npc/012-7/celestia.txt
+++ b/npc/012-7/celestia.txt
@@ -104,6 +104,7 @@ L_TeaCheck:
select
l("I will be back shortly."),
l("I have all.");
+ mes "";
if (@menu == 1) {
closedialog;