allow only def in o31

Monika-After-Story · Oct 27, 2020 · de03013 · de03013
1 parent ffbcc3e
commit de03013
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy
@@ -470,7 +470,7 @@ label mas_o31_autoload_check:
             #TODO: Replace this with generic room deco framework for event deco
             store.mas_lockEVL("monika_change_background", "EVE")
             #force to spaceroom
-            mas_changeBackground(mas_background_def)
+            mas_changeBackground(mas_background_def, set_persistent=True)
 
             #NOTE: We do not do O31 deco/amb on first sesh day
             if (not persistent._mas_o31_in_o31_mode and not mas_isFirstSeshDay()):

diff --git a/Monika After Story/game/zz_backgrounds.rpy b/Monika After Story/game/zz_backgrounds.rpy
@@ -1340,7 +1340,7 @@ init -10 python:
                         curr_time
                     )
 
-                    # and global 
+                    # and global
                     try:
                         store.mas_background._gbl_chunk_change(
                             curr_chunk,
@@ -1356,7 +1356,7 @@ init -10 python:
 
                 # then finally reset slice index for the chunk we are leaving
                 curr_chunk.reset_index()
-                
+
                 # and set the current chunk to next chunk
                 curr_chunk = new_chunk
                 st_index = nxt_index
@@ -2998,18 +2998,19 @@ label monika_change_background_loop:
         # default should always be at the top
         backgrounds = [(mas_background_def.prompt, mas_background_def, False, False)]
 
-        # build other backgrounds list
-        other_backgrounds = [
-            (mbg_obj.prompt, mbg_obj, False, False)
-            for mbg_id, mbg_obj in mas_background.BACKGROUND_MAP.iteritems()
-            if mbg_id != "spaceroom" and mbg_obj.unlocked
-        ]
+        if not persistent._mas_o31_in_o31_mode:
+            # build other backgrounds list
+            other_backgrounds = [
+                (mbg_obj.prompt, mbg_obj, False, False)
+                for mbg_id, mbg_obj in mas_background.BACKGROUND_MAP.iteritems()
+                if mbg_id != "spaceroom" and mbg_obj.unlocked
+            ]
 
-        # sort other backgrounds list
-        other_backgrounds.sort()
+            # sort other backgrounds list
+            other_backgrounds.sort()
 
-        # build full list
-        backgrounds.extend(other_backgrounds)
+            # build full list
+            backgrounds.extend(other_backgrounds)
 
         # now add final quit item
         final_item = (mas_background.BACKGROUND_RETURN, False, False, False, 20)