From b1830a501829eefc4a95ccaafc19299ddebfef12 Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Mon, 2 Mar 2020 13:55:37 -0800
Subject: [PATCH] paFix
---
src/personalAssistant/assistant.js | 6 +++---
src/personalAssistant/assistantEvents.tw | 2 +-
src/personalAssistant/assistantOptions.tw | 2 +-
src/uncategorized/nonRandomEvent.tw | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/personalAssistant/assistant.js b/src/personalAssistant/assistant.js
index 93784f19155..2d1d7e269b5 100644
--- a/src/personalAssistant/assistant.js
+++ b/src/personalAssistant/assistant.js
@@ -32,9 +32,6 @@ window.assistant = (function() {
convert('assistantNameAnnounced', 'announcedName');
convert('assistantBodyDesire', 'bodyDesire');
convert('assistantOptions', 'options');
- if (V.week >= 11 && !V.assistant.options) {
- V.assistant.options = 1;
- }
convert('assistantFSOptions', 'fsOptions');
convert('assistantFSAppearance', 'fsAppearance');
@@ -86,5 +83,8 @@ window.assistant = (function() {
aggressiveness: V.assistant.market.aggressiveness || 0,
});
}
+ if (V.week < 18) {
+ delete V.assistant.options;
+ }
}
})();
\ No newline at end of file
diff --git a/src/personalAssistant/assistantEvents.tw b/src/personalAssistant/assistantEvents.tw
index 7d424a3133b..efefe6a0843 100644
--- a/src/personalAssistant/assistantEvents.tw
+++ b/src/personalAssistant/assistantEvents.tw
@@ -12,7 +12,6 @@
<<setAssistantPronouns>>
<<switch $Event>>
<<case "assistant">>
-<<set $assistant.options = 1>>
One morning, after seeing to an immense pile of business with $assistant.name program's able assistance, you are struck by the strangeness of the situation. You spent the past hours talking back and forth as though to a human personal assistant, getting information and responses in the program's impersonal, genderless voice. You ask the program what _heA thinks of _hisA duties.
<br><br>
@@ -21,6 +20,7 @@ One morning, after seeing to an immense pile of business with $assistant.name pr
"However, if I understand the line of questioning correctly, I can make myself more entertaining, if you wish." The voice grows sultry and feminine. "I'd be happy to speak a little differently, to refer to myself as female, and to act as though some of the more complex sex toys in the arcology are, well, me."
<<case "assistant SP">>
+<<set $assistant.options = 1>>
<<set _smartPiercings = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index 20a784c8ab5..208e524d747 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -36,7 +36,7 @@ Seated at your desk, you glance at the visual representation of
<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Assistant)>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
-<<if def $assistant.options>>
+<<if $week >= 11>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
<<if $assistant.personality != 0>>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index fa2d5da4773..1d8b11e38c3 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -122,7 +122,7 @@
<<goto "eliteTakeOver">>
<<elseif (_effectiveWeek > 5) && ($rep > 3000) && ($FSAnnounced == 0)>>
<<goto "P FS Announcement">>
-<<elseif _effectiveWeek > 18 && $assistant.personality > 0>>
+<<elseif _effectiveWeek > 18 && $assistant.personality > 0 && !$assistant.options>>
<<set $Event = "assistant SP">>
<<goto "Assistant Events">>
<<elseif (_effectiveWeek > 45) && ($bodyswapAnnounced == 0) && ($surgeryUpgrade == 1)>>
--
GitLab