ReformCopyright authored 7 years ago and ReformCopyright committed 6 years ago

Now that auto forfeit works, there's no need to start the auto forfeit timer after closing the Options modal. If actualMainButtonState is true, there's always already some timeout set, and it would be wrong to set another one, and if actualMainButtonState is false, the main button will be enabled, allowing progression.

ReformCopyright authored 7 years ago and ReformCopyright committed 6 years ago

Simply call allowProgression() instead of carefully returning false just to tell advanceGame() to do it, as mentioned in the previous commit.

ReformCopyright authored 7 years ago and ReformCopyright committed 6 years ago

I did this by having the functions that can either set up a timer or complete their work straight away (including tickForfeitTimers()) return true in the former case and false if advanceGame() should go ahead and set up the auto forfeit timed if enabled and the human player is out, or otherwise enable the main button.

However, in those cases were special timers are used (cards dealt, AIs done exchanging cards, after someone's orgasm, and after the human has chosen a piece of clothing to strip), the same thing (enabling the main button or setting up the auto forfeit timer) needs to happen so I created a function allowProgression() that does that. It might easier to understand to the code if it's simply called wherever needed instead of returning true or false.

Also got rid of the savedContext global variable, instead passing the value as another argument to finishMasturbation().

Also, "Cumming..." is not a context that can happen since tickForfeitTimers() returns null when it changes the main button caption to that.

Also moved "Next" state to it's place in the ordering.

Don't refresh the speech bubbles when opening the strip dialog box, only when stripping an AI player

Closes #18

See merge request spnati/spnati.gitlab.io!651

Revy Portrait

See merge request spnati/spnati.gitlab.io!652

Don't refresh the speech bubbles when opening the strip dialog box, only when stripping an AI player.

Closes issue #18.

Added and adjusted some lines based on feedback and playtesting

Gives Chiaki an Epilogue.

See merge request spnati/spnati.gitlab.io!650

Revy Bug Fix, Portrait Change

See merge request spnati/spnati.gitlab.io!648

Kyu Updates

See merge request spnati/spnati.gitlab.io!643

Updates for Joey & Aella

See merge request spnati/spnati.gitlab.io!642

Add check mark to already finished epilogues in the selection dialog box, and push down the buttons so they don't overlap

See merge request spnati/spnati.gitlab.io!635

Add check mark to already finished epilogues in the selection dialog box, and push down the buttons so they don't overlap

Use dictionaries (objects) to count unique lines and poses. Greatly speeds up computing especially Pit's and Meia's unique line counts. The old code used linear searches which scaled poorly.

Correct IDs of individual selection buttons (they had the same IDs as the buttons you click to go to the individual selection screen).

Adds some new and tasty lines to Kyu, bringing her up to 626

Felicia bug fix part 2

See merge request spnati/spnati.gitlab.io!641

Felicia bug fix part 1

See merge request spnati/spnati.gitlab.io!640

Add alphabetical sort options.

See merge request spnati/spnati.gitlab.io!639

Jura-Meia Game State Dependent Line Update

See merge request spnati/spnati.gitlab.io!638

Felicia's Final Update Before Sponsorship (Part 1)

See merge request spnati/spnati.gitlab.io!636

Felicia's Final Update Before Sponsorship (Part 2)

See merge request spnati/spnati.gitlab.io!637

Also fixed a clothing error that has existed since Nugi-chan joined the game: her skirt is no longer positioned over her bottom