From 404076df524e89034132ac661a64e8e9b88da08e Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 27 Feb 2018 16:09:11 -0500
Subject: [PATCH] SFJS work.
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 ++++++++
devNotes/twine JS | 15 +++++++++++++++
src/js/SFJS.tw | 15 +++++++++++++++
src/pregmod/SecForceEX/securityForceTradeShow.tw | 2 +-
src/pregmod/SimpleWorldEcomonyCheck.tw | 12 ------------
src/uncategorized/SFMBarracks.tw | 2 +-
6 files changed, 40 insertions(+), 14 deletions(-)
create mode 100644 src/js/SFJS.tw
delete mode 100644 src/pregmod/SimpleWorldEcomonyCheck.tw
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 4717d23ae00..8acbe7c1576 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 bd695f54b41..d77b8ca36ae 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 00000000000..b47078f318c
--- /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 c7d64fa12b4..4b2124db49a 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 36545876829..00000000000
--- 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 d0a03b4cd31..fd04f969115 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>>
--
GitLab