From 995807d8a5b9de01a02f84471310491d1fb691de Mon Sep 17 00:00:00 2001 From: Adrien Burgun Date: Mon, 8 Aug 2022 18:56:09 +0200 Subject: [PATCH] :sparkles: snuggle_right for arctic fox and husky, heart in snuggle, coffee --- snuggle.toml | 17 +++ .../blobarcticfox/assets/snuggle_right.svg | 51 +++++++ species/blobarcticfox/species.toml | 1 + .../templates/body-snuggle.mustache | 16 +++ species/blobfox/assets/coffee.svg | 44 ++++++ species/blobfox/assets/snuggle_right.svg | 41 +++--- species/blobfox/species.toml | 1 + .../blobfox/templates/body-snuggle.mustache | 2 +- species/blobfox/templates/coffee.mustache | 6 + species/blobfox/templates/hands.mustache | 32 ++++- species/blobfox/variants/coffee.mustache | 10 ++ .../blobfox/variants/heart_progress.mustache | 1 + .../blobfox/variants/snuggle_right.mustache | 2 + .../variants/snuggle_right_blush.mustache | 2 + species/blobhusky/assets/snuggle_right.svg | 51 +++++++ .../blobhusky/templates/body-snuggle.mustache | 5 + vector/blobarcticfox_snuggle_right.svg | 136 ++++++++++++++++++ vector/blobfox_snuggle_right.svg | 84 ++++++----- vector/blobhusky_snuggle_right.svg | 136 ++++++++++++++++++ vector/coffee.svg | 109 ++++++++++++++ 20 files changed, 683 insertions(+), 64 deletions(-) create mode 100644 species/blobarcticfox/assets/snuggle_right.svg create mode 100644 species/blobarcticfox/templates/body-snuggle.mustache create mode 100644 species/blobfox/assets/coffee.svg create mode 100644 species/blobfox/templates/coffee.mustache create mode 100644 species/blobfox/variants/coffee.mustache create mode 100644 species/blobhusky/assets/snuggle_right.svg create mode 100644 species/blobhusky/templates/body-snuggle.mustache create mode 100644 vector/blobarcticfox_snuggle_right.svg create mode 100644 vector/blobhusky_snuggle_right.svg create mode 100644 vector/coffee.svg diff --git a/snuggle.toml b/snuggle.toml index 324a5fa..4eb7e6c 100644 --- a/snuggle.toml +++ b/snuggle.toml @@ -11,6 +11,11 @@ blobfox_blush = "blobfox_blush" blobfox_happy = "blobfox_happy" blobfox_aww = "blobfox_aww" +blobhusky = "blobhusky_snuggle_left" +blobhusky_blush = "blobhusky_blush" +blobhusky_happy = "blobhusky_happy" +blobhusky_aww = "blobhusky_aww" + blobcat = "blobcat_snuggle_left" blobcat_blush = "blobcat_blush" blobcat_happy = "blobcat_happy" @@ -29,3 +34,15 @@ blobarcticfox_aww = "blobarcticfox_aww" [right] blobfox = "blobfox_snuggle_right" blobfox_blush = "blobfox_snuggle_right_blush" +blobfox_heart = "blobfox_snuggle_right_heart" +blobfox_blush_heart = "blobfox_snuggle_right_blush_heart" + +blobarcticfox = "blobarcticfox_snuggle_right" +blobarcticfox_blush = "blobarcticfox_snuggle_right_blush" +blobarcticfox_heart = "blobarcticfox_snuggle_right_heart" +blobarcticfox_blush_heart = "blobarcticfox_snuggle_right_blush_heart" + +blobhusky = "blobhusky_snuggle_right" +blobhusky_blush = "blobhusky_snuggle_right_blush" +blobhusky_heart = "blobhusky_snuggle_right_heart" +blobhusky_blush_heart = "blobhusky_snuggle_right_blush_heart" diff --git a/species/blobarcticfox/assets/snuggle_right.svg b/species/blobarcticfox/assets/snuggle_right.svg new file mode 100644 index 0000000..d59afe1 --- /dev/null +++ b/species/blobarcticfox/assets/snuggle_right.svg @@ -0,0 +1,51 @@ + + + blobarcticfox_snuggle_right + + + + + + + + + + + + + + + + + + + + + + + + + + Blobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 License + + + blobarcticfox_snuggle_right + + + Feuerfuchs + + + https://git.shadamethyst.xyz/adri326/blobfox + + + Shad Amethyst + + + + + + + diff --git a/species/blobarcticfox/species.toml b/species/blobarcticfox/species.toml index ea6355f..4b4124e 100644 --- a/species/blobarcticfox/species.toml +++ b/species/blobarcticfox/species.toml @@ -9,3 +9,4 @@ hand_color = "#eef2f4" tail_color = "#eef2f4" marks_color = "#eee64e" sheen_color = "#bfdef4" +hand_stroke_color = "#8599ad" diff --git a/species/blobarcticfox/templates/body-snuggle.mustache b/species/blobarcticfox/templates/body-snuggle.mustache new file mode 100644 index 0000000..156a12c --- /dev/null +++ b/species/blobarcticfox/templates/body-snuggle.mustache @@ -0,0 +1,16 @@ +{{! Left ear }} +{{#set-fill}} {{vars.ear_color}} | {{#snuggle_right}}#left-ear{{/snuggle_right}} {{/set-fill}} + +{{! Body }} + + + {{#snuggle_right}}#body{{/snuggle_right}} + + +{{#set-fill}} {{vars.sheen_color}} | {{#snuggle_right}}#body-sheen{{/snuggle_right}} {{/set-fill}} +{{#set-fill}} {{vars.body_color}} | {{#snuggle_right}}#body{{/snuggle_right}} {{/set-fill}} +{{#set-fill}} {{vars.body_color}} | {{#snuggle_right}}#hair{{/snuggle_right}} {{/set-fill}} + +{{! Right ear }} +{{#set-fill}} {{vars.ear_color}} | {{#snuggle_right}}#right-ear{{/snuggle_right}} {{/set-fill}} +{{#set-fill}} {{vars.ear_fluff_color}} | {{#snuggle_right}}#right-ear-fluff{{/snuggle_right}} {{/set-fill}} diff --git a/species/blobfox/assets/coffee.svg b/species/blobfox/assets/coffee.svg new file mode 100644 index 0000000..3844688 --- /dev/null +++ b/species/blobfox/assets/coffee.svg @@ -0,0 +1,44 @@ + + + coffee + + + + + + + + + + + + + + + + + + + + + + + Blobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 License + + + + + Feuerfuchs + + + https://git.shadamethyst.xyz/adri326/blobfox + + + Shad Amethyst + + + coffee + + + + diff --git a/species/blobfox/assets/snuggle_right.svg b/species/blobfox/assets/snuggle_right.svg index 1941986..6a26c88 100644 --- a/species/blobfox/assets/snuggle_right.svg +++ b/species/blobfox/assets/snuggle_right.svg @@ -1,27 +1,28 @@ - - blobfox - - + + blobfox_snuggle_right + + - - - + - - - - - - + + + + + + - - - - - - + + + + + + + @@ -31,7 +32,7 @@ Blobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 License - blobfox + blobfox_snuggle_right Feuerfuchs diff --git a/species/blobfox/species.toml b/species/blobfox/species.toml index 261aacc..c2a2234 100644 --- a/species/blobfox/species.toml +++ b/species/blobfox/species.toml @@ -42,6 +42,7 @@ comfy_boop = ["body-comfy", "boop", "eyes-basic", "mouth-w"] stabby = ["body-basic", "holding", "eyes-evil", "mouth-w", "hand-3c", "left-hand"] gordon = ["body-basic", "holding", "eyes-basic", "mouth-w", "hand-3c", "left-hand"] +coffee = ["body-basic", "holding", "eyes-basic", "mouth-w", "hand-cup", "right-hand"] blush = ["body-basic", "ear-blush", "eyes-closed", "blush", "mouth-hmpf"] diff --git a/species/blobfox/templates/body-snuggle.mustache b/species/blobfox/templates/body-snuggle.mustache index db2c8f7..80811ba 100644 --- a/species/blobfox/templates/body-snuggle.mustache +++ b/species/blobfox/templates/body-snuggle.mustache @@ -3,7 +3,7 @@ {{! Body }} - + {{#snuggle_right}}#body{{/snuggle_right}} diff --git a/species/blobfox/templates/coffee.mustache b/species/blobfox/templates/coffee.mustache new file mode 100644 index 0000000..4e43c60 --- /dev/null +++ b/species/blobfox/templates/coffee.mustache @@ -0,0 +1,6 @@ + + {{#coffee}}#smoke{{/coffee}} + {{#coffee}}#cup{{/coffee}} + {{#coffee}}#cup-handle{{/coffee}} + {{#coffee}}#liquid{{/coffee}} + diff --git a/species/blobfox/templates/hands.mustache b/species/blobfox/templates/hands.mustache index 57317b2..46468e8 100644 --- a/species/blobfox/templates/hands.mustache +++ b/species/blobfox/templates/hands.mustache @@ -15,24 +15,48 @@ {{/set-fill}} {{/set-stroke}} {{/tags.hands-reach}} + {{#tags.hand-3c}} {{#tags.holding}} - {{#set-fill}} {{vars.hand_color}} | {{#knife}}#left-hand{{/knife}} {{/set-fill}} + {{#set-stroke}} + {{vars.hand_stroke_color}} | + {{#set-fill}} {{vars.hand_color}} | {{#knife}}#left-hand{{/knife}} {{/set-fill}} + {{/set-stroke}} {{/tags.holding}} {{^tags.holding}} {{! :3c hand }} - {{#set-fill}} {{vars.hand_color}} | {{#3c_evil}}#left-hand{{/3c_evil}} {{/set-fill}} + + {{#set-stroke}} + {{vars.hand_stroke_color}} | + {{#set-fill}} {{vars.hand_color}} | {{#3c_evil}}#left-hand{{/3c_evil}} {{/set-fill}} + {{/set-stroke}} {{/tags.holding}} {{/tags.hand-3c}} {{^tags.hand-3c}} {{#tags.holding}} {{#tags.left-hand}} - {{#set-fill}} {{vars.hand_color}} | {{#heart}}#left-hand{{/heart}} {{/set-fill}} + {{#set-stroke}} + {{vars.hand_stroke_color}} | + {{#set-fill}} {{vars.hand_color}} | {{#heart}}#left-hand{{/heart}} {{/set-fill}} + {{/set-stroke}} {{/tags.left-hand}} {{#tags.right-hand}} - {{#set-fill}} {{vars.hand_color}} | {{#heart}}#right-hand{{/heart}} {{/set-fill}} + {{#tags.hand-cup}} + {{#set-stroke}} + {{vars.hand_stroke_color}} | + {{#set-fill}} {{vars.hand_color}} | {{#coffee}}#right-hand{{/coffee}} {{/set-fill}} + {{/set-stroke}} + {{/tags.hand-cup}} + {{^tags.hand-cup}} + {{#set-stroke}} + {{vars.hand_stroke_color}} | + {{#set-fill}} {{vars.hand_color}} | {{#heart}}#right-hand{{/heart}} {{/set-fill}} + {{/set-stroke}} + {{/tags.hand-cup}} {{/tags.right-hand}} {{/tags.holding}} {{/tags.hand-3c}} + + diff --git a/species/blobfox/variants/coffee.mustache b/species/blobfox/variants/coffee.mustache new file mode 100644 index 0000000..51723aa --- /dev/null +++ b/species/blobfox/variants/coffee.mustache @@ -0,0 +1,10 @@ +{{>header}} + {{>body}} + + {{>eyes}} + {{>nose}} + {{>mouth}} + + {{>coffee}} + {{>hands}} +{{>footer}} diff --git a/species/blobfox/variants/heart_progress.mustache b/species/blobfox/variants/heart_progress.mustache index 3ffc9f5..ad45bdc 100644 --- a/species/blobfox/variants/heart_progress.mustache +++ b/species/blobfox/variants/heart_progress.mustache @@ -13,6 +13,7 @@ {{#heart}}#heart{{/heart}} + {{! NOTE: The progress flag has a different aspect ratio compared to the other flags }} {{#flag_progress}}{{/flag_progress}} diff --git a/species/blobfox/variants/snuggle_right.mustache b/species/blobfox/variants/snuggle_right.mustache index 6a0a83d..18d23bb 100644 --- a/species/blobfox/variants/snuggle_right.mustache +++ b/species/blobfox/variants/snuggle_right.mustache @@ -6,4 +6,6 @@ {{>nose}} {{>mouth}} + + {{#snuggle_right}}#heart{{/snuggle_right}} {{>footer}} diff --git a/species/blobfox/variants/snuggle_right_blush.mustache b/species/blobfox/variants/snuggle_right_blush.mustache index a6a9544..3b401c5 100644 --- a/species/blobfox/variants/snuggle_right_blush.mustache +++ b/species/blobfox/variants/snuggle_right_blush.mustache @@ -7,4 +7,6 @@ {{>mouth}} {{>blush}} + + {{#snuggle_right}}#heart{{/snuggle_right}} {{>footer}} diff --git a/species/blobhusky/assets/snuggle_right.svg b/species/blobhusky/assets/snuggle_right.svg new file mode 100644 index 0000000..7fddd34 --- /dev/null +++ b/species/blobhusky/assets/snuggle_right.svg @@ -0,0 +1,51 @@ + + + blobhusky_snuggle_right + + + + + + + + + + + + + + + + + + + + + + + + + + + Blobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 License + + + blobhusky_snuggle_right + + + Feuerfuchs + + + https://git.shadamethyst.xyz/adri326/blobfox + + + Shad Amethyst + + + + + + diff --git a/species/blobhusky/templates/body-snuggle.mustache b/species/blobhusky/templates/body-snuggle.mustache new file mode 100644 index 0000000..d10b1fa --- /dev/null +++ b/species/blobhusky/templates/body-snuggle.mustache @@ -0,0 +1,5 @@ +{{>blobfox.body-snuggle}} + + + {{#set-fill}} {{vars.marks_color}} | {{#snuggle_right}}#marks{{/snuggle_right}} {{/set-fill}} + diff --git a/vector/blobarcticfox_snuggle_right.svg b/vector/blobarcticfox_snuggle_right.svg new file mode 100644 index 0000000..c0c7cf9 --- /dev/null +++ b/vector/blobarcticfox_snuggle_right.svg @@ -0,0 +1,136 @@ + +blobarcticfox_snuggle_rightBlobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 Licenseblobarcticfox_snuggle_rightFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfoxShad Amethyst diff --git a/vector/blobfox_snuggle_right.svg b/vector/blobfox_snuggle_right.svg index f7a2382..fa633af 100644 --- a/vector/blobfox_snuggle_right.svg +++ b/vector/blobfox_snuggle_right.svg @@ -1,6 +1,6 @@ blobfoxblobfox_snuggle_rightBlobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 LicenseblobfoxFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfoxShad Amethyst + rdf:about="">Blobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 Licenseblobfox_snuggle_rightFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfoxShad Amethyst diff --git a/vector/blobhusky_snuggle_right.svg b/vector/blobhusky_snuggle_right.svg new file mode 100644 index 0000000..eabffa0 --- /dev/null +++ b/vector/blobhusky_snuggle_right.svg @@ -0,0 +1,136 @@ + +blobhusky_snuggle_rightBlobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 Licenseblobhusky_snuggle_rightFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfoxShad Amethyst diff --git a/vector/coffee.svg b/vector/coffee.svg new file mode 100644 index 0000000..5eda2be --- /dev/null +++ b/vector/coffee.svg @@ -0,0 +1,109 @@ + +coffeeBlobfox team (https://git.shadamethyst.xyz/adri326/blobfox), licensed under the Apache 2.0 LicenseFeuerfuchshttps://git.shadamethyst.xyz/adri326/blobfoxShad Amethystcoffee