Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generalized Dockstat Flow #5957

Merged
merged 16 commits into from
Aug 1, 2020
Merged

Generalized Dockstat Flow #5957

merged 16 commits into from
Aug 1, 2020

Conversation

multimokia
Copy link
Member

@multimokia multimokia commented Jun 21, 2020

Adjusted the dockstat flow such that it's completely modular. Simply passing in a label for a specific part will replace that part of the generic flow with the one provided (should the label exist)

Added:

  • 6 new variables to control the dockstat flow

    • dockstat_iowait_label:

      • The label used for the "let me get ready" phase of the io generation (Used by the iostart label)
    • dockstat_rtg_label:

      • The label containing dialogue for when Monika is ready to go out (Used by the generic iowait label)
    • dockstat_cancel_dlg_label:

      • The label containing dialogue used for when you tell Monika you can't take her with you (Used in the generic iowait label)
    • dockstat_wait_menu_label:

      • The label used to contain the menu in which Monika asks what's wrong (Used when you click the wait button during iowait)
    • dockstat_cancelled_still_going_ask_label:

      • The label used which contains the menu where Monika asks the player if they're still going to go (Used if you cancel dockstat gen)
    • dockstat_failed_io_still_going_ask_label:

      • The label used which contains the menu where Monika asks the player if they're still going to go (Used in the generic rtg label if we failed to generate a file)
  • If these are None or non-existent labels, the generic is used (generic being the current standard flow for the taking you somewhere farewell)

Testing:

  • Verify that the taking you somewhere farewell still works without issues
  • Verify that the player bday going somewhere still works without issues
  • Verify that O31 Trick or Treat fare still works without issues
  • Verify that d25 dockstat still works without issues
  • Verify that all vars are cleared on dockstat cancel
  • Verify that plugging your own labels into the parts has them used accordingly
  • Verify that the flow will always be generic if the label provided to be subbed in doesn't exist

NOTE: This also comments out some CG code in Marisa/Rin o31 greets

@multimokia multimokia added awaiting testing code needs to be tested awaiting code review someone needs to check for syntax/logic/indentation errors labels Jun 21, 2020
@multimokia multimokia added this to the Maybe this rel milestone Jun 21, 2020
@multimokia multimokia modified the milestones: Maybe this rel, 0.11.4 Jul 3, 2020
mas_farewells.dockstat_cancel_dlg_label = None
mas_farewells.dockstat_wait_menu_label = None
mas_farewells.dockstat_cancelled_still_going_ask_label = None
mas_farewells.dockstat_failed_io_still_going_ask_label = None
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make a function version of setting all of these to None, in case a non-generic label needs to do this for some reason?

ThePotatoGuy
ThePotatoGuy previously approved these changes Jul 12, 2020
@ThePotatoGuy ThePotatoGuy removed the awaiting code review someone needs to check for syntax/logic/indentation errors label Jul 12, 2020
Co-authored-by: Totally a booplicate <53382877+Booplicate@users.noreply.github.com>
Legendkiller21
Legendkiller21 previously approved these changes Jul 26, 2020
Copy link
Member

@ThePotatoGuy ThePotatoGuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are the marisa CG lines being commented out?

Copy link
Member

@Booplicate Booplicate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nevermind this

ThePotatoGuy
ThePotatoGuy previously approved these changes Jul 27, 2020
Legendkiller21
Legendkiller21 previously approved these changes Jul 27, 2020
Co-authored-by: Totally a booplicate <53382877+Booplicate@users.noreply.github.com>
Copy link
Member

@Booplicate Booplicate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This time I did it right

Monika After Story/game/zz_dockingstation.rpy Show resolved Hide resolved
Monika After Story/game/zz_dockingstation.rpy Show resolved Hide resolved
Monika After Story/game/zz_dockingstation.rpy Outdated Show resolved Hide resolved
Co-authored-by: Totally a booplicate <53382877+Booplicate@users.noreply.github.com>
Booplicate
Booplicate previously approved these changes Jul 28, 2020
Legendkiller21
Legendkiller21 previously approved these changes Jul 28, 2020
@jmwall24 jmwall24 removed the awaiting testing code needs to be tested label Aug 1, 2020
@jmwall24 jmwall24 merged commit e8da4dc into content Aug 1, 2020
@multimokia multimokia mentioned this pull request Aug 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants