Merge remote-tracking branch 'upstream/content' into pr/Booplicate/9736

Author: multimokia

.github/workflows/mas_check.yml

@@ -19,7 +19,7 @@ jobs:
     name: ci_build
 
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     env:
       SDL_AUDIODRIVER: dummy # handles ALSA issues

Monika After Story/game/0config.rpy

@@ -14,7 +14,7 @@ python early:
     renpy.config.name = "Monika After Story"
 
     ## The version of the game.
-    renpy.config.version = "0.12.12"
+    renpy.config.version = "0.12.14"
 
     #Triple space suffix to avoid potential issues with same names in window title
     config.window_title = "Monika After Story   "

Monika After Story/game/definitions.rpy

@@ -4836,6 +4836,7 @@ init -100 python in mas_utils:
         return [bullet + " " + str(item) for item in _list]
 
 
+
     def nested_defaultdict(final_factory=None, levels=1):
         """
         Generates a nested defaultdict. Basically good for creating an n-level
@@ -5543,6 +5544,25 @@ init -100 python in mas_utils:
         return (ival, int((num - cleanival) * __FLIMIT), __FLIMIT)
 
 
+    def sanitize_filename(s):
+        """
+        Sanitizes a filename by removing characters that might have special
+        meaning on certain platforms.
+
+        IN:
+            s:
+                String to sanitize.
+
+        OUT:
+            str:
+                Sanitized string, stripped of special characters.
+        """
+
+        for c in '<>:"/\\|?*':
+            s = s.replace(c, "")
+        return s
+
+
 init -985 python:
     import datetime
     # global stuff that should be defined somewhat early

Monika After Story/game/mod_assets/location/special/our_reality

@@ -1116,7 +1116,7 @@ label greeting_o31_briaryoung_shuchiin_academy_uniform:
 
     m 2hub "Welcome back!"
     m 2eub "Well, what do you think?"
-    m 7tuu "I thought Instead of being president, I could be the secretary for today..."
+    m 7tuu "I thought instead of being president, I could be the secretary for today..."
 
     if mas_isMoniAff(higher=True):
         m 3rtu "Or maybe even a love detective, but that's probably a waste, I've already found that..."
@@ -6029,7 +6029,7 @@ default persistent._mas_f14_on_date = None
 ##Did we do a dockstat fare over all of f14?
 default persistent._mas_f14_gone_over_f14 = None
 #Valentine's Day
-define mas_f14 = datetime.date(datetime.date.today().year,2,14)
+define mas_f14 = datetime.date(datetime.date.today().year, 2, 14)
 
 #Is it vday?
 init -10 python:
@@ -6956,6 +6956,27 @@ init 20 python:
 """
     )
 
+    mas_poem_vday_6 = MASPoem(
+        poem_id="poem_f14_6",
+        category="f14",
+        prompt="Forget-me-not",
+        title=" My dearest [player],",
+        text="""\
+ All the flowers know are their vase.
+ A few cups of soil, and a pretty case of porcelain.
+ They will never leave without help, even if they someday outgrow it.
+
+ Flowers need more than their vase.
+ Water from the skies, or a helping hand.
+ And without sight of the sky above, the world apart, they would someday wither.
+
+ This gardener gives all this and more.
+ It's said a flower blooms brighter when spoken to with love.
+ Even trapped in this vase, maybe it isn't a curse to know more.
+
+ Forget-me-not.
+"""
+    )
 
 #######################[HOL050] dockstat farwell###############################
 label bye_f14:
@@ -7331,7 +7352,7 @@ image chibi_peek = MASFilterSwitch("mod_assets/other/chibi_peek.png")
 label mas_bday_surprise_party_hint:
     #Set up letters
     python:
