From 4215d819a16558e9ac67098b7de60fc5fcd4045d Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Tue, 17 Mar 2020 16:51:09 -0400 Subject: [PATCH] Add Lalim; adjust Shadow's weight; make sliders toggleable --- macrovision.css | 5 + macrovision.html | 4 + macrovision.js | 4 + media/attribution.js | 20 + media/characters/lalim/feeding.svg | 633 +++++++++++++++++++++++++++++ media/characters/lalim/side.svg | 495 ++++++++++++++++++++++ presets/characters.js | 28 +- 7 files changed, 1187 insertions(+), 2 deletions(-) create mode 100644 media/characters/lalim/feeding.svg create mode 100644 media/characters/lalim/side.svg diff --git a/macrovision.css b/macrovision.css index c3b161b2..58f43e5a 100644 --- a/macrovision.css +++ b/macrovision.css @@ -413,12 +413,17 @@ a { } .floating-slider { + display: none; position: absolute; z-index: 1000; width: 250px; height: 50px; } +body.toggle-scale-sliders .floating-slider { + display: block; +} + #slider-scale { top: 1%; left: 5%; diff --git a/macrovision.html b/macrovision.html index 72c4e417..b94ade57 100644 --- a/macrovision.html +++ b/macrovision.html @@ -155,6 +155,10 @@ +
+ + +
Auto-sizing mode diff --git a/macrovision.js b/macrovision.js index 331d8e29..96797cef 100644 --- a/macrovision.js +++ b/macrovision.js @@ -1018,6 +1018,10 @@ document.addEventListener("DOMContentLoaded", () => { document.body.classList[e.target.checked ? "add" : "remove"]("toggle-entity-glow"); }); + document.querySelector("#options-world-show-scale-sliders").addEventListener("input", e => { + document.body.classList[e.target.checked ? "add" : "remove"]("toggle-scale-sliders"); + }); + document.querySelector("#options-order-forward").addEventListener("click", e => { if (selected) { entities[selected.dataset.key].priority += 1; diff --git a/media/attribution.js b/media/attribution.js index 99d056a0..97977070 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -6827,6 +6827,18 @@ const attributionData = { "4wrz" ] }, + { + prefix: "./media/characters/lalim/", + files: [ + { name: "feeding.svg", source: "https://www.furaffinity.net/view/28273923/" } + ], + authors: [ + "witchfang" + ], + owners: [ + "bruyaglovae" + ] + }, //characters { prefix: "./media/food/animals/", @@ -9430,6 +9442,14 @@ const attributionData = { "name": "4wrz", "url": "https://www.furaffinity.net/user/4wrz", }, + "witchfang": { + "name": "witchfang", + "url": "https://www.furaffinity.net/user/witchfang", + }, + "bruyaglovae": { + "name": "Bruyaglovae", + "url": "https://www.furaffinity.net/user/bruyaglovae/", + }, } } diff --git a/media/characters/lalim/feeding.svg b/media/characters/lalim/feeding.svg new file mode 100644 index 00000000..d877cc63 --- /dev/null +++ b/media/characters/lalim/feeding.svg @@ -0,0 +1,633 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/lalim/side.svg b/media/characters/lalim/side.svg new file mode 100644 index 00000000..a04dab15 --- /dev/null +++ b/media/characters/lalim/side.svg @@ -0,0 +1,495 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index ad1b57b5..7ef0dbd4 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -16468,7 +16468,7 @@ characterMakers["Shadow"] = () => { { side: { height: math.unit(55, "feet"), - weight: math.unit(30, "tons"), + weight: math.unit(153, "tons"), name: "Side", image: { source: "./media/characters/shadow/side.svg", @@ -16478,7 +16478,7 @@ characterMakers["Shadow"] = () => { }, flying: { height: math.unit(145, "feet"), - weight: math.unit(30, "tons"), + weight: math.unit(153, "tons"), name: "Flying", image: { source: "./media/characters/shadow/flying.svg" @@ -16601,6 +16601,30 @@ characterMakers["Kash"] = () => { ) }; +characterMakers["Lalim"] = () => { + return makeCharacter( + "Lalim", + "", + { + feeding: { + height: math.unit(6.7, "feet"), + weight: math.unit(350, "lb"), + name: "Feeding", + image: { + source: "./media/characters/lalim/feeding.svg", + } + }, + }, + [ + { + name: "Normal", + height: math.unit(6.7, "feet"), + default: true + }, + ] + ) +}; + //characters function makeCharacters() {