diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 4717d23ae0092f336536dbf559c8b044cc021066..8acbe7c1576fa331fd15993c03edb6e4c5b1156a 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,14 @@ 0.10.7.0/1 +2/28/18 + + 375 + -Sfanon's fixes and tweaks + -some more robust catchers for NaN'd rep + -pregmodfan's tweaking to saAgent + -cleaned out all the new sanityCheck complaints + 2/27/18 374 diff --git a/devNotes/twine JS b/devNotes/twine JS index bd695f54b415e7aa014a513552f71b79fd487383..d77b8ca36ae990dd200f35e3389d2fd2bca42c17 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -7916,3 +7916,18 @@ window.extractHairColor = function(hColor) { } return colorCode; }; + +/*SFJS [script]*/ + +window.simpleWorldEconomyCheck = function() { + n1 = 7; + n2 = 5; + n3 = 3; + if(State.variables.economy === .5) { + return n1; + } else if(State.variables.economy === 1.5) { + return n3; + } else { + return n2; + } +} diff --git a/src/js/SFJS.tw b/src/js/SFJS.tw new file mode 100644 index 0000000000000000000000000000000000000000..b47078f318cd97cdc8596e536dcc99cacbb3e9a3 --- /dev/null +++ b/src/js/SFJS.tw @@ -0,0 +1,15 @@ +SFJS [script] + +window.simpleWorldEconomyCheck = function() { + n1 = 7; + n2 = 5; + n3 = 3; + if(State.variables.economy === .5) { + return n1; + } else if(State.variables.economy === 1.5) { + return n3; + } else { + return n2; + } +} + diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw index c7d64fa12b46f92fb85c27fee3a4c4315eccd7ac..4b2124db49a07bab7b30b4b3dd9e2dd5e4f56aa9 100644 --- a/src/pregmod/SecForceEX/securityForceTradeShow.tw +++ b/src/pregmod/SecForceEX/securityForceTradeShow.tw @@ -1,7 +1,7 @@ :: securityForceTradeShow [nobr] <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">> -<<include "SimpleWorldEcomonyCheck">> +<<set $Env = simpleWorldEconomyCheck()>> <<if ndef $TradeShowAttendanceGranted>> <<set $TradeShowAttendanceGranted = 0>> <</if>> <<if $OverallTradeShowAttendance == 0>> diff --git a/src/pregmod/SimpleWorldEcomonyCheck.tw b/src/pregmod/SimpleWorldEcomonyCheck.tw deleted file mode 100644 index 3654587682954cb5e124bdb5cfba70830218d870..0000000000000000000000000000000000000000 --- a/src/pregmod/SimpleWorldEcomonyCheck.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: SimpleWorldEcomonyCheck -<<silently>> -<<set _N1 = 7, _N2 = 5, _N3 = 3>> - <<switch $economy>> - <<case .5>> - <<set $Env = _N1>> - <<case 1>> - <<set $Env = _N2>> - <<case 1.5>> - <<set $Env = _N3>> - <</switch>> -<</silently>> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index d0a03b4cd312401be600de3acb28236834e7c935..fd04f969115453f09f4ff0c95b979ad670992afe 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -7,7 +7,7 @@ <<set $ColonelRelationship = 0>> /* 0 - Employee and boss, 100 - Friend, 200 - Close friend, 300 - Girlfriend, 400 - Lover */ <</if>> <<set _RelationshipTitle = "<<if $ColonelRelationship = 0>> boss <<elseif $ColonelRelationship >= 100>> friend <<elseif $ColonelRelationship >= 200>> close friend <<elseif $ColonelRelationship >= 300>> <<if $PC.title = 1>> boyfriend <<else>> $PC.title = 0>> girlfriend <</if>> <<elseif $ColonelRelationship >= 400>> lover <</if> -<<include "SimpleWorldEcomonyCheck">> +<<set $Env = simpleWorldEconomyCheck()>> <<switch $Env>> <<case "_N1">> <<set $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>>