fixes

* Added _event.cancel() on events that should get canceled rather than marked as "failed"
* Renamed event var for clarity.

game/scripts/characters/astoria/events/imperio_training.rpy

@@ -547,7 +547,6 @@ label ag_st_imperio_E2:
             $ states.ast.mood += 12
 
             # Event fails.
-            $ ag_st_imperio.fail()
 
             gen "(I don't think we made much progress here...)" ("base", xpos="far_left", ypos="head")
 
@@ -555,6 +554,10 @@ label ag_st_imperio_E2:
             $ astoria.equip(ast_outfit_last) # Equip player outfit.
 
             call music_block
+
+            # Event resets. (No progress)
+            $ _event.cancel()
+
             jump main_room_menu
 
         "\"Show us those tits!\"": # Succeeds

game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy

@@ -1157,8 +1157,8 @@ label cc_pf_strip_T2_E3_fail:
     # Cho leaves.
     call cho_walk(action="leave")
 
-    # Event failed, no progress.
-    $ cc_pf_strip.fail()
+    # Event resets. (No progress)
+    $ _event.cancel()
     jump end_cho_event
 
 label cc_pf_strip_T2_E3_fail_repeat:
@@ -1213,7 +1213,7 @@ label cc_pf_strip_T2_E3_fail_repeat:
     # Cho leaves.
     call cho_walk(action="leave")
 
-    # Event failed, no progress.
-    $ cc_pf_strip.fail()
+    # Event resets. (No progress)
+    $ _event.cancel()
     jump end_cho_event
 

game/scripts/characters/cho/events/favors/suck_it.rpy

@@ -360,12 +360,14 @@ label cc_pf_blowjob_1:
             if states.cho.ev.suck_it.variant == "failed":
                 gen "(Perhaps I should go a bit easier on her next time...)" ("base", xpos="far_left", ypos="head")
 
-            $ cc_pf_blowjob.fail()
             $ states.cho.ev.suck_it.variant = "failed"
 
             call gen_chibi("sit_behind_desk")
             with fade
 
+            # Event resets. (No progress)
+            $ _event.cancel()
+
             jump end_cho_event
 
         "-Take it slow...-": #Cho strokes and licks genie then goes back to stroking until climax

game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy

@@ -26,6 +26,9 @@ label hg_pf_strip_T3_snape: # Fails
 
     $ states.her.mood += 15
 
+    # Event resets. (No progress)
+    $ _event.cancel()
+
     jump end_hermione_event
 
 

game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy

@@ -161,7 +161,9 @@ label hg_pf_admire_breasts_T1_intro_E1:
 
             gen "(Well... Next time, I guess.)" ("base", xpos="far_left", ypos="head")
 
-            jump hg_pf_admire_breasts_fail
+            # Event resets. (No progress)
+            $ _event.cancel()
+            jump end_hermione_event
 
     play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME.
     her "(................)" ("annoyed", "narrow", "angry", "R")
@@ -251,7 +253,9 @@ label hg_pf_admire_breasts_T1_intro_E2:
 
             gen "Bummer..." ("base", xpos="far_left", ypos="head")
 
-            jump hg_pf_admire_breasts_fail
+            # Event resets. (No progress)
+            $ _event.cancel()
+            jump end_hermione_event
 
     call hg_pf_admire_breasts_T1
 
@@ -322,7 +326,7 @@ label hg_pf_admire_breasts_T2_intro_E1:
     gen "How much will it cost me to see your tits?" ("base", xpos="far_left", ypos="head")
 
     stop music fadeout 1.0
-    if not states.her.ev.show_me_your_tits.failed:
+    if not states.her.ev.admire_breasts_T2_intro_E1.failed:
         her "How much will it cost you to...?" ("open", "base", "base", "mid")
 
         play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME.
@@ -402,8 +406,10 @@ label hg_pf_admire_breasts_T2_intro_E1:
             gen "Maybe I have pushed her a bit too hard." ("base", xpos="far_left", ypos="head")
 
             $ states.her.mood += 12
-            $ states.her.ev.show_me_your_tits.failed = True
+            $ states.her.ev.admire_breasts_T2_intro_E1.failed = True #repeat writing
 
+            # Event resets. (No progress)
+            $ _event.cancel()
             jump end_hermione_event
 
     jump hg_pf_admire_breasts_T2

game/scripts/characters/hermione/vars.rpy

@@ -70,7 +70,7 @@ default states.her.ev.intro.e4_complete = False # 4th visit, she's crying. Faile
 default states.her.ev.intro.e5_complete = False # 5th visit, asks to be tutored, summon unlocked.
 default states.her.ev.intro.convinced = False # Tonks convinces Hermione to sell favours.
 default states.her.ev.intro.e6_complete = False # 6th visit, asks to buy favours, favours unlocked.
-default states.her.ev.show_me_your_tits.failed = False
+default states.her.ev.admire_breasts_T2_intro_E1.failed = False
 default states.her.ev.panty_thief.soaked = False # Temp var, genie procures Hermione's panties and cums on them, resets once returned.
 default states.her.ev.forest_bj.stage = 1
 default states.her.ev.sealed_scroll.sample = False