Merge branch 'content' into r7.4

Author: ThePotatoGuy

Monika After Story/game/0config.rpy

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

Monika After Story/game/0utils.rpy

@@ -388,8 +388,79 @@ python early in mas_utils:
 
     mas_log = init_mas_log()
 
+    # Keep all warnings
+    _deprecation_warnings = set()
+
+    def report_deprecation(
+        deprecated,
+        use_instead="",
+        should_raise=False,
+        deprecated_msg_fmt="{deprecated} is deprecated.",
+        use_instead_msg_fmt="Use '{use_instead}' instead."
+    ):
+        """
+        A unified function to report deprecation
+
+        IN:
+            deprecated - the object that was deprecated or a str explaining what
+                was deprecated
+                Examples:
+                    report_deprecation("parameter 'mode'")
+                    report_deprecation(some_func)
+                    report_deprecation(DeprecatedClassExample)
+            use_instead - str, the name of the function/class to use instead
+                or just a message
+            should_raise - bool, whether we raise an exception or just log the error
+            deprecated_msg_fmt - str, formatter string used to report the deprecated object
+                NOTE: MUST accept the 'deprecated' keyword and only it
+            use_instead_msg_fmt - str, formatter string used to report the object to use instead
+                of the deprecated one
+                NOTE: MUST accept the 'use_instead' keyword and only it
+                Examples:
+                    report_deprecation(
+                        "using 'int's",
+                        use_instead="floats"
+                        deprecated_msg_fmt="{deprecated} is no longer supported",
+                        use_instead_msg_fmt="The function now accepts {use_instead}."
+                    )
+
+        RAISES:
+            DeprecationWarning - if should_raise is True
+        """
+        if isinstance(deprecated, basestring):
+            deprecated = deprecated.capitalize()
+
+        else:
+            module = getattr(deprecated, "__module__", "")
+            if module:
+                module += "."
+
+            name = getattr(deprecated, "__name__", None)
+            if not name:
+                name = str(deprecated)
+
+            deprecated = "'{}{}'".format(module, name)
+
+        msg_start = deprecated_msg_fmt.format(deprecated=deprecated)
+
+        if use_instead:
+            msg_end = " " + use_instead_msg_fmt.format(use_instead=use_instead)
+
+        else:
+            msg_end = ""
+
+        msg = msg_start + msg_end
 
-    def deprecated(use_instead=None, should_raise=False):
+        _deprecation_warnings.add(msg)
+
+        if should_raise:
+            raise DeprecationWarning(msg)
+
+        else:
+            print("[WARNING]: " + msg, file=sys.stderr)
+            mas_log.warning(msg)
+
+    def deprecated(**report_kws):
         """
         Decorator that marks functions and classes as deprecated
 
@@ -399,11 +470,16 @@ python early in mas_utils:
             will be reported in the main log (mas_log.txt) and stderr
         NOTE: if we were allowed to raise, we RAISE a DeprecationWarning intead
 
-        You can access all the reports via __all_warnings__
+        You can access all the reports via mas_utils._deprecation_warnings
 
         IN:
-            use_instead - string with the name of the function/class to use instead
-            should_raise - whether we raise an exception or just log the error
+            use_instead - string, the name of the function/class to use instead
+            should_raise - bool, whether we raise an exception or just log the error
+            deprecated_msg_fmt - string, a custom formater for the message (see report_deprecation)
+            use_instead_msg_fmt - string, a custom formater for the message (see report_deprecation)
+
+        RAISES:
+            DeprecationWarning - if should_raise is True
         """
         def decorator(callable_):
             """
@@ -421,43 +497,15 @@ python early in mas_utils:
                 """
                 Wrapper around the deprecated function/class
                 """
-                msg = "'{module}{name}' is deprecated.{use_instead_text}"
-
-                if hasattr(callable_, "__module__") and callable_.__module__:
-                    module = callable_.__module__ + "."
-                else:
-                    module = ""
-
-                name = callable_.__name__
-
-                if not use_instead:
-                    use_instead_text = ""
-                else:
-                    use_instead_text = " Use '{0}' instead.".format(use_instead)
-
-                msg = msg.format(
-                    module=module,
-                    name=name,
-                    use_instead_text=use_instead_text
-                )
-
-                deprecated.__all_warnings__.add(msg)
-
-                if should_raise:
-                    raise DeprecationWarning(msg)
-
-                else:
-                    print("[WARNING]: " + msg, file=sys.stderr)
-                    mas_log.warning(msg)
+                report_deprecation(callable_, **report_kws)
 
                 return callable_(*args, **kwargs)
 
             return wrapper
 
         return decorator
 
-    # Keep all warnings
-    deprecated.__all_warnings__ = set()
+    deprecated.__all_warnings__ = _deprecation_warnings
 
     @deprecated(use_instead="mas_utils.mas_log.info")
     def writelog(msg):

Monika After Story/game/event-handler.rpy

@@ -2406,7 +2406,7 @@ init python:
         eventdb.setdefault(event.eventlabel, event)
 
 
-    @store.mas_utils.deprecated("mas_hideEvent")
+    @store.mas_utils.deprecated(use_instead="mas_hideEvent")
     def hideEvent(
             event,
             lock=False,
@@ -2576,7 +2576,8 @@ init python:
         evhand._lockEventLabel(evlabel, eventdb=eventdb)
 
 
-    def mas_pushEvent(*args, **kwargs):
+    @store.mas_utils.deprecated(use_instead="MASEventList.push")
+    def pushEvent(event_label, skipeval=False, notify=False):
         """
         NOTE: Preferable to use MASEventList.push
         This pushes high priority or time sensitive events onto the top of
@@ -2597,7 +2598,8 @@ init python:
         MASEventList.push(*args, **kwargs)
 
 
-    def mas_queueEvent(*args, **kwargs):
+    @store.mas_utils.deprecated(use_instead="MASEventList.queue")
+    def queueEvent(event_label, notify=False):
         """
         NOTE: Preferable to use MASEventList.queue
         This adds low priority or order-sensitive events onto the bottom of