From fab4da6f7696370540cfd69b2cfc9e01cca1f37f Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Mon, 20 Mar 2023 21:44:55 +0000 Subject: [PATCH] Bug fixes * Fixed import initialization offset * Fixed and converted hooch chibi images into spritesheets * Fixed hooch chibi calls * Fixed new chibi format file dirs * Fixed inner thought overlay displaying above side images * Added default audio fadeout value of 1.0 * Removed rebuild method calls (superseded) * Removed incompatible updater code * Converted cho new chibi into spritesheets (Placeholder) * Commented out dev code to avoid issues --- .../walk/0/bodyparts/frame/default/skin.webp | 3 - .../walk/1/bodyparts/frame/default/skin.webp | 3 - .../walk/2/bodyparts/frame/default/skin.webp | 3 - .../walk/3/bodyparts/frame/default/skin.webp | 3 - .../walk/4/bodyparts/frame/default/skin.webp | 3 - .../walk/5/bodyparts/frame/default/skin.webp | 3 - .../walk/6/bodyparts/frame/default/skin.webp | 3 - .../walk/7/bodyparts/frame/default/skin.webp | 3 - .../stand}/bodyparts/frame/default/skin.webp | 0 .../clothes/bottom/default/overlay.webp | 0 .../clothes/bottom/school_skirt_1/0.webp | 0 .../stand}/clothes/bra/basic_bra_1/0.webp | 0 .../stand}/clothes/bra/default/overlay.webp | 0 .../clothes/footwear/default/overlay.webp | 0 .../clothes/panties/basic_panties_1/0.webp | 0 .../clothes/panties/default/overlay.webp | 0 .../stand}/clothes/robe/robe_school_1/0.webp | 0 .../clothes/robe/robe_school_1/0_back.webp | 0 .../clothes/stockings/house/outline.webp | 0 .../stand}/clothes/top/default/overlay.webp | 0 .../clothes/top/top_school_1/outline.webp | 0 .../walk/bodyparts/frame/default/skin.webp | 3 + game/characters/hooch/chibi/stand/0.webp | 3 - game/characters/hooch/chibi/walk/0.webp | 3 - game/characters/hooch/chibi/walk/1.webp | 3 - game/characters/hooch/chibi/walk/2.webp | 3 - game/characters/hooch/chibi/walk/3.webp | 3 - game/characters/hooch/chibi/walk/4.webp | 3 - game/characters/hooch/chibi/walk/5.webp | 3 - game/characters/hooch/chibi/walk/6.webp | 3 - game/characters/hooch/chibi/walk/7.webp | 3 - .../stand/bodyparts/frame/default/skin.webp | 3 + .../walk/bodyparts/frame/default/skin.webp | 3 + .../stand/bodyparts/frame/default/skin.png | 0 .../chibi/stand/clothes/hair/new/0.png | 0 .../chibi/stand/clothes/hair/new/1.png | 0 .../chibi/stand/clothes/hair/new/outline.png | 0 .../chibi/stand/clothes/hair/new/skin.png | 0 .../walk/bodyparts/frame/default/skin.png | 0 .../chibi/walk/clothes/hair/new/0.png | 0 .../chibi/walk/clothes/hair/new/1.png | 0 .../chibi/walk/clothes/hair/new/outline.png | 0 .../chibi/walk/clothes/hair/new/skin.png | 0 game/scripts/cds.rpy | 6 +- .../cho/events/quidditch/gryffindor_match.rpy | 4 +- .../cho/events/quidditch/intros.rpy | 9 ++- game/scripts/doll/chibi.rpy | 78 +++++++++---------- game/scripts/doll/init.rpy | 7 +- game/scripts/gui/say.rpy | 10 +-- game/scripts/options.rpy | 1 + game/scripts/utility/common_functions.rpy | 2 +- game/scripts/utility/updater.rpy | 68 +--------------- 52 files changed, 73 insertions(+), 172 deletions(-) delete mode 100644 game/characters/cho/chibi/walk/0/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/1/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/2/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/3/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/4/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/5/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/6/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/cho/chibi/walk/7/bodyparts/frame/default/skin.webp rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/bodyparts/frame/default/skin.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/bottom/default/overlay.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/bottom/school_skirt_1/0.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/bra/basic_bra_1/0.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/bra/default/overlay.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/footwear/default/overlay.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/panties/basic_panties_1/0.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/panties/default/overlay.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/robe/robe_school_1/0.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/robe/robe_school_1/0_back.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/stockings/house/outline.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/top/default/overlay.webp (100%) rename game/characters/cho/{chibi/stand/0 => poses/default/chibi/stand}/clothes/top/top_school_1/outline.webp (100%) create mode 100644 game/characters/cho/poses/default/chibi/walk/bodyparts/frame/default/skin.webp delete mode 100644 game/characters/hooch/chibi/stand/0.webp delete mode 100644 game/characters/hooch/chibi/walk/0.webp delete mode 100644 game/characters/hooch/chibi/walk/1.webp delete mode 100644 game/characters/hooch/chibi/walk/2.webp delete mode 100644 game/characters/hooch/chibi/walk/3.webp delete mode 100644 game/characters/hooch/chibi/walk/4.webp delete mode 100644 game/characters/hooch/chibi/walk/5.webp delete mode 100644 game/characters/hooch/chibi/walk/6.webp delete mode 100644 game/characters/hooch/chibi/walk/7.webp create mode 100644 game/characters/hooch/poses/default/chibi/stand/bodyparts/frame/default/skin.webp create mode 100644 game/characters/hooch/poses/default/chibi/walk/bodyparts/frame/default/skin.webp rename game/characters/tonks/{ => poses/default}/chibi/stand/bodyparts/frame/default/skin.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/stand/clothes/hair/new/0.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/stand/clothes/hair/new/1.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/stand/clothes/hair/new/outline.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/stand/clothes/hair/new/skin.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/walk/bodyparts/frame/default/skin.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/walk/clothes/hair/new/0.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/walk/clothes/hair/new/1.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/walk/clothes/hair/new/outline.png (100%) rename game/characters/tonks/{ => poses/default}/chibi/walk/clothes/hair/new/skin.png (100%) diff --git a/game/characters/cho/chibi/walk/0/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/0/bodyparts/frame/default/skin.webp deleted file mode 100644 index 887cf0bf..00000000 --- a/game/characters/cho/chibi/walk/0/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24bff78653d56ffe297fe90f28326461730e6e2c6f952df0cec484285c494161 -size 54038 diff --git a/game/characters/cho/chibi/walk/1/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/1/bodyparts/frame/default/skin.webp deleted file mode 100644 index bd527e15..00000000 --- a/game/characters/cho/chibi/walk/1/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:855a52053bd72d3b2b3802675ed82328edf097d327496a6f0c86b8cb5a94ad0a -size 56228 diff --git a/game/characters/cho/chibi/walk/2/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/2/bodyparts/frame/default/skin.webp deleted file mode 100644 index 5f3473d6..00000000 --- a/game/characters/cho/chibi/walk/2/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e97a1e55e8d6656095fdb2219f9ff14fca492b16a7170460e1a100a63be61e0c -size 59466 diff --git a/game/characters/cho/chibi/walk/3/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/3/bodyparts/frame/default/skin.webp deleted file mode 100644 index 0ffc3907..00000000 --- a/game/characters/cho/chibi/walk/3/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab6789edadb4ac698f64aca9b1fb26df62b999fcf61e38eacc37fd1cbdd5b63f -size 56848 diff --git a/game/characters/cho/chibi/walk/4/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/4/bodyparts/frame/default/skin.webp deleted file mode 100644 index 887cf0bf..00000000 --- a/game/characters/cho/chibi/walk/4/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24bff78653d56ffe297fe90f28326461730e6e2c6f952df0cec484285c494161 -size 54038 diff --git a/game/characters/cho/chibi/walk/5/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/5/bodyparts/frame/default/skin.webp deleted file mode 100644 index fbad8c46..00000000 --- a/game/characters/cho/chibi/walk/5/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c8d345e501fadf7c64a576ca6361ff5c4b2c19d05fd34bb5897accd0e5778e7 -size 54490 diff --git a/game/characters/cho/chibi/walk/6/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/6/bodyparts/frame/default/skin.webp deleted file mode 100644 index fe92aa95..00000000 --- a/game/characters/cho/chibi/walk/6/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a1bc51779628526f1fd64940cc0d705bc7661311b3a938bda062d75166413e6 -size 53034 diff --git a/game/characters/cho/chibi/walk/7/bodyparts/frame/default/skin.webp b/game/characters/cho/chibi/walk/7/bodyparts/frame/default/skin.webp deleted file mode 100644 index e3c88f0a..00000000 --- a/game/characters/cho/chibi/walk/7/bodyparts/frame/default/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed0c8a792391cc4f45183c0a02b52a3a435341507d3abe2dba6714fd0683e067 -size 54178 diff --git a/game/characters/cho/chibi/stand/0/bodyparts/frame/default/skin.webp b/game/characters/cho/poses/default/chibi/stand/bodyparts/frame/default/skin.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/bodyparts/frame/default/skin.webp rename to game/characters/cho/poses/default/chibi/stand/bodyparts/frame/default/skin.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/bottom/default/overlay.webp b/game/characters/cho/poses/default/chibi/stand/clothes/bottom/default/overlay.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/bottom/default/overlay.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/bottom/default/overlay.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/bottom/school_skirt_1/0.webp b/game/characters/cho/poses/default/chibi/stand/clothes/bottom/school_skirt_1/0.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/bottom/school_skirt_1/0.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/bottom/school_skirt_1/0.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/bra/basic_bra_1/0.webp b/game/characters/cho/poses/default/chibi/stand/clothes/bra/basic_bra_1/0.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/bra/basic_bra_1/0.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/bra/basic_bra_1/0.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/bra/default/overlay.webp b/game/characters/cho/poses/default/chibi/stand/clothes/bra/default/overlay.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/bra/default/overlay.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/bra/default/overlay.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/footwear/default/overlay.webp b/game/characters/cho/poses/default/chibi/stand/clothes/footwear/default/overlay.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/footwear/default/overlay.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/footwear/default/overlay.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/panties/basic_panties_1/0.webp b/game/characters/cho/poses/default/chibi/stand/clothes/panties/basic_panties_1/0.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/panties/basic_panties_1/0.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/panties/basic_panties_1/0.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/panties/default/overlay.webp b/game/characters/cho/poses/default/chibi/stand/clothes/panties/default/overlay.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/panties/default/overlay.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/panties/default/overlay.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/robe/robe_school_1/0.webp b/game/characters/cho/poses/default/chibi/stand/clothes/robe/robe_school_1/0.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/robe/robe_school_1/0.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/robe/robe_school_1/0.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/robe/robe_school_1/0_back.webp b/game/characters/cho/poses/default/chibi/stand/clothes/robe/robe_school_1/0_back.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/robe/robe_school_1/0_back.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/robe/robe_school_1/0_back.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/stockings/house/outline.webp b/game/characters/cho/poses/default/chibi/stand/clothes/stockings/house/outline.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/stockings/house/outline.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/stockings/house/outline.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/top/default/overlay.webp b/game/characters/cho/poses/default/chibi/stand/clothes/top/default/overlay.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/top/default/overlay.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/top/default/overlay.webp diff --git a/game/characters/cho/chibi/stand/0/clothes/top/top_school_1/outline.webp b/game/characters/cho/poses/default/chibi/stand/clothes/top/top_school_1/outline.webp similarity index 100% rename from game/characters/cho/chibi/stand/0/clothes/top/top_school_1/outline.webp rename to game/characters/cho/poses/default/chibi/stand/clothes/top/top_school_1/outline.webp diff --git a/game/characters/cho/poses/default/chibi/walk/bodyparts/frame/default/skin.webp b/game/characters/cho/poses/default/chibi/walk/bodyparts/frame/default/skin.webp new file mode 100644 index 00000000..224f2da0 --- /dev/null +++ b/game/characters/cho/poses/default/chibi/walk/bodyparts/frame/default/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:693a1cd1cf74969c587b006bc74e733556c862a3996df9e47259215da98fcd5d +size 389014 diff --git a/game/characters/hooch/chibi/stand/0.webp b/game/characters/hooch/chibi/stand/0.webp deleted file mode 100644 index a9f3acb3..00000000 --- a/game/characters/hooch/chibi/stand/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c50ae9945e86b3aa54128c9744bcb171be5083dd3cba8a13c2f72ebfceeb085 -size 72638 diff --git a/game/characters/hooch/chibi/walk/0.webp b/game/characters/hooch/chibi/walk/0.webp deleted file mode 100644 index dda4e144..00000000 --- a/game/characters/hooch/chibi/walk/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44da5f9cdef4729a269f32d159c436552be2b8fc190745eb803413bfbaa06e3d -size 71976 diff --git a/game/characters/hooch/chibi/walk/1.webp b/game/characters/hooch/chibi/walk/1.webp deleted file mode 100644 index 1bdd9b75..00000000 --- a/game/characters/hooch/chibi/walk/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c609af0a32574e7d5116833e09c0321222d6835d839a447932ffa448f180d5e -size 74396 diff --git a/game/characters/hooch/chibi/walk/2.webp b/game/characters/hooch/chibi/walk/2.webp deleted file mode 100644 index 42ebbcd2..00000000 --- a/game/characters/hooch/chibi/walk/2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47656ec563c6bbd28f559dd0a6b7a9671a55a225f73402b785b9c5cd59f2c618 -size 78622 diff --git a/game/characters/hooch/chibi/walk/3.webp b/game/characters/hooch/chibi/walk/3.webp deleted file mode 100644 index 1c3c387d..00000000 --- a/game/characters/hooch/chibi/walk/3.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bca74ca38eccae3061a2a9eb9970e466f9dfddbc20207034fab004919e3f1861 -size 76288 diff --git a/game/characters/hooch/chibi/walk/4.webp b/game/characters/hooch/chibi/walk/4.webp deleted file mode 100644 index dda4e144..00000000 --- a/game/characters/hooch/chibi/walk/4.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44da5f9cdef4729a269f32d159c436552be2b8fc190745eb803413bfbaa06e3d -size 71976 diff --git a/game/characters/hooch/chibi/walk/5.webp b/game/characters/hooch/chibi/walk/5.webp deleted file mode 100644 index 5b03eb92..00000000 --- a/game/characters/hooch/chibi/walk/5.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cb78bfebbb1650694e4605c70caa5ee47c161e497c07f9795152302ca8c4767 -size 73124 diff --git a/game/characters/hooch/chibi/walk/6.webp b/game/characters/hooch/chibi/walk/6.webp deleted file mode 100644 index 5727d40f..00000000 --- a/game/characters/hooch/chibi/walk/6.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3d30d56caf41f4afc18f2861da51825f05e9c0bea025aa510f4552cd58cd955 -size 74366 diff --git a/game/characters/hooch/chibi/walk/7.webp b/game/characters/hooch/chibi/walk/7.webp deleted file mode 100644 index 695185a7..00000000 --- a/game/characters/hooch/chibi/walk/7.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0206b0a10228fb97ede93b1ccd4adec37179bd5f38ca188d001963c1a9133869 -size 73634 diff --git a/game/characters/hooch/poses/default/chibi/stand/bodyparts/frame/default/skin.webp b/game/characters/hooch/poses/default/chibi/stand/bodyparts/frame/default/skin.webp new file mode 100644 index 00000000..1f697cf5 --- /dev/null +++ b/game/characters/hooch/poses/default/chibi/stand/bodyparts/frame/default/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56a00ddc50df8046f6a338a008583ae0c1a3a5e0608e39fba8b82f35cd7fc0c2 +size 72296 diff --git a/game/characters/hooch/poses/default/chibi/walk/bodyparts/frame/default/skin.webp b/game/characters/hooch/poses/default/chibi/walk/bodyparts/frame/default/skin.webp new file mode 100644 index 00000000..8f24d329 --- /dev/null +++ b/game/characters/hooch/poses/default/chibi/walk/bodyparts/frame/default/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7641f6257c501ef2d26b57dcb483730d4d331139a5f9213f91cf3c21d3cd090e +size 496278 diff --git a/game/characters/tonks/chibi/stand/bodyparts/frame/default/skin.png b/game/characters/tonks/poses/default/chibi/stand/bodyparts/frame/default/skin.png similarity index 100% rename from game/characters/tonks/chibi/stand/bodyparts/frame/default/skin.png rename to game/characters/tonks/poses/default/chibi/stand/bodyparts/frame/default/skin.png diff --git a/game/characters/tonks/chibi/stand/clothes/hair/new/0.png b/game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/0.png similarity index 100% rename from game/characters/tonks/chibi/stand/clothes/hair/new/0.png rename to game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/0.png diff --git a/game/characters/tonks/chibi/stand/clothes/hair/new/1.png b/game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/1.png similarity index 100% rename from game/characters/tonks/chibi/stand/clothes/hair/new/1.png rename to game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/1.png diff --git a/game/characters/tonks/chibi/stand/clothes/hair/new/outline.png b/game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/outline.png similarity index 100% rename from game/characters/tonks/chibi/stand/clothes/hair/new/outline.png rename to game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/outline.png diff --git a/game/characters/tonks/chibi/stand/clothes/hair/new/skin.png b/game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/skin.png similarity index 100% rename from game/characters/tonks/chibi/stand/clothes/hair/new/skin.png rename to game/characters/tonks/poses/default/chibi/stand/clothes/hair/new/skin.png diff --git a/game/characters/tonks/chibi/walk/bodyparts/frame/default/skin.png b/game/characters/tonks/poses/default/chibi/walk/bodyparts/frame/default/skin.png similarity index 100% rename from game/characters/tonks/chibi/walk/bodyparts/frame/default/skin.png rename to game/characters/tonks/poses/default/chibi/walk/bodyparts/frame/default/skin.png diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/0.png b/game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/0.png similarity index 100% rename from game/characters/tonks/chibi/walk/clothes/hair/new/0.png rename to game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/0.png diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/1.png b/game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/1.png similarity index 100% rename from game/characters/tonks/chibi/walk/clothes/hair/new/1.png rename to game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/1.png diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/outline.png b/game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/outline.png similarity index 100% rename from game/characters/tonks/chibi/walk/clothes/hair/new/outline.png rename to game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/outline.png diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/skin.png b/game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/skin.png similarity index 100% rename from game/characters/tonks/chibi/walk/clothes/hair/new/skin.png rename to game/characters/tonks/poses/default/chibi/walk/clothes/hair/new/skin.png diff --git a/game/scripts/cds.rpy b/game/scripts/cds.rpy index dc294285..4021c553 100644 --- a/game/scripts/cds.rpy +++ b/game/scripts/cds.rpy @@ -8,21 +8,21 @@ python early: def execute_chibi(p): print(f"{p}") who, action = p - func = eval(f"{who[:3]}_chibi_new.{action}") + func = eval(f"{who}_chibi.{action}") print(f"Execution: {who} {action}") def lint_chibi(p): who, action = p try: - chibi = eval(f"{who[:3]}_chibi_new") # TODO: Update naming once testing is done + chibi = eval(f"{who}_chibi") except Exception: renpy.error(f"Character chibi not defined: {who}") def predict_chibi(p): who, action = p - chibi = eval(f"{who[:3]}_chibi_new") + chibi = eval(f"{who}_chibi") doll = eval(f"{who}") layers = ( diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 819df722..cf1ebb78 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -1887,7 +1887,7 @@ label gryffindor_match_return: with d3 play sound "sounds/door.ogg" - $ hooch_chibi.move(path=[(790, 450), (610, 445)]) + chibi hooch move (path=[(790, 450), (610, 445)]) pause 1.0 #Hooch enters and walks up behind Snape and Tonks @@ -2578,7 +2578,7 @@ label gryffindor_match_return: $ cho.strip("panties") $ cho.set_cum(None) $ choq_accessory_protectors.zorder = 3 - $ cho.rebuild() + hide screen cho_cloth_pile with d3 pause 0.5 diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index b4d2ef4d..1c22b882 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1210,7 +1210,8 @@ label cho_quid_E12: $ hooch_chibi.zoom = 0.38 $ hooch_chibi.zorder = 4 - $ hooch_chibi.move(path=[(50, 460), (200, 520), (450, 500)]) + + chibi hooch move(path=[(50, 460), (200, 520), (450, 500)]) pause 1.5 call gen_chibi(flip=False) @@ -1303,7 +1304,7 @@ label cho_quid_E12: #Some time later #Hooch comes back holding broom (No dildo) - $ hooch_chibi.move(path=[(450, 500), (200, 520), (50, 460)]) + chibi hooch move (path=[(450, 500), (200, 520), (50, 460)]) hide screen bld1 hide hooch_main @@ -1331,7 +1332,7 @@ label cho_quid_E12: pause 0.5 - $ hooch_chibi.move(path=[(50, 460), (200, 520), (450, 500)]) + chibi hooch move (path=[(50, 460), (200, 520), (450, 500)]) pause 1.0 @@ -1518,7 +1519,7 @@ label cho_quid_E12: $ game.day = 666 $ game.daytime = True $ game.weather = "clear" - $ hooch_chibi.move((450, 500), speed=100) # TODO, fix after chibi changes are merged + chibi hooch place ((450, 500)) camera screens at sepia call room("quidditch_pitch") call cho_chibi("stand", "right", "base", flip=False) diff --git a/game/scripts/doll/chibi.rpy b/game/scripts/doll/chibi.rpy index 993d4b37..2d07e989 100644 --- a/game/scripts/doll/chibi.rpy +++ b/game/scripts/doll/chibi.rpy @@ -359,48 +359,48 @@ init 5 python: init offset = 5 default hooch_chibi = DollChibi(name="hooch", doll=hooch) -default cho_chibi_new = DollChibi(name="cho", doll=cho) -default ton_chibi_new = DollChibi(name="tonks", doll=tonks) +# default cho_chibi_new = DollChibi(name="cho", doll=cho) +# default tonks_chibi_new = DollChibi(name="tonks", doll=tonks) -label chibitest: - chibi tonks register ("stand", 1, (600, 800)) - chibi tonks register ("walk", 8, (600, 800)) - "Rollback block" - $ renpy.block_rollback() +# label chibitest: +# chibi tonks register ("stand", 1, (600, 800)) +# chibi tonks register ("walk", 8, (600, 800)) +# "Rollback block" +# $ renpy.block_rollback() - "repeat 3" - chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], repeat=3) - "loop" - chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True) - "doll synchronisation" - chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False) - ton "Default" ("base", "base", "base", "mid", hair="default") - ton "Angry" ("angry", "narrow", "angry", "mid", hair="angry") - ton "Scared" ("scream", "wide", "worried", "mid", hair="scared") - "End" - hide tonks_chibi - hide tonks_main +# "repeat 3" +# chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], repeat=3) +# "loop" +# chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True) +# "doll synchronisation" +# chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False) +# ton "Default" ("base", "base", "base", "mid", hair="default") +# ton "Angry" ("angry", "narrow", "angry", "mid", hair="angry") +# ton "Scared" ("scream", "wide", "worried", "mid", hair="scared") +# "End" +# hide tonks_chibi +# hide tonks_main - jump main_room_menu +# jump main_room_menu -label chibitest2: - chibi tonks register ("stand", 1, (600, 800)) - chibi tonks register ("walk", 8, (600, 800)) - "Rollback block" - $ renpy.block_rollback() +# label chibitest2: +# chibi tonks register ("stand", 1, (600, 800)) +# chibi tonks register ("walk", 8, (600, 800)) +# "Rollback block" +# $ renpy.block_rollback() - "pos 1" - chibi tonks place (pos=(300,300)) - "pos 2" - chibi tonks place (pos=(400,300)) - "pos 3" - chibi tonks place (pos=(400,400)) - "pos 4" - chibi tonks place (pos=(200,400)) - "pos 5" - chibi tonks place (pos=(600,400)) - "End" - hide tonks_chibi - hide tonks_main +# "pos 1" +# chibi tonks place (pos=(300,300)) +# "pos 2" +# chibi tonks place (pos=(400,300)) +# "pos 3" +# chibi tonks place (pos=(400,400)) +# "pos 4" +# chibi tonks place (pos=(200,400)) +# "pos 5" +# chibi tonks place (pos=(600,400)) +# "End" +# hide tonks_chibi +# hide tonks_main - jump main_room_menu +# jump main_room_menu diff --git a/game/scripts/doll/init.rpy b/game/scripts/doll/init.rpy index 4ffcb044..0045a337 100644 --- a/game/scripts/doll/init.rpy +++ b/game/scripts/doll/init.rpy @@ -16,4 +16,9 @@ init python: char.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid") - config.start_callbacks.append(wardrobe_init) + def chibi_init(): + # TODO: Perhaps it could be automated? + hooch_chibi.register("stand", 1, (600, 800)) + hooch_chibi.register("walk", 8, (600, 800)) + + config.start_callbacks.extend([wardrobe_init, chibi_init]) diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy index aa5cb296..e7846e7d 100644 --- a/game/scripts/gui/say.rpy +++ b/game/scripts/gui/say.rpy @@ -34,16 +34,16 @@ screen say(who, what, side_image=None, icon=None): if not renpy.get_screen("choice"): use invisible_button(action=Function(ui.saybehavior), keysym="dismiss") - if side_image: - add side_image yalign 1.0 yanchor 1.0 zoom 0.5 - else: - add SideImage() - # TODO: While this works, there might be a better way to add effects based on contents of the dialogue. if text_inner_thought(what) and not renpy.showing("cg"): add "fade_gradient" + if side_image: + add side_image yalign 1.0 yanchor 1.0 zoom 0.5 + else: + add SideImage() + window id "window": style gui.theme("say_window") diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy index e7c9cc28..01b8712e 100644 --- a/game/scripts/options.rpy +++ b/game/scripts/options.rpy @@ -98,6 +98,7 @@ define config.has_music = True define config.has_voice = False define config.sound_sample_rate = 48000 define config.main_menu_music = "music/aquarium-by-kevin-macleod.ogg" +define config.fadeout_audio = 1.0 # Transitions define config.enter_transition = f3 diff --git a/game/scripts/utility/common_functions.rpy b/game/scripts/utility/common_functions.rpy index 88b1c42f..43a40f93 100644 --- a/game/scripts/utility/common_functions.rpy +++ b/game/scripts/utility/common_functions.rpy @@ -1,4 +1,4 @@ -init -1 python: +init python early: # Import commonly used python modules import time import datetime diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 3bb137fb..5935f370 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -76,72 +76,8 @@ init python: # For unknown reasons, sometimes version is missing from the save, so we need a fallback current = getattr(renpy.store, "version", latest) - if current <= 1.431: - for i in CHARACTERS: - char = get_character_object(i) - - if isinstance(char.animation, list) and char.animation: - char.animation = char.animation[0] - else: - char.animation = None - - if current <= 1.432: - her_buttplug_small1.type = "buttplug" - her_buttplug_medium1.type = "buttplug" - her_buttplug_large1.type = "buttplug" - - her_buttplug_small1.set_imagepath() - her_buttplug_small1.set_layers() - her_buttplug_medium1.set_imagepath() - her_buttplug_medium1.set_layers() - her_buttplug_large1.set_imagepath() - her_buttplug_large1.set_layers() - - # Need to repeat the fix, because I am a donkey - for i in CHARACTERS: - char = get_character_object(i) - - if isinstance(char.animation, list) and char.animation: - char.animation = char.animation[0] - else: - char.animation = None - - if hasattr(store, "color_favorites"): - for i, col in enumerate(store.color_favorites): - col = Color(tuple(col)) - store.colorpicker.favorites[i] = col - - if current <= 1.433: - ton_robe_auror.color_default = [[40, 40, 41, 255], [244, 230, 236, 255]] - ton_neckwear_beads.color_default = [[45, 45, 48, 255], [244, 230, 236, 255]] - - for i in CHARACTERS: - char = get_character_object(i) - - for c in char.wardrobe_list: - c.set_layers() - - char.rebuild() - - if current <= 1.441: - pass - - if current <= 1.442: - for i in CHARACTERS: - char = get_character_object(i) - - for j in char.wardrobe_list: - j.zlayers = [] - - for j in char.outfits: - for k in j.group: - k.zlayers = [] - - char.rebuild() - - if current <= 1.443: - - fix_return_stack() + # if current <= 1.431: + # # code if current > latest: raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest))