From b285274909b24ada781be2a525a3ad02376fc65c Mon Sep 17 00:00:00 2001
From: x <okp57855@psoxs.com>
Date: Thu, 7 Feb 2019 17:27:02 +1300
Subject: [PATCH] Fix and tweaking.

---
 src/SpecialForce/SpecialForce.js | 2 +-
 src/events/intro/introSummary.tw | 4 ++--
 src/init/storyInit.tw            | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 494ebcdb5b4..e7b676c37f1 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -459,7 +459,7 @@ window.MercCon = function() {
 };
 window.Facility = function() {
  const V=State.variables;
- V.SF.Facility={Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ V.SF.Facility={Toggle:V.SF.Facility.Toggle, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
 };
 
 window.SFInit = function() {
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 37951dd4f7e..d6c3f137084 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1111,12 +1111,12 @@ Currently
 
 __''Mods''__
 <br>The Special Force Mod is
-<<if $SF.Toggle === 0>>
+<<if $SF.Toggle < 1>>
 	''disabled.'' [[Enable|Intro Summary][$SF.Toggle = 1]]
 <<else>>
 	''enabled.'' [[Disable|Intro Summary][$SF.Toggle = 0]]
 	<br>&nbsp;The support facility is
-	<<if ($SF.Facility.Toggle === 0)>>
+	<<if $SF.Facility.Toggle < 1>>
 			@@.red;DISABLED.@@ [[Enable|Intro Summary][$SF.Facility.Toggle = 1]]
 	<<else>>
 			@@.cyan;ENABLED.@@ [[Disable|Intro Summary][$SF.Facility.Toggle = 0]]
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index d05c527d10d..cd7abe21264 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1496,9 +1496,10 @@ erectileImplant: 0
 <<set $abbreviateHormoneBalance = 2>>
 
 <<if def $SF.Toggle>>
-	<<set $SF = {Toggle:$SF.Toggle,Active:-1}>>
+	<<set $SF = {Toggle:$SF.Toggle, Facility:{Toggle:$SF.Facility.Toggle}}>>
 <<else>>
-	<<set $SF = {Toggle:0,Active:-1}>>
+	<<set $SF = {Toggle:0, Facility:{Toggle:0}}>>
 <</if>>
+<<set $SF.Active = -1>>
 
 <<goto "Alpha disclaimer">>
-- 
GitLab