From 5bdf050a7569c9622bb956e6ae4dd61a8ae6ca55 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 20 Sep 2022 21:08:46 +0100 Subject: [PATCH] Vibrator Interface * Added vibrator interface to the public event * Fixed invalid syntax --- .../vibrator_interface_background.webp | 3 ++ .../vibrator_interface_caption_high.webp | 3 ++ .../vibrator_interface_caption_low.webp | 3 ++ .../vibrator_interface_caption_medium.webp | 3 ++ .../vibrator_interface_emoji_high.webp | 3 ++ ...ibrator_interface_emoji_high_disabled.webp | 3 ++ .../vibrator_interface_emoji_low.webp | 3 ++ ...vibrator_interface_emoji_low_disabled.webp | 3 ++ .../vibrator_interface_emoji_medium.webp | 3 ++ ...rator_interface_emoji_medium_disabled.webp | 3 ++ .../vibrator_interface_vibration_high.webp | 3 ++ .../vibrator_interface_vibration_low.webp | 3 ++ .../vibrator_interface_vibration_medium.webp | 3 ++ .../hermione/events/items/vibrators.rpy | 32 ++++++++++-- game/scripts/interface/vibrator.rpy | 52 +++++++++++++++++++ 15 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_background.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_caption_high.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_caption_low.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_caption_medium.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_emoji_high.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_emoji_high_disabled.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_emoji_low.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_emoji_low_disabled.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_emoji_medium.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_emoji_medium_disabled.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_vibration_high.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_vibration_low.webp create mode 100644 game/images/ui/vibrator_interface/vibrator_interface_vibration_medium.webp create mode 100644 game/scripts/interface/vibrator.rpy diff --git a/game/images/ui/vibrator_interface/vibrator_interface_background.webp b/game/images/ui/vibrator_interface/vibrator_interface_background.webp new file mode 100644 index 00000000..d3ec73ea --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_background.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e55292498dd1a530a08cb14ba0c58eb862604d0986bc6ab17902721aecdb19a3 +size 75610 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_caption_high.webp b/game/images/ui/vibrator_interface/vibrator_interface_caption_high.webp new file mode 100644 index 00000000..7365e41c --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_caption_high.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de46722dbad4047e3cd5afb5f32d4d59e167b75b6dd2383e5298fa50202e2766 +size 6490 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_caption_low.webp b/game/images/ui/vibrator_interface/vibrator_interface_caption_low.webp new file mode 100644 index 00000000..cbe4fddd --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_caption_low.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80a75252f3ae582667809e92a3845a43bf7d648a4b458dbde68114045c4a28df +size 5034 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_caption_medium.webp b/game/images/ui/vibrator_interface/vibrator_interface_caption_medium.webp new file mode 100644 index 00000000..646f9ba0 --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_caption_medium.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76e9f81ff642defae5a3324d7afba08ef28a149bb508fead22fd7b7b706a4714 +size 10288 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_emoji_high.webp b/game/images/ui/vibrator_interface/vibrator_interface_emoji_high.webp new file mode 100644 index 00000000..fdb04de8 --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_emoji_high.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dabe1d52350d4ba97ca10a384847a7b85122d4e175d189c68556b1a2d47247cf +size 24894 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_emoji_high_disabled.webp b/game/images/ui/vibrator_interface/vibrator_interface_emoji_high_disabled.webp new file mode 100644 index 00000000..5ccb32ae --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_emoji_high_disabled.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24d098ff112ac6b7da1ea89f4af4667bffd029b5fdd7a9d62d5cbd918846213c +size 17266 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_emoji_low.webp b/game/images/ui/vibrator_interface/vibrator_interface_emoji_low.webp new file mode 100644 index 00000000..9cb26fa2 --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_emoji_low.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1aa75b7ae6881e550a423be5b66c6af9ac41faaa7541e08640aa582ddb0df2d6 +size 15298 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_emoji_low_disabled.webp b/game/images/ui/vibrator_interface/vibrator_interface_emoji_low_disabled.webp new file mode 100644 index 00000000..19d45968 --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_emoji_low_disabled.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e289b9a55b0c6d2ee4840161e583ada0a40b12eaa79da5f26e505d68b8096b0d +size 10864 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_emoji_medium.webp b/game/images/ui/vibrator_interface/vibrator_interface_emoji_medium.webp new file mode 100644 index 00000000..0a378a53 --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_emoji_medium.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:391953f68ed405ff1c7481166eb12b377ea291a0f4c0493f02e0e232d00ecb62 +size 18028 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_emoji_medium_disabled.webp b/game/images/ui/vibrator_interface/vibrator_interface_emoji_medium_disabled.webp new file mode 100644 index 00000000..9297550d --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_emoji_medium_disabled.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fd2e848c62e4f815092a4a8aff49de09ae528b45ca410926bfe1edaa344ebda +size 12670 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_vibration_high.webp b/game/images/ui/vibrator_interface/vibrator_interface_vibration_high.webp new file mode 100644 index 00000000..cde14c01 --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_vibration_high.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4e81d348016ca6259eaef6df8020f2619b8c47ce1e43d6126eb6386c2da8cb4 +size 3574 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_vibration_low.webp b/game/images/ui/vibrator_interface/vibrator_interface_vibration_low.webp new file mode 100644 index 00000000..478a5ebd --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_vibration_low.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91ebb58fcdbc445e9bb2d7c262fff9765513a2826f6edef53985bc6fa56fe9e0 +size 1274 diff --git a/game/images/ui/vibrator_interface/vibrator_interface_vibration_medium.webp b/game/images/ui/vibrator_interface/vibrator_interface_vibration_medium.webp new file mode 100644 index 00000000..5f51d09c --- /dev/null +++ b/game/images/ui/vibrator_interface/vibrator_interface_vibration_medium.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f447e862cf444c4fb270e2d68156639dcf563ee84209ab350cbfcfca1bc4a596 +size 2606 diff --git a/game/scripts/characters/hermione/events/items/vibrators.rpy b/game/scripts/characters/hermione/events/items/vibrators.rpy index 45d6fca8..cd15a298 100644 --- a/game/scripts/characters/hermione/events/items/vibrators.rpy +++ b/game/scripts/characters/hermione/events/items/vibrators.rpy @@ -2388,12 +2388,16 @@ label hg_vibrators_public_return: $ _vibrator_medium = False $ _vibrator_high = False + show vibrator_interface zorder 20 + # First choice menu: "\"(Right up to the high setting!)\"": $ _vibrator_high = True $ _vibrator_last = "high" + show vibrator_interface vibration_high high_disabled + # Worst option # Xray turns active once player picks this option, Vibrator shakes, etc. @@ -2464,6 +2468,8 @@ label hg_vibrators_public_return: $ _vibrator_medium = True $ _vibrator_last = "medium" + show vibrator_interface vibration_medium medium_disabled + show her_vibrators_public eyebrows_surprised eyes_forward mouth_shocked underwear as xray_child show her_vibrators_public_proxy eyebrows_surprised eyes_forward mouth_shocked as xray_overlay @@ -2530,6 +2536,8 @@ label hg_vibrators_public_return: $ _vibrator_low = True $ _vibrator_last = "low" + show vibrator_interface vibration_low low_disabled + show her_vibrators_public eyebrows_worried mouth_open underwear as xray_child show her_vibrators_public_proxy eyebrows_worried mouth_open as xray_overlay @@ -2624,12 +2632,16 @@ label hg_vibrators_public_return: gen "That's when I--" ("base", xpos="far_left", ypos="head") + show vibrator_interface + # Second choice menu: "\"(Turned it to the high setting!)\"" if not _vibrator_high: # Average option $ _vibrator_high = True + show vibrator_interface vibration_high high_disabled + show her_vibrators_public eyebrows_surprised mouth_shocked eyes_crossed as xray_child show her_vibrators_public_proxy eyebrows_surprised mouth_shocked eyes_crossed as xray_overlay @@ -2770,6 +2782,8 @@ label hg_vibrators_public_return: if _vibrator_last == "high": # Strength was set to high before. + show vibrator_interface vibration_medium medium_disabled + show her_vibrators_public eyebrows_neutral eyes_sad effects_shaky_legs as xray_child show her_vibrators_public_proxy eyebrows_neutral eyes_sad effects_shaky_legs as xray_overlay @@ -2829,6 +2843,8 @@ label hg_vibrators_public_return: "\"(Turned it to the low setting.)\"" if not _vibrator_low: #Best option $ _vibrator_low = True + show vibrator_interface vibration_low low_disabled + show her_vibrators_public eyebrows_neutral eyes_forward mouth_open as xray_child show her_vibrators_public_proxy eyebrows_neutral eyes_forward mouth_open as xray_overlay @@ -2885,12 +2901,16 @@ label hg_vibrators_public_return: $ _vibrator_last = "low" + show vibrator_interface + # Third choice menu: "\"(I Turned it to the high setting!)\"" if not _vibrator_high: $ _vibrator_high = True - if _vibrator_last = "medium": + show vibrator_interface vibration_high high_disabled + + if _vibrator_last == "medium": # Strength was set to medium before. # Vagina is wet @@ -3077,7 +3097,9 @@ label hg_vibrators_public_return: "\"(I Turned it to the medium setting.)\"" if not _vibrator_medium: $ _vibrator_medium = True - if _vibrator_last = "low": + show vibrator_interface vibration_medium medium_disabled + + if _vibrator_last == "low": # Strength was set to low before. # Hermione is denied an orgasm, the boys almost notice. # Vagina is wet @@ -3284,8 +3306,10 @@ label hg_vibrators_public_return: "\"(I Turned it to the low setting.)\""if not _vibrator_low: $ _vibrator_low = True + show vibrator_interface vibration_low low_disabled + # Hermione does not reach orgasm. - if _vibrator_last = "medium": + if _vibrator_last == "medium": # Strength was set to medium before. (worst ending) # Vagina is not wet. @@ -3328,7 +3352,9 @@ label hg_vibrators_public_return: her "The gentle vibrations carried on for quite a while, and didn't stop until the game was almost over." ("base", "base", "base", "mid") her "If I was alone and in a private place, then maybe that would've been enough to push me over, but luckily for me, I managed to keep it together in front of the boys..." ("base", "base", "base", "mid") + hide vibrator_interface hide cg + with fade if not her_vibrators_public_stage == 2: her "Of course, it only lasted until you turned them back on while I was on my way here..." ("base", "base", "base", "mid") diff --git a/game/scripts/interface/vibrator.rpy b/game/scripts/interface/vibrator.rpy new file mode 100644 index 00000000..a75059a9 --- /dev/null +++ b/game/scripts/interface/vibrator.rpy @@ -0,0 +1,52 @@ +transform vibrator_interface_transform: + + zoom 0.4 + align (0.5, 0.0) + + on show: + alpha 0.0 + linear 0.66 alpha 1.0 + pause 4.0 + linear 0.66 alpha 0.0 + + on replace: # New widget + linear 0.66 alpha 1.0 + pause 4.0 + linear 0.66 alpha 0.0 + + on replaced: # Old widget + alpha 0.0 + + on hide: + linear 0.66 alpha 0.0 + +transform vibrator_interface_captions_transform: + pause 1.0 + linear 0.66 alpha 0.0 + +layeredimage vibrator_interface: + fit_first True + + always "vibrator_interface_background" + + group emoji multiple variant "emoji": + attribute low default if_not "low_disabled" + attribute medium default if_not "medium_disabled" + attribute high default if_not "high_disabled" + attribute low_disabled + attribute medium_disabled + attribute high_disabled + + group vibration auto prefix "vibration": + attribute off null default + + at shake + + group caption prefix "caption": + attribute low default + attribute medium default + attribute high default + + at vibrator_interface_captions_transform + + at vibrator_interface_transform