From 129b9256e12e5a4a5812aff75577f76ce59b9f99 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Wed, 15 Mar 2023 20:52:15 +0100 Subject: [PATCH] Fixes and more * Re-added Tonks' Silky dress using in-engine opacity to allow 0 opacity. * Adjusted some calls to work with new bld/blktone functions. * Fixed Hermione talking about herself rather than genie. (nickname) * Minor writing and positioning fixes --- .../poses/default/clothes/top/silk_dress/0.webp | 4 ++-- .../cho/events/favors/inspect_her_body_tier2.rpy | 6 ++---- .../characters/cho/events/favors/talk_to_me.rpy | 14 +++----------- .../cho/events/quidditch/hufflepuff_match.rpy | 6 +++--- .../events/favors/dance_for_me_masturbate.rpy | 10 +++++----- .../hermione/events/favors/talk_to_me.rpy | 2 +- game/scripts/characters/hermione/events/forest.rpy | 2 +- game/scripts/characters/tonks/wardrobe.rpy | 2 +- 8 files changed, 18 insertions(+), 28 deletions(-) diff --git a/game/characters/tonks/poses/default/clothes/top/silk_dress/0.webp b/game/characters/tonks/poses/default/clothes/top/silk_dress/0.webp index 1c87a2b2..94d41e48 100644 --- a/game/characters/tonks/poses/default/clothes/top/silk_dress/0.webp +++ b/game/characters/tonks/poses/default/clothes/top/silk_dress/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17cb006d3897cd1afcc8e1b909c79906c40a3864f4d988c0462a0e6a0f5aae3d -size 5606 +oid sha256:72668069f0e79f26dfa183aacf07e43aeb1792fe556bb65ed97eba42e43cf342 +size 5924 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 d3948179..25b63f3e 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 @@ -208,9 +208,7 @@ label cc_pf_strip_T2_intro_E1: cho "I wholeheartedly agree, Sir!" ("base", "narrow", "angry", "mid") gen "Her tits sag too much, and her fat hips are disgusting..." ("base", xpos="far_left", ypos="head") hide cho_main - call blktone gen "(Something deep inside me just died saying this...)" ("angry", xpos="far_left", ypos="head") - call hide_blktone cho "She really is a..." ("open", "closed", "raised", "mid") cho "... stupid..." ("angry", "closed", "angry", "mid") cho "... fat..." ("clench", "narrow", "angry", "mid") @@ -707,7 +705,7 @@ label cc_pf_strip_T2_intro_E2: with d3 pause .2 - cho "Yes?" ("soft", "base", "raised", "mid", ypos="head", flip=False) + cho "Yes?" ("soft", "base", "raised", "mid", xpos="base", flip=False) gen "Aren't you forgetting about something?" ("base", xpos="far_left", ypos="head") cho "Sir?" ("soft", "narrow", "base", "mid") gen "You're still naked...{w} I wouldn't go out there if I were you..." ("base", xpos="far_left", ypos="head") @@ -773,7 +771,7 @@ label cc_pf_strip_T2_intro_E3: cho "..." ("annoyed", "narrow", "worried", "mid") gen "Now, unless there are any more objections, it's time we get back to your training." ("base", xpos="far_left", ypos="head") cho "*Hmph*... I can't believe this could even be considered \"training\"." ("annoyed", "narrow", "angry", "mid") - gen "Well, it is a trainer after all..." + gen "Well, it is a \"trainer\" after all..." ("base", xpos="far_left", ypos="head") cho "What?" ("annoyed", "narrow", "angry", "mid") gen "I'll consider incorporating some more physical training for you in the future." ("base", xpos="far_left", ypos="head") gen "Now, less talking, more stripping." ("base", xpos="far_left", ypos="head") 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 21cfe8c4..efd4268c 100644 --- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy @@ -316,7 +316,7 @@ label cc_pf_talk_T1_intro_E2: cho "First... Mouth, [name_genie_cho]?" ("soft", "base", "raised", "mid") gen "That's right." ("base", xpos="far_left", ypos="head") cho "I don't--" ("annoyed", "base", "base", "mid") - gen "Speaking of your team...{w=0.4} You're getting along with then well, I hope?" ("base", xpos="far_left", ypos="head") + gen "Speaking of your team...{w=0.4} You're getting along with them well, I hope?" ("base", xpos="far_left", ypos="head") cho "I'd say so...{w=1.0} Although there was a time when--" ("soft", "base", "base", "mid") cho "Let's just say it was a bit difficult for me at first. After all Quidditch is largely dominated by men..." ("open", "narrow", "worried", "down") cho "Getting accepted into our Quidditch team was a challenge. I really had to prove I was worth it." ("soft", "narrow", "worried", "mid") @@ -716,9 +716,6 @@ label cc_pf_talk_T2_intro_E1: with d3 pause .8 - show screen blktone # Gets removed by `nar ` - show screen bld1 - with d3 gen "(Just to make this clear, I'm not getting off because I like the thought that she's getting bullied...)" ("base", xpos="far_left", ypos="head") nar "Right..." gen "I hope you fought back those bullies?" ("angry", xpos="far_left", ypos="head") @@ -770,15 +767,12 @@ 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 - hide screen bld1 - with d3 call cum_block call gen_chibi("cum_behind_desk") with d3 pause .8 - call bld gen "*Argh*! {size=-4}(Take it!){/size}" ("angry", xpos="far_left", ypos="head") call cum_block @@ -1041,7 +1035,6 @@ label cc_pf_talk_T2_intro_E2: # Cho leaves. call cho_walk(action="leave") - call bld gen "(I really did make a mess...)" ("base", xpos="far_left", ypos="head") gen "(Maybe I {b}should{/b} get Hermione to clean it up for me?)" ("base", xpos="far_left", ypos="head") gen "(With her mouth!)" ("grin", xpos="far_left", ypos="head") @@ -1121,7 +1114,7 @@ label cc_pf_talk_T2_E3: cho "He even had the audaciousness to whistle at me, in front of everybody!" ("soft", "narrow", "base", "mid") cho "And shout about what a \"great arse\" I have, and that he couldn't wait to \"beat it\"!" ("soft", "narrow", "angry", "mid") if genie_masturbating: - gen "Great minds...{w=0.2} *Argh!* think alike!" ("angry", xpos="far_left", ypos="head") + gen "Great minds...{w=0.2} *Argh*! think alike!" ("angry", xpos="far_left", ypos="head") else: gen "Sounds to me like he was just enjoying the view!" ("grin", xpos="far_left", ypos="head") cho "Next time he does it I'll turn him into a filthy ferret, I swear!" ("clench", "narrow", "angry", "down") @@ -1195,7 +1188,7 @@ label cc_pf_talk_T2_E3: cho "And let the entire school watch her as she's getting pounded by a horde of centaurs!!!" ("mad", "narrow", "angry", "mid") if genie_masturbating: - gen "*Argh!*{w=0.3} {size=-4}(What the hell?){/size}" ("angry", xpos="far_left", ypos="head") + gen "*Argh*!{w=0.3} {size=-4}(What the hell?){/size}" ("angry", xpos="far_left", ypos="head") cho "While there are bludgers flying around -- hitting her disgusting udders..." ("soft", "narrow", "angry", "mid") gen "{size=-4}(That sounds really painful!){/size}" ("angry", xpos="far_left", ypos="head") nar "*Fap* *Fap* *Fap*!" @@ -1272,7 +1265,6 @@ label cc_pf_talk_T2_E3: # Cho leaves. call cho_walk(action="leave") - call bld gen "(Well that was weird.)" ("base", xpos="far_left", ypos="head") gen "(That girl has a very wild imagination, I've got to say...)" ("base", xpos="far_left", ypos="head") gen "(Although I have to admit, I'm a bit of a fanboy now...)" ("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 53c70660..a2c5aa71 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -702,7 +702,7 @@ label hufflepuff_match: her "" ("normal", "happyCl", "base", "mid") sna "Great commentary there girl... You might want to let them know the colour of the grass next..." ("snape_10", ypos="head") play sound "sounds/ball_hit.ogg" - her "Um, I'm not sure if anyone's scored yet..." ("normal", "happy", "base", "mid") + her "*Umm*, I'm not sure if anyone's scored yet..." ("normal", "happy", "base", "mid") her "Wait, that guy has the quaffle... I think..." ("open", "squint", "base", "mid") her "Scratch that last bit, he has a stick so he must be a beater!" ("mad", "happy", "base", "mid") sna "{size=-4}Good grief...{/size}" ("snape_05", ypos="head") @@ -970,7 +970,7 @@ label hufflepuff_match: cho "No one did, thanks to your dreadful commentating!" ("scream", "narrow", "angry", "L") cho "" ("mad", "narrow", "angry", "L") her "Oh..." ("normal", "wide", "worried", "shocked") - her "So should I announce it now?" ("open", "happyCl", "worried", "mid") + her "So, should I announce it now?" ("open", "happyCl", "worried", "mid") sna "Obviously--" ("snape_12", ypos="head") cho "{size=+10}YES!{/size}" ("scream", "closed", "angry", "mid", trans=vpunch) her "" ("normal", "base", "annoyed", "L") @@ -1115,7 +1115,7 @@ label hufflepuff_match_return: cho "I was a little at the start of the game..." ("quiver", "narrow", "worried", "downR", cheeks="blush") cho "But once I realised how much it was affecting those slack-jawed Hufflepuffs..." ("smile", "narrow", "angry", "R") cho "It was like having my own personal weapon of mass distraction!" ("smile", "wide", "angry", "mid") - cho "I don't think Cedric even knew where the snitch was most of the time!" ("horny", "base", "base", "downR", cheeks="blush") + cho "I don't think Cedric even knew where the snitch was, most of the time!" ("horny", "base", "base", "downR", cheeks="blush") cho "All he seemed to do was follow me around..." ("horny", "narrow", "worried", "down", cheeks="blush") cho "Him {size=-2}and {size=-2}half {size=-2}the {size=-2}team...{/size}{/size}{/size}{/size}" ("quiver", "narrow", "worried", "downR", cheeks="heavy_blush") cho "This might be the first real chance Ravenclaw has ever had to win the cup." ("open", "closed", "worried", "mid") diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy index fede68d6..eb725080 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy @@ -122,7 +122,7 @@ label hg_pf_strip_T4_fingering: call ctc her "*Ah*...{heart}" ("open", "happyCl", "worried", "mid") - gen "ha! just Admit it, you do enjoy being called a slut!" ("base", xpos="far_left", ypos="head") + gen "Ha! just Admit it, you do enjoy being called a slut!" ("base", xpos="far_left", ypos="head") her "I do not!" ("normal", "happyCl", "worried", "mid") her "I'm just thinking about...{w=0.4}*Ah*...{w=0.4} how happy everyone will be when we win!" ("shock", "happyCl", "worried", "mid") gen "And what if they find out how you earned the points?" ("base", xpos="far_left", ypos="head") @@ -202,7 +202,7 @@ label hg_pf_strip_T4_fingering: gen "Are you sure?" ("base", xpos="far_left", ypos="head") her "*Ah*...{heart}" ("soft", "narrow", "base", "up", cheeks="blush") her "It...{w=0.4} I'm sure it's just sweat, [name_genie_hermione]..." ("open", "narrow", "base", "R", cheeks="blush") - gen "if you say so..." ("base", xpos="far_left", ypos="head") + gen "If you say so..." ("base", xpos="far_left", ypos="head") her "..............." ("soft", "closed", "base", "up", cheeks="blush") gen "Slut." ("base", xpos="far_left", ypos="head") play background "sounds/slickloopfast.ogg" @@ -225,10 +225,10 @@ label hg_pf_strip_T4_fingering: play background "sounds/slickloop.ogg" her "*Ah*..." ("soft", "narrow", "base", "R", cheeks="blush") - gen "almost there [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") - her "a-almost..." ("annoyed", "base", "worried", "L", cheeks="blush") + gen "Almost there [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") + her "A-almost..." ("annoyed", "base", "worried", "L", cheeks="blush") her "I just need a bit longer..." - gen "well you better hurry..." ("base", xpos="far_left", ypos="head") + gen "Well you better hurry..." ("base", xpos="far_left", ypos="head") her "*Ah*...{w=0.3} I know, [name_genie_hermione]." ("angry", "happyCl", "worried", "mid") her "..........." ("normal", "closed", "base", "R", cheeks="blush") gen "Is everything alright?" ("base", xpos="far_left", ypos="head") 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 fb9ccfcc..71e067d2 100644 --- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy @@ -200,7 +200,7 @@ label hg_pf_talk_T2_intro_E1: label hg_pf_talk_T2_E1: if hg_jerkoff.trigger: - her "Another talk, [name_hermione_genie]?" ("soft", "base", "base", "mid") + her "Another talk, [name_genie_hermione]?" ("soft", "base", "base", "mid") her "(I hope he doesn't do \"that\" again...)" ("disgust", "narrow", "base", "down") else: her "Of course, Sir." ("soft", "base", "base", "R") diff --git a/game/scripts/characters/hermione/events/forest.rpy b/game/scripts/characters/hermione/events/forest.rpy index cfd86e0a..4d8de5e9 100644 --- a/game/scripts/characters/hermione/events/forest.rpy +++ b/game/scripts/characters/hermione/events/forest.rpy @@ -624,7 +624,7 @@ label forest_BJ_4: #Moaning myrtle dirty talk (Repeatable) (Threaten to expose) her "*Mmmmm*..." $ dynamic_cg("herm_forest", "base", "17", "overlay") - her "I can't believe you're making come down here during these circumstances..." + her "I can't believe you're making me come down here during these circumstances..." gen "Say what?" her "You heard me..." $ dynamic_cg("herm_forest", "base", "19", "overlay") diff --git a/game/scripts/characters/tonks/wardrobe.rpy b/game/scripts/characters/tonks/wardrobe.rpy index b6a0b5e9..89ca03a2 100644 --- a/game/scripts/characters/tonks/wardrobe.rpy +++ b/game/scripts/characters/tonks/wardrobe.rpy @@ -86,7 +86,7 @@ default ton_outfit_dressing_gown = DollOutfit([ton_hair_base, ton_robe_dressing_ ## Silky Dress Outfit ## ######################## -default ton_top_silk_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "silk_dress", ["#f0edfaff", "#eaeaeaff"], blacklist=["bra", "bottom"]) +default ton_top_silk_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "silk_dress", ["#f0edfaBF", "#eaeaeaff"], blacklist=["bra", "bottom"]) default ton_robe_silk = DollCloth("tonks", ("upper body", "robes"), "robe", "silk_robe", ["#f0edfaff"]) default ton_outfit_silky = DollOutfit([ton_hair_base, ton_top_silk_dress, ton_robe_silk], price=350, name="Silky Dress", desc="{size=-4}Disclaimer: Madam Mafkin isn't responsible for damaged nipples.{/size}")