Fixes and more

* Fixed miss-named Cho "crooked_smile" expression.
* Fixed Tonks' "Morph" effect being delayed in some instances.
* Fixed some calls showing multiple ">".

* Removed bld and blktone in some places where it's replaced by inner thought and narrator character.
* Minor writing fixes.
* Minor character positioning fixes.
This commit is contained in:
Johnny28 2023-03-17 16:48:17 +01:00
parent bbcaba9c03
commit b5cc8da4c4
43 changed files with 339 additions and 450 deletions

File diff suppressed because it is too large Load Diff

View File

@ -151,7 +151,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
gen "Nice, I still got her panties!" ("grin", xpos="far_left", ypos="head")
# Panties acquired message!
call give_reward(">You have acquired Cho's panties!", "interface/icons/panties.webp")
call give_reward("You have acquired Cho's panties!", "interface/icons/panties.webp")
"\"Not even close.\"":
$ cho_mood += 15
@ -396,7 +396,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
call bld
gen "Nice, I still got her panties!" ("grin", xpos="far_left", ypos="head")
call give_reward(">You have acquired Cho's panties!", "interface/icons/panties.webp")
call give_reward("You have acquired Cho's panties!", "interface/icons/panties.webp")
$ has_cho_panties = True
# Reset Hermione clothing.

View File

