few more fixes

fml
Monika-After-Story · Jun 24, 2022 · d36f92f · d36f92f
1 parent f3012f8
commit d36f92f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Monika After Story/game/zz_cardgames.rpy b/Monika After Story/game/zz_cardgames.rpy
@@ -960,13 +960,12 @@ init 5 python in mas_nou:
             IN:
                 player - the player we check
             """
+            global winner
             if player.hand:
                 return
 
             self.set_sensitive(False)
 
-            global winner
-
             if player.isAI:
                 winner = "Monika"
 
@@ -3013,15 +3012,18 @@ init 5 python in mas_nou:
                     return (
                         (
                             (
-                                persistent._mas_game_nou_abandoned > 2
+                                persistent._mas_game_nou_abandoned > 1
                                 or (
                                     get_house_rule("points_to_win") > 0
                                     and get_player_points_percentage("Player") <= 0.2
                                     and get_player_points_percentage("Monika") >= 0.8
                                 )
                                 or (
                                     get_house_rule("points_to_win") == 0
-                                    and monika_win_streak > 2
+                                    and (
+                                        monika_win_streak > 2
+                                        or monika_wins_this_sesh - player_wins_this_sesh > 4
+                                    )
                                 )
                             )
                             and random.random() < self.HIGHT_MISSING_NOU_CHANCE
@@ -3560,9 +3562,10 @@ label monika_change_nou_house_rules:
                 m "Then maybe we could play now?{nw}"
                 $ _history_list.pop()
                 menu:
-                    m "Then maybe we could play now?{nw}"
+                    m "Then maybe we could play now?{fast}"
 
                     "Sure.":
+                        show monika 1hua zorder MAS_MONIKA_Z
                         $ mas_nou.visit_game_ev()
                         jump mas_nou_game_loop
 
@@ -4353,7 +4356,7 @@ label mas_nou_reaction_monika_wins_game:
             m 1eka "I hope you had fun too."
             # TODO: move this out of the RNG selection to 100% get it?
             if (
-                persistent._mas_game_nou_wins["Monika"] + persistent._mas_game_nou_wins["Player"] < 20
+                persistent._mas_game_nou_wins["Monika"] + persistent._mas_game_nou_wins["Player"] < 40
                 and persistent._mas_game_nou_wins["Monika"] > persistent._mas_game_nou_wins["Player"]
             ):
                 m 3hua "I'm sure if we play more games you'll win too."