diff --git a/game/scripts/characters/astoria/common.rpy b/game/scripts/characters/astoria/common.rpy index 25466913..41f186d2 100644 --- a/game/scripts/characters/astoria/common.rpy +++ b/game/scripts/characters/astoria/common.rpy @@ -26,6 +26,7 @@ label end_astoria_event: $ states.ast.busy = True $ astoria.wear("all") $ astoria.set_cum(None) + $ astoria.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/characters/cho/common.rpy b/game/scripts/characters/cho/common.rpy index 70a433ee..91e78700 100644 --- a/game/scripts/characters/cho/common.rpy +++ b/game/scripts/characters/cho/common.rpy @@ -22,6 +22,7 @@ label end_cho_event: $ states.cho.busy = True $ cho.wear("all") $ cho.set_cum(None) + $ cho.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/characters/hermione/common.rpy b/game/scripts/characters/hermione/common.rpy index 64f8ba2e..98a4d180 100644 --- a/game/scripts/characters/hermione/common.rpy +++ b/game/scripts/characters/hermione/common.rpy @@ -19,6 +19,7 @@ label end_hermione_event: $ states.her.busy = True $ hermione.wear("all") $ hermione.set_cum(None) + $ hermione.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/characters/hooch/common.rpy b/game/scripts/characters/hooch/common.rpy index 13f63ccc..ac765507 100644 --- a/game/scripts/characters/hooch/common.rpy +++ b/game/scripts/characters/hooch/common.rpy @@ -10,6 +10,7 @@ label end_hooch_event: $ states.hoo.busy = True $ hooch.wear("all") $ hooch.set_cum(None) + $ hooch.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/characters/luna/common.rpy b/game/scripts/characters/luna/common.rpy index 7b382ceb..cc2c5353 100644 --- a/game/scripts/characters/luna/common.rpy +++ b/game/scripts/characters/luna/common.rpy @@ -12,6 +12,8 @@ label end_luna_event: $ states.active_girl = None $ states.lun.busy = True $ luna.wear("all") + $ luna.set_cum(None) + $ luna.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/characters/susan/common.rpy b/game/scripts/characters/susan/common.rpy index d4c9c54b..5c0a2a06 100644 --- a/game/scripts/characters/susan/common.rpy +++ b/game/scripts/characters/susan/common.rpy @@ -11,6 +11,8 @@ label end_susan_event: $ states.active_girl = None $ states.sus.busy = True $ susan.wear("all") + $ susan.set_cum(None) + $ susan.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/characters/tonks/common.rpy b/game/scripts/characters/tonks/common.rpy index fd313997..c3b4ce38 100644 --- a/game/scripts/characters/tonks/common.rpy +++ b/game/scripts/characters/tonks/common.rpy @@ -32,6 +32,7 @@ label end_tonks_event: $ states.ton.busy = True $ tonks.wear("all") $ tonks.set_cum(None) + $ tonks.set_face(tears=False, cheeks=False) call music_block jump main_room_menu diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 95be649d..ec394a9f 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -22,7 +22,14 @@ init python: global UPDATE_VER, UPDATE_HINT - if (not updater.can_update() or config.developer) and not self.simulate: + if (config.developer or not updater.can_update()) and not self.simulate: + + if config.developer: + UPDATE_HINT = "Updater is disabled." + else: + UPDATE_HINT = "Cannot fetch updates." + + renpy.restart_interaction() return check = True diff --git a/game/scripts/wardrobe/studio.rpy b/game/scripts/wardrobe/studio.rpy index edd411ef..7ff49051 100644 --- a/game/scripts/wardrobe/studio.rpy +++ b/game/scripts/wardrobe/studio.rpy @@ -30,7 +30,12 @@ init python in studio: fp, fn = os.path.split(f) fn, ext = os.path.splitext(fn) expression = os.path.split(fp)[1] - expressions = d.setdefault(charname, _dict()).setdefault(part, _list((None,))) + + + if part in ("cheeks", "tears"): + expressions = d.setdefault(charname, _dict()).setdefault(part, _list((False,))) + else: + expressions = d.setdefault(charname, _dict()).setdefault(part, _list()) if not fp.startswith(path) or not ext in extensions: continue @@ -48,8 +53,8 @@ init python in studio: d[i]["eyes"] = faces[i].get("eyes", [None]).index("base") d[i]["mouth"] = faces[i].get("mouth", [None]).index("base") d[i]["pupils"] = faces[i].get("pupils", [None]).index("mid") - d[i]["cheeks"] = faces[i].get("cheeks", [None]).index(None) - d[i]["tears"] = faces[i].get("tears", [None]).index(None) + d[i]["cheeks"] = faces[i].get("cheeks", [False]).index(False) + d[i]["tears"] = faces[i].get("tears", [False]).index(False) d[i]["zoom"] = 0.5 d[i]["flip"] = 1 d[i]["alpha"] = 1.0 @@ -143,8 +148,8 @@ init python in studio: choices[drag.char_name]["eyes"] = faces[drag.char_name]["eyes"].index("base") choices[drag.char_name]["mouth"] = faces[drag.char_name]["mouth"].index("base") choices[drag.char_name]["pupils"] = faces[drag.char_name]["pupils"].index("mid") - choices[drag.char_name]["cheeks"] = faces[drag.char_name]["cheeks"].index(None) - choices[drag.char_name]["tears"] = faces[drag.char_name]["tears"].index(None) + choices[drag.char_name]["cheeks"] = faces[drag.char_name]["cheeks"].index(False) + choices[drag.char_name]["tears"] = faces[drag.char_name]["tears"].index(False) choices[drag.char_name]["zoom"] = 0.5 choices[drag.char_name]["flip"] = 1 choices[drag.char_name]["alpha"] = 1.0