From 82c54c0b57afb4d4ca4b62ce1d4922a4f8789f24 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 13 Sep 2022 22:40:27 +0100 Subject: [PATCH] Image attribute * Added `no_hermione` image attribute * Fixed missing xray effect * Implemented equips for the event (partially) --- game/scripts/cg/hermione.rpy | 39 ++++++++++--------- .../hermione/events/items/vibrators.rpy | 18 ++++----- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/game/scripts/cg/hermione.rpy b/game/scripts/cg/hermione.rpy index 1b8c128f..83ec5c28 100644 --- a/game/scripts/cg/hermione.rpy +++ b/game/scripts/cg/hermione.rpy @@ -81,44 +81,45 @@ layeredimage her_vibrators_public: Fixed("her_vibrators_public_npc_shock_harry", \ "her_vibrators_public_npc_shock_harry_effect") - attribute body default - group blush auto prefix "blush": + attribute no_hermione null + attribute body default if_not "no_hermione" + group blush auto prefix "blush" if_not "no_hermione": attribute neutral default - group tears auto prefix "tears" - group eyes auto prefix "eyes": + group tears auto prefix "tears" if_not "no_hermione" + group eyes auto prefix "eyes" if_not "no_hermione": attribute forward default - group eyebrows auto prefix "eyebrows": + group eyebrows auto prefix "eyebrows" if_not "no_hermione": attribute neutral default - group mouth auto prefix "mouth": + group mouth auto prefix "mouth" if_not "no_hermione": attribute neutral default - attribute hair default + attribute hair default if_not "no_hermione" - group wetness auto prefix "wetness" + group wetness auto prefix "wetness" if_not "no_hermione" - group vibrator_upper multiple variant "vibrator_upper": + group vibrator_upper variant "vibrator_upper" multiple if_not "no_hermione": attribute base default - attribute egg default if_any ["nude" "nobra"] - attribute tape default if_any ["nude" "nobra"] - attribute effect default if_any ["nude" "nobra"] + attribute egg default + attribute tape default + attribute effect default - group vibrator_lower multiple variant "vibrator_lower": + group vibrator_lower variant "vibrator_lower" multiple if_not "no_hermione": attribute base default - attribute egg default if_any ["nude" "nopanties"] - attribute tape default if_any ["nude" "nopanties"] - attribute effect default if_any ["nude" "nopanties"] + attribute egg default + attribute tape default + attribute effect default - group underwear multiple: + group underwear multiple if_not "no_hermione": attribute bra default if_any ["underwear", "nopanties"] attribute panties default if_any ["underwear", "nobra"] - group outfit: + group outfit if_not "no_hermione": attribute uniform default attribute underwear null attribute nobra null attribute nopanties null attribute nude null - group effects auto multiple prefix "effects" + group effects auto multiple prefix "effects" if_not "no_hermione" image her_vibrators_public_proxy = LayeredImageProxy("her_vibrators_public") image her_vibrators_public_xray = Xray("her_vibrators_public", "her_vibrators_public_proxy", radius=0.18) diff --git a/game/scripts/characters/hermione/events/items/vibrators.rpy b/game/scripts/characters/hermione/events/items/vibrators.rpy index 80bf9f72..571e34d8 100644 --- a/game/scripts/characters/hermione/events/items/vibrators.rpy +++ b/game/scripts/characters/hermione/events/items/vibrators.rpy @@ -1969,6 +1969,10 @@ label hg_vibrators_public_return: # TODO set clothing again as it will reset if sheduling is turned on, Do not use her_outfit_last.save() as that should've been done at the start # TODO Hermione enters office in her school clothing and walks to front of desk + + $ hermione.equip(her_outfit_default) + $ hermione.equip(her_bottom_school3) + call her_walk("desk", "base", action="enter") if her_tier_public >= 5: @@ -2174,7 +2178,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 as xray_child # Controls the bottom layer of the Xray CG + show her_vibrators_public nude 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 @@ -2254,7 +2258,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 as xray_child # Controls the bottom layer of the Xray CG + show her_vibrators_public nude 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 @@ -2907,10 +2911,8 @@ label hg_vibrators_public_return: her "Their voices brought me back to reality, and I finally took in my surroundings, realising the situation I was in, but it was too late." - show screen blkfade - with d8 - - #TODO hide CG Hermione completely + show her_vibrators_public no_hermione as xray_child + show her_vibrators_public_proxy no_hermione as xray_overlay her "My legs finally buckled, as orgasm, after orgasm had finally took its toll on my body." her "My friends seeing this, yelped out in shock, calling my name again." @@ -2918,9 +2920,7 @@ label hg_vibrators_public_return: her "The only thing I could remember before passing out were the vibrators, finally coming to a stop..." hide cg - - hide screen blkfade - with d3 + with fade gen "That's one hell of an orgasm... And here I thought I took that crown." ("base", xpos="far_left", ypos="head") gen "So, is this like a bad ending or what?" ("base", xpos="far_left", ypos="head")