@ -129,7 +129,7 @@ label cc_pf_strip_T3_intro_E1:
pause .5
# Panties acquired message!
call give_reward(">You have acquired Cho's panties!", "interface/icons/panties.webp")
call give_reward("You have acquired Cho's panties!", "interface/icons/panties.webp")
$ has_cho_panties = True
else:
@ -456,7 +456,7 @@ label cc_pf_strip_T3_intro_E2:
cho "..." ("quiver", "happyCl", "base", "mid", cheeks="blush") #Heavy blush
gen "..." ("base", xpos="far_left", ypos="head")
gen "So, what's your opinion?" ("base", xpos="far_left", ypos="head")
gen "I'm sure Miss Cho is dying to know..." ("grin", xpos="far_left", ypos="head")
gen "I'm sure Miss Chang is dying to know..." ("grin", xpos="far_left", ypos="head")
ton "I don't know how I could possibly answer such a difficult question, Professor." ("soft", "narrow", "base", "mid")
gen "Then let me help you with your decision..." ("base", xpos="far_left", ypos="head")
@ -639,12 +639,8 @@ label cc_pf_strip_T3_intro_E2:
gen "!!!" ("grin", xpos="far_left", ypos="head")
ton "*Hmm*... Or is that snitch of yours going to dart off after all?" ("soft", "narrow", "base", "down", hair="horny")
cho "" ("angry", "happyCl", "worried", "mid", cheeks="blush")
show screen blktone
with d3
gen "(I sure hope the desk is sturdy enough...)" ("base", xpos="far_left", ypos="head")
call hide_characters
hide screen bld1
hide screen blktone
show screen blkfade
with d5
@ -823,9 +819,7 @@ label cc_pf_strip_T3_intro_E2:
pass
sna "As much as I'd like to watch you make a fool of yourself for us, Miss Chang, I have more important things to do." ("snape_13")
show screen blktone
gen "(More important than this?...)" ("base", xpos="far_left", ypos="head")
hide screen blktone
sna "I merely came here to discuss a private matter with our headmaster." ("snape_24")
sna "About this... Misunderstanding that occurred during the last Quidditch game." ("snape_09")
@ -856,7 +850,7 @@ label cc_pf_strip_T3_intro_E2:
ton "" ("annoyed", "narrow", "raised", "downR")
cho "But the entire Slytherin team drank some! They were even bragging about it!" ("clench", "narrow", "angry", "L", xpos=275, ypos="base", flip=True, trans=hpunch)
sna "I suppose if that's what they said then who am I to refute it..." ("snape_37") #smirk
sna "I suppose if that's what they said, then who am I to refute it..." ("snape_37") #smirk
sna "Now, if you'll excuse me..." ("snape_09")
sna "I'll leave you three to indulge further in your...{w=0.8} debaucheries..." ("snape_47")
cho "No! You stay where you are!" ("scream", "base", "angry", "L")
@ -2829,7 +2823,7 @@ label cc_pf_strip_T3_intro_E3:
cho "I--{w=0.2} Yes, but that's not--{w=0.2} I mean...{w=0.2} They're meant to help me with Quidditch, I swear!" ("mad", "narrow", "base", "L", cheeks="heavy_blush")
else:
ton "*Mmm*... Your coach is very lucky to have the opportunity to buy favours from you." ("base", "base", "base", "mid", cheeks="blush")
cho "He's--{w=0.2} They're meant to help me with Quidditch, I swear!" ("base", "base", "base", "mid", cheeks="blush")
cho "He's--{w=0.2} They're meant to help me with Quidditch, I swear!" ("mad", "narrow", "base", "L", cheeks="heavy_blush")
play sound "sounds/giggle2_loud.ogg"
ton "*giggles*" ("crooked_smile", "closed", "base", "mid", cheeks="blush")
@ -2857,9 +2851,7 @@ label cc_pf_strip_T3_intro_E3:
ton "Well, what's done is done..." ("upset", "narrow", "worried", "downR", hair="horny", cheeks="blush")
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
#ton "Can I have your word that you won't tell anyone, Cho?" ("base", "base", "base", "mid")
#cho "Yes, you have my word! I promise I won't tell anyone!" ("base", "base", "base", "mid")
#ton "*Hmm*... Well, seeing the circumstances I guess that's good--" ("base", "base", "base", "mid")
gen "Show the girl your \"meta thing\" already!" ("grin", xpos="far_left", ypos="head")
ton "My \"metamorphmagi\" ability." ("soft", "narrow", "base", "mid")
cho "So, is this what you showed us in class before, professor?" ("crooked_smile", "base", "base", "mid", cheeks="blush")
@ -2928,11 +2920,11 @@ label cc_pf_strip_T3_intro_E3:
ton "Oh, that wasn't the only time, Professor."
gen "It wasn't?" ("base", xpos="far_left", ypos="head")
her "" ("grin", "narrow", "base", "mid")
ton "I sometimes stroll around the school grounds, disguised as one of the girls... wearing nothing but a school robe..."
ton "I sometimes stroll around the school grounds, disguised as one of the girls... Wearing nothing but a school robe..."
if hg_pr_flash.counter > 1:
her "" ("crooked_smile", "narrow", "base", "down")
ton "And If you ever had a boy say he got some tits flashed at him by Miss Granger... then it was most likely me."
ton "And If you ever had a boy say he got some tits flashed at him by Miss Granger... Then it was most likely me."
cho "That's awesome!" ("grin", "base", "base", "L", cheeks="blush")
gen "Well, I did tell Hermione to do it herself before." ("base", xpos="far_left", ypos="head")
her "" ("open", "wide", "base", "stare", cheeks="blush")
@ -2968,7 +2960,7 @@ label cc_pf_strip_T3_intro_E3:
$ cho_chibi.zorder = 3 # Reset to default.
$ tonks_chibi.zorder = 2 # behind Cho. Default is 3.
call ton_chibi("stand", 370, 360, flip=False)
ton "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", hair="neutral", flip=False, trans=morph) # Hermione brown
ton "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", hair="neutral", flip=False, trans=morph)
pause .2
cho "" ("clench", "base", "raised", "down", cheeks="heavy_blush")

View File

@ -1173,7 +1173,7 @@ label .succubus_E2:
# Unlock outfit message. Should only appear once.
if not ton_outfit_succubus.unlocked:
call unlock_clothing(text=">New clothing items for Tonks have been unlocked!", item=ton_outfit_succubus)
call unlock_clothing(text="New clothing items for Tonks have been unlocked!", item=ton_outfit_succubus)
cho "" ("horny", "narrow", "worried", "L", cheeks="heavy_blush")
ton "Maybe I could dress as a Succubus for Halloween. I'm sure the boys would love it..." ("base", "narrow", "base", "mid", hair="horny")

View File

