From 5b88a8463941c5e4f8052c1b358a5d3a5504b8e1 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Thu, 7 Oct 2021 16:40:57 -0400 Subject: [PATCH] Update Sini's views Also fix a bug with wrong sizing for multiple forms. The last default size encountered was being used, rather than using the one that matched the default form. --- macrovision.js | 5 + media/attribution.js | 18 +- media/characters/sini/back-anthro-nsfw.svg | 734 ++++++++ media/characters/sini/back-anthro.svg | 717 +++++++ media/characters/sini/back.svg | 282 --- media/characters/sini/dick-anthro.svg | 358 ++-- media/characters/sini/dick-feral.svg | 221 +++ media/characters/sini/eye-feral.svg | 105 ++ media/characters/sini/feral-nsfw.svg | 1407 ++++++++++++++ media/characters/sini/feral.svg | 1865 +++++++++++++------ media/characters/sini/foot-feral.svg | 99 - media/characters/sini/front-anthro-nsfw.svg | 876 +++++++++ media/characters/sini/front-anthro.svg | 825 ++++++++ media/characters/sini/front.svg | 389 ---- media/characters/sini/maw-anthro.svg | 1199 ++++++++---- media/characters/sini/maw-feral.svg | 481 +++-- media/characters/sini/paw-feral.svg | 237 +++ media/characters/sini/rump-feral.svg | 296 +++ presets/characters.js | 115 +- 19 files changed, 8247 insertions(+), 1982 deletions(-) create mode 100644 media/characters/sini/back-anthro-nsfw.svg create mode 100644 media/characters/sini/back-anthro.svg delete mode 100644 media/characters/sini/back.svg create mode 100644 media/characters/sini/dick-feral.svg create mode 100644 media/characters/sini/eye-feral.svg create mode 100644 media/characters/sini/feral-nsfw.svg delete mode 100644 media/characters/sini/foot-feral.svg create mode 100644 media/characters/sini/front-anthro-nsfw.svg create mode 100644 media/characters/sini/front-anthro.svg delete mode 100644 media/characters/sini/front.svg create mode 100644 media/characters/sini/paw-feral.svg create mode 100644 media/characters/sini/rump-feral.svg diff --git a/macrovision.js b/macrovision.js index 058bbfbf..ce9fd9ab 100644 --- a/macrovision.js +++ b/macrovision.js @@ -1227,6 +1227,11 @@ function makeEntity(info, views, sizes, forms = {}) { this.sizes.forEach(size => { if (size.default === true) { + if (Object.keys(forms).length > 0) { + if (this.defaultForm !== size.form) { + return; + } + } this.views[this.defaultView].height = size.height; this.size = size; } diff --git a/media/attribution.js b/media/attribution.js index 769797ee..04b46355 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -12967,13 +12967,19 @@ const attributionData = { { prefix: "./media/characters/sini/", files: [ - { name: "front.svg", source: "https://www.furaffinity.net/view/38214389/", nsfw: true }, - { name: "back.svg", source: "https://www.furaffinity.net/view/38214389/", nsfw: true }, - { name: "maw-anthro.svg", source: "https://www.furaffinity.net/view/38214389/", nsfw: false }, + { name: "back-anthro-nsfw.svg", source: "https://www.furaffinity.net/view/38214389/", nsfw: true }, + { name: "back-anthro.svg", source: "https://www.furaffinity.net/view/38583617/", nsfw: false }, { name: "dick-anthro.svg", source: "https://www.furaffinity.net/view/38214389/", nsfw: true }, - { name: "feral.svg", source: "https://www.furaffinity.net/view/38214429/", nsfw: false }, - { name: "maw-feral.svg", source: "https://www.furaffinity.net/view/38214429/", nsfw: false }, - { name: "foot-feral.svg", source: "https://www.furaffinity.net/view/38214429/", nsfw: false }, + { name: "dick-feral.svg", source: "https://www.furaffinity.net/view/38214429/", nsfw: true }, + { name: "eye-feral.svg", source: "https://www.furaffinity.net/view/38583647/", nsfw: false }, + { name: "feral-nsfw.svg", source: "https://www.furaffinity.net/view/38214429/", nsfw: true }, + { name: "feral.svg", source: "https://www.furaffinity.net/view/38583647/", nsfw: false }, + { name: "front-anthro-nsfw.svg", source: "https://www.furaffinity.net/view/38214389/", nsfw: true }, + { name: "front-anthro.svg", source: "https://www.furaffinity.net/view/38583617/", nsfw: false }, + { name: "maw-anthro.svg", source: "https://www.furaffinity.net/view/38583617/", nsfw: false }, + { name: "maw-feral.svg", source: "https://www.furaffinity.net/view/38583647/", nsfw: false }, + { name: "paw-feral.svg", source: "https://www.furaffinity.net/view/38583647/", nsfw: false }, + { name: "rump-feral.svg", source: "https://www.furaffinity.net/view/38214429/", nsfw: false }, ], authors: [ "trpcafterdark" diff --git a/media/characters/sini/back-anthro-nsfw.svg b/media/characters/sini/back-anthro-nsfw.svg new file mode 100644 index 00000000..984dab87 --- /dev/null +++ b/media/characters/sini/back-anthro-nsfw.svg @@ -0,0 +1,734 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/back-anthro.svg b/media/characters/sini/back-anthro.svg new file mode 100644 index 00000000..8690489e --- /dev/null +++ b/media/characters/sini/back-anthro.svg @@ -0,0 +1,717 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/back.svg b/media/characters/sini/back.svg deleted file mode 100644 index 8a7ca142..00000000 --- a/media/characters/sini/back.svg +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/sini/dick-anthro.svg b/media/characters/sini/dick-anthro.svg index 5125d4ce..be807f3c 100644 --- a/media/characters/sini/dick-anthro.svg +++ b/media/characters/sini/dick-anthro.svg @@ -1,148 +1,226 @@ - + + width="463.516" height="571.176" viewBox="0 0 463.516 571.176" style="enable-background:new 0 0 463.516 571.176;" xml:space="preserve"> - - - - - - - - - + + + + + + + + + diff --git a/media/characters/sini/dick-feral.svg b/media/characters/sini/dick-feral.svg new file mode 100644 index 00000000..360ea9dd --- /dev/null +++ b/media/characters/sini/dick-feral.svg @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/eye-feral.svg b/media/characters/sini/eye-feral.svg new file mode 100644 index 00000000..97345b2c --- /dev/null +++ b/media/characters/sini/eye-feral.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/feral-nsfw.svg b/media/characters/sini/feral-nsfw.svg new file mode 100644 index 00000000..078713e2 --- /dev/null +++ b/media/characters/sini/feral-nsfw.svg @@ -0,0 +1,1407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/feral.svg b/media/characters/sini/feral.svg index 77fdeeee..949a2309 100644 --- a/media/characters/sini/feral.svg +++ b/media/characters/sini/feral.svg @@ -1,559 +1,1330 @@ - + + width="2979.02" height="1220.728" viewBox="0 0 2979.02 1220.728" style="enable-background:new 0 0 2979.02 1220.728;" xml:space="preserve"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/foot-feral.svg b/media/characters/sini/foot-feral.svg deleted file mode 100644 index 1c62bb20..00000000 --- a/media/characters/sini/foot-feral.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/media/characters/sini/front-anthro-nsfw.svg b/media/characters/sini/front-anthro-nsfw.svg new file mode 100644 index 00000000..6fd11e1a --- /dev/null +++ b/media/characters/sini/front-anthro-nsfw.svg @@ -0,0 +1,876 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/front-anthro.svg b/media/characters/sini/front-anthro.svg new file mode 100644 index 00000000..90b25044 --- /dev/null +++ b/media/characters/sini/front-anthro.svg @@ -0,0 +1,825 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/front.svg b/media/characters/sini/front.svg deleted file mode 100644 index dca1c7d6..00000000 --- a/media/characters/sini/front.svg +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/sini/maw-anthro.svg b/media/characters/sini/maw-anthro.svg index 4b85e065..a8bd9998 100644 --- a/media/characters/sini/maw-anthro.svg +++ b/media/characters/sini/maw-anthro.svg @@ -1,366 +1,849 @@ - + + width="609.136" height="730.479" viewBox="0 0 609.136 730.479" style="enable-background:new 0 0 609.136 730.479;" xml:space="preserve"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/maw-feral.svg b/media/characters/sini/maw-feral.svg index 6f0a1f6d..049faf81 100644 --- a/media/characters/sini/maw-feral.svg +++ b/media/characters/sini/maw-feral.svg @@ -1,152 +1,347 @@ - + + width="488.599" height="553.865" viewBox="0 0 488.599 553.865" style="enable-background:new 0 0 488.599 553.865;" xml:space="preserve"> - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/paw-feral.svg b/media/characters/sini/paw-feral.svg new file mode 100644 index 00000000..4b227967 --- /dev/null +++ b/media/characters/sini/paw-feral.svg @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/sini/rump-feral.svg b/media/characters/sini/rump-feral.svg new file mode 100644 index 00000000..5af8ecc3 --- /dev/null +++ b/media/characters/sini/rump-feral.svg @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index cb0d41be..a33762f1 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -33780,37 +33780,62 @@ characterMakers.push(() => makeCharacter( characterMakers.push(() => makeCharacter( { name: "Sini", species: ["dragon"], tags: ["anthro", "feral"] }, { - front: { + frontAnthro: { height: math.unit(7, "feet"), name: "Front", image: { - source: "./media/characters/sini/front.svg", + source: "./media/characters/sini/front-anthro.svg", extra: 726/678, bottom: 35/761 - } + }, + form: "anthro", + default: true }, - back: { + backAnthro: { height: math.unit(7, "feet"), name: "Back", image: { - source: "./media/characters/sini/back.svg", + source: "./media/characters/sini/back-anthro.svg", extra: 743/701, bottom: 12/755 - } + }, + form: "anthro", + }, + frontAnthroNsfw: { + height: math.unit(7, "feet"), + name: "Front (NSFW)", + image: { + source: "./media/characters/sini/front-anthro-nsfw.svg", + extra: 726/678, + bottom: 35/761 + }, + form: "anthro" + }, + backAnthroNsfw: { + height: math.unit(7, "feet"), + name: "Back (NSFW)", + image: { + source: "./media/characters/sini/back-anthro-nsfw.svg", + extra: 743/701, + bottom: 12/755 + }, + form: "anthro", }, mawAnthro: { height: math.unit(2.14, "feet"), - name: "Maw (Anthro)", + name: "Maw", image: { source: "./media/characters/sini/maw-anthro.svg" - } + }, + form: "anthro" }, dick: { height: math.unit(1.45, "feet"), - name: "Dick (Anthro)", + name: "Dick", image: { source: "./media/characters/sini/dick-anthro.svg" - } + }, + form: "anthro" }, feral: { height: math.unit(16, "feet"), @@ -33819,30 +33844,84 @@ characterMakers.push(() => makeCharacter( source: "./media/characters/sini/feral.svg", extra: 814/605, bottom: 11/825 - } + }, + form: "feral", + default: true + }, + feralNsfw: { + height: math.unit(16, "feet"), + name: "Feral (NSFW)", + image: { + source: "./media/characters/sini/feral-nsfw.svg", + extra: 814/605, + bottom: 11/825 + }, + form: "feral" }, mawFeral: { height: math.unit(5.66, "feet"), - name: "Maw-feral", + name: "Maw", image: { source: "./media/characters/sini/maw-feral.svg" - } + }, + form: "feral", }, - footFeral: { + pawFeral: { height: math.unit(5.17, "feet"), - name: "Foot-feral", + name: "Paw", image: { - source: "./media/characters/sini/foot-feral.svg" - } + source: "./media/characters/sini/paw-feral.svg" + }, + form: "feral", + }, + rumpFeral: { + height: math.unit(13.11, "feet"), + name: "Rump", + image: { + source: "./media/characters/sini/rump-feral.svg" + }, + form: "feral", + }, + dickFeral: { + height: math.unit(1, "feet"), + name: "Dick", + image: { + source: "./media/characters/sini/dick-feral.svg" + }, + form: "feral", + }, + eyeFeral: { + height: math.unit(1.23, "feet"), + name: "Eye", + image: { + source: "./media/characters/sini/eye-feral.svg" + }, + form: "feral", }, }, [ { name: "Normal", height: math.unit(7, "feet"), + default: true, + form: "anthro" + }, + { + name: "Normal", + height: math.unit(16, "feet"), + default: true, + form: "feral" + }, + ], + { + "anthro": { + name: "Anthro", default: true }, - ] + "feral": { + name: "Feral", + } + } )) characterMakers.push(() => makeCharacter(