diff --git a/media/attribution.js b/media/attribution.js index c7bb0a0f..a9b8d8bb 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -4906,7 +4906,8 @@ const attributionData = { { name: "front.svg", source: null }, { name: "front-sporty.svg", source: null }, { name: "front-alt.svg", source: null }, - { name: "plush.svg", source: null }, + { name: "plush.svg", source: "https://www.furaffinity.net/view/36725739/" }, + { name: "fae.svg", source: null, nsfw: "https://www.furaffinity.net/view/44426343/" }, ], authors: [ "enormouse" diff --git a/media/characters/rose/fae.svg b/media/characters/rose/fae.svg new file mode 100644 index 00000000..2df14c6d --- /dev/null +++ b/media/characters/rose/fae.svg @@ -0,0 +1,582 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 84e29a76..96c831df 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -7179,7 +7179,9 @@ characterMakers.push(() => makeCharacter( source: "./media/characters/rose/front.svg", extra: 1785/1636, bottom: 30/1815 - } + }, + form: "liom", + default: true }, frontSporty: { height: math.unit(2, "meters"), @@ -7189,7 +7191,8 @@ characterMakers.push(() => makeCharacter( source: "./media/characters/rose/front-sporty.svg", extra: 350/335, bottom: 10/360 - } + }, + form: "liom" }, frontAlt: { height: math.unit(1.6, "meters"), @@ -7199,7 +7202,8 @@ characterMakers.push(() => makeCharacter( source: "./media/characters/rose/front-alt.svg", extra: 299/283, bottom: 3/302 - } + }, + form: "liom" }, plush: { height: math.unit(2, "meters"), @@ -7209,40 +7213,84 @@ characterMakers.push(() => makeCharacter( source: "./media/characters/rose/plush.svg", extra: 361/337, bottom: 11/372 - } + }, + form: "plush", + default: true + }, + fae: { + height: math.unit(4, "cm"), + name: "Fae", + image: { + source: "./media/characters/rose/fae.svg", + extra: 737/577, + bottom: 356/1093 + }, + form: "fae", + default: true }, }, [ { name: "True Micro", - height: math.unit(9, "cm") + height: math.unit(9, "cm"), + form: "liom" }, { name: "Micro", - height: math.unit(16, "cm") + height: math.unit(16, "cm"), + form: "liom" }, { name: "Normal", height: math.unit(1.85, "meters"), - default: true + default: true, + form: "liom" }, { name: "Mini-Macro", - height: math.unit(5, "meters") + height: math.unit(5, "meters"), + form: "liom" }, { name: "Macro", - height: math.unit(15, "meters") + height: math.unit(15, "meters"), + form: "liom" }, { name: "True Macro", - height: math.unit(40, "meters") + height: math.unit(40, "meters"), + form: "liom" }, { name: "City Scale", - height: math.unit(1, "km") + height: math.unit(1, "km"), + form: "liom" }, - ] + { + name: "Plushie", + height: math.unit(9, "cm"), + form: "plush", + default: true + }, + { + name: "Fae", + height: math.unit(4, "cm"), + form: "fae", + default: true + }, + ], + { + "liom": { + name: "Liom", + default: true + }, + "plush": { + name: "Plush" + }, + "fae": { + name: "Fae Fox" + } + } )) characterMakers.push(() => makeCharacter( diff --git a/presets/food.js b/presets/food.js index bd12ffd9..54ae7ef4 100644 --- a/presets/food.js +++ b/presets/food.js @@ -120,8 +120,6 @@ function makeFood() { "food" )) - console.log(results) - results.push(makeModel({"name": "Pizza", "kind": "food", "forms": [{"name": "10 Inch", "views": [{"name": "Top", "height": 0.0254 * 10}]}, {"name": "12 Inch", "views": [{"name": "Top", "height": 0.0254 * 12}]}, {"name": "14 Inch", "views": [{"name": "Top", "height": 0.0254 * 14}]}, {"name": "16 Inch", "views": [{"name": "Top", "height": 0.0254 * 16}]}]})) /* ***Candies*** */ results.push(makeModel({"name": "Candies", "kind": "food", "forms": [{"name": "Candy Corn", "views": [{"name": "Front", "height": 0.022001154720783234}, {"name": "Side", "height": 0.022001154720783234}, {"name": "Top", "height": 0.007666293531656265}]}]}));