From a7206bbb404186e8f02f4cd3f0601656ff212f85 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 21 Feb 2023 20:33:04 +0000 Subject: [PATCH] Sprite sheets * Implemented sprite sheets for chibis * Reduced computational cost for chibi animations * Simplified IO and prediction --- .../{0 => }/bodyparts/frame/default/skin.png | 0 .../stand/{0 => }/clothes/hair/new/0.png | 0 .../stand/{0 => }/clothes/hair/new/1.png | 0 .../{0 => }/clothes/hair/new/outline.png | 0 .../stand/{0 => }/clothes/hair/new/skin.png | 0 .../walk/0/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/0/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/0/clothes/hair/new/1.png | 3 - .../chibi/walk/0/clothes/hair/new/outline.png | 3 - .../chibi/walk/0/clothes/hair/new/skin.png | 3 - .../walk/1/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/1/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/1/clothes/hair/new/1.png | 3 - .../chibi/walk/1/clothes/hair/new/outline.png | 3 - .../chibi/walk/1/clothes/hair/new/skin.png | 3 - .../walk/2/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/2/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/2/clothes/hair/new/1.png | 3 - .../chibi/walk/2/clothes/hair/new/outline.png | 3 - .../chibi/walk/2/clothes/hair/new/skin.png | 3 - .../walk/3/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/3/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/3/clothes/hair/new/1.png | 3 - .../chibi/walk/3/clothes/hair/new/outline.png | 3 - .../chibi/walk/3/clothes/hair/new/skin.png | 3 - .../walk/4/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/4/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/4/clothes/hair/new/1.png | 3 - .../chibi/walk/4/clothes/hair/new/outline.png | 3 - .../chibi/walk/4/clothes/hair/new/skin.png | 3 - .../walk/5/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/5/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/5/clothes/hair/new/1.png | 3 - .../chibi/walk/5/clothes/hair/new/outline.png | 3 - .../chibi/walk/5/clothes/hair/new/skin.png | 3 - .../walk/6/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/6/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/6/clothes/hair/new/1.png | 3 - .../chibi/walk/6/clothes/hair/new/outline.png | 3 - .../chibi/walk/6/clothes/hair/new/skin.png | 3 - .../walk/7/bodyparts/frame/default/skin.png | 3 - .../tonks/chibi/walk/7/clothes/hair/new/0.png | 3 - .../tonks/chibi/walk/7/clothes/hair/new/1.png | 3 - .../chibi/walk/7/clothes/hair/new/outline.png | 3 - .../chibi/walk/7/clothes/hair/new/skin.png | 3 - .../walk/bodyparts/frame/default/skin.png | 3 + .../tonks/chibi/walk/clothes/hair/new/0.png | 3 + .../tonks/chibi/walk/clothes/hair/new/1.png | 3 + .../chibi/walk/clothes/hair/new/outline.png | 3 + .../chibi/walk/clothes/hair/new/skin.png | 3 + game/scripts/cds.rpy | 5 +- game/scripts/doll/chibi.rpy | 97 ++++++++++++------- 52 files changed, 79 insertions(+), 158 deletions(-) rename game/characters/tonks/chibi/stand/{0 => }/bodyparts/frame/default/skin.png (100%) rename game/characters/tonks/chibi/stand/{0 => }/clothes/hair/new/0.png (100%) rename game/characters/tonks/chibi/stand/{0 => }/clothes/hair/new/1.png (100%) rename game/characters/tonks/chibi/stand/{0 => }/clothes/hair/new/outline.png (100%) rename game/characters/tonks/chibi/stand/{0 => }/clothes/hair/new/skin.png (100%) delete mode 100644 game/characters/tonks/chibi/walk/0/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/1/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/2/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/3/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/4/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/5/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/6/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/skin.png delete mode 100644 game/characters/tonks/chibi/walk/7/bodyparts/frame/default/skin.png delete mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/0.png delete mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/1.png delete mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/outline.png delete mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/clothes/hair/new/skin.png diff --git a/game/characters/tonks/chibi/stand/0/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/stand/bodyparts/frame/default/skin.png similarity index 100% rename from game/characters/tonks/chibi/stand/0/bodyparts/frame/default/skin.png rename to game/characters/tonks/chibi/stand/bodyparts/frame/default/skin.png diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/0.png b/game/characters/tonks/chibi/stand/clothes/hair/new/0.png similarity index 100% rename from game/characters/tonks/chibi/stand/0/clothes/hair/new/0.png rename to game/characters/tonks/chibi/stand/clothes/hair/new/0.png diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/1.png b/game/characters/tonks/chibi/stand/clothes/hair/new/1.png similarity index 100% rename from game/characters/tonks/chibi/stand/0/clothes/hair/new/1.png rename to game/characters/tonks/chibi/stand/clothes/hair/new/1.png diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/outline.png b/game/characters/tonks/chibi/stand/clothes/hair/new/outline.png similarity index 100% rename from game/characters/tonks/chibi/stand/0/clothes/hair/new/outline.png rename to game/characters/tonks/chibi/stand/clothes/hair/new/outline.png diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/skin.png b/game/characters/tonks/chibi/stand/clothes/hair/new/skin.png similarity index 100% rename from game/characters/tonks/chibi/stand/0/clothes/hair/new/skin.png rename to game/characters/tonks/chibi/stand/clothes/hair/new/skin.png diff --git a/game/characters/tonks/chibi/walk/0/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/0/bodyparts/frame/default/skin.png deleted file mode 100644 index 814b7f3a..00000000 --- a/game/characters/tonks/chibi/walk/0/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a7733c7a579a350924bf0f49914c41d1df4c16d15e8175a82de1aa4a0812146 -size 72202 diff --git a/game/characters/tonks/chibi/walk/0/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/0/clothes/hair/new/0.png deleted file mode 100644 index e57e5f91..00000000 --- a/game/characters/tonks/chibi/walk/0/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6eb13d8ad2b64282fbd35dec6bf34801a79df9f238fb612afc3b4e00d23d1aea -size 36257 diff --git a/game/characters/tonks/chibi/walk/0/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/0/clothes/hair/new/1.png deleted file mode 100644 index 23f166d2..00000000 --- a/game/characters/tonks/chibi/walk/0/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c157f0168db131719367ef0d998719c081aa3bff47ae3f960a5fd765fc0afc4b -size 12940 diff --git a/game/characters/tonks/chibi/walk/0/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/0/clothes/hair/new/outline.png deleted file mode 100644 index b988d831..00000000 --- a/game/characters/tonks/chibi/walk/0/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2362c66f4a319aca05620a3b1c72a261277a73f36e264b98ba4048f160d72cd -size 33687 diff --git a/game/characters/tonks/chibi/walk/0/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/0/clothes/hair/new/skin.png deleted file mode 100644 index 135caaa9..00000000 --- a/game/characters/tonks/chibi/walk/0/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:266d023733b2cc7d1861742b13d5be75ec822a156490d48640bd7f45167e4f7e -size 4757 diff --git a/game/characters/tonks/chibi/walk/1/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/1/bodyparts/frame/default/skin.png deleted file mode 100644 index 432c71e4..00000000 --- a/game/characters/tonks/chibi/walk/1/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64b454fd60daf6c13a63fdc4a2d0ccd725e64dcd5cf946e64c64a03b1ac79321 -size 73302 diff --git a/game/characters/tonks/chibi/walk/1/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/1/clothes/hair/new/0.png deleted file mode 100644 index 20c6a0b4..00000000 --- a/game/characters/tonks/chibi/walk/1/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:213de270d3a77c829858d66c2f971949e77a7f8fca6431adcedd0922e4b8c18d -size 36413 diff --git a/game/characters/tonks/chibi/walk/1/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/1/clothes/hair/new/1.png deleted file mode 100644 index 113ddc61..00000000 --- a/game/characters/tonks/chibi/walk/1/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fb57f4bf3183b5d6862019d9fdb69f4768448427d5b14774474cc08357e29c1 -size 12918 diff --git a/game/characters/tonks/chibi/walk/1/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/1/clothes/hair/new/outline.png deleted file mode 100644 index 4d96d937..00000000 --- a/game/characters/tonks/chibi/walk/1/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b96a9bc5f7beed1463cbeb334f75f8517959fbe748f6fb415696c9a1308cbb99 -size 33635 diff --git a/game/characters/tonks/chibi/walk/1/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/1/clothes/hair/new/skin.png deleted file mode 100644 index 4a1c309c..00000000 --- a/game/characters/tonks/chibi/walk/1/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e064e95d86b9a84c18f907a8422335a01c0007c3133cd05bb8d75c86b5acee6 -size 4720 diff --git a/game/characters/tonks/chibi/walk/2/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/2/bodyparts/frame/default/skin.png deleted file mode 100644 index 56ccb126..00000000 --- a/game/characters/tonks/chibi/walk/2/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89e021f795a29578cc37f26ed8e3d2992b6cda6cbcd2caaa154870e91e8cf8bf -size 73289 diff --git a/game/characters/tonks/chibi/walk/2/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/2/clothes/hair/new/0.png deleted file mode 100644 index 4515ea99..00000000 --- a/game/characters/tonks/chibi/walk/2/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9b7b5c0de9cdaab6dafe700a6991045d983c4ee22867f91687732206ea498ff -size 35736 diff --git a/game/characters/tonks/chibi/walk/2/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/2/clothes/hair/new/1.png deleted file mode 100644 index aeac3e0b..00000000 --- a/game/characters/tonks/chibi/walk/2/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd1d5d7c8758d5f66c5babd4a8e929aeb2214e6d2d0bda09632c7639af4c4973 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/2/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/2/clothes/hair/new/outline.png deleted file mode 100644 index e1a3a525..00000000 --- a/game/characters/tonks/chibi/walk/2/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6349772b2aee8699b08d93ddf2ca53e8c0217ae067143210355c460dc3372394 -size 25912 diff --git a/game/characters/tonks/chibi/walk/2/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/2/clothes/hair/new/skin.png deleted file mode 100644 index 86e56ab5..00000000 --- a/game/characters/tonks/chibi/walk/2/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34ca4d77c067dd267099ce42262eb66b135be51b21361f2362f7790591d4cecd -size 1924400 diff --git a/game/characters/tonks/chibi/walk/3/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/3/bodyparts/frame/default/skin.png deleted file mode 100644 index 249aee23..00000000 --- a/game/characters/tonks/chibi/walk/3/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46402291088604e9b7d952dedf725e70618d9e4e0e64c1c8e3cd0dc9bc4be640 -size 72088 diff --git a/game/characters/tonks/chibi/walk/3/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/3/clothes/hair/new/0.png deleted file mode 100644 index 66d94050..00000000 --- a/game/characters/tonks/chibi/walk/3/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49a3e9a69549c09833df409476e0ec27f4686a0d13b66e5ca22474163c041649 -size 35903 diff --git a/game/characters/tonks/chibi/walk/3/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/3/clothes/hair/new/1.png deleted file mode 100644 index 7a68bee7..00000000 --- a/game/characters/tonks/chibi/walk/3/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9217bc9fc791408586a63264a541faafe51c01969aeda58eafbec94e75180703 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/3/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/3/clothes/hair/new/outline.png deleted file mode 100644 index 44aa3e25..00000000 --- a/game/characters/tonks/chibi/walk/3/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20a4b1d281c9baf576eb9e5c847e5622a7a7b46fa9408d81de0183d8a5ebd99e -size 1924400 diff --git a/game/characters/tonks/chibi/walk/3/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/3/clothes/hair/new/skin.png deleted file mode 100644 index 449291cc..00000000 --- a/game/characters/tonks/chibi/walk/3/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dee4d6e304bcaec62282676d53c82034ce11585f85d6a602bff981e05db5725 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/4/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/4/bodyparts/frame/default/skin.png deleted file mode 100644 index 814b7f3a..00000000 --- a/game/characters/tonks/chibi/walk/4/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a7733c7a579a350924bf0f49914c41d1df4c16d15e8175a82de1aa4a0812146 -size 72202 diff --git a/game/characters/tonks/chibi/walk/4/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/4/clothes/hair/new/0.png deleted file mode 100644 index e57e5f91..00000000 --- a/game/characters/tonks/chibi/walk/4/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6eb13d8ad2b64282fbd35dec6bf34801a79df9f238fb612afc3b4e00d23d1aea -size 36257 diff --git a/game/characters/tonks/chibi/walk/4/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/4/clothes/hair/new/1.png deleted file mode 100644 index 23f166d2..00000000 --- a/game/characters/tonks/chibi/walk/4/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c157f0168db131719367ef0d998719c081aa3bff47ae3f960a5fd765fc0afc4b -size 12940 diff --git a/game/characters/tonks/chibi/walk/4/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/4/clothes/hair/new/outline.png deleted file mode 100644 index b988d831..00000000 --- a/game/characters/tonks/chibi/walk/4/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2362c66f4a319aca05620a3b1c72a261277a73f36e264b98ba4048f160d72cd -size 33687 diff --git a/game/characters/tonks/chibi/walk/4/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/4/clothes/hair/new/skin.png deleted file mode 100644 index 135caaa9..00000000 --- a/game/characters/tonks/chibi/walk/4/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:266d023733b2cc7d1861742b13d5be75ec822a156490d48640bd7f45167e4f7e -size 4757 diff --git a/game/characters/tonks/chibi/walk/5/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/5/bodyparts/frame/default/skin.png deleted file mode 100644 index 588c7b12..00000000 --- a/game/characters/tonks/chibi/walk/5/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8db234ffb3a26258e1aef1afa7ee08d3be2645df6f0bf8e205078fa1a9958085 -size 73045 diff --git a/game/characters/tonks/chibi/walk/5/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/5/clothes/hair/new/0.png deleted file mode 100644 index b32b8944..00000000 --- a/game/characters/tonks/chibi/walk/5/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29b44ef94e483b5087579d2433a2fbbdded6fdafb83d7b6978645b226a5eb024 -size 35688 diff --git a/game/characters/tonks/chibi/walk/5/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/5/clothes/hair/new/1.png deleted file mode 100644 index ff685500..00000000 --- a/game/characters/tonks/chibi/walk/5/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5d57f7d56a4a9a9053233c27713b512f8dba60311bc39a02588a559d14a5c55 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/5/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/5/clothes/hair/new/outline.png deleted file mode 100644 index 42c72a96..00000000 --- a/game/characters/tonks/chibi/walk/5/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e08d9970da7613f3946260f1e3bb05506e07f54754fb9a1d384118a3196f8c07 -size 25933 diff --git a/game/characters/tonks/chibi/walk/5/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/5/clothes/hair/new/skin.png deleted file mode 100644 index 5b887666..00000000 --- a/game/characters/tonks/chibi/walk/5/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:750b8bbf333ddd5405de7fb1d744c7762bfd15129cc14fc7418a0bdebb9c9050 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/6/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/6/bodyparts/frame/default/skin.png deleted file mode 100644 index da015ee8..00000000 --- a/game/characters/tonks/chibi/walk/6/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12a2dfe62c2ea4c5039d8cd5de5bc8e4259465e6b6696c7be9ce7fbddccc83cb -size 75232 diff --git a/game/characters/tonks/chibi/walk/6/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/6/clothes/hair/new/0.png deleted file mode 100644 index 5650b760..00000000 --- a/game/characters/tonks/chibi/walk/6/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e208aa10cefb4e6fb7db1f658f07f2e486f85bc66dcfab7542748a4b779d9bec -size 35907 diff --git a/game/characters/tonks/chibi/walk/6/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/6/clothes/hair/new/1.png deleted file mode 100644 index d0281bb0..00000000 --- a/game/characters/tonks/chibi/walk/6/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59aa3014f5a17ff7389d0a1f55b4d23cdf6b776ed8b95f4f32c788d4ab505754 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/6/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/6/clothes/hair/new/outline.png deleted file mode 100644 index bd83d78a..00000000 --- a/game/characters/tonks/chibi/walk/6/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03e888efe09cbc623d45aa7b2eaed4e2509126f6698d8342545c6825b8d6a79c -size 25919 diff --git a/game/characters/tonks/chibi/walk/6/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/6/clothes/hair/new/skin.png deleted file mode 100644 index 4d4e6c68..00000000 --- a/game/characters/tonks/chibi/walk/6/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e6b48f3155d13a5107b3ec16b9e307d9c95660d55c10327cb1a974806367296 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/7/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/7/bodyparts/frame/default/skin.png deleted file mode 100644 index e59dac56..00000000 --- a/game/characters/tonks/chibi/walk/7/bodyparts/frame/default/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98d0cd8ee76048fd6cb12c0284eca578f16b3e00a9cc63deb16b0eb4fa5dc1f1 -size 72405 diff --git a/game/characters/tonks/chibi/walk/7/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/7/clothes/hair/new/0.png deleted file mode 100644 index 69996371..00000000 --- a/game/characters/tonks/chibi/walk/7/clothes/hair/new/0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c2d46662bfe1f0af72e36ee1b0f8fd7dcc80cf52c27fcf037f65c84e452806f -size 36001 diff --git a/game/characters/tonks/chibi/walk/7/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/7/clothes/hair/new/1.png deleted file mode 100644 index 567cc60d..00000000 --- a/game/characters/tonks/chibi/walk/7/clothes/hair/new/1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3ffa5b625a81ac1a1004c990a524bf048cc1f008862a346f1be4ddd4f7e8d42 -size 1924400 diff --git a/game/characters/tonks/chibi/walk/7/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/7/clothes/hair/new/outline.png deleted file mode 100644 index cbe140a9..00000000 --- a/game/characters/tonks/chibi/walk/7/clothes/hair/new/outline.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7653c111da7b2f5e766c64d7310f86a3d2af7b97c412c7b703018b8768bf08e -size 1924400 diff --git a/game/characters/tonks/chibi/walk/7/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/7/clothes/hair/new/skin.png deleted file mode 100644 index ca1e3211..00000000 --- a/game/characters/tonks/chibi/walk/7/clothes/hair/new/skin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3afb4feba1de1f4a3907c9d27206284a2ef70f64fe1502a4e0cc49cc875daf4f -size 1924400 diff --git a/game/characters/tonks/chibi/walk/bodyparts/frame/default/skin.png b/game/characters/tonks/chibi/walk/bodyparts/frame/default/skin.png new file mode 100644 index 00000000..bb5ce74b --- /dev/null +++ b/game/characters/tonks/chibi/walk/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2bf4fc699a80fb03e24c2cbbb70e0ec5fc1a08a86450ffaf15168236058aa90 +size 393902 diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/0.png b/game/characters/tonks/chibi/walk/clothes/hair/new/0.png new file mode 100644 index 00000000..7de28bc8 --- /dev/null +++ b/game/characters/tonks/chibi/walk/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:565ac48216f2e958eb36329fdd1774a46edc304eeb638c8a716e56c81a4115fb +size 182537 diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/1.png b/game/characters/tonks/chibi/walk/clothes/hair/new/1.png new file mode 100644 index 00000000..7cd0ef37 --- /dev/null +++ b/game/characters/tonks/chibi/walk/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:101e6e4a9a2edaeb86e8c020c64a8ba45b85f0fc13362d746c323b8f93843212 +size 36964 diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/outline.png b/game/characters/tonks/chibi/walk/clothes/hair/new/outline.png new file mode 100644 index 00000000..bf8c8f80 --- /dev/null +++ b/game/characters/tonks/chibi/walk/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01d025014ce087b9bb7a0fcb96d0d8fe7b9957f6dc7957f2646d4288638346b7 +size 88175 diff --git a/game/characters/tonks/chibi/walk/clothes/hair/new/skin.png b/game/characters/tonks/chibi/walk/clothes/hair/new/skin.png new file mode 100644 index 00000000..287277fd --- /dev/null +++ b/game/characters/tonks/chibi/walk/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60fd1988dda1c7dbdc780f2348d13d5c39b2a4c57573a2ab1f80c016dac6f5fd +size 22667 diff --git a/game/scripts/cds.rpy b/game/scripts/cds.rpy index 6dd98103..bd794296 100644 --- a/game/scripts/cds.rpy +++ b/game/scripts/cds.rpy @@ -26,10 +26,9 @@ python early: doll = eval(f"{who}") layers = ( - l[0] for pose, i in chibi.poses.items() - for j in range(i) + l[0] for pose in chibi.poses.keys() for k in doll.states.values() if k[0] and k[2] - for l in k[0].get_layers(k[0]._hash, subpath=posixpath.join("chibi", pose, str(j))).values() + for l in k[0].get_layers(k[0]._hash, subpath=posixpath.join("chibi", pose)).values() ) return layers diff --git a/game/scripts/doll/chibi.rpy b/game/scripts/doll/chibi.rpy index c4ee7983..a3077b2d 100644 --- a/game/scripts/doll/chibi.rpy +++ b/game/scripts/doll/chibi.rpy @@ -3,7 +3,7 @@ init 5 python: def __init__(self, name, pose=None, layer="screens", zorder=12, zoom=0.28, *args, **properties): - super(DollChibi, self).__init__(**properties) + super().__init__(**properties) self.name = name self.tag = name + "_chibi" @@ -21,8 +21,7 @@ init 5 python: # Animation self.anim_frames = None - self.anim_sprites = None - self.anim_prev_sprites = None + self.anim_sprite = None self.anim_speed = 1.0 self.anim_fps = 8.0 self.anim_trans = None @@ -37,21 +36,18 @@ init 5 python: self.atl_pause = False self.atl_at_list = [] - def register_pose(self, pose, frames): - self.poses[pose] = frames + def register_pose(self, pose, frames, size): + self.poses[pose] = (frames, size) print(f"Registered \"{pose}\" pose for {self.name}") @functools.cache - def build_image(self, hash, pose, frame): + def build_image(self, hash, pose): states = self.char.states items = [v[0] for v in states.values() if v[0] and v[2]] + subpath = posixpath.join("chibi", pose) - sprites = [] - for i in items: - subpath = posixpath.join("chibi", pose, str(frame)) - sprites.extend(i.build_image(i._hash, subpath)) - - masks = [sprites.pop(sprites.index(x)) for x in sprites if x[0] == "mask"] + sprites = [(ltype, img, z) for i in items for ltype, img, z in i.build_image(i._hash, subpath)] + masks = [sprites.pop(sprites.index(i)) for i in sprites if i[0] == "mask"] sprites.sort(key=itemgetter(2)) masks.sort(key=itemgetter(2)) @@ -79,8 +75,8 @@ init 5 python: def build_animation(self): pose = self.pose - frames = self.poses[pose] - sprites = [self.build_image(self.char._hash, pose, i) for i in range(frames)] + frames = self.poses[pose][0] + sprite = self.build_image(self.char._hash, pose) if frames > 1: interval = self.anim_speed / self.anim_fps @@ -90,37 +86,68 @@ init 5 python: self.anim_frames = frames self.anim_interval = interval self.anim_interval_total = (frames * interval) - self.anim_sprites = sprites - self.anim_prev_sprites = [ sprites[-1] ] + sprites[:-1] + self.anim_sprite = sprite def render(self, width, height, st, at): + frame_width, frame_height = self.poses[self.pose][1] - # Animation Renderer - t = st % self.anim_interval_total - + # Calculate the current frame based on the time trans = self.anim_trans interval = self.anim_interval + time = (st % self.anim_interval_total) + frame = int(time / interval) + sprite = self.anim_sprite + + if trans and st >= interval: + sprite = trans(old_widget=sprite, new_widget=sprite) + + cr = renpy.render(self.anim_sprite, width, height, st, at) + sheet_width, sheet_height = cr.get_size() + + # Calculate the position of the current frame within the sprite sheet + sheet_cols = sheet_width / frame_width + sheet_row = int(frame / sheet_cols) + sheet_col = frame % sheet_cols + frame_x = sheet_col * frame_width + frame_y = sheet_row * frame_height + + rv = renpy.Render(frame_width, frame_height) + rv.blit(cr.subsurface((frame_x, frame_y, frame_width, frame_height)), (0, 0)) - # Trigger event after animation time elapses if st > self.atl_time_total: renpy.timeout(0) + elif not renpy.game.less_updates: + renpy.redraw(self, interval - time) - for image, prev in zip(self.anim_sprites, self.anim_prev_sprites): - if t < interval: - if not renpy.game.less_updates: - renpy.redraw(self, interval - t) + return rv - if trans and st >= interval: - image = trans(old_widget=prev, new_widget=image) + # # Animation Renderer + # t = st % self.anim_interval_total - im = renpy.render(image, width, height, t, at) - width, height = im.get_size() - rv = renpy.Render(width, height) - rv.blit(im, (0, 0)) + # trans = self.anim_trans + # interval = self.anim_interval - return rv - else: - t = t - interval + # # Trigger event after animation time elapses + # if st > self.atl_time_total: + # renpy.timeout(0) + + # for curr_image, prev_image in zip(self.anim_sprites, self.anim_prev_sprites): + # if t < interval: + # if not renpy.game.less_updates: + # renpy.redraw(self, interval - t) + + # if trans and st >= interval: + # curr_image = trans(old_widget=prev_image, new_widget=curr_image) + + # im = renpy.render(curr_image, width, height, t, at) + # width, height = im.get_size() + # rv = renpy.Render(width, height) + # rv.blit(im, (0, 0)) + + # return rv + # else: + # t = t - interval + # return rv def event(self, ev, x, y, st): # Determine pose change if show time exceeds animation time. @@ -330,8 +357,8 @@ default cho_chibi_new = DollChibi(name="cho", doll=cho) default ton_chibi_new = DollChibi(name="tonks", doll=tonks) label chibitest: - chibi tonks register_pose ("stand", 1) - chibi tonks register_pose ("walk", 8) + chibi tonks register_pose ("stand", 1, (600, 800)) + chibi tonks register_pose ("walk", 8, (600, 800)) "Rollback block" $ renpy.block_rollback()