From c03ad6b2c18010835c584a4b4cf9efa09e8f0e39 Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Sun, 7 Oct 2018 01:20:17 -0700
Subject: [PATCH] Fixes #262865 and incorporates
https://gitgud.io/pregmodfan/fc-pregmod/merge_requests/2714
---
devNotes/twine JS.txt | 7 ++++---
src/SpecialForce/JS.js | 3 ++-
src/events/intro/introSummary.tw | 3 ++-
src/uncategorized/options.tw | 6 ++++++
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 65fb889bfd3..748e5e68a78 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -30904,9 +30904,10 @@ window.Count = function() {
T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H+T.SFF;
T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU+T.SFFU;
}
- if (V.terrain !== "oceanic") T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU;
- T.max = T.BaseU + T.LBU, V.SF.Units = T.Base + T.LB;
- if (V.terrain === "oceanic" || V.terrain === "marine") {
+ T.max = T.BaseU, V.SF.Units = T.Base;
+ if (V.terrain !== "oceanic") { T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU;
+ T.max += T.LBU, V.SF.Units += T.LB;
+ } else {
T.NY = S.AircraftCarrier + S.Sub + S.HAT, V.SF.Units += T.NY;
T.NYU = T.ACU + T.SubU + T.HATU, T.max += T.NYU;}
V.SF.Units = C(V.SF.Units, 0, T.max);
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index 0f51ed8ece7..a5e26db86e9 100644
--- a/src/SpecialForce/JS.js
+++ b/src/SpecialForce/JS.js
@@ -68,8 +68,9 @@ window.Count = function() {
T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H+T.SFF;
T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU+T.SFFU;
}
+ T.max = T.BaseU, V.SF.Units = T.Base;
if (V.terrain !== "oceanic") { T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU;
- T.max = T.BaseU + T.LBU, V.SF.Units = T.Base + T.LB;
+ T.max += T.LBU, V.SF.Units += T.LB;
} else {
T.NY = S.AircraftCarrier + S.Sub + S.HAT, V.SF.Units += T.NY;
T.NYU = T.ACU + T.SubU + T.HATU, T.max += T.NYU;}
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 9fe71b5d97d..893ad5059b5 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1017,11 +1017,12 @@ __''Mods''__
''disabled.'' [[Enable|Intro Summary][$SF.Toggle = 1]]
<<else>>
''enabled.'' [[Disable|Intro Summary][$SF.Toggle = 0]]
+ <br> The support facility is
<<if ($SF.Facility.Toggle === 0)>>
@@.red;DISABLED@@. [[Enable|Intro Summary][$SF.Facility.Toggle = 1]]
<<else>>
@@.cyan;ENABLED@@. [[Disable|Intro Summary][$SF.Facility.Toggle = 0]]
- <</if>>
+ <</if>> //Prep for future content.
<</if>>
<br>// This mod is initially from anon1888 but expanded by SFanon offers a lategame special (started out as security but changed to special in order to try and reduce confusion with CrimeAnon's separate Security Expansion (SecExp) mod) force, that is triggered after week 80. It is non-canon where it conflicts with canonical updates to the base game.//
<br><br>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index fe994fdb72c..fd45ba212fb 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -435,6 +435,12 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe
@@.red;DISABLED@@. [[Enable|Options][$SF.Toggle = 1]]
<<else>>
@@.cyan;ENABLED@@. [[Disable|Options][$SF.Toggle = 0]]
+ <br> The support facility is
+ <<if ($SF.Facility.Toggle === 0)>>
+ @@.red;DISABLED@@. [[Enable|Intro Summary][$SF.Facility.Toggle = 1]]
+ <<else>>
+ @@.cyan;ENABLED@@. [[Disable|Intro Summary][$SF.Facility.Toggle = 0]]
+ <</if>> //Prep for future content.
<</if>> //Will not affect mod content that has already been encountered.//
<br>
--
GitLab