From c8e1effb27a868a6568226b556d7256dd544ed26 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 9 Oct 2021 19:42:00 -0400 Subject: [PATCH] Combine all of Moonlight Rose's forms into one character --- media/attribution.js | 15 +- .../characters/moonlight-rose-terra/front.svg | 873 ------- media/characters/moonlight-rose/demon.svg | 2206 ++++++++++++----- .../jupiter-front.svg} | 0 .../neptune-front.svg} | 0 .../characters/moonlight-rose/normal-back.svg | 383 +++ .../moonlight-rose/normal-front.svg | 634 +++++ media/characters/moonlight-rose/normal.svg | 328 --- media/characters/moonlight-rose/terra.svg | 940 +++++++ presets/characters.js | 262 +- 10 files changed, 3669 insertions(+), 1972 deletions(-) delete mode 100644 media/characters/moonlight-rose-terra/front.svg rename media/characters/{moonlight-rose-jupiter/front.svg => moonlight-rose/jupiter-front.svg} (100%) rename media/characters/{moonlight-rose-neptune/front.svg => moonlight-rose/neptune-front.svg} (100%) create mode 100644 media/characters/moonlight-rose/normal-back.svg create mode 100644 media/characters/moonlight-rose/normal-front.svg delete mode 100644 media/characters/moonlight-rose/normal.svg create mode 100644 media/characters/moonlight-rose/terra.svg diff --git a/media/attribution.js b/media/attribution.js index 1ac908d0..12bbb374 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -13644,7 +13644,8 @@ const attributionData = { { prefix: "./media/characters/moonlight-rose/", files: [ - { name: "normal.svg", source: "https://twitter.com/Lun_n_Em/status/1259452018378387463" } + { name: "normal-front.svg", source: "https://twitter.com/Lun_n_Em/status/1259452018378387463" }, + { name: "normal-back.svg", source: "https://twitter.com/Lun_n_Em/status/1259452018378387463" }, ], authors: [ "galaxeaaa" @@ -13666,9 +13667,9 @@ const attributionData = { ] }, { - prefix: "./media/characters/moonlight-rose-terra/", + prefix: "./media/characters/moonlight-rose/", files: [ - { name: "front.svg", source: "https://twitter.com/Cassettewaves/status/1352695333642522625 " } + { name: "terra.svg", source: "https://twitter.com/Cassettewaves/status/1352695333642522625 " } ], authors: [ "cassettewaves" @@ -13678,9 +13679,9 @@ const attributionData = { ] }, { - prefix: "./media/characters/moonlight-rose-neptune/", + prefix: "./media/characters/moonlight-rose/", files: [ - { name: "front.svg", source: "https://twitter.com/CatTinyPaws/status/1347268340469923840" } + { name: "neptune-front.svg", source: "https://twitter.com/CatTinyPaws/status/1347268340469923840" } ], authors: [ "cattinypaws" @@ -13690,9 +13691,9 @@ const attributionData = { ] }, { - prefix: "./media/characters/moonlight-rose-jupiter/", + prefix: "./media/characters/moonlight-rose/", files: [ - { name: "front.svg", source: "https://twitter.com/BentoBox_Art/status/136254863118256537" } + { name: "jupiter-front.svg", source: "https://twitter.com/BentoBox_Art/status/136254863118256537" } ], authors: [ "bentobox-art" diff --git a/media/characters/moonlight-rose-terra/front.svg b/media/characters/moonlight-rose-terra/front.svg deleted file mode 100644 index dbdbe19a..00000000 --- a/media/characters/moonlight-rose-terra/front.svg +++ /dev/null @@ -1,873 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/moonlight-rose/demon.svg b/media/characters/moonlight-rose/demon.svg index edae82e6..2c59ec54 100644 --- a/media/characters/moonlight-rose/demon.svg +++ b/media/characters/moonlight-rose/demon.svg @@ -1,661 +1,1569 @@ - + + width="1232.13" height="1444.884" viewBox="0 0 1232.13 1444.884" style="enable-background:new 0 0 1232.13 1444.884;" xml:space="preserve"> - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/moonlight-rose-jupiter/front.svg b/media/characters/moonlight-rose/jupiter-front.svg similarity index 100% rename from media/characters/moonlight-rose-jupiter/front.svg rename to media/characters/moonlight-rose/jupiter-front.svg diff --git a/media/characters/moonlight-rose-neptune/front.svg b/media/characters/moonlight-rose/neptune-front.svg similarity index 100% rename from media/characters/moonlight-rose-neptune/front.svg rename to media/characters/moonlight-rose/neptune-front.svg diff --git a/media/characters/moonlight-rose/normal-back.svg b/media/characters/moonlight-rose/normal-back.svg new file mode 100644 index 00000000..fb7ad55c --- /dev/null +++ b/media/characters/moonlight-rose/normal-back.svg @@ -0,0 +1,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/moonlight-rose/normal-front.svg b/media/characters/moonlight-rose/normal-front.svg new file mode 100644 index 00000000..cb9af59b --- /dev/null +++ b/media/characters/moonlight-rose/normal-front.svg @@ -0,0 +1,634 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/moonlight-rose/normal.svg b/media/characters/moonlight-rose/normal.svg deleted file mode 100644 index 7452e7fa..00000000 --- a/media/characters/moonlight-rose/normal.svg +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/moonlight-rose/terra.svg b/media/characters/moonlight-rose/terra.svg new file mode 100644 index 00000000..71480be5 --- /dev/null +++ b/media/characters/moonlight-rose/terra.svg @@ -0,0 +1,940 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 0ca49c38..ab98ce4d 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -35869,46 +35869,172 @@ characterMakers.push(() => makeCharacter( )) characterMakers.push(() => makeCharacter( - { name: "Moonlight Rose", species: ["eevee"], tags: ["anthro"] }, + { name: "Moonlight Rose", species: ["eevee", "leafeon", "jolteon", "demon", "vaporeon"], tags: ["anthro"] }, { - normal: { + normalFront: { height: math.unit(5 + 11/12, "feet"), - name: "Normal", + name: "Front", image: { - source: "./media/characters/moonlight-rose/normal.svg", - extra: 1979/1835, - bottom: 14/1993 - } + source: "./media/characters/moonlight-rose/normal-front.svg", + extra: 1980/1825, + bottom: 18/1998 + }, + form: "normal", + default: true }, - demon: { - height: math.unit(5, "km"), - name: "Demon", + normalBack: { + height: math.unit(5 + 11/12, "feet"), + name: "Back", + image: { + source: "./media/characters/moonlight-rose/normal-back.svg", + extra: 2010/1839, + bottom: 10/2020 + }, + form: "normal" + }, + demonFront: { + height: math.unit(1.5, "earths"), + name: "Front", image: { source: "./media/characters/moonlight-rose/demon.svg", - extra: 986/916, - bottom: 28/1014 - } + extra: 1400/1294, + bottom: 45/1445 + }, + form: "demon", + default: true + }, + terraFront: { + height: math.unit(1.5, "earths"), + name: "Front", + image: { + source: "./media/characters/moonlight-rose/terra.svg" + }, + form: "terra", + default: true + }, + jupiterFront: { + height: math.unit(69911*2, "km"), + name: "Front", + image: { + source: "./media/characters/moonlight-rose/jupiter-front.svg", + extra: 1367/1286, + bottom: 55/1422 + }, + form: "jupiter", + default: true + }, + neptuneFront: { + height: math.unit(24622*2, "feet"), + name: "Front", + image: { + source: "./media/characters/moonlight-rose/neptune-front.svg", + extra: 1851/1712, + bottom: 0/1851 + }, + form: "neptune", + default: true }, }, [ { - name: "\"Natural\" height", - height: math.unit(5 + 11/12, "feet") + name: "\"Natural\" Height", + height: math.unit(5 + 11/12, "feet"), + form: "normal" }, { - name: "Comfortable Size", - height: math.unit(40, "meters") + name: "Smallest comfortable size", + height: math.unit(40, "meters"), + form: "normal" }, { - name: "Common Size", + name: "Common size", height: math.unit(50, "km"), + form: "normal", default: true }, { - name: "Demonic", - height: math.unit(1.24415e+21, "meters") + name: "Normal", + height: math.unit(1.5, "earths"), + form: "demon", + default: true }, - ] + { + name: "Universal", + height: math.unit(15, "universes"), + form: "demon" + }, + { + name: "Earth", + height: math.unit(1.5, "earths"), + form: "terra", + default: true + }, + { + name: "Super Earth", + height: math.unit(67.5, "earths"), + form: "terra" + }, + { + name: "Doesn't fit in a solar system...", + height: math.unit(1, "galaxy"), + form: "terra" + }, + { + name: "Saturn", + height: math.unit(58232*2, "km"), + form: "jupiter" + }, + { + name: "Jupiter", + height: math.unit(69911*2, "km"), + form: "jupiter", + default: true + }, + { + name: "HD 100546 b", + height: math.unit(482938, "km"), + form: "jupiter" + }, + { + name: "Enceladus", + height: math.unit(513*2, "km"), + form: "neptune" + }, + { + name: "Europe", + height: math.unit(1560*2, "km"), + form: "neptune" + }, + { + name: "Neptune", + height: math.unit(24622*2, "km"), + form: "neptune", + default: true + }, + { + name: "CoRoT-9b", + height: math.unit(75067*2, "km"), + form: "neptune" + }, + ], + { + "normal": { + name: "Normal", + default: true + }, + "demon": { + name: "Demon" + }, + "terra": { + name: "Terra" + }, + "jupiter": { + name: "Jupiter" + }, + "neptune": { + name: "Neptune" + } + } )) characterMakers.push(() => makeCharacter( @@ -42489,100 +42615,6 @@ characterMakers.push(() => makeCharacter( ] )) -characterMakers.push(() => makeCharacter( - { name: "Moonlight Rose (Terra)", species: ["leafeon"], tags: ["anthro"] }, - { - front: { - height: math.unit(6, "feet"), - name: "Front", - image: { - source: "./media/characters/moonlight-rose-terra/front.svg", - extra: 1434/1252, - bottom: 48/1482 - } - }, - }, - [ - { - name: "TRAPPIST-1D", - height: math.unit(4992*2, "km") - }, - { - name: "Earth", - height: math.unit(6367*2, "km"), - default: true - }, - { - name: "Kepler-22b", - height: math.unit(15282*2, "km") - }, - ] -)) - -characterMakers.push(() => makeCharacter( - { name: "Moonlight Rose (Neptune)", species: ["vaporeon"], tags: ["anthro"] }, - { - front: { - height: math.unit(6, "feet"), - name: "Front", - image: { - source: "./media/characters/moonlight-rose-neptune/front.svg", - extra: 1851/1712, - bottom: 0/1851 - } - }, - }, - [ - { - name: "Enceladus", - height: math.unit(513*2, "km") - }, - { - name: "Europe", - height: math.unit(1560*2, "km") - }, - { - name: "Neptune", - height: math.unit(24622*2, "km"), - default: true - }, - { - name: "CoRoT-9b", - height: math.unit(75067*2, "km") - }, - ] -)) - -characterMakers.push(() => makeCharacter( - { name: "Moonlight Rose (Jupiter)", species: ["jolteon"], tags: ["anthro"] }, - { - front: { - height: math.unit(6, "feet"), - name: "Front", - image: { - source: "./media/characters/moonlight-rose-jupiter/front.svg", - extra: 1367/1286, - bottom: 55/1422 - } - }, - }, - [ - { - name: "Saturn", - height: math.unit(58232*2, "km") - }, - { - name: "Jupiter", - height: math.unit(69911*2, "km"), - default: true - }, - { - name: "HD 100546 b", - height: math.unit(482938, "km") - }, - ] -)) - characterMakers.push(() => makeCharacter( { name: "Dechroma", species: ["dragon", "plant"], tags: ["anthro"] }, {