From fe67e3d9ca2e5856ff0da64643521fbea9774c89 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Mon, 20 Mar 2023 13:17:24 +0100 Subject: [PATCH] Fixes * Fixed Cho Quidditch outfit not being set properly during Gryffindor tactic talk, and base outfit getting overwritten. * Removed bld and blktone in some places where it's replaced by inner thought and narrator character. * Minor writing improvements. * Minor Doll positioning improvements. --- .../cho/events/quidditch/gryffindor_match.rpy | 20 ++++---- .../events/quidditch/gryffindor_practice.rpy | 12 ++--- .../cho/events/quidditch/intros.rpy | 48 +++++++++---------- .../cho/events/quidditch/training.rpy | 7 +-- game/scripts/characters/cho/summon.rpy | 4 -- game/scripts/utility/common_labels.rpy | 2 +- 6 files changed, 45 insertions(+), 48 deletions(-) diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 626af830..819df722 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -11,7 +11,7 @@ label start_gryffindor_match: gen "The big game of course!" ("grin", xpos="far_left", ypos="head") cho "The--{w=0.4} Are you talking about the Quidditch Finals?" ("soft", "base", "raised", "mid") gen "You got it." ("grin", xpos="far_left", ypos="head") - gen "Time to put your game face on [name_cho_genie]." ("base", xpos="far_left", ypos="head") + gen "Time to put your game face on, [name_cho_genie]." ("base", xpos="far_left", ypos="head") gen "I hope you've had some practice on that broom." ("base", xpos="far_left", ypos="head") cho "I... Yes, you could say that." ("open", "narrow", "base", "downR", cheeks="blush") gen "Great." ("base", xpos="far_left", ypos="head") @@ -42,7 +42,7 @@ label start_gryffindor_match: cho "Oh, right..." ("soft", "base", "base", "mid", cheeks="blush") gen "You seem oddly distracted today [name_cho_genie]." ("base", xpos="far_left", ypos="head") - "-Tell Cho that Hermione obviously Likes her-": #(Happens on cc_pf_strip_T2_intro_E3 which is mandatory so shouldn't need a check) + "-Tell Cho that Hermione obviously Likes her-": #(Happens on cc_pf_strip_T2_intro_E3 which is mandatory) $ cho_hermione_affection = "hermione" gen "Isn't it obvious?" ("base", xpos="far_left", ypos="head") @@ -56,7 +56,7 @@ label start_gryffindor_match: cho "I... I have never thought that she--" ("disgust", "narrow", "base", "down", cheeks="blush") gen "Now, now, there's no need to be overthinking it. Let's focus on responsibilities first, pleasantries second." ("base", xpos="far_left", ypos="head") - "-Tell Cho that she obviously likes Hermione-": #(Cho sees Hermione's Naked body even if it's Tonks transformed so shouldn't need a check) + "-Tell Cho that she obviously likes Hermione-": #(Cho sees Hermione's Naked body when Tonks transforms) $ cho_hermione_affection = "cho" gen "Is it really important to know why?" ("base", xpos="far_left", ypos="head") @@ -306,7 +306,7 @@ label gryffindor_match: ton "{size=-4}Thank Merlin, you're here...{/size}" ("normal", "base", "shocked", "R", ypos="head", flip=True) #whisper #genie walks next to Tonks # <- Not possible to do. ton "{size=-4}Where have you been?{/size}" ("open", "base", "base", "mid") #whisper - gen "{size=-4}You'd think that in a place of magic there'd be some better means of transport than simply walking...{/size}" ("base", xpos="far_left", ypos="head") #whisper + gen "{size=-4}You'd think that in a place of magic, there'd be some better means of transport than simply walking...{/size}" ("base", xpos="far_left", ypos="head") #whisper gen "{size=-4}What's Snape doing?{/size}" ("base", xpos="far_left", ypos="head") #whisper #Snape middle of the screen standing sna "And seeing that our dear headmaster couldn't make it today, it's fallen upon me--" ("snape_24", flip=True, xpos=340, ypos="base", trans=d5) @@ -572,7 +572,7 @@ label gryffindor_match: play sound "sounds/crowd_cheer2.ogg" call quidditch_stands(crowd_react=["emo8", "th", "emo8"]) - nar "Cheering from the Ravenclaw students erupts but is soon drowned out by excessive booing and jeering from the Slytherin crowd." + nar "Cheering from the Ravenclaw students erupts, but is soon drowned out by excessive booing and jeering from the Slytherin crowd." call quidditch_stands(crowd_react=[None, None, None]) gen "{size=-4}Why'd you cut me off like that?{/size}" ("base", xpos="far_left", ypos="head") #Whisper @@ -580,7 +580,7 @@ label gryffindor_match: gen "{size=-4}What's up with him?{/size}" ("base", xpos="far_left", ypos="head") ton "{size=-4}Trust me...{w=0.4} It was for your own good.{/size}" ("soft", "narrow", "base", "R") sna "{size=-4}\"He never stops talking about him\" he says...\n{/size}{w=0.4}How {w=0.2}{size=+4}{b}dare{/b}{/size} {w=0.2}you--" ("snape_12") - ton "{size=-2}Let's just focus on the game shall we?{/size}" ("open", "base", "raised", "R") + ton "{size=-2}Let's just focus on the game, shall we?{/size}" ("open", "base", "raised", "R") sna "Fine...{w=0.4} Count yourself lucky our bet is still up." ("snape_01") gen "I don't doubt you've got some filthy tricks up your sleeves again." ("base", xpos="far_left", ypos="head") sna "Says you." ("snape_39") @@ -1043,7 +1043,7 @@ label gryffindor_match: sna "Oh well, perhaps next time... Oh wait, there's no next time..." ("snape_46") else: sna "Of course, you can win the game even without your team being the ones to catch the snitch, albeit it is very uncommon..." ("snape_41") - sna "Perhaps if you'd learnt the actual game you wouldn't need to rely on silly rules like excessive elbow usage..." ("snape_46") # smug + sna "Perhaps if you'd learnt the actual game, you wouldn't need to rely on silly rules like excessive elbow usage..." ("snape_46") # smug gen "{size=-4}Smug bastard...{/size}" ("base", xpos="far_left", ypos="head") sna "I'll take that as a compliment." ("snape_37") @@ -1204,7 +1204,7 @@ label gryffindor_match: with d3 pause 1.0 - lun "Hmm... He never said I cannot put it back on..." ("open", "base", "base", "down", trans=d8) + lun "*Hmm*... He never said I cannot put it back on..." ("open", "base", "base", "down", trans=d8) play sound "sounds/cloth_sound3.ogg" $ luna.wear("all") @@ -2269,7 +2269,7 @@ label gryffindor_match_return: with d9 - cho "*Mmm*...{w=0.4} You're lucky I've been training for this, [name_genie_cho]..." ("smile", "narrow", "base", "down", cheeks="heavy_blush", ypos="head", flip=False, trans=d3) + cho "*Mmm*...{w=0.4} You're lucky I've been training for this, [name_genie_cho]..." ("smile", "narrow", "base", "down", cheeks="heavy_blush", xpos="base", ypos="head", flip=False, trans=d3) cho "Of course... I figured it'd come to this eventually..." ("open", "closed", "base", "mid", cheeks="heavy_blush") cho "Ever since I saw this thing for the first time..." ("base", "narrow", "base", "down", cheeks="heavy_blush") gen "(Why's she doing this? She already won the cup didn't she?)" @@ -2293,7 +2293,7 @@ label gryffindor_match_return: cho "You thought you were the only one having those thoughts?" ("soft", "narrow", "base", "mid", cheeks="heavy_blush", trans=d3) gen "*Err*..." cho "After I sucked your dick I couldn't help but worry--" ("open", "narrow", "base", "mid", cheeks="heavy_blush", trans=d3) - cho "That I'd end up winning the cup before ever knowing what my coach's thick beater's bat would feel like inside on my tight little... Snitch." ("horny", "narrow", "base", "down", cheeks="heavy_blush") + cho "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", cheeks="heavy_blush") #Cho up position dick in front of body show image "cho_sex up" as cg diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy index 6d6dbe9d..92c100f2 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy @@ -4,7 +4,7 @@ label cc_gt_start: gen "Alright then. Let's get you out there to smack some asses!" ("base", xpos="far_left", ypos="head") cho "Smack some asses, [name_genie_cho]?" ("angry", "base", "base", "mid") gen "You've heard me!" ("base", xpos="far_left", ypos="head") - gen "It's not against the rules is it?" ("base", xpos="far_left", ypos="head") + gen "It's not against the rules, is it?" ("base", xpos="far_left", ypos="head") cho "W--{w=0.2} Well... I suppose not, unless I do it with my elbows." ("soft", "narrow", "base", "R") gen "With your elbows...?" ("base", xpos="far_left", ypos="head") cho "Yeah, excessive use of elbows is against the rules." ("soft", "narrow", "base", "mid") @@ -16,8 +16,8 @@ label cc_gt_start: gen "Yeah!" ("base", xpos="far_left", ypos="head") cho "Isn't that a bit extreme?" ("angry", "narrow", "base", "mid", cheeks="blush") gen "A good ole love tap is hardly extreme." ("base", xpos="far_left", ypos="head") - gen "If you do it well enough then I'm sure Miss Granger will notice." ("base", xpos="far_left", ypos="head") - cho "Well enough [name_genie_cho]?" ("angry", "narrow", "base", "mid", cheeks="blush") + gen "If you do it well enough, then I'm sure Miss Granger will notice." ("base", xpos="far_left", ypos="head") + cho "Well enough, [name_genie_cho]?" ("angry", "narrow", "base", "mid", cheeks="blush") gen "Yeah, make those slaps echo across the pitch!" ("base", xpos="far_left", ypos="head") cho "*Hmm*... Alright then, I'll make sure of that..." ("open", "narrow", "base", "downR", cheeks="blush") gen "Great! Then get out there and spank some booty, [name_cho_genie]." ("base", xpos="far_left", ypos="head") @@ -47,7 +47,7 @@ label cc_gt_return: gen "[name_cho_genie]!" ("base", xpos="far_left", ypos="head") gen "Had a fruitful day, smacking some peaches?" ("base", xpos="far_left", ypos="head") - cho "I did not!" ("disgust", "narrow", "angry", "mid", cheeks="blush", trans=d3) + cho "I did not!" ("disgust", "narrow", "angry", "mid", xpos="mid", ypos="base", cheeks="blush", trans=d3) gen "Too bad, I was so sure it would have worked." ("base", xpos="far_left", ypos="head") cho "Oh it worked alright..." ("annoyed", "closed", "angry", "mid", cheeks="blush") gen "It did?" ("base", xpos="far_left", ypos="head") @@ -114,12 +114,12 @@ label cc_gt_return: with d5 # - cho "The school supplied brooms are ancient, there's no way I'd be able to win anything flying on that rubbish!" ("scream", "narrow", "worried", "mid", xpos="mid") + cho "The school supplied brooms are ancient, there's no way I'd be able to win anything, flying on that rubbish!" ("scream", "narrow", "worried", "mid", xpos="mid") cho "Harry's firebolt--" ("angry", "closed", "worried", "mid") gen "A broom's a broom. I'm sure the expensive ones are just branding." ("base", xpos="far_left", ypos="head") cho "..." ("disgust", "narrow", "base", "mid") gen "Just try them out, I'm sure it'll be fine." ("base", xpos="far_left", ypos="head") - cho "It's a waste of time but if that's what it takes then sure..." ("annoyed", "closed", "angry", "mid") + cho "It's a waste of time, but if that's what it takes, then sure..." ("annoyed", "closed", "angry", "mid") cho "I'll meet you at the pitch tomorrow morning." ("open", "closed", "angry", "mid") #smirk gen "Excellent, I'll...{w=0.4} Wait, did you say tomorrow morning?" ("base", xpos="far_left", ypos="head") cho "Yes, and you better be there, [name_genie_cho]..." ("disgust", "narrow", "angry", "mid") #smiling diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index b066cfcc..b4d2ef4d 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1084,12 +1084,12 @@ label cho_quid_E11: gen "Well, I've been looking into setting up a cheerleading squad." ("base", xpos="far_left", ypos="head") lun "Cheerleading?" ("soft", "base", "base", "mid") gen "Yes I--" ("base", xpos="far_left", ypos="head") - gen "Are you asking what it is or just confirming what I just said?" ("base", xpos="far_left", ypos="head") - lun "Oh, of course I know what it is! It's students that dress up and cheer for the players, right?" ("grin", "base", "base", "mid") + gen "Are you asking what it is, or just confirming what I just said?" ("base", xpos="far_left", ypos="head") + lun "Oh, of course I know what it is! It's students who dress up and cheer for the players, right?" ("grin", "base", "base", "mid") gen "That's right..." ("base", xpos="far_left", ypos="head") lun "..." ("base", "base", "base", "mid") gen "..." ("base", xpos="far_left", ypos="head") - gen "So... Is that something you could help me with?" ("base", xpos="far_left", ypos="head") + gen "So.{w=0.1}.{w=0.1}.{w=0.1}.{w=0.1}.{w=0.1} Is that something you could help me with?" ("base", xpos="far_left", ypos="head") lun "Oh, you want me to cheer at the finals?!" ("mad", "base", "base", "mid") gen "Yes... And your friends as well." ("base", xpos="far_left", ypos="head") gen "{size=-8}If you have any to begin with...{/size}" ("base", xpos="far_left", ypos="head") @@ -1233,7 +1233,7 @@ label cho_quid_E12: hoo "We use those for cleaning you know." ("base", "narrow", "base", "L") cho "See! I told you, sir!" ("mad", "narrow", "base", "mid", trans=d3) gen "..." ("base", xpos="far_left", ypos="head") - hoo "Certainly a good tool to teach students how to fly but not much beyond that." ("base", "base", "base", "L") + hoo "Certainly a good enough tool to teach students how to fly, but not much beyond that." ("base", "base", "base", "L") hoo "If you learn how to fly on one of those, you'll have no problem on a proper broomstick!" ("base", "base", "shocked", "mid") cho "" ("annoyed", "narrow", "base", "mid") gen "The motto for any public school when funds are involved." ("base", xpos="far_left", ypos="head") @@ -1254,13 +1254,13 @@ label cho_quid_E12: gen "{size=-6}More than usual that is...{/size}" ("base", xpos="far_left", ypos="head") #small text gen "Please... Help me..." ("base", xpos="far_left", ypos="head") cho "Azkaban--" ("mad", "happyCl", "angry", "mid", cheeks="blush") - hoo "Calm down miss Chang." ("open", "shocked", "angry", "L") + hoo "Calm down Miss Chang." ("open", "shocked", "angry", "L") cho "I need a broom that is as fast as Harry's!" ("angry", "narrow", "angry", "downR", cheeks="blush") - hoo "A firebolt? Now don't you think those expectations are a bit high Miss--" ("open", "shocked", "shocked", "L") + hoo "A firebolt? Now don't you think those expectations are a bit high, Miss--" ("open", "shocked", "shocked", "L") cho "Please professor, you're my only hope!" ("mad", "narrow", "base", "L") hoo "..." ("normal", "narrow", "base", "downR") - hoo "Well, I'd normally be able to pull some strings, but I don't think even I would be able to procure you a firebolt Miss Chang..." ("open", "base", "base", "down") - hoo "There's only so many produced each season and only a couple has been sold outside of professional--" ("normal", "base", "base", "down") + hoo "Well, I'd normally be able to pull some strings, but I don't think even I would be able to procure you a firebolt, Miss Chang..." ("open", "base", "base", "down") + hoo "There's only so many produced each season, and only a couple has been sold outside of professional--" ("normal", "base", "base", "down") cho "Pleaaaaaase!" ("soft", "narrow", "worried", "L") hoo "..." ("normal", "narrow", "worried", "downR") @@ -1285,7 +1285,7 @@ label cho_quid_E12: hoo "Promise me!" ("open", "shocked", "angry", "L") hoo "Don't ever tell a soul what I'm about to show you..." ("normal", "shocked", "base", "L") cho "Oh, of course professor!" ("angry", "base", "base", "L") - hoo "And that goes for you as well professor..." ("open", "base", "shocked", "mid") + hoo "And that goes for you as well, Professor..." ("open", "base", "shocked", "mid") gen "Of course, but what exactly--" ("base", xpos="far_left", ypos="head") hoo "Alright then, one moment..." ("grin", "base", "base", "R") gen "Hold on, this isn't a broom from some black market brooms dealer is it?" ("base", xpos="far_left", ypos="head") @@ -1365,7 +1365,7 @@ label cho_quid_E12: gen "You heard the squirrel." ("base", xpos="far_left", ypos="head") "-Pretend like you misheard her-": gen "Oh, the masked seeker! I thought you said, the masked streaker... You should really learn how to speak up." ("base", xpos="far_left", ypos="head") - cho "... You actually don't know do you?" ("disgust", "narrow", "base", "mid") + cho "... You actually don't know, do you?" ("disgust", "narrow", "base", "mid") gen "Of course I do..." ("base", xpos="far_left", ypos="head") gen "..." ("base", xpos="far_left", ypos="head") gen "Although a reminder wouldn't hurt." ("base", xpos="far_left", ypos="head") @@ -1421,7 +1421,7 @@ label cho_quid_E12: cho "Wow..." ("smile", "base", "base", "L", cheeks="blush") hoo "Think of magic as a tree." ("open", "base", "base", "L", cheeks="blush") hoo "All magic in this world and others stem from the same source, each school of magic are just branches leading to it." ("base", "shocked", "base", "L", cheeks="blush") - hoo "If the magic user has a higher understanding of the core fundamentals of that branch of magic then they have a much easier time at manipulating it.." ("base", "base", "base", "L", cheeks="blush") + hoo "If the magic user has a higher understanding of the core fundamentals of that branch of magic, then they have a much easier time at manipulating it.." ("base", "base", "base", "L", cheeks="blush") hoo "As an example, creatures of old such as Djinns possess magical abilities that stretch as far as the roots of magic." ("base", "base", "base", "mid", cheeks="blush") hoo "Although their abilities are innate... We'd be so lucky to even get close to the source of each school of magic." ("base", "shocked", "base", "mid", cheeks="blush") gen "(Makes sense... I sort of just waved my fingers and shit happened...)" ("base", xpos="far_left", ypos="head") @@ -1445,9 +1445,9 @@ label cho_quid_E12: hoo "It's about forming that bond with the object." ("base", "shocked", "base", "mid", cheeks="blush") gen "I polish mine every day." ("base", xpos="far_left", ypos="head") cho "Wow..." ("smile", "narrow", "base", "L", cheeks="blush") - hoo "Which leads me to my practical research in the subject and how I finally became... The masked seeker." ("open", "closed", "shocked", "mid", cheeks="blush_heavy") + hoo "Which leads me to my practical research in the subject, and how I finally became... The masked seeker." ("open", "closed", "shocked", "mid", cheeks="blush_heavy") cho "Oooh!" ("smile", "base", "base", "L") - hoo "So... With this knowledge I started working on figuring out new ways to care for your broom." ("base", "base", "base", "down", cheeks="blush") + hoo "So... With this knowledge, I started working on figuring out new ways to care for your broom." ("base", "base", "base", "down", cheeks="blush") hoo "I tried sweeping with it, it's a broom after all, I thought maybe it would like that." ("open", "shocked", "raised", "R", cheeks="blush") hoo "But it didn't work, in fact it made the broom slower... Which made sense, this broom was designed for flying after all..." ("normal", "base", "base", "mid", cheeks="blush") hoo "I tried talking to it... And that might've worked, albeit the fact that brooms don't have ears..." ("base", "shocked", "base", "L", cheeks="blush") @@ -1458,7 +1458,7 @@ label cho_quid_E12: hoo "There was no difference." ("open", "base", "base", "L", cheeks="blush") cho "" ("annoyed", "base", "base", "mid") #disappointed - hoo "After all these tests, I wasn't getting anywhere, leaving me more and more frustrated and needing to do something to take the edge off." ("open", "closed", "base", "mid", cheeks="blush") + hoo "After all these tests, I wasn't getting anywhere, and I was just feeling more and more frustrated...{w=0.4} So I had to do something to take the edge off." ("open", "closed", "base", "mid", cheeks="blush") hoo "And as it just so happened, there was a polished and stiff wooden object at hand right there..." ("open", "base", "base", "R", cheeks="blush_heavy") gen "..." ("grin", xpos="far_left", ypos="head") hoo "Let's just say that I rode that thing in ways I had never done before..." ("base", "narrow", "base", "down", cheeks="blush_heavy") @@ -1466,19 +1466,19 @@ label cho_quid_E12: gen "I don't think she meant in the way you're thinking." ("grin", xpos="far_left", ypos="head") cho "What do you mean then professor--" ("soft", "base", "raised", "mid") cho "Ooooh..." ("soft", "narrow", "base", "L", cheeks="blush") #Blushing - gen "So this is what you meant when you said you had just the broom for Miss Chang..." ("base", xpos="far_left", ypos="head") + gen "So, this is what you meant when you said you had just the broom for Miss Chang..." ("base", xpos="far_left", ypos="head") cho "" ("soft", "narrow", "base", "down", cheeks="blush") #Blushing hoo "Figured it out already have you?" ("base", "wink", "raised", "mid", cheeks="blush") hoo "Well I can't say I'm surprised, you've always had a much broader view on magic than most, professor." ("base", "base", "base", "mid", cheeks="blush") cho "I'm confused..." ("disgust", "narrow", "base", "mid", cheeks="blush") hoo "Think about the things I've told you thus far, Miss Chang." ("base", "base", "base", "L", cheeks="blush") - hoo "When you enchant an object it takes on some of the enchanter's characteristics." ("base", "base", "shocked", "L", cheeks="blush") + hoo "When you enchant an object, it takes on some of the enchanter's characteristics." ("base", "base", "shocked", "L", cheeks="blush") cho "Yes?" ("soft", "narrow", "base", "L", cheeks="blush") hoo "Well, Initially during practical testing I was trying to appeal to what I thought a broom would enjoy." ("base", "base", "base", "R", cheeks="blush") hoo "When I should've appealed to what I would enjoy..." ("base", "base", "base", "L", cheeks="blush_heavy") cho "Wait, so doing...{w=0.4} {i}\"That\"{/i} with your broom... Made the broom go faster? Using it to...{w=0.4} *Err*..." ("angry", "narrow", "base", "L", cheeks="heavy_blush") gen "Take off." ("base", xpos="far_left", ypos="head") - hoo "Faster \"and\" more agile... Although the effects faded quite quickly afterwards." ("base", "shocked", "base", "L", cheeks="blush") + hoo "Faster {b}and{/b} more agile... Although the effects faded quite quickly afterwards." ("base", "shocked", "base", "L", cheeks="blush") cho "Then how were you able to use this method during a game of Quidditch?" ("angry", "narrow", "base", "L", cheeks="heavy_blush") hoo "I'm glad you asked!" ("grin", "shocked", "base", "L", cheeks="blush") hoo "I used this..." ("grin", "base", "base", "L", cheeks="blush") @@ -1496,10 +1496,10 @@ label cho_quid_E12: hoo "So, what say you, Miss Chang? You wanted a broom that rivals the firebolt, so here you have it!" ("grin", "shocked", "raised", "L", cheeks="blush") cho "Yes, but..." ("mad", "narrow", "base", "downR", cheeks="heavy_blush") hoo "When used by the right person, this broom could go even faster." ("grin", "shocked", "base", "L", cheeks="blush_heavy") - cho "But, everyone will be there watching..." ("angry", "narrow", "base", "L", cheeks="heavy_blush") #blushing + cho "But, everyone will be there, watching..." ("angry", "narrow", "base", "L", cheeks="heavy_blush") #blushing hoo "I know...{w=0.4} Exciting thought, isn't it?" ("grin", "base", "shocked", "L", cheeks="blush_heavy") cho "..." ("horny", "narrow", "base", "downR", cheeks="heavy_blush") - hoo "You don't need to pretend with me, Miss Chang. I have seen how much you enjoyed everybody gazing at you during the preliminaries.." ("grin", "wink", "base", "L", cheeks="blush") + hoo "You don't need to pretend with me, Miss Chang. I have seen how much you enjoyed everybody gazing at you during the preliminaries..." ("grin", "wink", "base", "L", cheeks="blush") cho "You did?" ("angry", "narrow", "base", "L", cheeks="heavy_blush") hoo "Yes, and I assure you, I understand your feelings completely..." ("base", "narrow", "shocked", "L", cheeks="blush_heavy") hoo "As it happens... There's nothing that gets me more excited than a crowd..." ("base", "narrow", "base", "mid", cheeks="blush_heavy") @@ -1529,7 +1529,7 @@ label cho_quid_E12: # hoo "And all those feelings are imbued into this very broom..." ("base", "narrow", "base", "R", cheeks="blush") - hoo "I remember using it at the quidditch world cup finals... Thousands of people watching..." ("grin", "closed", "worried", "mid", cheeks="blush_heavy") + hoo "I remember using it at the Quidditch world cup finals... Thousands of people watching..." ("grin", "closed", "worried", "mid", cheeks="blush_heavy") cho "" ("horny", "narrow", "base", "downR", cheeks="heavy_blush") hoo "I don't think any broom had ever reached such speeds before..." ("grin", "narrow", "base", "stare", cheeks="blush_heavy") hoo "When I caught the snitch... Why I've never felt such a rush." ("grin", "closed", "shocked", "mid", cheeks="blush_heavy") @@ -1555,7 +1555,7 @@ label cho_quid_E12: cho "Just...{w=0.4} *Ahem*...{w=0.4} I have a question..." ("angry", "narrow", "base", "down", cheeks="heavy_blush") hoo "Yes?" ("base", "shocked", "raised", "L", cheeks="blush") - cho "How did you manage to keep it--{w=0.2} I mean it's so big...{w=0.4} How did nobody see?" ("angry", "narrow", "base", "L", cheeks="heavy_blush") + cho "How did you manage to keep it--{w=0.2} I mean, it's so big...{w=0.4} How did nobody see?" ("angry", "narrow", "base", "L", cheeks="heavy_blush") hoo "A skirt and a small cut in your underwear and no one will be any wiser." ("base", "shocked", "base", "downL", cheeks="blush") cho "I see..." ("soft", "narrow", "base", "down", cheeks="heavy_blush") gen "To think that a \"PE\" teacher would have such a grasp of the fundamentals of magic..." ("base", xpos="far_left", ypos="head") @@ -1589,7 +1589,7 @@ label cho_quid_E12: "\"The Speedblaster 2000!\"": $ name_broom_cho = "Speedblaster 2000" - gen "Cause it'll get up to higher speeds as it blasts your--" ("base", xpos="far_left", ypos="head") + gen "Cause it'll get up to higher speeds when it blasts your--" ("base", xpos="far_left", ypos="head") cho "Sir!" ("angry", "base", "angry", "mid", cheeks="blush") gen "I know, a perfect name isn't it?" ("base", xpos="far_left", ypos="head") cho "Professor Hooch, I'm so sorry about his--" ("angry", "closed", "angry", "mid", cheeks="blush") @@ -1600,7 +1600,7 @@ label cho_quid_E12: cho "The broom isn't... Oh I see..." ("disgust", "narrow", "base", "mid", cheeks="blush") hoo "Works for me." ("base", "base", "base", "mid") - gen "He-heh..." ("grin", xpos="far_left", ypos="head") + gen "*He-heh*..." ("grin", xpos="far_left", ypos="head") "\"The Cumet!!\"": $ name_broom_cho = "Cumet" @@ -1624,7 +1624,7 @@ label cho_quid_E12: cho "..." ("disgust", "base", "base", "mid", cheeks="blush") gen "Very well then... You've got what you wanted, Miss Chang. I hope you're satisfied." ("base", xpos="far_left", ypos="head") - gen "If not, I'm sure you will be at the finals." ("grin", xpos="far_left", ypos="head") + gen "If not, I'm sure you will be, at the finals." ("grin", xpos="far_left", ypos="head") cho "Sir!" ("angry", "base", "base", "mid", cheeks="heavy_blush") gen "When you win that cup, of course." ("base", xpos="far_left", ypos="head") cho "Oh..." ("upset", "base", "base", "downR", cheeks="blush") diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy index c4d32b32..db7a2474 100644 --- a/game/scripts/characters/cho/events/quidditch/training.rpy +++ b/game/scripts/characters/cho/events/quidditch/training.rpy @@ -273,14 +273,14 @@ label cho_training: cho "What is this plan of yours based on?" ("soft", "narrow", "base", "down", cheeks="blush") if cc_pr_manipulate_girls.is_complete(): # has completed "Manipulate the girls!" public request? - gen "These girls sure seem fond of you. If you could get close to them, they surely will lose focus on the game." ("base", xpos="far_left", ypos="head") + gen "The girls on the Gryffindor team sure seem fond of you. If you could get close to them, then I'm sure they'll lose focus on the game." ("base", xpos="far_left", ypos="head") cho "Maybe so, but that doesn't solve one important issue..." ("open", "base", "raised", "mid", cheeks="blush") else: gen "It's obvious isn't it..." ("base", xpos="far_left", ypos="head") cho "No?" ("annoyed", "base", "raised", "mid", cheeks="blush") gen "Girls doing naughty things together..." ("base", xpos="far_left", ypos="head") cho "What are you getting at?" ("angry", "base", "raised", "mid", cheeks="blush") - gen "If you get close to them they will lose focus on the game!" ("base", xpos="far_left", ypos="head") + gen "If you get close to them, they will lose focus on the game!" ("base", xpos="far_left", ypos="head") cho "..." ("normal", "closed", "base", "mid", cheeks="blush") #worried cho "What about the boys?" ("mad", "base", "raised", "mid", cheeks="blush") gen "What about them?" ("base", xpos="far_left", ypos="head") @@ -302,8 +302,9 @@ label cho_training: cho "--Let me fetch my gear, and we can jump straight to training." ("crooked_smile", "base", "base", "mid") #Cho returns with the Gryffindor clothing combination - $ cho_outfit_last.save() $ cho.equip(cho_outfit_quidditch_gryffindor) + $ cho_outfit_quidditch.save() + call cho_chibi("fly", "mid", "base") cho "Okay then, tell me what to do." ("base", "base", "base", "mid", trans=fade) diff --git a/game/scripts/characters/cho/summon.rpy b/game/scripts/characters/cho/summon.rpy index 6fbb1d35..f1dcd311 100644 --- a/game/scripts/characters/cho/summon.rpy +++ b/game/scripts/characters/cho/summon.rpy @@ -69,12 +69,8 @@ label summon_cho: gen "(If I want Cho to do anything in public with those {i}Gryphoncucks{/i} I better do it before the match.)" ("base", xpos="far_left", ypos="head") gen "(Although maybe not...)" ("base", xpos="far_left", ypos="head") - show screen blktone - with d3 nar "Starting the match will progress Cho's story to the next stage." nar "Make sure to save your game in case you want to return to this stage later." - hide screen blktone - with d3 pause.5 menu: diff --git a/game/scripts/utility/common_labels.rpy b/game/scripts/utility/common_labels.rpy index fd9ba9b3..d2784a6a 100644 --- a/game/scripts/utility/common_labels.rpy +++ b/game/scripts/utility/common_labels.rpy @@ -172,6 +172,6 @@ label end_of_content(): "SilverStudioGames" "This concludes story progression for this character as of version [config.version].\nThere still may be side events and activities that you have missed, but main story won't progress past this point." "SilverStudioGames" "We hope you have enjoyed yourself. Stay tuned for more in the future." call notes - nar " All stats have been maxed out. You can now use all of the wardrobe options." + nar "All stats have been maxed out. You can now use all of the wardrobe options." return