From 14ca2bfba66bc3a998251a6c1c39dbef1b15e105 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Mon, 13 Mar 2023 13:54:13 +0100 Subject: [PATCH] Fixes and improvements * Removed blktone in some places where "nar" character already applies it. * Added some dialogue options during "cc_pf_talk_T1_intro_E2". --- .../cho/events/favors/talk_to_me.rpy | 39 +++++++++++++++---- .../cho/events/quidditch/intros.rpy | 2 +- game/scripts/characters/hermione/summon.rpy | 4 -- game/scripts/utility/common_labels.rpy | 3 -- 4 files changed, 32 insertions(+), 16 deletions(-) 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 b77cf812..21cfe8c4 100644 --- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy @@ -226,8 +226,6 @@ label cc_pf_talk_T1_intro_E1: with d3 pause .8 - call bld - "-Participate in the conversation-": $ genie_masturbating = False @@ -268,8 +266,8 @@ label cc_pf_talk_T1_intro_E1: call bld gen "(...)" ("base", xpos="far_left", ypos="head") if genie_masturbating: - gen "Blue-balled..." ("base", xpos="far_left", ypos="head") - gen "Oh well... Maybe I deserved it." ("base", xpos="far_left", ypos="head") + gen "(Blue-balled...)" ("base", xpos="far_left", ypos="head") + gen "(Oh well...{w=0.4} Maybe I deserved it.)" ("base", xpos="far_left", ypos="head") jump end_cho_talk_event @@ -292,9 +290,34 @@ label cc_pf_talk_T1_intro_E2: gen "Training session?" ("base", xpos="far_left", ypos="head") cho "Yes. We are preparing ourselves for the Quidditch match against Hufflepuff." ("open", "narrow", "base", "mid") cho "Our team really believes that we have a chance to win this time!" ("smile", "base", "base", "mid") - cho "They got a huge boost of confidence after I told 'em that the {i}great Albus Dumbledore{/i} would be training us himself!" ("base", "narrow", "base", "mid") - gen "Are you getting along with your team well?" ("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 "They got a huge boost of confidence after I told 'em that the {i}Great Albus Dumbledore{/i} would be training us himself!" ("base", "narrow", "base", "mid") + gen "The... Great?" ("base", xpos="far_left", ypos="head") + cho "That's right!" ("smile", "base", "base", "mid") + menu: + "-Play it down-": + gen "Surely that can't be right..." ("base", xpos="far_left", ypos="head") + cho "But you are, [name_genie_cho]!" ("smile", "narrow", "base", "mid") + cho "Every witch and wizard has heard of the great Albus Dumbledore." ("smile", "closed", "base", "mid") + gen "Are you sure they weren't referring to {i}My Albus{/i}?" ("base", xpos="far_left", ypos="head") + cho "Your Albus, [name_genie_cho]?" ("soft", "base", "base", "mid") + cho "I'm not sure I--" ("open", "base", "raised", "mid") + "-Be modest-": + gen "Well, I wouldn't say great..." ("base", xpos="far_left", ypos="head") + cho "(He's so modest.)" ("base", "narrow", "base", "downR") + gen "{i}Massive{/i} is a more accurate description." ("base", xpos="far_left", ypos="head") + cho "Massive, [name_genie_cho]?" ("soft", "base", "base", "mid") + cho "I'm not sure I understand..." ("soft", "narrow", "base", "mid") + gen "I'm sure you'll find out in due time." ("base", xpos="far_left", ypos="head") + "-Boast-": + gen "Ah... Yes... Albin the great, that's me alright!" ("base", xpos="far_left", ypos="head") + gen "I hope you realise how lucky you are to get the opportunity to experience my greatness first hand." ("grin", xpos="far_left", ypos="head") + cho "Oh, of course [name_genie_cho]! Thank you again, [name_genie_cho]!" ("angry", "base", "base", "mid") + gen "And perhaps one day, you'll get the privilege to experience my greatness {i}first mouth{/i}." ("grin", xpos="far_left", ypos="head") + 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") + 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") gen "And how exactly did you manage that? Mind spilling the beans?" ("grin", xpos="far_left", ypos="head") @@ -411,7 +434,7 @@ label cc_pf_talk_T1_intro_E2: cho "I've known my team for years.{w=0.6} We're all professionals!" ("soft", "narrow", "base", "mid") gen "Let me ask you a question..." ("base", xpos="far_left", ypos="head") gen "In the showers,{w=0.3} do they all have their backs turned towards you?" ("base", xpos="far_left", ypos="head") - cho "I don't know. Maybe they-- *uhm*..." ("open", "base", "base", "mid") + cho "I don't know. Maybe they--{w=0.2} *Uhm*..." ("open", "base", "base", "mid") cho "!!!" ("normal", "wide", "base", "mid") # Cho remembers something?! cho "" ("normal", "happyCl", "worried", "mid", cheeks="heavy_blush") pause .6 diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 38f0952d..be607993 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1824,7 +1824,7 @@ label cho_quid_E14: cho "Of course! You don't want friction--" cho "*Ahem*... I mean, you need the element of water to cast a successful enchantment!" gen "You're not trying to turn my penis into a water geyser, are you?" ("base", xpos="far_left", ypos="base") - cho "*Sigh*" + cho "*Sigh*." gen "Alright, I'll listen... What's this magical spit rubbing called again?" ("base", xpos="far_left", ypos="base") cho "Imbuing." gen "Fascinating." ("base", xpos="far_left", ypos="base") diff --git a/game/scripts/characters/hermione/summon.rpy b/game/scripts/characters/hermione/summon.rpy index f9e8ed51..60a76a5c 100644 --- a/game/scripts/characters/hermione/summon.rpy +++ b/game/scripts/characters/hermione/summon.rpy @@ -142,13 +142,9 @@ label hermione_level_up(tier=None): call bld if tier == 1: - show screen blktone - with d3 nar "Hermione's second {i}favour tier{/i} is now available." nar "You can move up {i}favour tiers{/i} by increasing her {i}whoring level{/i}, and by triggering {i}favour milestones{/i}." nar "Each tier unlocks a new set of favours, but favours of the previous tier will no longer be available." - hide screen blktone - with d3 pause.5 menu: "Would you like to increase Hermione's {i}favour tier{/i} now?" diff --git a/game/scripts/utility/common_labels.rpy b/game/scripts/utility/common_labels.rpy index 3caf70c7..af5eae1d 100644 --- a/game/scripts/utility/common_labels.rpy +++ b/game/scripts/utility/common_labels.rpy @@ -125,7 +125,6 @@ label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"): label describe_mood(name, value): - call blktone if 5 > value >= 1: nar "[name] is a little upset with you..." elif 10 > value >= 5: @@ -142,8 +141,6 @@ label describe_mood(name, value): nar "[name] hates your guts." else: nar "[name] is calm." - call hide_blktone - return