From 30604392456587d5273f5774a151b2b6d1fbf512 Mon Sep 17 00:00:00 2001 From: Blank <okp57855@psoxs.com> Date: Fri, 21 Dec 2018 02:15:35 -0800 Subject: [PATCH] Bug fixes II: revenge of the close bracket --- devNotes/twine JS.txt | 19 ++++++++++--------- src/SpecialForce/JS.js | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 2e437822ed0..f5c8a638866 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -35656,15 +35656,16 @@ window.SFBC = function() { V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:V.SatLaunched}; delete V.SatLaunched; V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat; - if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow; - if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel; - if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units(); - if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = ""; - if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) { - delete V.SFUnit; - V.SF.Squad.Sat = {lv:0, InOrbit:0}; - delete V.SatLaunched; - V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat; + if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow; + if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel; + if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units(); + if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = ""; + if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) { + delete V.SFUnit; + V.SF.Squad.Sat = {lv:0, InOrbit:0}; + delete V.SatLaunched; + V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat; + } } } } diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js index 504d097ffeb..fb6dc6f44ac 100644 --- a/src/SpecialForce/JS.js +++ b/src/SpecialForce/JS.js @@ -646,15 +646,16 @@ window.SFBC = function() { V.SF.Squad.Sat = {lv:V.SF.Squad.Satellite, InOrbit:V.SatLaunched}; delete V.SatLaunched; V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat; - if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow; - if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel; - if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units(); - if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = ""; - if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) { - delete V.SFUnit; - V.SF.Squad.Sat = {lv:0, InOrbit:0}; - delete V.SatLaunched; - V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat; + if (V.SFTradeShow != undefined) V.SF.MercCon = V.SFTradeShow; delete V.SFTradeShow; + if (V.SFColonel != undefined) V.SF.Colonel = V.SFColonel; delete V.SFColonel; + if (V.securityForceName) Init(); Main(); Colonel(); TradeShow(); Units(); + if (V.SF.BadOutcome === undefined) V.SF.BadOutcome = ""; + if (V.SF.Squad.Satellite != undefined && V.SatLaunched == undefined) { + delete V.SFUnit; + V.SF.Squad.Sat = {lv:0, InOrbit:0}; + delete V.SatLaunched; + V.SF.Squad.Satellite = V.SF.Squad.Sat; delete V.SF.Squad.Sat; + } } } } -- GitLab