Merge pull request #6752 from Monika-After-Story/NewD25

d25 2020

Monika After Story/game/definitions.rpy

@@ -3528,7 +3528,7 @@ python early:
                     for key, value in ex_props.iteritems()
                 ]
                 return "<exprops: ({0})>".format(", ".join(props))
-                
+
             except:
                 return ""
 
@@ -3896,7 +3896,7 @@ init -995 python in mas_utils:
                 (Default: 6)
 
         RETURNS: tuple of the following format:
-            [0] - integer portion of float 
+            [0] - integer portion of float
             [1] - float portion of float, multiplied by 10^places
         """
         int_part, float_part = floatsplit(value)
@@ -5261,7 +5261,6 @@ init -1 python:
             or store.mas_utils.is_file_present('/characters/imsorry.txt')
         )
 
-
     def mas_cvToHM(mins):
         """
         Converts the given minutes into hour / minutes
@@ -6034,7 +6033,7 @@ init 2 python:
             not persistent._mas_sensitive_mode
             and persistent._mas_first_kiss is not None
             and mas_is18Over(_date)
-            and _mas_getAffection() >= aff_thresh
+            and persistent._mas_affection.get("affection", 0) >= aff_thresh
         )
 
     def mas_timePastSince(timekeeper, passed_time, _now=None):

Monika After Story/game/dev/dev_deco.rpy

@@ -57,7 +57,7 @@ init 501 python:
         MASAdvancedDecoFrame(zorder=6)
     )
 
-    # fake bg 1 
+    # fake bg 1
     MASImageTagDecoDefinition.register_img(
         "dev_monika_deco_one",
         "dev_mas_bg_1",
@@ -69,7 +69,7 @@ init 501 python:
         MASAdvancedDecoFrame(at_list=[i31], zorder=6)
     )
 
-    # fake bg 2 
+    # fake bg 2
     MASImageTagDecoDefinition.register_img(
         "dev_monika_deco_one",
         "dev_mas_bg_2",

Monika After Story/game/script-ch30.rpy

@@ -872,6 +872,13 @@ label spaceroom(start_bg=None, hide_mask=None, hide_monika=False, dissolve_all=F
                 if not hide_calendar:
                     mas_calShowOverlay()
 
+        # always generate bg change info if scene is changing.
+        #   NOTE: generally, this will just show all deco that is appropraite
+        #   for this background.
+        if scene_change and bg_change_info is None:
+            bg_change_info = store.mas_background.MASBackgroundChangeInfo()
+            mas_current_background._entry_deco(None, bg_change_info)
+
         # add show/hide statements for decos
         if bg_change_info is not None:
             if not scene_change:
@@ -892,15 +899,13 @@ label spaceroom(start_bg=None, hide_mask=None, hide_monika=False, dissolve_all=F
 
     # ----------- Grouping date-based events since they can never overlap:
     #O31 stuff
+    # TODO: move this to o31 autoload
     if persistent._mas_o31_in_o31_mode:
         $ store.mas_o31ShowVisuals()
-
-    # d25 seasonal
-    elif persistent._mas_d25_deco_active:
-        $ store.mas_d25ShowVisuals()
     # ----------- end date-based events
 
     # player bday
+    # TODO: move this to bday autoload
     if persistent._mas_player_bday_decor:
         $ store.mas_surpriseBdayShowVisuals()
 
@@ -1153,7 +1158,6 @@ label mas_ch30_post_retmoni_check:
 label mas_ch30_post_holiday_check:
     # post holiday checks
 
-
     # TODO should the apology check be only for when she's not affectionate?
     if persistent._mas_affection["affection"] <= -50 and seen_event("mas_affection_apology"):
         # no dissolves here since we want the player to be instantly aware