From 34b6d4298ad8b11a17314252d7fce77e0faded48 Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Mon, 6 Jun 2022 09:51:02 -0400
Subject: [PATCH] Fixed tiny assistant art
---
css/art/art.css | 10 ++--------
js/003-data/gameVariableData.js | 9 +++++++++
src/events/eventUtils.js | 14 +++++++++++---
src/personalAssistant/assistantOptions.js | 14 +++++++++-----
4 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/css/art/art.css b/css/art/art.css
index 2d16ae8b013..42ed6dfc583 100644
--- a/css/art/art.css
+++ b/css/art/art.css
@@ -65,9 +65,8 @@ img {
width: 33%;
}
-.lrgRender > img, .lrgRender > video {
- height: 4em;
- width: auto;
+.lrgVector.custom {
+ height: auto;
}
.lrgRender > svg {
@@ -75,11 +74,6 @@ img {
position: relative;
}
-.lrgVector > img, .lrgVector > video {
- height: 4em;
- width: auto;
-}
-
object {
object-fit: scale-down;
position: absolute;
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 0d7f4a6b8bd..3f002273b02 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -91,6 +91,15 @@ App.Data.defaultGameStateVariables = {
headGirlTrainsObedience: 1,
headGirlTrainsParaphilias: 1,
headGirlTrainsSkills: 1,
+ /**
+ * | ***Value*** | **Description** |
+ * |------------:|:-----------------------------|
+ * | *1* | NoX/Deepmurk's vector art |
+ * | *2* | Non-embedded vector art |
+ * | *3* | Revamped embedded vector art |
+ * | *4* | Elohiem's WebGL |
+ * | *5* | Shokushu's rendered |
+ */
imageChoice: 1,
inbreeding: 1,
lastBDayEvent: -1,
diff --git a/src/events/eventUtils.js b/src/events/eventUtils.js
index 32f70e094a0..37f975a09b1 100644
--- a/src/events/eventUtils.js
+++ b/src/events/eventUtils.js
@@ -54,15 +54,21 @@ App.Events.drawEventArt = (function() {
});
}
- let artSpan = document.createElement("span");
+ const artSpan = document.createElement("span");
artSpan.id = "art-frame";
+
if (slaves.length === 1) {
const slave = slaves[0];
+ const custom = typeof slave !== "string" && slave.custom.image && slave.custom.image.filename !== "";
if (!V.seeCustomImagesOnly ||
(slaves[0] === "assistant" && V.assistant.customImage) ||
- (typeof slave !== "string" && slave.custom.image && slave.custom.image.filename !== "")) {
+ (custom)) {
let refDiv = document.createElement("div");
refDiv.classList.add("imageRef", V.imageChoice === 1 ? "lrgVector" : "lrgRender");
+
+ if (custom) {
+ refDiv.classList.add("custom");
+ }
if (slaves[0] === "assistant") {
refDiv.appendChild(App.Art.assistantArt(3));
} else {
@@ -71,8 +77,10 @@ App.Events.drawEventArt = (function() {
artSpan.appendChild(refDiv);
}
} else {
- let colDiv = document.createElement("div");
+ const colDiv = document.createElement("div");
+
colDiv.classList.add("imageColumn");
+
for (const slave of slaves) {
if (!V.seeCustomImagesOnly ||
(slave === "assistant" && V.assistant.customImage) ||
diff --git a/src/personalAssistant/assistantOptions.js b/src/personalAssistant/assistantOptions.js
index 1d5a50918b1..ceb48e35c2c 100644
--- a/src/personalAssistant/assistantOptions.js
+++ b/src/personalAssistant/assistantOptions.js
@@ -8,11 +8,12 @@ App.UI.personalAssistantOptions = function() {
App.Events.drawEventArt(node, "assistant");
const {
- HeA, HisA,
- heA, hisA, himA, himselfA
- } = getPronouns(assistant.pronouns().main).appendSuffix("A");
+ He: HeA, His: HisA,
+ he: heA, his: hisA, him: himA, himself: himselfA,
+ } = getPronouns(assistant.pronouns().main);
+
+ const r = [];
- let r = [];
r.push(`Seated at your desk, you glance at the visual representation of`);
if (V.assistant.announcedName) {
r.push(App.UI.DOM.makeTextBox(V.assistant.name, (v) => V.assistant.name = v));
@@ -55,6 +56,7 @@ App.UI.personalAssistantOptions = function() {
function upgrades() {
const frag = new DocumentFragment();
+
if (V.assistant.power === 0) {
const memoryCost = Math.trunc(20000 * V.upgradeMultiplierArcology * V.HackingSkillMultiplier);
App.Events.addParagraph(frag, [
@@ -103,6 +105,7 @@ App.UI.personalAssistantOptions = function() {
function settings() {
const frag = new DocumentFragment();
+
App.UI.DOM.appendNewElement("h3", frag, "Behavior:");
if (V.assistant.personality <= 0) {
App.Events.addParagraph(frag, [
@@ -168,7 +171,8 @@ App.UI.personalAssistantOptions = function() {
function appearance() {
const frag = new DocumentFragment();
- let linkArray = [];
+
+ const linkArray = [];
frag.append(availableAssistantAppearances());
if (V.policies.publicPA === 1) {
--
GitLab