diff --git a/macrovision.js b/macrovision.js index cf5694d5..3c3634b9 100644 --- a/macrovision.js +++ b/macrovision.js @@ -1702,7 +1702,7 @@ 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) { + if (this.defaultForm !== size.form && !size.allForms) { return; } } diff --git a/media/attribution.js b/media/attribution.js index a2ca93a0..7f34df9d 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -9656,8 +9656,26 @@ const attributionData = { { prefix: "./media/characters/rory/", files: [ - { name: "front.svg", source: "https://twitter.com/rory_18plus/status/1493438882586652672", nsfw: true }, - { name: "back.svg", source: "https://twitter.com/rory_18plus/status/1493438882586652672" }, + { name: "front.svg", source: null, nsfw: false }, + { name: "back.svg", source: null, nsfw: false }, + { name: "front-dressed.svg", source: null, nsfw: false }, + { name: "back-dressed.svg", source: null, nsfw: false }, + { name: "front-nsfw.svg", source: null, nsfw: true }, + { name: "back-nsfw.svg", source: null, nsfw: true }, + { name: "dick.svg", source: null, nsfw: true }, + ], + authors: [ + "kitsuneten" + ], + owners: [ + "rory" + ] + }, + { + prefix: "./media/characters/rory/", + files: [ + { name: "thicc-front.svg", source: "https://twitter.com/rory_18plus/status/1493438882586652672", nsfw: true }, + { name: "thicc-back.svg", source: "https://twitter.com/rory_18plus/status/1493438882586652672" }, ], authors: [ "stylusknight" @@ -29302,6 +29320,10 @@ const attributionData = { "name": "WILTHKING", "url": "https://twitter.com/wilthking/status/1498007545889308676" }, + "kitsuneten": { + "name": "ten", + "url": "https://twitter.com/kitsuneten" + }, } } 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 d5cb9586..78d1a4e5 100644 --- a/media/characters/rory/back.svg +++ b/media/characters/rory/back.svg @@ -1,616 +1,1359 @@ - + width="1376.2" height="1860.769" viewBox="0 0 1376.2 1860.769" style="enable-background:new 0 0 1376.2 1860.769;" xml:space="preserve"> + - + - + - + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/media/characters/rory/dick.svg b/media/characters/rory/dick.svg new file mode 100644 index 00000000..159915c3 --- /dev/null +++ b/media/characters/rory/dick.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + 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 c462fb93..1a3a92f6 100644 --- a/media/characters/rory/front.svg +++ b/media/characters/rory/front.svg @@ -1,807 +1,1659 @@ - + width="1394.41" height="1856.604" viewBox="0 0 1394.41 1856.604" style="enable-background:new 0 0 1394.41 1856.604;" xml:space="preserve"> + - + - + - + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/thicc-back.svg b/media/characters/rory/thicc-back.svg new file mode 100644 index 00000000..d5cb9586 --- /dev/null +++ b/media/characters/rory/thicc-back.svg @@ -0,0 +1,617 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/rory/thicc-front.svg b/media/characters/rory/thicc-front.svg new file mode 100644 index 00000000..c462fb93 --- /dev/null +++ b/media/characters/rory/thicc-front.svg @@ -0,0 +1,808 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index e8c0169f..f29dc62b 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -25169,49 +25169,142 @@ characterMakers.push(() => makeCharacter( ] )) + + characterMakers.push(() => makeCharacter( { name: "Rory", species: ["dog", "magical"], tags: ["anthro"] }, { + front: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Front", + image: { + source: "./media/characters/rory/front.svg", + extra: 1790/1681, + bottom: 66/1856 + }, + form: "normal", + default: true + }, + back: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Back", + image: { + source: "./media/characters/rory/back.svg", + extra: 1805/1690, + bottom: 56/1861 + }, + form: "normal" + }, + frontDressed: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Front (Dressed)", + image: { + source: "./media/characters/rory/front-dressed.svg", + extra: 1790/1681, + bottom: 66/1856 + }, + form: "normal" + }, + backDressed: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Back (Dressed)", + image: { + source: "./media/characters/rory/back-dressed.svg", + extra: 1805/1690, + bottom: 56/1861 + }, + form: "normal" + }, frontNsfw: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Front (NSFW)", + image: { + source: "./media/characters/rory/front-nsfw.svg", + extra: 1790/1681, + bottom: 66/1856 + }, + form: "normal" + }, + backNsfw: { + height: math.unit(5 + 4/12, "feet"), + weight: math.unit(125, "lb"), + name: "Back (NSFW)", + image: { + source: "./media/characters/rory/back-nsfw.svg", + extra: 1805/1690, + bottom: 56/1861 + }, + form: "normal" + }, + dick: { + height: math.unit(0.8, "feet"), + name: "Dick", + image: { + source: "./media/characters/rory/dick.svg" + }, + form: "normal" + }, + thicc_front: { height: math.unit(5 + 4/12, "feet"), weight: math.unit(195, "lb"), name: "Front", image: { - source: "./media/characters/rory/front.svg", + source: "./media/characters/rory/thicc-front.svg", extra: 1220/1100, bottom: 103/1323 - } + }, + form: "thicc", + default: true }, - back: { + thicc_back: { height: math.unit(5 + 4/12, "feet"), weight: math.unit(195, "lb"), name: "Back", image: { - source: "./media/characters/rory/back.svg", + source: "./media/characters/rory/thicc-back.svg", extra: 1166/1086, bottom: 35/1201 - } + }, + form: "thicc" }, }, [ { name: "Micro", - height: math.unit(3, "inches") + height: math.unit(3, "inches"), + allForms: true }, { name: "Normal", height: math.unit(5 + 4/12, "feet"), + allForms: true, default: true }, { name: "Macro", - height: math.unit(90, "feet") + height: math.unit(90, "feet"), + allForms: true }, { name: "Supercharged", - height: math.unit(270, "feet") + height: math.unit(270, "feet"), + allForms: true }, - ] + ], + { + "normal": { + name: "Normal", + default: true + }, + "thicc": { + name: "Thicc", + }, + } )) characterMakers.push(() => makeCharacter(