From 8ac54fea968f4c89a4b8092a34447dfa552dc0c8 Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Fri, 4 Jan 2019 21:09:38 -0800
Subject: [PATCH] SFBugFix pass II
---
devNotes/twine JS.txt | 2 +-
src/SpecialForce/Firebase.tw | 4 ++--
src/SpecialForce/JS.js | 2 +-
src/SpecialForce/Report.tw | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 4246d2321e7..dae43f39df0 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -35702,7 +35702,7 @@ window.SFBC = function() {
delete V.securityForceHeavyAmphibiousTransport;
}
- if ( (V.SF.Toggle || V.SFMODToggle) > 0) {
+ if ( (V.SF.Toggle || V.SFMODToggle) > 0 || V.SF === undefined) {
if (V.SF === undefined) {
if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; InitClean();
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index fa6010bae88..d6921a0fbc5 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -76,9 +76,9 @@
<<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>>
- While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Helots)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
+ While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.V.SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
- <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalHelots)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
+ <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.V.SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</if>>
diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js
index 8989d14d068..09663802b03 100644
--- a/src/SpecialForce/JS.js
+++ b/src/SpecialForce/JS.js
@@ -537,7 +537,7 @@ window.SFBC = function() {
delete V.securityForceHeavyAmphibiousTransport;
}
- if ( (V.SF.Toggle || V.SFMODToggle) > 0) {
+ if ( (V.SF.Toggle || V.SFMODToggle) > 0 || V.SF === undefined) {
if (V.SF === undefined) {
if (V.securityForceEventSeen < 1) { V.securityForceActive = -1 } else { V.securityForceActive = 2 };
V.SF = {Toggle:V.SFMODToggle, Active:V.securityForceActive}; InitClean();
diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw
index 2973ac83a9f..3d48a0a15e7 100644
--- a/src/SpecialForce/Report.tw
+++ b/src/SpecialForce/Report.tw
@@ -186,13 +186,13 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
| <<link "No Accountability">> <<set $SF.Regs = "none">>
<<replace "#accountability">> ''No Accountability'' <</replace>> <</link>>
<<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'':
- <<set $SF.MercCon.Income = 0,$SF.MercCon.Helots = 0>>
+ <<set $SF.MercCon.Income = 0,$SF.V.SF.MercCon.Menials = 0>>
<<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>>
<<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>>
<<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>>
During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendees, some decided to also give her some menial slaves as a bonus.<br>
<<set $menials += _MenialSlaves>>
- <<set $SF.MercCon.Helots += _MenialSlaves,$SF.MercCon.TotalHelots += _MenialSlaves>>
+ <<set $SF.V.SF.MercCon.Menials += _MenialSlaves,$SF.V.SF.MercCon.TotalMenials += _MenialSlaves>>
<<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>>
<<set $SF.MercCon.Revenue += _TSProfit>>
<<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>>
--
GitLab