From 9a877ebcf68d0d51dcd253dbd8fb7d6b11330902 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Thu, 15 Sep 2022 22:37:23 +0100 Subject: [PATCH] Vibrators event * Added chibi vibrators on the floor image * Replaced python audio calls with renpy audio calls (better prediction) --- game/images/misc/vibrators_floor.webp | 3 + .../hermione/events/items/vibrators.rpy | 128 ++++++++++-------- 2 files changed, 78 insertions(+), 53 deletions(-) create mode 100644 game/images/misc/vibrators_floor.webp diff --git a/game/images/misc/vibrators_floor.webp b/game/images/misc/vibrators_floor.webp new file mode 100644 index 00000000..58453d58 --- /dev/null +++ b/game/images/misc/vibrators_floor.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7debf1b308090d92406ad738392e88c78a086c3bbde86abcabfb2f5c93394ba6 +size 3692 diff --git a/game/scripts/characters/hermione/events/items/vibrators.rpy b/game/scripts/characters/hermione/events/items/vibrators.rpy index 571e34d8..623d8079 100644 --- a/game/scripts/characters/hermione/events/items/vibrators.rpy +++ b/game/scripts/characters/hermione/events/items/vibrators.rpy @@ -148,17 +148,17 @@ label hg_vibrators: if hermione.is_any_worn("clothes"): if hermione.is_worn("robe"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("robe") with d3 if hermione.is_worn("top"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("top") with d3 if hermione.is_worn("bottom"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("bottom") with d3 @@ -168,12 +168,12 @@ label hg_vibrators: if her_tier >= 5: if hermione.is_worn("bra"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("bra") with d3 if hermione.is_worn("panties"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("panties") with d3 @@ -197,12 +197,12 @@ label hg_vibrators: "-Peek-": if hermione.is_worn("bra"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("bra") with d3 if hermione.is_worn("panties"): - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("panties") with d3 @@ -251,13 +251,15 @@ label hg_vibrators_fail: gen "Press the button, the one located on the side." ("base", xpos="far_left", ypos="head") nar "Hermione examines the device, locates the button and presses it." - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" if her_tier < 4: + her "!!!" ("base", "base", "base", "mid") #Wide eyed - #TODO vibrators on floor (Hermione drops them) + show vibrators_floor at Transform(xpos=536, ypos=413, zoom=0.5) + with d5 gen "There it is!" ("grin", xpos="far_left", ypos="head") her "This... This is a vibrator!" ("base", "base", "base", "mid") @@ -295,7 +297,8 @@ label hg_vibrators_fail: her "I can't believe you would ask me to do such a thing!" ("base", "base", "base", "mid") her "I think I should go..." ("base", "base", "base", "mid") - #TODO vibrators on floor + show vibrators_floor at Transform(xpos=536, ypos=413, zoom=0.5) + with d5 #Hermione leaves call her_walk(action="leave") @@ -304,10 +307,20 @@ label hg_vibrators_fail: gen "(Oh well. Was worth a shot...)" ("base", xpos="far_left", ypos="head") gen "(She'll come around eventually...)" ("base", xpos="far_left", ypos="head") - # TODO Genie walks and picks vibrators up off the ground - $ renpy.sound.play("sounds/click4.ogg") + call gen_chibi("stand", 230, "base", flip=True) + call gen_walk(path=[(230, 470), (440, 470), (450, 430)]) + + pause 0.5 + + play sound "sounds/click4.ogg" stop bg_sounds + pause 0.5 + + hide vibrators_floor + call gen_chibi("sit_behind_desk") + with fade + jump end_hermione_event label hg_vibrators_fail_repeat: @@ -319,7 +332,8 @@ label hg_vibrators_fail_repeat: gen "Vibrator{b}s{/b}." ("base", xpos="far_left", ypos="head") her "..." ("base", "base", "base", "mid") - #TODO vibrators on floor (Hermione drops them) + show vibrators_floor at Transform(xpos=536, ypos=413, zoom=0.5) + with d5 gen "And who said I wanted you to use it in front of me?" ("base", xpos="far_left", ypos="head") her "... Tell me with a straight face that you weren't going to ask me that." ("base", "base", "base", "mid") @@ -341,7 +355,8 @@ label hg_vibrators_fail_repeat: gen "Really?" ("grin", xpos="far_left", ypos="head") her "{size=+6}No!{/size}" ("base", "base", "base", "mid") with hpunch - #TODO vibrators on floor + show vibrators_floor at Transform(xpos=536, ypos=413, zoom=0.5) + with d5 gen "Oh..." ("base", xpos="far_left", ypos="head") her "...{w=0.4} I'm leaving." ("base", "base", "base", "mid") @@ -362,7 +377,14 @@ label hg_vibrators_fail_repeat: gen "(Well, that's just rude...)" ("base", xpos="far_left", ypos="head") - #TODO Genie walks and picks vibrators up off the ground + call gen_chibi("stand", 230, "base", flip=True) + call gen_walk(path=[(230, 470), (440, 470), (450, 430)]) + + pause 0.5 + + hide vibrators_floor + call gen_chibi("sit_behind_desk") + with fade jump end_hermione_event @@ -489,12 +511,12 @@ label hg_vibrators_public: gen "What I'm saying is... I'll be controlling it remotely, from here." ("base", xpos="far_left", ypos="head") gen "Like this." ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" her "{heart}*Ah*...{heart}" ("base", "base", "base", "mid") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds her "..." ("base", "base", "base", "mid") @@ -558,7 +580,7 @@ label hg_vibrators_public: her "..." ("base", "base", "base", "mid") #down gen "Go on then." ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.equip(her_outfit_default) $ hermione.equip(her_bottom_school3) @@ -580,7 +602,7 @@ label hg_vibrators_personal: gen "Let's turn these things on then, shall we." ("base", xpos="far_left", ypos="head") her "Hold on I'm not--" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" her "{heart}*Ah*!!!{heart}" @@ -601,21 +623,21 @@ label hg_vibrators_personal: menu: "-Lower the intensity-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" her "*Ah*...{w=0.4} That's better..." "-Raise the intensity-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_high.ogg" her "{cps=16}*Ahhhhhhhhh*{/cps} [genie_name]!!" gen "Oops, my bad! My hand slipped..." ("base", xpos="far_left", ypos="head") gen "(Wouldn't want to end it too soon...)" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" gen "Now, why don't you do me a favour, and lie down on the desk for me?" ("base", xpos="far_left", ypos="head") @@ -664,7 +686,7 @@ label hg_vibrators_personal: gen "There we go.{fast} Now for the telling part." ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" #Hermione legs closed @@ -753,7 +775,7 @@ label hg_vibrators_personal: menu: "-Turn the intensity to High-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_high.ogg" #Hermione pelvis pushed up @@ -809,7 +831,7 @@ label hg_vibrators_personal: "-Turn it down-": gen "Oh? Don't want it to end too soon?" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" #legs are closed @@ -902,7 +924,7 @@ label hg_vibrators_personal: her "{size=-4}Thank be Merlin... I thought you were being serious for a--{/size}" gen "Just kidding!" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_high.ogg" show her_vibrators_personal eyes_squint_crossed mouth_angry as cg @@ -960,7 +982,7 @@ label hg_vibrators_personal: "-Turn it down-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" show her_vibrators_personal eyebrows_upset eyes_squint_forward mouth_angry as cg @@ -1008,7 +1030,7 @@ label hg_vibrators_personal: gen "It could remain as is... At a level where you'd be stuck in a state of constant arousal... Enough to keep you on edge, but not enough to bring you over it." ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" show her_vibrators_personal eyebrows_neutral eyes_narrow_crossed mouth_shocked as cg @@ -1025,7 +1047,7 @@ label hg_vibrators_personal: "-Turn the intensity to Medium-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" # Hermione legs closed @@ -1110,7 +1132,7 @@ label hg_vibrators_personal: her "I--{w=0.4} I'm--" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" show her_vibrators_personal eyebrows_worried eyes_closed mouth_horny as cg @@ -1139,7 +1161,7 @@ label hg_vibrators_personal: her "*Ah*...{w=0.4} [genie_name], I don't know if--" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_high.ogg" # Hermione pelvis thrust @@ -1147,7 +1169,7 @@ label hg_vibrators_personal: her "{size=+4}{heart}{heart}{heart}*Ah*!!!{heart}{heart}{/size}{w=1}{nw}" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" show her_vibrators_personal eyebrows_worried eyes_closed mouth_open as cg @@ -1225,7 +1247,7 @@ label hg_vibrators_personal: gen "You shall not cum.{w=0.4}{nw}" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds gen "You shall not cum.{fast}{w=0.4}{nw}" ("base", xpos="far_left", ypos="head") @@ -1401,7 +1423,7 @@ label hg_vibrators_personal: "-Turn the intensity to Medium-": #She cums but it takes a little longer. - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" show her_vibrators_personal mouth_horny as cg @@ -1439,7 +1461,7 @@ label hg_vibrators_personal: "-Turn the intensity to High-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_high.ogg" show her_vibrators_personal eyebrows_neutral eyes_wide_crossed mouth_ahegao as cg @@ -1469,7 +1491,7 @@ label hg_vibrators_personal: # Turns the switch into overdrive mode gen "Skadoosh.{w=0.8}{nw}" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_overdrive.ogg" show her_vibrators_personal eyes_wide_crossed as cg @@ -1631,7 +1653,7 @@ label hg_vibrators_personal: gen "Forfeiting the points already, [hermione_name]?" ("base", xpos="far_left", ypos="head") gen "Well, if you insist." ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds her "Wait!" @@ -1644,7 +1666,7 @@ label hg_vibrators_personal: her "Yes..." gen "Low setting it is." ("grin", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" her "{heart}*Ngh*{heart}!" @@ -1681,7 +1703,7 @@ label hg_vibrators_personal: menu: "-Turn up the intensity-": # TODO Temp flag that you turned vibrator up - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" her "{heart}*Ah*!!{heart}" @@ -1690,7 +1712,7 @@ label hg_vibrators_personal: her "[genie_name], turn it down this instance, {w=0.5}or I'm leaving!" #mad gen "..." ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds gen "There... {w=0.4}Better?" ("base", xpos="far_left", ypos="head") @@ -1704,7 +1726,7 @@ label hg_vibrators_personal: "-Turn it off-": - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds gen "Well, if that's the case, I suppose we're done here." ("base", xpos="far_left", ypos="head") @@ -1713,7 +1735,7 @@ label hg_vibrators_personal: gen "Your points?" ("base", xpos="far_left", ypos="head") her "Yes, am I still getting--" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" her "*Ah*..." @@ -1748,7 +1770,7 @@ label hg_vibrators_personal: gen "I appreciate your honesty, any other student would've kept this information from me." ("base", xpos="far_left", ypos="head") her "Oh, well..." #blush - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" her "*Ah*!" @@ -1769,7 +1791,7 @@ label hg_vibrators_personal: her "I can't believe you!" # Replaces vibrators in underwear with underwear - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("accessory0", "accessory1") $ hermione.equip(her_bra_base1) $ hermione.equip(her_panties_base1) @@ -1796,7 +1818,7 @@ label hg_vibrators_personal: her "I want my points now..." - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds gen "...{w=0.4} Very well, [hermione_name]." ("base", xpos="far_left", ypos="head") @@ -1840,7 +1862,7 @@ label hg_vibrators_personal: gen "I suppose you wouldn't want anyone find them in your dorm." ("base", xpos="far_left", ypos="head") her "(That's not what I'm worried about...)" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds gen "No worries, just let me know if you feel like using them again." ("base", xpos="far_left", ypos="head") @@ -1864,7 +1886,7 @@ label hg_vibrators_personal: her "But... [genie_name]." her "I'm not to blame if it's you who is keeping me--" - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" her "Ah!" @@ -1958,7 +1980,7 @@ label hg_vibrators_personal: call her_walk(action="leave") gen "(This girl is such a mystery sometimes...)" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds # TODO Reset Temp flag that you turned vibrator up @@ -2026,13 +2048,13 @@ label hg_vibrators_public_return: her "At last..." her "These things...{w=0.4} *Ah*...{w=0.4} They turned on as I was walking up the stairs to your tower..." gen "They--" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/drawer_open.ogg") + play sound "sounds/drawer_open.ogg" gen "(Whops! I must've switched it on when I put the controller away in the drawer...)" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/cough_male.ogg") + play sound "sounds/cough_male.ogg" gen "*Loud cough*{w=0.5}{nw}" ("base", xpos="far_left", ypos="head") - $ renpy.sound.play("sounds/click4.ogg") + play sound "sounds/click4.ogg" stop bg_sounds gen "*Loud cough*{fast}" ("base", xpos="far_left", ypos="head") @@ -3253,13 +3275,13 @@ label hg_vibrators_public_return: her "So, after I exited your office..." her "I was wracking my brain trying to decide when would be the best time to use the vibrators." - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("top") with d3 her "I finally decided to set focus on the final lesson for today, \"Muggle Studies\", as that class would be the least likely to cause me any trouble." - $ renpy.sound.play("sounds/cloth_sound3.ogg") + play sound "sounds/cloth_sound3.ogg" $ hermione.strip("bottom") with d3