From 73fa9f6b8699b459fa10b3bb5fc8ce710473ec8f Mon Sep 17 00:00:00 2001 From: Giuseppe Gadola Date: Wed, 8 Mar 2023 09:35:05 +0100 Subject: feat(pets): new slime animation --- README.md | 6 +++++- lua/pets/pets/slime.lua | 9 +++++---- media/slime/green/split_idle/0.png | Bin 468 -> 465 bytes media/slime/green/split_idle/1.png | Bin 459 -> 464 bytes media/slime/green/split_idle/2.png | Bin 464 -> 465 bytes media/slime/green/split_idle/3.png | Bin 473 -> 466 bytes media/slime/green/split_idle/4.png | Bin 475 -> 465 bytes media/slime/green/split_idle/5.png | Bin 470 -> 0 bytes media/slime/green/split_idle/6.png | Bin 457 -> 0 bytes media/slime/green/split_idle/7.png | Bin 454 -> 0 bytes media/slime/green/split_swap/0.png | Bin 0 -> 470 bytes media/slime/green/split_swap/1.png | Bin 0 -> 474 bytes media/slime/green/split_swap/2.png | Bin 0 -> 485 bytes media/slime/green/split_swap/3.png | Bin 0 -> 490 bytes media/slime/green/split_swap/4.png | Bin 0 -> 494 bytes media/slime/green/split_swap/5.png | Bin 0 -> 491 bytes media/slime/green/split_swap/6.png | Bin 0 -> 492 bytes media/slime/green/split_swap/7.png | Bin 0 -> 495 bytes media/slime/green/split_swap/8.png | Bin 0 -> 485 bytes media/slime/green/split_swap/9.png | Bin 0 -> 478 bytes 20 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 media/slime/green/split_idle/5.png delete mode 100644 media/slime/green/split_idle/6.png delete mode 100644 media/slime/green/split_idle/7.png create mode 100644 media/slime/green/split_swap/0.png create mode 100644 media/slime/green/split_swap/1.png create mode 100644 media/slime/green/split_swap/2.png create mode 100644 media/slime/green/split_swap/3.png create mode 100644 media/slime/green/split_swap/4.png create mode 100644 media/slime/green/split_swap/5.png create mode 100644 media/slime/green/split_swap/6.png create mode 100644 media/slime/green/split_swap/7.png create mode 100644 media/slime/green/split_swap/8.png create mode 100644 media/slime/green/split_swap/9.png diff --git a/README.md b/README.md index 1df5990..7feddf4 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This is the default configuration: default_pet = "dog", -- the pet to use for the PetNew command default_style = "brown", -- the style of the pet to use for the PetNew command random = true, -- wether to use a random pet for the PetNew command, ovverides default_pet and default_style - -- death_animation = true, -- animate the pet's death, set to false to feel less guilt -- currently no animations are available + death_animation = true, -- animate the pet's death, set to false to feel less guilt -- currently no animations are available popup = { -- popup options, try changing these if you see a rectangle around the pets width = "30%", -- can be a string with percentage like "45%" or a number of columns like 45 winblend = 100, -- winblend value - see :h 'winblend' - only used if avoid_statusline is false @@ -77,6 +77,9 @@ This is the default configuration: - black - gray - beige +- slime: + - green + - pink (WIP) ## 📑 Usage - commands @@ -102,6 +105,7 @@ and shares all of its limitations. Here are the most significant ones: - The dog assets were created by [NVPH Studio](https://nvph-studio.itch.io/dog-animation-4-different-dogs). All the details about the license can be found [here](https://creativecommons.org/licenses/by-nd/4.0/#). +- The slime was created by me (for now it follows the MIT license):) - The old cat assets were designed by [SeethingSwarm](https://seethingswarm.itch.io/catset). diff --git a/lua/pets/pets/slime.lua b/lua/pets/pets/slime.lua index 794056f..da86c0d 100644 --- a/lua/pets/pets/slime.lua +++ b/lua/pets/pets/slime.lua @@ -3,13 +3,14 @@ return { idle_blink = { "idle_blink", "idle_wobble", "walk", "walk_left", "run", "run_left" }, idle_wobble = { "idle_wobble", "idle_blink", "walk", "walk_left", "run", "run_left", "divide" }, walk = { "walk", "idle_blink", "run" }, - run = { "run", "walk", "run_left", "idle_wobble" }, + run = { "run", "walk", "run_left", "idle_wobble", "divide" }, walk_left = { "walk_left", "run_left", "idle_blink", "idle_wobble" }, - run_left = { "run_left", "walk_left", "run", "idle_wobble" }, + run_left = { "run_left", "walk_left", "run", "idle_wobble", "divide" }, -- divide = { "split_walk", "split_idle" }, - split_walk = { "split_walk", "split_idle", "join" }, - split_idle = { "split_idle", "split_walk" }, + split_walk = { "split_walk", "split_idle", "split_swap", "join" }, + split_idle = { "split_idle", "split_walk", "split_swap" }, + split_swap = { "split_walk", "split_idle", "join" }, join = { "idle_wobble" }, }, idle_actions = { "idle_wobble", "idle_blink" }, diff --git a/media/slime/green/split_idle/0.png b/media/slime/green/split_idle/0.png index 638aac6..20f8c88 100644 Binary files a/media/slime/green/split_idle/0.png and b/media/slime/green/split_idle/0.png differ diff --git a/media/slime/green/split_idle/1.png b/media/slime/green/split_idle/1.png index d3e259d..bc67fc7 100644 Binary files a/media/slime/green/split_idle/1.png and b/media/slime/green/split_idle/1.png differ diff --git a/media/slime/green/split_idle/2.png b/media/slime/green/split_idle/2.png index 43056fb..e193640 100644 Binary files a/media/slime/green/split_idle/2.png and b/media/slime/green/split_idle/2.png differ diff --git a/media/slime/green/split_idle/3.png b/media/slime/green/split_idle/3.png index 8c23bc6..1ec6b9f 100644 Binary files a/media/slime/green/split_idle/3.png and b/media/slime/green/split_idle/3.png differ diff --git a/media/slime/green/split_idle/4.png b/media/slime/green/split_idle/4.png index 35d01aa..20f8c88 100644 Binary files a/media/slime/green/split_idle/4.png and b/media/slime/green/split_idle/4.png differ diff --git a/media/slime/green/split_idle/5.png b/media/slime/green/split_idle/5.png deleted file mode 100644 index 97cf847..0000000 Binary files a/media/slime/green/split_idle/5.png and /dev/null differ diff --git a/media/slime/green/split_idle/6.png b/media/slime/green/split_idle/6.png deleted file mode 100644 index b2f5866..0000000 Binary files a/media/slime/green/split_idle/6.png and /dev/null differ diff --git a/media/slime/green/split_idle/7.png b/media/slime/green/split_idle/7.png deleted file mode 100644 index 3ef96dd..0000000 Binary files a/media/slime/green/split_idle/7.png and /dev/null differ diff --git a/media/slime/green/split_swap/0.png b/media/slime/green/split_swap/0.png new file mode 100644 index 0000000..c9d2f62 Binary files /dev/null and b/media/slime/green/split_swap/0.png differ diff --git a/media/slime/green/split_swap/1.png b/media/slime/green/split_swap/1.png new file mode 100644 index 0000000..075913c Binary files /dev/null and b/media/slime/green/split_swap/1.png differ diff --git a/media/slime/green/split_swap/2.png b/media/slime/green/split_swap/2.png new file mode 100644 index 0000000..f135466 Binary files /dev/null and b/media/slime/green/split_swap/2.png differ diff --git a/media/slime/green/split_swap/3.png b/media/slime/green/split_swap/3.png new file mode 100644 index 0000000..8807608 Binary files /dev/null and b/media/slime/green/split_swap/3.png differ diff --git a/media/slime/green/split_swap/4.png b/media/slime/green/split_swap/4.png new file mode 100644 index 0000000..0f3f57a Binary files /dev/null and b/media/slime/green/split_swap/4.png differ diff --git a/media/slime/green/split_swap/5.png b/media/slime/green/split_swap/5.png new file mode 100644 index 0000000..63867f4 Binary files /dev/null and b/media/slime/green/split_swap/5.png differ diff --git a/media/slime/green/split_swap/6.png b/media/slime/green/split_swap/6.png new file mode 100644 index 0000000..86dab79 Binary files /dev/null and b/media/slime/green/split_swap/6.png differ diff --git a/media/slime/green/split_swap/7.png b/media/slime/green/split_swap/7.png new file mode 100644 index 0000000..cdafbaa Binary files /dev/null and b/media/slime/green/split_swap/7.png differ diff --git a/media/slime/green/split_swap/8.png b/media/slime/green/split_swap/8.png new file mode 100644 index 0000000..afe6591 Binary files /dev/null and b/media/slime/green/split_swap/8.png differ diff --git a/media/slime/green/split_swap/9.png b/media/slime/green/split_swap/9.png new file mode 100644 index 0000000..4c68851 Binary files /dev/null and b/media/slime/green/split_swap/9.png differ -- cgit v1.3-2-g11bf