From 30ef2ce65206ba1ac6b55520a50f88bbb0031759 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Mon, 20 Feb 2023 23:42:41 +0000 Subject: [PATCH] Chibis + Tonks chibi Test * Fixed sprite not updating until the next redraw * Fixed sprite flip states (xzoom) * Added Tonks chibi test --- .../stand/0/bodyparts/frame/default/skin.png | 3 + .../chibi/stand/0/clothes/hair/new/0.png | 3 + .../chibi/stand/0/clothes/hair/new/1.png | 3 + .../stand/0/clothes/hair/new/outline.png | 3 + .../chibi/stand/0/clothes/hair/new/skin.png | 3 + .../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 + game/scripts/characters/tonks/common.rpy | 1 + game/scripts/doll/chibi.rpy | 68 ++++++++++++------- 47 files changed, 178 insertions(+), 26 deletions(-) create mode 100644 game/characters/tonks/chibi/stand/0/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/stand/0/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/stand/0/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/stand/0/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/stand/0/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/0/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/0/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/1/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/1/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/2/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/2/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/3/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/3/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/4/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/4/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/5/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/5/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/6/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/6/clothes/hair/new/skin.png create mode 100644 game/characters/tonks/chibi/walk/7/bodyparts/frame/default/skin.png create mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/0.png create mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/1.png create mode 100644 game/characters/tonks/chibi/walk/7/clothes/hair/new/outline.png create mode 100644 game/characters/tonks/chibi/walk/7/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/0/bodyparts/frame/default/skin.png new file mode 100644 index 00000000..58de0f30 --- /dev/null +++ b/game/characters/tonks/chibi/stand/0/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27589c277040028a9a39eda747699df67906c3ed0d6981d05e272c74a148d58e +size 71587 diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/0.png b/game/characters/tonks/chibi/stand/0/clothes/hair/new/0.png new file mode 100644 index 00000000..515ecad8 --- /dev/null +++ b/game/characters/tonks/chibi/stand/0/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636629479987b42e3c5f6ee92ebb492de6fc9415aca0f631fe2719909c7de970 +size 37306 diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/1.png b/game/characters/tonks/chibi/stand/0/clothes/hair/new/1.png new file mode 100644 index 00000000..ea44e392 --- /dev/null +++ b/game/characters/tonks/chibi/stand/0/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f356239b93204935f88efb95e29fe8892451a12b725affb9a3bb28c1b28e809d +size 13014 diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/outline.png b/game/characters/tonks/chibi/stand/0/clothes/hair/new/outline.png new file mode 100644 index 00000000..8157d189 --- /dev/null +++ b/game/characters/tonks/chibi/stand/0/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:666f1dfe9b8d52d5bdec18254cd9bd0c90ac7eb4ef7e3c03b06f944f88d143e3 +size 33633 diff --git a/game/characters/tonks/chibi/stand/0/clothes/hair/new/skin.png b/game/characters/tonks/chibi/stand/0/clothes/hair/new/skin.png new file mode 100644 index 00000000..ab867541 --- /dev/null +++ b/game/characters/tonks/chibi/stand/0/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa54efaf353cab108e7d5387ed59a96760c4ce63feeb888da21776f535e7256c +size 4854 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 new file mode 100644 index 00000000..814b7f3a --- /dev/null +++ b/game/characters/tonks/chibi/walk/0/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..e57e5f91 --- /dev/null +++ b/game/characters/tonks/chibi/walk/0/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..23f166d2 --- /dev/null +++ b/game/characters/tonks/chibi/walk/0/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..b988d831 --- /dev/null +++ b/game/characters/tonks/chibi/walk/0/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..135caaa9 --- /dev/null +++ b/game/characters/tonks/chibi/walk/0/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..432c71e4 --- /dev/null +++ b/game/characters/tonks/chibi/walk/1/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..20c6a0b4 --- /dev/null +++ b/game/characters/tonks/chibi/walk/1/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..113ddc61 --- /dev/null +++ b/game/characters/tonks/chibi/walk/1/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..4d96d937 --- /dev/null +++ b/game/characters/tonks/chibi/walk/1/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..4a1c309c --- /dev/null +++ b/game/characters/tonks/chibi/walk/1/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..56ccb126 --- /dev/null +++ b/game/characters/tonks/chibi/walk/2/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..4515ea99 --- /dev/null +++ b/game/characters/tonks/chibi/walk/2/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..aeac3e0b --- /dev/null +++ b/game/characters/tonks/chibi/walk/2/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..e1a3a525 --- /dev/null +++ b/game/characters/tonks/chibi/walk/2/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..86e56ab5 --- /dev/null +++ b/game/characters/tonks/chibi/walk/2/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..249aee23 --- /dev/null +++ b/game/characters/tonks/chibi/walk/3/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..66d94050 --- /dev/null +++ b/game/characters/tonks/chibi/walk/3/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..7a68bee7 --- /dev/null +++ b/game/characters/tonks/chibi/walk/3/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..44aa3e25 --- /dev/null +++ b/game/characters/tonks/chibi/walk/3/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..449291cc --- /dev/null +++ b/game/characters/tonks/chibi/walk/3/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..814b7f3a --- /dev/null +++ b/game/characters/tonks/chibi/walk/4/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..e57e5f91 --- /dev/null +++ b/game/characters/tonks/chibi/walk/4/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..23f166d2 --- /dev/null +++ b/game/characters/tonks/chibi/walk/4/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..b988d831 --- /dev/null +++ b/game/characters/tonks/chibi/walk/4/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..135caaa9 --- /dev/null +++ b/game/characters/tonks/chibi/walk/4/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..588c7b12 --- /dev/null +++ b/game/characters/tonks/chibi/walk/5/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..b32b8944 --- /dev/null +++ b/game/characters/tonks/chibi/walk/5/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..ff685500 --- /dev/null +++ b/game/characters/tonks/chibi/walk/5/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..42c72a96 --- /dev/null +++ b/game/characters/tonks/chibi/walk/5/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..5b887666 --- /dev/null +++ b/game/characters/tonks/chibi/walk/5/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..da015ee8 --- /dev/null +++ b/game/characters/tonks/chibi/walk/6/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..5650b760 --- /dev/null +++ b/game/characters/tonks/chibi/walk/6/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..d0281bb0 --- /dev/null +++ b/game/characters/tonks/chibi/walk/6/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..bd83d78a --- /dev/null +++ b/game/characters/tonks/chibi/walk/6/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..4d4e6c68 --- /dev/null +++ b/game/characters/tonks/chibi/walk/6/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..e59dac56 --- /dev/null +++ b/game/characters/tonks/chibi/walk/7/bodyparts/frame/default/skin.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..69996371 --- /dev/null +++ b/game/characters/tonks/chibi/walk/7/clothes/hair/new/0.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..567cc60d --- /dev/null +++ b/game/characters/tonks/chibi/walk/7/clothes/hair/new/1.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..cbe140a9 --- /dev/null +++ b/game/characters/tonks/chibi/walk/7/clothes/hair/new/outline.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..ca1e3211 --- /dev/null +++ b/game/characters/tonks/chibi/walk/7/clothes/hair/new/skin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3afb4feba1de1f4a3907c9d27206284a2ef70f64fe1502a4e0cc49cc875daf4f +size 1924400 diff --git a/game/scripts/characters/tonks/common.rpy b/game/scripts/characters/tonks/common.rpy index b18a26a5..4a045c19 100644 --- a/game/scripts/characters/tonks/common.rpy +++ b/game/scripts/characters/tonks/common.rpy @@ -129,6 +129,7 @@ init python: if redraw: tonks.show() + ton_chibi_new.update() if not renpy.in_rollback(): if trans: diff --git a/game/scripts/doll/chibi.rpy b/game/scripts/doll/chibi.rpy index e58bd9d0..fd664aaa 100644 --- a/game/scripts/doll/chibi.rpy +++ b/game/scripts/doll/chibi.rpy @@ -1,5 +1,5 @@ init 5 python: - class DollChibi(renpy.Displayable, DollMethods): + class DollChibi(renpy.Displayable): def __init__(self, name, pose=None, layer="screens", zorder=12, zoom=0.28, *args, **properties): @@ -148,24 +148,7 @@ init 5 python: return self.pose = pose - self.build_animation() - - def stop(self): - # Freezes the animation - path, _, _, _ = self.atl_partial.args - pos = path[-1] - xzoom = 1 if (path[-1] > path[-2]) else -1 - zpos = self.zorder + (1.0 / (pos[1] / config.screen_height)) - - self.pos = pos - self.xzoom = xzoom - - self.atl_time = 0 - self.atl_time_total = 0 - - self.set_pose(self.idle) - transform = Transform(pos=pos, zoom=self.zoom, xzoom=xzoom, anchor=(0.5, 1.0)) - self.show(transform, self.atl_at_list, self.layer, zpos) + self.update() def move(self, path, speed=1.0, pause=True, loop=False, warper="linear", at_list=[], pose="walk", repeat=None, wrap=True, reverse=True): """Makes chibi move""" @@ -248,6 +231,23 @@ init 5 python: return (distances, times) + def stop(self): + # Freezes the animation + path, _, _, _ = self.atl_partial.args + pos = path[-1] + xzoom = -1 if (path[-1] > path[-2]) else 1 + zpos = self.zorder + (1.0 / (pos[1] / config.screen_height)) + + self.pos = pos + self.xzoom = xzoom + + self.atl_time = 0 + self.atl_time_total = 0 + + self.set_pose(self.idle) + transform = Transform(pos=pos, zoom=self.zoom, xzoom=xzoom, anchor=(0.5, 1.0)) + self.show(transform, self.atl_at_list, self.layer, zpos) + def move_atl(self, path, times, loop, warper, trans, st, at): """Animations are time based, so each segment will happen at a specific frame time.""" if self.atl_time_total == 0: @@ -282,7 +282,7 @@ init 5 python: # Adjust X zoom based on target X position # 1 = Facing Right, -1 = Facing Left - trans.xzoom = -1 if (path[current_segment][0] > path[next_segment][0]) else 1 + trans.xzoom = 1 if (path[current_segment][0] > path[next_segment][0]) else -1 self.xzoom = trans.xzoom # Adjust zoom @@ -298,7 +298,7 @@ init 5 python: # TODO: Using zorders is suboptimal and expensive, using 3D staging would be preferable. zpos = self.zorder + (1.0 / (self.pos[1] / config.screen_height)) - renpy.change_zorder(self.layer, self.char.name, zpos) + renpy.change_zorder(self.layer, self.name, zpos) return 0 def show(self, transform, at_list, layer, zorder): @@ -308,7 +308,15 @@ init 5 python: image = At(self, transform) # IMPORTANT: Enable perspective and gl_depth for 3D staging if not renpy.is_init_phase(): - renpy.show(name=self.char.name, what=image, at_list=at_list, layer=layer, zorder=zorder) + renpy.show(name=self.name, what=image, at_list=at_list, layer=layer, zorder=zorder) + + def hide(self): + if not renpy.is_init_phase(): + renpy.hide(name=self.name) + + def update(self): + self.build_animation() + renpy.redraw(self, 0) @property def image(self): @@ -318,17 +326,25 @@ 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) label chibitest: - $ cho_chibi_new.register_pose("stand", 1) - $ cho_chibi_new.register_pose("walk", 8) + $ ton_chibi_new.register_pose("stand", 1) + $ ton_chibi_new.register_pose("walk", 8) "Rollback block" $ renpy.block_rollback() "repeat 3" - $ cho_chibi_new.move(path=[(500, 421), (650, 521), (800, 421)], repeat=3) + $ ton_chibi_new.move(path=[(500, 421), (650, 521), (800, 421)], repeat=3) "loop" - $ cho_chibi_new.move(path=[(500, 421), (650, 521), (800, 421)], loop=True) + $ ton_chibi_new.move(path=[(500, 421), (650, 521), (800, 421)], loop=True) + "doll synchronisation" + $ ton_chibi_new.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" + $ ton_chibi_new.hide() + hide tonks_main jump main_room_menu