diff --git a/macrovision.html b/macrovision.html
index eb618b44..44ee0dfe 100644
--- a/macrovision.html
+++ b/macrovision.html
@@ -7,6 +7,7 @@
+
diff --git a/macrovision.js b/macrovision.js
index 66608ccb..8d576c4a 100644
--- a/macrovision.js
+++ b/macrovision.js
@@ -18,6 +18,10 @@ const unitChoices = {
"feet",
"miles",
],
+ area: [
+ "cm^2",
+ "meters^2"
+ ],
mass: [
"kilograms"
]
@@ -179,35 +183,41 @@ function makeFen() {
name: "Height",
power: 1,
type: "length",
- base: math.unit(1, "meter")
+ base: math.unit(2.2428, "meter")
},
weight: {
name: "Weight",
power: 3,
type: "mass",
- base: math.unit(80, "kg")
+ base: math.unit(124.738, "kg")
}
},
- image: "./silhouette.png",
+ image: "./media/characters/fen/back.png",
name: "Body"
},
- pepper: {
+ paw: {
attributes: {
height: {
- name: "Height",
+ name: "Length",
power: 1,
type: "length",
- base: math.unit(50, "centimeter")
+ base: math.unit(20, "centimeter")
},
- weight: {
- name: "Weight",
- power: 3,
- type: "mass",
- base: math.unit(1, "kg")
+ width: {
+ name: "Length",
+ power: 1,
+ type: "length",
+ base: math.unit(20, "centimeter")
+ },
+ area: {
+ name: "Area",
+ power: 2,
+ type: "area",
+ base: math.unit(0.04, "meter^2")
}
},
- image: "./pepper.png",
- name: "Pepper"
+ image: "./media/characters/generic/paw.svg",
+ name: "Paw"
}
};
@@ -552,12 +562,15 @@ function displayEntity(entity, view, x, y) {
}
document.addEventListener("DOMContentLoaded", () => {
- for (let x = 0; x < 5; x++) {
+ for (let x = 0; x < 1; x++) {
const entity = makeFen();
const x = 0.25 + Math.random() * 0.5;
- const y = 0.25 + Math.random() * 0.5;
+ const y = 1;
displayEntity(entity, "body", x, y);
+ displayEntity(makeBuilding(), "building", 1 - x, 1);
}
+
+
document.querySelector("body").appendChild(testCtx.canvas);
updateSizes();
diff --git a/media/buildings/eiffel-tower.svg b/media/buildings/eiffel-tower.svg
new file mode 100644
index 00000000..cc35910a
--- /dev/null
+++ b/media/buildings/eiffel-tower.svg
@@ -0,0 +1,8 @@
+
+
+
diff --git a/silhouette.png b/media/characters/fen/back.png
similarity index 100%
rename from silhouette.png
rename to media/characters/fen/back.png
diff --git a/media/characters/generic/paw.svg b/media/characters/generic/paw.svg
new file mode 100644
index 00000000..2b305928
--- /dev/null
+++ b/media/characters/generic/paw.svg
@@ -0,0 +1,65 @@
+
+
+
+
diff --git a/presets/buildings.js b/presets/buildings.js
new file mode 100644
index 00000000..df89aae8
--- /dev/null
+++ b/presets/buildings.js
@@ -0,0 +1,18 @@
+function makeBuilding() {
+ views = {
+ building: {
+ attributes: {
+ height: {
+ name: "Height",
+ power: 1,
+ type: "length",
+ base: math.unit(324, "meter")
+ }
+ },
+ image: "./media/buildings/eiffel-tower.svg",
+ name: "Building"
+ },
+ };
+
+ return makeEntity("Eiffel Tower", "Fen", views);
+}
\ No newline at end of file