Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Fixes

Browse Source 
* 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.
This commit is contained in:
Johnny28 2023-03-20 13:17:24 +01:00
parent c0da6f3731
commit fe67e3d9ca
6 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
View File

@ -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

12
game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy
View File

@ -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

48
game/scripts/characters/cho/events/quidditch/intros.rpy
View File

File diff suppressed because it is too large Load Diff

7
game/scripts/characters/cho/events/quidditch/training.rpy
View File

@ -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)

4
game/scripts/characters/cho/summon.rpy
View File

@ -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:

2
game/scripts/utility/common_labels.rpy
View File

@ -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