Add New Quest State for Mushroom Quest#8475
Add New Quest State for Mushroom Quest#8475NiteKat wants to merge 2 commits intodiasurgical:masterfrom
Conversation
Adds a new state to the Mushroom Quest named QS_ADRIATALKED to track if she spoke the quest text about the demon brain in the player's inventory, allowing the player to hear that quest text once and then access her talk menu instead of her infinitely complaining about the brain.
Source/towners.cpp
Outdated
| if (HasInventoryItemWithId(player, IDI_BRAIN)) { | ||
| if (HasInventoryItemWithId(player, IDI_BRAIN) && Quests[Q_MUSHROOM]._qvar1 != QS_ADRIATALKED) { | ||
| Quests[Q_MUSHROOM]._qmsg = TEXT_MUSH11; | ||
| Quests[Q_MUSHROOM]._qvar1 = QS_ADRIATALKED; |
There was a problem hiding this comment.
_qvar1 gets stored in the save file so I think this enum should match the one in Devilution for the purposes of save compatibility. I feel like there must be another way.
There was a problem hiding this comment.
It looks like the original logic is using _qvar2 for this. Seems like we should be doing that, also for save compatibility.
There was a problem hiding this comment.
Oh good catch, I missed that was qvar2 in the original and not qvar1. I also got distracted by how tMsgSaid was removed in DevilutionX but is present in Devilution, though I couldn't find that being used anywhere.
This could be swapped to qvar2 and should work the same I think, and instead of using a QS_, we'd just store TEXT_MUSH11 and check for that like Devilution does.
Reverts the new QS_ and swaps to using qvar2 and TEXT_MUSH11 to track if Adria has given the quest text regarding the brain to match what Deviltuion/1.09 does to keep save file compatibility.
|
I'm not sure why the clang-format check fails. It looks like the clang warnings I can see are unrelated to the changes I made? |
|
Yeah, master is currently failing that check. |
3 participants
Adds a new state to the Mushroom Quest named QS_ADRIATALKED to track if she spoke the quest text about the demon brain in the player's inventory, allowing the player to hear that quest text once and then access her talk menu instead of her infinitely complaining about the brain.
Closes #8446