From 85c2c1e9f2988ee0cef96f9c927eecf592ff5501 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Sun, 2 Jul 2023 23:13:07 +0200 Subject: [PATCH] Cho Quidditch clothing. * Adjusted Cho's Main Doll clothing items to match flying doll. * Minor fix. --- .../panties/{sport_panties_1 => sport_panties_2}/0.webp | 0 .../{sport_panties_1 => sport_panties_2}/outline.webp | 0 game/scripts/characters/cho/events/quidditch/intros.rpy | 5 ++--- game/scripts/characters/cho/wardrobe.rpy | 9 +++++---- .../hermione/events/favors/dance_for_me_snape.rpy | 2 -- 5 files changed, 7 insertions(+), 9 deletions(-) rename game/characters/cho/poses/broom/clothes/panties/{sport_panties_1 => sport_panties_2}/0.webp (100%) rename game/characters/cho/poses/broom/clothes/panties/{sport_panties_1 => sport_panties_2}/outline.webp (100%) diff --git a/game/characters/cho/poses/broom/clothes/panties/sport_panties_1/0.webp b/game/characters/cho/poses/broom/clothes/panties/sport_panties_2/0.webp similarity index 100% rename from game/characters/cho/poses/broom/clothes/panties/sport_panties_1/0.webp rename to game/characters/cho/poses/broom/clothes/panties/sport_panties_2/0.webp diff --git a/game/characters/cho/poses/broom/clothes/panties/sport_panties_1/outline.webp b/game/characters/cho/poses/broom/clothes/panties/sport_panties_2/outline.webp similarity index 100% rename from game/characters/cho/poses/broom/clothes/panties/sport_panties_1/outline.webp rename to game/characters/cho/poses/broom/clothes/panties/sport_panties_2/outline.webp diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 355a217d..d6e3df58 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -2787,9 +2787,8 @@ label cho_quid_E14: $ cho.set_pose(None) if _facefuck: - if game.daytime: - nar "You walk up to the window and watch as Cho flies off towards the direction of the Gryffindor tower." - nar "She returns within a couple of minutes and gives you a triumphant smile. She then takes her clothes and flies off again." + nar "You walk up to the window and watch as Cho flies off towards the direction of the Gryffindor tower." + nar "She returns within a couple of minutes and gives you a triumphant smile. She then takes her clothes and flies off again." else: play sound "sounds/steps_grass.ogg" nar "You grab Cho's clothing and start making your way down to the Quidditch pitch..." diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index aed28d78..1a340079 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -275,6 +275,7 @@ default cho_piercing_barbell = DollCloth("cho", ("piercings & tattoos", "piercin # Quidditch separate category default choq_bra_sports1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "sport_bra_1", ["#9cccf9ff"]) default choq_panties_sport1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sport_panties_1", ["#9cccf9ff"]) +default choq_panties_sport2 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sport_panties_2", ["#9cccf9ff"]) default choq_cloth_robequidditch1 = DollCloth("cho", ("upper body", "robes"), "robe", "robe_quidditch_1", ["#3c4e83ff", "#ba8d0bff"]) default choq_cloth_topsweater1 = DollCloth("cho", ("upper body", "sweaters"), "top", "top_sweater_1", ["#3c4e83ff", "#ba8d0bff"]) default choq_cloth_pantslong2 = DollCloth("cho", ("lower body", "trousers"), "bottom", "pants_long_2", ["#6d6979ff", "#d5a10dff"]) @@ -291,11 +292,11 @@ default choq_accessory_protectors2 = DollCloth("cho", ("misc", "accessory"), "ac default choq_accessory_snitch_in_hand = DollCloth("cho", ("hidden", "accessory"), "accessory", "snitch_in_hand", None, zorder=-1) # Add choq_accessory_protectors2 once drawn for normal pose -default cho_outfit_quidditch = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_cloth_robequidditch1, choq_bra_sports1, choq_panties_sport1], hidden=True) +default cho_outfit_quidditch = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_cloth_robequidditch1, choq_bra_sports1, choq_panties_sport2], hidden=True) -default cho_outfit_quidditch_hufflepuff = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_schoolskirt2, choq_cloth_robequidditch1, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport1], hidden=True) -default cho_outfit_quidditch_slytherin = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_accessory_protectors2, choq_bra_sports1, choq_panties_sport1], hidden=True) -default cho_outfit_quidditch_gryffindor = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_schoolskirt3, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport1], hidden=True) +default cho_outfit_quidditch_hufflepuff = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_schoolskirt2, choq_cloth_robequidditch1, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport2], hidden=True) +default cho_outfit_quidditch_slytherin = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_accessory_protectors2, choq_bra_sports1, choq_panties_sport2], hidden=True) +default cho_outfit_quidditch_gryffindor = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_schoolskirt2, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport2], hidden=True) ############ ## Events ## diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy index e5772586..c2f408b0 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy @@ -840,8 +840,6 @@ label hg_pf_strip_T4_snape_results: gen "Most certainly." ("base", xpos="far_left", ypos="head") gen "Now, why don't you tell me what you've learned?" ("base", xpos="far_left", ypos="head") - #TODO These are he results of menu options earlier in the event, and should only show the first time. If you replay the same option, it will skip it in this section (search for "#flogging", "#weasley", "#potter", "#butt") - if _flogging_known: her "Well, I've learned that he doesn't seem to have any problems with hitting his students..." ("open", "closed", "base", "mid") gen "*Hmm*... I'd say that his statement isn't exactly conclusive enough to make that assumption." ("base", xpos="far_left", ypos="head")