From 61e90a592e7e587aaa161063e318126c46fd7c37 Mon Sep 17 00:00:00 2001
From: ephphatha <ephphatha@thelettereph.com>
Date: Tue, 2 May 2023 17:39:56 +1000
Subject: [PATCH] Play Pepin's quest intro dialog if the player skips the intro

If the player discovers and enters the poison water set level before talking to Pepin the poison water quest does not appear in the quest log and his first set of dialog doesn't play. Handle this case specifically to ensure the player gets the message and can see progress.
---
 Source/towners.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Source/towners.cpp b/Source/towners.cpp
index c71250e44..80c00a4a8 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -486,30 +486,34 @@ void TalkToDrunk(Player & /*player*/, Towner & /*drunk*/)
 
 void TalkToHealer(Player &player, Towner &healer)
 {
-	if (Quests[Q_PWATER]._qactive != QUEST_NOTAVAIL) {
-		if ((player._pLvlVisited[1] || player._pLvlVisited[5]) && Quests[Q_PWATER]._qactive == QUEST_INIT) {
-			Quests[Q_PWATER]._qactive = QUEST_ACTIVE;
-			Quests[Q_PWATER]._qlog = true;
-			Quests[Q_PWATER]._qmsg = TEXT_POISON3;
+	Quest &poisonWater = Quests[Q_PWATER];
+	if (poisonWater._qactive != QUEST_NOTAVAIL) {
+		if ((poisonWater._qactive == QUEST_INIT && (player._pLvlVisited[1] || player._pLvlVisited[5])) || (poisonWater._qactive == QUEST_ACTIVE && !poisonWater._qlog)) {
+			// Play the dialog and make the quest visible in the log if the player has not started the quest but has
+			// visited the dungeon at least once, or if they've found the poison water cave before speaking to pepin
+			poisonWater._qactive = QUEST_ACTIVE;
+			poisonWater._qlog = true;
+			poisonWater._qmsg = TEXT_POISON3;
 			InitQTextMsg(TEXT_POISON3);
-			NetSendCmdQuest(true, Quests[Q_PWATER]);
+			NetSendCmdQuest(true, poisonWater);
 			return;
 		}
-		if (Quests[Q_PWATER]._qactive == QUEST_DONE && Quests[Q_PWATER]._qvar1 != 2) {
-			Quests[Q_PWATER]._qvar1 = 2;
+		if (poisonWater._qactive == QUEST_DONE && poisonWater._qvar1 != 2) {
+			poisonWater._qvar1 = 2;
 			InitQTextMsg(TEXT_POISON5);
 			SpawnUnique(UITEM_TRING, healer.position + Direction::SouthWest);
-			NetSendCmdQuest(true, Quests[Q_PWATER]);
+			NetSendCmdQuest(true, poisonWater);
 			return;
 		}
 	}
-	if (Quests[Q_MUSHROOM]._qactive == QUEST_ACTIVE) {
-		if (Quests[Q_MUSHROOM]._qvar1 >= QS_MUSHGIVEN && Quests[Q_MUSHROOM]._qvar1 < QS_BRAINGIVEN && RemoveInventoryItemById(player, IDI_BRAIN)) {
+	Quest &blackMushroom = Quests[Q_MUSHROOM];
+	if (blackMushroom._qactive == QUEST_ACTIVE) {
+		if (blackMushroom._qvar1 >= QS_MUSHGIVEN && blackMushroom._qvar1 < QS_BRAINGIVEN && RemoveInventoryItemById(player, IDI_BRAIN)) {
 			SpawnQuestItem(IDI_SPECELIX, healer.position + Displacement { 0, 1 }, 0, 0, true);
 			InitQTextMsg(TEXT_MUSH4);
-			Quests[Q_MUSHROOM]._qvar1 = QS_BRAINGIVEN;
+			blackMushroom._qvar1 = QS_BRAINGIVEN;
 			QuestDialogTable[TOWN_HEALER][Q_MUSHROOM] = TEXT_NONE;
-			NetSendCmdQuest(true, Quests[Q_MUSHROOM]);
+			NetSendCmdQuest(true, blackMushroom);
 			return;
 		}
 	}