From cc55805f92f3eb18d1dbd49bf08f471d8e933621 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Wed, 26 Feb 2020 08:24:12 -0500 Subject: [PATCH] Add Cobalt. Fix a few characters not showing up in the preset secnes. Add an everyone scene --- media/attribution.js | 20 ++ media/characters/cobalt/front.svg | 340 ++++++++++++++++++++++++++++++ presets/characters.js | 32 +++ presets/scenes.js | 13 +- 4 files changed, 399 insertions(+), 6 deletions(-) create mode 100644 media/characters/cobalt/front.svg diff --git a/media/attribution.js b/media/attribution.js index 9837660a..7a51954d 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -251,6 +251,18 @@ const attributionData = { "movler" ] }, + { + prefix: "./media/characters/cobalt/", + files: [ + { name: "front.svg", source: "https://www.furaffinity.net/view/34983155/" } + ], + authors: [ + "spaceweasel-2306" + ], + owners: [ + "miateshcha" + ] + }, { prefix: "./media/characters/dannik/", files: [ @@ -929,6 +941,10 @@ const attributionData = { name: "Mallowchu", url: "https://www.furaffinity.net/user/mallowchu" }, + "miateshcha": { + name: "Miateshcha", + url: "https://www.furaffinity.net/user/miateshcha/" + }, "mizumisensei": { name: "Mizumisensei", url: "https://twitter.com/mizumisensei" @@ -1001,6 +1017,10 @@ const attributionData = { name: "Sol", url: "https://twitter.com/Solaxee" }, + "spaceweasel-2306": { + name: "spaceweasel2306", + url: "https://www.furaffinity.net/user/spaceweasel2306/" + }, "spyropurple": { name: "spyropurple", url: "https://www.furaffinity.net/user/spyropurple/" diff --git a/media/characters/cobalt/front.svg b/media/characters/cobalt/front.svg new file mode 100644 index 00000000..cd7f2287 --- /dev/null +++ b/media/characters/cobalt/front.svg @@ -0,0 +1,340 @@ + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 6d9cd006..ff72abd8 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -5228,6 +5228,38 @@ characterMakers["Razinox"] = () => { ) }; +characterMakers["Cobalt"] = () => { + return makeCharacter( + "Cobalt", + "Miateshcha", + { + front: { + height: math.unit(6, "feet"), + weight: math.unit(150, "lbs"), + name: "Front", + image: { + source: "./media/characters/cobalt/front.svg" + } + } + }, + [ + { + name: "Normal", + height: math.unit(8 + 1/12, "foot") + }, + { + name: "Macro", + height: math.unit(111, "foot"), + default: true + }, + { + name: "Supracosmic", + height: math.unit(1e42, "feet") + }, + ] + ) +}; + function makeCharacters() { const results = []; diff --git a/presets/scenes.js b/presets/scenes.js index 1ce8a3bc..48f2fbff 100644 --- a/presets/scenes.js +++ b/presets/scenes.js @@ -55,7 +55,7 @@ function makeSlice(min, max) { return () => { const characters = availableEntities["characters"].filter(x => { const entity = x.constructor(); - return math.compare(entity.views[entity.view].height, min) == 1 && math.compare(entity.views[entity.view].height, max) == -1 + return math.compare(entity.views[entity.view].height, min) == 1 && math.compare(entity.views[entity.view].height, max) != 1 }); characters.forEach(character => { @@ -69,11 +69,12 @@ function makeSlice(min, max) { } scenes["x < 10m"] = makeSlice(math.unit(0, "meters"), math.unit(10, "meters")); -scenes["10m < x < 100m"] = makeSlice(math.unit(10, "meters"), math.unit(100, "meters")); -scenes["100m < x < 1km"] = makeSlice(math.unit(100, "meters"), math.unit(1000, "meters")); -scenes["1km < x < 10km"] = makeSlice(math.unit(1000, "meters"), math.unit(10000, "meters")); -scenes["10km < x < 100km"] = makeSlice(math.unit(10000, "meters"), math.unit(100000, "meters")); -scenes["100km < x < 1000km"] = makeSlice(math.unit(100000, "meters"), math.unit(1000000, "meters")); +scenes["10m < x <= 100m"] = makeSlice(math.unit(10, "meters"), math.unit(100, "meters")); +scenes["100m < x <= 1km"] = makeSlice(math.unit(100, "meters"), math.unit(1000, "meters")); +scenes["1km < x <= 10km"] = makeSlice(math.unit(1000, "meters"), math.unit(10000, "meters")); +scenes["10km < x <= 100km"] = makeSlice(math.unit(10000, "meters"), math.unit(100000, "meters")); +scenes["100km < x <= 1000km"] = makeSlice(math.unit(100000, "meters"), math.unit(1000000, "meters")); +scenes["Everyone"] = makeSlice(math.unit(0.000000000000000001, "meters"), math.unit(1000000e100, "meters")); scenes["Kurri"] = () => { availableEntities["characters"].filter(x => {