diff --git a/game/scripts/characters/astoria/chibi.rpy b/game/scripts/characters/astoria/chibi.rpy index 998d3804..525b1c8e 100644 --- a/game/scripts/characters/astoria/chibi.rpy +++ b/game/scripts/characters/astoria/chibi.rpy @@ -22,7 +22,7 @@ label ast_chibi(action=None, xpos=None, ypos=None, flip=False): return label ast_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy index 55180a6e..7894b22d 100644 --- a/game/scripts/characters/astoria/events/intro.rpy +++ b/game/scripts/characters/astoria/events/intro.rpy @@ -91,7 +91,7 @@ label astoria_intro_E1: pause.2 # Tonks walks over. - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d3 @@ -778,7 +778,7 @@ label astoria_intro_E3: # Astoria leaves. stop music fadeout 1 - call hide_characters + scene onlayer dolls call ast_chibi("stand","desk","base", flip=True) hide screen bld1 with d3 diff --git a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy index ce5a08ab..bd70759d 100644 --- a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy +++ b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy @@ -129,7 +129,7 @@ label ag_se_imperio_sb_E1: hide susan_main ast "IMPERIO!" ("scream", "base", "angry", "mid") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -231,7 +231,7 @@ label ag_se_imperio_sb_E1: pause.2 stop music fadeout 1 - call hide_characters + scene onlayer dolls call ast_chibi("reset",530,"base") hide screen bld1 with fade @@ -304,7 +304,7 @@ label ag_se_imperio_sb_E1: call sus_chibi("leave") - call hide_characters + scene onlayer dolls call ast_chibi("stand","door","base", flip=True) pause .3 call ast_chibi("leave") @@ -332,7 +332,7 @@ label ag_se_imperio_sb_E2: gen "..." ("base", xpos="far_left", ypos="head") ast "..." ("annoyed", "base", "base", "R") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 call sus_walk(action="enter") @@ -346,7 +346,7 @@ label ag_se_imperio_sb_E2: gen "Come up here for a moment Miss Bones..." ("base", xpos="far_left", ypos="head") sus "Okay..." ("open", "base", "base", "mid") - call hide_characters + scene onlayer dolls with d3 call sus_walk("desk") @@ -378,7 +378,7 @@ label ag_se_imperio_sb_E2: hide susan_main ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -594,7 +594,7 @@ label ag_se_imperio_sb_E2: pause 1 stop music fadeout 1 - call hide_characters + scene onlayer dolls call ast_chibi("reset",530,"base") pause .5 call ast_walk("door","base") @@ -617,7 +617,7 @@ label ag_se_imperio_sb_E2: gen "Good night." ("base", xpos="far_left", ypos="head") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call ast_chibi("hide") call gen_chibi("sit_behind_desk") hide screen bld1 @@ -639,7 +639,7 @@ label ag_se_imperio_sb_E3: stop music fadeout 1 - call hide_characters + scene onlayer dolls with d3 call sus_walk(action="enter") pause.2 @@ -669,7 +669,7 @@ label ag_se_imperio_sb_E3: hide susan_main ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -776,7 +776,7 @@ label ag_se_imperio_sb_E3: sus "..." ("base", "base", "base", "mid") ast "Now go, [name_susan_astoria]!" ("grin", "narrow", "angry", "mid") - call hide_characters + scene onlayer dolls call sus_chibi("hide") show screen blkfade with d3 @@ -991,7 +991,7 @@ label ag_se_imperio_sb_E3: stop music fadeout 1 - call hide_characters + scene onlayer dolls pause .5 call ast_walk("door","base") pause.2 @@ -1004,7 +1004,7 @@ label ag_se_imperio_sb_E3: call sus_walk(action="leave") - call hide_characters + scene onlayer dolls call ast_chibi("leave") hide screen bld1 with d3 diff --git a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy index 7855d3d0..e6186153 100644 --- a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy +++ b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy @@ -71,7 +71,7 @@ label ag_st_imperio: ast "Until then, [name_genie_astoria]!" ("smile", "base", "base", "R") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call ast_walk(action="leave") hide screen bld1 with d3 @@ -89,7 +89,7 @@ label ag_st_imperio: jump end_astoria_event label end_ag_st_imperio: - call hide_characters + scene onlayer dolls hide screen bld1 with d3 @@ -186,7 +186,7 @@ label ag_st_imperio_E1: stop music fadeout 2.0 ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -262,7 +262,7 @@ label ag_st_imperio_E1: # Tonks reverts back. pause.2 - call hide_characters + scene onlayer dolls call ast_chibi("reset",530,"base") hide screen bld1 with fade @@ -336,7 +336,7 @@ label ag_st_imperio_E2: stop music fadeout 2.0 ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -438,7 +438,7 @@ label ag_st_imperio_E2: ast "Fine..." ("annoyed", "narrow", "angry", "R") # Tonks returns to normal - call hide_characters + scene onlayer dolls call ton_chibi("stand","desk","base", flip=False) call ast_chibi("reset",530,"base") with fade @@ -472,7 +472,7 @@ label ag_st_imperio_E2: stop music fadeout 2.0 ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -518,7 +518,7 @@ label ag_st_imperio_E2: # Tonks returns to normal. pause.2 - call hide_characters + scene onlayer dolls call ton_chibi("stand","desk","base", flip=False) call ast_chibi("reset",530,"base") hide screen bld1 @@ -618,7 +618,7 @@ label ag_st_imperio_E2: # Tonks returns to normal. pause.2 - call hide_characters + scene onlayer dolls call ast_chibi("reset",530,"base") hide screen bld1 with fade @@ -705,7 +705,7 @@ label ag_st_imperio_E3: stop music fadeout 2.0 ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -922,7 +922,7 @@ label ag_st_imperio_E4: stop music fadeout 2.0 ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -953,7 +953,7 @@ label ag_st_imperio_E4: ton "*Hmm*... Yes!" ("base", "base", "worried", "stare") # Tonks turns around - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.1 @@ -1092,7 +1092,7 @@ label ag_st_imperio_E4: ast "..." ("clench", "narrow", "worried", "down") #embarrased # Astoria leaves and spell fades - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.5 @@ -1214,7 +1214,7 @@ label ag_st_imperio_E5: stop music fadeout 2.0 ast "Imperio...{w=0.8}{nw}" ("open", "closed", "base", "mid") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -1343,7 +1343,7 @@ label ag_st_imperio_E5: menu: "-Start masturbating!-": $ states.gen.masturbating = True - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -1368,7 +1368,7 @@ label ag_st_imperio_E5: ton @ hair horny "Yes...{heart}" ("grin", "wink", "base", "mid") # Climb desk and dance. - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -1390,7 +1390,7 @@ label ag_st_imperio_E5: ton "" ("horny", "base", "raised", "down", xpos="mid", ypos="base") ast "Move your hips!" ("open", "narrow", "base", "L") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.1 @@ -1409,7 +1409,7 @@ label ag_st_imperio_E5: ast "Look how easy it is, Professor!" ("smile", "closed", "base", "mid", emote="hearts",trans=hpunch) nar "Astoria joyfully jumps up and down on the spot, making a happy squeal..." - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.1 @@ -1453,7 +1453,7 @@ label ag_st_imperio_E5: ast "..." ("horny", "base", "worried", "mid") ton "............." ("base", "base", "shocked", "down", emote="hearts") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 #show screen blkfade diff --git a/game/scripts/characters/cho/chibi.rpy b/game/scripts/characters/cho/chibi.rpy index 95f68bab..e4bc745c 100644 --- a/game/scripts/characters/cho/chibi.rpy +++ b/game/scripts/characters/cho/chibi.rpy @@ -22,7 +22,7 @@ label cho_chibi(action=None, xpos=None, ypos=None, flip=False): return label cho_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy index a3d8370e..192e0ff2 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy @@ -417,7 +417,7 @@ label cc_pf_strip_T2_intro_E2: cho "Like I said, I'd go to any lengths just to please my trainer..." ("soft", "narrow", "base", "mid") # Climbs desk. - call hide_characters + scene onlayer dolls show screen blkfade with d5 play sound "sounds/08_hop_on_desk.ogg" @@ -691,7 +691,7 @@ label cc_pf_strip_T2_intro_E2: gen "That's great news, and hey..." ("base", xpos="far_left", ypos="head") gen "If distracting doesn't work, you could just crush your opponents with those thighs of yours." ("base", xpos="far_left", ypos="head") cho "That's true..." ("smile", "narrow", "base", "mid") - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -710,7 +710,7 @@ label cc_pf_strip_T2_intro_E2: gen "I doubt you'll have any problems distracting anyone with a body like that." ("base", xpos="far_left", ypos="head") gen "You're dismissed." ("base", xpos="far_left", ypos="head") cho "Thank you, [name_genie_cho]." ("base", "happyCl", "base", "mid") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .1 @@ -865,7 +865,7 @@ label cc_pf_strip_T2_intro_E3: gen "Aren't you scared that Snape might walk in on you too?" ("base", xpos="far_left", ypos="head") cho "*Hmm*..." ("annoyed", "base", "base", "R") - call hide_characters + scene onlayer dolls show screen blkfade with d3 play sound "sounds/08_hop_on_desk.ogg" @@ -900,7 +900,7 @@ label cc_pf_strip_T2_intro_E3: cho @ cheeks heavy_blush "What if Professor McGonagall stumbles in here while...{w} while I--" ("angry", "happyCl", "worried", "mid") - call hide_characters + scene onlayer dolls show screen blkfade with d3 pause 1.0 @@ -1091,7 +1091,7 @@ label cc_pf_strip_T2_E3_repeat: $ d_flag_01 = True cho "Good idea, [name_genie_cho]!" ("base", "happyCl", "base", "mid") - call hide_characters + scene onlayer dolls show screen blkfade with d3 play sound "sounds/08_hop_on_desk.ogg" @@ -1106,7 +1106,7 @@ label cc_pf_strip_T2_E3_repeat: cho "How is the view down there, Sir?" ("base", "narrow", "base", "down") gen "Couldn't be any better!" ("grin", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -1129,7 +1129,7 @@ label cc_pf_strip_T2_E3_repeat: cho "(...)" ("annoyed", "narrow", "angry", "L") gen "(...)" ("base", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .5 diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy index e7da91e8..5ed2b322 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy @@ -241,7 +241,7 @@ label cc_pf_strip_T2_E3_hermione_choices: call her_walk(action="leave") # Cho stands close to your desk. - call hide_characters + scene onlayer dolls show screen blkfade call cho_chibi("stand", "desk", "base", flip=True) with d3 diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy index 94cac796..df865a03 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy @@ -45,7 +45,7 @@ label cc_pf_strip_T3_intro_E1: # Cho hops on your desk. - call hide_characters + scene onlayer dolls show screen blkfade with d5 play sound "sounds/08_hop_on_desk.ogg" @@ -156,7 +156,7 @@ label cc_pf_strip_T3_intro_E1: cho "Although, to tell you a secret..." ("soft", "closed", "base", "mid") # mirror sprite - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -179,7 +179,7 @@ label cc_pf_strip_T3_intro_E1: pause .2 # mirror sprite - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -254,7 +254,7 @@ label cc_pf_strip_T3_intro_E1: cho "Yes, [name_genie_cho]." ("base", "happyCl", "base", "mid") # Cho hops off your desk. - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -300,7 +300,7 @@ label cc_pf_strip_T3_intro_E2: gen "You might want to change into your school clothing before she gets here..." ("base", xpos="far_left", ypos="head") cho "Of course." ("base", "happyCl", "base", "mid") - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -334,7 +334,7 @@ label cc_pf_strip_T3_intro_E2: cho "Yes, [name_genie_cho]." ("base", "narrow", "base", "mid") stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -418,7 +418,7 @@ label cc_pf_strip_T3_intro_E2: # Cho starts stripping. stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -646,7 +646,7 @@ label cc_pf_strip_T3_intro_E2: ton @ hair horny "*Hmm*... Or is that snitch of yours going to dart off after all?" ("soft", "narrow", "base", "down") cho @ cheeks blush "" ("angry", "happyCl", "worried", "mid") gen "(I sure hope the desk is sturdy enough...)" ("base", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -712,7 +712,7 @@ label cc_pf_strip_T3_intro_E2: # Snape enters. stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 with d3 @@ -857,7 +857,7 @@ label cc_pf_strip_T3_intro_E2: sna "Now, if you'll excuse me..." ("snape_09") sna "I'll leave you three to indulge further in your...{w=0.8} debaucheries..." ("snape_47") cho "No! You stay where you are!" ("scream", "base", "angry", "L") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -919,7 +919,7 @@ label cc_pf_strip_T3_intro_E2: cho "*Hmph*..." ("annoyed", "base", "angry", "L") gen "(...)" ("base", xpos="far_left", ypos="head") stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .1 @@ -974,7 +974,7 @@ label cc_pf_strip_T3_intro_E2: ton @ hair horny "Let me escort you back to your common room. It's getting late." ("soft", "base", "base", "L") # Fade to black. - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -1057,7 +1057,7 @@ label cc_pf_strip_T3_intro_E3: gen "Wait here at my desk while I summon your Teacher." ("base", xpos="far_left", ypos="head") cho @ cheeks blush "Yes, [name_genie_cho]." ("soft", "narrow", "worried", "R") - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -1167,7 +1167,7 @@ label cc_pf_strip_T3_intro_E3: ton @ hair horny "Now, after you..." ("horny", "narrow", "base", "L") # Cho and Tonks hop onto the desk. - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -1275,7 +1275,7 @@ label cc_pf_strip_T3_intro_E3: cho @ cheeks heavy_blush "*Ehm*... Y-Yes. Of course..." ("soft", "narrow", "worried", "L") # Tonks' sprite moves in front of Cho, both are facing Genie. - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .5 @@ -1514,7 +1514,7 @@ label cc_pf_strip_T3_intro_E3: ton @ hair horny "Fucking perfect {heart} aren't they, Professor?..." ("horny", "narrow", "base", "mid") ton @ hair horny "Move next to me, Cho. I need you to stand -- right here {heart}{heart}{heart}" ("open", "base", "base", "downR") cho @ cheeks heavy_blush "*Ehm*... yes, Professor." ("soft", "narrow", "worried", "L") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .5 @@ -3005,7 +3005,7 @@ label cc_pf_strip_T3_intro_E3: ton @ hair horny "*Sigh*... Alright..." ("open", "closed", "shocked", "mid") # Fade to black. - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy index 7a62b5a7..ee5b0616 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy @@ -4,7 +4,7 @@ label cc_pf_strip_T3_tonks: # Setup - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -66,7 +66,7 @@ label cc_pf_strip_T3_tonks: cho "Yes, [name_genie_cho]." ("base", "base", "base", "mid") stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -140,7 +140,7 @@ label cc_pf_strip_T3_tonks: stop music fadeout 1 # Cho and Tonks hop onto the desk. - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -205,7 +205,7 @@ label .strip_cho: ton @ hair horny "Move between us, Cho." ("soft", "narrow", "shocked", "L") ton @ hair horny "That way the headmaster can see you better." ("base", "narrow", "base", "mid") cho @ cheeks blush "Yes, Professor." ("smile", "narrow", "base", "L") - call hide_characters + scene onlayer dolls hide screen bld1 with d5 pause .2 @@ -487,7 +487,7 @@ label .strip_tonks: ton @ hair horny "I'd like to give the headmaster a better view of my body." ("base", "narrow", "base", "mid") cho @ cheeks blush "Not at all, Professor." ("smile", "narrow", "base", "L") ton @ hair horny "Thank you, [name_cho_tonks]." ("soft", "narrow", "shocked", "L") - call hide_characters + scene onlayer dolls hide screen bld1 with d5 pause .2 @@ -1389,7 +1389,7 @@ label .end_event: # Fade to black. stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 diff --git a/game/scripts/characters/cho/events/favors/talk_to_me.rpy b/game/scripts/characters/cho/events/favors/talk_to_me.rpy index a52e9515..220bd71b 100644 --- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy @@ -566,7 +566,7 @@ label cc_pf_talk_T1_E3: gen "*Fuck!* {size=-4}(That did it!!!){/size}" ("angry", xpos="far_left", ypos="head") # Genie cums. - call hide_characters + scene onlayer dolls hide screen bld1 with d3 @@ -583,7 +583,7 @@ label cc_pf_talk_T1_E3: gen "{size=-4}(I bet you are so wet right now too!){/size}" ("angry", xpos="far_left", ypos="head") # Genie finished. - call hide_characters + scene onlayer dolls call gen_chibi("cum_behind_desk_done") with d3 pause .8 @@ -785,7 +785,7 @@ label cc_pf_talk_T2_intro_E1: # Genie cums. gen "{size=-4}(Yes! Yes!{w=0.6} It's coming!){/size}" ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls call cum_block call gen_chibi("cum_behind_desk") @@ -993,7 +993,7 @@ label cc_pf_talk_T2_intro_E2: # Genie cums. gen "{size=-2}Yes, yes! You nasty slut!{/size}" ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 @@ -1021,7 +1021,7 @@ label cc_pf_talk_T2_intro_E2: gen "{size=-4}(I'm busted!){/size}" ("angry", xpos="far_left", ypos="head") # Genie stops. - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -1226,7 +1226,7 @@ label cc_pf_talk_T2_E3: gen "*Fuck!* {size=-4}(Come on! Unload! Before it's too late!!!){/size}" ("angry", xpos="far_left", ypos="head") # Genie cums. - call hide_characters + scene onlayer dolls hide screen bld1 with d3 diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index 074449a0..a9b5b7e2 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -188,7 +188,7 @@ label cho_intro_E1: # Hermione walks in stop music fadeout 1.0 - call hide_characters + scene onlayer dolls play sound "sounds/door.ogg" call her_chibi("stand", "door", "base") @@ -224,7 +224,7 @@ label cho_intro_E1: # Choice to start jerking off menu: "\"(I will jerk off a little while they talk.)\"": - call hide_characters + scene onlayer dolls with d3 pause .2 @@ -281,7 +281,7 @@ label cho_intro_E1: gen "{size=-4}You fucking sluts!{/size}" ("angry", xpos="far_left", ypos="head") # Genie cums - call hide_characters + scene onlayer dolls with d3 call cum_block @@ -332,7 +332,7 @@ label cho_intro_E1: gen "(I guess I'll just have to wait this one out...)" ("base", xpos="far_left", ypos="head") # Black screen - call hide_characters + scene onlayer dolls call blkfade pause 2 diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index f0da91ca..8e469c96 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -84,7 +84,7 @@ label hufflepuff_match: gen "Well... I wouldn't mind that." ("base", xpos="far_left", ypos="head") sna "I'm sure you wouldn't..." ("snape_06") sna "Good thing though is that we'll be able to bring a little something to keep us occupied." ("snape_20") - call hide_characters + scene onlayer dolls with d3 # Show wine diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 60444cab..00e5769f 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -635,7 +635,7 @@ label cho_quid_E7: her "[name_genie_hermione], you can't do this!" ("open", "base", "angry", "mid") gen "Sure I can." ("grin", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls nar "You telepathically call Cho into your office." if states.her.tier < 4: # Hermione changes into her school outfit diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index 153f20ac..ef79fdf6 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -136,7 +136,7 @@ label slytherin_match: gen "We certainly shall!" ("grin", xpos="far_left", ypos="head") stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 with d3 @@ -451,7 +451,7 @@ label slytherin_match: sly1 "{size=+15}Boooo!{/size}" her "*Hmph*!" ("annoyed", "narrow", "angry", "mid") - call hide_characters + scene onlayer dolls with d3 pause .2 call her_chibi(flip=False) @@ -631,7 +631,7 @@ label slytherin_match: play sound "sounds/ball_hit.ogg" her "Ravenclaw would have no issues beating the ever living sh--{w=2.0}{nw}" ("angry", "narrow", "angry", "L") - call hide_characters + scene onlayer dolls with d3 pause .2 @@ -673,7 +673,7 @@ label slytherin_match: stop music fadeout 1 pause .5 - call hide_characters + scene onlayer dolls $ snape_chibi.zorder = 1 $ hermione_chibi.zorder = 3 $ tonks_chibi.zorder = 2 @@ -730,7 +730,7 @@ label slytherin_match: ton "Leave it to me..." ("open", "base", "angry", "mid") gen "What?" ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls call ton_chibi(flip=True) with d3 pause .1 @@ -977,7 +977,7 @@ label slytherin_match: #TODO Spotlights Off, pause, genie leaves podium play sound "sounds/footsteps.ogg" - call hide_characters + scene onlayer dolls with d3 pause .5 @@ -1081,7 +1081,7 @@ label slytherin_match: # Section where genie goes up and touches Hermione (Tonks) under her skirt show screen blktone - call hide_characters + scene onlayer dolls with d3 sna "{size=-4}You know... Tonks isn't here right now...{/size}" ("snape_05") @@ -1335,7 +1335,7 @@ label slytherin_match: gen "You put the cup in your office?" ("base", xpos="far_left", ypos="head") # Fade to black - call hide_characters + scene onlayer dolls show screen blkfade with d5 pause .8 @@ -1525,7 +1525,7 @@ label slytherin_match_return: # Cho enters stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 with d3 @@ -1554,7 +1554,7 @@ label slytherin_match_return: # Cho walks out and slams the door stop music fadeout 1 - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause .2 @@ -1583,7 +1583,7 @@ label slytherin_match_return: # Tonks turns back into herself #TODO Should the naked version only happen if you've done Imperio Training maybe? play sound "sounds/magic4.ogg" - call hide_characters + scene onlayer dolls call her_chibi("hide") call ton_chibi("stand", "desk", "base", flip=False) ton "" ("base", "base", "base", "mid", xpos="mid", ypos="base", flip=False, trans=morph) @@ -1626,7 +1626,7 @@ label slytherin_match_return: # Tonks turns into cho play sound "sounds/magic4.ogg" play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call ton_chibi("hide") call cho_chibi("stand", "desk", "base", flip=False) cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", flip=False, trans=morph) @@ -1640,14 +1640,14 @@ label slytherin_match_return: # Tonks turns into Astoria play sound "sounds/magic4.ogg" play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call cho_chibi("hide") call ast_chibi("stand", "desk", "base", flip=False) ast "How about giving this little butt a spanking?" ("smile", "base", "base", "mid", xpos="mid", ypos="base", flip=False, trans=morph) play sound "sounds/magic4.ogg" play music "music/teddy-bear-waltz-by-kevin-macleod.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call cho_chibi("hide") call ast_chibi("hide") call sus_chibi("stand", "desk", "base", flip=False) @@ -1663,7 +1663,7 @@ label slytherin_match_return: # Tonks Turns into Susan play sound "sounds/magic4.ogg" play music "music/teddy-bear-waltz-by-kevin-macleod.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call cho_chibi("hide") call ast_chibi("hide") call sus_chibi("stand", "desk", "base", flip=False) @@ -1681,7 +1681,7 @@ label slytherin_match_return: play sound "sounds/magic4.ogg" play music "music/wallpaper-by-kevin-macleod.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call cho_chibi("hide") call ast_chibi("hide") call sus_chibi("hide") @@ -1697,7 +1697,7 @@ label slytherin_match_return: play sound "sounds/magic4.ogg" play music "music/Dark Fog.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call cho_chibi("hide") call ast_chibi("hide") call sus_chibi("hide") @@ -1716,7 +1716,7 @@ label slytherin_match_return: # Tonks turns into herself play sound "sounds/magic4.ogg" play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls call sna_chibi("hide") call ton_chibi("stand", "desk", "base", flip=False) ton "" ("base", "base", "base", "mid", xpos="mid", ypos="base", flip=False, trans=morph) diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy index 99501605..df79d09f 100644 --- a/game/scripts/characters/cho/events/quidditch/training.rpy +++ b/game/scripts/characters/cho/events/quidditch/training.rpy @@ -21,7 +21,7 @@ label cho_training: # Setup show screen blkfade - call hide_characters + scene onlayer dolls with d5 $ cho_outfit_last.save() @@ -409,7 +409,7 @@ label cho_tactics: # Menu label .choices: - call hide_characters + scene onlayer dolls call bld menu (menu_yalign=.74): diff --git a/game/scripts/characters/genie/chibi.rpy b/game/scripts/characters/genie/chibi.rpy index f718c99e..b3b7c5d1 100644 --- a/game/scripts/characters/genie/chibi.rpy +++ b/game/scripts/characters/genie/chibi.rpy @@ -77,7 +77,7 @@ label gen_chibi(action=None, xpos=None, ypos=None, flip=True, pic=None): return label gen_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 diff --git a/game/scripts/characters/hermione/chibi.rpy b/game/scripts/characters/hermione/chibi.rpy index 07b26c43..895b4f2e 100644 --- a/game/scripts/characters/hermione/chibi.rpy +++ b/game/scripts/characters/hermione/chibi.rpy @@ -25,7 +25,7 @@ label her_chibi(action=None, xpos=None, ypos=None, flip=False, pic=None): return label her_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 @@ -148,7 +148,7 @@ init python: # Sets up a chibi scene with Hermione and Genie in it label her_chibi_scene(action="reset", xpos="mid", ypos="base", trans=None): if trans is not None: - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blkfade diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy index ff97d1ec..fb302dcd 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy @@ -21,7 +21,7 @@ label end_hg_pf_strip: # Setup stop music fadeout 1.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -439,7 +439,7 @@ label hg_pf_strip_T3_intro_E2: gen ".............." ("base", xpos="far_left", ypos="head") her "Ha! Might as well do this the proper way!" ("angry", "base", "angry", "mid") - call hide_characters + scene onlayer dolls with d3 pause.2 @@ -685,7 +685,7 @@ label hg_pf_strip_T3_intro_E2: sna "Miss Granger..." ("snape_13") her "................................." ("angry", "happyCl", "worried", "mid") - call hide_characters + scene onlayer dolls with fade pause.2 @@ -764,7 +764,7 @@ label hg_pf_strip_T3_E2: pass # Locks Door. - call hide_characters + scene onlayer dolls with d3 pause.5 @@ -913,7 +913,7 @@ label hg_pf_strip_T3_watch: call her_chibi("sit_naked","on_desk","on_desk") - call hide_characters + scene onlayer dolls hide screen blkfade with d5 call ctc @@ -1069,7 +1069,7 @@ label hg_pf_strip_T4: else: her "(How boring...)" ("annoyed", "narrow", "annoyed", "R") - call hide_characters + scene onlayer dolls with d3 pause.5 @@ -1342,7 +1342,7 @@ label hg_pf_strip_T4_watch: nar "Completely exhausted, Hermione slumps down onto her butt." nar "You watch her in silence for a couple of moments, until she's finally managed to catch her breath..." - call hide_characters + scene onlayer dolls hide screen blkfade with d5 call ctc diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy index 94d0fa36..56d598d6 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy @@ -425,7 +425,7 @@ label hg_pf_strip_T4_snape_masturbate: $ _masturbate = True play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed - call hide_characters + scene onlayer dolls show screen blkfade with d5 pause.2 @@ -461,7 +461,7 @@ label hg_pf_strip_T4_snape_masturbate: with d3 pause.2 sna "I see Miss Granger has managed to remain exceptionally stubborn in every situation..." ("snape_03") - call hide_characters + scene onlayer dolls with d5 call gen_chibi("sit_behind_desk") @@ -477,7 +477,7 @@ label hg_pf_strip_T4_snape_masturbate: her @ cheeks blush "...{w}...{w}{nw}" ("angry", "happyCl", "worried", "mid") her @ cheeks blush "......{fast} No, I can't! This is just not worth it!" ("disgust", "happyCl", "worried", "stare") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -521,7 +521,7 @@ label hg_pf_strip_T4_snape_masturbate: her @ cheeks blush "I do not mind it at all..." ("soft", "closed", "worried", "mid", emote="sweat") sna "Right..." ("snape_01") - call hide_characters + scene onlayer dolls play sound "sounds/MaleClearThroat.ogg" gen "*clears throat*" @@ -588,7 +588,7 @@ label hg_pf_strip_T4_snape_masturbate: call her_chibi("sit_naked","on_desk","on_desk") - call hide_characters + scene onlayer dolls hide screen blkfade with d5 call ctc @@ -658,7 +658,7 @@ label hg_pf_strip_T4_snape_masturbate: her "I cannot believe this!" ("clench", "base", "angry", "mid", emote="angry") pause.5 - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -770,7 +770,7 @@ label hg_pf_strip_T4_snape_watch: call her_chibi("sit_naked","on_desk","on_desk") - call hide_characters + scene onlayer dolls hide screen blkfade with d5 call ctc @@ -823,7 +823,7 @@ label hg_pf_strip_T4_snape_results: $ hermione.set_cum(None) $ hermione.wear("all") - call hide_characters + scene onlayer dolls call her_chibi("stand","desk","base", flip=False) diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy index e881ddee..86f3db8d 100644 --- a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy +++ b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy @@ -24,7 +24,7 @@ label end_hg_pf_handjob: # Setup stop music fadeout 1.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -306,7 +306,7 @@ label hg_pf_handjob_T5_repeat: label hg_pf_handjob_1: $ states.her.status.handjob = True stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -662,7 +662,7 @@ label hg_pf_handjob_1: her "What other choice do I have?" ("angry", "narrow", "base", "down") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -708,7 +708,7 @@ label hg_pf_handjob_1: her "......................." ("angry", "wide", "base", "stare") gen "Finally...{w=0.4} I Feel so much better now..." ("base", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -753,7 +753,7 @@ label hg_pf_handjob_1: label hg_pf_handjob_2: stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -1173,7 +1173,7 @@ label hg_pf_handjob_2_cumming: her ".............." ("base", "narrow", "worried", "down") call ctc - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -1244,7 +1244,7 @@ label hg_pf_handjob_2_cumming: her @ cheeks blush ".............." ("base", "narrow", "worried", "down") call ctc - call hide_characters + scene onlayer dolls show screen blkfade with d5 diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy index 860f08d2..a75b3c68 100644 --- a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy +++ b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy @@ -24,7 +24,7 @@ label end_hg_pf_titjob: # Setup stop music fadeout 1.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -338,7 +338,7 @@ label hg_pf_titjob_T6_repeat: label hg_pf_titjob_1: stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -731,7 +731,7 @@ label hg_pf_titjob_1: label hg_pf_titjob_2: stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/hermione/events/favors/grope_her.rpy b/game/scripts/characters/hermione/events/favors/grope_her.rpy index f177f87f..2c734993 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her.rpy @@ -24,7 +24,7 @@ label end_hg_pf_grope: # Setup stop music fadeout 1.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy index 16bc692d..b53e3138 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy @@ -140,7 +140,7 @@ label hg_pf_grope_breasts_T3: # Hermione gets mad if you slap them. her "What girl in her right mind would like to be treated this way?" ("angry", "narrow", "annoyed", "mid") stop music fadeout 2.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/hermione/events/favors/hg_pf_T3a_look_at_ass_INCOMPLETE.txt b/game/scripts/characters/hermione/events/favors/hg_pf_T3a_look_at_ass_INCOMPLETE.txt index 15d9e5f5..d7d62d8a 100644 --- a/game/scripts/characters/hermione/events/favors/hg_pf_T3a_look_at_ass_INCOMPLETE.txt +++ b/game/scripts/characters/hermione/events/favors/hg_pf_T3a_look_at_ass_INCOMPLETE.txt @@ -210,7 +210,7 @@ label hg_pf_look_at_ass: #LV.3 (Whoring = 9 - 11) label hg_show_ass: label hg_pr_strip_rear_transition: - call hide_characters + scene onlayer dolls show screen blkfade with d5 call play_sound("climb_desk") @@ -306,7 +306,7 @@ label hg_pr_strip_T2_grope_rear: her "[genie_name], I didn't agree to this!" ("angry", "base", "angry", "mid", cheeks="blush") with hpunch her "You must let go of me now!!!" ("scream", "base", "angry", "mid", cheeks="blush", emote="angry") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -338,7 +338,7 @@ label hg_pr_strip_T2_grope_rear: label hg_pr_strip_T2_masturbate_rear: - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -470,7 +470,7 @@ label hg_pr_strip_T3_grope_rear: gen "So you admit that it does feel good." ("base", xpos="far_left", ypos="head") call play_music("chipper_doodle") # HERMIONE'S THEME. her "Please, let go of me now!" ("annoyed", "narrow", "angry", "R", cheeks="blush") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -508,7 +508,7 @@ label hg_pr_strip_T3_grope_rear: label hg_pr_strip_T3_masturbate_rear: - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -653,7 +653,7 @@ label hg_pr_strip_T4_grope_rear: her "am late to bed... It is getting very... late..." ("open", "base", "base", "R", cheeks="blush") gen "Well, alright..." ("base", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls show screen blkfade with d5 @@ -686,7 +686,7 @@ label hg_pr_strip_T4_grope_rear: label hg_pr_strip_T4_masturbate_rear: - call hide_characters + scene onlayer dolls show screen blkfade with d5 diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy index 315b9472..2532b6c2 100644 --- a/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy +++ b/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy @@ -24,7 +24,7 @@ label end_hg_pf_admire_panties: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -146,7 +146,7 @@ label hg_pf_admire_panties_T1: # Call label $ states.her.status.show_panties = True - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): @@ -229,7 +229,7 @@ label hg_pf_admire_panties_T2: # Call label $ states.her.status.show_panties = True - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): @@ -300,7 +300,7 @@ label hg_pf_admire_panties_T3_intro_E1: gen "We'll see..." ("base", xpos="far_left", ypos="head") her "Right..." ("angry", "narrow", "base", "down") - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): @@ -410,7 +410,7 @@ label hg_pf_admire_panties_T3_E1: gen "*Hmm*... We'll see..." ("base", xpos="far_left", ypos="head") her "Alright..." ("open", "squint", "base", "mid") - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): @@ -522,7 +522,7 @@ label hg_pf_admire_panties_T4_intro_E1: gen "Yes [name_hermione_genie]... Get up here will you..." ("base", xpos="far_left", ypos="head") her @ cheeks blush "Oh, Okay..." ("base", "narrow", "base", "down") - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): @@ -622,7 +622,7 @@ label hg_pf_admire_panties_T4_E1: her "Oh..." ("open", "narrow", "worried", "down") her @ cheeks blush "Well, that might be an issue..." ("base", "narrow", "base", "down") - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): @@ -744,7 +744,7 @@ label hg_pf_admire_panties_T4_E2: her "Oh..." ("open", "narrow", "worried", "down") her @ cheeks blush "Okay..." ("base", "narrow", "base", "down") - call hide_characters + scene onlayer dolls with d3 if hermione.is_any_worn("robe", "accessory"): diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy index 62b5181e..17faf984 100644 --- a/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy +++ b/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy @@ -20,7 +20,7 @@ label end_hg_pf_admire_breasts: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -189,7 +189,7 @@ label hg_pf_admire_breasts_T1_intro_E1: her "Sir, I would like to have my points now." ("open", "closed", "angry", "mid") gen "What? Oh, yes... Of course." ("base", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy index 9d16b35d..ab85cd8e 100644 --- a/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy +++ b/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy @@ -2,7 +2,7 @@ label hg_pf_admire_breasts_transition: stop music fadeout 1.0 - call hide_characters + scene onlayer dolls hide screen blktone with d3 pause.2 diff --git a/game/scripts/characters/hermione/events/favors/suck_it.rpy b/game/scripts/characters/hermione/events/favors/suck_it.rpy index 69d54844..375b627d 100644 --- a/game/scripts/characters/hermione/events/favors/suck_it.rpy +++ b/game/scripts/characters/hermione/events/favors/suck_it.rpy @@ -26,7 +26,7 @@ label end_hg_pf_blowjob: # Setup stop music fadeout 1.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -414,7 +414,7 @@ label hg_pf_blowjob_T6_repeat: label hg_pf_blowjob_1: stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -791,7 +791,7 @@ label hg_pf_blowjob_1: label hg_pf_hidden_blowjob: stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -938,7 +938,7 @@ label hg_hidden_blowjob_snape: sna "Right..." ("snape_06") stop music fadeout 1.0 - call hide_characters + scene onlayer dolls with d3 call sna_chibi("stand","mid","base", flip=True) @@ -1683,7 +1683,7 @@ label hg_hidden_blowjob_cumming: label hg_pf_blowjob_2: stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy index 876c72ab..cc44272d 100644 --- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy @@ -19,7 +19,7 @@ label end_hg_pf_talk: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 @@ -324,7 +324,7 @@ label hg_pf_talk_T2: her "You were touching yourself, [name_genie_hermione]!" ("angry", "base", "angry", "mid") gen "What? No, I was just... Ah, shit, this feels good..." ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls call gen_chibi("cum_behind_desk_done") with d3 pause.8 @@ -423,7 +423,7 @@ label hg_pf_talk_T2_repeat: gen "What? No, I was just... *Ngh*..." ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls call gen_chibi("cum_behind_desk_done") with d3 pause.8 @@ -608,7 +608,7 @@ label hg_pf_talk_T3: gen "{size=-4}You dirty--{w=0.2}*Hngh*...{w=0.5} *Argh*!{/size}" ("angry", xpos="far_left", ypos="head") stop music fadeout 1 - call hide_characters + scene onlayer dolls with d3 call cum_block call gen_chibi("cum_behind_desk") @@ -626,7 +626,7 @@ label hg_pf_talk_T3: else: her "[name_genie_hermione]...{w} Did you just...?" ("soft", "narrow", "worried", "down") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.1 @@ -740,7 +740,7 @@ label hg_pf_talk_tonks_T3_E1: label hg_pf_talk_tonks: - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -800,7 +800,7 @@ label hg_pf_talk_tonks: "-Start jerking off-": $ states.gen.stats.masturbated_to_hermione += 1 $ states.gen.masturbating = True - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -867,7 +867,7 @@ label hg_pf_talk_tonks: "-Start jerking off-": $ states.gen.stats.masturbated_to_hermione += 1 $ states.gen.masturbating = True - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -1135,7 +1135,7 @@ label hg_pf_talk_tonks: ton @ cheeks blush hair horny "" ("horny", "base", "angry", "mid") gen "(Yes, take it right on your face, you slut!)" ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 call cum_block @@ -1299,7 +1299,7 @@ label hg_pf_talk_tonks: her @ cheeks blush "He did seem to enjoy... it." ("soft", "narrow", "base", "down") gen "(Damn right!)" ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy index b749d561..b81b5015 100644 --- a/game/scripts/characters/hermione/events/intro.rpy +++ b/game/scripts/characters/hermione/events/intro.rpy @@ -153,7 +153,7 @@ label hermione_intro_E1: menu: "\"(I will jerk off a little while she talks.)\"": - call hide_characters + scene onlayer dolls hide screen bld1 with d3 pause.2 @@ -243,7 +243,7 @@ label hermione_intro_E1: "\"(Yes, time to actually listen to her.)\"": $ states.gen.masturbating = False - call hide_characters + scene onlayer dolls hide screen bld1 with d3 diff --git a/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy b/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy index 7a2c5ad1..6de0fe04 100644 --- a/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy +++ b/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy @@ -488,7 +488,7 @@ label her_potion_cat_return: call her_walk("desk", "base", reduce=0.8) pause .2 - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy b/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy index c82fb20a..80bcb798 100644 --- a/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy +++ b/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy @@ -169,7 +169,7 @@ label hg_pr_cumslut: her @ cheeks blush "If you say so..." ("open", "closed", "base", "mid") stop music fadeout 4.0 - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/characters/luna/chibi.rpy b/game/scripts/characters/luna/chibi.rpy index ab1ee509..4bbff095 100644 --- a/game/scripts/characters/luna/chibi.rpy +++ b/game/scripts/characters/luna/chibi.rpy @@ -24,7 +24,7 @@ label lun_chibi(action=None, xpos=None, ypos=None, flip=False): return label lun_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy index 4aa735c5..70d1544a 100644 --- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy +++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy @@ -19,7 +19,7 @@ label ll_pf_inspect_end: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls call lun_chibi("stand", flip=False) call gen_chibi("sit_behind_desk") @@ -208,7 +208,7 @@ label ll_pf_inspect_T2_E1_intro: lun "I knew it!" lun @ cheeks blush "" ("grin", "base", "base", "mid", flip=False) - call hide_characters + scene onlayer dolls call lun_chibi(flip=False) hide cg with fade diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy index db3fd771..e01285d4 100644 --- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy +++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy @@ -16,7 +16,7 @@ label ll_pf_masturbate: jump luna_favor_menu # Start Event - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -34,7 +34,7 @@ label ll_pf_masturbate_end: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls call gen_chibi("sit_behind_desk") diff --git a/game/scripts/characters/luna/events/favors/suck_it.rpy b/game/scripts/characters/luna/events/favors/suck_it.rpy index 7aa0c0a0..3384a8c2 100644 --- a/game/scripts/characters/luna/events/favors/suck_it.rpy +++ b/game/scripts/characters/luna/events/favors/suck_it.rpy @@ -15,7 +15,7 @@ label ll_pf_blowjob: jump luna_favor_menu # Start Event - call hide_characters + scene onlayer dolls hide screen bld1 show screen blkfade with d5 @@ -33,7 +33,7 @@ label ll_pf_blowjob_end: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls call gen_chibi("sit_behind_desk") diff --git a/game/scripts/characters/luna/events/favors/talk_to_me.rpy b/game/scripts/characters/luna/events/favors/talk_to_me.rpy index 2ad89b02..7e3182e6 100644 --- a/game/scripts/characters/luna/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/luna/events/favors/talk_to_me.rpy @@ -20,7 +20,7 @@ label ll_pf_talk_end: # Setup stop music fadeout 2.0 - call hide_characters + scene onlayer dolls call gen_chibi("sit_behind_desk") diff --git a/game/scripts/characters/snape/chibi.rpy b/game/scripts/characters/snape/chibi.rpy index 052ccfba..f5ea0388 100644 --- a/game/scripts/characters/snape/chibi.rpy +++ b/game/scripts/characters/snape/chibi.rpy @@ -22,7 +22,7 @@ label sna_chibi(action=None, xpos=None, ypos=None, flip=False): return label sna_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 diff --git a/game/scripts/characters/susan/chibi.rpy b/game/scripts/characters/susan/chibi.rpy index 97e3a987..430e6b71 100644 --- a/game/scripts/characters/susan/chibi.rpy +++ b/game/scripts/characters/susan/chibi.rpy @@ -22,7 +22,7 @@ label sus_chibi(action=None, xpos=None, ypos=None, flip=False): return label sus_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 diff --git a/game/scripts/characters/tonks/chibi.rpy b/game/scripts/characters/tonks/chibi.rpy index 159a76ad..aa18f4ce 100644 --- a/game/scripts/characters/tonks/chibi.rpy +++ b/game/scripts/characters/tonks/chibi.rpy @@ -22,7 +22,7 @@ label ton_chibi(action=None, xpos=None, ypos=None, flip=False): return label ton_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False): - call hide_characters + scene onlayer dolls hide screen bld1 hide screen blktone with d3 @@ -148,7 +148,7 @@ init python: # Sets up a chibi scene with Tonks and Genie in it label ton_chibi_scene(action="reset", xpos="mid", ypos="base", trans=None): if trans is not None: - call hide_characters + scene onlayer dolls if trans: # Not sure if this part is needed, depends on context? hide screen bld1 diff --git a/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt b/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt index a4866f36..54842153 100644 --- a/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt +++ b/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt @@ -71,7 +71,7 @@ # ton @ hair horny "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L") # ton @ hair horny "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao") -# call hide_characters +# scene onlayer dolls # hide screen bld1 # with d3 diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy index 61d2e2a2..96cf1a6a 100644 --- a/game/scripts/characters/tonks/events/intro.rpy +++ b/game/scripts/characters/tonks/events/intro.rpy @@ -522,7 +522,7 @@ label tonks_intro_E3: gen "I'm not a dark wizard, you racist twat!" ("angry", xpos="far_left", ypos="head") ton @ hair angry "How dare you call me a racist!" ("mad", "shocked", "angry", "mid") gen "Bring it! Do your worst, witch!" ("angry", xpos="far_left", ypos="head") - call hide_characters + scene onlayer dolls hide screen bld1 with d3 diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy index 820b4f00..ae9af900 100644 --- a/game/scripts/events/ending.rpy +++ b/game/scripts/events/ending.rpy @@ -133,7 +133,7 @@ label ball_ending_E1: gen "Thank you. Have fun hosting the ball..." ("base", xpos="far_left", ypos="head") sna "*Sigh*" ("snape_06") - call hide_characters + scene onlayer dolls pause.3 diff --git a/game/scripts/events/labels.rpy b/game/scripts/events/labels.rpy index 1cdf69c0..26b6d4f3 100644 --- a/game/scripts/events/labels.rpy +++ b/game/scripts/events/labels.rpy @@ -6,7 +6,7 @@ label setup_fireplace_hangout(char=None): $ states.fireplace_started = True $ fireplace_OBJ.foreground = "fireplace_fire" - call hide_characters + scene onlayer dolls call gen_chibi("hide") call sna_chibi("hide") call ton_chibi("hide") @@ -15,7 +15,7 @@ label setup_fireplace_hangout(char=None): stop background show screen blkfade - call hide_characters + scene onlayer dolls call gen_chibi("hide") call sna_chibi("hide") call ton_chibi("hide") diff --git a/game/scripts/events/map.rpy b/game/scripts/events/map.rpy index b46813ed..dcaa3a0b 100644 --- a/game/scripts/events/map.rpy +++ b/game/scripts/events/map.rpy @@ -275,7 +275,7 @@ label outskirts_of_hogwarts: return label return_office: - call hide_characters + scene onlayer dolls show screen blkfade with d3 diff --git a/game/scripts/inventory/potions/polyjuice_potion.txt b/game/scripts/inventory/potions/polyjuice_potion.txt index 367c194a..d5211986 100644 --- a/game/scripts/inventory/potions/polyjuice_potion.txt +++ b/game/scripts/inventory/potions/polyjuice_potion.txt @@ -259,7 +259,7 @@ label potion_scene_1_1_2: show screen blkfade with d3 - call hide_characters + scene onlayer dolls call her_chibi(xpos="desk") call gen_chibi("sit_behind_desk") @@ -493,7 +493,7 @@ label potion_scene_1_1_2_alt: her ".........." ("annoyed", "base", "worried", "R") her "I am..." ("smile", "base", "base", "R") - call hide_characters + scene onlayer dolls call her_chibi("hide") call gen_chibi("sit_behind_desk") hide screen bld1 diff --git a/game/scripts/minigames/cardgame/_snape_card_game_.rpy b/game/scripts/minigames/cardgame/_snape_card_game_.rpy index 7db3fe6c..cfa336d2 100644 --- a/game/scripts/minigames/cardgame/_snape_card_game_.rpy +++ b/game/scripts/minigames/cardgame/_snape_card_game_.rpy @@ -177,7 +177,7 @@ label snape_first_duel: sna "Well played though." ("snape_04") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call sna_chibi("hide") with d3 @@ -216,7 +216,7 @@ label snape_second_duel: sna "So deliciously mischievous." ("snape_02") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call sna_chibi("hide") with d3 @@ -298,7 +298,7 @@ label snape_third_duel: $ states.env.tokens+= 1 play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call sna_chibi("hide") with d3 @@ -409,7 +409,7 @@ label snape_random_duel: gen "(I still don't have any use for it, but I won't turn down free shit.)" ("base", xpos="far_left", ypos="head") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call sna_chibi("hide") with d3 @@ -525,7 +525,7 @@ label snape_duel_lost: gen "Whatever you say, here's your bottle." ("base", xpos="far_left", ypos="head") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call sna_chibi("hide") with d3 @@ -551,7 +551,7 @@ label snape_duel_cancel: gen "Fine..." ("base", xpos="far_left", ypos="head") play sound "sounds/door.ogg" - call hide_characters + scene onlayer dolls call sna_chibi("hide") with d3 diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy index f657d894..2f45f2d6 100644 --- a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy +++ b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy @@ -269,7 +269,7 @@ label a_christmas_tale2(): nar "With the man's final words left echoing across the halls." nar "He had to spend another Christmas with the bluest of blue balls..." - call hide_characters + scene onlayer dolls with d5 $ renpy.end_replay() diff --git a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy index 00db2720..fb5e46f6 100644 --- a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy +++ b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy @@ -649,7 +649,7 @@ label anal_pirate_event_3: her "Shiver me timbers... 'tis so hot!" ("silly", "narrow", "annoyed", "up") #Ending - call hide_characters + scene onlayer dolls show screen blkfade with d7 diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy index cd322555..dbe5d8ed 100644 --- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy +++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy @@ -229,7 +229,7 @@ label genies_christmas_wish: with d4 pause .8 - call hide_characters + scene onlayer dolls hide screen blkfade diff --git a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy index 55b35f19..05bb2b1d 100644 --- a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy +++ b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy @@ -306,7 +306,7 @@ label not_so_great_escape: play sound "sounds/falling_stairs.ogg" call ton_chibi(flip=True) - call hide_characters + scene onlayer dolls call lun_chibi("stand", 440, 460, flip=True) call cho_chibi("stand", 690, 420) call gen_chibi("stand", 585, "base", flip=False) @@ -353,7 +353,7 @@ label not_so_great_escape: $ candleL_OBJ.get_action()() $ candleR_OBJ.get_action()() - call hide_characters + scene onlayer dolls call gen_chibi("sit_behind_desk") call gameover(fake=True) diff --git a/game/scripts/utility/common_labels.rpy b/game/scripts/utility/common_labels.rpy index 484e499d..52faf898 100644 --- a/game/scripts/utility/common_labels.rpy +++ b/game/scripts/utility/common_labels.rpy @@ -1,16 +1,3 @@ -# Hide all character images (not chibi) -label hide_characters: - hide hermione_main - hide luna_main - hide cho_main - hide astoria_main - hide susan_main - hide tonks_main - hide snape_main - hide screen genie_main - # Do not add transitions. Use one after return. - return - label bld(action=None): if action == "hide": hide screen bld1