diff --git a/.gitignore b/.gitignore index 54cc4a25..bb942e86 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ game/saves/ game/cache/ project.json android.json +*.keystore # Ren'py logs traceback.txt diff --git a/game/images/CG/cho_handjob/cho_handjob_cum_after.webp b/game/images/CG/cho_handjob/cho_handjob_cum_after.webp new file mode 100644 index 00000000..e059306a --- /dev/null +++ b/game/images/CG/cho_handjob/cho_handjob_cum_after.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a0ad7edbcd0b6fba54b8ca0285a4ec29ea7fd8ab0a9b9eaddddd402006c18ac +size 50990 diff --git a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot.webp b/game/images/CG/cho_handjob/cho_handjob_cum_cumshot.webp new file mode 100644 index 00000000..55e4bd9a --- /dev/null +++ b/game/images/CG/cho_handjob/cho_handjob_cum_cumshot.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:234ef5f76b0aa7e1031e601fc0947387ace7025454bbde18895cf32d8db2c622 +size 63296 diff --git a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot1.webp b/game/images/CG/cho_handjob/cho_handjob_cum_cumshot1.webp deleted file mode 100644 index a68899af..00000000 --- a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15bd85024a79232420a27e58702ee620be41fd91cc9a9a3e486ea3067a03f964 -size 14606 diff --git a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot2.webp b/game/images/CG/cho_handjob/cho_handjob_cum_cumshot2.webp deleted file mode 100644 index 68591156..00000000 --- a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5904fd906627284a933bb15e5b52b5b3b8b8456f8a5662d9e9ed4e8c3713b229 -size 27518 diff --git a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot3.webp b/game/images/CG/cho_handjob/cho_handjob_cum_cumshot3.webp deleted file mode 100644 index 419d52c5..00000000 --- a/game/images/CG/cho_handjob/cho_handjob_cum_cumshot3.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53cc36e68901efe1133ba1cf5828323ea533d8e68109d7c05cfb15cd9aa0326a -size 36992 diff --git a/game/images/CG/cho_handjob/cho_handjob_cum_precum.webp b/game/images/CG/cho_handjob/cho_handjob_cum_precum.webp index 7c169d99..61069e63 100644 --- a/game/images/CG/cho_handjob/cho_handjob_cum_precum.webp +++ b/game/images/CG/cho_handjob/cho_handjob_cum_precum.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aae4b4cfe0a75fd88419dbde0c8c7bd53d1c166528c5b48b7556a50413b41cb -size 4332 +oid sha256:d5923abc8eacc8dfdc6a066b0d78646ddc6f2ee1c3d875708cc10cba4123b8dc +size 5014 diff --git a/game/images/CG/cho_handjob/cho_handjob_hand_stroke_down.webp b/game/images/CG/cho_handjob/cho_handjob_hand_stroke_down.webp index 7a991c24..37561808 100644 --- a/game/images/CG/cho_handjob/cho_handjob_hand_stroke_down.webp +++ b/game/images/CG/cho_handjob/cho_handjob_hand_stroke_down.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a567211be5788c050927e92cc353580979864a4e23ab413174e135cc90275938 -size 32196 +oid sha256:ffb32ac6f95d8f21d5e1a31040f77094671b946c9c42a10635bd12287abc5809 +size 31734 diff --git a/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_cumshot.webp b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_cumshot.webp new file mode 100644 index 00000000..ae1dc17a --- /dev/null +++ b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_cumshot.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b11b8a5ae32e645e7fa38d6f5aa6a240bf29503530047c3714541bb0b10e63f +size 70960 diff --git a/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_head.webp b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_head.webp new file mode 100644 index 00000000..7725ed13 --- /dev/null +++ b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_head.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f367110b31c741526d67cdb102d56dcf88fe494cd80ebccc4046b7692cb8dc04 +size 125588 diff --git a/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_mouth_ahegao.webp b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_mouth_ahegao.webp new file mode 100644 index 00000000..72832c3e --- /dev/null +++ b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_mouth_ahegao.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a58e5d0cf6015555c336865fa8c51983b6e051913eb828b5a8316ee1ff69d0 +size 12892 diff --git a/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_mouth_base.webp b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_mouth_base.webp new file mode 100644 index 00000000..4b34ab09 --- /dev/null +++ b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_mouth_base.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0008183c98b5e5ee1646c8e646ec13f9cff839319f419714904c088213f0c4df +size 5250 diff --git a/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_stomach.webp b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_stomach.webp new file mode 100644 index 00000000..fd42d1a1 --- /dev/null +++ b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_stomach.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f4515e2743ee495e48e9f7834b510190220ee43b5937b8dff41aa21647b02ef +size 59058 diff --git a/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_torso.webp b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_torso.webp new file mode 100644 index 00000000..033bbe20 --- /dev/null +++ b/game/images/CG/cho_masturbate/cho_masturbate_lockers_cum_torso.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49c77526dae83a4da0837b561d2893847580828d58480f7289802395b26cb3d3 +size 92100 diff --git a/game/scripts/cg/cho.rpy b/game/scripts/cg/cho.rpy index 20826e9e..39487a3f 100644 --- a/game/scripts/cg/cho.rpy +++ b/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" \ No newline at end of file + always "cho_masturbate_lockers_hair" + + group cum auto prefix "cum" multiple \ No newline at end of file diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 608d2565..5c582c88 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/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..."