From 001544c8389e7a87d017343a76fa37c852794db2 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 21 Mar 2020 18:23:32 -0400 Subject: [PATCH] Add Typhek; add universes/galaxies as lengths --- macrovision.js | 2 + media/attribution.js | 26 ++ media/characters/typhek/back.svg | 185 ++++++++++ media/characters/typhek/fist.svg | 97 ++++++ media/characters/typhek/foot.svg | 420 ++++++++++++++++++++++ media/characters/typhek/front.svg | 561 ++++++++++++++++++++++++++++++ media/characters/typhek/palm.svg | 298 ++++++++++++++++ media/characters/typhek/side.svg | 366 +++++++++++++++++++ media/characters/typhek/sole.svg | 232 ++++++++++++ presets/characters.js | 86 +++++ presets/naturals.js | 12 +- presets/objects.js | 17 + 12 files changed, 2296 insertions(+), 6 deletions(-) create mode 100644 media/characters/typhek/back.svg create mode 100644 media/characters/typhek/fist.svg create mode 100644 media/characters/typhek/foot.svg create mode 100644 media/characters/typhek/front.svg create mode 100644 media/characters/typhek/palm.svg create mode 100644 media/characters/typhek/side.svg create mode 100644 media/characters/typhek/sole.svg diff --git a/macrovision.js b/macrovision.js index e62f55fe..d6fa3098 100644 --- a/macrovision.js +++ b/macrovision.js @@ -41,6 +41,8 @@ const unitChoices = { "AUs", "lightyears", "parsecs", + "galaxies", + "universes" ], area: [ "meters^2", diff --git a/media/attribution.js b/media/attribution.js index f59685a6..b89e6b3f 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -7306,6 +7306,24 @@ const attributionData = { "deathywolfi" ] }, + { + prefix: "./media/characters/typhek/", + files: [ + { name: "front.svg", source: "https://www.furaffinity.net/view/26577537/" }, + { name: "side.svg", source: "https://www.furaffinity.net/view/26577537/" }, + { name: "back.svg", source: "https://www.furaffinity.net/view/26577537/" }, + { name: "palm.svg", source: "https://www.furaffinity.net/view/26577537/" }, + { name: "fist.svg", source: "https://www.furaffinity.net/view/26577537/" }, + { name: "foot.svg", source: "https://www.furaffinity.net/view/26577537/" }, + { name: "sole.svg", source: "https://www.furaffinity.net/view/26577537/" }, + ], + authors: [ + "st3ph3n" + ], + owners: [ + "adam0800" + ] + }, //characters { prefix: "./media/food/animals/", @@ -10152,6 +10170,14 @@ const attributionData = { "name": "pinklionart", "url": "https://www.furaffinity.net/user/pinklionart", }, + "st3ph3n": { + "name": "st3ph3n", + "url": "https://www.furaffinity.net/user/st3ph3n/", + }, + "adam0800": { + "name": "Adam0800", + "url": "https://www.furaffinity.net/user/adam0800", + }, } } diff --git a/media/characters/typhek/back.svg b/media/characters/typhek/back.svg new file mode 100644 index 00000000..738321bd --- /dev/null +++ b/media/characters/typhek/back.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/typhek/fist.svg b/media/characters/typhek/fist.svg new file mode 100644 index 00000000..513aa8c6 --- /dev/null +++ b/media/characters/typhek/fist.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/typhek/foot.svg b/media/characters/typhek/foot.svg new file mode 100644 index 00000000..3b02b7ba --- /dev/null +++ b/media/characters/typhek/foot.svg @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/typhek/front.svg b/media/characters/typhek/front.svg new file mode 100644 index 00000000..07a6fa87 --- /dev/null +++ b/media/characters/typhek/front.svg @@ -0,0 +1,561 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/typhek/palm.svg b/media/characters/typhek/palm.svg new file mode 100644 index 00000000..e5bb1cdc --- /dev/null +++ b/media/characters/typhek/palm.svg @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/typhek/side.svg b/media/characters/typhek/side.svg new file mode 100644 index 00000000..c3d28ff2 --- /dev/null +++ b/media/characters/typhek/side.svg @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/typhek/sole.svg b/media/characters/typhek/sole.svg new file mode 100644 index 00000000..10fe74e0 --- /dev/null +++ b/media/characters/typhek/sole.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 33f81ec5..666114f5 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -18075,6 +18075,92 @@ characterMakers["Sebi"] = () => { ) }; +characterMakers["Typhek"] = () => { + return makeCharacter( + "Typhek", + "Adam0800", + { + front: { + height: math.unit(6, "feet"), + weight: math.unit(150, "lb"), + name: "Front", + image: { + source: "./media/characters/typhek/front.svg", + extra: 1948/1929, + bottom: 0.025 + } + }, + side: { + height: math.unit(6, "feet"), + weight: math.unit(150, "lb"), + name: "Side", + image: { + source: "./media/characters/typhek/side.svg", + extra: 2034/2010, + bottom: 0.003 + } + }, + back: { + height: math.unit(6, "feet"), + weight: math.unit(150, "lb"), + name: "Back", + image: { + source: "./media/characters/typhek/back.svg", + extra: 2005/1978, + bottom: 0.004 + } + }, + palm: { + height: math.unit(1.2, "feet"), + name: "Palm", + image: { + source: "./media/characters/typhek/palm.svg" + } + }, + fist: { + height: math.unit(1.1, "feet"), + name: "Fist", + image: { + source: "./media/characters/typhek/fist.svg" + } + }, + foot: { + height: math.unit(1.57, "feet"), + name: "Foot", + image: { + source: "./media/characters/typhek/foot.svg" + } + }, + sole: { + height: math.unit(2.05, "feet"), + name: "Sole", + image: { + source: "./media/characters/typhek/sole.svg" + } + }, + }, + [ + { + name: "Macro", + height: math.unit(40, "stories"), + default: true + }, + { + name: "Megamacro", + height: math.unit(1, "mile") + }, + { + name: "Gigamacro", + height: math.unit(4000, "solarradii") + }, + { + name: "Universal", + height: math.unit(1.1, "universes") + } + ] + ) +}; + //characters function makeCharacters() { diff --git a/presets/naturals.js b/presets/naturals.js index 98561a91..75e15367 100644 --- a/presets/naturals.js +++ b/presets/naturals.js @@ -129,12 +129,12 @@ function makeNaturals() { results.push(makeHeightWeight( [ - ["Sun", 1, "solarradii", 1, "solarmasses", "./media/naturals/planet-generic.svg"], + ["Sun", 2*1, "solarradii", 1, "solarmasses", "./media/naturals/planet-generic.svg"], ["White Dwarf", 14000, "km", 1e30, "kg", "./media/naturals/planet-generic.svg"], - ["Polaris", 37.5, "solarradii", 5.4, "solarmasses", "./media/naturals/planet-generic.svg"], - ["Sun (Red Giant)", 256, "solarradii", 1, "solarmasses", "./media/naturals/planet-generic.svg"], - ["Betelgeuse", 887, "solarradii", 11.6, "solarmasses", "./media/naturals/planet-generic.svg"], - ["VY Canis Majoris", 1420, "solarradii", 17, "solarmasses", "./media/naturals/planet-generic.svg"], + ["Polaris", 2*37.5, "solarradii", 5.4, "solarmasses", "./media/naturals/planet-generic.svg"], + ["Sun (Red Giant)", 2*256, "solarradii", 1, "solarmasses", "./media/naturals/planet-generic.svg"], + ["Betelgeuse", 2*887, "solarradii", 11.6, "solarmasses", "./media/naturals/planet-generic.svg"], + ["VY Canis Majoris", 2*1420, "solarradii", 17, "solarmasses", "./media/naturals/planet-generic.svg"], ], "Stars", "", @@ -142,7 +142,7 @@ function makeNaturals() { )); results.push(makePlanet("Milky Way", math.unit(105700, "lightyears"), math.unit(3e+39, "kg"), { source: "./media/naturals/milky-way.svg" })); - results.push(makePlanet("Observable Universe", math.unit(93.016e9, "lightyears"), math.unit(10e53, "kg"))); + results.push(makePlanet("Observable Universe", math.unit(1, "universe"), math.unit(10e53, "kg"))); results.push(makePlanet("Multiverse", math.unit(1e30, "lightyears"), math.unit(1e100, "kg"))); results.push({ diff --git a/presets/objects.js b/presets/objects.js index 3fe164df..3d809b7f 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -14,6 +14,23 @@ math.createUnit("solarmasses", { definition: "2e30 kg", prefixes: "long" }); +math.createUnit("galaxy", { + definition: "105700 lightyears", + prefixes: "long" +}); +math.createUnit("galaxies", { + definition: "105700 lightyears", + prefixes: "long" +}); +math.createUnit("universe", { + definition: "93.016e9 lightyears", + prefixes: "long" +}); +math.createUnit("universes", { + definition: "93.016e9 lightyears", + prefixes: "long" +}); + function makeObject(name, viewInfo) { views = {};