@ -176,7 +176,7 @@ label cc_pf_blowjob_T3_intro_E1:
$ camera.set_image("cho_hj mid annoyed")
cho "*tsk*..." #Annoyed
cho "*Tsk*..." #Annoyed
call ctc
@ -294,7 +294,7 @@ label cc_pf_blowjob_1:
$ camera.set_image("away_blush")
cho "Oh-okay..."
cho "(You can do this... push your boundaries!)"
cho "(You can do this... Push your boundaries!)"
cho "He-here I go..."
#Cho opens her mouth and moves in towards genies cock #Genie cock twitches
@ -321,7 +321,7 @@ label cc_pf_blowjob_1:
gen "[name_cho_genie]... You're here to push your limits."
$ camera.set_image("up_worried")
cho "I-I'm sorry [name_genie_cho]..."
cho "I... need some time to think..."
cho "I... Need some time to think..."
gen "[name_cho_genie]..."
$ camera.set_image("mid_worried")
cho "I'm sorry!" #blush, looking away
@ -362,7 +362,7 @@ label cc_pf_blowjob_1:
$ camera.set_imagepath("cho_bj/kneel/")
$ camera.set_image("up")
cho "Oh... Okay, I can do that..."
gen "But you better put some work into it, show me that stamina of yours!" #Should I use a different word than stamina? Works well I think.
gen "But you better put some work into it, show me that stamina of yours!"
$ camera.set_image("mid")
cho "Of course!"
@ -424,7 +424,7 @@ label cc_pf_blowjob_1:
call ctc
gen "*Ah* Good job [name_cho_genie]..."
gen "*Ah*... Good job [name_cho_genie]."
gen "I suppose that will be enough for n--"
$ camera.set_image("up_annoyed", trans=d3)
cho "No! I want--"
@ -618,9 +618,9 @@ label cc_pf_blowjob_1:
gen "Maybe." ("base", xpos="far_left", ypos="head")
cho "I knew it..." ("smile", "wide", "base", "mid", cheeks="blush")
gen "Miss Granger knows how to properly dispose--" ("base", xpos="far_left", ypos="head")
cho "She swallows?!?" ("clench", "wide", "base", "mid", cheeks="blush") #Shocked #Big text
cho "{size=+7}She swallows?!?{/size}" ("clench", "wide", "base", "mid", cheeks="blush")
cho "I mean..." ("disgust", "base", "base", "downR", cheeks="blush")
cho "Of course she does..." ("angry", "base", "base", "down", cheeks="blush") #small text #Blush
cho "{size=-4}Of course she does...{/size}" ("angry", "base", "base", "down", cheeks="blush")
else:
gen "Of course not..." ("base", xpos="far_left", ypos="head")
cho "I knew--" ("smile", "happyCl", "base", "mid", cheeks="blush")
@ -643,7 +643,7 @@ label cc_pf_blowjob_1:
call cho_walk(action="leave")
gen "[name_cho_genie]!" ("base", xpos="far_left", ypos="head")
gen "......" ("base", xpos="far_left", ypos="head")
gen "..." ("base", xpos="far_left", ypos="head")
gen "(Probably should've asked her to clean herself first...)" ("base", xpos="far_left", ypos="head")
gen "(Oh well, she'll find out one way or another.)" ("base", xpos="far_left", ypos="head")

View File

