diff --git a/media/attribution.js b/media/attribution.js index 5ed792f4..212bcbc3 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -9587,31 +9587,17 @@ const attributionData = { files: [ { name: "front.svg", source: null }, { name: "back.svg", source: null }, - { name: "butt.svg", source: null }, + { name: "front-dressed.svg", source: null }, + { name: "back-dressed.svg", source: null }, + { name: "front-nsfw.svg", source: null, nsfw: true }, + { name: "back-nsfw.svg", source: null, nsfw: true }, { name: "dick.svg", source: null, nsfw: true }, - { name: "paws.svg", source: null }, ], authors: [ - "solutionwcs" + "kitsuneten" ], owners: [ - "foulsbane" - ] - }, - { - prefix: "./media/characters/rory/", - files: [ - { name: "front-alt.svg", source: "https://www.furaffinity.net/view/35969646/" }, - { name: "front-alt-nude.svg", source: "https://www.furaffinity.net/view/35969646/", nsfw: true}, - { name: "side.svg", source: "https://www.furaffinity.net/view/35969646/" }, - { name: "back-alt.svg", source: "https://www.furaffinity.net/view/35969646/" }, - { name: "dick-alt.svg", source: "https://www.furaffinity.net/view/35969646/", nsfw: true }, - ], - authors: [ - "killu" - ], - owners: [ - "foulsbane" + "rory" ] }, { @@ -23880,13 +23866,9 @@ const attributionData = { "name": "WMDiscovery93", "url": "https://www.furaffinity.net/view/20268606/", }, - "foulsbane": { - "name": "Foulsbane", - "url": "https://www.furaffinity.net/user/foulsbane/", - }, - "killu": { - "name": "Killu", - "url": "https://twitter.com/KiilugonNSFW", + "rory": { + "name": "Rory", + "url": "https://twitter.com/rory117_", }, "gamemodels3d": { "name": "gamemodels3d", @@ -27468,6 +27450,10 @@ const attributionData = { "name": "CariFoxleopard", "url": "https://www.furaffinity.net/user/carifoxleopard/" }, + "kitsuneten": { + "name": "ten", + "url": "https://twitter.com/kitsuneten" + }, } } diff --git a/media/characters/rory/back-alt.svg b/media/characters/rory/back-alt.svg deleted file mode 100644 index 66b27de2..00000000 --- a/media/characters/rory/back-alt.svg +++ /dev/null @@ -1,359 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/rory/back-dressed.svg b/media/characters/rory/back-dressed.svg new file mode 100644 index 00000000..fbb350e3 --- /dev/null +++ b/media/characters/rory/back-dressed.svg @@ -0,0 +1,2252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/back-nsfw.svg b/media/characters/rory/back-nsfw.svg new file mode 100644 index 00000000..ebd08278 --- /dev/null +++ b/media/characters/rory/back-nsfw.svg @@ -0,0 +1,1385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/back.svg b/media/characters/rory/back.svg index a60e595d..78d1a4e5 100644 --- a/media/characters/rory/back.svg +++ b/media/characters/rory/back.svg @@ -1,642 +1,1360 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/butt.svg b/media/characters/rory/butt.svg deleted file mode 100644 index f0b4e999..00000000 --- a/media/characters/rory/butt.svg +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/rory/dick-alt.svg b/media/characters/rory/dick-alt.svg deleted file mode 100644 index efd1a6e5..00000000 --- a/media/characters/rory/dick-alt.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - diff --git a/media/characters/rory/dick.svg b/media/characters/rory/dick.svg index f6a49b02..159915c3 100644 --- a/media/characters/rory/dick.svg +++ b/media/characters/rory/dick.svg @@ -1,92 +1,70 @@ - - + + - + width="417.739" height="469.02" viewBox="0 0 417.739 469.02" style="enable-background:new 0 0 417.739 469.02;" xml:space="preserve"> - - - + + + + + + + diff --git a/media/characters/rory/front-alt-nude.svg b/media/characters/rory/front-alt-nude.svg deleted file mode 100644 index dd342e5e..00000000 --- a/media/characters/rory/front-alt-nude.svg +++ /dev/null @@ -1,619 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/rory/front-alt.svg b/media/characters/rory/front-alt.svg deleted file mode 100644 index c4fba6d8..00000000 --- a/media/characters/rory/front-alt.svg +++ /dev/null @@ -1,570 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/rory/front-dressed.svg b/media/characters/rory/front-dressed.svg new file mode 100644 index 00000000..f7d75e89 --- /dev/null +++ b/media/characters/rory/front-dressed.svg @@ -0,0 +1,2368 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/front-nsfw.svg b/media/characters/rory/front-nsfw.svg new file mode 100644 index 00000000..65a93ca3 --- /dev/null +++ b/media/characters/rory/front-nsfw.svg @@ -0,0 +1,1666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/front.svg b/media/characters/rory/front.svg index 9e86df52..1a3a92f6 100644 --- a/media/characters/rory/front.svg +++ b/media/characters/rory/front.svg @@ -1,1063 +1,1660 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/paws.svg b/media/characters/rory/paws.svg deleted file mode 100644 index d9ab96bd..00000000 --- a/media/characters/rory/paws.svg +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/characters/rory/side.svg b/media/characters/rory/side.svg deleted file mode 100644 index 8a53a9fd..00000000 --- a/media/characters/rory/side.svg +++ /dev/null @@ -1,476 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/presets/characters.js b/presets/characters.js index 9cee3f3e..76472e19 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -24473,111 +24473,90 @@ characterMakers.push(() => makeCharacter( { name: "Rory", species: ["dog", "magical"], tags: ["anthro"] }, { front: { - height: math.unit(5 + 4 / 12, "feet"), - weight: math.unit(120, "lb"), + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), name: "Front", image: { source: "./media/characters/rory/front.svg", - extra: 1318/1241, - bottom: 42/1360 + extra: 1790/1681, + bottom: 66/1856 } }, back: { - height: math.unit(5 + 4 / 12, "feet"), - weight: math.unit(120, "lb"), + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), name: "Back", image: { source: "./media/characters/rory/back.svg", - extra: 1318/1241, - bottom: 42/1360 - } - }, - butt: { - height: math.unit(1.74, "feet"), - name: "Butt", - image: { - source: "./media/characters/rory/butt.svg" - } - }, - dick: { - height: math.unit(1.02, "feet"), - name: "Dick", - image: { - source: "./media/characters/rory/dick.svg" - } - }, - paws: { - height: math.unit(1, "feet"), - name: "Paws", - image: { - source: "./media/characters/rory/paws.svg" + extra: 1805/1690, + bottom: 56/1861 } }, - frontAlt: { - height: math.unit(5 + 4 / 12, "feet"), - weight: math.unit(120, "lb"), - name: "Front (Alt)", + frontDressed: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Front (Dressed)", image: { - source: "./media/characters/rory/front-alt.svg", - extra: 589 / 556, - bottom: 45.7 / 635.76 + source: "./media/characters/rory/front-dressed.svg", + extra: 1790/1681, + bottom: 66/1856 } }, - frontAltNude: { - height: math.unit(5 + 4 / 12, "feet"), - weight: math.unit(120, "lb"), - name: "Front (Alt, Nude)", + backDressed: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Back (Dressed)", image: { - source: "./media/characters/rory/front-alt-nude.svg", - extra: 589 / 556, - bottom: 45.7 / 635.76 + source: "./media/characters/rory/back-dressed.svg", + extra: 1805/1690, + bottom: 56/1861 } }, - side: { - height: math.unit(5 + 4 / 12, "feet"), - weight: math.unit(120, "lb"), - name: "Side", + frontNsfw: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Front (NSFW)", image: { - source: "./media/characters/rory/side.svg", - extra: 597 / 564, - bottom: 55 / 653 + source: "./media/characters/rory/front-nsfw.svg", + extra: 1790/1681, + bottom: 66/1856 } }, - backAlt: { - height: math.unit(5 + 4 / 12, "feet"), - weight: math.unit(120, "lb"), - name: "Back (Alt)", + backNsfw: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Back (NSFW)", image: { - source: "./media/characters/rory/back-alt.svg", - extra: 620 / 585, - bottom: 8.86 / 630.43 + source: "./media/characters/rory/back-nsfw.svg", + extra: 1805/1690, + bottom: 56/1861 } }, - dickAlt: { - height: math.unit(0.86, "feet"), - name: "Dick (Alt)", + dick: { + height: math.unit(0.8, "feet"), + name: "Dick", image: { - source: "./media/characters/rory/dick-alt.svg" + source: "./media/characters/rory/dick.svg" } }, }, [ + { + name: "Micro", + height: math.unit(3, "inches") + }, { name: "Normal", - height: math.unit(5 + 4 / 12, "feet"), + height: math.unit(5 + 4/12, "feet"), default: true }, { name: "Macro", - height: math.unit(100, "feet") - }, - { - name: "Macro+", - height: math.unit(140, "feet") + height: math.unit(90, "feet") }, { - name: "Macro++", - height: math.unit(300, "feet") + name: "Supercharged", + height: math.unit(270, "feet") }, ] )) diff --git a/scripts/illustrator-export.jsx b/scripts/illustrator-export.jsx new file mode 100644 index 00000000..a43e0633 --- /dev/null +++ b/scripts/illustrator-export.jsx @@ -0,0 +1,9 @@ +var doc = app.activeDocument + +var parts = doc.name.slice(0, -4).split("-") + +var filename = parts.slice(1).join("-") + +var filepath = "/Users/crux/furry/macrovision/media/characters/" + parts[0] + "/" + filename + +doc.exportFile(File(filepath), ExportType.SVG) \ No newline at end of file diff --git a/scripts/illustrator.jsx b/scripts/illustrator.jsx index 9271b0c2..b9839b23 100644 --- a/scripts/illustrator.jsx +++ b/scripts/illustrator.jsx @@ -52,7 +52,6 @@ for (var i=0; i