From 751575c556dd4a6adecd594f63499749625a559f Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Thu, 2 Mar 2023 17:37:36 +0100 Subject: [PATCH] Posing, clothing and fixes * Added wet pussy and squirting when Tonks is masturbating, morphed as Hermione. * Added Cho nose and cheeks freckles. * Added redrawn versions of old cho clothing: * top_tanktop_1 * top_tanktop_2 * witch (hat) * Re-Added Hermione freckles to work better with multi-layer toggles. * Re-Posed Hermione masturbation events. * Re-Posed Luna masturbation events. * Renamed some clothing folders for consistency. * Fixed Cho Virgin-killer skin layer outline overlaps. * Fixed Miss-labeled expression folders and names. * Fixed folder structure on Hermione Masturbating pose folders. --- .../clothes/headgear/witch/default/0.webp | 4 +- .../clothes/headgear/witch/default/1.webp | 4 +- .../headgear/witch/default/outline.webp | 4 +- .../clothes/headgear/witch/default/skin.webp | 4 +- .../default/clothes/makeup/freckles1/0.webp | 3 ++ .../default/clothes/makeup/freckles2/0.webp | 3 ++ .../default/clothes/top/top_tanktop_1/0.webp | 4 +- .../clothes/top/top_tanktop_1/outline.webp | 4 +- .../clothes/top/top_tanktop_1/skin.webp | 3 ++ .../default/clothes/top/top_tanktop_2/0.webp | 4 +- .../default/clothes/top/top_tanktop_2/1.webp | 3 -- .../clothes/top/top_tanktop_2/outline.webp | 4 +- .../clothes/top/top_tanktop_2/skin.webp | 3 ++ .../0.webp | 0 .../1.webp | 0 .../outline.webp | 0 .../clothes/top/top_virgin_killer/skin.webp | 3 ++ .../clothes/top/virgin_killer_top/skin.webp | 3 -- .../default/clothes/makeup/freckles1/0.webp | 4 +- .../clothes/makeup/freckles1_nonose/0.webp | 3 -- .../default/clothes/makeup/freckles2/0.webp | 4 +- .../default/clothes/makeup/freckles3/0.webp | 4 +- .../default/clothes/makeup/freckles4/0.webp | 3 ++ .../bodyparts/frame/{ => default}/skin.webp | 0 .../eyes/happy/{skin.webp => eyemask.webp} | 0 .../expression.webp | 0 .../{aheagao => ahegao}/expression.webp | 0 .../bodyparts/frame/{ => default}/skin.webp | 0 .../eyes/happy/{skin.webp => eyemask.webp} | 0 .../expression.webp | 0 .../{aheagao => ahegao}/expression.webp | 0 .../bodyparts/frame/{ => default}/skin.webp | 0 .../eyes/happy/{skin.webp => eyemask.webp} | 0 .../expression.webp | 0 .../{aheagao => ahegao}/expression.webp | 0 .../bodyparts/{ => frame}/default/skin.webp | 0 .../favors/inspect_her_body_tier3_tonks.rpy | 38 ++++++++++++------- game/scripts/characters/cho/wardrobe.rpy | 10 ++++- .../events/favors/dance_for_me_masturbate.rpy | 32 ++++------------ .../characters/hermione/events/tutoring.rpy | 11 +----- game/scripts/characters/hermione/wardrobe.rpy | 10 ++--- .../luna/events/favors/masturbate_for_me.rpy | 8 ++-- game/scripts/events/final_events.rpy | 12 ++---- .../mirror/events/a_white_christmas.rpy | 5 +-- 44 files changed, 98 insertions(+), 99 deletions(-) create mode 100644 game/characters/cho/poses/default/clothes/makeup/freckles1/0.webp create mode 100644 game/characters/cho/poses/default/clothes/makeup/freckles2/0.webp create mode 100644 game/characters/cho/poses/default/clothes/top/top_tanktop_1/skin.webp delete mode 100644 game/characters/cho/poses/default/clothes/top/top_tanktop_2/1.webp create mode 100644 game/characters/cho/poses/default/clothes/top/top_tanktop_2/skin.webp rename game/characters/cho/poses/default/clothes/top/{virgin_killer_top => top_virgin_killer}/0.webp (100%) rename game/characters/cho/poses/default/clothes/top/{virgin_killer_top => top_virgin_killer}/1.webp (100%) rename game/characters/cho/poses/default/clothes/top/{virgin_killer_top => top_virgin_killer}/outline.webp (100%) create mode 100644 game/characters/cho/poses/default/clothes/top/top_virgin_killer/skin.webp delete mode 100644 game/characters/cho/poses/default/clothes/top/virgin_killer_top/skin.webp delete mode 100644 game/characters/hermione/poses/default/clothes/makeup/freckles1_nonose/0.webp create mode 100644 game/characters/hermione/poses/default/clothes/makeup/freckles4/0.webp rename game/characters/hermione/poses/hand_on_breast/bodyparts/frame/{ => default}/skin.webp (100%) rename game/characters/hermione/poses/hand_on_breast/face/eyes/happy/{skin.webp => eyemask.webp} (100%) rename game/characters/hermione/poses/hand_on_breast/face/mouth/{open_wide_tonue => open_wide_tongue}/expression.webp (100%) rename game/characters/hermione/poses/hand_on_breast/face/pupils/{aheagao => ahegao}/expression.webp (100%) rename game/characters/hermione/poses/hand_on_pussy/bodyparts/frame/{ => default}/skin.webp (100%) rename game/characters/hermione/poses/hand_on_pussy/face/eyes/happy/{skin.webp => eyemask.webp} (100%) rename game/characters/hermione/poses/hand_on_pussy/face/mouth/{open_wide_tonue => open_wide_tongue}/expression.webp (100%) rename game/characters/hermione/poses/hand_on_pussy/face/pupils/{aheagao => ahegao}/expression.webp (100%) rename game/characters/hermione/poses/hand_on_pussy_and_breast/bodyparts/frame/{ => default}/skin.webp (100%) rename game/characters/hermione/poses/hand_on_pussy_and_breast/face/eyes/happy/{skin.webp => eyemask.webp} (100%) rename game/characters/hermione/poses/hand_on_pussy_and_breast/face/mouth/{open_wide_tonue => open_wide_tongue}/expression.webp (100%) rename game/characters/hermione/poses/hand_on_pussy_and_breast/face/pupils/{aheagao => ahegao}/expression.webp (100%) rename game/characters/luna/poses/hand_on_pussy_and_breast/bodyparts/{ => frame}/default/skin.webp (100%) diff --git a/game/characters/cho/poses/default/clothes/headgear/witch/default/0.webp b/game/characters/cho/poses/default/clothes/headgear/witch/default/0.webp index 5c8807e6..c6c225bf 100644 --- a/game/characters/cho/poses/default/clothes/headgear/witch/default/0.webp +++ b/game/characters/cho/poses/default/clothes/headgear/witch/default/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:889e56ff9040ede57f84d38339b2d44311cb51c198b2a23fe7ff14383a6acd2b -size 8690 +oid sha256:eea3e4214900a3fcae2a33ae37866f49bf575973e193f6c362353a8bdb7b2d4d +size 6132 diff --git a/game/characters/cho/poses/default/clothes/headgear/witch/default/1.webp b/game/characters/cho/poses/default/clothes/headgear/witch/default/1.webp index 62f777ca..45e9abd4 100644 --- a/game/characters/cho/poses/default/clothes/headgear/witch/default/1.webp +++ b/game/characters/cho/poses/default/clothes/headgear/witch/default/1.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a07d1014ad2af3620184863ddee924c73f0bd2fd5b0f7175b8bfbe83c23980b3 -size 2908 +oid sha256:8e2b0af7f926eff2f3f60f6dfc8fc4efde25a4ff1d8285f0dfc61afabebb2806 +size 2044 diff --git a/game/characters/cho/poses/default/clothes/headgear/witch/default/outline.webp b/game/characters/cho/poses/default/clothes/headgear/witch/default/outline.webp index 903ba2a9..62c199ce 100644 --- a/game/characters/cho/poses/default/clothes/headgear/witch/default/outline.webp +++ b/game/characters/cho/poses/default/clothes/headgear/witch/default/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffeff1c40d386a2af23596db668c9c0dd94da73999ea3df058f8cb8934c08f2c -size 16298 +oid sha256:de7667ea809b655ce28b978086a7b9f3d4c932807c13ba0550b79a7b5b7743aa +size 8608 diff --git a/game/characters/cho/poses/default/clothes/headgear/witch/default/skin.webp b/game/characters/cho/poses/default/clothes/headgear/witch/default/skin.webp index f178429a..93ec1c96 100644 --- a/game/characters/cho/poses/default/clothes/headgear/witch/default/skin.webp +++ b/game/characters/cho/poses/default/clothes/headgear/witch/default/skin.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f6128412111109dca36c90e856915c07413780454cffc60cbafe36de3ee5e74 -size 1076 +oid sha256:e32beea1db51348df08e32f7d667f19c02170b74f8ce510054c963fb268e7e09 +size 1656 diff --git a/game/characters/cho/poses/default/clothes/makeup/freckles1/0.webp b/game/characters/cho/poses/default/clothes/makeup/freckles1/0.webp new file mode 100644 index 00000000..a3fb4947 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/makeup/freckles1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:120a60bc1de8ac97a44c6a036479dd517149372fd078b563bc0698e1151e7602 +size 1078 diff --git a/game/characters/cho/poses/default/clothes/makeup/freckles2/0.webp b/game/characters/cho/poses/default/clothes/makeup/freckles2/0.webp new file mode 100644 index 00000000..11ebddd0 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/makeup/freckles2/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a48a67da11937b715ea4db95fb5cef59746add43d7b24572a1f3175c13bf191 +size 606 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_1/0.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_1/0.webp index c149929e..3f60f183 100644 --- a/game/characters/cho/poses/default/clothes/top/top_tanktop_1/0.webp +++ b/game/characters/cho/poses/default/clothes/top/top_tanktop_1/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4217ef84d46ed638d3d95ef06e0188a96d397e827eaa8300c62ebe79411efcdd -size 17564 +oid sha256:5a6a11872e8cba850e44830c18cfd2e40b58f5387aeb3ed04bf245a9b8672627 +size 13254 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_1/outline.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_1/outline.webp index b44535d2..e9fea2ce 100644 --- a/game/characters/cho/poses/default/clothes/top/top_tanktop_1/outline.webp +++ b/game/characters/cho/poses/default/clothes/top/top_tanktop_1/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4af4ab9aab6703e4f626a30ac582ba226e528d83e6a4edffa87f2545afdcee01 -size 15792 +oid sha256:25dcbf004b163febef4fd033c4cd49af9ef1c4a956080dac71cc71653ca7c7a2 +size 12006 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_1/skin.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_1/skin.webp new file mode 100644 index 00000000..29d6fe5d --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/top_tanktop_1/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d8460f8cd664de808f63bc165fc6db55186c4399ba87dcaf531122e66994b97 +size 3130 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/0.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/0.webp index 86575037..186fa7ca 100644 --- a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/0.webp +++ b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e13a4cb24710e76d2ffbbb885a406422c97483a33cbc275ca1cb07f8c4c76775 -size 15036 +oid sha256:420ad4be4a7d8ffdc51c2c3d256f421ee8bf89e9d494f5431036b8640f146b33 +size 11150 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/1.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/1.webp deleted file mode 100644 index 0e40ceed..00000000 --- a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:889ea5af36415e3d90b6ff0d61bb7b3dd7b5b8ad23afc2e8c7998bf042a31593 -size 3064 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/outline.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/outline.webp index 3d1dc852..d16be695 100644 --- a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/outline.webp +++ b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/outline.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3877a19bc9ca7c1bb534dc574d366e0388a5fb68939c3c947517245b9ec82320 -size 13576 +oid sha256:f641c6db4a278cb08fddd6840dfee6a73402f097cf4be0e49ee1547798f386d0 +size 11810 diff --git a/game/characters/cho/poses/default/clothes/top/top_tanktop_2/skin.webp b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/skin.webp new file mode 100644 index 00000000..9f88d8de --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/top_tanktop_2/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cb25da49d4ef16116e44050363fd8c81130034fc7b7a256d10276fb9dfe9199 +size 2550 diff --git a/game/characters/cho/poses/default/clothes/top/virgin_killer_top/0.webp b/game/characters/cho/poses/default/clothes/top/top_virgin_killer/0.webp similarity index 100% rename from game/characters/cho/poses/default/clothes/top/virgin_killer_top/0.webp rename to game/characters/cho/poses/default/clothes/top/top_virgin_killer/0.webp diff --git a/game/characters/cho/poses/default/clothes/top/virgin_killer_top/1.webp b/game/characters/cho/poses/default/clothes/top/top_virgin_killer/1.webp similarity index 100% rename from game/characters/cho/poses/default/clothes/top/virgin_killer_top/1.webp rename to game/characters/cho/poses/default/clothes/top/top_virgin_killer/1.webp diff --git a/game/characters/cho/poses/default/clothes/top/virgin_killer_top/outline.webp b/game/characters/cho/poses/default/clothes/top/top_virgin_killer/outline.webp similarity index 100% rename from game/characters/cho/poses/default/clothes/top/virgin_killer_top/outline.webp rename to game/characters/cho/poses/default/clothes/top/top_virgin_killer/outline.webp diff --git a/game/characters/cho/poses/default/clothes/top/top_virgin_killer/skin.webp b/game/characters/cho/poses/default/clothes/top/top_virgin_killer/skin.webp new file mode 100644 index 00000000..316eeeb7 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/top_virgin_killer/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f3c30e15c68e61f2193613aff023a879d1ea7373c3a3bdf801f0350a3627345 +size 10896 diff --git a/game/characters/cho/poses/default/clothes/top/virgin_killer_top/skin.webp b/game/characters/cho/poses/default/clothes/top/virgin_killer_top/skin.webp deleted file mode 100644 index 55928d87..00000000 --- a/game/characters/cho/poses/default/clothes/top/virgin_killer_top/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7954e27ad9ef8ae73236acb86dc52a47beee27d14e23fd1c642a138d0c882c0e -size 8684 diff --git a/game/characters/hermione/poses/default/clothes/makeup/freckles1/0.webp b/game/characters/hermione/poses/default/clothes/makeup/freckles1/0.webp index 74ba7d00..dc571dc4 100644 --- a/game/characters/hermione/poses/default/clothes/makeup/freckles1/0.webp +++ b/game/characters/hermione/poses/default/clothes/makeup/freckles1/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9c1d5a77e4345a32cfbb07721ae8b11d81015796e0790574834011251a5be5f -size 2174 +oid sha256:914e2efbdcba7807067286ac3c6d8fe19392582fc58e98cc587972c54ac34494 +size 1080 diff --git a/game/characters/hermione/poses/default/clothes/makeup/freckles1_nonose/0.webp b/game/characters/hermione/poses/default/clothes/makeup/freckles1_nonose/0.webp deleted file mode 100644 index 55c2353e..00000000 --- a/game/characters/hermione/poses/default/clothes/makeup/freckles1_nonose/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1367fb49a77796cb9d12b6a9ce673bd5499143c0dca40fd6023c6e9d60b1a419 -size 1786 diff --git a/game/characters/hermione/poses/default/clothes/makeup/freckles2/0.webp b/game/characters/hermione/poses/default/clothes/makeup/freckles2/0.webp index 0c941488..9e1baca8 100644 --- a/game/characters/hermione/poses/default/clothes/makeup/freckles2/0.webp +++ b/game/characters/hermione/poses/default/clothes/makeup/freckles2/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a71177f5f6365da73341864a467927f881aeb828eeee900a661a34448718836 -size 2100 +oid sha256:f7518a54d9b2a217c878f70e4b88f0112db3f7913b04ef50a3d359ebbedcccd3 +size 784 diff --git a/game/characters/hermione/poses/default/clothes/makeup/freckles3/0.webp b/game/characters/hermione/poses/default/clothes/makeup/freckles3/0.webp index 51623c7f..0c941488 100644 --- a/game/characters/hermione/poses/default/clothes/makeup/freckles3/0.webp +++ b/game/characters/hermione/poses/default/clothes/makeup/freckles3/0.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ad84dcb5d7b22eed89576ad4aa3c36bc4575798d54544c5d2e25b1b341e8b6f -size 1714 +oid sha256:2a71177f5f6365da73341864a467927f881aeb828eeee900a661a34448718836 +size 2100 diff --git a/game/characters/hermione/poses/default/clothes/makeup/freckles4/0.webp b/game/characters/hermione/poses/default/clothes/makeup/freckles4/0.webp new file mode 100644 index 00000000..51623c7f --- /dev/null +++ b/game/characters/hermione/poses/default/clothes/makeup/freckles4/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ad84dcb5d7b22eed89576ad4aa3c36bc4575798d54544c5d2e25b1b341e8b6f +size 1714 diff --git a/game/characters/hermione/poses/hand_on_breast/bodyparts/frame/skin.webp b/game/characters/hermione/poses/hand_on_breast/bodyparts/frame/default/skin.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_breast/bodyparts/frame/skin.webp rename to game/characters/hermione/poses/hand_on_breast/bodyparts/frame/default/skin.webp diff --git a/game/characters/hermione/poses/hand_on_breast/face/eyes/happy/skin.webp b/game/characters/hermione/poses/hand_on_breast/face/eyes/happy/eyemask.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_breast/face/eyes/happy/skin.webp rename to game/characters/hermione/poses/hand_on_breast/face/eyes/happy/eyemask.webp diff --git a/game/characters/hermione/poses/hand_on_breast/face/mouth/open_wide_tonue/expression.webp b/game/characters/hermione/poses/hand_on_breast/face/mouth/open_wide_tongue/expression.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_breast/face/mouth/open_wide_tonue/expression.webp rename to game/characters/hermione/poses/hand_on_breast/face/mouth/open_wide_tongue/expression.webp diff --git a/game/characters/hermione/poses/hand_on_breast/face/pupils/aheagao/expression.webp b/game/characters/hermione/poses/hand_on_breast/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_breast/face/pupils/aheagao/expression.webp rename to game/characters/hermione/poses/hand_on_breast/face/pupils/ahegao/expression.webp diff --git a/game/characters/hermione/poses/hand_on_pussy/bodyparts/frame/skin.webp b/game/characters/hermione/poses/hand_on_pussy/bodyparts/frame/default/skin.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy/bodyparts/frame/skin.webp rename to game/characters/hermione/poses/hand_on_pussy/bodyparts/frame/default/skin.webp diff --git a/game/characters/hermione/poses/hand_on_pussy/face/eyes/happy/skin.webp b/game/characters/hermione/poses/hand_on_pussy/face/eyes/happy/eyemask.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy/face/eyes/happy/skin.webp rename to game/characters/hermione/poses/hand_on_pussy/face/eyes/happy/eyemask.webp diff --git a/game/characters/hermione/poses/hand_on_pussy/face/mouth/open_wide_tonue/expression.webp b/game/characters/hermione/poses/hand_on_pussy/face/mouth/open_wide_tongue/expression.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy/face/mouth/open_wide_tonue/expression.webp rename to game/characters/hermione/poses/hand_on_pussy/face/mouth/open_wide_tongue/expression.webp diff --git a/game/characters/hermione/poses/hand_on_pussy/face/pupils/aheagao/expression.webp b/game/characters/hermione/poses/hand_on_pussy/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy/face/pupils/aheagao/expression.webp rename to game/characters/hermione/poses/hand_on_pussy/face/pupils/ahegao/expression.webp diff --git a/game/characters/hermione/poses/hand_on_pussy_and_breast/bodyparts/frame/skin.webp b/game/characters/hermione/poses/hand_on_pussy_and_breast/bodyparts/frame/default/skin.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy_and_breast/bodyparts/frame/skin.webp rename to game/characters/hermione/poses/hand_on_pussy_and_breast/bodyparts/frame/default/skin.webp diff --git a/game/characters/hermione/poses/hand_on_pussy_and_breast/face/eyes/happy/skin.webp b/game/characters/hermione/poses/hand_on_pussy_and_breast/face/eyes/happy/eyemask.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy_and_breast/face/eyes/happy/skin.webp rename to game/characters/hermione/poses/hand_on_pussy_and_breast/face/eyes/happy/eyemask.webp diff --git a/game/characters/hermione/poses/hand_on_pussy_and_breast/face/mouth/open_wide_tonue/expression.webp b/game/characters/hermione/poses/hand_on_pussy_and_breast/face/mouth/open_wide_tongue/expression.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy_and_breast/face/mouth/open_wide_tonue/expression.webp rename to game/characters/hermione/poses/hand_on_pussy_and_breast/face/mouth/open_wide_tongue/expression.webp diff --git a/game/characters/hermione/poses/hand_on_pussy_and_breast/face/pupils/aheagao/expression.webp b/game/characters/hermione/poses/hand_on_pussy_and_breast/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/hermione/poses/hand_on_pussy_and_breast/face/pupils/aheagao/expression.webp rename to game/characters/hermione/poses/hand_on_pussy_and_breast/face/pupils/ahegao/expression.webp diff --git a/game/characters/luna/poses/hand_on_pussy_and_breast/bodyparts/default/skin.webp b/game/characters/luna/poses/hand_on_pussy_and_breast/bodyparts/frame/default/skin.webp similarity index 100% rename from game/characters/luna/poses/hand_on_pussy_and_breast/bodyparts/default/skin.webp rename to game/characters/luna/poses/hand_on_pussy_and_breast/bodyparts/frame/default/skin.webp diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy index 2ee16f58..2b324bfd 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy @@ -1252,8 +1252,7 @@ label .hermione_E1: $ renpy.play("sounds/slick_02.ogg") with hpunch with kissiris - $ hermione.set_pose("masturbate") - $ hermione.set_body(armleft="on_pussy") + $ hermione.set_pose("hand_on_pussy") her "" ("base", "narrow", "worried", "stare") hide screen blkfade with d5 @@ -1277,12 +1276,8 @@ label .hermione_E1: her "Yes... How could I not?" ("base", "narrow", "base", "mid") her "These breasts are just so..." ("soft", "narrow", "base", "down") - #pinch nipples. - - - # Hands on pussy, tits - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy", armright="on_tits") + # Hands on pussy, breast + $ hermione.set_pose("hand_on_pussy_and_breast") play bg_sounds "sounds/slickloop.ogg" fadein 2 her "*Mmmh*... So soft..." ("base", "closed", "base", "mid") @@ -1301,7 +1296,7 @@ label .hermione_E1: her "*Mmmm*..." ("base", "narrow", "base", "up") pause 1 her "*Hmm?*... Not even a peek?" ("soft", "narrow", "base", "L") - her "Don't you want to see what Hermione looks like when... *Ah*... She masturbates?" ("grin", "narrow", "worried", "down", cheeks="blush") + her "Don't you want to see what Hermione looks like when--{w=0.2} *Ah*...{w=0.4} She masturbates?" ("grin", "narrow", "worried", "down", cheeks="blush") her "Are you sure you... *Ah*...{w=0.4} Want to miss this?" ("open", "closed", "base", "mid", cheeks="blush") cho "..." ("clench", "narrow", "worried", "down", cheeks="heavy_blush") #glances at her her "*Ah*...{w=0.3} That's it, Cho..." ("smile", "narrow", "base", "L") @@ -1316,6 +1311,7 @@ label .hermione_E1: her "No! Keep watching me!" ("annoyed", "narrow", "angry", "L") play bg_sounds "sounds/slickloopfast.ogg" + $ hermione.set_cum(pussy="wet") her "*Ah*...{w=0.3} I'm getting close!" ("soft", "narrow", "base", "up", cheeks="blush") play bg_sounds "sounds/slickloopveryfast.ogg" cho "" ("mad", "narrow", "base", "down", cheeks="heavy_blush") #still looking away @@ -1325,12 +1321,27 @@ label .hermione_E1: cho "" ("smile", "narrow", "base", "down", cheeks="heavy_blush") #embarrased #Looks at Tonks $ renpy.sound.play("sounds/slick_01.ogg") her "*Nngh*...{w=0.4} *Aaah*!!!" ("clench", "happy", "base", "ahegao", cheeks="blush") - stop bg_sounds + with kissiris + with hpunch + $ renpy.play("sounds/slick_01.ogg") + $ hermione.set_cum(pussy="squirt") + pause .8 + + $ hermione.set_cum(pussy="squirt_post") + cho "" ("horny", "base", "raised", "down", cheeks="heavy_blush") #wide eyed - with kissiris - $ renpy.sound.play("sounds/slick_01.ogg") + her "*Ah*!" ("open_wide_tongue", "happy", "angry", "ahegao", cheeks="blush") + + with kissiris + with hpunch + $ renpy.play("sounds/slick_01.ogg") + $ hermione.set_cum(pussy="squirt_transition") + pause .8 + + $ hermione.set_cum(pussy="squirt_post") + stop bg_sounds fadeout 2 call play_music("stop") her "*Mmmh*..." ("clench", "narrow", "base", "squint", cheeks="blush") @@ -1338,8 +1349,6 @@ label .hermione_E1: her "*Ah*...{w=0.3} *Ah*...{w=0.5} *Ah*...{w=0.6} Good...{w=0.3} Good girl..." ("open_tongue", "narrow", "base", "up", cheeks="blush") # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) $ hermione.strip("clothes") with d5 @@ -1354,6 +1363,7 @@ label .hermione_E1: # Tonks transforms back. call play_sound("magic") hide hermione_main + $ hermione.set_cum(None) call her_chibi("hide") $ cho_chibi.zorder = 3 # Reset to default. $ tonks_chibi.zorder = 2 # behind Cho. Default is 3. diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index 9b46c471..8fe496dc 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -196,7 +196,7 @@ default cho_outfit_bunny = DollOutfit([cho_hair_base, cho_top_bunny1, cho_stocki ## Virgin Killer Outfit ## ########################## -default cho_top_virgin_killer = DollCloth("cho", ("upper body", "one-piece suits"), "top", "virgin_killer_top", ["#de4047ff", "#de4047ff"], blacklist=["panties", "bra"], zorder=183, level=15) +default cho_top_virgin_killer = DollCloth("cho", ("upper body", "one-piece suits"), "top", "top_virgin_killer", ["#de4047ff", "#de4047ff"], blacklist=["bottom", "panties", "bra"], zorder=183, level=15) default cho_outfit_virgin_killer = DollOutfit([cho_hair_base, cho_top_virgin_killer], price=200, name="Virgin Killer", desc="Disclaimer: Does not actually kill virgins.") @@ -211,8 +211,16 @@ default cho_pubes_unshaved = DollCloth("cho", ("lower undergarment", "pubes"), " default cho_pubes_thick = DollCloth("cho", ("lower undergarment", "pubes"), "pubes", "thick", ["#343b50ff", "#465a93ff"], unlocked=True) default cho_pubes_heart = DollCloth("cho", ("lower undergarment", "pubes"), "pubes", "heart", ["#343b50ff", "#465a93ff"], unlocked=True) +############ +## Makeup ## +############ + +default cho_makeup_freckles1 = DollCloth("cho", ("head", "makeup"), "makeup", "freckles1", ["#BB7A49ff"], unlocked=True) +default cho_makeup_freckles2 = DollCloth("cho", ("head", "makeup"), "makeup", "freckles2", ["#BB7A49ff"], unlocked=True) + default cho_makeup_lipstick = DollMakeup("cho", ("head", "makeup"), "makeup", "lipstick", ["#ff4646ff"], unlocked=True, tracking="mouth") + ############# ## Tattoos ## ############# diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy index 28c16811..230ce150 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy @@ -60,8 +60,7 @@ label hg_pf_strip_T4_fingering: her "(I never would've imagined... To do this in front of my headmaster of all people...)" ("normal", "happyCl", "worried", "mid") - $ hermione.set_pose("masturbate") - $ hermione.set_body(armleft="on_pussy") + $ hermione.set_pose("hand_on_pussy") her "" ("soft", "closed", "worried", "mid", trans=d3) $ renpy.play("sounds/slick_02.ogg") @@ -111,8 +110,7 @@ label hg_pf_strip_T4_fingering: gen "As if that's the only reason..." ("grin", xpos="far_left", ypos="head") her "I..{w=0.4}*Ah*... of course it...--" ("normal", "happyCl", "worried", "mid") - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy", armright="on_tits") + $ hermione.set_pose("hand_on_pussy_and_breast") her "*Ah-a*{heart}..." ("open", "happyCl", "worried", "mid") her "What..{w=0.4}*Ah*... other reason would there be for me to..." ("angry", "narrow", "base", "down") @@ -157,8 +155,7 @@ label hg_pf_strip_T4_fingering: her "..." ("normal", "happy", "base", "R") her "......" ("soft", "happy", "base", "R") - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy", armright="on_tits") + $ hermione.set_pose("hand_on_pussy_and_breast") her "*Ah*...{heart}" ("open", "closed", "base", "R") gen "There... Isn't that better?" ("base", xpos="far_left", ypos="head") @@ -214,8 +211,7 @@ label hg_pf_strip_T4_fingering: gen "Wow, that sure is a lot of sweat, [name_hermione_genie]." ("grin", xpos="far_left", ypos="head") her "Sir... please..." ("open", "narrow", "base", "mid_soft", cheeks="blush") - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy", armright="on_tits") + $ hermione.set_pose("hand_on_pussy_and_breast") play bg_sounds "sounds/slickloopveryfast.ogg" call nar(">Hermione starts fingering herself even faster.") @@ -258,8 +254,6 @@ label hg_pf_strip_T4_fingering: call nar(">Hermione starts grinding furiously against her hand.") # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) $ hermione.strip("clothes") @@ -297,8 +291,6 @@ label hg_pf_strip_T4_fingering: gen "I'm sure you're just a little nervous." ("base", xpos="far_left", ypos="head") # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) $ hermione.strip("clothes") @@ -344,9 +336,8 @@ label hg_pf_strip_T5_fingering: show screen blkfade with d5 - $ hermione.set_pose("masturbate") - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy") + $ hermione.set_pose("hand_on_pussy") + her "" ("soft", "closed", "worried", "mid", trans=d3) $ renpy.play("sounds/slick_02.ogg") with hpunch @@ -417,8 +408,6 @@ label hg_pf_strip_T5_fingering: call nar(">Hermione takes a minute to collect herself.") # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) jump end_hg_pf_strip @@ -456,9 +445,7 @@ label hg_pf_strip_T6_fingering: show screen blkfade with d5 - $ hermione.set_pose("masturbate") - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy") + $ hermione.set_pose("hand_on_pussy") her "" ("soft", "closed", "worried", "mid", trans=d3) $ renpy.play("sounds/slick_02.ogg") with hpunch @@ -537,8 +524,7 @@ label hg_pf_strip_T6_fingering: her "*Hmm*?" ("soft", "narrow", "annoyed", "up") her "Okay...{w=0.4} if you insist..." ("open", "base", "base", "R", cheeks="blush") - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armright="on_tits") + $ hermione.set_pose("hand_on_breast") her "*Ah*...{heart}" ("angry", "wink", "base", "mid") gen "Now pinch your nipples." ("base", xpos="far_left", ypos="head") @@ -574,8 +560,6 @@ label hg_pf_strip_T6_fingering: pause.5 # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) $ hermione.strip("clothes") diff --git a/game/scripts/characters/hermione/events/tutoring.rpy b/game/scripts/characters/hermione/events/tutoring.rpy index e987bfca..fe2c9a32 100644 --- a/game/scripts/characters/hermione/events/tutoring.rpy +++ b/game/scripts/characters/hermione/events/tutoring.rpy @@ -1061,9 +1061,7 @@ label hg_tutor_E10: ### Milestone ### $ hg_masturbated.triggered() - $ hermione.set_pose("masturbate") - $ hermione.set_body(armleft="on_pussy") - #call set_her_action("pinch") + $ hermione.set_pose("hand_on_pussy") pause .5 her "Caress it." ("open_tongue", "narrow", "base", "up", cheeks="blush") @@ -1074,12 +1072,9 @@ label hg_tutor_E10: her "Insert my fingers into her wet pussy." ("open_tongue", "narrow", "base", "up", cheeks="blush") gen "Yes, yes! Now the vibrator!" ("angry", xpos="far_left", ypos="head") - hide hermione_main - call blkfade ## TODO: show vibrator pose - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy", armright="on_tits") + $ hermione.set_pose("hand_on_pussy_and_breast") hide screen blkfade call ctc @@ -1101,8 +1096,6 @@ label hg_tutor_E10: ">Hermione catches her breath and puts her clothes back on." # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) $ hermione.wear("all") diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy index ba3ea99f..a290f76f 100644 --- a/game/scripts/characters/hermione/wardrobe.rpy +++ b/game/scripts/characters/hermione/wardrobe.rpy @@ -453,15 +453,15 @@ default her_tattoo_free = DollCloth("hermione", ("piercings & tattoos", "tattoos ## Makeup ## ############ -# Face (Slot 0) -default her_makeup_freckles = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles1", ["#b97c51ff"], unlocked=True) -default her_makeup_freckles_nonose = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles1_nonose", ["#b97c51ff"], unlocked=True) +# Face +default her_makeup_freckles1 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles1", ["#fd9d60ff"], unlocked=True) +default her_makeup_freckles2 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles2", ["#fd9d60ff"], unlocked=True) # Breasts -default her_makeup_freckles2 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles2", ["#b97c51ff"], unlocked=True) +default her_makeup_freckles3 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles3", ["#b97c51ff"], unlocked=True) # Torso -default her_makeup_freckles3 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles3", ["#b97c51ff"], unlocked=True) +default her_makeup_freckles4 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles4", ["#b97c51ff"], unlocked=True) # Lipstick default her_makeup_lipstick = DollMakeup("hermione", ("head", "makeup"), "makeup", "lipstick", ["#ff4646ff"], unlocked=True, tracking="mouth") diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy index 7efaba27..f7f64467 100644 --- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy +++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy @@ -115,7 +115,7 @@ label ll_pf_masturbate_T3_E1_intro: show screen blkfade with d3 - $ luna.set_pose("masturbate") + $ luna.set_pose("hand_on_pussy_and_breast") call nar(">Luna puts one of her hands on her nipple and the other one below her skirt, a slight moan escapes her as her fingers reaches the surface of her skin.") @@ -393,7 +393,7 @@ label ll_pf_masturbate_T3_E2_intro: call ctc - $ luna.set_pose("masturbate") + $ luna.set_pose("hand_on_pussy_and_breast") $ luna.strip("bottom", "panties") @@ -609,7 +609,7 @@ label ll_pf_masturbate_T3_E3_intro: $ camera.set_overlay("night_overlay") $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True) - $ luna.set_pose("masturbate") + $ luna.set_pose("hand_on_pussy_and_breast") $ luna.set_cum(pussy="wet") $ luna.strip("clothes") @@ -854,7 +854,7 @@ label ll_pf_masturbate_T3_E4_repeat: lun "Oh...{w=0.4} Okay..." ("base", "base", "base", "mid") #Luna hand on nipple. - $ luna.set_pose("masturbate") + $ luna.set_pose("hand_on_pussy_and_breast") $ luna.strip("top", "bra") lun "Like this?" ("soft", "base", "base", "mid") diff --git a/game/scripts/events/final_events.rpy b/game/scripts/events/final_events.rpy index 4c41862a..5a6b5d3e 100644 --- a/game/scripts/events/final_events.rpy +++ b/game/scripts/events/final_events.rpy @@ -336,8 +336,7 @@ label ball_quest_E1: $ renpy.play("sounds/slick_02.ogg") with hpunch with kissiris - $ hermione.set_pose("masturbate") - $ hermione.set_body(armleft="on_pussy") + $ hermione.set_pose("hand_on_pussy") her "" ("open", "squint", "worried", "mid", xpos=270) hide screen blkfade with d5 @@ -360,14 +359,13 @@ label ball_quest_E1: stop bg_sounds # Hand down - $ hermione.set_body(armleft="down") + $ hermione.set_pose(None) her "*Sob*! No, [name_genie_hermione]... *sob*!..." ("angry", "happyCl", "worried", "mid", cheeks="blush", tears="crying_blink") her "I... I enjoy touching myself...{w=0.5} In front of my headmaster *SOB*!" ("angry", "squint", "worried", "R_soft", cheeks="blush", tears="crying") - # Hands on pussy, tits - $ hermione.set_body_zorder(armright=3) - $ hermione.set_body(armleft="on_pussy", armright="on_tits") + # Hands on pussy, breast + $ hermione.set_pose("hand_on_pussy_and_breast") play bg_sounds "sounds/slickloop.ogg" fadein 2 her "*Ah*..." ("open", "squint", "worried", "R", cheeks="blush") @@ -418,8 +416,6 @@ label ball_quest_E1: her "..." # Reset pose - $ hermione.set_body_zorder(armright=0) - $ hermione.set_body(armleft="down", armright="down") $ hermione.set_pose(None) $ hermione.strip("clothes") diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy index c12d2c09..bfd47108 100644 --- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy +++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy @@ -209,8 +209,7 @@ label a_white_christmas: $ hermione.strip("clothes") call ctc - $ hermione.set_pose("masturbate") - $ hermione.set_body(armleft="on_pussy") + $ hermione.set_pose("hand_on_pussy") $ hermione.set_cum(pussy="wet") call her_chibi("masturbate_pause") #Finger inserted @@ -297,7 +296,7 @@ label a_white_christmas: call gen_chibi("hold_dick") call her_chibi("masturbate_pause") - $ hermione.set_body(armleft="down") + $ hermione.set_pose(None) $ hermione.set_cum(None) with d5 her "I...{w=0.4} I won!" ("grin", "happy", "base", "stare", cheeks="blush")