diff --git a/media/attribution.js b/media/attribution.js index 6a3d2022..f4f377ba 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -22592,6 +22592,26 @@ const attributionData = { "halo" ] }, + { + prefix: "./media/fiction/Star Wars/", + all: null, + authors: [ + "kavaeric" + ], + owners: [ + "star-wars" + ] + }, + { + prefix: "./media/fiction/Mass Effect/", + all: null, + authors: [ + "kavaeric" + ], + owners: [ + "star-wars" + ] + }, { prefix: "./media/food/animals/", files: [ @@ -31199,6 +31219,14 @@ const attributionData = { "name": "Kavaeric", "url": "https://twitter.com/Kavaeric" }, + "star-wars": { + "name": "Star Wars", + "url": "https://www.starwars.com" + }, + "mass-effect": { + "name": "Mass Effect", + "url": "https://www.ea.com/games/mass-effect" + }, } } diff --git a/media/fiction/Mass Effect/Normandy SR-1-Front.svg b/media/fiction/Mass Effect/Normandy SR-1-Front.svg new file mode 100644 index 00000000..9838875d --- /dev/null +++ b/media/fiction/Mass Effect/Normandy SR-1-Front.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/fiction/Mass Effect/Normandy SR-1-Side.svg b/media/fiction/Mass Effect/Normandy SR-1-Side.svg new file mode 100644 index 00000000..e48dd032 --- /dev/null +++ b/media/fiction/Mass Effect/Normandy SR-1-Side.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/fiction/Mass Effect/Normandy SR-1-Top.svg b/media/fiction/Mass Effect/Normandy SR-1-Top.svg new file mode 100644 index 00000000..73b15901 --- /dev/null +++ b/media/fiction/Mass Effect/Normandy SR-1-Top.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/fiction/Mass Effect/Normandy SR-2-Front.svg b/media/fiction/Mass Effect/Normandy SR-2-Front.svg new file mode 100644 index 00000000..9838875d --- /dev/null +++ b/media/fiction/Mass Effect/Normandy SR-2-Front.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/fiction/Mass Effect/Normandy SR-2-Side.svg b/media/fiction/Mass Effect/Normandy SR-2-Side.svg new file mode 100644 index 00000000..e48dd032 --- /dev/null +++ b/media/fiction/Mass Effect/Normandy SR-2-Side.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/fiction/Mass Effect/Normandy SR-2-Top.svg b/media/fiction/Mass Effect/Normandy SR-2-Top.svg new file mode 100644 index 00000000..73b15901 --- /dev/null +++ b/media/fiction/Mass Effect/Normandy SR-2-Top.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/fiction/Star Wars/Death Star I-Side.svg b/media/fiction/Star Wars/Death Star I-Side.svg new file mode 100644 index 00000000..fa77223d --- /dev/null +++ b/media/fiction/Star Wars/Death Star I-Side.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/fiction/Star Wars/Death Star II-Side.svg b/media/fiction/Star Wars/Death Star II-Side.svg new file mode 100644 index 00000000..1e128c3e --- /dev/null +++ b/media/fiction/Star Wars/Death Star II-Side.svg @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/fiction/Star Wars/Executor Super Star Destroyer-Front.svg b/media/fiction/Star Wars/Executor Super Star Destroyer-Front.svg new file mode 100644 index 00000000..90e7b8f3 --- /dev/null +++ b/media/fiction/Star Wars/Executor Super Star Destroyer-Front.svg @@ -0,0 +1,27 @@ + + + + + + + diff --git a/media/fiction/Star Wars/Executor Super Star Destroyer-Side.svg b/media/fiction/Star Wars/Executor Super Star Destroyer-Side.svg new file mode 100644 index 00000000..e50fee53 --- /dev/null +++ b/media/fiction/Star Wars/Executor Super Star Destroyer-Side.svg @@ -0,0 +1,30 @@ + + + + + + + diff --git a/media/fiction/Star Wars/Executor Super Star Destroyer-Top.svg b/media/fiction/Star Wars/Executor Super Star Destroyer-Top.svg new file mode 100644 index 00000000..cd4f1829 --- /dev/null +++ b/media/fiction/Star Wars/Executor Super Star Destroyer-Top.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Front.svg b/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Front.svg new file mode 100644 index 00000000..c794bfbd --- /dev/null +++ b/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Front.svg @@ -0,0 +1,22 @@ + + + + + + + diff --git a/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Side.svg b/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Side.svg new file mode 100644 index 00000000..11abdb74 --- /dev/null +++ b/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Side.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Top.svg b/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Top.svg new file mode 100644 index 00000000..71ca2ba3 --- /dev/null +++ b/media/fiction/Star Wars/Imperial I-Class Star Destroyer-Top.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/presets/fiction.js b/presets/fiction.js index 63f724a6..23c2ac32 100644 --- a/presets/fiction.js +++ b/presets/fiction.js @@ -3,50 +3,149 @@ function makeFiction() { results.push({ name: "Halo", - constructor: () => makeObject( - "Halo", - { + constructor: () => + makeObject("Halo", { side: { height: math.unit(10000, "km"), mass: math.unit(1e17, "kg"), image: { source: "./media/fiction/halo/halo/side.svg" }, - name: "Side" + name: "Side", }, edge: { height: math.unit(318, "km"), mass: math.unit(1e17, "kg"), image: { source: "./media/fiction/halo/halo/edge.svg" }, - name: "Edge" + name: "Edge", }, angled: { height: math.unit(8819.1, "km"), mass: math.unit(1e17, "kg"), image: { source: "./media/fiction/halo/halo/angled.svg" }, - name: "Angled" + name: "Angled", }, - } - ) + }), }); results.push({ name: "Traveler", - constructor: () => makeObject( - "Traveler", - { + constructor: () => + makeObject("Traveler", { orb: { height: math.unit(14, "km"), image: { source: "./media/naturals/planet-generic.svg" }, - name: "ORB" + name: "ORB", }, - } - ) + }), }); + results.push( + makeModel({ + name: "Star Wars", + kind: "fiction", + forms: [ + { + name: "Death Star I", + views: [ + { + name: "Side", + height: 120000, + volume: 9.04778684234e+14 + }, + ], + }, + { + name: "Death Star II", + views: [ + { + name: "Side", + height: 180000, + volume: 3.0536281e+15 + }, + ], + }, + { + name: "Executor Super Star Destroyer", + views: [ + { + name: "Side", + height: 1345 + }, + { + name: "Front", + height: 1345 + }, + { + name: "Top", + height: 4930 + }, + ] + }, + { + name: "Imperial I-Class Star Destroyer", + views: [ + { + name: "Side", + height: 475 + }, + { + name: "Front", + height: 475 + }, + { + name: "Top", + height: 900 + }, + ] + }, + ], + }) + ); + + results.push( + makeModel({ + name: "Mass Effect", + kind: "fiction", + forms: [ + { + name: "Normandy SR-1", + views: [ + { + name: "Side", + height: 37.5 + }, + { + name: "Front", + height: 37.5 + }, + { + name: "Top", + height: 69.5 + }, + ] + }, + { + name: "Normandy SR-2", + views: [ + { + name: "Side", + height: 48.5294117647 + }, + { + name: "Front", + height: 48.5294117647 + }, + { + name: "Top", + height: 97 + }, + ] + }, + ] + }) + ); results.sort((b1, b2) => { - e1 = b1.constructor(); - e2 = b2.constructor(); - return -math.subtract(e1.views[e1.defaultView].height, e2.views[e2.defaultView].height).value; + return b1.name.localeCompare(b2.name); }); return results;