-        persistent._mas_bday_hint_filename = "For " + player + ".txt"
+        persistent._mas_bday_hint_filename = mas_utils.sanitize_filename("For {0}.txt".format(player))
         if mas_isMoniNormal(higher=True):
             message = """\
 [player],

Monika After Story/game/script-holidays.rpy

@@ -572,7 +572,7 @@ init -20 python in mas_island_event:
         )
     )
     IslandsDataDefinition(
-        "decal_house",
+        "decal_house",# FIXME: clear and snow sprites appear to be of different sizes
         partial_disp=functools.partial(
             ParallaxDecal,
             x=215,
@@ -744,6 +744,80 @@ init -20 python in mas_island_event:
             # on_click=True
         )
     )
+    # D25 specific deco
+    IslandsDataDefinition(
+        "decal_bookshelf_lantern",
+        filenames=("d", "n", "s"),
+        partial_disp=functools.partial(
+            ParallaxDecal,
+            x=387,
+            y=47,
+            z=7,
+            on_click=True
+        )
+    )
+    IslandsDataDefinition(
+        "decal_circle_garland",
+        filenames=("d", "n", "s"),
+        partial_disp=functools.partial(
+            ParallaxDecal,
+            x=234,
+            y=22,
+            z=2,
+            on_click=True
+        )
+    )
+    IslandsDataDefinition(
+        "decal_hanging_lantern",
+        filenames=("d", "n", "s"),
+        partial_disp=functools.partial(
+            ParallaxDecal,
+            x=210,
+            y=23,
+            z=2,
+            on_click=True
+        )
+    )
+    IslandsDataDefinition(
+        "decal_rectangle_garland",
+        filenames=("d", "n", "s"),
+        partial_disp=functools.partial(
+            ParallaxDecal,
+            x=320,
+            y=28,
+            z=2,
+            on_click=True
+        )
+    )
+    TREE_LIGHTS_FPS = (
+        "other/tree_lights/d",
+        "other/tree_lights/n_0",
+        "other/tree_lights/n_1",
+        "other/tree_lights/n_2",
+        "other/tree_lights/s"
+    )
+    IslandsDataDefinition(
+        "decal_tree_lights",
+        fp_map={},# TODO: move TREE_LIGHTS_FPS to fp_map
+        partial_disp=functools.partial(
+            ParallaxDecal,
+            x=140,
+            y=-168,
+            z=5,
+            # on_click=True
+        )
+    )
+    IslandsDataDefinition(
+        "decal_wreath",
+        filenames=("d", "n", "s"),
+        partial_disp=functools.partial(
+            ParallaxDecal,
+            x=294,
+            y=33,
+            z=2,
+            on_click=True
+        )
+    )
 
     # Objects
     IslandsDataDefinition(
@@ -1073,6 +1147,12 @@ init -25 python in mas_island_event:
                     (store.MASImageData(zip_file.read(fn), fn + ".png") for fn in GLITCH_FPS)
                 )
 
+                tree_lights_imgs = {}
+                for fn in TREE_LIGHTS_FPS:
+                    k = fn.rpartition("/")[-1]
+                    raw_disp = store.MASImageData(zip_file.read(fn), fn + ".png")
+                    tree_lights_imgs[k] = raw_disp
+
                 # Audio is being loaded right away
                 isly_data = IslandsDataDefinition.getDataFor("other_isly")
                 if isly_data:
@@ -1086,7 +1166,15 @@ init -25 python in mas_island_event:
 
         else:
             # We loaded the images, now create dynamic displayables
-            _build_displayables(island_map, decal_map, bg_map, overlay_map, interior_map, glitch_frames)
+            _build_displayables(
+                island_map,
+                decal_map,
+                bg_map,
+                overlay_map,
+                interior_map,
+                glitch_frames,
+                tree_lights_imgs
+            )
 
         return True
 
@@ -1161,7 +1249,8 @@ init -25 python in mas_island_event:
         bg_imgs_maps,
         overlay_imgs_maps,
         interior_imgs_map,
-        glitch_frames
+        glitch_frames,
+        tree_lights_imgs
     ):
         """
         Takes multiple maps with images and builds displayables from them, sets global vars
@@ -1175,6 +1264,8 @@ init -25 python in mas_island_event:
             overlay_imgs_maps - the map from overlay ids to raw images map
             interior_imgs_map - the map from the interior stuff to the raw images map
             glitch_frames - tuple of glitch raw anim frames
