Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Bug fixes

Browse Source 
* Fixed character cheeks and tears layers being stuck in both gameplay and character studio
* Fixed missing reset properties during end event labels
* Improved updater hint for potential edge cases
This commit is contained in:
LoafyLemon 2023-07-08 18:30:36 +01:00
parent 47096ba09d
commit 2f136986e2
9 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/scripts/characters/astoria/common.rpy
View File

@ -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

1
game/scripts/characters/cho/common.rpy
View File

@ -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

1
game/scripts/characters/hermione/common.rpy
View File

@ -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

1
game/scripts/characters/hooch/common.rpy
View File

@ -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

2
game/scripts/characters/luna/common.rpy
View File

@ -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

2
game/scripts/characters/susan/common.rpy
View File

@ -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

1
game/scripts/characters/tonks/common.rpy
View File

@ -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

9
game/scripts/utility/updater.rpy
View File

@ -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

15
game/scripts/wardrobe/studio.rpy
View File

@ -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