Move humans to the species category; add hands and feet

macrovision.js

@@ -3429,6 +3429,12 @@ function prepareEntities() {
     availableEntities["species"] = makeSpecies();
     availableEntities["vehicles"] = makeVehicles();
 
+    availableEntities["species"].forEach(x => {
+        if (x.name == "Human") {
+            availableEntities["food"].push(x);
+        }
+    })
+
     availableEntities["characters"].sort((x, y) => {
         return x.name.toLowerCase() < y.name.toLowerCase() ? -1 : 1
     });

media/attribution.js

@@ -15467,25 +15467,6 @@ const attributionData = {
                 "chemicalcrux"
             ]
         },
-        {
-            prefix: "./media/food/humans/",
-            files: [
-                { name: "woman-1.svg", source: "https://commons.wikimedia.org/wiki/File:1Silhouette_Female.svg" }
-            ],
-            authors: [
-                "phil-bronnery",
-                "beao"
-            ]
-        },
-        {
-            prefix: "./media/food/humans/",
-            files: [
-                { name: "man-1.svg", source: "https://commons.wikimedia.org/wiki/File:Silhouette.svg" }
-            ],
-            authors: [
-                "anonymous"
-            ]
-        },
         {
             prefix: "./media/food/trees/",
             files: [
@@ -15941,6 +15922,35 @@ const attributionData = {
                 "samalamb-bases"
             ]
         },
+        {
+            prefix: "./media/species/human/",
+            files: [
+                { name: "female.svg", source: "https://commons.wikimedia.org/wiki/File:1Silhouette_Female.svg" }
+            ],
+            authors: [
+                "phil-bronnery",
+                "beao"
+            ]
+        },
+        {
+            prefix: "./media/species/human/",
+            files: [
+                { name: "male.svg", source: "https://commons.wikimedia.org/wiki/File:Silhouette.svg" }
+            ],
+            authors: [
+                "anonymous"
+            ]
+        },
+        {
+            prefix: "./media/species/human/",
+            files: [
+                { name: "hand.svg", source: "https://www.dimensions.com/collection/body-parts-anatomy" },
+                { name: "foot.svg", source: "https://www.dimensions.com/collection/body-parts-anatomy" }
+            ],
+            authors: [
+                "dimensions-guide"
+            ]
+        },
         {
             prefix: "./media/vehicles/",
             files: [

media/species/human/foot.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="184.24" height="485.25" viewBox="0 0 184.24 485.25" style="enable-background:new 0 0 184.24 485.25;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1A1A1A;stroke:#000000;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st1{fill:#1A1A1A;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:3.7944,7.5888;}
+	.st2{fill:#1A1A1A;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
+</style>
+<g>
+	<path class="st0" d="M154.17,125.15c-3.19-2.79-5.99-6-8.7-9.26c-2.57-3.09-4.98-6.54-5.98-10.49c-1.54-6.08,0.47-12.94,4.47-17.66
+		c4.7-5.53,12.73-8.57,19.39-4.75c6.5,3.73,7.61,11.5,9.96,17.98c1.47,4.05,3.01,8.08,3.94,12.3c0.87,3.95,1.03,7.97,1.18,12
+		c0.16,4.34,0.31,8.64,0.94,12.95c0.62,4.26,1.6,8.45,2.27,12.7c0.6,3.87,0.79,7.8,0.91,11.71c0.14,4.54,0.3,9.08,0.32,13.61
+		c0.04,8.74-0.14,17.45-1.02,26.15c-0.84,8.25-2.16,16.45-3.39,24.64c-1.42,9.4-2.86,18.79-4.36,28.18
+		c-0.86,5.36-1.72,10.71-2.64,16.06c-1.65,9.57-3.31,19.14-4.96,28.71c-2.22,12.87-4.44,25.73-6.67,38.6
+		c-1.85,10.71-3.7,21.43-5.55,32.15c-0.89,5.17-1.78,10.33-2.6,15.51c-1.51,9.51-2.8,19.05-4.17,28.57
+		c-1.1,7.65-2.49,15.28-4.58,22.72c-2.22,7.92-5.31,15.67-10.21,22.34c-4.94,6.72-11.42,12.18-18.79,16.07
+		c-7.48,3.94-15.72,6.27-24.09,7.31c-8.07,1.01-16.53,0.9-24.46-1.05c-6.99-1.72-13.23-5.25-18.61-9.98
+		c-6.4-5.62-11.67-12.48-16.02-19.77c-4.12-6.9-7.23-14.52-8.68-22.44c-1.52-8.3-1.32-16.71-0.64-25.08
+		c0.76-9.34,2.15-18.66,3.3-27.96c0.97-7.9,1.95-15.8,2.63-23.73c0.8-9.4,1.4-18.8,1.91-28.21c0.45-8.33,0.75-16.7,0.85-25.03
+		c0.11-9.04,0.19-18.06,0.01-27.1c-0.17-8.63-0.56-17.28-1.56-25.86c-0.95-8.16-2.82-16.09-5.56-23.83
+		c-2.91-8.21-6.7-16.1-9.93-24.18c-3.27-8.17-6.04-16.5-8.1-25.06c-1.95-8.14-3.15-16.46-3.48-24.82
+		c-0.34-8.64,0.41-17.33,1.66-25.88c1.28-8.7,3.22-17.26,4.95-25.88c0.77-3.85,1.23-7.8,1.12-11.74c-0.11-3.98-0.61-7.93-1.15-11.87
+		c-1.19-8.71-2.74-17.55-2.1-26.38c0.6-8.16,3.01-15.77,7-22.9c3.89-6.95,9.01-13.88,15.4-18.74c3.03-2.3,6.46-4.01,10.29-4.33
+		c3.82-0.32,7.76,0.55,11.29,1.96c5.77,2.3,11.71,6.47,13.17,12.89c0.84,3.67,0.34,7.58,0.11,11.29c-0.28,4.45-0.69,8.9-1.05,13.34
+		c-0.62,7.88-1.47,15.74-3.86,23.3c-1.34,4.24-2.9,8.5-3.66,12.9c-0.45,2.61-0.74,5.6,0.24,8.14c1.22,3.13,4.76,4.63,8,4.04
+		c1.24-0.22,2.1-0.82,2.29-2.11c0.19-1.28-0.08-2.65-0.2-3.92c-0.14-1.51-0.26-3.02-0.38-4.53c-0.74-9.63-1.48-19.26-2.23-28.88
+		c-0.3-3.94-0.39-7.95-0.03-11.88c0.3-3.37,1.02-6.83,2.9-9.7c4.12-6.31,12.23-7.31,19.03-5.69c5.16,1.23,10.53,3.93,11.48,9.63
+		c0.48,2.89,0.03,5.99-1.12,8.68l-3.62,30.43c-0.75,3.74-0.93,7.59-0.76,11.39c0.06,1.23-0.21,3.94,1.17,4.71
+		c0.72,0.4,1.48-0.1,1.98-0.62c1.03-1.06,1.53-2.59,1.47-4.05c-0.14-3.31-2.17-6.46-3.25-9.52c-1.3-3.67-1.79-7.41-1.43-11.3
+		c0.39-4.23,1.33-8.41,2.09-12.58c0.99-5.43,2.48-12.3,8.38-14.37c3.18-1.11,6.85-0.8,10.07-0.01c3.57,0.88,6.83,2.57,9.56,5.02
+		c2.8,2.52,5.07,5.74,6.04,9.41c0.86,3.26,0.95,6.82,0.26,10.11l-5.89,27.13c-0.57,2.27-1.16,4.64-1.34,6.97
+		c-0.06,0.82-0.02,1.68,0.3,2.45c0.48,1.16,1.77,2.41,3.14,2.25c1.11-0.13,1.87-1.19,2.22-2.16c0.47-1.29,0.15-2.65-0.42-3.85
+		c-5.69-4.94,0.75-38.98,10.74-38.16c3.4-0.33,7,0.4,10.16,1.63c2.44,0.95,4.72,2.28,6.33,4.39c1.98,2.59,2.86,5.93,3.39,9.1
+		c0.68,4.03,0.66,8.04-0.05,12.07"/>
+</g>
+</svg>

media/species/human/hand.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="309.79" height="423.11" viewBox="0 0 309.79 423.11" style="enable-background:new 0 0 309.79 423.11;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1A1A1A;stroke:#000000;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st1{fill:#1A1A1A;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:3.7944,7.5888;}
+	.st2{fill:#1A1A1A;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;}
+</style>
+<g>
+	<path class="st0" d="M74.21,421.73c0.19-9.48,0.38-18.97,0.57-28.45c0.16-8.25,0.45-16.5,0.33-24.75c-0.13-8.48-1.43-16.76-3.42-25
+		c-2.24-9.27-4.9-18.43-7.43-27.63c-2.17-7.89-4.1-15.86-5.74-23.88c-1.76-8.57-3.07-17.21-4.01-25.9
+		c-0.81-7.39-1.36-14.81-1.82-22.23c-0.7-11.4-1.4-22.81-2.1-34.21c-0.48-7.77-1.2-15.53-1.95-23.28
+		c-0.73-7.51-1.57-15.04-2.62-22.51c-1.5-10.77-3.01-21.54-4.51-32.31c-1.09-7.8-2.26-15.59-3.09-23.42
+		c-0.46-4.32-0.89-8.65-0.96-13c-0.06-3.76,0.09-7.67,1.24-11.29c1.51-4.75,5.23-9.11,10.52-9.19c2.92-0.04,5.87,1.04,8.12,2.89
+		c2.6,2.13,3.82,5.28,4.61,8.46c0.91,3.7,1.34,7.54,1.78,11.31c0.54,4.67,1.02,9.35,1.63,14.01c1.22,9.23,3.29,18.22,5.37,27.29
+		c1.95,8.52,3.44,17.13,5.02,25.73c0.71,3.87,1.24,7.85,2.27,11.65c0.49,1.83,1.23,3.9,3.01,4.83c3.82,2,5.31-2.8,5.83-5.65
+		c1.18-6.47,1.13-13.2,1.38-19.76c0.46-12.29,0.93-24.59,1.4-36.88c0.26-6.99,0.55-13.97,0.77-20.96C90.65,89.2,90.86,80.8,91,72.38
+		c0.17-9.86,0.33-19.71,0.5-29.57c0.07-4.01,0.16-8.15,0.79-12.11c0.46-2.88,1.64-5.4,3.52-7.64c1.58-1.88,3.62-3.46,6.04-4.08
+		c2.87-0.74,6.05-0.28,8.76,0.84c2.19,0.91,4.14,2.35,5.39,4.39c1.47,2.4,1.87,5.26,2.01,8.02c0.22,4.28-0.01,8.58,0.02,12.86
+		c0.04,4.66,0.23,9.31,0.4,13.96c0.35,9.25,1.01,18.5,1.53,27.75c0.46,8.17,0.96,16.31,1.02,24.49c0.06,8.28-0.4,16.57-0.72,24.83
+		c-0.23,6.03-0.46,12.07-0.7,18.1c-0.05,1.31-0.1,2.62-0.15,3.94c-0.04,0.94-0.13,2.03,0.18,2.94c0.21,0.61,0.88,1.67,1.66,1.64
+		c0.78-0.04,1.1-1.2,1.28-1.78c0.99-3.16,1.31-6.63,1.73-9.9c0.62-4.72,1.23-9.44,1.85-14.16c0.98-7.5,1.89-15.01,3.01-22.49
+		c1.76-11.7,3.51-23.4,5.26-35.1c1.05-7.02,2.13-14.04,3-21.09c1.1-8.9,2.05-17.81,2.85-26.74c0.42-4.65,0.78-9.31,1.3-13.95
+		c0.4-3.53,0.72-7.39,2.28-10.63c2.03-4.21,6.8-5.8,11.26-5.5c5.5,0.37,10.49,4.04,11.82,9.48c0.93,3.78,0.73,7.86,0.7,11.72
+		c-0.03,3.12-0.13,6.23-0.21,9.35c-0.3,11.39-0.61,22.79-0.91,34.18c-0.2,7.63-0.51,15.23-1.17,22.84
+		c-0.81,9.35-2.35,18.65-3.64,27.94c-1.12,8.01-2.08,16.04-2.78,24.09c-0.38,4.38-0.71,8.77-0.84,13.17
+		c-0.07,2.31-0.48,5.63,0.98,7.67c0.78,1.09,2.25,1.69,3.57,1.69c1.36,0,2.37-0.75,3.09-1.86c1.79-2.73,2.35-6.28,3.1-9.4
+		c1.03-4.31,2.05-8.63,3.28-12.9c2.46-8.6,5.2-17.1,8.2-25.53c2.97-8.35,6.4-16.52,9.2-24.93c2.72-8.17,4.87-16.51,7.13-24.82
+		c2.31-8.48,4.35-17.14,7.26-25.45c1.62-4.62,4.82-11.47,10.62-11.6c5.54-0.13,9.97,5.52,11.69,10.2c1.3,3.52,1.67,7.36,1.75,11.09
+		c0.09,4.29-0.19,8.6-0.65,12.86c-0.86,7.88-2.49,15.71-4.35,23.41c-2.43,10.08-4.86,20.16-7.29,30.24
+		c-1.95,8.09-3.9,16.17-5.88,24.26c-2.03,8.28-4.59,16.41-6.79,24.65c-2.18,8.19-3.61,16.45-4.15,24.91
+		c-0.56,8.65-0.61,17.36-0.22,26.02c0.19,4.3,0.5,8.59,1.09,12.86c0.51,3.73,1.27,7.54,2.97,10.92c1.58,3.15,4.04,5.72,6.94,7.69
+		c2.48,1.68,5.43,3.08,8.46,3.31c5.53,0.43,8.39-4.74,11.06-8.75c4.89-7.33,9.92-14.56,15.59-21.32
+		c5.39-6.41,11.15-12.55,18.05-17.36c6.64-4.63,14.39-8.78,22.41-10.29c7.13-1.34,14.45,0.28,19.91,5.21
+		c2.62,2.37,4.45,5.61,2.62,9.02c-1.52,2.84-4.75,4.81-7.21,6.76c-3.36,2.67-6.76,5.32-9.95,8.2c-6.38,5.74-12.3,11.95-18.09,18.27
+		c-5.93,6.46-12.22,12.8-17.23,20.03c-4.76,6.88-7.39,14.95-11.48,22.22c-3.96,7.04-9.09,13.16-14.46,19.15
+		c-6.19,6.9-12.44,13.74-18.2,21.01c-2.95,3.72-5.86,7.45-8.76,11.21c-2.29,2.97-4.67,5.82-7.61,8.18
+		c-3.19,2.57-6.76,4.64-9.89,7.29c-3.22,2.73-5.38,5.99-6.35,10.12c-0.97,4.11-1.19,8.45-1.46,12.66
+		c-0.27,4.32-0.35,8.65-0.39,12.98c-0.1,9.09,0.04,18.18,0.15,27.27c0.04,3.47,0.08,6.94,0.12,10.41L74.21,421.73z"/>
+</g>
+</svg>

media/species/human/male.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg2265" inkscape:version="0.43" sodipodi:docbase="C:\foo\wikipedia\transfer" sodipodi:docname="Silhouette.svg" sodipodi:version="0.32" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="82.97" height="240.7" viewBox="0 0 82.97 240.7"
+	 style="enable-background:new 0 0 82.97 240.7;" xml:space="preserve">
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="svg2265" inkscape:cx="61.124515" inkscape:cy="116.53524" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="540" inkscape:window-width="812" inkscape:window-x="66" inkscape:window-y="66" inkscape:zoom="1.1298716" pagecolor="#ffffff">
+	</sodipodi:namedview>
+<path id="path2279" d="M22.42,239.77c-0.35-0.57-0.35-2.55,0-4.42c0.46-2.46,0.04-4.56-1.57-7.7c-2.12-4.15-2.17-4.99-1.48-22.54
+	c0.71-18.1,0.7-18.23-1.48-19.4l-2.2-1.18l0.21-31.66c0.11-17.41,0.16-32.84,0.1-34.29c-0.07-1.65-1.78-4.36-4.59-7.3
+	c-2.46-2.57-6.12-7.6-8.12-11.18c-3.34-5.96-3.59-6.99-3.07-12.2c0.31-3.13,0.82-9.29,1.13-13.69c0.53-7.61,4.12-27.4,5.15-28.44
+	c0.27-0.27,2.38-1.21,4.69-2.09c5.38-2.05,18.7-10.8,19.47-12.8c0.32-0.84-0.15-3.58-1.04-6.1c-3.39-9.54-3.27-12,0.87-18.26
+	c4.18-6.33,5.81-7.08,13.49-6.23c7.38,0.82,9.77,1.95,10.53,4.97c0.86,3.42-0.19,13.43-1.55,14.79c-0.58,0.58-1.06,3.33-1.05,6.11
+	c0,6.3,2.88,11.55,6.33,11.55c3.32,0,7.52,2.3,12.08,6.61c3.8,3.59,3.94,3.96,4.63,12.3c0.98,11.81,4.02,22.06,7.18,24.19
+	c1.2,0.81,1.16,3.37-0.18,10.41c-0.63,3.3-1.33,7.34-1.57,8.98c-0.24,1.64-1.34,4.21-2.45,5.71c-1.11,1.5-2.02,3.39-2.02,4.19
+	c0,2.81-1.27,4.71-4.12,6.18l-2.88,1.49v13.03c0,7.17,0.43,16.04,0.95,19.72c0.52,3.68,1.16,12.49,1.41,19.57
+	c0.45,12.37,0.37,12.96-1.79,15c-2.93,2.75-4.04,9.95-3.68,23.92c0.19,7.38-0.11,11.27-0.94,12.27c-0.67,0.81-1.22,3.32-1.22,5.6
+	c0,3.62,0.51,4.55,4.14,7.57c6.79,5.64,5.96,6.27-8.19,6.27H47.22l1.01-5.55c0.77-4.24,0.67-6.78-0.4-10.75
+	c-0.93-3.42-1.42-10.56-1.43-20.9c-0.01-10.18-0.41-16.09-1.13-16.81c-0.74-0.74-2.24-0.82-4.5-0.24l-3.39,0.87l-0.79,12.94
+	c-0.49,8.05-0.4,15.19,0.23,18.89c0.82,4.78,0.74,6.38-0.41,8.13c-0.79,1.2-1.57,4.6-1.73,7.55l-0.31,5.37l-5.66,0.3
+	C25.58,240.66,22.77,240.34,22.42,239.77z"/>
+</svg>

presets/creatures.js

@@ -1,28 +1,5 @@
 function makeCreatures() {
     const results = [];
-    
-    results.push({
-        name: "Human",
-        constructor: () => makeObject(
-            "Human",
-            {
-                woman1: {
-                    height: math.unit(5 + 7 / 12, "feet"),
-                    mass: math.unit(140, "lbs"),
-                    energy: math.unit(1, "peopleEaten"),
-                    image: { source: "./media/food/humans/woman-1.svg" },
-                    name: "Woman 1"
-                },
-                man1: {
-                    height: math.unit(5 + 11 / 12, "feet"),
-                    mass: math.unit(150, "lbs"),
-                    energy: math.unit(1, "peopleEaten"),
-                    image: { source: "./media/food/humans/man-1.svg" },
-                    name: "Man 1"
-                },
-            }
-        )
-    });
 
     results.push(
         makeHeightWeight([

presets/food.js

@@ -120,29 +120,6 @@ function makeFood() {
         "food"
     ))
 
-    results.push({
-        name: "Human",
-        constructor: () => makeObject(
-            "Human",
-            {
-                woman1: {
-                    height: math.unit(5 + 7 / 12, "feet"),
-                    mass: math.unit(140, "lbs"),
-                    energy: math.unit(1, "peopleEaten"),
-                    image: { source: "./media/food/humans/woman-1.svg" },
-                    name: "Woman 1"
-                },
-                man1: {
-                    height: math.unit(5 + 11 / 12, "feet"),
-                    mass: math.unit(150, "lbs"),
-                    energy: math.unit(1, "peopleEaten"),
-                    image: { source: "./media/food/humans/man-1.svg" },
-                    name: "Man 1"
-                },
-            }
-        )
-    })
-
     results.sort((b1, b2) => {
         e1 = b1.constructor();
         e2 = b2.constructor();

presets/species.js

@@ -492,6 +492,51 @@ speciesMakers["Squirrel"] = () => makeCharacter(
     ]
 )
 
+speciesMakers["Human"] = () => makeCharacter(
+    { name: "Human", species: ["human"], tags: ["anthro"] },
+    {
+        female: {
+            height: math.unit(5 + 7/12, "feet"),
+            weight: math.unit(140, "lb"),
+            energy: math.unit(1, "peopleEaten"),
+            name: "Female",
+            image: {
+                source: "./media/species/human/female.svg"
+            }
+        },
+        male: {
+            height: math.unit(5 + 11/12, "feet"),
+            weight: math.unit(150, "lb"),
+            energy: math.unit(1, "peopleEaten"),
+            name: "Male",
+            image: {
+                source: "./media/species/human/male.svg"
+            }
+        },
+        hand: {
+            height: math.unit(7.2, "inches"),
+            name: "Hand",
+            image: {
+                source: "./media/species/human/hand.svg"
+            }
+        },
+        foot: {
+            height: math.unit(10.5, "inches"),
+            name: "Foot",
+            image: {
+                source: "./media/species/human/foot.svg"
+            }
+        },
+    },
+    [
+        {
+            name: "Human-Sized",
+            height: math.unit(5 + 7/12, "feet"),
+            default: true
+        },
+    ]
+)
+
 
 
 function makeSpecies() {