Merge remote-tracking branch 'origin/dev' into Python3

This commit is contained in:
LoafyLemon 2023-01-03 19:50:23 +00:00
commit 7533b82331
8 changed files with 1065 additions and 129 deletions

View File

@ -60,10 +60,30 @@ label cc_pf_strip_T2_intro_E1:
gen "That's very commendable of you..." ("base", xpos="far_left", ypos="head")
cho "Thank you, Sir." ("base", "base", "base", "mid")
label .introspection:
if _in_replay:
show screen blkfade
with d5
$ cho.equip(cho_outfit_default)
$ game.gold = 1984
$ game.day = 123
call room("main_room")
hide screen blkfade
with d5
# Ask her to strip.
gen "So, Why don't you show me what you are made of?{w=1.0} Let me have a proper look at you!" ("grin", xpos="far_left", ypos="head")
cho "Sir?" ("soft", "wink", "raised", "mid")
gen "I need you to remove your clothes." ("base", xpos="far_left", ypos="head")
if _in_replay:
show screen blkfade
with d5
return
call play_music("stop")
cho "!!!" ("soft", "wide", "base", "mid", cheeks="blush")
call play_music("cho")

View File

@ -47,8 +47,29 @@ label cc_pf_blowjob_T3_intro_E1:
gen "Your dream is to become a professional is it not?" ("base", xpos="far_left", ypos="head")
cho "I... yes... I suppose it is." ("soft", "narrow", "base", "R")
gen "Then we should do our best to prepare you for what's out there!" ("base", xpos="far_left", ypos="head")
label .introspection:
if _in_replay:
show screen blkfade
with d5
$ cho.equip(cho_outfit_default)
$ game.gold = 1984
$ game.day = 124
call room("main_room")
hide screen blkfade
with d5
gen "I won't be your coach forever... Once you're looking for a proper team, you'll be in fierce competition with the other women athletes." ("base", xpos="far_left", ypos="head")
gen "Women that will stop at nothing to get what they want." ("base", xpos="far_left", ypos="head")
if _in_replay:
show screen blkfade
with d5
$ renpy.end_replay()
gen "So, as your coach, it's my responsibility to prepare you!" ("base", xpos="far_left", ypos="head")
cho "And a blowjob is necessary for this?" ("angry", "narrow", "raised", "mid")

View File

@ -92,7 +92,29 @@ label cc_gt_return:
cho "Please believe me [cho_genie_name]!" ("scream", "closed", "worried", "mid")
gen "A school supplied broom will have to suffice." ("base", xpos="far_left", ypos="head")
cho "Why aren't you listening, [cho_genie_name]!" ("angry", "wide", "worried", "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")
# Used in Quidditch Outro
label .introspection:
if _in_replay:
show screen blkfade
with d5
$ cho.equip(cho_outfit_quidditch_gryffindor)
$ game.gold = 1984
$ game.day = 665
$ game.daytime = False
$ game.weather = "clear"
camera screens at sepia
call room("main_room")
call cho_chibi(xpos="mid", ypos="base")
hide screen blkfade
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 "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")
@ -120,8 +142,15 @@ label cc_gt_return:
call cho_walk(action="leave")
pause .8
gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
# Used in Quidditch Outro
if _in_replay:
show screen blkfade
with d5
camera screens
$ renpy.end_replay()
#
gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
$ cho.equip(cho_outfit_last) # Equip last worn clothes

File diff suppressed because it is too large Load Diff

View File

@ -24,6 +24,9 @@ label summon_cho:
# Gryffindor Quidditch Intro.
elif cho_tier == 3 and not cho_quid.E10_complete:
jump cho_quid_E10
# Quidditch Outro
elif cho_tier == 4 and not cho_quid.E14_complete:
jump cho_quid_E14
# Clothes Events
call cho_summon_setup

View File

@ -424,6 +424,7 @@ default cho_quid = quest_class(
E11_complete = False, # Ask Luna for help (Talk)
E12_complete = False, # Acquire new broom
E13_complete = False, # Notify the player that all preparations are complete
E14_complete = False, # Quidditch Outro
hufflepuff_prepared = False, # Ready for practice match? (Requirements: tactic)
hufflepuff_training = False, # Finished Hufflepuff practice match?

View File

@ -139,6 +139,8 @@ init python:
char.rebuild()
if current <= 1.443:
fix_return_stack()
if current > latest: