From 7466922f1af55d40f3942098bb7afe13c944a967 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sun, 24 Dec 2017 07:25:57 +1300 Subject: [PATCH] Added missing /if and rework. --- src/uncategorized/nonRandomEvent.tw | 2 +- src/uncategorized/scheduledEvent.tw | 2 +- src/uncategorized/securityForceEOWReport.tw | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw index bda67eea09c..d254400975e 100644 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -158,7 +158,7 @@ <<goto "secExpSmilingMan">> <<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>> <<goto "secExpSmilingMan">> -<<elseif (_effectiveWeek > 84) && $LieutenantColonel == 2 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>> +<<elseif (_effectiveWeek > 84) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>> <<goto "securityForceTradeShow">> <<else>> <<if random(1,100) > _effectiveWeek+25>> diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw index a7ace8ded5b..81c2dc16dbb 100644 --- a/src/uncategorized/scheduledEvent.tw +++ b/src/uncategorized/scheduledEvent.tw @@ -194,7 +194,7 @@ <<else>> <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>> <</if>> -<<elseif (Math.trunc($week/24) == ($week/24)) && $LieutenantColonel == 2 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>> +<<elseif (Math.trunc($week/24) == ($week/24)) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>> <<goto "securityForceTradeShow">> <<elseif $plot == 1>> <<goto "Nonrandom Event">> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index c3d0389ba39..b6df81f60dd 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -397,9 +397,10 @@ Rules of Engagement: <span id="roe"><<if $securityForceRulesOfEngagement == "hold">>''Hold Fire''<<elseif $securityForceRulesOfEngagement == "limited">>''Limited Fire''<<else>>''Free Fire''<</if>></span>. <<link "Hold Fire">><<set $securityForceRulesOfEngagement = "hold">><<replace "#roe">>''Hold Fire''<</replace>><</link>> | <<link "Limited Fire">><<set $securityForceRulesOfEngagement = "limited">><<replace "#roe">>''Limited Fire''<</replace>><</link>> | <<link "Free Fire">><<set $securityForceRulesOfEngagement = "free">><<replace "#roe">>''Free Fire''<</replace>><</link>> Accountability: <span id="accountability"><<if $securityForceAccountability == "strict">>''Strict Accountability''<<elseif $securityForceAccountability == "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. <<link "Strict Accountability">><<set $securityForceAccountability = "strict">><<replace "#accountability">>''Strict Accountability''<</replace>><</link>> | <<link "Some Accountability">><<set $securityForceAccountability = "some">><<replace "#accountability">>''Some Accountability''<</replace>><</link>> | <<link "No Accountability">><<set $securityForceAccountability = "none">><<replace "#accountability">>''No Accountability''<</replace>><</link>> <<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 <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away. There was some interest in our developements, I could probably sell generic scematics next time I go if you want? + <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 <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>> 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, <<print cashFormat($TradeShowIncome)>> was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus. + <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 <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>> + <br>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:// -- GitLab