Merge remote-tracking branch 'origin/Python3' into Chibis

Bug fixes
* Fixed Luna sprite persisting throughout Wardrobe context * Fixed regression related to wardrobe chit-chats due to the mixing of renpy and python scopes
2022-11-09 21:09:53 +00:00 · 2022-11-04 21:17:41 +00:00
2 changed files with 108 additions and 97 deletions
--- a/game/scripts/characters/luna/summon.rpy
+++ b/game/scripts/characters/luna/summon.rpy
@ -48,7 +48,7 @@ label summon_luna:

        # Wardrobe
        "-Wardrobe-" (icon="interface/icons/small/wardrobe.webp") if luna_wardrobe_unlocked:
-            hide astoria_main with d1
+            hide luna_main with d1
            call wardrobe
            jump luna_requests

--- a/game/scripts/wardrobe/wardrobe.rpy
+++ b/game/scripts/wardrobe/wardrobe.rpy
Author	SHA1	Message	Date
LoafyLemon	2334c25d72	Merge remote-tracking branch 'origin/Python3' into Chibis	2022-11-09 21:09:53 +00:00
LoafyLemon	dd4b2898e0	Bug fixes * Fixed Luna sprite persisting throughout Wardrobe context * Fixed regression related to wardrobe chit-chats due to the mixing of renpy and python scopes	2022-11-04 21:17:41 +00:00