From 7870da0905d1b3100f7cd2c25a23a53105db2f56 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sun, 19 Jun 2022 22:27:08 +0100 Subject: [PATCH] Bug fixes * Fix `fem` caller unnecessary arguments (Caused by regex most likely) * Fixed xray displayable opaque Render flag (superseded by internal Ren'py changes) * Fixed Doll animation concatenation to list --- game/scripts/cg/xray.rpy | 2 +- .../cho/events/quidditch/gryffindor_match.rpy | 3 +- .../cho/events/quidditch/hufflepuff_match.rpy | 4 +- .../characters/hermione/events/tentacles.rpy | 14 +-- game/scripts/doll/main.rpy | 6 +- game/scripts/events/ending.rpy | 106 +++++++++--------- .../minigames/mirror/events/panty_raid.rpy | 2 +- 7 files changed, 70 insertions(+), 67 deletions(-) diff --git a/game/scripts/cg/xray.rpy b/game/scripts/cg/xray.rpy index 6968a820..8ed4424c 100644 --- a/game/scripts/cg/xray.rpy +++ b/game/scripts/cg/xray.rpy @@ -50,7 +50,7 @@ init python: overlay = renpy.render(self.overlay, width, height, st, at) mask = renpy.render(self.mask, width, height, st, at) - rv = renpy.Render(width, height, opaque=False) + rv = renpy.Render(width, height) rv.operation = renpy.display.render.IMAGEDISSOLVE rv.operation_alpha = 1.0 diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 47058d07..fb42e14d 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -564,7 +564,7 @@ label gryffindor_match: $ renpy.sound.play("sounds/wolf_whistle2.ogg") call quidditch_stands(crowd_react=["emo8", None, None]) - fem "Shake that booty, sister!" ("base", xpos="far_left", ypos="head") + fem "Shake that booty, sister!" stop bg_sounds fadeout 3.0 call play_sound("kick") with hpunch @@ -1666,7 +1666,6 @@ label gryffindor_match_return: gen "...{w=0.8}{nw}" ("base", xpos="far_left", ypos="head") gen "...{w=0.8}{nw}" ("angry", xpos="far_left", ypos="head") - hoo "Prison? No, not that, thank heavens." ("open", "shocked", "shocked", "mid") hoo "But she could kiss getting into any sort of professional league goodbye." ("open", "shocked", "base", "down") gen "Kiss--" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 5bd67088..a33b0beb 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -731,7 +731,7 @@ label hufflepuff_match: $ renpy.sound.play("sounds/giggle2_loud.ogg") hide hermione_main with d3 - fem "What a slut!" ("base", xpos="far_left", ypos="head") + fem "What a slut!" call ctc # Pack to stands. @@ -779,7 +779,7 @@ label hufflepuff_match: call quidditch_stands(crowd_react=["emo8", "emo7", "sur"]) with d3 - fem "We want to see them!" ("base", xpos="far_left", ypos="head") + fem "We want to see them!" $ renpy.sound.play("sounds/crowd_cheer.ogg") call quidditch_stands(crowd_react=["emo8", "emo7", "emo8"]) diff --git a/game/scripts/characters/hermione/events/tentacles.rpy b/game/scripts/characters/hermione/events/tentacles.rpy index 38a33f74..51bdc8ac 100644 --- a/game/scripts/characters/hermione/events/tentacles.rpy +++ b/game/scripts/characters/hermione/events/tentacles.rpy @@ -297,7 +297,7 @@ label tentacle_scene_intro: ">Slinking your slimy tentacles under her top and skirt." if not hermione.is_worn("panties"): mal "Hey, look, look! She doesn't have panties on!" - fem "Oh my gosh, so the rumours about her were true?!" ("base", xpos="far_left", ypos="head") + fem "Oh my gosh, so the rumours about her were true?!" mal2 "And she brought her own plant sample, I bet she planned this out, what a total slut!" her "Oh no..." $ renpy.sound.play("sounds/cloth_rip.ogg") @@ -310,7 +310,7 @@ label tentacle_scene_intro: if hermione.is_worn("panties"): ">The tentacles slowly remove her panties, revealing her pussy to the entire class." mal "Wow..." - fem "This is horrible, someone should do something!" ("base", xpos="far_left", ypos="head") + fem "This is horrible, someone should do something!" mal2 "Professor Sprout says as long as she doesn't move she'll be released." $ renpy.sound.play("sounds/plant_slithering.ogg") ">You position a large, flowered tentacle above Hermione's head." @@ -455,7 +455,7 @@ label tentacle_1: #Public path $ renpy.sound.play("sounds/slick_02.ogg") ">The sensations proved to much for Hermione and she faints, going limp in your tentacles." mal "What a slut..." - fem "That's what I've been telling you!" ("base", xpos="far_left", ypos="head") + fem "That's what I've been telling you!" mal2 "Man, I'm going to have to join Gryffindor." hide screen cg show screen blkfade @@ -526,7 +526,7 @@ label tentacle_2: # Personal path ">You start to rotate the tentacles in her vagina." gen "!!! *HMMMMM*" mal "Wow, I think she's starting to enjoy it." - fem "Hermione? No way, she's too stuck-up to let boys kiss her, not to mention enjoying sex. {size=-6}With a plant but still..{/size}" ("base", xpos="far_left", ypos="head") + fem "Hermione? No way, she's too stuck-up to let boys kiss her, not to mention enjoying sex. {size=-6}With a plant but still..{/size}" mal2 "I don't know man, she doesn't look like she hates it." play bg_sounds "sounds/slickloopfast.ogg" fadein 2 fadeout 2 ">You increase the speed of the tentacles in her vagina." @@ -576,7 +576,7 @@ label tentacle_2: # Personal path $ renpy.sound.play("sounds/slick_02.ogg") mal "Told you she was a slut." $ renpy.sound.play("sounds/slick_02.ogg") - fem "I guess you were right..." ("base", xpos="far_left", ypos="head") + fem "I guess you were right..." hide screen cg show screen blkfade with d9 @@ -586,9 +586,9 @@ label tentacle_2: # Personal path her "..................*Ah*" spo ".... She's breathing, thank be Merlin." spo "You! Yes, you girls! Take her to the hospital wing at once!" - fem "W-wha-- But..." ("base", xpos="far_left", ypos="head") + fem "W-wha-- But..." spo "What are you waiting for!" - fem "{size=-4}Fine...{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Fine...{/size}" call play_sound("running") pause 3.0 diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy index 9c8e4451..04fe06a8 100644 --- a/game/scripts/doll/main.rpy +++ b/game/scripts/doll/main.rpy @@ -48,8 +48,12 @@ init python: return base_transform = doll_transform(self.pos, self.zoom, self.xzoom) + animation = self.animation - renpy.show(name=self.tag, at_list=[base_transform] + self.animation, layer=self.layer, what=self.get_image(), zorder=self.zorder) + if not isinstance(animation, list): + animation = [animation] + + renpy.show(name=self.tag, at_list=[base_transform] + animation, layer=self.layer, what=self.get_image(), zorder=self.zorder) def hide(self): renpy.hide(name=self.tag, layer=self.layer) diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy index 5c379a63..54d4d264 100644 --- a/game/scripts/events/ending.rpy +++ b/game/scripts/events/ending.rpy @@ -440,20 +440,20 @@ label ball_ending_E2: mal "*huh*? No, that's not a rumour, that's a fact." mal "The rumour was that she is being paid in house points to whore herself out." mal2 "*Hmm*... I don't believe that. I think she is just a slut." - fem "Who's a slut?" ("base", xpos="far_left", ypos="head") + fem "Who's a slut?" mal "Oh, hey you..." - fem "So, who's a slut?" ("base", xpos="far_left", ypos="head") + fem "So, who's a slut?" mal2 "Hermione Granger..." - fem "*Tsk*! You, guys are talking about that whore again?" ("base", xpos="far_left", ypos="head") - fem "That girl jerks off a couple of dicks, gives a few blowjobs and suddenly she is the school's new sensation." ("base", xpos="far_left", ypos="head") - fem "Pathetic little muggle-born..." ("base", xpos="far_left", ypos="head") + fem "*Tsk*! You, guys are talking about that whore again?" + fem "That girl jerks off a couple of dicks, gives a few blowjobs and suddenly she is the school's new sensation." + fem "Pathetic little muggle-born..." mal "You should not be jealous of--" - fem "Jealous? Of her? Puh-lease!" ("base", xpos="far_left", ypos="head") - fem "I have no use for popularity that comes from putting cocks in my mouth!" ("base", xpos="far_left", ypos="head") + fem "Jealous? Of her? Puh-lease!" + fem "I have no use for popularity that comes from putting cocks in my mouth!" mal "Well, if you ever change your mind..." - fem "*huh*?" ("base", xpos="far_left", ypos="head") + fem "*huh*?" mal "Feel free to use me as a stepping stone on your road to fame!" - fem "You wish!" ("base", xpos="far_left", ypos="head") + fem "You wish!" mal2 "Hey, guys, I think that's Hermione over there!" mal "You're right!" mal2 "Do you think if I ask her to the dance, I might get lucky later?" @@ -463,29 +463,29 @@ label ball_ending_E2: mal2 "Hey, wait up! That was my idea!" call play_sound("running") pause 2 - fem "Guys...?" ("base", xpos="far_left", ypos="head") - fem "........................." ("base", xpos="far_left", ypos="head") - fem "*Tsk*... Men......" ("base", xpos="far_left", ypos="head") + fem "Guys...?" + fem "........................." + fem "*Tsk*... Men......" else: # Personal whore ending # Students talking mal "{size=-4}Have you heard the rumours?{/size}" mal2 "{size=-4}Yeah, they say Hermione took one for the team.{/size}" - fem "{size=-4}Whoring herself out for house points!{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}How disgraceful!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Whoring herself out for house points!{/size}" + fem "{size=-4}How disgraceful!{/size}" mal "{size=-4}Those are just rumours!{/size}" - fem "{size=-4}I think it's more than just that...{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}I think it's more than just that...{/size}" mal "{size=-4}Oh, shut up! You are just jealous.{/size}" mal2 "{size=-4}Yeah, you wish you had Hermione's courage!{/size}" mal "{size=-4}Exactly! No one is more loyal to Gryffindor than she is!{/size}" mal "{size=-4}Even if the rumours are true, what does it matter?{/size}" mal "{size=-4}Thanks to her sacrifice our house will be getting the cup this year!{/size}" mal2 "{size=-4}Yeah, and what did you ever do for our house?{/size}" - fem "{size=-4}I..... But....{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}I..... But....{/size}" mal "{size=-4}Exactly! So don't you bad-mouth Hermione!{/size}" mal2 "{size=-4}You said it, man.{/size}" - fem "{size=-4}*Pouting*{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}*Pouting*{/size}" hide screen bld1 call hide_blktone_top @@ -1126,30 +1126,30 @@ label ball_ending_E2: mal "{size=-4}That doesn't look like sweat though...{/size}" mal2 "{size=-4}Yeah...{/size}" mal2 "{size=-4}Some weird goo seeping out of her hair...{/size}" - fem "{size=-4}Are you guys really {i}that{/i} dim?{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Are you guys really {i}that{/i} dim?{/size}" mal "{size=-4}What?{/size}" - fem "{size=-4}That's cum... obviously.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}That's cum... obviously.{/size}" mal2 "{size=-4}What? Bullshit, girl!{/size}" - fem "{size=-4}I think I know cum when I see it.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}I think I know cum when I see it.{/size}" mal "{size=-4}I bet you do. *Chuckle*{/size}" - fem "{size=-4}Whatever. Just take a better look...{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}She must've let some guy bury his cock in her hair and pump it full of semen.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Whatever. Just take a better look...{/size}" + fem "{size=-4}She must've let some guy bury his cock in her hair and pump it full of semen.{/size}" mal "{size=-4}*Hmm*... Hair fucking then? Is that a thing now?{/size}" mal2 "{size=-4}You girls do the craziest things.{/size}" - fem "{size=-4}*Humph*! Not all of us are sluts, you know.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}*Humph*! Not all of us are sluts, you know.{/size}" mal "{size=-4}Unfortunately not...{/size}" - fem "{size=-4}\"Unfortunately\"?!{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}*Tsk*! You, men are so clueless about everything!{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}You could never build a meaningful relationship with a slut!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}\" + fem "{size=-4}*Tsk*! You, men are so clueless about everything!{/size}" + fem "{size=-4}You could never build a meaningful relationship with a slut!{/size}" mal "{size=-4}What's a \"meaningful relationship\"?{/size}" - fem "{size=-4}It's when your girl is also your best friend.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}It's when your girl is also your best friend.{/size}" mal "{size=-4}Oh, I don't need {i}that{/i}!{/size}" mal "{size=-4}I already have a best friend, this ugly bugger right here.{/size}" mal2 "{size=-4}Right back at you, mate!{/size}" mal "{size=-4}But I sure could use a slut in my life!{/size}" mal2 "{size=-4}What he said!{/size}" - fem "{size=-4}you guys are...{/size}" ("base", xpos="far_left", ypos="head") - fem "Such Idiots!!!" ("base", xpos="far_left", ypos="head") + fem "{size=-4}you guys are...{/size}" + fem "Such Idiots!!!" hide screen blktone $ dynamic_cg("ball/speech", "background", "base", "mouth_open", "eyes_closed", "cum4", "overlay") @@ -1200,9 +1200,9 @@ label ball_ending_E2: mal2 "{size=-4}No, it's really happening... I see it too...{/size}" mal "{size=-4}Hermione... Granger's... tit...{/size}" mal "{size=-4}Major wardrobe malfunction, mate!{/size}" - fem "{size=-4}Oh no! Poor thing! We must let her know!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Oh no! Poor thing! We must let her know!{/size}" mal "{size=-4}Don't you dare to take this away from us, girl!{/size}" - fem "{size=-4}But...!!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}But...!!{/size}" call hide_blktone_top call ctc @@ -1231,15 +1231,15 @@ label ball_ending_E2: mal "{size=-4}Now she just sort of stands there...{/size}" mal2 "{size=-4}Giving us a better look...?{/size}" mal "{size=-4}Do You think she is aware of her tit being visible at all?{/size}" - fem "{size=-4}What a shameless display...{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}And to think that I almost felt sorry for that slut...{/size}" ("base", xpos="far_left", ypos="head") - fem "........................" ("base", xpos="far_left", ypos="head") + fem "{size=-4}What a shameless display...{/size}" + fem "{size=-4}And to think that I almost felt sorry for that slut...{/size}" + fem "........................" with hpunch - fem "{size=+5}Cover up, you shameless slut!!!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=+5}Cover up, you shameless slut!!!{/size}" mal "{size=-4}!!!{/size}" mal2 "{size=-4}Have you lost your mind, yelling like that?!{/size}" with hpunch - fem "{size=+5}Gryffindor whore!!!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=+5}Gryffindor whore!!!{/size}" call hide_blktone_top $ dynamic_cg("ball/speech", "background", "base2", "mouth_open", "eyes_closed", "brows", "cum6", "overlay") @@ -2068,40 +2068,40 @@ label ball_ending_E2: call blktone_top mal "{size=-4}So it's Hermione Granger again this year...{/size}" - fem "{size=-4}*Tsk*... Why am I not surprised?{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}*Tsk*... Why am I not surprised?{/size}" mal2 "{size=-4}Maybe because she deserves it?{/size}" mal "{size=-4}Yeah! Stop hating on Hermione!{/size}" - fem "{size=-4}*Tch*... Whatever.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}*Tch*... Whatever.{/size}" mal "{size=-4}By the way, when Hermione went on stage-{/size}" mal2 "{size=-4}Yeah, there was something in her mouth. I noticed it too.{/size}" - fem "{size=-4}I bet it was someone's cum!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}I bet it was someone's cum!{/size}" mal "{size=-4}WHAT?!!{/size}" mal2 "{size=-4}Get your head out of the gutter, girl!{/size}" - fem "{size=-4}Why not?{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}Everyone knows she is sleeping with Professor Dumbledore!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Why not?{/size}" + fem "{size=-4}Everyone knows she is sleeping with Professor Dumbledore!{/size}" mal "{size=-4}No, not your gossips again.{/size}" mal2 "{size=-4}Wait, I want to hear this one. Tell us more.{/size}" - fem "{size=-4}What is there to tell?{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}Hermione Granger is a whore. She enjoys sucking cocks....{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}Yes, she loves to suck cocks but she loves sperm even more!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}What is there to tell?{/size}" + fem "{size=-4}Hermione Granger is a whore. She enjoys sucking cocks....{/size}" + fem "{size=-4}Yes, she loves to suck cocks but she loves sperm even more!{/size}" mal "{size=-4}....{/size}" - fem "{size=-4}She is a sperm addict! She must swallow half a cup of sperm every day...{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}Because if she doesn't she goes into a sex-craze...{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}She is a sperm addict! She must swallow half a cup of sperm every day...{/size}" + fem "{size=-4}Because if she doesn't she goes into a sex-craze...{/size}" mal2 "{size=-4}.....{/size}" - fem "{size=-4}And when that happens she cannot control herself and will gladly sleep with the first man she sees.{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}And when that happens she cannot control herself and will gladly sleep with the first man she sees.{/size}" mal "{size=-4}.............{/size}" mal2 "{size=-4}.....................{/size}" - fem "{size=-4}*Hmm*? Why are you staring at me like that?{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}*Hmm*? Why are you staring at me like that?{/size}" mal "{size=-4}What? We're not staring.{/size}" mal2 "{size=-4}Yes, keep talking. You are good at this!{/size}" - fem "{size=-4}Good at what?!{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}Wait a second, are you guys getting off on this?{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}Good at what?!{/size}" + fem "{size=-4}Wait a second, are you guys getting off on this?{/size}" mal "{size=-4}Heh... Look at the crow calling the raven black!{/size}" - fem "{size=-4}What do you mean?{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}What do you mean?{/size}" mal2 "{size=-4}You are blushing like crazy, girl! And your eyes are all misty!{/size}" mal "{size=-4}Yeah! You enjoy this as much as we do!{/size}" - fem "{size=-4}!!!?{/size}" ("base", xpos="far_left", ypos="head") - fem "{size=-4}You guys are idiots!{/size}" ("base", xpos="far_left", ypos="head") + fem "{size=-4}!!!?{/size}" + fem "{size=-4}You guys are idiots!{/size}" call play_sound("running") pause 3 diff --git a/game/scripts/minigames/mirror/events/panty_raid.rpy b/game/scripts/minigames/mirror/events/panty_raid.rpy index e2084ee0..92488a2f 100644 --- a/game/scripts/minigames/mirror/events/panty_raid.rpy +++ b/game/scripts/minigames/mirror/events/panty_raid.rpy @@ -588,7 +588,7 @@ label panty_raid: call play_sound("knocking") "*Knock-knock-knock*" pause 1.0 - fem "Who is it?" ("base", xpos="far_left", ypos="head") + fem "Who is it?" pause 0.5 her "It's me... Hermione granger." call play_sound("door")