diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 4246d2321e7fed570e0983934faf3603510e53ef..dae43f39df0cf213e5b91ec2c7411c41f89a9156 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 fa6010bae88c1d6b5d5c28d61553c3ca92868b79..d6921a0fbc5a859b5b9fecaf500911137d77f50e 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 8989d14d068cf759c98a856179adb8ba0c38b4d7..09663802b03aaaef8d81a6280529a32219a41d06 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 2973ac83a9fb04925a169ee33396b3509865e0df..3d48a0a15e744866c0d85364cc4a37d4db6207f9 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>>