diff --git a/macrovision.js b/macrovision.js index 66eaec98..a1d82bd2 100644 --- a/macrovision.js +++ b/macrovision.js @@ -533,8 +533,8 @@ function configEntityOptions(entity, view) { button.addEventListener("click", e => { entity.views[entity.defaultView].height = defaultInfo.height; entity.dirty = true; - updateEntityOptions(entity, view); - updateViewOptions(entity, view); + updateEntityOptions(entity, entity.view); + updateViewOptions(entity, entity.view); if (!checkFitWorld()){ updateSizes(true); } diff --git a/media/attribution.js b/media/attribution.js index 66721ee0..1a213905 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -6917,6 +6917,32 @@ const attributionData = { "xanaomin" ] }, + { + prefix: "./media/characters/klay/", + files: [ + { name: "front.svg", source: "https://www.furaffinity.net/view/32218784/" }, + { name: "back.svg", source: "https://www.furaffinity.net/view/32218784/" }, + { name: "beans.svg", source: "https://www.furaffinity.net/view/32218784/" }, + ], + authors: [ + "yellowstumps" + ], + owners: [ + "klaythebat" + ] + }, + { + prefix: "./media/characters/marcus/", + files: [ + { name: "front.svg", source: "https://www.furaffinity.net/view/34701907/" }, + ], + authors: [ + "yellowstumps" + ], + owners: [ + "klaythebat" + ] + }, //characters { prefix: "./media/food/animals/", @@ -9544,6 +9570,14 @@ const attributionData = { "name": "Min", "url": "https://www.furaffinity.net/user/min/", }, + "yellowstumps": { + "name": "yellowstumps", + "url": "https://www.furaffinity.net/user/yellowstumps", + }, + "klaythebat": { + "name": "KlayTheBat", + "url": "https://www.furaffinity.net/user/klaythebat/", + }, } } diff --git a/media/characters/klay/back.svg b/media/characters/klay/back.svg new file mode 100644 index 00000000..3f7c9697 --- /dev/null +++ b/media/characters/klay/back.svg @@ -0,0 +1,409 @@ + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/klay/beans.svg b/media/characters/klay/beans.svg new file mode 100644 index 00000000..c0fc9d3e --- /dev/null +++ b/media/characters/klay/beans.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + diff --git a/media/characters/klay/front.svg b/media/characters/klay/front.svg new file mode 100644 index 00000000..64946bc6 --- /dev/null +++ b/media/characters/klay/front.svg @@ -0,0 +1,576 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/marcus/front.svg b/media/characters/marcus/front.svg new file mode 100644 index 00000000..39d9a8a4 --- /dev/null +++ b/media/characters/marcus/front.svg @@ -0,0 +1,1171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 744a6780..ed9814f6 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -16825,6 +16825,108 @@ characterMakers["Richard (Smeargle)"] = () => { ) }; +characterMakers["Klay"] = () => { + return makeCharacter( + "Klay", + "klaythebat", + { + front: { + height: math.unit(6, "feet"), + weight: math.unit(110, "lb"), + name: "Front", + image: { + source: "./media/characters/klay/front.svg", + extra: 962/883, + bottom: 0.04 + } + }, + back: { + height: math.unit(6, "feet"), + weight: math.unit(110, "lb"), + name: "Back", + image: { + source: "./media/characters/klay/back.svg", + extra: 962/883 + } + }, + beans: { + height: math.unit(1.15, "feet"), + name: "Beans", + image: { + source: "./media/characters/klay/beans.svg" + } + }, + }, + [ + { + name: "Micro", + height: math.unit(6, "inches") + }, + { + name: "Mini", + height: math.unit(3, "feet") + }, + { + name: "Normal", + height: math.unit(6, "feet"), + default: true + }, + { + name: "Big", + height: math.unit(25, "feet") + }, + { + name: "Macro", + height: math.unit(100, "feet") + }, + { + name: "Megamacro", + height: math.unit(400, "feet") + }, + ] + ) +}; + +characterMakers["Marcus"] = () => { + return makeCharacter( + "Marcus", + "klaythebat", + { + front: { + height: math.unit(6, "feet"), + weight: math.unit(160, "lb"), + name: "Front", + image: { + source: "./media/characters/marcus/front.svg", + extra: 734/676, + bottom: 0.03 + } + }, + }, + [ + { + name: "Little", + height: math.unit(6, "feet") + }, + { + name: "Normal", + height: math.unit(110, "feet"), + default: true + }, + { + name: "Macro", + height: math.unit(250, "feet") + }, + { + name: "Megamacro", + height: math.unit(1000, "feet") + }, + ] + ) +}; + + + //characters function makeCharacters() {