[Issue Report]: Issues with Adria's Quest Text for Black Mushroom Quest

[NiteKat]

Operating System

Windows x64

DevilutionX version

Custom build (please specify commit ID)

Describe

DAPIIntegration branch commit 21e0b2f
Last master branch commit 5e6e2e8

If you talk to Adria while holding the Brain, she will give her usual quest text asking you why you brought it to her; however, she will do this EVERY time you talk to her while holding the Brain in your inventory.

To Reproduce

1. Progress the Black Mushroom quest to the point of obtaining the Brain.
2. Click Adria while holding the Brain in your inventory.
3. When the quest text box closes, click Adria again while still holding the Brain in your inventory.

Expected Behavior

Adria should only state her quest text asking you why you brought her the brain once, and then proceed to let talk/shop/recharge etc. while still holding the brain.

Additional context

Additionally, not sure if this is a bug or not, but there is a quest text that is skipped when you turn in the fungal tomb. She jumps straight to saying she needs a big black mushroom instead of telling you the tomb is a book of reagents, and THEN saying she needs the mushroom.

[strich]

Can you please provide a sav file that more quickly repros the issue?

[NiteKat]

Attached is a save file with a warrior holding a Brain and unable to interact with Adria. If you click her she will only say the quest text.

example.zip

I was unable to reproduce the skipping of the quest text where she talks about the fungal tome - that looks like it might be an issue with how the bot I use to test the API integration is interacting with the NPC though that might imply there's a frame perfect way to skip it so I'll have to research that further.

[NiteKat]

Digging into this some, I found the code that causes this.

DevilutionX/Source/towners.cpp

Line 369 in ed18290

if (Quests[Q_MUSHROOM]._qvar1 >= QS_MUSHGIVEN) {

This code says if the quest variable is above or equal to 5 and the player has the brain to always play TEXT_MUSH11 which is the Grotesque Organ quote. The only way to avoid this if the quest variable is above or equal to 5 is to not have the brain in your inventory. I still need to compare to Devilution and see how this differs since this doesn't happen in 1.09.

[NiteKat]

Figured it out, it's due to the way we check the quest variable in DevilutionX compared to Devilution/1.09.

https://github.com/diasurgical/devilution/blob/9f01757243412bb154d02d9af65c804159e6e0ea/Source/towners.cpp#L1061-L1066

DevilutionX/Source/towners.cpp

Lines 369 to 375 in ed18290

	if (Quests[Q_MUSHROOM]._qvar1 >= QS_MUSHGIVEN) {
	if (HasInventoryItemWithId(player, IDI_BRAIN)) {
	Quests[Q_MUSHROOM]._qmsg = TEXT_MUSH11;
	NetSendCmdQuest(true, Quests[Q_MUSHROOM]);
	InitQTextMsg(TEXT_MUSH11);
	return;
	}

TEXT_MUSH11 is value 131 in DevilutionX

QS_MUSHGIVEN is 5 in DevilutionX.

So while we do update qvar here, checking >= is a problem, but I think the underlying issue is that quest state is being tracked two different ways, with the speech_id enum AND the unnamed enum where they start with QS.

EDIT: Just noticed my analysis is wrong. There's a system in 1.09/Devilution that isn't in DevilutionX anymore that's being used. _tMsgSaid

https://github.com/diasurgical/devilution/blob/9f01757243412bb154d02d9af65c804159e6e0ea/Source/towners.cpp#L1066C5-L1067C1

I think that's actually the issue.

[NiteKat]

Looking at this again, I'm pretty sure it's the qvar check. It's != in Devilution, and it's >= in DevilutionX and the enum values work such that TEXT_MUSH11 will trigger this.

[NiteKat]

I have a fix that appears to work. I'm testing it a bit before submitting a PR.