From f8a1d75d9bb4dcf46434d2a9d4a78055c0eed583 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sun, 9 Apr 2023 20:54:15 +0100 Subject: [PATCH] Bug fixes * Added missing hooch head icon * Removed leftover references to update_interface functionality * Fixed missing directory for expressions causing crashes in character studio * Fixed unlock state detection in character studio * Fixed hooch studio crash --- game/interface/icons/head/hooch.webp | 3 +++ game/scripts/characters/hooch/vars.rpy | 2 +- game/scripts/events/Start.rpy | 1 - game/scripts/interface/credits.rpy | 1 - .../minigames/mirror/events/a_bad_time_to_disrobe.rpy | 4 ---- game/scripts/minigames/mirror/events/panty_raid.rpy | 4 ---- game/scripts/wardrobe/studio.rpy | 5 ++--- 7 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 game/interface/icons/head/hooch.webp diff --git a/game/interface/icons/head/hooch.webp b/game/interface/icons/head/hooch.webp new file mode 100644 index 00000000..beb7cce2 --- /dev/null +++ b/game/interface/icons/head/hooch.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f73c621d20053841e623cb8c047e11007d6231aa76f0414efb6d4772660a92eb +size 24796 diff --git a/game/scripts/characters/hooch/vars.rpy b/game/scripts/characters/hooch/vars.rpy index b6c885fb..f964e6b4 100644 --- a/game/scripts/characters/hooch/vars.rpy +++ b/game/scripts/characters/hooch/vars.rpy @@ -6,7 +6,7 @@ # default states.hoo.public_tier = 0 # default states.hoo.public_level = 0 # default states.hoo.mood = 0 -# default states.hoo.unlocked = False +default states.hoo.unlocked = False default states.hoo.busy = False # Names diff --git a/game/scripts/events/Start.rpy b/game/scripts/events/Start.rpy index 21033fcb..0ae5991b 100644 --- a/game/scripts/events/Start.rpy +++ b/game/scripts/events/Start.rpy @@ -87,7 +87,6 @@ label genie_intro_E1: dum2 "*Yawn*...{w=0.4} Well... It begins to dawn." # Swap to day seamlessly - call update_interface_color("gold") $ game.daytime = True $ game.day = 1 $ mailbox.tick() diff --git a/game/scripts/interface/credits.rpy b/game/scripts/interface/credits.rpy index a3cbbea6..4d4a549a 100644 --- a/game/scripts/interface/credits.rpy +++ b/game/scripts/interface/credits.rpy @@ -63,7 +63,6 @@ label credits: show screen credits(credits_text) with dissolve - call update_interface_color("gray") $ achievements.unlock("Credits") pause credits_duration if not _menu: diff --git a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy index c441d97f..a53441ed 100644 --- a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy +++ b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy @@ -74,7 +74,6 @@ label a_bad_time_to_disrobe_part_1: with d5 $ game.daytime = False - call update_interface_color call music_block call her_chibi("stand","desk","base") @@ -127,7 +126,6 @@ label a_bad_time_to_disrobe_part_1: nar "Hermione returns the next morning, looking nervous but more determined than yesterday." $ game.daytime = True - call update_interface_color call music_block hide qmark @@ -146,7 +144,6 @@ label a_bad_time_to_disrobe_part_1: with d5 $ game.daytime = False - call update_interface_color call music_block nar "Later that evening a distraught-looking Hermione enters the office." @@ -274,7 +271,6 @@ label a_bad_time_to_disrobe_part_2: with d3 $ game.daytime = False - call update_interface_color call music_block nar "Later that evening." diff --git a/game/scripts/minigames/mirror/events/panty_raid.rpy b/game/scripts/minigames/mirror/events/panty_raid.rpy index 3ddb45d3..53b8d4a4 100644 --- a/game/scripts/minigames/mirror/events/panty_raid.rpy +++ b/game/scripts/minigames/mirror/events/panty_raid.rpy @@ -121,7 +121,6 @@ label panty_raid: centered "{size=+7}{color=#cbcbcb}Three hours later...{/color}{/size}" $ game.daytime = False - call update_interface_color call music_block pause 1.0 @@ -295,7 +294,6 @@ label panty_raid: stop music fadeout 1.0 centered "{size=+7}{color=#cbcbcb}Four hours later...{/color}{/size}" $ game.daytime = False - call update_interface_color call music_block pause 1.0 @@ -430,7 +428,6 @@ label panty_raid: stop music fadeout 1.0 centered "{size=+7}{color=#cbcbcb}A few hours later...{/color}{/size}" $ game.daytime = False - call update_interface_color call music_block pause 1.0 @@ -674,7 +671,6 @@ label panty_raid: stop music fadeout 1.0 centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" $ game.daytime = False - call update_interface_color call music_block pause 1.0 diff --git a/game/scripts/wardrobe/studio.rpy b/game/scripts/wardrobe/studio.rpy index 2e123fc4..a7327b17 100644 --- a/game/scripts/wardrobe/studio.rpy +++ b/game/scripts/wardrobe/studio.rpy @@ -31,12 +31,11 @@ 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 not fp.startswith(path) or not ext in extensions: continue - expressions = d.setdefault(charname, _dict()).setdefault(part, _list((None,))) - if not expression in expressions: expressions.append(expression) return d @@ -319,7 +318,7 @@ screen studio(): vbox: for k, v in studio.drags.items(): $ active = (states.active_girl == k and v[1]) - $ unlocked = getattr(renpy.store, k+"_unlocked") + $ unlocked = getattr(states, f"{k[:3]}").unlocked if not v[1]: $ action = [ SetDict(studio.drags[k], 1, True), Function(studio.drag_activated, [v[0]]), renpy.restart_interaction ]