From 7b4355b120d447f0a5dce616a0fdbc69d6a04703 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Fri, 5 Nov 2021 21:25:23 -0400 Subject: [PATCH] Add Merrian --- media/attribution.js | 14 +- media/characters/merrian/front.svg | 728 +++++++++++++++++++++++++++++ presets/characters.js | 27 +- 3 files changed, 766 insertions(+), 3 deletions(-) create mode 100644 media/characters/merrian/front.svg diff --git a/media/attribution.js b/media/attribution.js index 808f4c6e..69fba475 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -18642,7 +18642,19 @@ const attributionData = { { prefix: "./media/characters/north-caudin/", files: [ - { name: "front.svg", source: "https://www.furaffinity.net/view/35672929/" } + { name: "front.svg", source: "https://www.furaffinity.net/view/35672929/", nsfw: true } + ], + authors: [ + "plat" + ], + owners: [ + "plat" + ] + }, + { + prefix: "./media/characters/merrian/", + files: [ + { name: "front.svg", source: "https://twitter.com/Platinumeggsart/status/1432449938189922312", nsfw: true } ], authors: [ "plat" diff --git a/media/characters/merrian/front.svg b/media/characters/merrian/front.svg new file mode 100644 index 00000000..dd184d96 --- /dev/null +++ b/media/characters/merrian/front.svg @@ -0,0 +1,728 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 476c9a33..54acfacd 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -50416,7 +50416,7 @@ characterMakers.push(() => makeCharacter( { front: { height: math.unit(9, "feet"), - weight: math.unit(750, "lb"), + weight: math.unit(1500, "lb"), name: "Front", image: { source: "./media/characters/nora/front.svg", @@ -50426,7 +50426,7 @@ characterMakers.push(() => makeCharacter( }, erect: { height: math.unit(9, "feet"), - weight: math.unit(10750, "lb"), + weight: math.unit(11500, "lb"), name: "Erect", image: { source: "./media/characters/nora/erect.svg", @@ -50467,6 +50467,29 @@ characterMakers.push(() => makeCharacter( ] )) +characterMakers.push(() => makeCharacter( + { name: "Merrian", species: ["caudin", "avian"], tags: ["anthro"] }, + { + front: { + height: math.unit(9, "feet"), + weight: math.unit(1250, "lb"), + name: "Front", + image: { + source: "./media/characters/merrian/front.svg", + extra: 2393/2304, + bottom: 40/2433 + } + }, + }, + [ + { + name: "Normal", + height: math.unit(9, "feet"), + default: true + }, + ] +)) + //characters function makeCharacters() {