From dbab61b9a48dfa2e1fb512be9b11e14b8bf64648 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Mon, 10 Feb 2025 16:52:03 +0000 Subject: [PATCH] Bug fixes --- game/scripts/characters/cho/events/intro.rpy | 8 ++++---- .../cho/events/quidditch/hufflepuff_match.rpy | 3 ++- .../characters/cho/events/quidditch/training.rpy | 2 +- game/scripts/characters/cho/talk.rpy | 12 ------------ game/scripts/characters/hermione/events/intro.rpy | 14 +++++++------- .../characters/hermione/events/odd_jobs/maid.rpy | 7 ++----- .../events/requests/flirt_with_teachers.rpy | 2 +- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index 1dde6644..123db714 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -746,9 +746,9 @@ label cho_intro_E3: gen "Then what else?" ("base", xpos="far_left", ypos="head") her "*Uhm*..." ("annoyed", "base", "base", "R") gen "You're testing my patience, Miss Granger..." ("base", xpos="far_left", ypos="head") - her "Oh, I know!{w=0.5} I want a seat in the teacher stands during the Quidditch matches!" ("smile", "happyCl", "base", "mid") + her "Oh, I know!{w=0.5} I want a seat at the teacher stands during the Quidditch matches!" ("smile", "happyCl", "base", "mid") her "Cho would be so jealous if she saw me sitting near the commentator and teachers..." ("grin", "narrow", "base", "mid_soft") - gen "So, you want both one hundred points and a seat in the teacher stands..." ("base", xpos="far_left", ypos="head") + gen "So, you want both one hundred points and a seat at the teacher stands..." ("base", xpos="far_left", ypos="head") her "Yes..." ("base", "happy", "base", "mid_soft") menu: @@ -804,7 +804,7 @@ label cho_intro_E3: her "I'll tell you what I want!" ("open", "closed", "base", "mid") her "What I really, really want!" ("grin", "narrow", "base", "mid_soft") gen "{size=-4}Nice!{/size}" ("grin", xpos="far_left", ypos="head") - her "I'd like a seat in the teacher stands, during the Quidditch matches..." ("open", "closed", "base", "mid") + her "I'd like a seat at the teacher stands, during the Quidditch matches..." ("open", "closed", "base", "mid") gen "Is that all?" ("base", xpos="far_left", ypos="head") her "Oh, and a hundred points for Gryffindor..." ("grin", "base", "base", "R") gen "(...)" ("base", xpos="far_left", ypos="head") @@ -826,7 +826,7 @@ label cho_intro_E3: her "I guess so..." ("soft", "narrow", "worried", "down") her "Although, if I were to drop it..." ("open", "narrow", "base", "down") gen "Yes?" ("base", xpos="far_left", ypos="head") - her "I want a seat in the teacher stands during the Quidditch matches!" ("grin", "narrow", "base", "mid_soft") + her "I want a seat at the teacher stands during the Quidditch matches!" ("grin", "narrow", "base", "mid_soft") gen "I'm sure that could be arranged..." ("base", xpos="far_left", ypos="head") her "Thank you, [name_genie_hermione]." ("base", "narrow", "base", "mid_soft") diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 86c548de..0933707b 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -88,7 +88,7 @@ label hufflepuff_match: with d3 # Show wine - call give_reward(text=_(">Not grape-juice."), gift="interface/icons/wine.webp") + call give_reward(text=_("Not grape-juice."), gift="interface/icons/wine.webp") gen "That's all the persuasion I needed, my friend!" ("base", xpos="far_left", ypos="head") hide screen bld1 @@ -707,6 +707,7 @@ label hufflepuff_match: her "Hold on a minute... Is Cho wearing a skirt?" ("scream", "wide", "worried", "stare") show expression "CG quidditch cho_flashing" as cg zorder 17 + hide hermione_main with fade play sound "sounds/crowd_gasp.ogg" diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy index 35414168..fc7c95a1 100644 --- a/game/scripts/characters/cho/events/quidditch/training.rpy +++ b/game/scripts/characters/cho/events/quidditch/training.rpy @@ -63,7 +63,7 @@ label cho_training: jump .choices # Hufflepuff - # Clothes: Skirt, Robes + # Clothes: Skirt, Robes if not states.cho.ev.quidditch.hufflepuff_stage == "intro_done": $ states.cho.ev.quidditch.hufflepuff_stage = "intro_done" diff --git a/game/scripts/characters/cho/talk.rpy b/game/scripts/characters/cho/talk.rpy index 0151c80e..876f0e5e 100644 --- a/game/scripts/characters/cho/talk.rpy +++ b/game/scripts/characters/cho/talk.rpy @@ -1,18 +1,6 @@ # Cho Talk label cho_talk: menu: - #"-Working-": - - "-Discuss Quidditch Training-" (icon="interface/icons/small/quidditch.webp") if not states.cho.ev.quidditch.lock_training: - if states.cho.tier == 1: - jump cc_ht_talk - elif states.cho.tier == 2: - jump cc_st_talk - elif states.cho.tier == 3: - jump cc_gt_talk - - jump cho_talk - # Naming "\"-Address me only as-\"" if states.cho.ev.quidditch.e1_complete: menu: diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy index 32f1af16..4e57860d 100644 --- a/game/scripts/characters/hermione/events/intro.rpy +++ b/game/scripts/characters/hermione/events/intro.rpy @@ -674,7 +674,7 @@ label ss_he_hermione_E2: menu: gen "..." ("base", xpos="far_left", ypos="head") - "{size=-3}\"Make sure she is not a top student any longer!\"{/size}" if not d_flag_01: + "\"Make sure she is not a top student any longer!\"" if not d_flag_01: $ d_flag_01 = True sna "What? You mean grade her unfairly?" ("snape_01") sna "Nah... Dumbledore would never allow--" ("snape_31") @@ -689,7 +689,7 @@ label ss_he_hermione_E2: gen "Yeah, yeah, still here..." ("base", xpos="far_left", ypos="head") sna "OK, good." ("snape_02") - "{size=-3}\"Make sure Gryffindor loses the cup this year!\"{/size}" if not d_flag_02: + "\"Make sure Gryffindor loses the cup this year!\"" if not d_flag_02: $ d_flag_02 = True sna "You mean to just start subtracting points from them for no good reason?" ("snape_01") sna "Oh, I like that!" ("snape_02") @@ -698,7 +698,7 @@ label ss_he_hermione_E2: sna "You are a Genius!" ("snape_02") gen "Yes, I am a genius genie. What are the odds of that..." ("base", xpos="far_left", ypos="head") - "{size=-3}\"Ruin her reputation!\"{/size}" if not d_flag_03: + "\"Ruin her reputation!\"" if not d_flag_03: $ d_flag_03 = True sna "Tarnish her reputation?" ("snape_01") sna "But the girl is incorruptible..." ("snape_01") @@ -821,11 +821,11 @@ label hermione_intro_E3: label .choices: menu: - "{size=-3}\"Of course. You are a top student, after all.\"{/size}": + "\"Of course. You are a top student, after all.\"": her "Exactly..." ("annoyed", "squint", "angry", "mid") her "Or at least I used to be until today..." her @ tears soft_blink "I cannot believe this is happening!" ("mad", "happyCl", "worried", "mid") - "{size=-3}\"You could prepare better if I were to tutor you.\"{/size}": + "\"You could prepare better if I were to tutor you.\"": $ states.her.ev.tutoring.offered = True her "*Hmm*..." ("annoyed", "squint", "base", "mid") her "Yes, that could help I suppose..." ("soft", "base", "base", "R") @@ -834,9 +834,9 @@ label hermione_intro_E3: her "I don't think it would be necessary, sir. But..." ("soft", "base", "base", "mid") her "May I think about it?" gen "Don't take too long..." ("base", xpos="far_left", ypos="head") - "{size=-3}\"I suppose we'll know soon enough.\"{/size}": + "\"I suppose we'll know soon enough.\"": her "Yes, I suppose we will..." ("soft", "base", "base", "mid") - "{size=-3}\"You need to put my cock in your mouth.\"{/size}" if not d_flag_01: + "\"You need to put my cock in your mouth.\"" if not d_flag_01: $ d_flag_01 = True gen "You need to put my co--" ("base", xpos="far_left", ypos="head") her "*Huh*?" ("soft", "base", "base", "mid") diff --git a/game/scripts/characters/hermione/events/odd_jobs/maid.rpy b/game/scripts/characters/hermione/events/odd_jobs/maid.rpy index 68eb3fbc..cb76fbea 100644 --- a/game/scripts/characters/hermione/events/odd_jobs/maid.rpy +++ b/game/scripts/characters/hermione/events/odd_jobs/maid.rpy @@ -45,7 +45,7 @@ label her_maid_job: $ _event.cancel() jump hermione_favor_menu.odd_jobs - + elif states.her.level < 13: her "Cleaned up, [name_genie_hermione]?" ("angry", "base", "base", "mid") gen "Yes, so you better put this on..." ("base", xpos="far_left", ypos="head") @@ -180,7 +180,7 @@ label her_maid_job_return: python: progress_factor = math.log(states.her.tier + states.cho.tier + states.ton.tier + states.lun.tier + states.env.day) payment = int(progress_factor * states.env.random.randint(8, 40)) - + $ hermione.equip(her_outfit_maid) call her_walk(action="enter", xpos="mid", ypos="base") @@ -321,6 +321,3 @@ label her_maid_job_return: $ current_job = None jump main_room_menu - -#Send Hermione to work, promoting the card game. - diff --git a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy index 764bd53e..44d52777 100644 --- a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy +++ b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy @@ -302,7 +302,7 @@ label hg_pr_flirt_teacher_T2_E1: # Slughorn jump end_hg_pr_flirt_teacher -label hg_pr_flirt_teacher_T2_E2: +label hg_pr_flirt_teacher_T2_E2: # Lockhart $ hermione.equip(her_tattoo_lockhart) # Tattoo