diff --git a/macrovision.css b/macrovision.css index 951b4894..061ebc0c 100644 --- a/macrovision.css +++ b/macrovision.css @@ -86,6 +86,13 @@ body.toggle-entity-name .entity-name { max-width: 15vw; } +.options-block { + display: flex; + text-align: center; + max-width: 15vw; + flex-direction: column; +} + @media (max-aspect-ratio: 1/1) { .options-row { flex-direction: column; @@ -193,6 +200,12 @@ body.toggle-entity-name .entity-name { font-size: 150%; } +.options-block .options-button { + flex: 1; + width: 100%; + font-size: 150%; +} + .options-row label { flex: 1; width: 100%; diff --git a/macrovision.html b/macrovision.html index a0da19a3..06e9090b 100644 --- a/macrovision.html +++ b/macrovision.html @@ -64,7 +64,7 @@
Entity options
-
+
diff --git a/media/LICENSES.md b/media/LICENSES.md index 0970c227..f483f1b7 100644 --- a/media/LICENSES.md +++ b/media/LICENSES.md @@ -169,6 +169,23 @@ https://www.furaffinity.net/view/32499316/ * front.svg +## Aigey + +**https://www.furaffinity.net/user/just-a-little-mixed-up** + +https://www.furaffinity.net/view/12006265/ + +* side.svg + +## Natasha + +**https://www.furaffinity.net/user/fsmaverick** +**https://www.furaffinity.net/user/yutmutt** + +(no link) + +* front.svg + # Objects **Self-created** diff --git a/media/characters/aigey/side.svg b/media/characters/aigey/side.svg new file mode 100644 index 00000000..6caa1014 --- /dev/null +++ b/media/characters/aigey/side.svg @@ -0,0 +1,50 @@ + + + + + + + diff --git a/media/characters/natasha/front.svg b/media/characters/natasha/front.svg new file mode 100644 index 00000000..23f1733b --- /dev/null +++ b/media/characters/natasha/front.svg @@ -0,0 +1,124 @@ + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index ab583ced..a0c003c3 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -794,6 +794,102 @@ function makeShingo() { return entity; } +function makeAigey() { + const views = { + side: { + attributes: { + height: { + name: "Height", + power: 1, + type: "length", + base: math.unit(6, "feet") + }, + weight: { + name: "Weight", + power: 3, + type: "mass", + base: math.unit(75, "kg") + } + }, + image: { + source: "./media/characters/aigey/side.svg" + }, + name: "Side" + } + }; + + const entity = makeEntity("Aigey", "Aigey", views); + + entity.defaults.push({ + name: "Macro", + height: math.unit(200, "feet") + }); + + entity.defaults.push({ + name: "Megamacro", + height: math.unit(100, "miles") + }); + + entity.views[entity.defaultView].height = math.unit(200, "feet"); + + return entity; +} + +function makeNatasha() { + const views = { + side: { + attributes: { + height: { + name: "Height", + power: 1, + type: "length", + base: math.unit(6, "feet") + }, + weight: { + name: "Weight", + power: 3, + type: "mass", + base: math.unit(75, "kg") + } + }, + image: { + source: "./media/characters/natasha/front.svg" + }, + name: "Side" + } + }; + + const entity = makeEntity("Natasha", "Natasha", views); + + entity.defaults.push({ + name: "Normal", + height: math.unit(5 + 5/12, "feet") + }); + + entity.defaults.push({ + name: "Large", + height: math.unit(12, "feet") + }); + entity.defaults.push({ + name: "Macro", + height: math.unit(100, "feet") + }); + + entity.defaults.push({ + name: "Macro+", + height: math.unit(260, "feet") + }); + + entity.defaults.push({ + name: "Macro++", + height: math.unit(1000, "feet") + }); + + entity.views[entity.defaultView].height = math.unit(100, "feet"); + + return entity; +} + function makeMan() { const views = { body: { @@ -883,6 +979,14 @@ function makeCharacters() { name: "Shingo", constructor: makeShingo }); + results.push({ + name: "Aigey", + constructor: makeAigey + }); + results.push({ + name: "Natasha", + constructor: makeNatasha + }); results.push({ name: "Normal man", constructor: makeMan