Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Fix

Browse Source 
* Moved T2 Hermione "Dance for me" into single label with a "repeat" check.
This commit is contained in:
Johnny28 2023-06-30 19:49:07 +02:00
parent 0447b1df46
commit 65c4082380
2 changed files with 57 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game/scripts/characters/hermione/events/favors/dance_for_me.rpy
View File

@ -60,7 +60,7 @@ label end_hg_pf_strip:
### Fail Events ### ### Fail Events ###
label hg_pf_strip_fail: label hg_pf_strip_fail:
jump end hermione_event jump end_hermione_event
label hg_pf_strip_T1_E1: #Fails label hg_pf_strip_T1_E1: #Fails
call start_hg_pf_strip call start_hg_pf_strip
@ -75,12 +75,14 @@ label hg_pf_strip_T1_E1: #Fails
her "[name_genie_hermione]! That is going too far!" ("angry", "base", "angry", "mid") her "[name_genie_hermione]! That is going too far!" ("angry", "base", "angry", "mid")
her "I think I better leave..." ("angry", "base", "base", "R") her "I think I better leave..." ("angry", "base", "base", "R")
jump hg_pf_strip_fail $ states.her.mood += 5
jump hg_pf_strip_fail
label hg_pf_strip_T2_E1: # Hermione starts dancing, but it will fail anyway. label hg_pf_strip_T2_E1: # Hermione starts dancing, but it will fail anyway.
call start_hg_pf_strip call start_hg_pf_strip
if not _event_completed_failed:
gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") 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 "You want me to..." ("open", "base", "worried", "mid")
her "... Dance for you, [name_genie_hermione]?" ("open", "wink", "base", "mid") her "... Dance for you, [name_genie_hermione]?" ("open", "wink", "base", "mid")
@ -124,16 +126,7 @@ label hg_pf_strip_T2_E1: # Hermione starts dancing, but it will fail anyway.
her "Yes. I believe you're right, Sir." ("soft", "closed", "angry", "mid") 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 "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") her "I will be leaving now!" ("annoyed", "base", "angry", "mid")
else:
call her_walk(action="leave")
$ states.her.mood += 5
jump hg_pf_strip_fail
label hg_pf_strip_T1_E2: #Fails
call start_hg_pf_strip
gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") 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") 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") gen "Yes?" ("base", xpos="far_left", ypos="head")

3
game/scripts/characters/hermione/favors.rpy
View File

@ -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_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_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_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_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_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_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_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"]) 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"])