diff --git a/macrovision.js b/macrovision.js
index 8ab83923..4316626e 100644
--- a/macrovision.js
+++ b/macrovision.js
@@ -1939,7 +1939,9 @@ function makeEntity(info, views, sizes, forms = {}) {
if (size.default) {
if (size.allForms) {
Object.keys(forms).forEach(form => {
- this.formSizes[form] = size;
+ if (!forms[form].ignoreAllFormSizes) {
+ this.formSizes[form] = size;
+ }
});
} else {
this.formSizes[size.form] = size;
@@ -2294,6 +2296,9 @@ function configSizeList(entity) {
if (!defaultInfo.allForms && defaultInfo.form !== entity.form) {
return;
}
+ if (defaultInfo.allForms && entity.forms[entity.form].ignoreAllFormSizes) {
+ return;
+ }
}
const button = document.createElement("button");
button.classList.add("options-button");
diff --git a/media/attribution.js b/media/attribution.js
index 3c5b20b2..9edef143 100644
--- a/media/attribution.js
+++ b/media/attribution.js
@@ -11872,6 +11872,8 @@ const attributionData = {
{ name: "lopunny-back.svg", source: "https://twitter.com/CatTinyPaws/status/1530975561144844288" },
{ name: "dog-front.svg", source: "https://twitter.com/CatTinyPaws/status/1406671363738378244" },
{ name: "dog-back.svg", source: "https://twitter.com/CatTinyPaws/status/1406671363738378244" },
+ { name: "gigachu-front.svg", source: "https://twitter.com/CatTinyPaws/status/1353828763801444352" },
+ { name: "gigachu-back.svg", source: "https://twitter.com/CatTinyPaws/status/1353828763801444352" },
],
authors: [
"cattinypaws"
@@ -11896,19 +11898,6 @@ const attributionData = {
"pederont"
]
},
- {
- prefix: "./media/characters/cat-gigachu/",
- files: [
- { name: "front.svg", source: "https://twitter.com/CatTinyPaws/status/1353828763801444352" },
- { name: "back.svg", source: "https://twitter.com/CatTinyPaws/status/1353828763801444352" },
- ],
- authors: [
- "cattinypaws"
- ],
- owners: [
- "cattinypaws"
- ]
- },
{
prefix: "./media/characters/sfaiyan/",
files: [
diff --git a/media/characters/cat-gigachu/back.svg b/media/characters/cat-gigachu/back.svg
deleted file mode 100644
index 96776db6..00000000
--- a/media/characters/cat-gigachu/back.svg
+++ /dev/null
@@ -1,249 +0,0 @@
-
-
-
diff --git a/media/characters/cat-gigachu/front.svg b/media/characters/cat-gigachu/front.svg
deleted file mode 100644
index 7a81d4ae..00000000
--- a/media/characters/cat-gigachu/front.svg
+++ /dev/null
@@ -1,417 +0,0 @@
-
-
-
diff --git a/media/characters/cat/gigachu-back.svg b/media/characters/cat/gigachu-back.svg
new file mode 100644
index 00000000..764d5873
--- /dev/null
+++ b/media/characters/cat/gigachu-back.svg
@@ -0,0 +1,606 @@
+
+
+
diff --git a/media/characters/cat/gigachu-front.svg b/media/characters/cat/gigachu-front.svg
new file mode 100644
index 00000000..73e4ab9c
--- /dev/null
+++ b/media/characters/cat/gigachu-front.svg
@@ -0,0 +1,1109 @@
+
+
+
diff --git a/presets/characters.js b/presets/characters.js
index ba467489..82c9f46b 100644
--- a/presets/characters.js
+++ b/presets/characters.js
@@ -32140,7 +32140,7 @@ characterMakers.push(() => makeCharacter(
))
characterMakers.push(() => makeCharacter(
- { name: "Cat", species: ["cat", "nickit", "lucario", "riolu", "lopunny", "dog"], tags: ["anthro", "feral", "taur"] },
+ { name: "Cat", species: ["cat", "nickit", "lucario", "riolu", "lopunny", "dog", "pikachu"], tags: ["anthro", "feral", "taur"] },
{
front: {
height: math.unit(5 + 6 / 12, "feet"),
@@ -32259,6 +32259,27 @@ characterMakers.push(() => makeCharacter(
},
form: "dog",
},
+ gigachuFront: {
+ height: math.unit(75, "feet"),
+ name: "Front",
+ image: {
+ source: "./media/characters/cat/gigachu-front.svg",
+ extra: 1239/1027,
+ bottom: 32/1271
+ },
+ form: "gigachu",
+ default: true
+ },
+ gigachuBack: {
+ height: math.unit(75, "feet"),
+ name: "Back",
+ image: {
+ source: "./media/characters/cat/gigachu-back.svg",
+ extra: 1229/1030,
+ bottom: 9/1238
+ },
+ form: "gigachu"
+ },
},
[
{
@@ -32318,6 +32339,12 @@ characterMakers.push(() => makeCharacter(
height: math.unit(50, "feet"),
allForms: true
},
+ {
+ name: "Dynamax",
+ height: math.unit(75, "feet"),
+ form: "gigachu",
+ default: true
+ },
{
name: "Macro+",
height: math.unit(150, "feet"),
@@ -32352,6 +32379,10 @@ characterMakers.push(() => makeCharacter(
"dog": {
name: "Dog",
},
+ "gigachu": {
+ name: "Gigachu",
+ ignoreAllFormSizes: true
+ }
}
))
@@ -32409,37 +32440,6 @@ characterMakers.push(() => makeCharacter(
]
))
-characterMakers.push(() => makeCharacter(
- { name: "Cat (Gigachu)", species: ["pikachu"], tags: ["anthro"] },
- {
- front: {
- height: math.unit(75, "feet"),
- name: "Front",
- image: {
- source: "./media/characters/cat-gigachu/front.svg",
- extra: 1239/1027,
- bottom: 32/1271
- }
- },
- back: {
- height: math.unit(75, "feet"),
- name: "Back",
- image: {
- source: "./media/characters/cat-gigachu/back.svg",
- extra: 1229/1030,
- bottom: 9/1238
- }
- },
- },
- [
- {
- name: "Dynamax",
- height: math.unit(75, "feet"),
- default: true
- },
- ]
-))
-
characterMakers.push(() => makeCharacter(
{ name: "Sfaiyan", species: ["jackal"], tags: ["anthro"] },
{