diff --git a/game/scripts/cg/hermione.rpy b/game/scripts/cg/hermione.rpy index 44322425..47df4cca 100644 --- a/game/scripts/cg/hermione.rpy +++ b/game/scripts/cg/hermione.rpy @@ -280,7 +280,6 @@ layeredimage her_sex_personal lean_back: group genie auto: attribute caress default - attribute shadow default attribute body default group cheeks auto prefix "cheeks": attribute neutral null default diff --git a/game/scripts/characters/cho/events/favors/suck_it.rpy b/game/scripts/characters/cho/events/favors/suck_it.rpy index 18cccb73..17a52861 100644 --- a/game/scripts/characters/cho/events/favors/suck_it.rpy +++ b/game/scripts/characters/cho/events/favors/suck_it.rpy @@ -13,7 +13,7 @@ label cc_pf_blowjob: "\"(Not right now.)\"": $ _event.cancel() - jump cho_favor_menu.personal + jump cho_favor_menu.favors # Setup $ warned_her = False diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index e86b34bc..52d4407d 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -2658,6 +2658,5 @@ label gryffindor_match_return: $ states.cho.ev.quidditch.lock_tactic = False $ states.cho.ev.quidditch.lock_training = True $ states.cho.ev.quidditch.gryffindor_stage = "completed" - call update_cho_favors jump end_cho_event diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 4c2fada7..6c516f55 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -1156,6 +1156,5 @@ label hufflepuff_match_return: $ states.cho.ev.quidditch.lock_practice = True $ states.cho.ev.quidditch.lock_tactic = False $ states.cho.ev.quidditch.hufflepuff_stage = "completed" - call update_cho_favors jump end_cho_event diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 5f34cf90..a6c4432f 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -3540,12 +3540,12 @@ label cho_quid_E14_facefuck: if _no_shirt: show cho_handjob no_shirt cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_soft as cg zorder 16 else: - show cho_handjob cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_softt as cg zorder 16 + show cho_handjob cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_soft as cg zorder 16 else: 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) 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_soft 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/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index 98d5e9d9..c26a0c8d 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -1773,7 +1773,6 @@ label slytherin_match_return: $ states.cho.ev.quidditch.lock_practice = True $ states.cho.ev.quidditch.lock_tactic = False $ states.cho.ev.quidditch.slytherin_stage = "completed" # Prevents this event from repeating. - call update_cho_favors # Reset $ tonks.equip(ton_outfit_last) 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 95a19c51..41f5b77a 100644 --- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy +++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy @@ -415,6 +415,9 @@ label hg_sex_1: show her_sex_personal lean_back as cg: transform_anchor True anchor (0.0, 0.0) + offset (0, 0) + zoom 1.0 + rotate 0 ease_quad 3.0 offset (-230, -100) zoom 0.5 rotate -15 ### @@ -488,6 +491,9 @@ label hg_sex_1: her "Fine..." show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 show her_sex_personal mouth_annoyed eyebrows_worried eyes_narrow_mid cheeks_blush as cg @@ -507,7 +513,7 @@ label hg_sex_1: "\"So... What's new in your life?\"": - show her_sex_personal mouth_open eyebrows_base eyes_base_r + show her_sex_personal mouth_mad eyebrows_worried eyes_narrow_r cheeks_blush as cg her "...[name_genie_hermione]?" gen "Just trying to have a polite conversation." show her_sex_personal mouth_open eyebrows_base eyes_narrow_r cheeks_blush as cg @@ -562,6 +568,9 @@ label hg_sex_1: her "Fine..." show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 play background "sounds/slickloopfast.ogg" fadeout 2 @@ -636,6 +645,9 @@ label hg_sex_1: her "Alright..." show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 play background "sounds/slickloopfast.ogg" fadeout 2 @@ -685,6 +697,9 @@ label hg_sex_1: gen "You need to be punished for being such a slut!" show her_sex_personal bent_over grab as cg: + offset (-65, -240) + zoom 0.45 + rotate -4 easein 1.0 offset (0, -480) rotate 0 with vpunch @@ -692,6 +707,8 @@ label hg_sex_1: #Could add some sound effect here show her_sex_personal mouth_open eyebrows_base eyes_wide_r cheeks_blush as cg: + offset (0, -480) + rotate 0 ease_quad 3.0 offset (-60, -620) zoom 0.55 nar "You push Hermione down onto the desk and start fucking her fiercely!" @@ -916,6 +933,9 @@ label hg_sex_2: show her_sex_personal lean_back as cg: transform_anchor True anchor (0.0, 0.0) + offset (-500, -650) + rotate (15) + zoom 1.0 ease_quad 3.0 offset (-230, -100) zoom 0.5 rotate -15 show her_sex_personal mouth_open eyebrows_base eyes_happycl cheeks_blush as cg @@ -956,6 +976,9 @@ label hg_sex_2: gen "How about this?" show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 show her_sex_personal mouth_grin eyebrows_base eyes_narrow_r cheeks_blush as cg @@ -1013,6 +1036,9 @@ label hg_sex_2: play background "sounds/slickloopfast.ogg" fadeout 2 show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 pause .4 @@ -1102,6 +1128,9 @@ label hg_sex_2: play background "sounds/sexloop.ogg" fadein 2 show her_sex_personal bent_over grab as cg: + offset (-65, -240) + zoom 0.45 + rotate -4 easein 1.0 offset (0, -480) rotate 0 with vpunch @@ -1109,6 +1138,8 @@ label hg_sex_2: #Could add some sound effect here show her_sex_personal mouth_soft eyebrows_base eyes_wide_r cheeks_blush as cg: + offset (0, -480) + rotate 0 ease_quad 3.0 offset (-60, -620) zoom 0.55 nar "You push Hermione over your desk, and start fucking her fiercely as you begin spanking her ass." @@ -1416,6 +1447,9 @@ label hg_sex_3: show her_sex_personal lean_back as cg: transform_anchor True anchor (0.0, 0.0) + offset (-500, -650) + rotate (15) + zoom 1.0 ease_quad 3.0 offset (-230, -100) zoom 0.5 rotate -15 gen "There it is...{w=0.3} I've been looking forward to this." @@ -1469,6 +1503,9 @@ label hg_sex_3: her "I..." show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 show her_sex_personal mouth_angry eyebrows_base eyes_base_r cheeks_blush as cg @@ -1532,6 +1569,9 @@ label hg_sex_3: call ctc show her_sex_personal lean_forward caress mouth_normal eyebrows_base eyes_closed cheeks_blush as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 show her_sex_personal caress_grin as cg @@ -1575,6 +1615,9 @@ label hg_sex_3: her "[name_genie_hermione]!" show her_sex_personal lean_forward caress as cg: + offset (-230, -100) + zoom 0.5 + rotate -15 ease_quad 1.0 offset (-65, -240) zoom 0.45 rotate -4 show her_sex_personal mouth_mad eyebrows_base eyes_base_mid cheeks_blush as cg @@ -1609,6 +1652,9 @@ label hg_sex_3: gen "For example..." show her_sex_personal bent_over grab as cg: + offset (-65, -240) + zoom 0.45 + rotate -4 easein 1.0 offset (0, -480) rotate 0 with vpunch @@ -1616,6 +1662,8 @@ label hg_sex_3: #Could add some sound effect here show her_sex_personal mouth_open eyebrows_base eyes_wide_r cheeks_blush as cg: + offset (0, -480) + rotate 0 ease_quad 3.0 offset (-60, -620) zoom 0.55 nar "You push Hermione down onto the desk and start fucking her fiercely!" @@ -1783,6 +1831,8 @@ label hg_sex_3: rotate 1 xoffset -70 pause 1.0 + offset (-60, -620) + zoom 0.55 ease_quad 1.0 offset (-60, -635) with hpunch nar "You pin Hermione down as you pick up the pace once again." diff --git a/game/scripts/characters/hermione/events/odd_jobs/maid.rpy b/game/scripts/characters/hermione/events/odd_jobs/maid.rpy index 3676b018..43196cdc 100644 --- a/game/scripts/characters/hermione/events/odd_jobs/maid.rpy +++ b/game/scripts/characters/hermione/events/odd_jobs/maid.rpy @@ -44,7 +44,8 @@ label her_maid_job: call tutorial("points") $ _event.cancel() - jump working_menu + 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") @@ -75,7 +76,7 @@ label her_maid_job: call tutorial("points") $ _event.cancel() - jump working_menu + jump hermione_favor_menu.odd_jobs else: #13+ her "I'm not sure what you--" ("angry", "base", "base", "mid") gen "I want you to put this on!" ("base", xpos="far_left", ypos="head") @@ -107,7 +108,7 @@ label her_maid_job: call tutorial("points") $ _event.cancel() - jump working_menu + jump hermione_favor_menu.odd_jobs else: her "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=fade) @@ -132,7 +133,7 @@ label her_maid_job: call tutorial("points") $ _event.cancel() - jump working_menu + jump hermione_favor_menu.odd_jobs elif states.her.level < 16: if not is_in_lead(gryffindor): her "Alright..." ("angry", "base", "base", "mid", xpos="right", ypos="base") @@ -145,7 +146,7 @@ label her_maid_job: call tutorial("points") $ _event.cancel() - jump working_menu + jump hermione_favor_menu.odd_jobs elif states.her.level < 22: her "Of course, [name_genie_hermione]..." ("base", "squint", "base", "mid", xpos="right", ypos="base") else: #22+ diff --git a/game/scripts/characters/hermione/events/odd_jobs/promoter.rpy b/game/scripts/characters/hermione/events/odd_jobs/promoter.rpy index cd519be4..f1061f9b 100644 --- a/game/scripts/characters/hermione/events/odd_jobs/promoter.rpy +++ b/game/scripts/characters/hermione/events/odd_jobs/promoter.rpy @@ -33,7 +33,7 @@ label her_promoter_job: $ states.her.mood += 5 $ _event.cancel() - jump working_menu + jump hermione_favor_menu.odd_jobs random: block: diff --git a/game/scripts/characters/snape/chitchats.rpy b/game/scripts/characters/snape/chitchats.rpy index 5b068b44..412ff523 100644 --- a/game/scripts/characters/snape/chitchats.rpy +++ b/game/scripts/characters/snape/chitchats.rpy @@ -215,7 +215,7 @@ label snape_chitchat: block: sna "You think we could turn Hogwarts into a \"girls only\" school?" ("snape_24") sna "Hogwarts Girls Academy!" ("snape_23") - sna "Now that would make this institution bloody perfect... If it wasn't for for Lockhart." ("snape_13") + sna "Now that would make this institution bloody perfect... If it wasn't for Lockhart." ("snape_13") block: sna "Why did the teacher cross the road?" ("snape_24")