diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy index 3f588c45..0353f39b 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy @@ -60,7 +60,7 @@ label end_hg_pf_strip: ### Fail Events ### label hg_pf_strip_fail: - jump end hermione_event + jump end_hermione_event label hg_pf_strip_T1_E1: #Fails call start_hg_pf_strip @@ -75,74 +75,67 @@ label hg_pf_strip_T1_E1: #Fails her "[name_genie_hermione]! That is going too far!" ("angry", "base", "angry", "mid") her "I think I better leave..." ("angry", "base", "base", "R") - jump hg_pf_strip_fail - - -label hg_pf_strip_T2_E1: # Hermione starts dancing, but it will fail anyway. - call start_hg_pf_strip - - gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") - her "You want me to..." ("open", "base", "worried", "mid") - her "... Dance for you, [name_genie_hermione]?" ("open", "wink", "base", "mid") - gen "Yes... You think you could manage that?" ("base", xpos="far_left", ypos="head") - her "*Ehm*... I suppose so..." ("soft", "base", "base", "R") - her "Am I getting paid for this?" - gen "Of course, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") - her "So... Just a little dancing then..." ("annoyed", "base", "worried", "R") - gen "Whenever you're ready..." ("base", xpos="far_left", ypos="head") - her "................." - hide hermione_main - with d3 - - nar "Hermione starts dancing..." - - stop music fadeout 1.0 - call her_chibi("dance","mid","base") - with d3 - pause.2 - - gen "*Hmm*..." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "{size=-5}(...........................................){/size}" ("disgust", "narrow", "base", "down", ypos="head", flip=False) - her @ cheeks blush "{size=-5}(This is silly...){/size}" ("annoyed", "narrow", "angry", "R") - nar "Hermione looks embarrassed, but she keeps on \"dancing\"..." - gen "..................." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "{size=-5}(...........................................){/size}" ("annoyed", "narrow", "angry", "R") - gen "Alright, you can start undressing now." ("base", xpos="far_left", ypos="head") - - call her_chibi("stand","mid","base") #Hermione stands still. - with hpunch - - her @ cheeks blush "??!" ("mad", "wide", "base", "stare") - gen "Take off your clothes..." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "You want me to...?" ("disgust", "narrow", "base", "down") - - her @ cheeks blush "[name_genie_hermione]!" ("angry", "base", "angry", "mid") - her @ cheeks blush "This is ridiculous on a whole other level!" ("angry", "closed", "angry", "mid") - her @ cheeks blush "I won't let myself be forced to become some cheap stripper!!!" ("mad", "wide", "base", "stare") - gen "Nobody is forcing you to do this." ("base", xpos="far_left", ypos="head") - gen "If you don't need the points, please feel free to leave." ("base", xpos="far_left", ypos="head") - her "Yes. I believe you're right, Sir." ("soft", "closed", "angry", "mid") - her "Stripping for you won't be worth {b}any{/b} amount of points!" ("angry", "base", "angry", "mid") - her "I will be leaving now!" ("annoyed", "base", "angry", "mid") - - call her_walk(action="leave") - $ states.her.mood += 5 jump hg_pf_strip_fail -label hg_pf_strip_T1_E2: #Fails +label hg_pf_strip_T2_E1: # Hermione starts dancing, but it will fail anyway. call start_hg_pf_strip - gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") - her "And would you like me to take off my clothes as well?" ("soft", "closed", "base", "mid") - gen "Yes?" ("base", xpos="far_left", ypos="head") - her "No! I will not!" ("scream", "base", "angry", "mid") - her "And I'd appreciate it if you'd stop making such outrageous requests..." ("annoyed", "base", "angry", "mid") - gen "You will get points for it..." ("base", xpos="far_left", ypos="head") - her "Shove those points up your--" ("angry", "closed", "angry", "mid") - her "I will be leaving now..." ("annoyed", "base", "angry", "mid") - her "Good day, Sir..." ("annoyed", "narrow", "angry", "R") + if not _event_completed_failed: + gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") + her "You want me to..." ("open", "base", "worried", "mid") + her "... Dance for you, [name_genie_hermione]?" ("open", "wink", "base", "mid") + gen "Yes... You think you could manage that?" ("base", xpos="far_left", ypos="head") + her "*Ehm*... I suppose so..." ("soft", "base", "base", "R") + her "Am I getting paid for this?" + gen "Of course, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") + her "So... Just a little dancing then..." ("annoyed", "base", "worried", "R") + gen "Whenever you're ready..." ("base", xpos="far_left", ypos="head") + her "................." + hide hermione_main + with d3 + + nar "Hermione starts dancing..." + + stop music fadeout 1.0 + call her_chibi("dance","mid","base") + with d3 + pause.2 + + gen "*Hmm*..." ("base", xpos="far_left", ypos="head") + her @ cheeks blush "{size=-5}(...........................................){/size}" ("disgust", "narrow", "base", "down", ypos="head", flip=False) + her @ cheeks blush "{size=-5}(This is silly...){/size}" ("annoyed", "narrow", "angry", "R") + nar "Hermione looks embarrassed, but she keeps on \"dancing\"..." + gen "..................." ("base", xpos="far_left", ypos="head") + her @ cheeks blush "{size=-5}(...........................................){/size}" ("annoyed", "narrow", "angry", "R") + gen "Alright, you can start undressing now." ("base", xpos="far_left", ypos="head") + + call her_chibi("stand","mid","base") #Hermione stands still. + with hpunch + + her @ cheeks blush "??!" ("mad", "wide", "base", "stare") + gen "Take off your clothes..." ("base", xpos="far_left", ypos="head") + her @ cheeks blush "You want me to...?" ("disgust", "narrow", "base", "down") + + her @ cheeks blush "[name_genie_hermione]!" ("angry", "base", "angry", "mid") + her @ cheeks blush "This is ridiculous on a whole other level!" ("angry", "closed", "angry", "mid") + her @ cheeks blush "I won't let myself be forced to become some cheap stripper!!!" ("mad", "wide", "base", "stare") + gen "Nobody is forcing you to do this." ("base", xpos="far_left", ypos="head") + gen "If you don't need the points, please feel free to leave." ("base", xpos="far_left", ypos="head") + her "Yes. I believe you're right, Sir." ("soft", "closed", "angry", "mid") + her "Stripping for you won't be worth {b}any{/b} amount of points!" ("angry", "base", "angry", "mid") + her "I will be leaving now!" ("annoyed", "base", "angry", "mid") + else: + gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") + her "And would you like me to take off my clothes as well?" ("soft", "closed", "base", "mid") + gen "Yes?" ("base", xpos="far_left", ypos="head") + her "No! I will not!" ("scream", "base", "angry", "mid") + her "And I'd appreciate it if you'd stop making such outrageous requests..." ("annoyed", "base", "angry", "mid") + gen "You will get points for it..." ("base", xpos="far_left", ypos="head") + her "Shove those points up your--" ("angry", "closed", "angry", "mid") + her "I will be leaving now..." ("annoyed", "base", "angry", "mid") + her "Good day, Sir..." ("annoyed", "narrow", "angry", "R") call her_walk(action="leave") diff --git a/game/scripts/characters/hermione/favors.rpy b/game/scripts/characters/hermione/favors.rpy index 511e6bef..a29c08e0 100644 --- a/game/scripts/characters/hermione/favors.rpy +++ b/game/scripts/characters/hermione/favors.rpy @@ -42,8 +42,7 @@ default her_ev_grope_t4_e2 = Event(id="grope_t4_e2", label="hg_pf_grope_T4_intro default her_ev_grope_t4_e3 = Event(id="grope_t4_e3", label="hg_pf_grope_T4_E2", priority=7, req="states.her.tier >= 4", queue="her_eventqueue_grope", autoenqueue=True, autodequeue=False, ignore_labels=["hg_pf_grope_breasts_T4", "hg_pf_grope_ass_T4", "hg_pf_grope_ass_T4_back", "hg_pf_grope_ass_T4_front", "hg_pf_grope_ass_T4_continue", "hg_pf_grope_breasts_T4_continue"]) default her_ev_strip_for_me_t1_e1 = Event(id="strip_for_me_t1_e1", label="hg_pf_strip_T1_E1", priority=5, req="states.her.tier == 1", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False) -default her_ev_strip_for_me_t2_e1 = Event(id="strip_for_me_t2_e1", label="hg_pf_strip_T2_E1", priority=5, req="states.her.tier == 2", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False, repeat=False) -default her_ev_strip_for_me_t2_e2 = Event(id="strip_for_me_t2_e2", label="hg_pf_strip_T2_E2", priority=6, req="states.her.tier == 2", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False) +default her_ev_strip_for_me_t2_e1 = Event(id="strip_for_me_t2_e1", label="hg_pf_strip_T2_E1", priority=5, req="states.her.tier == 2", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False) default her_ev_strip_for_me_t3_e1 = Event(id="strip_for_me_t3_e1", label="hg_pf_strip_T3_intro_E1", priority=5, req="states.her.tier == 3", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False, repeat=False) default her_ev_strip_for_me_t3_e2 = Event(id="strip_for_me_t3_e2", label="hg_pf_strip_T3_intro_E2", priority=6, req="states.her.tier == 3", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False, repeat=False) default her_ev_strip_for_me_t3_e3 = Event(id="strip_for_me_t3_e3", label="hg_pf_strip_T3_E2", priority=7, req="states.her.tier == 3", queue="her_eventqueue_strip_for_me", autoenqueue=True, autodequeue=False, ignore_labels=["hg_pf_strip_T3_masturbate", "hg_pf_strip_T3_watch", "hg_pf_strip_T3_snape"])