From 993c6d18cc4fb55174e81910739dee7e6e57716c Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 10 Jan 2018 19:53:15 -0500 Subject: [PATCH] manual merging of !1300 --- src/uncategorized/securityForceEOWReport.tw | 33 +++++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 8efcae7313c..55f9038ca71 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -369,19 +369,26 @@ <<set $TradeShowHelots = 0>> <</if>> -<<set _OverdoseSurvivalChance = 99>> -<<if _Env == _N1>> - <<set _OverdoseSurvivalChance = _OverdoseSurvivalChance-.5>> -<<elseif _Env == _N2>> - <<set _OverdoseSurvivalChance = _OverdoseSurvivalChance>> -<<elseif _Env == _N3>> - <<set _OverdoseSurvivalChance = _OverdoseSurvivalChance+.5>> -<</if>> +<<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10>> + <<set _OverdoseSurvivalChance = 5, _OverdoseDeaths = 0>> + <<if _Env == _N1>> + <<set _OverdoseSurvivalChance = _OverdoseSurvivalChance-.5>> + <<elseif _Env == _N2>> + <<set _OverdoseSurvivalChance = _OverdoseSurvivalChance>> + <<elseif _Env == _N3>> + <<set _OverdoseSurvivalChance = _OverdoseSurvivalChance+.5>> + <</if>> + + <<if $securityForceStimulantPower == 8 && random(0,100) > _OverdoseSurvivalChance>> + <<set _OverdoseDeaths = random(0,10)>> + <<elseif $securityForceStimulantPower == 10 && random(0,100) > _OverdoseSurvivalChance>> + <<set _OverdoseDeaths = random(0,20)>> + <</if>> + + <<if _OverdoseDeaths > 0>> + <<set $securityForcePersonnel -= _OverdoseDeaths>> + <</if>> -<<if $securityForceStimulantPower == 8 && random(0,100) > _OverdoseSurvivalChance>> - <<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,10)">> -<<elseif $securityForceStimulantPower == 10 && random(0,100) > _OverdoseSurvivalChance>> - <<set _OverdoseDeaths = "$securityForcePersonnel -= random(0,20)">> <</if>> /* Take all the above and display the EOW text and control panel. */ @@ -389,7 +396,7 @@ <<nobr>> __Status and Activities of the $securityForceName __: <br>This week, $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, focused on <<if $securityForceFocus == "recruit">>recruiting and training more personnel. Smaller parties ventured out to protect the arcology's trade routes and strike targets of opportunity.<<elseif $securityForceFocus == "secure">>securing the trade routes between the arcology and the surrounding area. Smaller parties ventured out to strike targets of opportunity and process new recruits. - <<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10>> _OverdoseDeaths soldiers fatally overdosed. The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security. + <<elseif $securityForceFocus == "raiding">>locating and striking targets of opportunity, capturing both material loot and new slaves. Smaller parties secured the most important of the arcology's trade routes and processed new recruits.<</if>> <<if $securityForceStimulantPower == 8 || $securityForceStimulantPower == 10 && _OverdoseDeaths > 0>> <<print (_OverdoseDeaths)>> soldiers fatally overdosed on the drug cocktail, The Colonel's much heavier than average drug use saves her from this side effect.<</if>> These activities have, overall, @@.green;improved@@ your arcology's prosperity. <<if $securityForceProfitable == 1>>The goods procured by the $securityForceName this week, after accounting for the spoils retained by individual soldiers, were @@.green;more than sufficient@@ to cover expenses. Excess material and human assets totalling @@.yellowgreen;<<print cashFormat($securityForceIncome)>>@@ (after liquidation) were transferred to your accounts. <<elseif $securityForceProfitable == 0>>The goods procured by the special force were, after accounting for the spoils retained by individual soldiers, @@.red;barely enough@@ to cover expenses. More growth will be needed to ensure profitability.<</if>> $securityForceName managed to recruit $securityForceRecruit new soldiers this week, and your reputation has @@.green;improved@@ through the improvement of trade security. <</nobr>> <br> //Your instructions to <<if $CurrentTradeShowAttendance == 1>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>><<else>>The Colonel<</if>>:// -- GitLab