diff --git a/media/attribution.js b/media/attribution.js index 37c17aed..d92b18ea 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -5192,6 +5192,19 @@ const attributionData = { "fidchell" ] }, + { + prefix: "./media/characters/malgam/", + files: [ + { name: "eevee.svg", source: "https://fidverse.fandom.com/wiki/Malgam" }, + { name: "sylveon.svg", source: "https://fidverse.fandom.com/wiki/https://fidverse.fandom.com/wiki/Malgam_Future" }, + ], + authors: [ + "fidchell" + ], + owners: [ + "fidchell" + ] + }, //characters { prefix: "./media/landmarks/", diff --git a/media/characters/malgam/eevee.svg b/media/characters/malgam/eevee.svg new file mode 100644 index 00000000..0ba5d6ee --- /dev/null +++ b/media/characters/malgam/eevee.svg @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/malgam/sylveon.svg b/media/characters/malgam/sylveon.svg new file mode 100644 index 00000000..8f76af16 --- /dev/null +++ b/media/characters/malgam/sylveon.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 440c7fa2..85a36742 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -13054,7 +13054,7 @@ characterMakers["Bernard & Wilder"] = () => { rename: true, image: { source: "./media/characters/bernard-wilder/bernard.svg", - extra: 192/166 * (1 / (1 - 0.05)), + extra: 192/128 * (1 / (1 - 0.05)), bottom: 0.05 } }, @@ -13141,6 +13141,42 @@ characterMakers["Ingrid"] = () => { ] ) }; + +characterMakers["Malgam"] = () => { + return makeCharacter( + "Malgam", + "Fidchell", + { + eevee: { + height: math.unit(2 + 10/12, "feet"), + weight: math.unit(86, "lb"), + name: "Eevee", + image: { + source: "./media/characters/malgam/eevee.svg", + extra: 218/180 * (1 / (1 - 0.2)), + bottom: 0.2 + } + }, + sylveon: { + height: math.unit(4, "feet"), + weight: math.unit(101, "lb"), + name: "Sylveon", + image: { + source: "./media/characters/malgam/sylveon.svg", + extra: 371/325 * (1 / (1 - 0.015)), + bottom: 0.015 + } + }, + }, + [ + { + name: "Normal", + height: math.unit(2 + 10/12, "feet"), + default: true + }, + ] + ) +}; //characters function makeCharacters() {