From ff4b3f0cf1b402fc26af4e153063995395e49e3a Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Wed, 20 Dec 2017 23:45:13 +1300
Subject: [PATCH] Re-adding missing vars and format conversion.
---
src/init/storyInit.tw | 33 +++++++++++++++++----
src/uncategorized/securityForceEOWReport.tw | 4 +--
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index bb2a2ac1ccc..3eb0591b832 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -27,6 +27,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $slaves[_i].assignmentVisible = 1>>
<<set $slaves[_i].weekAcquired = 1>>
<<set $slaves[_i].newGamePlus = 1>>
+ <<set $slaves[$i].HasBeenAssignedToFacilitySupport = 0>>
<<PMODinit $slaves[_i]>>
<<if $slaves[_i].mother > 0>>
<<set $slaves[_i].mother += 1200000>>
@@ -506,6 +507,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $cellblock = 0>>
<<set $cellblockName = "the Cellblock">>
<<set $cellblockNameCaps = "The Cellblock">>
+<<set $cellblockWardenCumsInside = 1>>
<<set $masterSuiteSlaves = 0>>
<<set $masterSuiteDecoration = "standard">>
<<set $masterSuiteUpgradeLuxury = 0>>
@@ -560,12 +562,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $FSCredits = 0>>
<<set $FSCreditCount = 5>>
<<set $FSCreditCountString = "five">>
-<<set $FSGotRepCreditOne = 0>>
-<<set $FSGotRepCreditTwo = 0>>
-<<set $FSGotRepCreditThree = 0>>
-<<set $FSGotRepCreditFour = 0>>
-<<set $FSGotRepCreditFive = 0>>
-<<set $FSGotRepCreditSix = 0>>
+<<set $FSGotRepCredits = 0>>
<<set $FSSingleSlaveRep = 10>>
<<set $FSSpending = 0>>
<<set $FSLockinLevel = 100>>
@@ -1242,6 +1239,30 @@ cyberneticPLimb: 0,
ocularImplant: 0,
erectileImplant: 0
} >>
+
+<<if ndef $AgePricing>>
+ <<set $AgePricing = 1>>
+<</if>>
+<<if ndef $AgeTrainingEffect>>
+ <<set $AgeTrainingEffect = 1>>
+<</if>>
+<<if ndef $AgeTrainingUpperBounds>>
+ <<set $AgeTrainingUpperBounds = 14>>
+<</if>>
+<<if ndef $AgeTrainingLowerBounds>>
+ <<set $AgeTrainingLowerBounds = 12>>
+<</if>>
+<<if ndef $MinEffectedAge>>
+ <<set $MinEffectedAge = 3>>
+<</if>>
+<<if ndef $PastPrimeAge>>
+ <<set $PastPrimeAge = 5000>>
+<</if>>
+
+<<if ndef $FormattedWithCommas>>
+ <<set $FormattedWithCommas = 0>>
+<</if>>
+
<<set $researchLab = {
built: "false",
aiModule: 1,
diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw
index 16d41bc7e0f..ab248260351 100644
--- a/src/uncategorized/securityForceEOWReport.tw
+++ b/src/uncategorized/securityForceEOWReport.tw
@@ -397,8 +397,8 @@
<<if $OverallTradeShowAttendance == 1>>
<br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job. There was some interest in our developements, I could probably sell generic scematics next time I go if you want?
<<elseif $OverallTradeShowAttendance >= 2>>
- While at the recent TradeShow, $TradeShowIncome was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus.
- Overal $TotalTradeShowIncome has been made and $TotalTradeShowHelots menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended.
+ While at the recent TradeShow, <<print cashFormat($TradeShowIncome)>> was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus.
+ Overal <<print cashFormat($TotalTradeShowIncome)>> has been made and $TotalTradeShowHelots menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended.
<</if>>
//Current facilities status://
<<include "SpecialForceUpgradeDec">>
--
GitLab