Masturbate CG

* Added cum layers
* Fixed minor art inconsistencies
* Updated .gitignore

.gitignore

@@ -43,6 +43,7 @@ game/saves/
 game/cache/
 project.json
 android.json
+*.keystore
 
 # Ren'py logs
 traceback.txt

game/scripts/cg/cho.rpy

@@ -1973,10 +1973,6 @@ layeredimage cho_handjob:
         attribute soft default
         attribute none null
 
-    group genie prefix "genie":
-        attribute robed default
-        attribute unrobed
-
     attribute hand_stroke_down default if_all ["cho_body_stroke_down"]
     attribute hand_stroke_up default if_all ["cho_body_stroke_up"]
     attribute hand_stroke_idle default if_all ["cho_body_stroke_idle"]
@@ -1984,6 +1980,10 @@ layeredimage cho_handjob:
     attribute hand_stroke_up_wet default if_all ["cho_body_stroke_up", "penis_hard_spit_on_shaft"]
     attribute hand_stroke_idle_wet default if_all ["cho_body_stroke_idle", "penis_hard_spit_on_shaft"]
 
+    group genie prefix "genie":
+        attribute robed default
+        attribute unrobed
+
     group effects multiple auto prefix "effects"
 
     group cum auto prefix "cum" 
@@ -2010,4 +2010,6 @@ layeredimage cho_masturbate_lockers:
 
     group effects auto prefix "effects" multiple
 
-    always "cho_masturbate_lockers_hair"
+    always "cho_masturbate_lockers_hair"
+
+    group cum auto prefix "cum" multiple

game/scripts/characters/cho/events/quidditch/intros.rpy

@@ -2703,14 +2703,6 @@ label cho_quid_E14:
             with d3
             call ctc
 
-            menu: #Both choices get discarded, and it shoots past her onto the masturbating cho bubble
-
-                "-Cum on her face-":
-                    pass
-
-                "-Cum in her mouth-":
-                    pass
-
             show cho_masturbate_lockers cho_body_fingering_up mouth_lipbite as cg2 with d3
             gen "Aaaaah Yeeeees!"
 
@@ -2720,20 +2712,28 @@ label cho_quid_E14:
             # Genies cum shoots past Cho through time, space and reason onto the masturbating Cho CG
             #Masturbating Cho CG Cums
             show cho_masturbate_lockers cho_body_fingering_up eyes_narrow_ahegao mouth_ahegao effects_shaking -effects_hand_move as cg2
-            show cho_handjob cum_cumshot1 as cg
+            show cho_handjob cum_cumshot as cg
             with d3
-            pause 0.2
-            show cho_handjob cum_cumshot2 as cg with d3
-            pause 0.2
-            show cho_handjob cum_cumshot3 as cg with d3
-            pause 0.2
+            pause 0.5
+            show cho_masturbate_lockers cum_cumshot as cg2 with d3
+            call ctc
+            show cho_masturbate_lockers cum_head as cg2 with d3
+            call ctc
+            show cho_masturbate_lockers cum_torso cum_mouth_ahegao as cg2 with d3
+            call ctc
+            show cho_masturbate_lockers -cum_cumshot cum_stomach as cg2 with d3
+            call ctc
 
-            show cho_masturbate_lockers -effects_shaking as cg2 #TODO add cum layers on Cho body
-            show cho_handjob -cum_cumshot3 as cg
+            show cho_masturbate_lockers -effects_shaking as cg2 with d3
+            pause 0.5
+            show cho_handjob -cum_cumshot cum_after as cg
             with d3
             gen "*Ah*......."
 
-            show cho_masturbate_lockers cho_body_idle eyebrows_sad mouth_smile as cg2
+            show cho_masturbate_lockers mouth_base -cum_mouth_ahegao cum_mouth_base as cg2
+            cho "*Gulp*"
+
+            show cho_masturbate_lockers cho_body_idle eyebrows_sad mouth_smile -cum_mouth_base as cg2
             show cho_handjob eyes_open_right as cg
             with d3
             cho "You--{w=0.2} your cum... It's..."