Flag fixes and additions

* Added "states.her.status.caught_genie_masturbating" flag, and changed previous "states.her.status.handjob" checks to use it.
* Added "states.her.status.cum_body" flag, used to check when genie first cums on Hermione's clothes/body.

* Adjusted some checks.

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

@@ -955,6 +955,8 @@ label hg_pf_strip_T3_masturbate:
             stop music fadeout 1.0
 
             her "No, [name_genie_hermione]!" ("annoyed", "narrow", "angry", "R", flip=False)
+            if states.her.status.cum_body:
+                her "You've done this to me before, without telling me beforehand..." ("angry", "happyCl", "worried", "mid")
             gen "*Huh*?" ("base", xpos="far_left", ypos="head")
             show screen blkfade
             with d5
@@ -1616,7 +1618,7 @@ label hg_pf_strip_T4_masturbate:
                     her "I degraded myself for your amusement..." ("soft", "happy", "base", "R")
                     her "I even let you cum on me..." ("open", "base", "base", "R")
                     her "And I get, {size=+5}NOTHING?!{/size}" ("clench", "base", "angry", "mid", emote="angry", trans=hpunch)
-                    gen "You've got a shiny and glistening complexion..." ("base", xpos="far_left", ypos="head")
+                    gen "You've got a shiny and glistening complexion out of it..." ("base", xpos="far_left", ypos="head")
                     her "Oh, this is a new low... Even for you, [name_genie_hermione]!" ("soft", "base", "angry", "mid")
                     gen "Dismissed." ("base", xpos="far_left", ypos="head")
                     her "{size=+5}*GROAN*!{/size}" ("clench", "base", "angry", "mid", emote="angry")

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

@@ -221,6 +221,7 @@ label hg_pf_handjob_T5_repeat:
 ### First Tier Handjob ###
 
 label hg_pf_handjob_1:
+    $ states.her.status.handjob = True
     stop music fadeout 4.0
     call hide_characters
     show screen blkfade
@@ -517,6 +518,7 @@ label hg_pf_handjob_1:
     menu:
         gen "..." ("base", xpos="far_left", ypos="head")
         "-Give her a warning-":
+            $ states.her.status.cum_body = True
             gen "Here it comes, [name_hermione_genie]! You better be ready!" ("angry", xpos="far_left", ypos="head")
             her "What? So soon?!" ("shock", "wide", "base", "stare")
             gen "{size=+5}Yeah, you did a great job!!!{/size}" ("angry", xpos="far_left", ypos="head")
@@ -602,6 +604,7 @@ label hg_pf_handjob_1:
             her "I really need to go now, so may I have my payment?" ("open", "squint", "worried", "R")
 
         "-Just start cumming-":
+            $ states.her.status.cum_body = True
             with hpunch
             gen "{size=+3}*Argh*!{/size}" ("angry", xpos="far_left", ypos="head")
             her "{size=+3}What?!{/size}" ("shock", "wide", "base", "stare")

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

@@ -185,10 +185,10 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label
     hide screen blktone
     call her_chibi_scene("grope_tits_jerk_off", trans=fade)
 
-    if states.her.status.handjob == False:
+    if states.her.status.caught_genie_masturbating == False:
         $ achievements.unlock("busted")
         $ hg_pf_talk.change_icon(a="heart_half", b="heart_red")
-        $ states.her.status.handjob = True
+        $ states.her.status.caught_genie_masturbating = True
 
     call ctc
 
@@ -403,7 +403,7 @@ label hg_pf_admire_breasts_T3_masturbate:
     her "................" ("angry", "happyCl", "worried", "mid", cheeks="blush")
 
     gen "*Ngh*--" ("angry", xpos="far_left", ypos="head")
-    $ _cumming = False
+    $ _cumming = False # Checked during end label
     menu:
         "-Hold it as promised-":
             gen "Oh, alright..." ("base", xpos="far_left", ypos="head")
@@ -419,6 +419,7 @@ label hg_pf_admire_breasts_T3_masturbate:
             return
 
         "-Just start cumming-":
+            $ states.her.status.cum_body = True
             $ _cumming = True
             gen "*Argh*! You whore!" ("angry", xpos="far_left", ypos="head")
             her "Proff--?" ("scream", "wide", "base", "stare", cheeks="blush")

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

@@ -184,7 +184,7 @@ label hg_pf_talk_T1: # Call label
 ### Tier 2 ###
 
 # Hermione realises you've been jerking off this whole time!
-# 'states.her.status.handjob' is required to advance into the next tier.
+# 'states.her.status.caught_genie_masturbating' is required to advance into the next tier.
 # Event 1 (i) - Hermione can spot you jerking off.
 # Event 2 (r) - Slight dialogue variation if you've been busted jerking off before.
 
@@ -199,7 +199,7 @@ label hg_pf_talk_T2_intro_E1:
 
 label hg_pf_talk_T2_E1:
 
-    if states.her.status.handjob:
+    if states.her.status.caught_genie_masturbating:
         her "Another talk, [name_genie_hermione]?" ("soft", "base", "base", "mid")
         her "(I hope he doesn't do \"that\" again...)" ("disgust", "narrow", "base", "down")
     else:
