From d546583d5086320d7293be23b591e0ba3dccd0d2 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Wed, 5 Feb 2020 12:00:23 -0500
Subject: [PATCH] Allow feet/miles. Make entity creation more generic

---
 macrovision.html |  2 ++
 macrovision.js   | 93 +++++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/macrovision.html b/macrovision.html
index 92a4ebc5..eb618b44 100644
--- a/macrovision.html
+++ b/macrovision.html
@@ -35,6 +35,8 @@
           <select class="options-field-unit" id="options-height-unit">
             <option>meters</option>
             <option>kilometers</option>
+            <option>feet</option>
+            <option>miles</option>
           </select>
         </div>
       </span>
diff --git a/macrovision.js b/macrovision.js
index b0f8e5d6..66608ccb 100644
--- a/macrovision.js
+++ b/macrovision.js
@@ -14,7 +14,9 @@ let altHeld = false;
 const unitChoices = {
     length: [
         "meters",
-        "kilometers"
+        "kilometers",
+        "feet",
+        "miles",
     ],
     mass: [
         "kilograms"
@@ -169,49 +171,54 @@ function drawScale() {
     drawTicks(ctx, pixelsPer, heightPer);
 }
 
-function makeEntity() {
-    const entityTemplate = {
-        name: "",
-        author: "",
-        scale: 1,
-        views: {
-            body: {
-                attributes: {
-                    height: {
-                        name: "Height",
-                        power: 1,
-                        type: "length",
-                        base: math.unit(1, "meter")
-                    },
-                    weight: {
-                        name: "Weight",
-                        power: 3,
-                        type: "mass",
-                        base: math.unit(80, "kg")
-                    }
+function makeFen() {
+    const views = {
+        body: {
+            attributes: {
+                height: {
+                    name: "Height",
+                    power: 1,
+                    type: "length",
+                    base: math.unit(1, "meter")
                 },
-                image: "./silhouette.png",
-                name: "Body"
+                weight: {
+                    name: "Weight",
+                    power: 3,
+                    type: "mass",
+                    base: math.unit(80, "kg")
+                }
             },
-            pepper: {
-                attributes: {
-                    height: {
-                        name: "Height",
-                        power: 1,
-                        type: "length",
-                        base: math.unit(50, "centimeter")
-                    },
-                    weight: {
-                        name: "Weight",
-                        power: 3,
-                        type: "mass",
-                        base: math.unit(1, "kg")
-                    }
-                },
-                image: "./pepper.png",
-                name: "Pepper"
-            }
+            image: "./silhouette.png",
+            name: "Body"
         },
+        pepper: {
+            attributes: {
+                height: {
+                    name: "Height",
+                    power: 1,
+                    type: "length",
+                    base: math.unit(50, "centimeter")
+                },
+                weight: {
+                    name: "Weight",
+                    power: 3,
+                    type: "mass",
+                    base: math.unit(1, "kg")
+                }
+            },
+            image: "./pepper.png",
+            name: "Pepper"
+        }
+    };
+
+    return makeEntity("Fen", "Fen", views);
+}
+function makeEntity(name, author, views) {
+    const entityTemplate = {
+        name: name,
+        author: author,
+        scale: 1,
+        views: views,
         init: function () {
             Object.values(this.views).forEach(view => {
                 view.parent = this;
@@ -546,9 +553,7 @@ function displayEntity(entity, view, x, y) {
 
 document.addEventListener("DOMContentLoaded", () => {
     for (let x = 0; x < 5; x++) {
-        const entity = makeEntity();
-        entity.name = "Dude";
-        entity.author = "Fen"
+        const entity = makeFen();
         const x = 0.25 + Math.random() * 0.5;
         const y = 0.25 + Math.random() * 0.5;
         displayEntity(entity, "body", x, y);