+            tree_lights_imgs - map of images for the tree lights, format:
+                img_name: disp
         """
         global island_disp_map, decal_disp_map, other_disp_map
         global bg_disp_map, overlay_disp_map, interior_disp_map
@@ -1245,6 +1336,23 @@ init -25 python in mas_island_event:
         partial_disp = IslandsDataDefinition.getDataFor("decal_glitch").partial_disp
         decal_disp_map["decal_glitch"] = partial_disp(glitch_disp)
 
+        # Build tree lights disp
+        tree_lights_frames = tuple(
+            tree_lights_imgs.pop("n_" + i)# don't need these in the map anymore
+            for i in "012"
+        )
+        def _tree_lights_transform_func(transform, st, at):
+            next_child = random.choice(tree_lights_frames)
+            transform.child = next_child
+            return 0.4
+
+        tree_lights_night_disp = Transform(child=tree_lights_frames[0], function=_tree_lights_transform_func)
+        tree_lights_imgs["n"] = tree_lights_night_disp
+
+        tree_lights_disp = _build_ifwd(tree_lights_imgs)
+        partial_disp = IslandsDataDefinition.getDataFor("decal_tree_lights").partial_disp
+        decal_disp_map["decal_tree_lights"] = partial_disp(tree_lights_disp)
+
         # Build chibi disp
         partial_disp = IslandsDataDefinition.getDataFor("other_shimeji").partial_disp
         other_disp_map["other_shimeji"] = partial_disp()
@@ -1365,6 +1473,7 @@ init -25 python in mas_island_event:
         _unlock("other_shimeji")
         if not renpy.seen_label("mas_monika_islands_final_reveal"):
             _unlock("decal_glitch")
+
         _unlock("decal_pumpkins")
         _unlock("decal_skull")
 
@@ -1383,23 +1492,33 @@ init -25 python in mas_island_event:
         # This requires the 4th isld
         if _is_unlocked("island_4"):
             _unlock("decal_bloodfall")
+
         # This requires the 5th isld
         if _is_unlocked("island_5"):
             _unlock("decal_gravestones")
 
     def __unlocks_for_lvl_6():
         _unlock("decal_bushes")
+
         # Unlock everything from lvl 3
         _unlock("island_4")
         _unlock("island_5")
 
     def __unlocks_for_lvl_7():
         _unlock("island_3")
+
         # Unlock only one, the rest at lvl 7
         _unlock_one("decal_bookshelf", "decal_tree")
+
         # These require the tree
         if _is_unlocked("decal_tree"):
             _unlock_one(*("decal_ghost_" + i for i in "012"))
+            _unlock("decal_tree_lights")
+
+        # This requires the bookshelf
+        if _is_unlocked("decal_bookshelf"):
+            _unlock("decal_bookshelf_lantern")
+
         # Unlock everything from lvl 4
         _unlock("island_7")
         _unlock("island_6")
@@ -1408,18 +1527,30 @@ init -25 python in mas_island_event:
         # Unlock everything from lvl 7
         _unlock("decal_bookshelf")
         _unlock("decal_tree")
+
         # These require the tree
         for i in "012":
             _unlock("decal_haunted_tree_" + i)
+        _unlock("decal_tree_lights")
+
+        # This requires the bookshelf
+        _unlock("decal_bookshelf_lantern")
 
     def _final_unlocks():
         # TODO: update monika_why_spaceroom
         # NOTE: NO SANITY CHECKS, use carefully
         _unlock("other_isly")
         _unlock("decal_house")
+
         # These requires the house
         _unlock("decal_jack")
         _unlock("decal_webs")
+        _unlock("decal_circle_garland")
+        _unlock("decal_hanging_lantern")
+        _unlock("decal_rectangle_garland")
+        _unlock("decal_wreath")
+
+        # This should be removed once we have the house
         _lock("decal_glitch")
 
     def __unlocks_for_lvl_9():
@@ -1602,6 +1733,7 @@ init -25 python in mas_island_event:
         global SHIMEJI_CHANCE
 
         enable_o31_deco = persistent._mas_o31_in_o31_mode and not is_winter_weather()
+        enable_d25_deco = persistent._mas_d25_in_d25_mode and is_winter_weather()
 
         def _reset_parallax_disp(disp):
             # Just in case we always remove all decals and readd them as needed
@@ -1638,7 +1770,7 @@ init -25 python in mas_island_event:
             )
         )
 
-        # Now add all unlocked O31 decals
+        # Add all unlocked O31 decals
         if enable_o31_deco:
             # Basic decals
             isld_to_decals_map = {
@@ -1674,6 +1806,21 @@ init -25 python in mas_island_event:
             if store.mas_current_background.isFltNight() and _is_unlocked("decal_bloodfall"):
                 island_disp_map["island_4"].add_decals(decal_disp_map["decal_bloodfall"])
 
+        # Add all unlocked D25 decals
+        if enable_d25_deco:
+            isld_1_d25_decals = (
+                "decal_bookshelf_lantern",
+                "decal_circle_garland",
+                "decal_hanging_lantern",
+                "decal_rectangle_garland",
+                "decal_tree_lights",
+                "decal_wreath"
+            )
+            island_disp_map["island_1"].add_decals(
+                *(decal_disp_map[key] for key in isld_1_d25_decals if _is_unlocked(key))
+            )
+
+        # Add chibi
         if _is_unlocked("other_shimeji") and random.random() <= SHIMEJI_CHANCE:
             shimeji_disp = other_disp_map["other_shimeji"]
             _reset_parallax_disp(shimeji_disp)

Monika After Story/game/script-islands-event.rpy

@@ -1889,7 +1889,7 @@ label mas_scary_story_prison_escape:
     m 7eua "Over time, she became good friends with one of the prison caretakers."
     m 3esc "His job was to bury any prisoners who died in a graveyard just outside the prison walls."
     m 3esd "Whenever a prisoner died, the caretaker rang a bell which was heard by all of the inmates."
-    m 3esc "Next, he got the body and put it in a casket, and then entered his office to fill out the death certificate before returning to the nail the casket lid shut."
+    m 3esc "Next, he got the body and put it in a casket, and then entered his office to fill out the death certificate before returning to nail the casket lid shut."
     m 3esd "Finally, he put it on a wagon to take to the graveyard and bury it."
     m 1euc "Knowing this routine, the woman devised an escape plan and shared it with the caretaker..."
     m 1eud "The next time the bell rang, the woman would leave her cell and sneak into the dark room where the coffins were kept."