Merge branch 'content' into pr/6350

Monika-After-Story · Oct 27, 2020 · ffbcc3e · ffbcc3e
2 parents a814ab8 + 1bd1f90
commit ffbcc3e
Show file tree

Hide file tree

Showing 46 changed files with 404 additions and 279 deletions.
diff --git a/Monika After Story/game/definitions.rpy b/Monika After Story/game/definitions.rpy
@@ -1,4 +1,5 @@
 define persistent.demo = False
+
 define config.developer = False #This is the flag for Developer tools
 # define persistent.steam = "steamapps" in config.basedir.lower()
 
@@ -7441,6 +7442,9 @@ default persistent._mas_ddlc_reload_count = 0
 
 define startup_check = False
 
+# define temp zoom to default level in case of crash
+define mas_temp_zoom_level = store.mas_sprites.default_zoom_level
+
 define his = "his"
 define he = "he"
 define hes = "he's"

diff --git a/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_back-0.png b/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_back-0.png
diff --git a/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_back-5.png b/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_back-5.png
diff --git a/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_front-0.png b/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_front-0.png
diff --git a/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_front-5.png b/Monika After Story/game/mod_assets/monika/a/acs-rin_bows_front-5.png
diff --git a/Monika After Story/game/mod_assets/monika/a/acs-rin_ears-0.png b/Monika After Story/game/mod_assets/monika/a/acs-rin_ears-0.png
diff --git a/Monika After Story/game/mod_assets/monika/a/acs-rin_ears-5.png b/Monika After Story/game/mod_assets/monika/a/acs-rin_ears-5.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed-10.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed-10.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed-5.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed-5.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed-n.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed-n.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-crossed.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-down-n.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-down-n.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-down.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-down.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-leaning-def-left-def-10.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-leaning-def-left-def-10.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-leaning-def-right-def-10.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-leaning-def-right-def-10.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-leaning-def-right-def-5.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-leaning-def-right-def-5.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-left-down-0.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-left-down-0.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-left-rest-10.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-left-rest-10.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-pointright-n.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-pointright-n.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-pointright.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-pointright.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-restleftpointright-n.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-restleftpointright-n.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-restleftpointright.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-restleftpointright.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-right-down-0.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-right-down-0.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-right-point-0.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-right-point-0.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-right-restpoint-10.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-right-restpoint-10.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-steepling-10.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-steepling-10.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-steepling-n.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-steepling-n.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/arms-steepling.png b/Monika After Story/game/mod_assets/monika/c/rin/arms-steepling.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/body-def-0.png b/Monika After Story/game/mod_assets/monika/c/rin/body-def-0.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/body-def-1.png b/Monika After Story/game/mod_assets/monika/c/rin/body-def-1.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/body-leaning-def-0.png b/Monika After Story/game/mod_assets/monika/c/rin/body-leaning-def-0.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/body-leaning-def-1.png b/Monika After Story/game/mod_assets/monika/c/rin/body-leaning-def-1.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/torso-custom-n.png b/Monika After Story/game/mod_assets/monika/c/rin/torso-custom-n.png
diff --git a/Monika After Story/game/mod_assets/monika/c/rin/torso-custom.png b/Monika After Story/game/mod_assets/monika/c/rin/torso-custom.png
diff --git a/Monika After Story/game/mod_assets/monika/h/hair-braided-back.png b/Monika After Story/game/mod_assets/monika/h/hair-braided-back.png
diff --git a/Monika After Story/game/mod_assets/monika/h/hair-braided-front.png b/Monika After Story/game/mod_assets/monika/h/hair-braided-front.png
diff --git a/Monika After Story/game/mod_assets/monika/h/hair-leaning-def-braided-back.png b/Monika After Story/game/mod_assets/monika/h/hair-leaning-def-braided-back.png
diff --git a/Monika After Story/game/mod_assets/monika/h/hair-leaning-def-braided-front.png b/Monika After Story/game/mod_assets/monika/h/hair-leaning-def-braided-front.png
diff --git a/Monika After Story/game/mod_assets/thumbs/clothes-rin.png b/Monika After Story/game/mod_assets/thumbs/clothes-rin.png
diff --git a/Monika After Story/game/mod_assets/thumbs/hair-braided.png b/Monika After Story/game/mod_assets/thumbs/hair-braided.png