diff --git a/media/attribution.js b/media/attribution.js index 9e3d5129..67121207 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -11233,32 +11233,10 @@ const attributionData = { files: [ { name: "front.svg", source: "https://toyhou.se/1331952.cat-the-cat/23389606" }, { name: "back.svg", source: "https://toyhou.se/1331952.cat-the-cat/23389606" }, - { name: "taur.svg", source: null } - ], - authors: [ - "cattinypaws" - ], - owners: [ - "cattinypaws" - ] - }, - { - prefix: "./media/characters/cat-lucario/", - files: [ - { name: "normal.svg", source: null }, - { name: "mega.svg", source: null }, - ], - authors: [ - "cattinypaws" - ], - owners: [ - "cattinypaws" - ] - }, - { - prefix: "./media/characters/cat-nickit/", - files: [ - { name: "side.svg", source: null } + { name: "taur.svg", source: null }, + { name: "lucario.svg", source: null }, + { name: "mega-lucario.svg", source: null }, + { name: "nickit.svg", source: null } ], authors: [ "cattinypaws" diff --git a/media/characters/cat-lucario/normal.svg b/media/characters/cat/lucario.svg similarity index 100% rename from media/characters/cat-lucario/normal.svg rename to media/characters/cat/lucario.svg diff --git a/media/characters/cat-lucario/mega.svg b/media/characters/cat/mega-lucario.svg similarity index 100% rename from media/characters/cat-lucario/mega.svg rename to media/characters/cat/mega-lucario.svg diff --git a/media/characters/cat-nickit/side.svg b/media/characters/cat/nickit.svg similarity index 100% rename from media/characters/cat-nickit/side.svg rename to media/characters/cat/nickit.svg diff --git a/presets/characters.js b/presets/characters.js index 947da863..11ef8917 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -28403,87 +28403,29 @@ characterMakers.push(() => makeCharacter( bottom: 66/1411 } }, - }, - [ - { - name: "Really small", - height: math.unit(1, "nm") - }, - { - name: "Micro", - height: math.unit(5, "inches") - }, - { - name: "Normal", - height: math.unit(5 + 6/12, "feet"), - default: true - }, - { - name: "Macro", - height: math.unit(50, "feet") - }, - { - name: "Macro+", - height: math.unit(150, "feet") - }, - { - name: "Megamacro", - height: math.unit(100, "miles") - }, - ] -)) - -characterMakers.push(() => makeCharacter( - { name: "Cat (Lucario)", species: ["lucario"], tags: ["anthro"] }, - { - normal: { + lucario: { height: math.unit(4, "feet"), - name: "Normal", + name: "Lucario", image: { - source: "./media/characters/cat-lucario/normal.svg", + source: "./media/characters/cat/lucario.svg", extra: 1470/1318, bottom: 65/1535 } }, - mega: { + megaLucario: { height: math.unit(4, "feet"), - name: "Mega", + name: "Mega Lucario", image: { - source: "./media/characters/cat-lucario/mega.svg", + source: "./media/characters/cat/mega-lucario.svg", extra: 1515/1319, bottom: 63/1578 } }, - }, - [ - { - name: "Micro", - height: math.unit(4, "inches") - }, - { - name: "Normal", - height: math.unit(4, "feet"), - default: true - }, - { - name: "Macro", - height: math.unit(150, "feet") - }, - { - name: "Macro+", - height: math.unit(500, "feet") - }, - ] -)) - -characterMakers.push(() => makeCharacter( - { name: "Cat (Nickit)", species: ["nickit"], tags: ["feral"] }, - { - side: { + nickit: { height: math.unit(2, "feet"), - name: "Side", + name: "Nickit", image: { - source: "./media/characters/cat-nickit/side.svg", + source: "./media/characters/cat/nickit.svg", extra: 1980/1585, bottom: 102/2082 } @@ -28496,24 +28438,24 @@ characterMakers.push(() => makeCharacter( }, { name: "Micro", - height: math.unit(1, "inch") + height: math.unit(5, "inches") }, { name: "Normal", - height: math.unit(2, "feet"), + height: math.unit(5 + 6/12, "feet"), default: true }, { - name: "Dyanmaxed", - height: math.unit(65, "feet") + name: "Macro", + height: math.unit(50, "feet") }, { - name: "Macro", + name: "Macro+", height: math.unit(150, "feet") }, { - name: "Macro+", - height: math.unit(900, "feet") + name: "Megamacro", + height: math.unit(100, "miles") }, ] ))