diff --git a/game/scripts/characters/astoria/wardrobe_reactions.rpy b/game/scripts/characters/astoria/wardrobe_reactions.rpy index 126a84d7..4604ac8d 100644 --- a/game/scripts/characters/astoria/wardrobe_reactions.rpy +++ b/game/scripts/characters/astoria/wardrobe_reactions.rpy @@ -84,7 +84,7 @@ label ast_reaction_touch(what): ast "Thought you could slip past my wards, did you?" ("clench", "base", "base", "mid") ast @ cheeks blush "I'll have you know I felt none of that!" ("open", "closed", "base", "mid") elif what == "ass": - $ show_kinetic_text(_("{shake}*spank*{/shake}"), sound="sounds/spank.ogg", trans=expand_text) + $ show_kinetic_text(_("*spank*"), sound="sounds/spank.ogg", trans=expand_text) random: ast "Ouch! Well, well... Didn't think you had the balls to do that..." ("annoyed", "base", "base", "R") diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy index 1e35bca7..64cf66c7 100644 --- a/game/scripts/characters/cho/wardrobe_reactions.rpy +++ b/game/scripts/characters/cho/wardrobe_reactions.rpy @@ -128,7 +128,7 @@ label cho_reaction_touch(what): cho @ cheeks blush "Careful or I might lock my thighs around your neck and keep you there..." ("soft", "narrow", "base", "mid") elif what == "ass": - $ show_kinetic_text(_("{shake}*spank*{/shake}"), sound="sounds/spank.ogg", trans=expand_text) + $ show_kinetic_text(_("*spank*"), sound="sounds/spank.ogg", trans=expand_text) if states.cho.level < 16: #Before Gryffindor match random: diff --git a/game/scripts/characters/hermione/wardrobe_reactions.rpy b/game/scripts/characters/hermione/wardrobe_reactions.rpy index da19514f..b5d91a89 100644 --- a/game/scripts/characters/hermione/wardrobe_reactions.rpy +++ b/game/scripts/characters/hermione/wardrobe_reactions.rpy @@ -134,7 +134,7 @@ label her_reaction_touch(what): her @ cheeks blush "More..." ("open", "closed", "base", "mid") her @ cheeks blush "Keep going [name_genie_hermione]..." ("smile", "closed", "base", "mid") elif what == "ass": - $ show_kinetic_text(_("{shake}*spank*{/shake}"), sound="sounds/spank.ogg", trans=expand_text) + $ show_kinetic_text(_("*spank*"), sound="sounds/spank.ogg", trans=expand_text) if states.her.level >= 20: random: diff --git a/game/scripts/characters/luna/wardrobe_reactions.rpy b/game/scripts/characters/luna/wardrobe_reactions.rpy index 968241d5..f8a0c52c 100644 --- a/game/scripts/characters/luna/wardrobe_reactions.rpy +++ b/game/scripts/characters/luna/wardrobe_reactions.rpy @@ -183,7 +183,7 @@ label lun_reaction_touch(what): lun "{bounce}*Ooohh*...{/bounce}" ("grin", "base", "base", "up") lun "I don't think anyone has ever kissed me there before... How strange..." ("grin", "closed", "base", "mid") elif what == "ass": - $ show_kinetic_text(_("{shake}*spank*{/shake}"), sound="sounds/spank.ogg", trans=expand_text) + $ show_kinetic_text(_("*spank*"), sound="sounds/spank.ogg", trans=expand_text) random: lun @ cheeks blush "{bounce}*Ooooh*...{/bounce} Tingly!" ("crooked_smile", "narrow", "base", "mid") diff --git a/game/scripts/characters/susan/wardrobe_reactions.rpy b/game/scripts/characters/susan/wardrobe_reactions.rpy index a0297f73..0a71dae5 100644 --- a/game/scripts/characters/susan/wardrobe_reactions.rpy +++ b/game/scripts/characters/susan/wardrobe_reactions.rpy @@ -61,7 +61,7 @@ label sus_reaction_touch(what): sus @ cheeks blush "S--{w=0.2} Sir..." ("soft", "closed", "sad", "mid") sus @ cheeks blush "P--{w=0.2} please sir, it's embarrassing..." ("base", "happy", "sad", "downR") elif what == "ass": - $ show_kinetic_text(_("{shake}*spank*{/shake}"), sound="sounds/spank.ogg", trans=expand_text) + $ show_kinetic_text(_("*spank*"), sound="sounds/spank.ogg", trans=expand_text) random: sus @ cheeks blush "Ouch! That--{w=0.2} My word..." ("angry", "happy", "sad", "downR") diff --git a/game/scripts/characters/tonks/wardrobe_reactions.rpy b/game/scripts/characters/tonks/wardrobe_reactions.rpy index 995e0df1..eb9384fd 100644 --- a/game/scripts/characters/tonks/wardrobe_reactions.rpy +++ b/game/scripts/characters/tonks/wardrobe_reactions.rpy @@ -93,15 +93,16 @@ label ton_reaction_touch(what): elif what == "ass": $ show_kinetic_text(_("*spank*"), sound="sounds/spank.ogg", trans=expand_text) - ton "*Mmm* Spank me [name_genie_tonks]!" ("angry", "narrow", "base", "down") - ton "Oooh... You naughty boy!" ("horny", "narrow", "base", "down") - ton "{shake}*Ah*!{/shake} Yes!" ("horny", "narrow", "base", "down") - ton "{shudder}*Ngh*!{/shudder}" ("clench", "narrow", "base", "mid") - ton "Yes! I've been such a naughty girl!" ("horny", "narrow", "base", "down") - ton "Punish me [name_genie_tonks]!" ("horny", "narrow", "base", "down") - ton "Harder [name_genie_tonks]!!!" ("horny", "narrow", "base", "down") - ton "Again!" ("open", "narrow", "base", "mid") - ton "More!{w=0.4} More!" ("horny", "narrow", "base", "down") + random: + ton "*Mmm* Spank me [name_genie_tonks]!" ("angry", "narrow", "base", "mid") + ton "Oooh... You naughty boy!" ("horny", "narrow", "base", "mid") + ton "{shake}*Ah*!{/shake} Yes!" ("horny", "narrow", "base", "mid") + ton "{shudder}*Ngh*!{/shudder}" ("clench", "narrow", "base", "mid") + ton "Yes! I've been such a naughty girl!" ("horny", "narrow", "base", "mid") + ton "Punish me [name_genie_tonks]!" ("horny", "narrow", "base", "mid") + ton "Harder [name_genie_tonks]!!!" ("horny", "narrow", "base", "mid") + ton "Again!" ("open", "narrow", "base", "mid") + ton "More!{w=0.4} More!" ("horny", "narrow", "base", "mid") return diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index 7f7cd1fd..b2004525 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -225,6 +225,8 @@ init python in wardrobe: scope = renpy.get_screen("wardrobe").scope character = scope["character"] + renpy.play("sounds/curtain_close.ogg") + # Handle exit animation scope["navigation_last_frame_atl"] = renpy.store.navigation_last_frame_hide scope["navigation_atl"] = renpy.store.wardrobe_hide @@ -419,6 +421,7 @@ label wardrobe(inter_pause=True): $ wardrobe._last_track = renpy.music.get_playing() if wardrobe.music: play music "music/Spring_In_My_Step.ogg" + play sound "sounds/curtain_open.ogg" if inter_pause: # Ensures all irrelevant screens are hidden before capturing the surface tree with Pause(0.2) @@ -453,6 +456,21 @@ screen wardrobe(): if navigation_exit: timer 0.4 action Return() + frame: + style "empty" + + at navigation_atl + + vbox: + style_prefix "navigation_tabs" + pos (540, 470) + + at navigation_tabs_show + + textbutton "Strip" action wardrobe.strip at navigation_tabs + null height 35 + textbutton "Exit" action wardrobe.exit keysym "K_ESCAPE" at navigation_tabs + frame: at navigation_atl @@ -694,11 +712,6 @@ screen wardrobe(): add character.image align (1.0, 1.0) zoom 0.6 at character_atl - vbox: - align (0.5, 1.0) - textbutton "Strip" action wardrobe.strip - textbutton "Return" action wardrobe.exit keysym "K_ESCAPE" - for i, j in wardrobe.easteregg(character.name): add i pos j @@ -769,8 +782,8 @@ style wardrobe_checkbox_button_text is wardrobe_button_text: # Debug only style wardrobe_secret: - background "#ff000025" - # background None + # background "#ff000025" + background None transform wardrobe_show: subpixel True diff --git a/game/sounds/curtain_close.ogg b/game/sounds/curtain_close.ogg new file mode 100644 index 00000000..00daff4e --- /dev/null +++ b/game/sounds/curtain_close.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92fef308f8e616559fbe1003b7e2c029bb38397a0730f1047fc40a59d9d5771e +size 14287 diff --git a/game/sounds/curtain_open.ogg b/game/sounds/curtain_open.ogg new file mode 100644 index 00000000..c4d98ae5 --- /dev/null +++ b/game/sounds/curtain_open.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5239792d4c7205adbb19477ce726ea454c5141f2cf43bec27b05f161287ac2d2 +size 16704