From 69e7f5e5421d2c293e9eac2d649981f27f345f22 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sun, 5 Feb 2023 17:25:11 +0000 Subject: [PATCH] Convert Potions * Converted Hermione's potion body changes into clothing items for better maintainability and to provide modding support * Composited body images of characters into singular files to reduce layering complexity and overhead * Fixed Luna's eyemasks --- game/characters/astoria/body/armfix.webp | 3 -- game/characters/astoria/body/front.webp | 4 +- .../astoria/body/larm_zorder_1.webp | 3 -- .../astoria/body/nbreast_zorder_2.webp | 3 -- .../astoria/body/rarm_zorder_1.webp | 3 -- game/characters/cho/body/front.webp | 4 +- game/characters/cho/body/larm_zorder_1.webp | 3 -- .../characters/cho/body/nbreast_zorder_2.webp | 3 -- game/characters/cho/body/rarm_zorder_1.webp | 3 -- .../hermione/body/breasts/big3_backside.webp | 3 -- .../hermione/body/breasts/normal.webp | 3 -- .../hermione/body/breasts/normal_tight.webp | 3 -- game/characters/hermione/body/front.webp | 4 +- .../hermione/body/larm_zorder_1.webp | 3 -- .../hermione/body/nbreasts_zorder_2.webp | 3 -- .../hermione/body/rarm_zorder_1.webp | 3 -- .../accessory/potion_expand_ass1/skin.webp} | 0 .../accessory/potion_expand_ass2/skin.webp} | 0 .../accessory/potion_expand_ass3/skin.webp} | 0 .../potion_expand_breasts1/skin.webp} | 0 .../potion_expand_breasts2/skin.webp} | 0 .../potion_expand_breasts3/skin.webp} | 0 game/characters/luna/body/front.webp | 4 +- game/characters/luna/body/larm_zorder_2.webp | 3 -- .../luna/body/nbreasts_zorder_1.webp | 3 -- game/characters/luna/body/rarm_zorder_2.webp | 3 -- .../eyes/base/{mask.webp => eyemask.webp} | 0 .../eyes/narrow/{mask.webp => eyemask.webp} | 0 .../eyes/wide/{mask.webp => eyemask.webp} | 0 .../eyes/wink/{mask.webp => eyemask.webp} | 0 game/characters/tonks/body/base.webp | 3 -- game/characters/tonks/body/front.webp | 3 ++ game/characters/tonks/body/larm.webp | 3 -- .../tonks/body/nbreast_zorder_1.webp | 3 -- game/characters/tonks/body/rarm.webp | 3 -- .../hermione/events/potions/ass_expand.rpy | 44 ++++++++++++------- .../hermione/events/potions/breast_expand.rpy | 29 +++++++----- game/scripts/characters/hermione/wardrobe.rpy | 12 +++++ 38 files changed, 67 insertions(+), 97 deletions(-) delete mode 100644 game/characters/astoria/body/armfix.webp delete mode 100644 game/characters/astoria/body/larm_zorder_1.webp delete mode 100644 game/characters/astoria/body/nbreast_zorder_2.webp delete mode 100644 game/characters/astoria/body/rarm_zorder_1.webp delete mode 100644 game/characters/cho/body/larm_zorder_1.webp delete mode 100644 game/characters/cho/body/nbreast_zorder_2.webp delete mode 100644 game/characters/cho/body/rarm_zorder_1.webp delete mode 100644 game/characters/hermione/body/breasts/big3_backside.webp delete mode 100644 game/characters/hermione/body/breasts/normal.webp delete mode 100644 game/characters/hermione/body/breasts/normal_tight.webp delete mode 100644 game/characters/hermione/body/larm_zorder_1.webp delete mode 100644 game/characters/hermione/body/nbreasts_zorder_2.webp delete mode 100644 game/characters/hermione/body/rarm_zorder_1.webp rename game/characters/hermione/{body/backside/big1.webp => clothes/accessory/potion_expand_ass1/skin.webp} (100%) rename game/characters/hermione/{body/backside/big2.webp => clothes/accessory/potion_expand_ass2/skin.webp} (100%) rename game/characters/hermione/{body/backside/big3.webp => clothes/accessory/potion_expand_ass3/skin.webp} (100%) rename game/characters/hermione/{body/breasts/big1.webp => clothes/accessory/potion_expand_breasts1/skin.webp} (100%) rename game/characters/hermione/{body/breasts/big2.webp => clothes/accessory/potion_expand_breasts2/skin.webp} (100%) rename game/characters/hermione/{body/breasts/big3.webp => clothes/accessory/potion_expand_breasts3/skin.webp} (100%) delete mode 100644 game/characters/luna/body/larm_zorder_2.webp delete mode 100644 game/characters/luna/body/nbreasts_zorder_1.webp delete mode 100644 game/characters/luna/body/rarm_zorder_2.webp rename game/characters/luna/face/eyes/base/{mask.webp => eyemask.webp} (100%) rename game/characters/luna/face/eyes/narrow/{mask.webp => eyemask.webp} (100%) rename game/characters/luna/face/eyes/wide/{mask.webp => eyemask.webp} (100%) rename game/characters/luna/face/eyes/wink/{mask.webp => eyemask.webp} (100%) delete mode 100644 game/characters/tonks/body/base.webp create mode 100644 game/characters/tonks/body/front.webp delete mode 100644 game/characters/tonks/body/larm.webp delete mode 100644 game/characters/tonks/body/nbreast_zorder_1.webp delete mode 100644 game/characters/tonks/body/rarm.webp diff --git a/game/characters/astoria/body/armfix.webp b/game/characters/astoria/body/armfix.webp deleted file mode 100644 index 51349bad..00000000 --- a/game/characters/astoria/body/armfix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 -size 10772 diff --git a/game/characters/astoria/body/front.webp b/game/characters/astoria/body/front.webp index d78b3d87..f37262ba 100644 --- a/game/characters/astoria/body/front.webp +++ b/game/characters/astoria/body/front.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e47362e920b3f917cb6914855821faaedba4b7a278f62daa72b4ec577708a7a6 -size 49660 +oid sha256:3d7045fc6ca88fa356fded9249c2c2e89db4dec51ae0a1d259a63e440f988509 +size 72420 diff --git a/game/characters/astoria/body/larm_zorder_1.webp b/game/characters/astoria/body/larm_zorder_1.webp deleted file mode 100644 index 262c7f9d..00000000 --- a/game/characters/astoria/body/larm_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f526f0c288aaee88c077af126a86513300994798eb9e3ddc9971b717229174e1 -size 13080 diff --git a/game/characters/astoria/body/nbreast_zorder_2.webp b/game/characters/astoria/body/nbreast_zorder_2.webp deleted file mode 100644 index ef6f20e8..00000000 --- a/game/characters/astoria/body/nbreast_zorder_2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afe997a209491b6f4c0535813ad99782ad7f413c4964aa1a573b78c131d54973 -size 10144 diff --git a/game/characters/astoria/body/rarm_zorder_1.webp b/game/characters/astoria/body/rarm_zorder_1.webp deleted file mode 100644 index 83895df3..00000000 --- a/game/characters/astoria/body/rarm_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d8ef470d7a0ad028df5dfaf19f443c5ee943fcbf05de4b2a46f7d763825172c -size 11832 diff --git a/game/characters/cho/body/front.webp b/game/characters/cho/body/front.webp index 83f11c30..29f5ee67 100644 --- a/game/characters/cho/body/front.webp +++ b/game/characters/cho/body/front.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de7b69a54d723579bbd4f66734c1939754c9a7940876b65894e4b7f0b524b27 -size 48148 +oid sha256:6f6cdc3cedbf0ee2450c140f652f6336608cdf99f81723dcb793bc97bf36b801 +size 62200 diff --git a/game/characters/cho/body/larm_zorder_1.webp b/game/characters/cho/body/larm_zorder_1.webp deleted file mode 100644 index a21015ec..00000000 --- a/game/characters/cho/body/larm_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6da9a3762a6298532ef7a1291a5eaa323439c7439e0d1db2c41ae73707ebec91 -size 13508 diff --git a/game/characters/cho/body/nbreast_zorder_2.webp b/game/characters/cho/body/nbreast_zorder_2.webp deleted file mode 100644 index 00dd9ee0..00000000 --- a/game/characters/cho/body/nbreast_zorder_2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19275d4fce23e6327e43cb1bcb9e91b99dc58b9c3b6fd2f159cc0bedf0a2c0b7 -size 11414 diff --git a/game/characters/cho/body/rarm_zorder_1.webp b/game/characters/cho/body/rarm_zorder_1.webp deleted file mode 100644 index d66831cc..00000000 --- a/game/characters/cho/body/rarm_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69b853d882e6124842e077bd8a8d3aa8916baa9728c7b23b5601510dd85a98ed -size 6668 diff --git a/game/characters/hermione/body/breasts/big3_backside.webp b/game/characters/hermione/body/breasts/big3_backside.webp deleted file mode 100644 index f6f11a9e..00000000 --- a/game/characters/hermione/body/breasts/big3_backside.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e4b0535b4575d9536a5a680fbcc63a83c67ccae4a8fcba4bb2ac59e44ba5950 -size 21056 diff --git a/game/characters/hermione/body/breasts/normal.webp b/game/characters/hermione/body/breasts/normal.webp deleted file mode 100644 index 89de88c4..00000000 --- a/game/characters/hermione/body/breasts/normal.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a74656fa03d149d2bf90c5d9c28a9d331902539a05b875014527dcf16ed82e8f -size 15466 diff --git a/game/characters/hermione/body/breasts/normal_tight.webp b/game/characters/hermione/body/breasts/normal_tight.webp deleted file mode 100644 index 7b1e4d33..00000000 --- a/game/characters/hermione/body/breasts/normal_tight.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e7a2a46f6e1b864bb2979ffee334b64631b1c40f591bccf7d3478aa5c92ee6f -size 15648 diff --git a/game/characters/hermione/body/front.webp b/game/characters/hermione/body/front.webp index 26dde8a7..1fa06664 100644 --- a/game/characters/hermione/body/front.webp +++ b/game/characters/hermione/body/front.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b1f8e290c683c8295d40f8f0d49227355fc666972dcd77a40802dcff536c6a5 -size 57642 +oid sha256:e90dcd9f529fda39e0a94485fd5efcc1b09e707fa61e7c990713e719b220a9fe +size 90170 diff --git a/game/characters/hermione/body/larm_zorder_1.webp b/game/characters/hermione/body/larm_zorder_1.webp deleted file mode 100644 index de690ef2..00000000 --- a/game/characters/hermione/body/larm_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad43dbf9ecbf97fc96157d7149e76b7e49631909c1fdbf8ba24659fa0b43eb04 -size 19184 diff --git a/game/characters/hermione/body/nbreasts_zorder_2.webp b/game/characters/hermione/body/nbreasts_zorder_2.webp deleted file mode 100644 index 89de88c4..00000000 --- a/game/characters/hermione/body/nbreasts_zorder_2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a74656fa03d149d2bf90c5d9c28a9d331902539a05b875014527dcf16ed82e8f -size 15466 diff --git a/game/characters/hermione/body/rarm_zorder_1.webp b/game/characters/hermione/body/rarm_zorder_1.webp deleted file mode 100644 index f250b08d..00000000 --- a/game/characters/hermione/body/rarm_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:235144e94d03e1c2e113bc77bc9e80d9082a3a17016cbf9a5abb32e177c00b14 -size 14008 diff --git a/game/characters/hermione/body/backside/big1.webp b/game/characters/hermione/clothes/accessory/potion_expand_ass1/skin.webp similarity index 100% rename from game/characters/hermione/body/backside/big1.webp rename to game/characters/hermione/clothes/accessory/potion_expand_ass1/skin.webp diff --git a/game/characters/hermione/body/backside/big2.webp b/game/characters/hermione/clothes/accessory/potion_expand_ass2/skin.webp similarity index 100% rename from game/characters/hermione/body/backside/big2.webp rename to game/characters/hermione/clothes/accessory/potion_expand_ass2/skin.webp diff --git a/game/characters/hermione/body/backside/big3.webp b/game/characters/hermione/clothes/accessory/potion_expand_ass3/skin.webp similarity index 100% rename from game/characters/hermione/body/backside/big3.webp rename to game/characters/hermione/clothes/accessory/potion_expand_ass3/skin.webp diff --git a/game/characters/hermione/body/breasts/big1.webp b/game/characters/hermione/clothes/accessory/potion_expand_breasts1/skin.webp similarity index 100% rename from game/characters/hermione/body/breasts/big1.webp rename to game/characters/hermione/clothes/accessory/potion_expand_breasts1/skin.webp diff --git a/game/characters/hermione/body/breasts/big2.webp b/game/characters/hermione/clothes/accessory/potion_expand_breasts2/skin.webp similarity index 100% rename from game/characters/hermione/body/breasts/big2.webp rename to game/characters/hermione/clothes/accessory/potion_expand_breasts2/skin.webp diff --git a/game/characters/hermione/body/breasts/big3.webp b/game/characters/hermione/clothes/accessory/potion_expand_breasts3/skin.webp similarity index 100% rename from game/characters/hermione/body/breasts/big3.webp rename to game/characters/hermione/clothes/accessory/potion_expand_breasts3/skin.webp diff --git a/game/characters/luna/body/front.webp b/game/characters/luna/body/front.webp index 0dfa24fa..2b949fb2 100644 --- a/game/characters/luna/body/front.webp +++ b/game/characters/luna/body/front.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e63ed1dc79ba3aaa042b334972bbb08040311f5cec874aadc6dcb219d97c003 -size 20342 +oid sha256:c1f930f061a1f782b3a0b617ff68a91b08048d987d36d40cb2b1f018018d47e4 +size 158562 diff --git a/game/characters/luna/body/larm_zorder_2.webp b/game/characters/luna/body/larm_zorder_2.webp deleted file mode 100644 index 4765e583..00000000 --- a/game/characters/luna/body/larm_zorder_2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:334ff656b1823cc5d58c74f5c506bf095fa6604c45fbe4d2b0cc1b51e4ed8cd2 -size 9236 diff --git a/game/characters/luna/body/nbreasts_zorder_1.webp b/game/characters/luna/body/nbreasts_zorder_1.webp deleted file mode 100644 index 266369c8..00000000 --- a/game/characters/luna/body/nbreasts_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c94dfb7db323d0df5356f46f6f48a2e7e5962e4b2f3d21fe67a0fe3cd182e6c -size 6790 diff --git a/game/characters/luna/body/rarm_zorder_2.webp b/game/characters/luna/body/rarm_zorder_2.webp deleted file mode 100644 index 179d0793..00000000 --- a/game/characters/luna/body/rarm_zorder_2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcf33fa9657244ee6fcfdb8c14d3de7aed5b3f8336df7797f720367afcff19e3 -size 7196 diff --git a/game/characters/luna/face/eyes/base/mask.webp b/game/characters/luna/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/luna/face/eyes/base/mask.webp rename to game/characters/luna/face/eyes/base/eyemask.webp diff --git a/game/characters/luna/face/eyes/narrow/mask.webp b/game/characters/luna/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/luna/face/eyes/narrow/mask.webp rename to game/characters/luna/face/eyes/narrow/eyemask.webp diff --git a/game/characters/luna/face/eyes/wide/mask.webp b/game/characters/luna/face/eyes/wide/eyemask.webp similarity index 100% rename from game/characters/luna/face/eyes/wide/mask.webp rename to game/characters/luna/face/eyes/wide/eyemask.webp diff --git a/game/characters/luna/face/eyes/wink/mask.webp b/game/characters/luna/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/luna/face/eyes/wink/mask.webp rename to game/characters/luna/face/eyes/wink/eyemask.webp diff --git a/game/characters/tonks/body/base.webp b/game/characters/tonks/body/base.webp deleted file mode 100644 index 77514b7d..00000000 --- a/game/characters/tonks/body/base.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:978609978d6bbb0bd37cea64e8063265ced02921286e7a6e5ce901e021274dca -size 63978 diff --git a/game/characters/tonks/body/front.webp b/game/characters/tonks/body/front.webp new file mode 100644 index 00000000..1598e457 --- /dev/null +++ b/game/characters/tonks/body/front.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8e2302337cb4d4be7abb40b298bf7230c7ad64feb0bcbbf069706f1fd09fae +size 96104 diff --git a/game/characters/tonks/body/larm.webp b/game/characters/tonks/body/larm.webp deleted file mode 100644 index 292208a6..00000000 --- a/game/characters/tonks/body/larm.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da007931f76b7977e9993b557a95dfdf1476312bffe76f70334f991299c60be6 -size 20628 diff --git a/game/characters/tonks/body/nbreast_zorder_1.webp b/game/characters/tonks/body/nbreast_zorder_1.webp deleted file mode 100644 index cadcd90b..00000000 --- a/game/characters/tonks/body/nbreast_zorder_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8d1b06ce10c1ddf3ce260070e170a3541b635babce63ba50a6c91699ae512d8 -size 15346 diff --git a/game/characters/tonks/body/rarm.webp b/game/characters/tonks/body/rarm.webp deleted file mode 100644 index eee0a34b..00000000 --- a/game/characters/tonks/body/rarm.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17c4d2cb79d349aca8a162c2f52f38f2f719eddedd9e6fa1129a8331081723dc -size 15482 diff --git a/game/scripts/characters/hermione/events/potions/ass_expand.rpy b/game/scripts/characters/hermione/events/potions/ass_expand.rpy index 424203e1..8ec5f470 100644 --- a/game/scripts/characters/hermione/events/potions/ass_expand.rpy +++ b/game/scripts/characters/hermione/events/potions/ass_expand.rpy @@ -330,7 +330,7 @@ label her_potion_ass_give: gen "It appears the potion is working." ("base", xpos="far_left", ypos="head") her "It-- Hold on, is it--" ("angry", "wide", "base", "mid", cheeks="blush") - $ hermione.set_body(backside="big1") + $ hermione.equip(her_potion_expand_ass1) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -340,7 +340,8 @@ label her_potion_ass_give: gen "I assure you I had no idea [hermione_name], it was only meant to spank you a little." ("base", xpos="far_left", ypos="head") her "Then how come it's--" ("soft", "narrow", "annoyed", "down", cheeks="blush") - $ hermione.set_body(backside="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass2) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -350,7 +351,8 @@ label her_potion_ass_give: gen "Well, it is an untested potion to be fair... You'll have to expect some side effects." ("base", xpos="far_left", ypos="head") her "Side effects? But you assured me this potion was--" ("clench", "narrow", "worried", "down", cheeks="blush") - $ hermione.set_body(backside="big3") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass3) $ renpy.sound.play("sounds/boing04.ogg") with d3 @@ -421,7 +423,7 @@ label her_potion_ass_give: gen "I don't... *Err*.... I brewed it to do that!" ("base", xpos="far_left", ypos="head") her "You brewed it to-- I thought it was meant to make it--" ("disgust", "narrow", "base", "down", cheeks="blush") - $ hermione.set_body(backside="big1") + $ hermione.equip(her_potion_expand_ass1) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -434,7 +436,8 @@ label her_potion_ass_give: gen "You underestimate me, girl..." ("base", xpos="far_left", ypos="head") her "What do you--" ("soft", "narrow", "base", "down", cheeks="blush") - $ hermione.set_body(backside="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass2) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -445,7 +448,8 @@ label her_potion_ass_give: gen "Well you expected wrong... We're not done yet, [hermione_name]." ("base", xpos="far_left", ypos="head") her "We're--" ("mad", "base", "base", "mid", cheeks="blush") - $ hermione.set_body(backside="big3") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass3) $ renpy.sound.play("sounds/boing04.ogg") with d3 @@ -516,7 +520,7 @@ label her_potion_ass_give: call nar(">You start to notice Hermione's ass increase in size.") - $ hermione.set_body(backside="big1") + $ hermione.equip(her_potion_expand_ass1) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -525,7 +529,8 @@ label her_potion_ass_give: gen "I think you look great!" ("grin", xpos="far_left", ypos="head") her "If only this was as big as it's going to--" ("annoyed", "narrow", "worried", "down", cheeks="blush") - $ hermione.set_body(backside="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass2) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -535,7 +540,8 @@ label her_potion_ass_give: gen "As in there's even more of you now." ("grin", xpos="far_left", ypos="head") her "I understood what you--" ("disgust", "narrow", "annoyed", "down", cheeks="blush") - $ hermione.set_body(backside="big3") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass3) $ renpy.sound.play("sounds/boing04.ogg") with d3 @@ -552,7 +558,7 @@ label her_potion_ass_give: gen "Perhaps." ("base", xpos="far_left", ypos="head") her "I figured..." ("angry", "narrow", "base", "R", cheeks="blush") - $ hermione.set_body(backside="big1") + $ hermione.equip(her_potion_expand_ass1) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -561,7 +567,8 @@ label her_potion_ass_give: her "I guess..." ("base", "closed", "base", "mid", cheeks="blush") her "So when is it supposed to start--" ("open", "squint", "base", "mid", cheeks="blush") - $ hermione.set_body(backside="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass2) $ renpy.sound.play("sounds/boing05.ogg") with d3 @@ -577,7 +584,8 @@ label her_potion_ass_give: gen "Disappointed, [hermione_name]?" ("base", xpos="far_left", ypos="head") her "No, I was just expecting it to--" ("angry", "base", "base", "mid", cheeks="blush") - $ hermione.set_body(backside="big3") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass3) $ renpy.sound.play("sounds/boing04.ogg") with d3 @@ -821,7 +829,7 @@ label her_potion_ass_give: gen "{cps=3}...{/cps}" ("base", xpos="far_left", ypos="head") gen "No buts next time, got it." ("base", xpos="far_left", ypos="head") - $ hermione.set_body(backside=None) + $ hermione.unequip("accessory") $ her_ass_expand_drank = True $ her_ass_expand_finger = True $ her_ass_expand_no_clothes = False #Took off main clothing check reset @@ -1024,7 +1032,7 @@ label her_potion_ass_give: $ her_ass_expand_drank = True $ her_ass_expand_finger = True $ her_ass_expand_no_clothes = False #Took off main clothing check reset - $ hermione.set_body(backside=None) + $ hermione.unequip("accessory") jump end_hermione_event "-Let go of her-": @@ -1048,12 +1056,14 @@ label her_potion_ass_give: show screen blkfade with d5 - $ hermione.set_body(backside="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass2) call nar(">As Hermione's straightens her back you watch as her ass begins shrinking in size.") call nar(">With a short sigh, she then walk up to the front of your desk.") - $ hermione.set_body(backside="big1") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_ass1) call her_chibi("stand","desk","base", flip=False) call gen_chibi("sit_behind_desk") @@ -1062,7 +1072,7 @@ label her_potion_ass_give: hide screen blkfade with d5 - $ hermione.set_body(backside=None) + $ hermione.unequip("accessory") her "So, is that it [genie_name]?" ("open", "squint", "base", "R", cheeks="blush", xpos="base", ypos="base", flip=False, trans=d3) if her_whoring < 19: diff --git a/game/scripts/characters/hermione/events/potions/breast_expand.rpy b/game/scripts/characters/hermione/events/potions/breast_expand.rpy index 08e802f7..1afb3071 100644 --- a/game/scripts/characters/hermione/events/potions/breast_expand.rpy +++ b/game/scripts/characters/hermione/events/potions/breast_expand.rpy @@ -427,7 +427,7 @@ label her_potion_breasts_give: call ctc - $ hermione.set_body(breasts="big1") + $ hermione.equip(her_potion_expand_breast1) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -439,7 +439,8 @@ label her_potion_breasts_give: gen "Maybe it takes a while for it to take full effect." ("base", xpos="far_left", ypos="head") her "A lot bigger? How big are they supposed to--" ("clench", "squint", "base", "mid") - $ hermione.set_body(breasts="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_breast2) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -488,7 +489,7 @@ label her_potion_breasts_give: call ctc - $ hermione.set_body(breasts="big1") + $ hermione.equip(her_potion_expand_breast1) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -501,7 +502,8 @@ label her_potion_breasts_give: gen "Can't have too much of a good thing." ("base", xpos="far_left", ypos="head") her "That's not--" ("open", "narrow", "base", "mid", cheeks="blush") - $ hermione.set_body(breasts="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_breast2) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -566,7 +568,7 @@ label her_potion_breasts_give: call nar (">Hermione's breasts expand as the potion spreads through her body.") - $ hermione.set_body(breasts="big1") + $ hermione.equip(her_potion_expand_breast1) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -578,7 +580,8 @@ label her_potion_breasts_give: her "... Oh, thank Merlin..." ("angry", "narrow", "base", "down", cheeks="blush") her "I was readying myself for them to get even--" ("angry", "narrow", "worried", "down", cheeks="blush") - $ hermione.set_body(breasts="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_breast2) $ renpy.sound.play("sounds/boing02.ogg") with d3 pause .5 @@ -625,7 +628,7 @@ label her_potion_breasts_give: her "*Mmm*...{w=0.4} What...{w=0.4} What's that supposed to mean?" ("smile", "narrow", "base", "stare", cheeks="blush") call nar (">Hermione's breasts bounces slightly as the potion spreads through her body.") - $ hermione.set_body(breasts="big1") + $ hermione.equip(her_potion_expand_breast1) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -635,7 +638,8 @@ label her_potion_breasts_give: her "Although... Are they not supposed to get bigger?" ("open", "narrow", "base", "down", cheeks="blush") gen "Well..." ("base", xpos="far_left", ypos="head") - $ hermione.set_body(breasts="big2") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_breast2) $ renpy.sound.play("sounds/boing02.ogg") with d3 @@ -740,7 +744,8 @@ label her_potion_breasts_give: $ renpy.sound.play("sounds/boing04.ogg") with vpunch - $ hermione.set_body(breasts="big3") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_breast2) with d3 @@ -775,7 +780,8 @@ label her_potion_breasts_give: $ renpy.sound.play("sounds/boing04.ogg") with vpunch - $ hermione.set_body(breasts="big3") + $ hermione.unequip("accessory") + $ hermione.equip(her_potion_expand_breast2) her "Aaaah!!!" ("scream", "wide", "base", "stare", cheeks="blush") with d3 @@ -1017,8 +1023,7 @@ label her_potion_breasts_give: $ her_breast_expand_groped = True $ her_breast_expand_drank = True $ her_breast_expand_effects_known = True - - $ hermione.set_body(breasts="normal") + $ hermione.unequip("accessory") jump end_hermione_event diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy index 43e82891..a93ed176 100644 --- a/game/scripts/characters/hermione/wardrobe.rpy +++ b/game/scripts/characters/hermione/wardrobe.rpy @@ -535,3 +535,15 @@ default her_accessory_bb_tie = DollCloth("hermione", ("misc", "accessory"), "acc default her_tattoo_bb_tattoo = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "bb_tattoo", [[0, 0, 0, 255], [255, 247, 0, 255], [246, 40, 0, 255]]) default her_outfit_bb = DollOutfit([her_hair_base, her_accessory_bb_tie, her_tattoo_bb_tattoo]) + +############# +## Potions ## +############# + +default her_potion_expand_breasts1 = DollCloth("hermione", ("hidden", "accessory"), "accessory", "potion_expand_breasts1", None) +default her_potion_expand_breasts2 = DollCloth("hermione", ("hidden", "accessory"), "accessory", "potion_expand_breasts2", None) +default her_potion_expand_breasts3 = DollCloth("hermione", ("hidden", "accessory"), "accessory", "potion_expand_breasts3", None) + +default her_potion_expand_ass1 = DollCloth("hermione", ("hidden", "accessory"), "accessory", "her_potion_expand_ass1", None) +default her_potion_expand_ass2 = DollCloth("hermione", ("hidden", "accessory"), "accessory", "her_potion_expand_ass2", None) +default her_potion_expand_ass3 = DollCloth("hermione", ("hidden", "accessory"), "accessory", "her_potion_expand_ass3", None)