From c43827d203d0a659ee868215d1a7d8b0da305d02 Mon Sep 17 00:00:00 2001 From: Adrien Burgun Date: Sat, 30 Jul 2022 14:37:27 +0200 Subject: [PATCH] :bug: Fix infinite recursion with `parent.xyz` --- species/blobamber/assets/base.svg | 61 +++++++++++++++++++ species/blobamber/species.toml | 2 + .../blobamber/templates/body-basic.mustache | 15 +++++ species/blobamber/templates/eyes.mustache | 3 + species/blobamber/templates/hands.mustache | 16 +++++ species/blobcat/assets/base.svg | 40 ++++++------ species/blobcat/templates/hand-boop.mustache | 2 +- species/blobcat/templates/hands.mustache | 2 +- species/blobcat/templates/mouth.mustache | 2 +- species/blobcat/templates/nose.mustache | 6 +- species/blobcat/templates/tail.mustache | 2 +- src/template.rs | 54 +++++++++++----- vector/blobcat.svg | 16 ++--- 13 files changed, 170 insertions(+), 51 deletions(-) create mode 100644 species/blobamber/assets/base.svg create mode 100644 species/blobamber/species.toml create mode 100644 species/blobamber/templates/body-basic.mustache create mode 100644 species/blobamber/templates/eyes.mustache create mode 100644 species/blobamber/templates/hands.mustache diff --git a/species/blobamber/assets/base.svg b/species/blobamber/assets/base.svg new file mode 100644 index 0000000..0dae62e --- /dev/null +++ b/species/blobamber/assets/base.svg @@ -0,0 +1,61 @@ + + + blobcat + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Blobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 License + + + blobcat + + + Feuerfuchs + + + https://git.shadamethyst.xyz/adri326/blobfox + + + + diff --git a/species/blobamber/species.toml b/species/blobamber/species.toml new file mode 100644 index 0000000..c6009b3 --- /dev/null +++ b/species/blobamber/species.toml @@ -0,0 +1,2 @@ +name = "blobamber" +base = "../blobcat/" diff --git a/species/blobamber/templates/body-basic.mustache b/species/blobamber/templates/body-basic.mustache new file mode 100644 index 0000000..44346be --- /dev/null +++ b/species/blobamber/templates/body-basic.mustache @@ -0,0 +1,15 @@ +{{! Left ear }} +{{#base}}#left-ear{{/base}} + +{{#base}}#body{{/base}} +{{#base}}#belly{{/base}} +{{#base}}#hair{{/base}} + +{{! Right ear }} +{{#base}}#right-ear{{/base}} +{{#base}}#right-ear-fluff{{/base}} + +{{! Whiskers }} +{{^tags.hands-reach}} + {{>whiskers}} +{{/tags.hands-reach}} diff --git a/species/blobamber/templates/eyes.mustache b/species/blobamber/templates/eyes.mustache new file mode 100644 index 0000000..cff1a5f --- /dev/null +++ b/species/blobamber/templates/eyes.mustache @@ -0,0 +1,3 @@ +{{#blobamber.base}}#blobamber-defs{{/blobamber.base}} + +{{>blobcat.eyes}} diff --git a/species/blobamber/templates/hands.mustache b/species/blobamber/templates/hands.mustache new file mode 100644 index 0000000..342d878 --- /dev/null +++ b/species/blobamber/templates/hands.mustache @@ -0,0 +1,16 @@ +{{#tags.hand-3c}} +{{#tags.holding}} + +{{/tags.holding}} +{{^tags.holding}} + +{{/tags.holding}} +{{/tags.hand-3c}} + +{{#set-fill}} + #6a6862 | {{>blobfox.hands}} +{{/set-fill}} + +{{#tags.hand-3c}} + +{{/tags.hand-3c}} diff --git a/species/blobcat/assets/base.svg b/species/blobcat/assets/base.svg index 3ac4901..83b05b7 100644 --- a/species/blobcat/assets/base.svg +++ b/species/blobcat/assets/base.svg @@ -1,30 +1,30 @@ - + blobcat - - + + -