From b81d7323c53fb2450fc3360245f26d026951372a Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Mon, 20 Jun 2022 18:45:02 +0100 Subject: [PATCH] Bug fixes * Fixed outfit scheduling overriding outfits in certain events * Fixed Hermione's jobs transition issues --- .../events/quidditch/hufflepuff_practice.rpy | 3 + .../events/quidditch/slytherin_practice.rpy | 2 + .../characters/hermione/events/jobs.rpy | 67 +++++++++---------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy index 5eb0e6f2..7a248d26 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy @@ -34,6 +34,7 @@ label cc_ht_start: label cc_ht_return: # Cho enters. + call play_sound("knocking") call bld "*Knock-knock-knock*" @@ -46,6 +47,8 @@ label cc_ht_return: gen "Come on in, [cho_name]!" ("base", xpos="far_left", ypos="head") cho "..." + $ cho.equip(cho_outfit_quidditch) + call cho_walk(xpos="mid", ypos="base", action="enter") cho "(...)" ("annoyed", "narrow", "angry", "R", xpos="mid", ypos="base", trans=d3) diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_practice.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_practice.rpy index 9cac4e32..8072ee50 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_practice.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_practice.rpy @@ -75,6 +75,8 @@ label cc_st_return: gen "Wha--?" ("base", xpos="far_left", ypos="head") + $ cho.equip(cho_outfit_quidditch) + call cho_walk(action="enter", xpos="desk", ypos="base") # Cho is furious. diff --git a/game/scripts/characters/hermione/events/jobs.rpy b/game/scripts/characters/hermione/events/jobs.rpy index 38ce2de1..6356141f 100644 --- a/game/scripts/characters/hermione/events/jobs.rpy +++ b/game/scripts/characters/hermione/events/jobs.rpy @@ -1,9 +1,9 @@ +default maid_intro_done = False + # Maid Job label job_1: - default maid_intro_done = False - show screen blkfade with d3 hide hermione_main @@ -11,7 +11,6 @@ label job_1: hide screen blkfade with d5 - if not maid_intro_done: $ maid_intro_done = True gen "I think it's about time we got someone to clean up this place." ("base", xpos="far_left", ypos="head") @@ -161,17 +160,17 @@ label job_1: show screen blkfade with d5 - # Setup $ maid_outfit_ITEM.used = True call play_sound("equip_inventory") $ her_outfit_last.save() $ hermione.equip(her_outfit_maid) - hide hermione_main - pause 2.5 hide screen blkfade with d5 + pause 2.5 + hide hermione_main + with d3 gen "Off you go then..." ("base", xpos="far_left", ypos="head") @@ -183,11 +182,12 @@ label job_1: jump main_room_menu label maid_responses: + + $ hermione.equip(her_outfit_maid) $ payment = renpy.random.randint(10, 25) call her_walk(action="enter", xpos="mid", ypos="base") - $ random_number = renpy.random.randint(1, 3) menu: @@ -334,12 +334,13 @@ label job_2: call play_sound("equip_inventory") $ her_outfit_last.save() $ hermione.equip(her_outfit_maid) - pause 2.5 + her "" ("base", "base", "base", "mid",xpos="right",ypos="base") hide screen blkfade with d5 - her "" ("base", "base", "base", "mid",xpos="right",ypos="base",trans=fade) - pause.8 + pause 2.5 + hide hermione_main + with d3 gen "Off you go then..." ("base", xpos="far_left", ypos="head") @@ -351,6 +352,8 @@ label job_2: jump main_room_menu label barmaid_responses: + + $ hermione.equip(her_outfit_maid) $ payment = renpy.random.randint(20, 50) call her_walk(action="enter", xpos="mid", ypos="base") @@ -395,17 +398,18 @@ label job_3: show screen blkfade with d5 call play_sound("equip_inventory") - pause 2.5 $ her_outfit_last.save() # Store current outfit. if her_outfit_cheerleader_2.unlocked and her_whoring >= 11: #Sexy $ hermione.equip(her_outfit_cheerleader_2) else: #Normal $ hermione.equip(her_outfit_cheerleader_1) + her "" ("base", "base", "base", "mid",xpos="right",ypos="base") hide screen blkfade with d5 - her "" ("base", "base", "base", "mid",xpos="right",ypos="base",trans=fade) - pause.8 + pause 2.5 + hide hermione_main + with d3 gen "You look great!" ("grin", xpos="far_left", ypos="head") her "Thank you..." ("base", "happyCl", "base", "mid") @@ -413,23 +417,20 @@ label job_3: call her_walk(action="leave") - $ hermione.equip(her_outfit_last) - $ hermione_busy = True $ current_job = "gryffindor_cheerleader" jump main_room_menu label gryffindor_cheer_responses: - $ payment = renpy.random.randint(40, 80) - call her_walk(action="enter", xpos="mid", ypos="base") - - $ her_outfit_last.save() # Store current outfit. if her_outfit_cheerleader_2.unlocked and her_whoring >= 11: #Sexy $ hermione.equip(her_outfit_cheerleader_2) else: #Normal $ hermione.equip(her_outfit_cheerleader_1) + $ payment = renpy.random.randint(40, 80) + + call her_walk(action="enter", xpos="mid", ypos="base") her "" ("base", "base", "base", "mid",xpos="right",ypos="base") pause.5 @@ -527,10 +528,9 @@ label gryffindor_cheer_responses: $ current_job = None jump main_room_menu - - # Slytherin Cheerleader Job label job_4: + if her_whoring <= 6: her "*Humph*!..." elif her_whoring >=7 and her_whoring <= 15: @@ -541,18 +541,18 @@ label job_4: show screen blkfade with d5 call play_sound("equip_inventory") - pause 2.5 $ her_outfit_last.save() # Store current outfit. if her_outfit_cheerleader_2.unlocked and her_whoring >= 11: #Sexy $ hermione.equip(her_outfit_cheerleader_2) else: #Normal $ hermione.equip(her_outfit_cheerleader_1) + her "" ("base", "base", "base", "mid",xpos="right",ypos="base") hide screen blkfade with d5 - - her "" ("base", "base", "base", "mid",xpos="right",ypos="base",trans=fade) - pause.8 + pause 2.5 + hide hermione_main + with d3 gen "You look incredible!" ("angry", xpos="far_left", ypos="head") her "Thank you..." ("base", "happyCl", "base", "mid") @@ -560,8 +560,6 @@ label job_4: call her_walk(action="leave") - $ hermione.equip(her_outfit_last) - $ hermione_busy = True $ current_job = "slytherin_cheerleader" @@ -569,16 +567,16 @@ label job_4: jump main_room_menu label slytherin_cheer_responses: - $ payment = renpy.random.randint(50, 100) - call her_walk(action="enter", xpos="mid", ypos="base") - - $ her_outfit_last.save() # Store current outfit. if her_outfit_cheerleader_2.unlocked and her_whoring >= 11: #Sexy $ hermione.equip(her_outfit_cheerleader_2) else: #Normal $ hermione.equip(her_outfit_cheerleader_1) + $ payment = renpy.random.randint(50, 100) + + call her_walk(action="enter", xpos="mid", ypos="base") + $ random_number = renpy.random.randint(0, 10) if random_number >=9 and her_reputation > 15: @@ -732,19 +730,17 @@ label job_5: else: her "That doesn't leave a lot to the imagination..." ("smile", "happy", "base", "mid") her "At least the straps should cover my nipples..." ("open", "wink", "base", "mid") - her "I'll do it..." ("normal","happy", cheeks="blush") + her "I'll do it..." ("normal", "happy", "base", "mid", cheeks="blush") show screen blkfade with d5 call play_sound("equip_inventory") - pause 2.5 - $ her_outfit_last.save() $ hermione.equip(her_outfit_poker) - hide screen blkfade with d5 + gen "Looking great!" ("grin", xpos="far_left", ypos="head") her "Thank you..." ("open","happy", cheeks="blush") gen "Off you go then..." ("base", xpos="far_left", ypos="head") @@ -758,6 +754,7 @@ label job_5: label hermione_helping_selling_cards: $ current_job = None + $ hermione.equip(her_outfit_poker) call her_walk(action="enter", xpos="mid", ypos="base")