From 0c564a521bf450a4538a9ade56947028b7501b25 Mon Sep 17 00:00:00 2001 From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:14:33 +0100 Subject: [PATCH] Use expression instead of image the only documented lingua this is AST-equivalent (cherry picked from commit 542db72609883b59d66f35db9178839d972288d7) --- .../cho/events/quidditch/gryffindor_match.rpy | 82 ++++++------ .../cho/events/quidditch/hufflepuff_match.rpy | 4 +- game/scripts/events/Start.rpy | 6 +- game/scripts/inventory/scrolls.rpy | 120 +++++++++--------- .../mirror/events/a_bad_time_to_disrobe.rpy | 2 +- .../mirror/events/an_odd_circumstance.rpy | 4 +- .../rooms/main_room/objects/poster.rpy | 4 +- game/scripts/shops/dress/chitchats.rpy | 2 +- 8 files changed, 112 insertions(+), 112 deletions(-) diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 52d4407d..1d3b56ef 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -204,7 +204,7 @@ label gryffindor_match: # Note: I've tried using chibis, but it's too difficult/buggy. #Cho appears in the window on her broom/knocks on door - #show image "ch_cho fly_window_masked" onlayer screens zorder 5 + #show expression "ch_cho fly_window_masked" onlayer screens zorder 5 #call cho_chibi("fly_window", "mid", "base") cho "[name_genie_cho]!" @@ -869,7 +869,7 @@ label gryffindor_match: call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 - show image Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 + show expression Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 show screen blkfade with ComposeTransition(pushleft, before=faderight) hide screen blkfade @@ -939,7 +939,7 @@ label gryffindor_match: call room("quidditch_stands2") call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) - show image Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 + show expression Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 call gen_chibi("stand", 650, 430, flip=False) play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 @@ -963,7 +963,7 @@ label gryffindor_match: call room("quidditch_stands2") call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) - show image Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 + show expression Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 call gen_chibi("stand", 650, 430, flip=False) hide screen blkfade @@ -1121,7 +1121,7 @@ label gryffindor_match: call room("quidditch_stands2") call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) - show image Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 + show expression Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 show screen blkfade with ComposeTransition(pushleft, before=faderight) hide screen blkfade @@ -1262,7 +1262,7 @@ label gryffindor_match: call sna_chibi("stand", 150, 290, flip=True) call ton_chibi("stand", 130, 310, flip=True) call her_chibi("stand", 300, 400, flip=True) - hide image redhead + hide expression redhead show screen blkfade with ComposeTransition(pushright, before=fadeleft) hide screen blkfade @@ -1494,7 +1494,7 @@ label gryffindor_match: call ctc - hide image cg2 + hide expression cg2 with dissolve her "What are you doing?! Don't you have a firebolt?" @@ -1687,7 +1687,7 @@ label gryffindor_match: # Hermione removes panties off head. $ hermione.unequip("headgear") - show image "panties_on_the_ground" as panties zorder 2: + show expression "panties_on_the_ground" as panties zorder 2: pos (268, 380) with d3 @@ -1735,7 +1735,7 @@ label gryffindor_match: ton @ hair horny "Nice, free panties." ("horny", "base", "base", "down", trans=d3) play sound "sounds/cloth_sound2.ogg" - hide image panties + hide expression panties with d3 pause 0.8 @@ -2015,21 +2015,21 @@ label gryffindor_match_return: gen "*Hngh*--" ("angry", xpos="far_left", ypos="head") #Cut to CG - show image "cho_under_desk_idle_snape_no_spit" as cg_doll zorder 16 + show expression "cho_under_desk_idle_snape_no_spit" as cg_doll zorder 16 with fade call ctc ton "Professor?" ("soft", "narrow", "raised", "mid", xpos="far_right", ypos="head") play sound "sounds/spit.ogg" - show image "cho_under_desk_idle_snape" as cg_doll + show expression "cho_under_desk_idle_snape" as cg_doll gen "..." ("angry", xpos="far_left", ypos="head") ton "Are you alright?" ("soft", "base", "raised", "mid") #Cho's head starts moving play background "sounds/slickloop.ogg" fadein 2 - show image "cho_under_desk_blowjob" as cg_doll + show expression "cho_under_desk_blowjob" as cg_doll with d3 cho @ cheeks heavy_blush "*Slurp*...{w=0.4} *Gobble*...{w=0.4} *Slurp*" ("open_wide_tongue", "narrow", "base", "up", xpos="far_right", ypos="head", flip=False, trans=d3) @@ -2052,7 +2052,7 @@ label gryffindor_match_return: gen "Nah, it's just a sports--" ("base", xpos="far_left", ypos="head") play background "sounds/slickloopfast.ogg" - show image "cho_under_desk_blowjob_fast" as cg_doll + show expression "cho_under_desk_blowjob_fast" as cg_doll cho @ cheeks heavy_blush "*Gobble*...{w=0.2} *Slurp*...{w=0.2} *Gobble*" ("open_wide_tongue", "happyCl", "base", "mid") gen "*Ngh*...{w=0.4} sports drink." ("angry", xpos="far_left", ypos="head") @@ -2078,11 +2078,11 @@ label gryffindor_match_return: #Cho stops moving stop background fadeout 2 play sound "sounds/slick_pop.ogg" - show image "cho_under_desk_idle_snape" as cg_doll + show expression "cho_under_desk_idle_snape" as cg_doll cho @ cheeks heavy_blush "*Pwah*." ("open_tongue", "narrow", "base", "up") - show image "cho_under_desk_handjob" as cg_doll + show expression "cho_under_desk_handjob" as cg_doll with d3 ton "The boys have a bet on which team would end up winning the Quidditch cup." ("open", "base", "base", "R") @@ -2094,7 +2094,7 @@ label gryffindor_match_return: sna "*Hmph*... In that case, I'll just bring the vial to professor Slughorn and have him test it!" ("snape_16") #Snape's legs vanish from CG as he goes to grab the bottle. - show image "cho_under_desk_idle" as cg_doll + show expression "cho_under_desk_idle" as cg_doll with d3 play sound "sounds/cloth_sound3.ogg" @@ -2282,8 +2282,8 @@ label gryffindor_match_return: play sound "sounds/08_hop_on_desk.ogg" pause 3 - show image "cho_sex idle" as cg_doll zorder 16 - show image "dustfloating" as cg_doll_effects zorder 17 + show expression "cho_sex idle" as cg_doll zorder 16 + show expression "dustfloating" as cg_doll_effects zorder 17 hide screen blkfade hide cho_main with d9 @@ -2316,7 +2316,7 @@ label gryffindor_match_return: cho @ cheeks heavy_blush "That I'd end up winning the cup before ever knowing what my coach's thick beater's bat would feel like inside my tight little... Snitch." ("horny", "narrow", "base", "down") #Cho up position dick in front of body - show image "cho_sex up" as cg_doll + show expression "cho_sex up" as cg_doll with d3 gen "Miss Chang!" @@ -2325,7 +2325,7 @@ label gryffindor_match_return: cho @ cheeks heavy_blush "Although it's quite fitting to have this be part of my reward, don't you think?" ("smile", "narrow", "base", "down") #Cho positioning dick against pussy pose - show image "cho_sex insert" as cg_doll + show expression "cho_sex insert" as cg_doll with d3 $ states.cho.status.sex = True @@ -2340,15 +2340,15 @@ label gryffindor_match_return: cho @ cheeks heavy_blush "And it's about to get even better..." ("crooked_smile", "narrow", "base", "down") #Cho sits down on genie's dick and gets fully penetrated - show image "cho_sex up inside" as cg_doll + show expression "cho_sex up inside" as cg_doll with d3 pause 0.25 cho @ cheeks heavy_blush "*Nnngh--{w=0.40}{nw}" ("angry", "closed", "angry", "mid") - show image "cho_sex middle" as cg_doll + show expression "cho_sex middle" as cg_doll with d3 pause 0.25 play sound "sounds/slick_02.ogg" - show image "cho_sex down" as cg_doll + show expression "cho_sex down" as cg_doll with d3 pause 0.25 @@ -2360,7 +2360,7 @@ label gryffindor_match_return: #Cho starts moving play background "sounds/slickloop.ogg" - show image "cho_sex loop slow" as cg_doll + show expression "cho_sex loop slow" as cg_doll with d3 gen "*Hngh*!" @@ -2416,7 +2416,7 @@ label gryffindor_match_return: #sexloop fast. #speedlines play background "sounds/sexloopfast.ogg" - show image "cho_sex loop fast" as cg_doll + show expression "cho_sex loop fast" as cg_doll with d1 gen "*Argh*...{w=0.4} You little--" @@ -2446,26 +2446,26 @@ label gryffindor_match_return: #Cho standing pose, genie body 3 (cho normal up, jacking it) stop background fadeout 2 play sound "sounds/slick_02.ogg" - show image "cho_sex up jerking" as cg_doll + show expression "cho_sex up jerking" as cg_doll with d3 pause .5 gen "*Aaargh*!!" #Genie cums play sound "sounds/slick_01.ogg" - show image "cho_sex up cum outside stage0" as cg_doll + show expression "cho_sex up cum outside stage0" as cg_doll with d3 pause 0.66 - show image "cho_sex up cum outside stage1" as cg_doll + show expression "cho_sex up cum outside stage1" as cg_doll with d3 pause 0.66 play sound "sounds/slick_01.ogg" - show image "cho_sex up cum outside stage2" as cg_doll + show expression "cho_sex up cum outside stage2" as cg_doll with d3 pause 0.66 - show image "cho_sex up cum outside stage3" as cg_doll + show expression "cho_sex up cum outside stage3" as cg_doll with d3 gen "*Ah*..." @@ -2481,7 +2481,7 @@ label gryffindor_match_return: #Cho standing tasting cum pose, dick outside (cum on dick) #TODO change for variant with cum on her chest included - show image "cho_sex up taste outside" as cg_doll + show expression "cho_sex up taste outside" as cg_doll with d2 cho @ cheeks heavy_blush "*Mmm*..." ("base", "closed", "base", "stare") @@ -2495,9 +2495,9 @@ label gryffindor_match_return: cho @ cheeks heavy_blush "My--" ("smile", "narrow", "base", "up") gen "*Aaaargh*!!!" - show image "cho_sex middle" as cg_doll + show expression "cho_sex middle" as cg_doll pause 0.25 - show image "cho_sex down" as cg_doll + show expression "cho_sex down" as cg_doll play sound "sounds/slick_01.ogg" with kissiris stop background fadeout 1 @@ -2507,28 +2507,28 @@ label gryffindor_match_return: with flashbulb play sound "sounds/slick_02.ogg" - show image "cho_sex idle creampie" as cg_doll + show expression "cho_sex idle creampie" as cg_doll with d3 gen "*Ah*...." cho @ cheeks heavy_blush "*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*..." ("grin", "narrow", "base", "up", trans=d3) #Cho moves to stand pose (cycle images?) - show image "cho_sex middle cum inside" as cg_doll + show expression "cho_sex middle cum inside" as cg_doll with d2 pause 0.25 - show image "cho_sex up cum inside" as cg_doll + show expression "cho_sex up cum inside" as cg_doll with d2 pause 0.25 play sound "sounds/slick_02.ogg" - show image "cho_sex up cum outside" as cg_doll + show expression "cho_sex up cum outside" as cg_doll with d2 cho @ cheeks heavy_blush "I think--{w=0.4} *Ah*...{w=0.4} I think I've finally found a fun activity to put into my workout routine..." ("smile", "narrow", "base", "stare") - show image "cho_sex insert cum inside" as cg_doll + show expression "cho_sex insert cum inside" as cg_doll with d2 pause 0.25 - show image "cho_sex up taste" as cg_doll + show expression "cho_sex up taste" as cg_doll with d2 #Cum sound @@ -2548,8 +2548,8 @@ label gryffindor_match_return: stop music fadeout 1.0 - hide image cg_doll - hide image cg_doll_effects + hide expression cg_doll + hide expression cg_doll_effects call cho_chibi(xpos="desk", ypos="base", flip=False) with fade diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 6c516f55..47c3d906 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -712,7 +712,7 @@ label hufflepuff_match: her "Higher up, Cho seems to have caught an eye on the snitch and is chasing after it, directly followed by Cedric who..." ("open", "slit", "low", "stare", flip=True) her "Hold on a minute... Is Cho wearing a skirt?" ("scream", "wide", "worried", "stare") - show image "CG quidditch cho_flashing" as cg zorder 17 + show expression "CG quidditch cho_flashing" as cg zorder 17 with fade play sound "sounds/crowd_gasp.ogg" @@ -735,7 +735,7 @@ label hufflepuff_match: call ctc # Pack to stands. - hide image cg + hide expression cg with fade pause .1 diff --git a/game/scripts/events/Start.rpy b/game/scripts/events/Start.rpy index 0ae5991b..987c758e 100644 --- a/game/scripts/events/Start.rpy +++ b/game/scripts/events/Start.rpy @@ -3,7 +3,7 @@ label start_wt: show screen blkfade with d3 - show image "images/rooms/_bg_/castle.webp" + show expression "images/rooms/_bg_/castle.webp" hide screen blkfade with d3 show screen close_button(action=MainMenu()) @@ -40,7 +40,7 @@ label start_wt: $ states.ton.level = 5 jump skip_to_hermione - hide image "images/rooms/_bg_/castle.webp" + hide expression "images/rooms/_bg_/castle.webp" hide screen close_button $ enable_game_menu() @@ -182,7 +182,7 @@ label genie_intro_E4: label skip_to_hermione: $ renpy.block_rollback() - hide image "images/rooms/_bg_/castle.webp" + hide expression "images/rooms/_bg_/castle.webp" hide screen close_button $ enable_game_menu() diff --git a/game/scripts/inventory/scrolls.rpy b/game/scripts/inventory/scrolls.rpy index 876755a2..6dc952b2 100644 --- a/game/scripts/inventory/scrolls.rpy +++ b/game/scripts/inventory/scrolls.rpy @@ -33,7 +33,7 @@ default leg30_scroll_ITEM = Item("leg30_scroll", "scroll", "Scroll 30: The Gang" label leg1_scroll: show screen blktone - show image "images/scrolls/1.webp" onlayer screens zorder 25 + show expression "images/scrolls/1.webp" onlayer screens zorder 25 with d3 pause 1 @@ -42,14 +42,14 @@ label leg1_scroll: call ctc hide screen blktone - hide image "images/scrolls/1.webp" onlayer screens zorder 25 + hide expression "images/scrolls/1.webp" onlayer screens zorder 25 with d3 jump inventory label leg2_scroll: show screen blktone - show image "images/scrolls/2.webp" onlayer screens zorder 25 + show expression "images/scrolls/2.webp" onlayer screens zorder 25 with d3 pause 1 @@ -61,14 +61,14 @@ label leg2_scroll: call ctc hide screen blktone - hide image "images/scrolls/2.webp" onlayer screens zorder 25 + hide expression "images/scrolls/2.webp" onlayer screens zorder 25 with d3 jump inventory label leg3_scroll: show screen blktone - show image "images/scrolls/3.webp" onlayer screens zorder 25 + show expression "images/scrolls/3.webp" onlayer screens zorder 25 with d3 pause 1 @@ -76,14 +76,14 @@ label leg3_scroll: call ctc hide screen blktone - hide image "images/scrolls/3.webp" onlayer screens zorder 25 + hide expression "images/scrolls/3.webp" onlayer screens zorder 25 with d3 jump inventory label leg4_scroll: show screen blktone - show image "images/scrolls/4.webp" onlayer screens zorder 25 + show expression "images/scrolls/4.webp" onlayer screens zorder 25 with d3 pause 1 @@ -93,14 +93,14 @@ label leg4_scroll: call ctc hide screen blktone - hide image "images/scrolls/4.webp" onlayer screens zorder 25 + hide expression "images/scrolls/4.webp" onlayer screens zorder 25 with d3 jump inventory label leg5_scroll: show screen blktone - show image "images/scrolls/5.webp" onlayer screens zorder 25 + show expression "images/scrolls/5.webp" onlayer screens zorder 25 with d3 pause 1 @@ -109,14 +109,14 @@ label leg5_scroll: call ctc hide screen blktone - hide image "images/scrolls/5.webp" onlayer screens zorder 25 + hide expression "images/scrolls/5.webp" onlayer screens zorder 25 with d3 jump inventory label leg6_scroll: show screen blktone - show image "images/scrolls/6.webp" onlayer screens zorder 25 + show expression "images/scrolls/6.webp" onlayer screens zorder 25 with d3 pause 1 @@ -125,14 +125,14 @@ label leg6_scroll: call ctc hide screen blktone - hide image "images/scrolls/6.webp" onlayer screens zorder 25 + hide expression "images/scrolls/6.webp" onlayer screens zorder 25 with d3 jump inventory label leg7_scroll: show screen blktone - show image "images/scrolls/7.webp" onlayer screens zorder 25 + show expression "images/scrolls/7.webp" onlayer screens zorder 25 with d3 pause 1 @@ -141,14 +141,14 @@ label leg7_scroll: call ctc hide screen blktone - hide image "images/scrolls/7.webp" onlayer screens zorder 25 + hide expression "images/scrolls/7.webp" onlayer screens zorder 25 with d3 jump inventory label leg8_scroll: show screen blktone - show image "images/scrolls/8.webp" onlayer screens zorder 25 + show expression "images/scrolls/8.webp" onlayer screens zorder 25 with d3 pause 1 @@ -157,14 +157,14 @@ label leg8_scroll: call ctc hide screen blktone - hide image "images/scrolls/8.webp" onlayer screens zorder 25 + hide expression "images/scrolls/8.webp" onlayer screens zorder 25 with d3 jump inventory label leg9_scroll: show screen blktone - show image "images/scrolls/9.webp" onlayer screens zorder 25 + show expression "images/scrolls/9.webp" onlayer screens zorder 25 with d3 pause 1 @@ -173,14 +173,14 @@ label leg9_scroll: call ctc hide screen blktone - hide image "images/scrolls/9.webp" onlayer screens zorder 25 + hide expression "images/scrolls/9.webp" onlayer screens zorder 25 with d3 jump inventory label leg10_scroll: show screen blktone - show image "images/scrolls/10.webp" onlayer screens zorder 25 + show expression "images/scrolls/10.webp" onlayer screens zorder 25 with d3 pause 1 @@ -190,14 +190,14 @@ label leg10_scroll: call ctc hide screen blktone - hide image "images/scrolls/10.webp" onlayer screens zorder 25 + hide expression "images/scrolls/10.webp" onlayer screens zorder 25 with d3 jump inventory label leg11_scroll: show screen blktone - show image "images/scrolls/11.webp" onlayer screens zorder 25 + show expression "images/scrolls/11.webp" onlayer screens zorder 25 with d3 pause 1 @@ -205,14 +205,14 @@ label leg11_scroll: call ctc hide screen blktone - hide image "images/scrolls/11.webp" onlayer screens zorder 25 + hide expression "images/scrolls/11.webp" onlayer screens zorder 25 with d3 jump inventory label leg12_scroll: show screen blktone - show image "images/scrolls/12.webp" onlayer screens zorder 25 + show expression "images/scrolls/12.webp" onlayer screens zorder 25 with d3 pause 1 @@ -220,14 +220,14 @@ label leg12_scroll: call ctc hide screen blktone - hide image "images/scrolls/12.webp" onlayer screens zorder 25 + hide expression "images/scrolls/12.webp" onlayer screens zorder 25 with d3 jump inventory label leg13_scroll: show screen blktone - show image "images/scrolls/13.webp" onlayer screens zorder 25 + show expression "images/scrolls/13.webp" onlayer screens zorder 25 with d3 pause 1 @@ -237,14 +237,14 @@ label leg13_scroll: call ctc hide screen blktone - hide image "images/scrolls/13.webp" onlayer screens zorder 25 + hide expression "images/scrolls/13.webp" onlayer screens zorder 25 with d3 jump inventory label leg14_scroll: show screen blktone - show image "images/scrolls/14.webp" onlayer screens zorder 25 + show expression "images/scrolls/14.webp" onlayer screens zorder 25 with d3 pause 1 @@ -253,14 +253,14 @@ label leg14_scroll: call ctc hide screen blktone - hide image "images/scrolls/14.webp" onlayer screens zorder 25 + hide expression "images/scrolls/14.webp" onlayer screens zorder 25 with d3 jump inventory label leg15_scroll: show screen blktone - show image "images/scrolls/15.webp" onlayer screens zorder 25 + show expression "images/scrolls/15.webp" onlayer screens zorder 25 with d3 pause 1 @@ -270,14 +270,14 @@ label leg15_scroll: call ctc hide screen blktone - hide image "images/scrolls/15.webp" onlayer screens zorder 25 + hide expression "images/scrolls/15.webp" onlayer screens zorder 25 with d3 jump inventory label leg16_scroll: show screen blktone - show image "images/scrolls/16.webp" onlayer screens zorder 25 + show expression "images/scrolls/16.webp" onlayer screens zorder 25 with d3 pause 1 @@ -287,14 +287,14 @@ label leg16_scroll: call ctc hide screen blktone - hide image "images/scrolls/16.webp" onlayer screens zorder 25 + hide expression "images/scrolls/16.webp" onlayer screens zorder 25 with d3 jump inventory label leg17_scroll: show screen blktone - show image "images/scrolls/17.webp" onlayer screens zorder 25 + show expression "images/scrolls/17.webp" onlayer screens zorder 25 with d3 pause 1 @@ -303,14 +303,14 @@ label leg17_scroll: call ctc hide screen blktone - hide image "images/scrolls/17.webp" onlayer screens zorder 25 + hide expression "images/scrolls/17.webp" onlayer screens zorder 25 with d3 jump inventory label leg18_scroll: show screen blktone - show image "images/scrolls/18.webp" onlayer screens zorder 25 + show expression "images/scrolls/18.webp" onlayer screens zorder 25 with d3 pause 1 @@ -319,14 +319,14 @@ label leg18_scroll: call ctc hide screen blktone - hide image "images/scrolls/18.webp" onlayer screens zorder 25 + hide expression "images/scrolls/18.webp" onlayer screens zorder 25 with d3 jump inventory label leg19_scroll: show screen blktone - show image "images/scrolls/19.webp" onlayer screens zorder 25 + show expression "images/scrolls/19.webp" onlayer screens zorder 25 with d3 pause 1 @@ -335,14 +335,14 @@ label leg19_scroll: call ctc hide screen blktone - hide image "images/scrolls/19.webp" onlayer screens zorder 25 + hide expression "images/scrolls/19.webp" onlayer screens zorder 25 with d3 jump inventory label leg20_scroll: show screen blktone - show image "images/scrolls/20.webp" onlayer screens zorder 25 + show expression "images/scrolls/20.webp" onlayer screens zorder 25 with d3 pause 1 @@ -353,14 +353,14 @@ label leg20_scroll: call ctc hide screen blktone - hide image "images/scrolls/20.webp" onlayer screens zorder 25 + hide expression "images/scrolls/20.webp" onlayer screens zorder 25 with d3 jump inventory label leg21_scroll: show screen blktone - show image "images/scrolls/21.webp" onlayer screens zorder 25 + show expression "images/scrolls/21.webp" onlayer screens zorder 25 with d3 pause 1 @@ -370,14 +370,14 @@ label leg21_scroll: call ctc hide screen blktone - hide image "images/scrolls/21.webp" onlayer screens zorder 25 + hide expression "images/scrolls/21.webp" onlayer screens zorder 25 with d3 jump inventory label leg22_scroll: show screen blktone - show image "images/scrolls/22.webp" onlayer screens zorder 25 + show expression "images/scrolls/22.webp" onlayer screens zorder 25 with d3 pause 1 @@ -386,14 +386,14 @@ label leg22_scroll: call ctc hide screen blktone - hide image "images/scrolls/22.webp" onlayer screens zorder 25 + hide expression "images/scrolls/22.webp" onlayer screens zorder 25 with d3 jump inventory label leg23_scroll: show screen blktone - show image "images/scrolls/23.webp" onlayer screens zorder 25 + show expression "images/scrolls/23.webp" onlayer screens zorder 25 with d3 pause 1 @@ -402,14 +402,14 @@ label leg23_scroll: call ctc hide screen blktone - hide image "images/scrolls/23.webp" onlayer screens zorder 25 + hide expression "images/scrolls/23.webp" onlayer screens zorder 25 with d3 jump inventory label leg24_scroll: show screen blktone - show image "images/scrolls/24.webp" onlayer screens zorder 25 + show expression "images/scrolls/24.webp" onlayer screens zorder 25 with d3 pause 1 @@ -418,14 +418,14 @@ label leg24_scroll: call ctc hide screen blktone - hide image "images/scrolls/24.webp" onlayer screens zorder 25 + hide expression "images/scrolls/24.webp" onlayer screens zorder 25 with d3 jump inventory label leg25_scroll: show screen blktone - show image "images/scrolls/25.webp" onlayer screens zorder 25 + show expression "images/scrolls/25.webp" onlayer screens zorder 25 with d3 pause 1 @@ -435,14 +435,14 @@ label leg25_scroll: call ctc hide screen blktone - hide image "images/scrolls/25.webp" onlayer screens zorder 25 + hide expression "images/scrolls/25.webp" onlayer screens zorder 25 with d3 jump inventory label leg26_scroll: show screen blktone - show image "images/scrolls/26.webp" onlayer screens zorder 25 + show expression "images/scrolls/26.webp" onlayer screens zorder 25 with d3 pause 1 @@ -452,14 +452,14 @@ label leg26_scroll: call ctc hide screen blktone - hide image "images/scrolls/26.webp" onlayer screens zorder 25 + hide expression "images/scrolls/26.webp" onlayer screens zorder 25 with d3 jump inventory label leg27_scroll: show screen blktone - show image "images/scrolls/27.webp" onlayer screens zorder 25 + show expression "images/scrolls/27.webp" onlayer screens zorder 25 with d3 pause 1 @@ -467,14 +467,14 @@ label leg27_scroll: call ctc hide screen blktone - hide image "images/scrolls/27.webp" onlayer screens zorder 25 + hide expression "images/scrolls/27.webp" onlayer screens zorder 25 with d3 jump inventory label leg28_scroll: show screen blktone - show image "images/scrolls/28.webp" onlayer screens zorder 25 + show expression "images/scrolls/28.webp" onlayer screens zorder 25 with d3 pause 1 @@ -482,14 +482,14 @@ label leg28_scroll: call ctc hide screen blktone - hide image "images/scrolls/28.webp" onlayer screens zorder 25 + hide expression "images/scrolls/28.webp" onlayer screens zorder 25 with d3 jump inventory label leg29_scroll: show screen blktone - show image "images/scrolls/29.webp" onlayer screens zorder 25 + show expression "images/scrolls/29.webp" onlayer screens zorder 25 with d3 pause 1 @@ -497,14 +497,14 @@ label leg29_scroll: call ctc hide screen blktone - hide image "images/scrolls/29.webp" onlayer screens zorder 25 + hide expression "images/scrolls/29.webp" onlayer screens zorder 25 with d3 jump inventory label leg30_scroll: show screen blktone - show image "images/scrolls/30.webp" onlayer screens zorder 25 + show expression "images/scrolls/30.webp" onlayer screens zorder 25 with d3 pause 1 @@ -512,7 +512,7 @@ label leg30_scroll: call ctc hide screen blktone - hide image "images/scrolls/30.webp" onlayer screens zorder 25 + hide expression "images/scrolls/30.webp" onlayer screens zorder 25 with d3 jump inventory diff --git a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy index c59fe68f..cbef02d0 100644 --- a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy +++ b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy @@ -120,7 +120,7 @@ label a_bad_time_to_disrobe_part_1: show screen blkfade with d3 - show image Text("{image=images/rooms/room_of_requirement/qmark.webp}{size=+4}{color=#cbcbcb}Hermione will remember that{/color}{/size}") as qmark zorder 100: + show expression Text("{image=images/rooms/room_of_requirement/qmark.webp}{size=+4}{color=#cbcbcb}Hermione will remember that{/color}{/size}") as qmark zorder 100: pos (10, 10) nar "Hermione returns the next morning, looking nervous but more determined than yesterday." diff --git a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy index a3919e34..cc85a9a8 100644 --- a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy +++ b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy @@ -18,7 +18,7 @@ label an_odd_circumstance: $ hermione.equip(her_outfit_default) call room("main_room") stop music fadeout 1 - show image "dark_overlay" zorder 6 as dark_overlay + show expression "dark_overlay" zorder 6 as dark_overlay show screen blkfade with d5 @@ -86,7 +86,7 @@ label an_odd_circumstance: $ hermione_chibi.zorder = states.desk_chibi_zorder - 1 call her_chibi("stand",210, 450, flip=True) hide screen white - show image "dark_overlay" zorder 6 as dark_overlay + show expression "dark_overlay" zorder 6 as dark_overlay with d1 her "Silencio." diff --git a/game/scripts/rooms/main_room/objects/poster.rpy b/game/scripts/rooms/main_room/objects/poster.rpy index c8ffe2fe..edc0ce4f 100644 --- a/game/scripts/rooms/main_room/objects/poster.rpy +++ b/game/scripts/rooms/main_room/objects/poster.rpy @@ -1,6 +1,6 @@ label enlarge_poster: - show image "#00000080" as underlay - show image Image(poster_OBJ.decoration.image) zorder 25 at truecenter as poster + show expression "#00000080" as underlay + show expression Image(poster_OBJ.decoration.image) zorder 25 at truecenter as poster call ctc diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy index 10b4cb14..1df5c6c7 100644 --- a/game/scripts/shops/dress/chitchats.rpy +++ b/game/scripts/shops/dress/chitchats.rpy @@ -936,7 +936,7 @@ label purchase_outfit(item): gen "Well, if you could, I'd like something like this... *Scribbles*." ("base", xpos="far_left", ypos="head") #TODO uncomment once conversion for python 3 allows it - #show image Transform(Fixed("paper", "geniedrawing", fit_first=True), align=(0.5, 0.5), zoom=0.5) as drawing + #show expression Transform(Fixed("paper", "geniedrawing", fit_first=True), align=(0.5, 0.5), zoom=0.5) as drawing #with d5 #call ctc #hide drawing