Sounds, Wardrobe, Bug fixes

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")

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:

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:

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")

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")

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
 

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