diff --git a/media/attribution.js b/media/attribution.js index 919e1568..241f0540 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -8539,20 +8539,17 @@ const attributionData = { { prefix: "./media/characters/artemis/", files: [ - { name: "front.svg", source: "https://www.furaffinity.net/view/29084844/" }, - { name: "front-nsfw.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, - { name: "front-nsfwer.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, - { name: "side.svg", source: "https://www.furaffinity.net/view/29084844/" }, - { name: "side-nsfw.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, - { name: "side-nsfwer.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, - { name: "back.svg", source: "https://www.furaffinity.net/view/29084844/" }, - { name: "back-nsfw.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, - { name: "back-nsfwer.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, - { name: "maw.svg", source: "https://www.furaffinity.net/view/29084844/" }, - { name: "stomach.svg", source: "https://www.furaffinity.net/view/29084844/" }, + { name: "calibrating-front.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, + { name: "calibrating-side.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, { name: "dick-canine.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, { name: "dick-equine.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, { name: "dick-exotic.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, + { name: "maw.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: false }, + { name: "oversize-load-front.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, + { name: "oversize-load-side.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: true }, + { name: "stomach.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: false }, + { name: "work-safe-front.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: false }, + { name: "work-safe-side.svg", source: "https://www.furaffinity.net/view/29084844/", nsfw: false }, ], authors: [ "meep" diff --git a/media/characters/artemis/calibrating-front.svg b/media/characters/artemis/calibrating-front.svg new file mode 100644 index 00000000..2d3695b1 --- /dev/null +++ b/media/characters/artemis/calibrating-front.svg @@ -0,0 +1,1720 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/calibrating-side.svg b/media/characters/artemis/calibrating-side.svg new file mode 100644 index 00000000..6948c95f --- /dev/null +++ b/media/characters/artemis/calibrating-side.svg @@ -0,0 +1,752 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/dick-canine.svg b/media/characters/artemis/dick-canine.svg index 8f541602..15f7e806 100644 --- a/media/characters/artemis/dick-canine.svg +++ b/media/characters/artemis/dick-canine.svg @@ -1,54 +1,153 @@ - + + width="399.641" height="246.716" viewBox="0 0 399.641 246.716" style="enable-background:new 0 0 399.641 246.716;" xml:space="preserve"> - - - - - - - + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/dick-equine.svg b/media/characters/artemis/dick-equine.svg index 4e5bad9a..08bcfe82 100644 --- a/media/characters/artemis/dick-equine.svg +++ b/media/characters/artemis/dick-equine.svg @@ -1,62 +1,172 @@ - + + width="402.781" height="210.986" viewBox="0 0 402.781 210.986" style="enable-background:new 0 0 402.781 210.986;" xml:space="preserve"> - - - - + + + + + + + + diff --git a/media/characters/artemis/dick-exotic.svg b/media/characters/artemis/dick-exotic.svg index 7a4d4134..1253b57d 100644 --- a/media/characters/artemis/dick-exotic.svg +++ b/media/characters/artemis/dick-exotic.svg @@ -1,54 +1,153 @@ - + + width="324.318" height="208.601" viewBox="0 0 324.318 208.601" style="enable-background:new 0 0 324.318 208.601;" xml:space="preserve"> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/front-nsfw.svg b/media/characters/artemis/front-nsfw.svg deleted file mode 100644 index 81183076..00000000 --- a/media/characters/artemis/front-nsfw.svg +++ /dev/null @@ -1,598 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/artemis/front-nsfwer.svg b/media/characters/artemis/front-nsfwer.svg deleted file mode 100644 index bf56bd8e..00000000 --- a/media/characters/artemis/front-nsfwer.svg +++ /dev/null @@ -1,583 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/artemis/front.svg b/media/characters/artemis/front.svg deleted file mode 100644 index 7a997830..00000000 --- a/media/characters/artemis/front.svg +++ /dev/null @@ -1,591 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/artemis/maw.svg b/media/characters/artemis/maw.svg index 4b6994d4..af176297 100644 --- a/media/characters/artemis/maw.svg +++ b/media/characters/artemis/maw.svg @@ -1,131 +1,384 @@ - + + width="371.851" height="511.157" viewBox="0 0 371.851 511.157" style="enable-background:new 0 0 371.851 511.157;" xml:space="preserve"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/oversize-load-front.svg b/media/characters/artemis/oversize-load-front.svg new file mode 100644 index 00000000..ca657b19 --- /dev/null +++ b/media/characters/artemis/oversize-load-front.svg @@ -0,0 +1,1714 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/oversize-load-side.svg b/media/characters/artemis/oversize-load-side.svg new file mode 100644 index 00000000..22627726 --- /dev/null +++ b/media/characters/artemis/oversize-load-side.svg @@ -0,0 +1,752 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/side-nsfw.svg b/media/characters/artemis/side-nsfw.svg deleted file mode 100644 index 2f8a4ec6..00000000 --- a/media/characters/artemis/side-nsfw.svg +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/artemis/side-nsfwer.svg b/media/characters/artemis/side-nsfwer.svg deleted file mode 100644 index e9da4dee..00000000 --- a/media/characters/artemis/side-nsfwer.svg +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/artemis/side.svg b/media/characters/artemis/side.svg deleted file mode 100644 index a06498be..00000000 --- a/media/characters/artemis/side.svg +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/artemis/stomach.svg b/media/characters/artemis/stomach.svg index e8e216c2..71248042 100644 --- a/media/characters/artemis/stomach.svg +++ b/media/characters/artemis/stomach.svg @@ -1,81 +1,244 @@ - + + width="318.059" height="423.019" viewBox="0 0 318.059 423.019" style="enable-background:new 0 0 318.059 423.019;" xml:space="preserve"> - + + + + + + + + + + + + + + - - - - - - - diff --git a/media/characters/artemis/work-safe-front.svg b/media/characters/artemis/work-safe-front.svg new file mode 100644 index 00000000..0eb32939 --- /dev/null +++ b/media/characters/artemis/work-safe-front.svg @@ -0,0 +1,1664 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/artemis/work-safe-side.svg b/media/characters/artemis/work-safe-side.svg new file mode 100644 index 00000000..3470c09f --- /dev/null +++ b/media/characters/artemis/work-safe-side.svg @@ -0,0 +1,731 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index e31748c5..9e5dae28 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -21352,108 +21352,182 @@ characterMakers.push(() => makeCharacter( weight: math.unit(2, "lb"), name: "Front", image: { - source: "./media/characters/artemis/front.svg", + source: "./media/characters/artemis/work-safe-front.svg", extra: 1192 / 1075, bottom: 0.07 - } + }, + form: "work-safe", + default: true }, frontNsfw: { height: math.unit(7.5, "feet"), weight: math.unit(2, "lb"), - name: "Front (NSFW)", + name: "Front", image: { - source: "./media/characters/artemis/front-nsfw.svg", + source: "./media/characters/artemis/calibrating-front.svg", extra: 1192 / 1075, bottom: 0.07 - } + }, + form: "calibrating", + default: true }, frontNsfwer: { height: math.unit(7.5, "feet"), weight: math.unit(2, "lb"), - name: "Front (NSFW-er)", + name: "Front", image: { - source: "./media/characters/artemis/front-nsfwer.svg", + source: "./media/characters/artemis/oversize-load-front.svg", extra: 1192 / 1075, bottom: 0.07 - } + }, + form: "oversize-load", + default: true }, side: { height: math.unit(7.5, "feet"), weight: math.unit(2, "lb"), name: "Side", image: { - source: "./media/characters/artemis/side.svg", + source: "./media/characters/artemis/work-safe-side.svg", extra: 1192 / 1075, bottom: 0.07 - } + }, + form: "work-safe" }, sideNsfw: { height: math.unit(7.5, "feet"), weight: math.unit(2, "lb"), - name: "Side (NSFW)", + name: "Side", image: { - source: "./media/characters/artemis/side-nsfw.svg", + source: "./media/characters/artemis/calibrating-side.svg", extra: 1192 / 1075, bottom: 0.07 - } + }, + form: "calibrating" }, sideNsfwer: { height: math.unit(7.5, "feet"), weight: math.unit(2, "lb"), - name: "Side (NSFW-er)", + name: "Side", image: { - source: "./media/characters/artemis/side-nsfwer.svg", + source: "./media/characters/artemis/oversize-load-side.svg", extra: 1192 / 1075, bottom: 0.07 - } + }, + form: "oversize-load" }, maw: { height: math.unit(1.1, "feet"), name: "Maw", image: { source: "./media/characters/artemis/maw.svg" - } + }, + form: "work-safe" }, stomach: { height: math.unit(0.95, "feet"), name: "Stomach", image: { source: "./media/characters/artemis/stomach.svg" - } + }, + form: "work-safe" }, dickCanine: { height: math.unit(1, "feet"), name: "Dick (Canine)", image: { source: "./media/characters/artemis/dick-canine.svg" - } + }, + form: "calibrating" }, dickEquine: { height: math.unit(0.85, "feet"), name: "Dick (Equine)", image: { source: "./media/characters/artemis/dick-equine.svg" - } + }, + form: "calibrating" }, dickExotic: { height: math.unit(0.85, "feet"), name: "Dick (Exotic)", image: { source: "./media/characters/artemis/dick-exotic.svg" - } + }, + form: "calibrating" + }, + dickCanineBigger: { + height: math.unit(1 * 1.33, "feet"), + name: "Dick (Canine)", + image: { + source: "./media/characters/artemis/dick-canine.svg" + }, + form: "oversize-load" + }, + dickEquineBigger: { + height: math.unit(0.85 * 1.33, "feet"), + name: "Dick (Equine)", + image: { + source: "./media/characters/artemis/dick-equine.svg" + }, + form: "oversize-load" + }, + dickExoticBigger: { + height: math.unit(0.85 * 1.33, "feet"), + name: "Dick (Exotic)", + image: { + source: "./media/characters/artemis/dick-exotic.svg" + }, + form: "oversize-load" }, }, [ { name: "Normal", height: math.unit(7.5, "feet"), + form: "work-safe", + default: true + }, + { + name: "Normal", + height: math.unit(7.5, "feet"), + form: "calibrating", + default: true + }, + { + name: "Normal", + height: math.unit(7.5, "feet"), + form: "oversize-load", default: true }, { name: "Enlarged", - height: math.unit(12, "feet") + height: math.unit(12, "feet"), + form: "work-safe", }, - ] + { + name: "Enlarged", + height: math.unit(12, "feet"), + form: "calibrating", + }, + { + name: "Enlarged", + height: math.unit(12, "feet"), + form: "oversize-load", + }, + ], + { + "work-safe": { + name: "Work-Safe", + default: true + }, + "calibrating": { + name: "Calibrating" + }, + "oversize-load": { + name: "Oversize Load" + } + } )) characterMakers.push(() => makeCharacter(