Frogs Ocarina Game Difficulty Options

[A-Green-Spoon]

Adds instant win, an unlimited failure timer, and a slider to increase the frames before failure

Build Artifacts

• soh.otr.zip
• soh-linux-compatibility.zip
• soh-linux-performance.zip
• soh-windows.zip
• soh-mac.zip

[Malkierian]

Congratulations, you get to be the guinea pig for the new vanilla codeflow PR policy. We're going to start being more strict about notating changes to vanilla code, and yours was freshest in my mind.

[Malkierian]

Just noticed that you put the // Enhancement end one bracket too low on the first enhancement block.

[Malkierian]

Also, I was looking more closely at that code block, and I think I misunderstood some of what was going on there. I think some of the vanilla block needs to be reincorporated into the enhancement block. I think this

        else {
            this->ocarinaNoteIndex = 0;
            func_8010BD58(play, OCARINA_ACTION_FROGS);
            this->ocarinaNote = EnFr_GetNextNoteFrogSong(this->ocarinaNoteIndex);
            EnFr_CheckOcarinaInputFrogSong(this->ocarinaNote);
            this->actionFunc = EnFr_ContinueFrogSong;
        }

needs to be added back onto the if (CVarGetInteger("gInstantFrogsGameWin", 0)) block flow, as that does still need to run in the enhancement block if the instant win isn't on. My apologies XD. I knew there was supposed to be some code duplication. Should probably test that to make sure everything still works before the next commit.

[Malkierian]

Perfect. All aspects work (and the difference in multipliers is noticeable, but not overly much), and I'm satisfied with the format of the code now. Great work.

[Malkierian]

Also, should we decide to change the default time for non-modified stuff, I think that should be a separate PR and doesn't need to hold this up.

[Pepper0ni]

I want to review this and probably your other outstanding PRs soon and see if I can push them through, can you please resolve the conflicts.

[A-Green-Spoon]

I want to review this and probably your other outstanding PRs soon and see if I can push them through, can you please resolve the conflicts.

Conflicts resolved and CVAR changes updated on all of my outstanding PRs!

[Pepper0ni]

LGTM.

It's not blocking, but I think a future PR that adds more granular options (especially for trying to simulate the intended time) and the option to use the random game you get on second play for the first play would make this even better.

[inspectredc]

Just a couple things here