Merge pull request #74 from ForeverAndEverTeam/hotfix-v0.1.0

Hotfix v0.1.0

game/additional/mg_reversi.rpy

@@ -309,10 +309,6 @@ init 10 python:
         scheme = int(scheme)
         reversi(True, scheme = scheme)
 
-    ## Add this game to the minigame list
-    #reversi = minigame(_("Reversi"), 'mg_reversi', reversi_prep)
-    #mg_list.append(reversi)
-
 
 image reversi_selectable:
     "mod_assets/images/minigames/checkers_selected.png"

game/cache/shaders.txt

@@ -1,11 +1,11 @@
-renpy.solid
+renpy.alpha renpy.geometry renpy.solid
 renpy.geometry renpy.solid
-renpy.geometry renpy.texture
-renpy.texture
+renpy.alpha renpy.geometry renpy.texture
 renpy.dissolve renpy.dissolve
+renpy.geometry renpy.texture
+renpy.dissolve renpy.geometry
+renpy.ftl
 renpy.alpha renpy.solid
 renpy.alpha renpy.texture
-renpy.ftl
-renpy.alpha renpy.geometry renpy.solid
-renpy.alpha renpy.geometry renpy.texture
-renpy.dissolve renpy.geometry
+renpy.texture
+renpy.solid

game/core/expr.rpy

@@ -1,5 +1,3 @@
-image nothing = Null()
-
 init -50 python in fae_sprites:
 
     import store
@@ -72,7 +70,6 @@ init -50 python in fae_sprites:
 
     pose = "sitting"
 
-
     _FAE_SAYORI_IMAGES_PATH = "mod_assets/sayori/"
 
     _FAE_DESK_SPRITE = "desk"

game/core/gifting.rpy

@@ -7,13 +7,13 @@ init -100 python:
     def look_for_gift():
 
 
-        if renpy.exists("gifts/cookies.gift"):
+        if renpy.exists("{0}/gifts/cookies.gift").format(renpy.config.basedir):
 
             store.fae_utilities.removeFileDir("{0}/gifts/cookies.gift".format(renpy.config.basedir))
 
             renpy.call("fae_cookies")
 
-        if renpy.exists("gifts/otter.gift"):
+        if renpy.exists("{0}/gifts/otter.gift").format(renpy.config.basedir):
 
             store.fae_utilities.removeFileDir("{0}/gifts/otter.gift".format(renpy.config.basedir))
 

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.1.0"
+define config.version = "0.1.1"
 
 # This adds information about your mod in the About screen.
 # DDLC does not have a 'About' screen so you can leave this blank.

game/core/script-ch30.rpy

@@ -187,8 +187,6 @@ label ch30_setup:
 
     show black zorder 99
 
-
-
     python:
         main_background.form()
 
@@ -199,6 +197,8 @@ label ch30_setup:
         fae_outfits.FAEAcs.call_all()
         fae_outfits.FAEOutfit.call_all()
         fae_utilities.log("Outfit data loaded.")
+        persistent._fae_version = config.version
+        fae_utilities.log("Current persisted version post-mig check: {0}".format(store.persistent._fae_version))
 
         #Sayori.setOutfit(fae_outfits.get_outfit("fae_uniform"))
         try:
@@ -262,9 +262,9 @@ label ch30_init:
 
         if (datetime.datetime.now() - persistent.fae_last_visit_date).total_seconds() / 604800 >= 2 and persistent._fae_absence_choice is None:
             Sayori.add_regret_quit(fae_regrets.RegretTypes.long_absence)
-            ats("s_greeting_long_absence")
-            reveal()
-            renpy.jump("cnc")
+            #ats("s_return_long_absence")
+            #reveal()
+            #renpy.jump("cnc")
 
         elif not persistent._fae_player_apology_type_on_quit:
             Affection.calculatedAffectionGain()
@@ -308,22 +308,13 @@ label ch30_init:
                 renpy.call("cnc")
 
     #$ begin_song()
