From 40079a4f622461b6976ffc38700921cb3e8d6d30 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 1 Jul 2023 00:24:17 +0100 Subject: [PATCH] Bug fixes * Enabled colour temperature shader for handjob CG * Fixed syntax errors * Fixed odd jobs menu appearing twice * Fixed speedlines --- ...es1.webp => cho_handjob_speedlines_1.webp} | 0 ...es2.webp => cho_handjob_speedlines_2.webp} | 0 ...es3.webp => cho_handjob_speedlines_3.webp} | 0 game/scripts/cg/cho.rpy | 2 +- .../cho/events/quidditch/intros.rpy | 42 +++++++++---------- .../hermione/events/requests/wear_my_cum.rpy | 4 +- game/scripts/characters/hermione/summon.rpy | 2 +- 7 files changed, 23 insertions(+), 27 deletions(-) rename game/images/CG/cho_handjob/{cho_handjob_speedlines_speedlines1.webp => cho_handjob_speedlines_1.webp} (100%) rename game/images/CG/cho_handjob/{cho_handjob_speedlines_speedlines2.webp => cho_handjob_speedlines_2.webp} (100%) rename game/images/CG/cho_handjob/{cho_handjob_speedlines_speedlines3.webp => cho_handjob_speedlines_3.webp} (100%) diff --git a/game/images/CG/cho_handjob/cho_handjob_speedlines_speedlines1.webp b/game/images/CG/cho_handjob/cho_handjob_speedlines_1.webp similarity index 100% rename from game/images/CG/cho_handjob/cho_handjob_speedlines_speedlines1.webp rename to game/images/CG/cho_handjob/cho_handjob_speedlines_1.webp diff --git a/game/images/CG/cho_handjob/cho_handjob_speedlines_speedlines2.webp b/game/images/CG/cho_handjob/cho_handjob_speedlines_2.webp similarity index 100% rename from game/images/CG/cho_handjob/cho_handjob_speedlines_speedlines2.webp rename to game/images/CG/cho_handjob/cho_handjob_speedlines_2.webp diff --git a/game/images/CG/cho_handjob/cho_handjob_speedlines_speedlines3.webp b/game/images/CG/cho_handjob/cho_handjob_speedlines_3.webp similarity index 100% rename from game/images/CG/cho_handjob/cho_handjob_speedlines_speedlines3.webp rename to game/images/CG/cho_handjob/cho_handjob_speedlines_3.webp diff --git a/game/scripts/cg/cho.rpy b/game/scripts/cg/cho.rpy index 4af4b476..0ec7962d 100644 --- a/game/scripts/cg/cho.rpy +++ b/game/scripts/cg/cho.rpy @@ -1989,7 +1989,7 @@ layeredimage cho_handjob: group effects multiple auto prefix "effects" - group speedlines auto variant "speedlines" + group speedlines auto prefix "speedlines" group cum auto prefix "cum" diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 12567693..7344d485 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1796,7 +1796,7 @@ label cho_quid_E14: cho "There we go!" cho "You can open your eyes now." - show cho_handjob as cg zorder 16 # at color_temperature(1.0) + show cho_handjob as cg zorder 16 at color_temperature(1.0) hide screen blkfade with d5 @@ -2058,7 +2058,7 @@ label cho_quid_E14: #jerking slow play background "sounds/slickloop.ogg" fadein 2 - show cho_handjob speedlines1 as cg with d3 + show cho_handjob speedlines_1 as cg with d3 call ctc cho "You were saying?" @@ -2113,7 +2113,7 @@ label cho_quid_E14: cho "It's somewhat similar, but..." stop background - show cho_handjob eyebrows_raised eyes_open_forward mouth_smile -speedlines1 as cg with d3 + show cho_handjob eyebrows_raised eyes_open_forward mouth_smile -speedlines_1 as cg with d3 cho "You know what... Why don't I tell you how I usually do it, and we could compare?" gen "Sounds like a plan!" @@ -2164,7 +2164,7 @@ label cho_quid_E14: #Cho starts rubbing clit (masturbate) play background "sounds/slickloop.ogg" fadein 2 show cho_masturbate_lockers cho_body_fingering_down mouth_base eyes_narrow_down as cg2 - show cho_handjob eyebrows_base eyes_open_narrow_down speedlines1 as cg + show cho_handjob eyebrows_base eyes_open_narrow_down speedlines_1 as cg with d3 cho "Rubbing it,{w=0.3} up and down,{w=0.3} up and down..." @@ -2177,7 +2177,7 @@ label cho_quid_E14: #jerking medium (genie) #rubbing medium (masturbate) play background "sounds/slickloopfast.ogg" fadein 2 - show cho_handjob speedlines2 as cg + show cho_handjob speedlines_2 as cg show cho_masturbate_lockers mouth_lipbite eyebrows_mad eyes_down as cg2 with d3 gen "*Ngh*... You're--{w=0.2} You're able to channel your own magic into your--" @@ -2201,7 +2201,7 @@ label cho_quid_E14: #jerking fast (genie) #rubbing fast (masturbate) play background "sounds/slickloopveryfast.ogg" fadein 2 - show cho_handjob speedlines3 as cg + show cho_handjob speedlines_3 as cg gen "*Ngh*!!!" show cho_masturbate_lockers eyebrows_mad mouth_angry as cg2 @@ -2222,7 +2222,7 @@ label cho_quid_E14: gen "*Ah*...{w=0.4} Why did you--" - show cho_handjob cho_body_idle mouth_neutral eyes_open_right penis_hard_spit_on_shaft as cg zorder 16 # at color_temperature(1.0) + show cho_handjob cho_body_idle mouth_neutral eyes_open_right penis_hard_spit_on_shaft as cg zorder 16 at color_temperature(1.0) hide screen blkfade with d5 @@ -2570,7 +2570,7 @@ label cho_quid_E14: #Cho starts fingering pussy (masturbate) play background "sounds/slickloop.ogg" fadein 2 show cho_masturbate_lockers eyes_narrow_left eyebrows_sad as cg2 - show cho_handjob eyes_open_forward mouth_angry speedlines1 as cg + show cho_handjob eyes_open_forward mouth_angry speedlines_1 as cg with d3 cho "So, you're--{w=0.2} You're not mad at me?" gen "Mad? Are you kidding?" @@ -2602,7 +2602,7 @@ label cho_quid_E14: #Fingering fast play background "sounds/slickloopveryfast.ogg" fadein 2 show cho_masturbate_lockers eyes_down mouth_base effects_hand_move as cg2 - show cho_handjob eyebrows_raised eyes_open_wide_down speedlines3 as cg + show cho_handjob eyebrows_raised eyes_open_wide_down speedlines_3 as cg with d3 call ctc @@ -2630,7 +2630,7 @@ label cho_quid_E14: cho "Yes, [name_genie_cho]!" stop background - show cho_masturbate_lockers cho_body_sucking mouth_sucking -effects_hand_move -speedlines3 as cg2 + show cho_masturbate_lockers cho_body_sucking mouth_sucking -effects_hand_move -speedlines_3 as cg2 show cho_handjob cho_body_bending as cg with d6 pause 0.75 @@ -2656,7 +2656,7 @@ label cho_quid_E14: play background "sounds/slickloopfast.ogg" fadein 2 show cho_masturbate_lockers cho_body_fingering_up mouth_smile eyes_narrow_down as cg2 with d3 - show cho_handjob speedlines2 as cg + show cho_handjob speedlines_2 as cg pause 0.5 show cho_masturbate_lockers cho_body_fingering_up eyebrows_sad eyes_narrow_ahegao effects_hand_move as cg2 show cho_handjob eyes_open_down as cg @@ -2674,7 +2674,7 @@ label cho_quid_E14: gen "{size=+4}Aaaaah Yeeeees!{/size}" stop background - show cho_handjob cum_precum eyebrows_raised eyes_open_wide_down mouth_angry -speedlines2 as cg with d3 + show cho_handjob cum_precum eyebrows_raised eyes_open_wide_down mouth_angry -speedlines_2 as cg with d3 cho "{size=+4}Wait!{/size}" # Genies cum shoots past Cho through time, space and reason onto the masturbating Cho CG @@ -2777,7 +2777,8 @@ label cho_quid_E14: with d3 stop music fadeout 2.0 - call gen_chibi("hide") + gen_chibi("sit_behind_desk") + $ cho.set_pose(None) if _facefuck: if game.daytime: @@ -2800,11 +2801,6 @@ label cho_quid_E14: hide screen blkfade with d3 - call gen_chibi("sit_behind_desk") - with fade - - $ cho.set_pose(None) - jump end_cho_event label cho_quid_E14.facefuck: @@ -2867,16 +2863,16 @@ label cho_quid_E14.facefuck: # Throatfuck CG: if _no_shirt: - show cho_facefuck up eyebrows_low eyes_narrow_down no_shirt as cg zorder 15 + show cho_facefuck up eyebrows_low eyes_narrow_down no_shirt as cg zorder 15 at color_temperature(1.0) else: - show cho_facefuck up eyebrows_low eyes_narrow_down as cg zorder 15 + show cho_facefuck up eyebrows_low eyes_narrow_down as cg zorder 15 at color_temperature(1.0) hide screen blkfade with d5 gen "I can't believe a pupil of mine would defy me like this!" - show cho_facefuck eyebrows_worried eyes_narrow_stare as cg with d3 + show cho_facefuck eyebrows_worried eyes_narrow_stare as cg with d3 cho "*Mfff*!" gen "So, to set you straight, I'm going to pump some morals into you!" @@ -3527,9 +3523,9 @@ label cho_quid_E14.facefuck: pause 0.8 if _no_shirt: - show cho_handjob no_shirt cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_soft as cg zorder 16 # at color_temperature(1.0) + show cho_handjob no_shirt cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_soft as cg zorder 16 at color_temperature(1.0) else: - show cho_handjob cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_softt as cg zorder 16 # at color_temperature(1.0) + show cho_handjob cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_softt as cg zorder 16 at color_temperature(1.0) play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed diff --git a/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy b/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy index e2e7a9c3..6c0b2e4b 100644 --- a/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy +++ b/game/scripts/characters/hermione/events/requests/wear_my_cum.rpy @@ -589,9 +589,9 @@ label hg_pr_cumslut_e3: her "*Huh*? Classes?" ("silly", "happyCl", "worried", "mid") her "Oh no, what have I done!!" ("normal", "wide", "worried", "mid") - if _cum_location == "face" + if _cum_location == "face": her "I can't attend classes with your cum on my face!" ("shock", "happyCl", "worried", "mid") - elif _cum_location == "chest" + elif _cum_location == "chest": her "I can't attend classes with your cum on my chest!" ("angry", "happyCl", "worried", "mid") gen "Not with that attitude." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/summon.rpy b/game/scripts/characters/hermione/summon.rpy index 6a1defe4..61e2b01c 100644 --- a/game/scripts/characters/hermione/summon.rpy +++ b/game/scripts/characters/hermione/summon.rpy @@ -207,7 +207,7 @@ label hermione_favor_menu: else: $ result.start() - "-Odd Jobs-" (icon="interface/icons/small/gold.webp"): + "-Odd Jobs-" (icon="interface/icons/small/gold.webp") if game.daytime: label .odd_jobs: $ result = show_events_menu(hermione_jobs, report_progress=False)