Merge pull request #118 from ForeverAndEverTeam/0.2.1

0.2.1 Hotfix
ForeverAndEverTeam · Jun 8, 2023 · 35a1b0a · 35a1b0a
2 parents 491762d + c189d18
commit 35a1b0a
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 15 deletions.
diff --git a/game/additional/game-handler.rpy b/game/additional/game-handler.rpy
@@ -5,7 +5,7 @@ init python in fae_games:
 
     import store
 
-    mg_list = []
+    mg_list_redux = []
 
 init python:
     zorder_game = 4

diff --git a/game/core/definitions.rpy b/game/core/definitions.rpy
@@ -693,6 +693,7 @@ default persistent.gender = "M"
 default persistent.last_playthrough = persistent.playthrough
 default persistent.fae_sayori_closed = False
 default persistent.fae_intro_complete = False
+default persistent.games_reset = False
 
 #########################
 #NON-PERSISTENT DEFAULTS#
@@ -807,6 +808,7 @@ init -100 python:
             return False
 
 init python:
+    import store.fae_games as fae_games
 
     def boop():
         """
@@ -819,6 +821,26 @@ init python:
         Sayori.setInChat(False)
         renpy.jump("ch30_loop")
 
+
+    def ResetGames():
+
+        if persistent.fae_bnc_unlocked:
+            bnc = minigame(_("Bows & Cows"), 'mg_bnc', bnc_prep)
+            fae_games.mg_list_redux.append(bnc)
+
+            get_chat("s_stopic_bulls_and_cows").lock()
+
+        if persistent.fae_reversi_unlocked:
+            reversi = minigame(_("Reversi"), 'mg_reversi', reversi_prep)
+
+            fae_games.mg_list_redux.append(reversi)
+
+            get_chat("s_topic_reversi").lock()
+
+        persistent.games_reset = True
+
+
+
 
     PATH = renpy.config.basedir
 

diff --git a/game/core/menu_events.rpy b/game/core/menu_events.rpy
@@ -110,7 +110,7 @@ screen minigame_ui():
     vbox:
         xcenter 250
 
-        for i in store.fae_games.mg_list:
+        for i in store.fae_games.mg_list_redux:
             if i.available:
                 textbutton i.name action [Function(i), Hide("minigame_ui"), Jump("ch30_loop")]
 

diff --git a/game/core/options.rpy b/game/core/options.rpy
@@ -22,7 +22,7 @@ define config.name = "Forever & Ever"
 define gui.show_name = True
 
 # This controls the version number of your mod.
-define config.version = "0.2.0"
+define config.version = "0.2.1"
 
 # This adds information about your mod in the About screen.
 # DDLC does not have a 'About' screen so you can leave this blank.

diff --git a/game/core/script-ch30.rpy b/game/core/script-ch30.rpy
@@ -133,6 +133,9 @@ label ch30_autoload:
     $ store.fae_utilities.makedirifnot("{0}/gifts/".format(renpy.config.basedir))
 
     $ fae_set_pronouns()
+
+    if not persistent.games_reset:
+        $ ResetGames()
 
     jump ch30_main
 
@@ -256,7 +259,10 @@ label ch30_init:
                 renpy.call("cnc", False)
 
             else:
-                ats(fae_greetings.greet_sel())
+                try:
+                    ats(fae_greetings.greet_sel())
+                except:
+                    ats("s_greeting_5")
                 persistent.fae_mood_on_quit = None
                 persistent._fae_player_apology_type_on_quit = None
                 reveal()

diff --git a/game/dialogs/script-farewells.rpy b/game/dialogs/script-farewells.rpy
@@ -266,14 +266,6 @@ init 5 python:
 label s_farewell_sleep:
     s abhfaoa "Heading to bed, [player]?"
     s abhfcaa "Hope you have a good night’s sleep!"
-    if Affection.isEnamoured():
-        s abhebob "...can I have a goodnight kiss? Ehehehe~"
-        menu: 
-            "Sure, Sayori":
-                s abgcceb "Yay!"
-                call fae_kiss_short
-            "Another time":
-                s bbhfbaa "Alright then..."
     s abfcaaa "Sweet dreams, [player]!"
     return { "quit": None }
 

diff --git a/game/dialogs/script-moods.rpy b/game/dialogs/script-moods.rpy
@@ -223,7 +223,7 @@ init 5 python:
     )
 
 label s_mood_bored: #Bored player
-    $ random_mg = renpy.random.choice(store.fae_games.mg_list).name
+    $ random_mg = renpy.random.choice(store.fae_games.mg_list_redux).name
     s abhfmja "Hmm…{w=0.5}{nw}"
     extend abhfaaa " if you're bored, would you like to play [random_mg] with me?"
     s abbbaoa "You can start a game in the {i}'Play'{/i} menu!"

diff --git a/game/dialogs/script-topics.rpy b/game/dialogs/script-topics.rpy
@@ -2391,7 +2391,7 @@ label s_stopic_bulls_and_cows:
 
     $ bnc = minigame(_("Bows & Cows"), 'mg_bnc', bnc_prep)
     #$ mg_list = []
-    $ store.fae_games.mg_list.append(bnc)
+    $ store.fae_games.mg_list_redux.append(bnc)
 
     return
 
@@ -2426,7 +2426,7 @@ label s_topic_reversi:
 
     $ reversi = minigame(_("Reversi"), 'mg_reversi', reversi_prep)
     # $ mg_list = []
-    $ store.fae_games.mg_list.append(reversi)
+    $ store.fae_games.mg_list_redux.append(reversi)
     return