From b645914b726a9f401a44f3883e9e3ba9e7e35b42 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 30 May 2021 21:21:11 -0300 Subject: Fix typos, and force HurnscaldQuest_Celestia to be reset on death/logout --- npc/012-7/celestia.txt | 6 ++---- npc/functions/hub.txt | 3 +++ npc/functions/politics.txt | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/npc/012-7/celestia.txt b/npc/012-7/celestia.txt index 48b776c6c..8ad80de44 100644 --- a/npc/012-7/celestia.txt +++ b/npc/012-7/celestia.txt @@ -6,8 +6,6 @@ // Celestia Yeti King's quest. Designed so if you're with 4 players, all 4 can // summon the Yeti King, helping you while doing the quest by themselves. -// TODO: OnPCDieEvent must reset quest - 012-7,35,49,0 script Celestia NPC_ELF_F,{ .@q1=getq(HurnscaldQuest_Celestia); @@ -213,7 +211,7 @@ L_DrinkTea: } mesc l("To your pleasant surprise the tea is actually quite good."); next; - mesc l("Despite its initial dubious fragrance, the tea comes off as very smooth and mellow with a bit of natural sweetness and a touch of an earthy forest like flavour, but in a very good way."); + mesc l("Despite its initial dubious fragrance, the tea comes off as very smooth and mellow with a bit of natural sweetness and a touch of an earthy forest like flavor, but in a very good way."); next; mesc l("Clearly an exotic tea, with a refined flavor fit for a refined woman such as Celestia."); close; @@ -258,7 +256,7 @@ L_OtherQuest: mesn; mesq l("Wasn't there something on the Holy Bible? About a young boy trapped by his brothers somewhere because envy?"); mesc l("If you don't want to look at the Bible, you can try to solve the following riddle:"); - mesc l("\"When you're thristy, you may look for me. I'm often in desert areas, but this time, the winter has come.\""), 3; + mesc l("\"When you're thirsty, you may look for me. I'm often in desert areas, but this time, the winter has come.\""), 3; CINDY_PLAYER_STRUCK=false; next; clear; diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index a2a981da9..5263a62c7 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -214,6 +214,9 @@ function script HUB_Logout { setq1 HurnscaldQuest_Sagratha, 3; setq3 HurnscaldQuest_Sagratha, 0; } + // Died or logged out during Yeti King Fight + if (getq(HurnscaldQuest_Celestia) > 1) + setq HurnscaldQuest_Celestia, 1; // First death produces a warning message if (PC_DIE_COUNTER <= 1 && .@dead) { dispbottom l("Dying outside a town square will cause EXP loss."); diff --git a/npc/functions/politics.txt b/npc/functions/politics.txt index 455cd463a..0a35d2458 100644 --- a/npc/functions/politics.txt +++ b/npc/functions/politics.txt @@ -374,7 +374,7 @@ function script POL_TownInfo { -// Town Managment +// Town Management // POL_Manage( TOWNCODE ) function script POL_Manage { .@town$="$"+getarg(0); @@ -570,7 +570,7 @@ function script POL_Manage { } detachrid(); attachrid(.@you); - kamibroadcast(sprintf("%s has ANNULED THE EXILE %s from %s.", + kamibroadcast(sprintf("%s has ANNULLED THE EXILE %s from %s.", .@MAYOR$, .@ex$, getarg(0))); TOWN_ACTIONS[.@TP]+=6; break; -- cgit v1.2.3-60-g2f50