From 3d2252d13ee9c309b2ab535e82ede50bf14f3e4e Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Wed, 12 Feb 2020 13:28:54 -0500 Subject: [PATCH] Add alt view for Jennifer. Fix bug with character offsets If a character had a bottom offset for one view but none for another, the offset was not getting cleared properly when switching --- macrovision.js | 9 +- media/LICENSES.md | 6 ++ media/characters/jennifer/front-alt.svg | 105 ++++++++++++++++++++++++ presets/characters.js | 11 ++- 4 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 media/characters/jennifer/front-alt.svg diff --git a/macrovision.js b/macrovision.js index 77fe9d50..ab1ebe7e 100644 --- a/macrovision.js +++ b/macrovision.js @@ -618,8 +618,10 @@ function displayEntity(entity, view, x, y) { const image = entity.views[view].image; img.src = image.source; - if (image.bottom) { + if (image.bottom !== undefined) { img.style.setProperty("--offset", ((-1 + image.bottom) * 100) + "%") + } else { + img.style.setProperty("--offset", ((-1) * 100) + "%") } box.dataset.x = x; @@ -729,9 +731,10 @@ document.addEventListener("DOMContentLoaded", () => { const image = entities[selected.dataset.key].views[e.target.value].image selected.querySelector(".entity-image").src = image.source; - - if (image.bottom) { + if (image.bottom !== undefined) { selected.querySelector(".entity-image").style.setProperty("--offset", ((-1 + image.bottom) * 100) + "%") + } else { + selected.querySelector(".entity-image").style.setProperty("--offset", ((-1) * 100) + "%") } updateSizes(); updateEntityOptions(entities[selected.dataset.key], e.target.value); diff --git a/media/LICENSES.md b/media/LICENSES.md index 47a2dc50..f334a1f5 100644 --- a/media/LICENSES.md +++ b/media/LICENSES.md @@ -320,6 +320,12 @@ https://www.furaffinity.net/view/16949759/ * front.svg +**https://www.furaffinity.net/user/wfa** + +https://www.furaffinity.net/view/19334493/ + +* front-alt.svg + # Naturals **Self-created** diff --git a/media/characters/jennifer/front-alt.svg b/media/characters/jennifer/front-alt.svg new file mode 100644 index 00000000..d0fb5b7e --- /dev/null +++ b/media/characters/jennifer/front-alt.svg @@ -0,0 +1,105 @@ + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index 071c23f8..778a3c03 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -1506,7 +1506,16 @@ characterMakers["Jennifer"] = () => { name: "Front", image: { source: "./media/characters/jennifer/front.svg", - bottom: 0.11 + bottom: 0.11, + extra: 1.16 + } + }, + frontAlt: { + height: math.unit(2, "meter"), + weight: math.unit(80, "kg"), + name: "Front (Alt)", + image: { + source: "./media/characters/jennifer/front-alt.svg" } } },