From dd52f46dc27df45d4d40082a96177c09cb9b5f2d Mon Sep 17 00:00:00 2001 From: Adrien Burgun Date: Sun, 31 Jul 2022 18:07:26 +0200 Subject: [PATCH] :sparkles: Blob Stella, and parametrize the existing body-basic and body-snug --- species/blobamber/species.toml | 1 + .../blobamber/templates/body-basic.mustache | 16 +- species/blobcat/templates/body-basic.mustache | 16 +- species/blobcat/templates/body-snug.mustache | 12 +- species/blobfox/species.toml | 2 +- species/blobfox/templates/body-basic.mustache | 20 +- species/blobfox/templates/body-snug.mustache | 21 +- species/blobstella/assets/base.svg | 57 +++++ species/blobstella/species.toml | 10 + .../blobstella/templates/body-basic.mustache | 26 +++ .../blobstella/templates/body-snug.mustache | 14 ++ vector/blobamber.svg | 207 ++++++++++++++++++ vector/blobstella.svg | 186 ++++++++++++++++ 13 files changed, 551 insertions(+), 37 deletions(-) create mode 100644 species/blobstella/assets/base.svg create mode 100644 species/blobstella/species.toml create mode 100644 species/blobstella/templates/body-basic.mustache create mode 100644 species/blobstella/templates/body-snug.mustache create mode 100644 vector/blobamber.svg create mode 100644 vector/blobstella.svg diff --git a/species/blobamber/species.toml b/species/blobamber/species.toml index acb5569..50ec5e4 100644 --- a/species/blobamber/species.toml +++ b/species/blobamber/species.toml @@ -7,3 +7,4 @@ ear_color = "#313131" ear_fluff_color = "#474747" hand_color = "#6a6862" tail_color = "#6a6862" +marks_color = "#c8c8c8" diff --git a/species/blobamber/templates/body-basic.mustache b/species/blobamber/templates/body-basic.mustache index 44346be..ad731ad 100644 --- a/species/blobamber/templates/body-basic.mustache +++ b/species/blobamber/templates/body-basic.mustache @@ -1,15 +1,3 @@ -{{! Left ear }} -{{#base}}#left-ear{{/base}} +{{>blobcat.body-basic}} -{{#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}} +{{#set-fill}} {{vars.marks_color}} | {{#base}}#belly{{/base}} {{/set-fill}} diff --git a/species/blobcat/templates/body-basic.mustache b/species/blobcat/templates/body-basic.mustache index 92ec3e2..b11822a 100644 --- a/species/blobcat/templates/body-basic.mustache +++ b/species/blobcat/templates/body-basic.mustache @@ -1,12 +1,18 @@ {{! Left ear }} -{{#base}}#left-ear{{/base}} +{{#set-fill}} {{vars.ear_color}} | {{#base}}#left-ear{{/base}} {{/set-fill}} -{{#base}}#body{{/base}} -{{#base}}#hair{{/base}} +{{! Body }} + + + {{#base}}#body{{/base}} + + +{{#set-fill}} {{vars.body_color}} | {{#base}}#body{{/base}} {{/set-fill}} +{{#set-fill}} {{vars.body_color}} | {{#base}}#hair{{/base}} {{/set-fill}} {{! Right ear }} -{{#base}}#right-ear{{/base}} -{{#base}}#right-ear-fluff{{/base}} +{{#set-fill}} {{vars.ear_color}} | {{#base}}#right-ear{{/base}} {{/set-fill}} +{{#set-fill}} {{vars.ear_fluff_color}} | {{#base}}#right-ear-fluff{{/base}} {{/set-fill}} {{! Whiskers }} {{^tags.hands-reach}} diff --git a/species/blobcat/templates/body-snug.mustache b/species/blobcat/templates/body-snug.mustache index aa2ab12..b5dcb32 100644 --- a/species/blobcat/templates/body-snug.mustache +++ b/species/blobcat/templates/body-snug.mustache @@ -1,6 +1,12 @@ + + + {{#snug}}#body{{/snug}} + + + - {{#base}}#left-ear{{/base}} + {{#set-fill}} {{vars.ear_color}} | {{#base}}#left-ear{{/base}} {{/set-fill}} {{#set-fill}} @@ -9,8 +15,8 @@ {{/set-fill}} - {{#base}}#right-ear{{/base}} - {{#base}}#right-ear-fluff{{/base}} + {{#set-fill}} {{vars.ear_color}} | {{#base}}#right-ear{{/base}} {{/set-fill}} + {{#set-fill}} {{vars.ear_fluff_color}} | {{#base}}#right-ear-fluff{{/base}} {{/set-fill}} {{>tail}} diff --git a/species/blobfox/species.toml b/species/blobfox/species.toml index 5a99dc6..7fe64c8 100644 --- a/species/blobfox/species.toml +++ b/species/blobfox/species.toml @@ -4,7 +4,7 @@ name = "blobfox" [vars] body_color = "#ff8702" ear_color = "#313131" -ear_fluff_color = "#3bdccc" +ear_fluff_color = "#ebdccc" hand_color = "#ff8702" tail_color = "#ff8702" diff --git a/species/blobfox/templates/body-basic.mustache b/species/blobfox/templates/body-basic.mustache index d8f3b8e..9ccaefa 100644 --- a/species/blobfox/templates/body-basic.mustache +++ b/species/blobfox/templates/body-basic.mustache @@ -1,15 +1,21 @@ {{! Left ear }} {{#tags.ear-owo}} - {{#boop_owo}}#left-ear{{/boop_owo}} - {{#boop_owo}}#left-ear-fluff{{/boop_owo}} + {{#set-fill}} {{vars.ear_color}} | {{#boop_owo}}#left-ear{{/boop_owo}} {{/set-fill}} + {{#set-fill}} {{vars.ear_fluff_color}} | {{#boop_owo}}#left-ear-fluff{{/boop_owo}} {{/set-fill}} {{/tags.ear-owo}} {{^tags.ear-owo}} - {{#base}}#left-ear{{/base}} + {{#set-fill}} {{vars.ear_color}} | {{#base}}#left-ear{{/base}} {{/set-fill}} {{/tags.ear-owo}} -{{#base}}#body{{/base}} -{{#base}}#hair{{/base}} +{{! Body }} + + + {{#base}}#body{{/base}} + + +{{#set-fill}} {{vars.body_color}} | {{#base}}#body{{/base}} {{/set-fill}} +{{#set-fill}} {{vars.body_color}} | {{#base}}#hair{{/base}} {{/set-fill}} {{! Right ear }} -{{#base}}#right-ear{{/base}} -{{#base}}#right-ear-fluff{{/base}} +{{#set-fill}} {{vars.ear_color}} | {{#base}}#right-ear{{/base}} {{/set-fill}} +{{#set-fill}} {{vars.ear_fluff_color}} | {{#base}}#right-ear-fluff{{/base}} {{/set-fill}} diff --git a/species/blobfox/templates/body-snug.mustache b/species/blobfox/templates/body-snug.mustache index 2bf4891..6633363 100644 --- a/species/blobfox/templates/body-snug.mustache +++ b/species/blobfox/templates/body-snug.mustache @@ -1,15 +1,22 @@ + + + {{#snug}}#body{{/snug}} + + + {{! TODO: owo ear }} - {{#snug}}#left-ear{{/snug}} - {{#snug}}#body{{/snug}} - {{#snug}}#hair{{/snug}} - {{#snug}}#right-ear{{/snug}} - {{#snug}}#right-ear-fluff{{/snug}} + {{#set-fill}} {{vars.ear_color}} | {{#snug}}#left-ear{{/snug}} {{/set-fill}} + + {{#set-fill}} {{vars.body_color}} | {{#snug}}#body{{/snug}} {{/set-fill}} + {{#set-fill}} {{vars.body_color}} | {{#snug}}#hair{{/snug}} {{/set-fill}} + + {{#set-fill}} {{vars.ear_color}} | {{#snug}}#right-ear{{/snug}} {{/set-fill}} + {{#set-fill}} {{vars.ear_fluff_color}} | {{#snug}}#right-ear-fluff{{/snug}} {{/set-fill}} {{#tags.tail}} - {{#snug}}#tail{{/snug}} - {{#snug}}#tail-outline{{/snug}} + {{#set-fill}} {{vars.body_color}} | {{#snug}}#tail{{/snug}} {{/set-fill}} {{/tags.tail}} diff --git a/species/blobstella/assets/base.svg b/species/blobstella/assets/base.svg new file mode 100644 index 0000000..ebce6d1 --- /dev/null +++ b/species/blobstella/assets/base.svg @@ -0,0 +1,57 @@ + + + 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/blobstella/species.toml b/species/blobstella/species.toml new file mode 100644 index 0000000..9a4ba0f --- /dev/null +++ b/species/blobstella/species.toml @@ -0,0 +1,10 @@ +name = "blobstella" +base = "../blobcat/" + +[vars] +body_color = "#54b6e7" +ear_color = "#3398c7" +ear_fluff_color = "#224f66" +hand_color = "#54b6e7" +tail_color = "#54b6e7" +marks_color = "#eee64e" diff --git a/species/blobstella/templates/body-basic.mustache b/species/blobstella/templates/body-basic.mustache new file mode 100644 index 0000000..fb9dbc0 --- /dev/null +++ b/species/blobstella/templates/body-basic.mustache @@ -0,0 +1,26 @@ +{{! Left ear }} +{{#set-fill}} {{vars.ear_color}} | {{#base}}#left-ear{{/base}} {{/set-fill}} + +{{! Body }} + + + {{#base}}#body{{/base}} + + +{{#set-fill}} {{vars.body_color}} | {{#base}}#body{{/base}} {{/set-fill}} +{{#set-fill}} {{vars.body_color}} | {{#base}}#hair{{/base}} {{/set-fill}} + +{{! Right ear }} +{{#set-fill}} {{vars.ear_color}} | {{#base}}#right-ear{{/base}} {{/set-fill}} +{{#set-fill}} {{vars.ear_fluff_color}} | {{#base}}#right-ear-full{{/base}} {{/set-fill}} + +{{! Marks }} + + {{#base}}#left-marks{{/base}} + {{#base}}#right-marks{{/base}} + + +{{! Whiskers }} +{{^tags.hands-reach}} + {{>whiskers}} +{{/tags.hands-reach}} diff --git a/species/blobstella/templates/body-snug.mustache b/species/blobstella/templates/body-snug.mustache new file mode 100644 index 0000000..9253199 --- /dev/null +++ b/species/blobstella/templates/body-snug.mustache @@ -0,0 +1,14 @@ +{{>blobcat.body-snug}} + + + + {{#set-fill}} + {{vars.marks_color}} + | {{#base}}#left-marks{{/base}} + {{/set-fill}} + {{#set-fill}} + {{vars.marks_color}} + | {{#base}}#right-marks{{/base}} + {{/set-fill}} + + diff --git a/vector/blobamber.svg b/vector/blobamber.svg new file mode 100644 index 0000000..b88445f --- /dev/null +++ b/vector/blobamber.svg @@ -0,0 +1,207 @@ + + + +blobcatBlobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 LicenseblobcatFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfox diff --git a/vector/blobstella.svg b/vector/blobstella.svg new file mode 100644 index 0000000..4351565 --- /dev/null +++ b/vector/blobstella.svg @@ -0,0 +1,186 @@ + + + +blobcatBlobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 LicenseblobcatFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfox