✨ Update blobcat

species/blobcat/templates/body-basic.mustache

@@ -0,0 +1,14 @@
+{{! Left ear }}
+{{#base}}#left-ear{{/base}}
+
+{{#base}}#body{{/base}}
+{{#base}}#hair{{/base}}
+
+{{! Right ear }}
+{{#base}}#right-ear{{/base}}
+{{#base}}#right-ear-fluff{{/base}}
+
+{{! Whiskers }}
+{{^tags.hands-reach}}
+    {{>whiskers}}
+{{/tags.hands-reach}}

species/blobcat/templates/body-snug.mustache

@@ -1,6 +1,6 @@
-<g id="base-snug">
+<g id="body-snug">
     <g id="left-ear" transform="translate(0 2) rotate(5 6.6 5.5) translate(0 0.2)">
-            {{#base}}#left-ear{{/base}}
+        {{#base}}#left-ear{{/base}}
     </g>
 
     {{#set-fill}}#fcc21b|{{#snug}}#body{{/snug}}{{/set-fill}}
@@ -9,4 +9,6 @@
         {{#base}}#right-ear{{/base}}
         {{#base}}#right-ear-fluff{{/base}}
     </g>
+
+    {{>tail}}
 </g>

species/blobcat/templates/extra-3c.mustache

@@ -1,3 +0,0 @@
-<g id="3c-extra">
-    {{>whiskers}}
-</g>

species/blobcat/templates/extra-base.mustache

@@ -1 +0,0 @@
-{{>whiskers}}

species/blobcat/templates/extra-snug.mustache

@@ -1 +0,0 @@
-{{>whiskers-snug}}

species/blobcat/templates/hand-3c.mustache

@@ -1,3 +0,0 @@
-<g id="hand-3c" transform="translate(1.5 -2.5)">
-    {{#set-fill}}#fcc21b|{{#3c_evil}}#left-hand{{/3c_evil}}{{/set-fill}}
-</g>

species/blobcat/templates/hand-boop.mustache

@@ -0,0 +1,3 @@
+<g id="hand-boop" transform="translate(1.5 -1)">
+    {{#boop_owo}}#hand-boop{{/boop_owo}}
+</g>

species/blobcat/templates/hand-knife.mustache

@@ -1,9 +0,0 @@
-<g id="hand-knife" transform="translate(1.5 -2.5)">
-    <g id="knife">
-        {{#knife}}#blade-back{{/knife}}
-        {{#knife}}#blade-front{{/knife}}
-        {{#knife}}#handle{{/knife}}
-        {{#knife}}#handle-screw{{/knife}}
-    </g>
-    {{#set-fill}}#fcc21b|{{#knife}}#left-hand{{/knife}}{{/set-fill}}
-</g>

species/blobcat/templates/hands-reach.mustache

@@ -1,4 +0,0 @@
-<g id="hands-reach">
-    {{#set-fill}}#fcc21b|{{#reach_aww}}#left-hand{{/reach_aww}}{{/set-fill}}
-    {{#set-fill}}#fcc21b|{{#reach_aww}}#right-hand{{/reach_aww}}{{/set-fill}}
-</g>

species/blobcat/templates/hands.mustache

@@ -0,0 +1,16 @@
+{{! TODO: use parent }}
+<g id="hands">
+    {{#tags.hands-reach}}
+        {{#set-fill}}#fcc21b|{{#reach_aww}}#left-hand{{/reach_aww}}{{/set-fill}}
+        {{#set-fill}}#fcc21b|{{#reach_aww}}#right-hand{{/reach_aww}}{{/set-fill}}
+    {{/tags.hands-reach}}
+    {{#tags.hand-3c}}
+        {{#tags.holding}}
+            {{#set-fill}}#fcc21b|{{#knife}}#left-hand{{/knife}}{{/set-fill}}
+        {{/tags.holding}}
+        {{^tags.holding}}
+            {{! :3c hand }}
+            {{#set-fill}}#fcc21b|{{#3c_evil}}#left-hand{{/3c_evil}}{{/set-fill}}
+        {{/tags.holding}}
+    {{/tags.hand-3c}}
+</g>

species/blobcat/templates/mouth-reach.mustache

@@ -1 +0,0 @@
-{{#base}}#mouth{{/base}}

species/blobcat/templates/mouth-w.mustache

@@ -1 +0,0 @@
-{{#base}}#mouth{{/base}}

species/blobcat/templates/mouth.mustache

@@ -0,0 +1,9 @@
+{{#tags.boop}}
+    <g id="mouth" transform="translate(-0.2 0.5)">
+{{/tags.boop}}
+    {{#tags.mouth-w}}
+        {{#base}}#mouth{{/base}}
+    {{/tags.mouth-w}}
+{{#tags.boop}}
+    </g>
+{{/tags.boop}}

species/blobcat/templates/nose-aww.mustache

@@ -1 +0,0 @@
-<g id="nose-aww" />

species/blobcat/templates/nose-evil.mustache

@@ -1 +0,0 @@
-<g id="nose-evil" />

species/blobcat/templates/nose-snug.mustache

@@ -1 +0,0 @@
-<g id="nose-snug" />

species/blobcat/templates/nose.mustache

@@ -1 +1,13 @@
-<g id="nose" />
+{{#tags.body-snug}}
+    <g id="nose-snug" transform="translate(1.5 0)">
+        {{#snug}}#nose{{/snug}}
+    </g>
+{{/tags.body-snug}}
+
+{{^tags.body-snug}}
+{{#tags.boop}}
+    <g id="nose-snug" transform="translate(1.5 -0.5)">
+        {{#snug}}#nose{{/snug}}
+    </g>
+{{/tags.boop}}
+{{/tags.body-snug}}

species/blobcat/templates/tail-snug.mustache

@@ -1,4 +0,0 @@
-<g id="tail-snug">
-    {{#set-fill}}#fcc21b|{{#snug}}#tail{{/snug}}{{/set-fill}}
-    {{#snug}}#tail-outline{{/snug}}
-</g>

species/blobcat/templates/tail.mustache

@@ -0,0 +1 @@
+{{#set-fill}}#fcc21b|{{#snug}}#tail{{/snug}}{{/set-fill}}

species/blobcat/templates/whiskers-snug.mustache

@@ -1,12 +0,0 @@
-<g id="whiskers-snug">
-    {{#base}}#left-whisker{{/base}}
-    {{#base}}#left-whisker-2{{/base}}
-    <g transform="translate(-1 -3)">
-        <g transform="rotate(-20 25 20)">
-            {{#base}}#right-whisker{{/base}}
-        </g>
-        <g transform="rotate(-10 25 20) translate(0 0.7)">
-            {{#base}}#right-whisker-2{{/base}}
-        </g>
-    </g>
-</g>

species/blobcat/variants/snug.mustache

@@ -1,14 +0,0 @@
-
-{{>header}}
-    <g id="body">
-        {{>base-snug}}
-        {{>tail-snug}}
-    </g>
-    <g id="features">
-        {{>eyes-snug}}
-        <g id="nose-snug" transform="translate(1.5 0)">
-            {{#snug}}#nose{{/snug}}
-        </g>
-        {{>whiskers-snug}}
-    </g>
-{{>footer}}

species/blobcat/variants/snug_aww.mustache

@@ -1,13 +0,0 @@
-{{>header}}
-    <g id="body">
-        {{>base-snug}}
-        {{>tail-snug}}
-        {{>extra-snug}}
-    </g>
-    <g id="features">
-        {{>eyes-aww}}
-        <g id="nose-snug" transform="translate(1.5 0)">
-            {{#snug}}#nose{{/snug}}
-        </g>
-    </g>
-{{>footer}}

species/blobfox/templates/tail.mustache

@@ -0,0 +1 @@
+{{#snug}}#tail{{/snug}}

src/parse.rs

@@ -69,6 +69,7 @@ pub fn load_species(path: impl AsRef<Path>) -> Result<SpeciesDecl, ParseError> {
         res.template_paths = base.template_paths;
         res.variant_paths = base.variant_paths;
         res.asset_paths = base.asset_paths;
+        res.variants = base.variants;
     }
 
     // Read the `templates` directory and populate the `template_paths` field;