-
-
-    if (
-        store.fae_per_check.is_per_corrupt()
-        and not renpy.seen_label("fae_corrupted_persistent")
-    ):
-        $ ats("fae_corrupted_persistent")
 
     show sayori idle at t11 zorder store.fae_sprites.FAE_SAYORI_ZORDER
     #show bg spaceroom zorder 1
     hide black with Dissolve(2)
     #show screen hidden1(True)
     show screen hidden1(True)
 
-
-
     #FALL THRouGH
 label after_holiday:
 
@@ -518,7 +509,7 @@ label force_quit:
 
     else:
 
-        s "YOU CAN'T LEAVE LIKE THAT!"
+        s ebgchga "YOU CAN'T LEAVE LIKE THAT!"
 
         python:
             Affection.percentageAffectionLoss(2)

game/core/zz_poems.rpy

@@ -27,7 +27,7 @@ style poem_vbar is vscrollbar:
 
     ysize 700
 
-style sayori_handwriting:
+style sayori_text:
     font "gui/font/s1.ttf"
     size 34
     color "#000"
@@ -48,7 +48,7 @@ init python in fae_poems:
     }
 
     writer_def = {
-        "sayori": "sayori_handwriting"
+        "sayori": "sayori_text"
     }
 
     if store.persistent.playerbdate is not None:

game/dialogs/quips.rpy

@@ -33,61 +33,61 @@ init 15 python in fae_quips:
     ## AFFECTIONATE quips
     aff_quips = [
         "What would you like to talk about?",
-        "What would you like to talk about, [fae_get_player_nickname()]?",
+        "What would you like to talk about, [player]?",
         "What are you thinking of?",
-        "Is there something you'd like to talk about, [fae_get_player_nickname()]?",
+        "Is there something you'd like to talk about, [player]?",
         "Something on your mind?",
-        "Something on your mind, [fae_get_player_nickname()]?",
-        "Up to chat, [fae_get_player_nickname()]?",
-        "Yes, [fae_get_player_nickname()]?",
-        "What's on your mind, [fae_get_player_nickname()]?",
-        "What's up, [fae_get_player_nickname()]?",
-        "Ask away, [fae_get_player_nickname()].",
-        "Don't be shy, [fae_get_player_nickname()]~",
-        "I'm all ears, [fae_get_player_nickname()]~",
-        "Of course we can talk, [fae_get_player_nickname()].",
+        "Something on your mind, [player]?",
+        "Up to chat, [player]?",
+        "Yes, [player]?",
+        "What's on your mind, [player]?",
+        "What's up, [player]?",
+        "Ask away, [player].",
+        "Don't be shy, [player]~",
+        "I'm all ears, [player]~",
+        "Of course we can talk, [player].",
     ]
     #save_quips(AFFECTIONATE, quips)
 
     ## ENAMORED quips
     enamoured_quips = [
         "What would you like to talk about? <3",
-        "What would you like to talk about, [fae_get_player_nickname()]? <3",
+        "What would you like to talk about, [player]? <3",
         "What are you thinking of?",
-        "Is there something you'd like to talk about, [fae_get_player_nickname()]?",
+        "Is there something you'd like to talk about, [player]?",
         "Something on your mind?",
-        "Something on your mind, [fae_get_player_nickname()]?",
+        "Something on your mind, [player]?",
         "Up to chat, I see~",
-        "Yes, [fae_get_player_nickname()]?",
-        "What's on your mind, [fae_get_player_nickname()]?",
+        "Yes, [player]?",
+        "What's on your mind, [player]?",
         "What's up, [player]?",
-        "Ask away, [fae_get_player_nickname()]~",
-        "I'm all ears, [fae_get_player_nickname()]~",
-        "Of course we can talk, [fae_get_player_nickname()]~",
+        "Ask away, [player]~",
+        "I'm all ears, [player]~",
+        "Of course we can talk, [player]~",
         "Take all the time you need, [player].",
-        "We can talk about whatever you'd like, [fae_get_player_nickname()].",
+        "We can talk about whatever you'd like, [player].",
     ]
     #save_quips(ENAMORED, quips)
 
     ## LOVE quips
     love_quips = [
         "What would you like to talk about? <3",
-        "What would you like to talk about, [fae_get_player_nickname()]? <3",
+        "What would you like to talk about, [player]? <3",
         "What are you thinking of?",
         "Something on your mind?",
-        "Something on your mind, [fae_get_player_nickname()]?",
+        "Something on your mind, [player]?",
         "Up to chat, I see~",
-        "Yes, [fae_get_player_nickname()]?",
-        "What's on your mind, [fae_get_player_nickname()]?",
+        "Yes, [player]?",
+        "What's on your mind, [player]?",
         "<3",
-        "What's up, [fae_get_player_nickname()]?",
-        "Ask away, [fae_get_player_nickname()]~",
-        "I'm all ears, [fae_get_player_nickname()]~",
-        "We can talk about whatever you'd like, [fae_get_player_nickname()].",
-        "Of course we can talk, [fae_get_player_nickname()]~",
-        "Take all the time you need, [fae_get_player_nickname()]~",
-        "I'm all yours, [fae_get_player_nickname()]~",
-        "Oh? Something...{w=0.3}{i}important{/i} on your mind, [fae_get_player_nickname()]?~",
+        "What's up, [player]?",
+        "Ask away, [player]~",
+        "I'm all ears, [player]~",
+        "We can talk about whatever you'd like, [player].",
+        "Of course we can talk, [player]~",
+        "Take all the time you need, [player]~",
+        "I'm all yours, [player]~",
+        "Oh? Something...{w=0.3}{i}important{/i} on your mind, [player]?~",
     ]
         #save_quips(LOVE, quips)
 

