From 06e6d58166d74e3ee8a53557b3862cd93240484e Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 17 Apr 2021 11:02:46 -0400 Subject: [PATCH] Move humans to the species category; add hands and feet --- macrovision.js | 6 +++++ media/attribution.js | 48 ++++++++++++++++++++-------------- media/species/human/female.svg | 17 ++++++++++++ media/species/human/foot.svg | 37 ++++++++++++++++++++++++++ media/species/human/hand.svg | 42 +++++++++++++++++++++++++++++ media/species/human/male.svg | 22 ++++++++++++++++ presets/creatures.js | 23 ---------------- presets/food.js | 23 ---------------- presets/species.js | 45 +++++++++++++++++++++++++++++++ 9 files changed, 198 insertions(+), 65 deletions(-) create mode 100644 media/species/human/female.svg create mode 100644 media/species/human/foot.svg create mode 100644 media/species/human/hand.svg create mode 100644 media/species/human/male.svg diff --git a/macrovision.js b/macrovision.js index 610ab301..406d0956 100644 --- a/macrovision.js +++ b/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 }); diff --git a/media/attribution.js b/media/attribution.js index 2c6bece2..72e91005 100644 --- a/media/attribution.js +++ b/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: [ diff --git a/media/species/human/female.svg b/media/species/human/female.svg new file mode 100644 index 00000000..0daf130f --- /dev/null +++ b/media/species/human/female.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/media/species/human/foot.svg b/media/species/human/foot.svg new file mode 100644 index 00000000..9c8da2c4 --- /dev/null +++ b/media/species/human/foot.svg @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/media/species/human/hand.svg b/media/species/human/hand.svg new file mode 100644 index 00000000..f0971b22 --- /dev/null +++ b/media/species/human/hand.svg @@ -0,0 +1,42 @@ + + + + + + + + diff --git a/media/species/human/male.svg b/media/species/human/male.svg new file mode 100644 index 00000000..49ef559d --- /dev/null +++ b/media/species/human/male.svg @@ -0,0 +1,22 @@ + + + + + + + diff --git a/presets/creatures.js b/presets/creatures.js index ad1b77db..caff80c7 100644 --- a/presets/creatures.js +++ b/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([ diff --git a/presets/food.js b/presets/food.js index fde6af6f..bab2810d 100644 --- a/presets/food.js +++ b/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(); diff --git a/presets/species.js b/presets/species.js index d742ac1d..07bf76c3 100644 --- a/presets/species.js +++ b/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() {