@ -1624,7 +1624,7 @@ label cc_pf_talk_T3_E3:
cho "The girls all play extremely well together and so does the twins." ("soft", "base", "base", "mid")
cho "The Keeper and seeker sort of does their own thing." ("open", "base", "base", "mid")
gen "Right... Miss Grangers friends..." ("base", xpos="far_left", ypos="head")
cho "Yes... To be honest I doubt Harry and Ron would still be on the team if it wasn't for Angelina's lack of interest in training them..." ("soft", "narrow", "base", "mid")
cho "Yes... To be honest I doubt Harry and Ron would still be on their team if it wasn't for Angelina's lack of interest in training them..." ("soft", "narrow", "base", "mid")
gen "Really?" ("base", xpos="far_left", ypos="head")
cho "Granger is quite protective of her friends but still let them play despite having a female captain." ("annoyed", "base", "base", "mid")
cho "She bosses them around a lot, and would probably feel threatened if Angelina actually did her job properly." ("smile", "narrow", "base", "R")
@ -1693,7 +1693,7 @@ label cc_pf_talk_T3_E3:
gen "The Potter boy!" ("base", xpos="far_left", ypos="head")
cho "Yes?" ("soft", "base", "raised", "mid")
gen "I feel like that name should have more importance for some reason..." ("base", xpos="far_left", ypos="head")
cho "I don't know, he seems pretty boring if you ask me." ("open", "narrow", "base", "R")
cho "I don't know about that, he seems pretty boring if you ask me." ("open", "narrow", "base", "R")
gen "What do you know about him? And don't give me another spiel about his broomstick..." ("base", xpos="far_left", ypos="head")
cho "*Hmm*..." ("soft", "narrow", "base", "downR")
gen "Any weaknesses?" ("base", xpos="far_left", ypos="head")
@ -1741,7 +1741,7 @@ label cc_pf_talk_T3_E3:
gen "Right...{w} So what do you know about him?" ("base", xpos="far_left", ypos="head")
cho "Not much aside from the fact that he's one of Granger's friends..." ("annoyed", "narrow", "base", "mid")
gen "I see." ("base", xpos="far_left", ypos="head")
cho "He's a new addition to their team so I haven't yet been able to see how good he's with a broom." ("open", "base", "base", "mid")
cho "He's a new addition to their team, so I haven't yet been able to see how good he is with a broom." ("open", "base", "base", "mid")
cho "All I've heard is that he's gone from quite the nervous rookie to a great keeper..." ("soft", "base", "base", "mid")
gen "Sounds suspicious..." ("base", xpos="far_left", ypos="head")
cho "It's likely that Granger has been enticing him to do better." ("annoyed", "narrow", "base", "R")
@ -1754,7 +1754,7 @@ label cc_pf_talk_T3_E3:
gen "Is that all of them?" ("base", xpos="far_left", ypos="head")
cho "Yes, that's it." ("base", "base", "base", "mid")
gen "I think I've got a rough idea how to approach this but..." ("base", xpos="far_left", ypos="head")
gen "I think I've got a rough idea how to approach this, but..." ("base", xpos="far_left", ypos="head")
gen "It might be worth learning a bit more about their non-curriculum activities." ("base", xpos="far_left", ypos="head")
cho "And how do you suggest I do that?" ("open", "base", "base", "mid")
gen "Espionage!" ("base", xpos="far_left", ypos="head")

View File

@ -678,12 +678,9 @@ label ss_he_cho_E1:
label discussed_cho_plan:
show screen with_snape(ani=True)
show screen bld1
call notes
nar "You spend the rest of the evening in Snape's company, talking about Cho's impressive thighs."
hide screen bld1
with d3
$ ss_he.cho_E1 = True

View File

@ -19,7 +19,7 @@ label cho_panties_response_T2:
call cho_walk("desk", "base")
pause .8
call give_reward("> You hand over the panties...", "interface/icons/panties_cum.webp")
call give_reward("You hand over the panties...", "interface/icons/panties_cum.webp")
play sound "sounds/cloth_sound3.ogg"
pause .4
@ -115,7 +115,7 @@ label cho_panties_response_T3:
call cho_walk("desk", "base")
pause .8
call give_reward("> You hand over the panties...", "interface/icons/panties_cum.webp")
call give_reward("You hand over the panties...", "interface/icons/panties_cum.webp")
cho "(...)" ("upset", "base", "base", "down", cheeks="blush", xpos="mid", ypos="base", trans=blackfade)
gen "Something wrong?" ("base", xpos="far_left", ypos="head")

View File

@ -1142,7 +1142,7 @@ label hufflepuff_match_return:
call cho_walk(action="leave")
stop music fadeout 1.0
call unlock_clothing(text=">New clothing items for Cho have been unlocked!", item=cho_outfit_cheerleader)
call unlock_clothing(text="New clothing items for Cho have been unlocked!", item=cho_outfit_cheerleader)
call popup("New favours for Cho have been unlocked!", "Congratulations!", "interface/icons/head/cho.webp")
$ hermione_busy = True

View File