@@ -283,7 +283,7 @@ label hg_pf_talk_T2:
         call cum_block
         gen "*Argh*! YES!" ("angry", xpos="far_left", ypos="head")
 
-        if states.her.status.handjob:
+        if states.her.status.caught_genie_masturbating:
             her "I can't believe it, [name_genie_hermione]!" ("soft", "base", "angry", "mid")
             her "You were touching yourself!{w} Again!" ("angry", "base", "angry", "mid")
         else:
@@ -305,10 +305,10 @@ label hg_pf_talk_T2:
 
         $ states.her.mood = +7
 
-        if states.her.status.handjob == False:
+        if states.her.status.caught_genie_masturbating == False:
             $ achievements.unlock("busted")
             $ hg_pf_talk.change_icon(a="heart_half", b="heart_red")
-            $ states.her.status.handjob = True
+            $ states.her.status.caught_genie_masturbating = True
 
     else:
         her "We need to put an end to this behaviour, [name_genie_hermione]!" ("open", "closed", "base", "mid")

game/scripts/characters/hermione/events/potions/breast_expand.rpy

@@ -1337,7 +1337,7 @@ label her_potion_breasts_return:
 
             her "I must admit... That Slytherin boy was more clever than I'd give any of them credit for." ("annoyed", "narrow", "worried", "R", cheeks="blush")
             her "I got completely covered in that horribly sticky mess..." ("disgust", "closed", "worried", "mid", cheeks="blush")
-            if not states.her.status.kissing:
+            if not states.her.status.cum_body:
                 gen "I'm sure you'll get used to it..."
             else:
                 gen "You'd think you'd be used to that sort of thing."

game/scripts/characters/hermione/events/shaming/wear_my_cum.rpy

@@ -23,9 +23,9 @@ label hg_ps_cumslut:
     her "Of course..." ("base", "base", "base", "mid")
     gen "After I cum on you." ("base", xpos="far_left", ypos="head")
 
-    if states.her.level < 9:
+    if not states.her.status.cum_body: #Occurs at the latest during HJ favour.
         jump too_much
-    elif states.her.level < 15:
+    elif states.her.level < 19:
         jump hg_ps_cumslut_Scene_1
     elif states.her.level < 21:
         jump hg_ps_cumslut_Scene_2

game/scripts/characters/hermione/events/tutoring.rpy

@@ -419,7 +419,7 @@ label hg_tutor_E5:
         call gen_chibi("cum_behind_desk_done")
         with d3
 
-        if states.her.status.handjob:
+        if states.her.status.caught_genie_masturbating:
             her "Professor!" ("angry", "base", "angry", "mid", cheeks="blush")
             gen "You enjoyed it too, so don't act all innocent." ("base", xpos="far_left", ypos="head")
             gen "Anyway, I hope it was revealing." ("base", xpos="far_left", ypos="head")

game/scripts/characters/hermione/summon.rpy

@@ -360,14 +360,14 @@ label update_her_tier:
         if states.her.tier == 1 and states.her.level >= 3:
             # Trigger: None
             her_level_up = 1
-        elif states.her.tier == 2 and states.her.level >= 9 and states.her.status.handjob == True:
+        elif states.her.tier == 2 and states.her.level >= 9 and states.her.status.caught_genie_masturbating == True:
-            # Trigger: When you get caught jerking off.
+            # Trigger: Caught/saw Genie masturbate for the first time.
             her_level_up = 2
         elif states.her.tier == 3 and states.her.level >= 12 and states.her.status.stripping == True:
-            # Trigger: After she strips for you.
+            # Trigger: After she has stripped completely for Genie.
             her_level_up = 3
         elif states.her.tier == 4 and states.her.level >= 18 and states.her.status.kissing == True:
-            # Trigger: None
+            # Trigger: Kissed Genie's dick during HJ favour.
             her_level_up = 4
         elif states.her.tier == 5 and states.her.level >= 21 and states.her.status.blowjob == True:
             # Trigger: First BJ

game/scripts/characters/hermione/vars.rpy

@@ -18,9 +18,11 @@ default states.her.map_location  = "library"
 
 # Sexual activity states
 
-default states.her.status.kissing = False
+default states.her.status.caught_genie_masturbating = False #Required for Tier up, caught/saw genie masturbate for the first time.
 default states.her.status.stripping = False #Required for Tier up, unlocks hangout with Snape, which in turn allows you to invite him to watch her strip.
-default states.her.status.handjob = False
+default states.her.status.cum_body = False #Genie came on her body/clothes. (Will always happen during HJ T4)
+default states.her.status.handjob = False #Given Genie a Handjob.
+default states.her.status.kissing = False #Required for Tier up, kissed Genie's Dick during HJ.
 default states.her.status.blowjob = False
 default states.her.status.masturbating = False # Hermione has touched herself in front of Genie.
 default states.her.status.sex = False

game/scripts/interface/cheats.rpy

@@ -497,7 +497,7 @@ label .hermione_skip_intro:
 # label .hermione_skip_T2:
 #     $ states.her.tier = 3
 #     $ states.her.level = 9
-#     $ states.her.status.handjob = True
+#     $ states.her.status.caught_genie_masturbating = True
 #     return
 
 # label .hermione_skip_T3: