From 4a87f8aed95f8c98a0ef4ae3c6c4511a5c77852e Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Sun, 1 Aug 2021 17:38:55 -0700 Subject: [PATCH] Fix gating for assistant options --- devTools/types/assistant.d.ts | 3 ++- src/personalAssistant/assistantOptions.js | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/devTools/types/assistant.d.ts b/devTools/types/assistant.d.ts index 767cbfe6b6d..9d0729f420f 100644 --- a/devTools/types/assistant.d.ts +++ b/devTools/types/assistant.d.ts @@ -7,7 +7,8 @@ interface assistant { personality: -1 | 0 | 1; name: string; power: number; - fsOptions: 1 | 0; + fsOptions: FC.Bool; + options: FC.Bool; market: { relationship: "nonconsensual" | "incestuous" | "cute" | "romantic"; limit: number; diff --git a/src/personalAssistant/assistantOptions.js b/src/personalAssistant/assistantOptions.js index 507314620d1..946a370fd9f 100644 --- a/src/personalAssistant/assistantOptions.js +++ b/src/personalAssistant/assistantOptions.js @@ -44,7 +44,7 @@ App.UI.personalAssistantOptions = function() { tabBar.addTab("Computer Core Upgrades", "upgrades", upgrades()); if (V.week >= 11) { tabBar.addTab("Settings", "settings", settings()); - if (V.assistant.personality !== 0) { + if (V.assistant.personality !== 0 && V.assistant.options) { tabBar.addTab("Appearance", "appearance", appearance()); } } @@ -281,11 +281,11 @@ App.UI.personalAssistantOptions = function() { } } App.UI.DOM.appendNewElement("div", frag, App.UI.DOM.generateLinksStrip(linkArray)); - } - if (V.seeImages) { - App.UI.DOM.appendNewElement("h3", node, "Custom Image"); - node.append(customAssistantImage()); + if (V.seeImages && V.seeAvatar) { + App.UI.DOM.appendNewElement("h3", node, "Custom Image"); + node.append(customAssistantImage()); + } } return frag; -- GitLab