diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 2e437822ed09fc8eaebd1f8ac750abbbc2eee7f0..f5c8a638866037283bc8389d32ffe7972b67d592 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 504d097ffeb0cf9a8131bd6e4d56d8c3b693682c..fb6dc6f44aca151abb2d816d0077196d444227a9 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; + } } } }