[Enhancement] Add Gibdo Trade Sequence Options

[zodiac-ill]

Add options to the Gibdo trade sequence beneath the well in Ikana.

• Vanilla: Gibdo trade sequence works normally
• MM3D: Gibdos will only require (and take) one of the item they request, as in MM3D. Additionally, the Gibdo that requests a blue potion will also accept a red potion.
• No Trade: Gibdos will not require or take any items. They will disappear without requiring a trade.

Build Artifacts

• 2ship-mac.zip
• 2ship-linux.zip
• 2ship-windows.zip

[garrettjoecox]

Solid job! Sorry it's taken a minute to get you some feedback.

So for the most part you nailed it with using GameInteractor_Should in places to branch into custom behavior, with the main exception that you should introduce that behavior outside of the original source.

So instead of

if (GameInteractor_Should(VB_..., true)) {
    // Original Stuff
} else {
    // Custom Stuff
}

In your file, where you set *should = false; is where the custom stuff should belong.

The other part is I'd like to not add new values to the EnTalkGibudRequestedItemIndex enum and sRequestedItemTable. Let me know if you run into trouble with this and I can try and figure something out.

[zodiac-ill]

When you get the chance, please review revised commit

[garrettjoecox]

Some small things, and I'd like someone to thoroughly QA this, then we can get it in

[garrettjoecox]

Does this need to be a nested pointer? I think you can get away with just the top level pointer and changing it

[zodiac-ill]

The top-level pointer requestedItem points to the sRequestedItemTable entry that contains the blue potion. If I passed requestedItem by copy to the hook, that would leave with the ability to alter the vanilla table, which I definitely want to avoid. If I had altered the table, and the player switched back to Vanilla behavior, the gibdo would only take a red potion, and not a blue one. So I definitely don't want to change what's already there, I found that the cleanest solution is to just pass a pointer to that pointer and change what it is pointing to, which would be our own entry.

[Eblo]

One additional thought, which I don't consider a blocker for merging, is that the Gibdos' vanilla dialog does not reflect this setting. e.g. "at least five", "something blue which bestows health". Since the tooltip details the exact changes, I think that's acceptable.

[zodiac-ill]

One additional thought, which I don't consider a blocker for merging, is that the Gibdos' vanilla dialog does not reflect this setting. e.g. "at least five", "something blue which bestows health". Since the tooltip details the exact changes, I think that's acceptable.

I had also thought that the vanilla dialogue could possibly create confusion. However I wanted to avoid implementing a message that matches/resembles the MM3D dialogue, as that could be seen as including an asset from that game. Ultimately as you said I think the tooltip serves well enough.

[Patrick12115]

Ran through it a few times in game and everything seemed to work as intended

[garrettjoecox]

Final change, let's move this outside of cheats, maybe gameplay or difficulty options

[Patrick12115]

I believe this is under difficulty options in the actual menu.

[garrettjoecox]

I believe this is under difficulty options in the actual menu.

ah, so it is, I guess all of the difficulty options have the incorrect cvar path. We can adjust that later then