@ -647,12 +647,7 @@ label cho_quid_E7:
call hide_characters
nar "You telepathically call Cho into your office."
hide screen bld1
with d3
pause .2
if her_tier < 4: # Hermione changes into her school outfit
# TODO Does this even make sense? She's supposed to be comfortable enough to wear her clothes around the school anyway
nar "While Hermione hastily puts on some less revealing clothes."
$ her_outfit_last.save()
$ hermione.equip(her_outfit_default)
@ -788,8 +783,7 @@ label cho_quid_E7:
call cho_walk(action="leave")
pause 1.0
call bld
gen "Quest complete!" ("grin", xpos="far_left", ypos="head")
gen "(Quest complete!)" ("grin", xpos="far_left", ypos="head")
$ cho_mood = 0

View File

@ -643,13 +643,9 @@ label ss_he_cho_E2:
sna "..." ("snape_08") #[angry]
# Ending
show screen bld1
call notes
nar "You spend the rest of the evening in Snape's company once again talking about Cho's remarkable legs."
hide screen bld1
with d3
$ ss_he.cho_E2 = True

View File

@ -108,13 +108,7 @@ label cc_st_return:
gen "Why aren't you on that Quidditch ditch right now?" ("base", xpos="far_left", ypos="head")
cho "It's a pitch, Sir." ("soft", "narrow", "raised", "mid")
gen "I thought we were going to prepare for the next match, or are we already finished with that?" ("base", xpos="far_left", ypos="head")
show screen blktone
with d3
gen "(Please say yes! I want to do the naughty stuff already!)" ("angry", xpos="far_left", ypos="head")
hide screen blktone
with d3
cho "Yes, we are..." ("open", "closed", "base", "mid")
gen "(Yes!)" ("grin", xpos="far_left", ypos="head")
cho "For today, that is..." ("annoyed", "narrow", "base", "R")

File diff suppressed because it is too large Load Diff

View File

@ -54,7 +54,7 @@ label hermione_summon_setup:
# her "" ("base", "base", "base", "mid", xpos="base", ypos="base")
# #Unlocks rewards.
# call unlock_clothing(text = ">New clothing items for Hermione have been unlocked!", item = hg_muggle_hot_ITEM)
# call unlock_clothing(text = "New clothing items for Hermione have been unlocked!", item = hg_muggle_hot_ITEM)
# if game.weather == "overcast":
@ -116,7 +116,7 @@ label hermione_summon_setup:
# her "" ("base", "base", "base", "mid", xpos="base", ypos="base")
# #Unlocks rewards.
# call unlock_clothing(text = ">New clothing items for Hermione have been unlocked!", item = hg_accs_wool_g_ITEM)
# call unlock_clothing(text = "New clothing items for Hermione have been unlocked!", item = hg_accs_wool_g_ITEM)
# # Raining
@ -164,7 +164,7 @@ label hermione_summon_setup:
# her "" ("base", "base", "base", "mid", xpos="base", ypos="base")
# #Unlocks rewards.
# call unlock_clothing(text = ">New clothing items for Hermione have been unlocked!", item = hg_muggle_rainy_ITEM)
# call unlock_clothing(text = "New clothing items for Hermione have been unlocked!", item = hg_muggle_rainy_ITEM)
# # Robe
# else:
@ -227,7 +227,7 @@ label hermione_summon_setup:
# her "" ("base", "base", "base", "mid", xpos="base", ypos="base")
# #Unlocks rewards.
# call unlock_clothing(text = ">New clothing items for Hermione have been unlocked!", item = hg_muggle_cold_ITEM)
# call unlock_clothing(text = "New clothing items for Hermione have been unlocked!", item = hg_muggle_cold_ITEM)
# elif her_tier >= 3 and not hg_muggle_cold_sexy_ITEM.unlocked:
# $ hg_muggle_cold_sexy_ITEM.unlocked = True
@ -270,7 +270,7 @@ label hermione_summon_setup:
# her "" ("base", "base", "base", "mid", xpos="base", ypos="base")
# #Unlocks rewards.
# call unlock_clothing(text = ">New clothing items for Hermione have been unlocked!", item = hg_muggle_cold_sexy_ITEM)
# call unlock_clothing(text = "New clothing items for Hermione have been unlocked!", item = hg_muggle_cold_sexy_ITEM)
if hermione_outfits_schedule:
$ hermione.equip_random_outfit()

View File

