From 00518458048cbbe2a8f81fd1d92a468950435093 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 14 Feb 2023 22:17:04 +0000 Subject: [PATCH] Bug fixes * Fixed sprite positioning in some events * Fixed story inconsistencies, spelling mistakes, and grammar in some events * Fixed leading house checks in some events --- .../hermione/events/favors/lets_have_sex.rpy | 2 +- .../hermione/events/favors/talk_to_me.rpy | 4 ++-- .../scripts/characters/hermione/events/intro.rpy | 16 +++++++++------- .../characters/hermione/events/tutoring.rpy | 11 ++++++----- game/scripts/characters/tonks/events/hangout.rpy | 6 +++--- game/scripts/characters/tonks/events/intro.rpy | 12 ++++++------ 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy index 9549fa5e..39ec82a8 100644 --- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy +++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy @@ -107,7 +107,7 @@ label hg_pf_sex_T6_intro_E1: her "Of course, I mind, [genie_name]!" ("upset", "closed", "base", "mid") her "I am not a prostitute!" gen "But you'll do it anyway??" ("base", xpos="far_left", ypos="head") - if gryffindor < hufflepuff or gryffindor < slytherin or gryffindor < ravenclaw: + if not is_in_lead(gryffindor): her "Gryffindor is falling behind again..." ("open", "closed", "base", "mid") else: her "I have to make sure Gryffindor stays in the lead..." ("open", "closed", "base", "mid") diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy index 8993d702..e131f9b6 100644 --- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy @@ -77,7 +77,7 @@ label hg_pf_talk_T1_intro_E1: call play_music("chipper_doodle") gen "Alright then..." ("base", xpos="far_left", ypos="head") - gen "Just tell me some news about you." ("base", xpos="far_left", ypos="head") + gen "Just tell me some news about yourself." ("base", xpos="far_left", ypos="head") her "*Ehm*... Alright..." ("open", "squint", "base", "mid") her "I just stand here and talk then...? Like this?" ("base", "squint", "base", "mid", xpos="mid", ypos="base", trans=fade) pause.8 @@ -96,7 +96,7 @@ label hg_pf_talk_T1_E1: call play_music("chipper_doodle") gen "Alright then..." ("base", xpos="far_left", ypos="head") - gen "Just tell me some news about you." ("base", xpos="far_left", ypos="head") + gen "Just tell me some more news about yourself." ("base", xpos="far_left", ypos="head") her "Here in the middle, right? I remember..." ("open", "squint", "base", "mid", xpos="mid", ypos="base", trans=fade) pause.8 diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy index f6ddc96e..368a4f7f 100644 --- a/game/scripts/characters/hermione/events/intro.rpy +++ b/game/scripts/characters/hermione/events/intro.rpy @@ -1053,7 +1053,7 @@ label nt_he_hermione_E1: ton "Now that's surprising." ("annoyed", "base", "base", "R") gen "No he literally couldn't believe it... He thought I was lying at first." ("base", xpos="far_left", ypos="head") gen "Although after he stopped laughing like a maniac..." ("base", xpos="far_left", ypos="head") - gen "He did figure out quite quickly that the ministry probably wouldn't have sent a full fletched auror for something like this." ("base", xpos="far_left", ypos="head") + gen "He did figure out quite quickly that the ministry probably wouldn't have sent a full-fledged Auror for a minor case like this one." ("base", xpos="far_left", ypos="head") ton "Well, what can I say... I'm an open book." ("base", "happyCl", "base", "mid") ton "I'm sure you'll both find out the benefits of having me around soon enough..." ("horny", "narrow", "base", "R") gen "I'm sure..." ("base", xpos="far_left", ypos="head") @@ -1062,7 +1062,7 @@ label nt_he_hermione_E1: ton "Maybe I can be of help with her?" ("base", "base", "base", "mid") ton "I can be very convincing." ("horny", "narrow", "annoyed", "mid") gen "What are you suggesting?" ("base", xpos="far_left", ypos="head") - ton "To persuade her into having a try of it herself, for a start..." ("open", "base", "base", "R") + ton "To persuade her into giving it a try before being judgemental, for a start..." ("open", "base", "base", "R") ton "Convince her that trading favours isn't all bad." ("base", "base", "base", "mid") gen "That would indeed be very helpful. She's stubborn in that regard." ("base", xpos="far_left", ypos="head") ton "You don't have to tell me. She's been lecturing me about those \"sexual favours\" since the very day I got here..." ("upset", "base", "base", "R") @@ -1147,7 +1147,7 @@ label hermione_intro_E6: gen "What is it, miss Granger?" ("base", xpos="far_left", ypos="head") her "Well... *Ehm*." ("open", "base", "base", "mid") - if gryffindor < slytherin: + if not is_in_lead(gryffindor): her "You see... The Gryffindor house is not in the lead anymore..." ("open", "base", "worried", "R") else: her "You see... The Gryffindor house is struggling with points..." ("open", "base", "worried", "R") @@ -1166,6 +1166,8 @@ label hermione_intro_E6: $ renpy.music.set_pause(False, channel="music") $ renpy.music.set_volume(1.0, 1.0) + gen "(Way to go Tonks!)" ("grin", xpos="far_left", ypos="head") + menu: "\"You mean like a sexual favour?\"": her "*Ehm*... I'm not sure..." ("angry", "wink", "worried", "mid", emote="sweat") @@ -1433,20 +1435,20 @@ label hermione_intro_E6: with d3 if current_favor == "show_tongue": - her "{size=-4}(*Hmm*...){/size}" ("annoyed", "narrow", "worried", "down", ypos="head", flip=False, trans=d3) + her "{size=-4}(*Hmm*...){/size}" ("annoyed", "narrow", "worried", "down", xpos="far_right", ypos="head", flip=True, trans=d3) her "{size=-4}(Students show teachers their tongues all the time...){/size}" ("soft", "base", "base", "R") her "{size=-4}(Although that's usually when the teacher is not looking...){/size}" ("base", "narrow", "base", "R_soft") her "{size=-4}(But there is nothing wrong with what I did today...){/size}" ("annoyed", "base", "base", "L") her "{size=-4}(I earned my house extra points...){/size}" ("smile", "happyCl", "base", "mid") elif current_favor == "stand_there": - her "{size=-4}(I can just stand there and let the professor look at me...){/size}" ("annoyed", "base", "base", "R", ypos="head", flip=False, trans=d3) + her "{size=-4}(I can just stand there and let the professor look at me...){/size}" ("annoyed", "base", "base", "R", xpos="far_right", ypos="head", flip=True, trans=d3) her "{size=-4}(There is nothing wrong with that... nothing at all...){/size}" ("base", "closed", "base", "mid") elif current_favor == "silly_face": - her "{size=-4}(Stupid face...){/size}" ("silly", "base", "base", "squint", ypos="head", flip=False, trans=d3) + her "{size=-4}(Stupid face...){/size}" ("silly", "base", "base", "squint", xpos="far_right", ypos="head", flip=True, trans=d3) her "{size=-4}(Stupid face...){/size}" ("disgust", "happy", "base", "squint") her "{size=-4}(I need to practise this.){/size}" ("base", "happyCl", "base", "mid") elif current_favor == "bad_girl": - her "{size=-4}(I'm a bad girl...){/size}" ("angry", "base", "angry", "stare", ypos="head", flip=False, trans=d3) + her "{size=-4}(I'm a bad girl...){/size}" ("angry", "base", "angry", "stare", xpos="far_right", ypos="head", flip=True, trans=d3) her "{size=-4}(I am a very bad girl...){/size}" ("base", "base", "angry", "stare") her "{size=-4}(Yes, I can say things like that easily...){/size}" ("smile", "happyCl", "base", "mid") her "{size=-4}(I guess I'm a born actress...){/size}" ("base", "happyCl", "base", "mid") diff --git a/game/scripts/characters/hermione/events/tutoring.rpy b/game/scripts/characters/hermione/events/tutoring.rpy index cc3a9ef6..99f3264f 100644 --- a/game/scripts/characters/hermione/events/tutoring.rpy +++ b/game/scripts/characters/hermione/events/tutoring.rpy @@ -175,7 +175,7 @@ label hg_tutor_E2: gen "Miss Granger, time for your first lesson." ("base", xpos="far_left", ypos="head") her "Yes, professor." ("soft", "base", "base", "R") gen "Have you thought about what we discussed?" ("base", xpos="far_left", ypos="head") - her "Not really, I'm not sure what you mean by \"emotions\"." ("normal", "base", "base", "mid") + her "Not really, I'm not sure what you meant by increasing magic ability through \"emotions\"." ("normal", "base", "base", "mid") gen "{size=-2}(You'll learn soon enough, girl.){/size}" ("grin", xpos="far_left", ypos="head") gen "For example, what was your state of mind when you heard those rumours about the Slytherin girls?" ("base", xpos="far_left", ypos="head") her "Please don't bring that up, sir! it really makes me mad!" ("clench", "base", "worried", "stare") @@ -193,7 +193,7 @@ label hg_tutor_E2: gen "Knowledge, Miss Granger, knowledge..." ("base", xpos="far_left", ypos="head") her "I am by far the most knowledgeable of my peers, professor. What more can you ask?" ("open", "closed", "base", "mid") gen "......{w=0.5}Miss Granger, did we not discuss this already? You need to accept you still have much to learn." ("base", xpos="far_left", ypos="head") - gen "I'm tired if repeating myself, let's finish it for tonight." ("base", xpos="far_left", ypos="head") + gen "I'm tired of repeating myself, let's finish it for tonight." ("base", xpos="far_left", ypos="head") her "What? So soon?" ("open", "narrow", "annoyed", "mid") gen "There are other students requiring my attention, you're not the only one." ("base", xpos="far_left", ypos="head") her "Don't tell me you're planning on tutoring one of those harlots from Slytherin, professor?" ("normal", "narrow", "annoyed", "mid", cheeks="blush") @@ -210,8 +210,9 @@ label hg_tutor_E2: call her_walk("door", "base") - her "{size=-4}(Filthy whores...){/size}" ("angry", "closed", "angry", "mid", cheeks="blush", ypos="head", flip=False, trans=d3) - her "{size=-4}(Oh, I should not talk like that...{w=0.5} but it feels so good!){/size}" ("base", "happyCl", "worried", "mid", cheeks="blush") + her "{size=-4}(Filthy whores...){/size}" ("angry", "closed", "angry", "mid", cheeks="blush", xpos="far_right", ypos="head", flip=True, trans=d3) + her "{size=-4}(Oh, I should not talk like that...{w=0.5} but it feels good to let my emotions out!){/size}" ("base", "happyCl", "worried", "mid", cheeks="blush") + her "{size=-4}(Maybe professor is onto something, after all...){/size}" ("soft", "base", "base", "R", cheeks="blush") call her_chibi("leave") @@ -250,7 +251,7 @@ label hg_tutor_E3: call her_walk("door", "base") - her "{size=-4}(*Hmm*... I wonder what he {b}was{/b} thinking about.){/size}" ("base", "narrow", "base", "down", cheeks="blush", ypos="head", flip=False, trans=d3) + her "{size=-4}(*Hmm*... I wonder what he {b}was{/b} thinking about.){/size}" ("base", "narrow", "base", "down", cheeks="blush", xpos="far_right", ypos="head", flip=True, trans=d3) her "{size=-4}(Probably all the problems caused by those harlots.){/size}" ("base", "narrow", "base", "mid_soft", cheeks="blush") her "{size=-4}(Well, I will never be like them, so no need to worry.){/size}" ("silly", "narrow", "base", "mid_soft", cheeks="blush") diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy index 38087e8d..e27a58be 100644 --- a/game/scripts/characters/tonks/events/hangout.rpy +++ b/game/scripts/characters/tonks/events/hangout.rpy @@ -313,7 +313,7 @@ label nt_he_story_intro_E2: gen "..." ("base", xpos="far_left", ypos="head") ton "You talking about Mad-eye?" ("upset", "base", "raised", "mid") gen "I can see perfectly fine, dear." ("base", xpos="far_left", ypos="head") - ton "Alastor Moody is the auror that taught me." ("open", "narrow", "annoyed", "mid") + ton "I'm talking about Alastor Moody, my mentor." ("open", "narrow", "annoyed", "mid") gen "Oh, of course." ("base", xpos="far_left", ypos="head") gen "(His parents must have hated him...)" ("base", xpos="far_left", ypos="head") #gen "(What's wrong with a normal name... like Will Smith, or Robin Williams?)" ("base", xpos="far_left", ypos="head") @@ -325,12 +325,12 @@ label nt_he_story_intro_E2: gen "So...{w=0.3} He's a racist?" ("base", xpos="far_left", ypos="head") ton "No, but he's old... I think he should just retire to be honest." ("open", "base", "base", "downR") ton "His methods have gotten progressively more nefarious..." ("open", "narrow", "annoyed", "R") - ton "Some would argue he should be locked up himself, for all the things that he did to catch his targets..." ("mad", "narrow", "base", "down") + ton "Some would argue he should lock up himself, for all the things that he did to catch his targets..." ("mad", "narrow", "base", "down") gen "And you?" ("grin", xpos="far_left", ypos="head") ton "Me? What about me?" ("upset", "narrow", "annoyed", "mid") gen "You wouldn't say what we do is unethical as well?" ("base", xpos="far_left", ypos="head") ton "Did you start drinking before I got here?" ("open", "narrow", "annoyed", "L") - gen "I never stop..." ("base", xpos="far_left", ypos="head") + gen "I never stopped..." ("base", xpos="far_left", ypos="head") ton "..." ("annoyed", "closed", "base", "up") jump end_tonks_hangout diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy index 4cc1490d..65305535 100644 --- a/game/scripts/characters/tonks/events/intro.rpy +++ b/game/scripts/characters/tonks/events/intro.rpy @@ -793,11 +793,11 @@ label ss_he_tonks_E2: sna "Why would the Ministry have sent a full-fledged Auror, to deal with some eccentric insinuations made by some petty student..." ("snape_16") gen "Shouldn't they?" ("base", xpos="far_left", ypos="head") sna "Just because of some silly rumour about teachers having sexual intercourse with their students?" ("snape_34") - gen "And that's not a reasonable enough concern to send somebody to look into?" ("base", xpos="far_left", ypos="head") + gen "And that's not a reasonable enough concern to send somebody to look into it?" ("base", xpos="far_left", ypos="head") sna "It's the Ministry we're talking about...{w=0.8} They don't give a shit..." ("snape_30") sna "They wouldn't even believe it if \"you-know-who\" were to make a return..." ("snape_31") gen "Who?" ("base", xpos="far_left", ypos="head") - sna "That Tonks had to be the only Ministry personnel that saw some truth in Granger's letters..." ("snape_35") + sna "That Tonks had to be the only Ministry personnel seeing some truth in Granger's letters..." ("snape_35") sna "What if she specifically requested to be sent here to investigate?" ("snape_03") gen "She might have..." ("base", xpos="far_left", ypos="head") sna "So...{w=0.4} what does she want?" ("snape_04") @@ -810,13 +810,13 @@ label ss_he_tonks_E2: sna "How exactly did you end up in this situation with her?" ("snape_04") gen "I don't know... It just... happened." ("base", xpos="far_left", ypos="head") gen "She pretty much figured everything out by herself." ("base", xpos="far_left", ypos="head") - gen "Straight away even guessed that I'm a Genie..." ("base", xpos="far_left", ypos="head") + gen "Straight away. She even guessed that I'm a Genie..." ("base", xpos="far_left", ypos="head") sna "So she knows everything? How did she--" ("snape_03") gen "It appears the \"illusion charm\" wasn't perfect. She momentarily got a glimpse through it..." ("base", xpos="far_left", ypos="head") sna "That's impressive... perhaps I didn't give her enough credit..." ("snape_01") - sna "If what you're telling me about her intentions are true..." ("snape_03") - sna "Maybe she could even be persuaded to help with the Granger situation..." ("snape_05") + sna "If what you're telling me about her intentions is true..." ("snape_03") + sna "Maybe she could be persuaded to help with the Granger situation..." ("snape_05") #if nt_he.hermione_E1: # gen "Way ahead of you!" ("grin", xpos="far_left", ypos="head") @@ -828,7 +828,7 @@ label ss_he_tonks_E2: sna "What a wicked bitch!" ("snape_13") sna "If only we were selling favours back then..." ("snape_46") sna "You know what they say about students from Hufflepuff..." ("snape_20") - sna "They are quite the \"hard-working\" bunch!" ("snape_21") + sna "They always come last!" ("snape_21") gen "(...)" ("base", xpos="far_left", ypos="head") gen "I'm calling dibs on her!" ("base", xpos="far_left", ypos="head") sna "You do what?" ("snape_14")