game/dialogs/script-affection.rpy

@@ -1,6 +1,6 @@
 default persistent.affection_day_gain = 5
 default persistent.affection_reset_date = None
-default persistent.affection = 25.0
+default persistent.affection = 0
 default persistent._affection_daily_bypasses = 5
 init -2 python:
     def _fae_AffStart():
@@ -175,10 +175,10 @@ init -2 python:
                 if persistent.affection_day_gain < 0:
                     persistent.affection_day_gain = 0
 
-                fae_utilities.log("Affection increased")
+                fae_utilities.log("Affection increased!")
 
             else:
-                fae_utilities.log("Affection increased!")
+                Affection.writeCap()
 
         @staticmethod
         def calculatedAffectionLoss(base=1):
@@ -197,7 +197,7 @@ init -2 python:
 
             else:
                 persistent.affection += to_add
-                fae_utilities.log("Affection+")
+                fae_utilities.log("Affection increased!")
 
         @staticmethod
         def percentageAffectionLoss(percentage_loss):

game/dialogs/script-greetings.rpy

@@ -19,8 +19,8 @@ init -1 python in fae_greetings:
 
         kwargs = dict()
 
-        if store.persistent._fae_await_apology_quit is not None:
-            kwargs.update({"extra_props": [("regret_type", store.persistent._fae_await_apology_quit)]})
+        if store.persistent._fae_player_apology_type_on_quit is not None:
+            kwargs.update({"extra_props": [("regret_type", store.persistent._fae_player_apology_type_on_quit)]})
 
         elif store.persistent.fae_mood_on_quit is not None:
             kwargs.update({"extra_props": [("mood_type", store.persistent.fae_mood_on_quit)]})
@@ -69,7 +69,7 @@ label greeting_first_force_quit:
             s bbaamfag "Whatever you did... {w=0.5}{nw}"
             extend bbaajfag "please don't do it again..."
 
-    $ persistent.fae_force_quit_state = int(fae_farewells.FAEForceQuitStates.has_force_quit)
+    $ persistent.fae_player_force_quit_state = int(fae_farewells.FAEForceQuitStates.has_force_quit)
 
     return
 
@@ -87,7 +87,7 @@ label first_force_quit_2:
     s bbaaagag "It was like I was being torn apart..."
     s bbaamfag "Whatever you did... {w=0.5}{nw}"
     extend bbaajfag "please don't do it again."
-    $ persistent.fae_force_quit_state = int(fae_farewells.FAEForceQuitStates.has_force_quit)
+    $ persistent.fae_player_force_quit_state = int(fae_farewells.FAEForceQuitStates.has_force_quit)
     return
 
 #Normal greetings