@ -339,7 +339,7 @@ label hg_butt_plugs:
her "The solution?" ("disgust", "wink", "base", "mid")
gen "Here." ("base", xpos="far_left", ypos="head")
call give_gift(">You hand hermione the jar of anal lubricant.",anal_lube_ITEM)
call give_gift("You hand hermione the jar of anal lubricant.",anal_lube_ITEM)
her "!!!" ("clench", "wide", "base", "stare")
her "I wasn't being serious, [name_genie_hermione]!" ("scream", "base", "angry", "mid")

View File

@ -452,7 +452,7 @@ label slut_scene:
gen "You are \"my\" slut and you will do well to remember it...{w=0.4} Now get out of my office." ("base", xpos="far_left", ypos="head")
her "...{w=0.4} Fine." ("angry", "narrow", "base", "down", cheeks="blush")
call give_reward(">A new collar has been unlocked in the wardrobe!")
call give_reward("A new collar has been unlocked in the wardrobe!")
show screen blkfade
with d5
@ -673,7 +673,7 @@ label whore_scene: #(locked behind public reputation and last sex event)
gen "And proudly!" ("base", xpos="far_left", ypos="head")
her "... *Hmph*!" ("annoyed", "narrow", "base", "R", cheeks="blush")
call give_reward(">A new collar has been unlocked in the wardrobe!")
call give_reward("A new collar has been unlocked in the wardrobe!")
her "Goodbye then, [name_genie_hermione]." ("soft", "narrow", "base", "R", cheeks="blush")
gen "Goodbye [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
@ -893,7 +893,7 @@ label slave_scene:
gen "The collar you're wearing... I want you to keep it." ("base", xpos="far_left", ypos="head")
her "Yes, [name_genie_hermione]! Thank you, [name_genie_hermione]!" ("angry", "happy", "base", "up")
call give_reward(">A new collar has been unlocked in the wardrobe!")
call give_reward("A new collar has been unlocked in the wardrobe!")
gen "Now... On your feet." ("base", xpos="far_left", ypos="head")
else:
@ -1170,7 +1170,7 @@ label flasher_scene:
her "Alright then..." ("open", "narrow", "base", "R", cheeks="blush")
her "Just let me know when you want me to put it on..." ("open", "closed", "base", "mid", cheeks="blush")
call give_reward(">A new collar has been unlocked in the wardrobe!")
call give_reward("A new collar has been unlocked in the wardrobe!")
if game.daytime:
her "Have a Good day." ("soft", "base", "base", "R", cheeks="blush")
@ -1285,7 +1285,7 @@ label good_girl_scene:
gen "(At least I can enjoy watching her wearing it...)" ("base", xpos="far_left", ypos="head")
her "Just let me know if you need anything." ("open", "happy", "base", "mid")
call give_reward(">A new collar has been unlocked in the wardrobe!")
call give_reward("A new collar has been unlocked in the wardrobe!")
if game.daytime:
her "Have a Good day." ("grin", "base", "base", "mid")

View File

@ -424,7 +424,7 @@ label hg_pr_flirt_teacher_T2_E2:
her "Thank you for understanding, [name_genie_hermione]." ("base", "happyCl", "base", "mid")
$ hermione.wear("all")
call unlock_clothing(text=">New tattoo for Hermione has been unlocked!", item=her_tattoo_lockhart)
call unlock_clothing(text="A New tattoo for Hermione has been unlocked!", item=her_tattoo_lockhart)
jump end_hg_pr_flirt_teacher

View File

@ -134,7 +134,7 @@ label hg_ps_get_panties:
call her_walk(action="leave")
call give_reward(">You have acquired Hermione's panties!", "interface/icons/panties.webp")
call give_reward("You have acquired Hermione's panties!", "interface/icons/panties.webp")
$ hg_ps_get_panties.inProgress = True
jump end_hermione_event
@ -143,7 +143,7 @@ label hg_ps_get_panties:
label hg_cum_on_panties_response:
# Hermione responds the cum on her panties
call give_reward("> You hand over the panties...", "interface/icons/panties_cum.webp")
call give_reward("You hand over the panties...", "interface/icons/panties_cum.webp")
if her_tier == 2:
her "*Hmm*....?" ("annoyed", "narrow", "worried", "down",xpos="right",ypos="base")

Some files were not shown because too many files have changed in this diff Show More