diff --git a/game/scripts/animations/transforms.rpy b/game/scripts/animations/transforms.rpy index eea1da86..f5c1d2d3 100644 --- a/game/scripts/animations/transforms.rpy +++ b/game/scripts/animations/transforms.rpy @@ -133,8 +133,8 @@ transform shake: transform shake_xlinear(speed=1.0): xoffset 1 - linear 0.1/speed xoffset -1 - linear 0.1/speed xoffset 1 + linear 0.1/speed xoffset -2 + linear 0.1/speed xoffset 2 repeat init python: diff --git a/game/scripts/cg/hermione.rpy b/game/scripts/cg/hermione.rpy index 19869c6a..4f6c8d2d 100644 --- a/game/scripts/cg/hermione.rpy +++ b/game/scripts/cg/hermione.rpy @@ -98,15 +98,15 @@ layeredimage her_vibrators_public: group vibrator_upper variant "vibrator_upper" multiple if_not "no_hermione": attribute base default - attribute egg default + attribute egg default at shake_xlinear attribute tape default - attribute effect default + attribute effect default at shake_xlinear group vibrator_lower variant "vibrator_lower" multiple if_not "no_hermione": attribute base default - attribute egg default + attribute egg default at shake_xlinear attribute tape default - attribute effect default + attribute effect default at shake_xlinear group underwear multiple if_not "no_hermione": attribute bra default if_any ["underwear", "nopanties"] diff --git a/game/scripts/characters/hermione/events/items/vibrators.rpy b/game/scripts/characters/hermione/events/items/vibrators.rpy index 9cc3bee8..74103115 100644 --- a/game/scripts/characters/hermione/events/items/vibrators.rpy +++ b/game/scripts/characters/hermione/events/items/vibrators.rpy @@ -286,8 +286,18 @@ label hg_vibrators: label .choices: menu: - "-Send her out-" if not _temp_lockout: + "-Send her out-" if not _temp_lockout and game.daytime: jump hg_vibrators_public + "-Send her out-" (style="disabled") if _temp_lockout and game.daytime: + gen "She already said no..." ("base", xpos="far_left", ypos="head") + + jump .choices + "-Send her out-" (style="disabled") if not game.daytime: + her "But it's already past curfew..." + gen "Oh, right..." ("base", xpos="far_left", ypos="head") + nar "This option is only available during the day." + + jump .choices "-Have her stay for a personal session-": jump hg_vibrators_personal @@ -2273,11 +2283,11 @@ label hg_vibrators_public_return: "-Push her horny buttons-": call gen_chibi("stand", 225, "base") - with fade + with d5 her "What are you--" ("angry", "base", "base", "mid", cheeks="blush") - call gen_chibi("stand", 230, "base", flip=True) + call gen_chibi("stand", 225, "base", flip=True) call gen_walk(path=[(230, 470), (440, 470), (450, 430)]) pause 0.5 @@ -2389,7 +2399,7 @@ label hg_vibrators_public_return: with d5 show her_vibrators_public_xray zorder 15 as cg # Dynamic displayable (Updates its children every interaction) - show her_vibrators_public nude as xray_child # Controls the bottom layer of the Xray CG + show her_vibrators_public underwear as xray_child # Controls the bottom layer of the Xray CG show her_vibrators_public_proxy as xray_overlay # Controls the top layer of the Xray CG hide screen blkfade @@ -2500,7 +2510,7 @@ label hg_vibrators_public_return: with d5 show her_vibrators_public_xray zorder 15 as cg # Dynamic displayable (Updates its children every interaction) - show her_vibrators_public nude as xray_child # Controls the bottom layer of the Xray CG + show her_vibrators_public underwear as xray_child # Controls the bottom layer of the Xray CG show her_vibrators_public_proxy as xray_overlay # Controls the top layer of the Xray CG hide screen blkfade @@ -2535,9 +2545,8 @@ label hg_vibrators_public_return: # Worst option # Xray turns active once player picks this option, Vibrator shakes, etc. - show her_vibrators_public eyebrows_surprised mouth_shocked eyes_clenched underwear as xray_child - show her_vibrators_public_proxy eyebrows_surprised mouth_shocked eyes_clenched as xray_overlay with d5 - with d5 + show her_vibrators_public nude eyebrows_surprised mouth_shocked eyes_clenched as xray_child + show her_vibrators_public_proxy eyebrows_surprised mouth_shocked eyes_clenched as xray_overlay # TODO sounds @@ -2598,7 +2607,7 @@ label hg_vibrators_public_return: her "You should know exactly what you did--" gen "Oh? So this was when I--" - "\"(Skipping low, straight up to medium setting!)\"": + "\"(Straight up to medium setting!)\"": # Best option $ _vibrator_medium = True $ _vibrator_last = "medium" @@ -2608,7 +2617,7 @@ label hg_vibrators_public_return: play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_medium.ogg" - show her_vibrators_public eyebrows_surprised eyes_forward mouth_shocked underwear as xray_child + show her_vibrators_public nude eyebrows_surprised eyes_forward mouth_shocked as xray_child show her_vibrators_public_proxy eyebrows_surprised eyes_forward mouth_shocked as xray_overlay if not her_vibrators_public_stage == 2: @@ -2679,14 +2688,14 @@ label hg_vibrators_public_return: play sound "sounds/click4.ogg" play bg_sounds "sounds/vibrator_low.ogg" - show her_vibrators_public eyebrows_worried mouth_open underwear as xray_child + show her_vibrators_public nude eyebrows_worried mouth_open as xray_child show her_vibrators_public_proxy eyebrows_worried mouth_open as xray_overlay if not her_vibrators_public_stage == 2: her "Yes...{w=0.4} Luckily, it was just low enough not to startle me and cast suspicion..." her "At first it didn't feel as if what was happening was real, but it soon dawned on me what a terrible situation I had put myself in." - show her_vibrators_public blush_heavy mouth_lip_bite eyes_left as xray_child + show her_vibrators_public nude blush_heavy mouth_lip_bite eyes_left as xray_child show her_vibrators_public_proxy blush_heavy mouth_lip_bite eyes_left as xray_overlay her "I was standing outside, in the middle of a courtyard, my friends right in front me as the vibrators had began shaking against my private parts..."