From 0549e07a7d2890934fecee3c2439ab7a9a29bb7c Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Wed, 4 Mar 2020 09:18:40 -0500 Subject: [PATCH] Add vending machines and sycamore trees --- media/attribution.js | 18 +++ media/objects/plants/sycamore-tree.svg | 165 +++++++++++++++++++++++++ media/objects/vending-machine.svg | 30 +++++ presets/objects.js | 30 +++++ 4 files changed, 243 insertions(+) create mode 100644 media/objects/plants/sycamore-tree.svg create mode 100644 media/objects/vending-machine.svg diff --git a/media/attribution.js b/media/attribution.js index 59fa506d..bed53a61 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -3757,6 +3757,15 @@ const attributionData = { "chemicalcrux", ] }, + { + prefix: "./media/objects/", + files: [ + { name: "vending-machine.svg", source: "https://www.dimensions.guide/element/beverage-vending-machine" } + ], + authors: [ + "dimensions-guide" + ] + }, { prefix: "./media/objects/humans/", files: [ @@ -3776,6 +3785,15 @@ const attributionData = { ] }, + { + prefix: "./media/objects/plants/", + files: [ + { name: "sycamore-tree.svg", source: "https://www.dimensions.guide/element/sycamore-tree" } + ], + authors: [ + "dimensions-guide" + ] + }, { prefix: "./media/vehicles/", files: [ diff --git a/media/objects/plants/sycamore-tree.svg b/media/objects/plants/sycamore-tree.svg new file mode 100644 index 00000000..620403b0 --- /dev/null +++ b/media/objects/plants/sycamore-tree.svg @@ -0,0 +1,165 @@ + + + + + + + + + diff --git a/media/objects/vending-machine.svg b/media/objects/vending-machine.svg new file mode 100644 index 00000000..c6bdc4bb --- /dev/null +++ b/media/objects/vending-machine.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/objects.js b/presets/objects.js index 3c5f0032..12f93fff 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -439,6 +439,36 @@ function makeObjects() { ) }); + results.push({ + name: "Trees", + constructor: () => makeObject( + "Trees", + { + sycamore: { + height: math.unit(35, "meters"), + image: { source: "./media/objects/plants/sycamore-tree.svg" }, + name: "Sycamore", + rename: true + } + } + ) + }) + + results.push({ + name: "Vending Machine", + constructor: () => makeObject( + "Vending Machine", + { + object: { + height: math.unit(183, "cm"), + mass: math.unit(347, "kg"), + image: { source: "./media/objects/vending-machine.svg" }, + name: "Vending Machine" + } + } + ) + }) + results.sort((b1, b2) => { e1 = b1.constructor();