From 43f9b859f3da01a81651c67030ce03098925e33f Mon Sep 17 00:00:00 2001 From: hexall90 <hexall90@gmail.com> Date: Fri, 19 Jan 2018 09:15:42 +0100 Subject: [PATCH] fixing formatting --- src/SecExp/authorityReport.tw | 1 - src/SecExp/unitsBattleReport.tw | 133 +++++++++++++++------------- src/SecExp/unitsRebellionReport.tw | 135 ++++++++++++++--------------- 3 files changed, 134 insertions(+), 135 deletions(-) diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw index 1e10dde494d..fc974d05046 100644 --- a/src/SecExp/authorityReport.tw +++ b/src/SecExp/authorityReport.tw @@ -2,7 +2,6 @@ <<if $useTabs == 0>>__Authority__<</if>> <br> -<<set _authGrowth = 0>> <<if $authority > 19500>> Your authority is nearly absolute. The arcology is yours to command as it pleases you. diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw index 87f3874b846..7b39e0e1395 100644 --- a/src/SecExp/unitsBattleReport.tw +++ b/src/SecExp/unitsBattleReport.tw @@ -2,35 +2,52 @@ <<if $losses == 0>> <<if $deployingBots == 1>> - Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army. - During the battle they suffered no casualties. + <br> + Security Drones: no casualties. <</if>> <<if $SFIntervention == 1>> - <<print $securityForcePersonnel>> soldiers from $securityForceName joined the battle aboard their <<if $securityForceVehiclePower >= 4>> armored <</if>> vehicles <<if $securityForceAC130 > 0>> and their AC130<</if>>. - Free cities armies are a rare sight, but their power is undeniable and your $securityForceName is living testament of this. - During the battle they suffered no casualties. + <br> + <<print $securityForcePersonnel>> soldiers from $securityForceName joined the battle: no casualties suffered. <</if>> <<if $deployingMilitia == 1>> <<for _j = 0; _j < $militiaUnits.length; _j++>> <<if $militiaUnits[_j].isDeployed == 1>> - $militiaUnits[_j].platoonName participated in the battle, your proud citizens defending with their lives their arcology. - During the battle they suffered no casualties. + <br> + $militiaUnits[_j].platoonName: no casualties. + <<if $militiaUnits[_j].training < 100>> + <<if random(1,100) > 60>> + Experience has increased. + <<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> + <</if>> + <</if>> <</if>> <</for>> <</if>> <<if $deployingSlaves == 1>> <<for _j = 0; _j < $slaveUnits.length; _j++>> <<if $slaveUnits[_j].isDeployed == 1>> - $slaveUnits[_j].platoonName participated in the battle. While a rare sight, your slave soldiers show no less willingness to fight for their arcology than their free counterparts, be it because of fear or devotion to their owner. - During the battle they suffered no casualties. + <br> + $slaveUnits[_j].platoonName: no casualties. + <<if $slaveUnits[_j].training < 100>> + <<if random(1,100) > 60>> + Experience has increased. + <<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> + <</if>> + <</if>> <</if>> <</for>> <</if>> <<if $deployingMercs == 1>> <<for _j = 0; _j < $mercUnits.length; _j++>> <<if $mercUnits[_j].isDeployed == 1>> - $mercUnits[_j].platoonName participated in the battle. Mercenaries are a common sight on the modern battlefield and yours are proud to serve their generous contractor. - During the battle they suffered no casualties. + <br> + $mercUnits[_j].platoonName: no casualties. + <<if $mercUnits[_j].training < 100>> + <<if random(1,100) > 60>> + Experience has increased. + <<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> + <</if>> + <</if>> <</if>> <</for>> <</if>> @@ -73,90 +90,88 @@ <<set _rand = random(_lossesList.length - 1)>> <<set _lossesList[_rand] += $losses - _count>> <<elseif _count > $losses>> - <br>@@.red;Error: assigned losses higher than actual losses@@ + <<set _diff = _count - $losses>> + <<set _rand = random(_lossesList.length - 1)>> + <<set _lossesList[_rand] = Math.trunc(_lossesList[_rand]-_diff,0,100)>> <</if>> /* assigns the losses and notify the player */ <<if $deployingBots == 1>> - <br> <br> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$secBots.troops)>> <<set $secBots.troops -= _loss>> - Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army. - During the battle they suffered + Security drones: <<if _loss <= 0>> - no casualties. - <<elseif _loss <= 10>> - light casualties. - <<elseif _loss <= 30>> - moderate casualties. - <<elseif _loss <= 60>> - heavy casualties. + no casualties + <<elseif _loss <= $secBots.troops * 0.2>> + light casualties + <<elseif _loss <= $secBots.troops * 0.4>> + moderate casualties + <<elseif _loss <= $secBots.troops * 0.6>> + heavy casualties <<else>> - catastrophic casualties. + catastrophic casualties <</if>> + suffered. <<if $secBots.troops <= 0>> <<set $secBots.active = 0>> Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. It will take quite the investment to rebuild them. <<elseif $secBots.troops <= 10>> The unit has very few operatives left, it risks complete annihilation if deployed again. <</if>> + <br> <</if>> <<if $SFIntervention == 1>> - <br> <br> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$securityForcePersonnel)>> <<set $securityForcePersonnel -= _loss>> - <<print $securityForcePersonnel>> soldiers from the $securityForceName joined the battle aboard their <<if $securityForceVehiclePower >= 4>> armored <</if>> vehicles <<if $securityForceAC130 > 0>> and their AC130<</if>>. - Free cities armies are a rare sight, but their power is undeniable and your $securityForceName is living testament of this. - During the battle they suffered + <<print $securityForcePersonnel>> soldiers from the $securityForceName joined the battle: <<if _loss <= 0>> - no casualties. + no casualties <<elseif _loss <= 10>> - light casualties. + light casualties <<elseif _loss <= 30>> - moderate casualties. + moderate casualties <<elseif _loss <= 60>> - heavy casualties. + heavy casualties <<else>> - catastrophic casualties. + catastrophic casualties <</if>> + suffered. + <br> <</if>> <<if $deployingMilitia == 1>> <<for _j = 0; _j < $militiaUnits.length; _j++>> <<if $militiaUnits[_j].isDeployed == 1>> - <br> <br> <<set $militiaUnits[_j].battlesFought++>> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$militiaUnits[_j].troops)>> - $militiaUnits[_j].platoonName participated in the battle, your proud citizens defending with their lives their arcology. - During the battle they suffered + $militiaUnits[_j].platoonName: <<if _loss <= 0>> no casualties - <<elseif _loss <= 10>> + <<elseif _loss <= $militiaUnits[_j].troops * 0.2>> light casualties - <<elseif _loss <= 30>> + <<elseif _loss <= $militiaUnits[_j].troops * 0.4>> moderate casualties - <<elseif _loss <= 60>> + <<elseif _loss <= $militiaUnits[_j].troops * 0.6>> heavy casualties <<else>> catastrophic casualties <</if>> + suffered. <<set _med = Math.round(Math.clamp(_loss * $militiaUnits[_j].medics * 0.25,1,_loss))>> <<if $militiaUnits[_j].medics == 1 && _loss > 0>> - , however some men were saved by the medics attached to this unit. - <<else>> - . + Some men were saved by their medics. <</if>> <<set $militiaUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$militiaUnits[_j].maxTroops))>> <<set $militiaEmployedManpower -= Math.trunc(_loss - _med)>> <<set $militiaTotalCasualties += Math.trunc(_loss - _med)>> <<if $militiaUnits[_j].training < 100>> <<if random(1,100) > 60>> - Fighting in the field increased the experience of the unit, making it more effective in future fights. + Experience has increased. <<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> @@ -172,36 +187,33 @@ <<if $deployingSlaves == 1>> <<for _j = 0; _j < $slaveUnits.length; _j++>> <<if $slaveUnits[_j].isDeployed == 1>> - <br> <br> <<set $slaveUnits[_j].battlesFought++>> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$slaveUnits[_j].troops)>> - $slaveUnits[_j].platoonName participated in the battle. While a rare sight, your slave soldiers show no less willingness to fight for their arcology than their free counterparts, be it because of fear or devotion to their owner. - During the battle they suffered + $slaveUnits[_j].platoonName: <<if _loss <= 0>> no casualties - <<elseif _loss <= 10>> + <<elseif _loss <= $slaveUnits[_j].troops * 0.2>> light casualties - <<elseif _loss <= 30>> + <<elseif _loss <= $slaveUnits[_j].troops * 0.4>> moderate casualties - <<elseif _loss <= 60>> + <<elseif _loss <= $slaveUnits[_j].troops * 0.6>> heavy casualties <<else>> catastrophic casualties <</if>> + suffered. <<set _med = Math.round(Math.clamp(_loss * $slaveUnits[_j].medics * 0.25,1,_loss))>> <<if $slaveUnits[_j].medics == 1 && _loss > 0>> - , however some men were saved by the medics attached to this unit. - <<else>> - . + Some men were saved by their medics. <</if>> <<set $slaveUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$slaveUnits[_j].maxTroops))>> <<set $slavesEmployedManpower -= Math.trunc(_loss - _med)>> <<set $slavesTotalCasualties += Math.trunc(_loss - _med)>> <<if $slaveUnits[_j].training < 100>> <<if random(1,100) > 60>> - Fighting in the field increased the experience of the unit, making it more effective in future fights. + Experience has increased. <<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> @@ -217,36 +229,33 @@ <<if $deployingMercs == 1>> <<for _j = 0; _j < $mercUnits.length; _j++>> <<if $mercUnits[_j].isDeployed == 1>> - <br> <br> <<set $mercUnits[_j].battlesFought++>> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$mercUnits[_j].troops)>> - $mercUnits[_j].platoonName participated in the battle. Mercenaries are a common sight on the modern battlefield and yours are proud to serve their generous contractor. - During the battle they suffered + $mercUnits[_j].platoonName: <<if _loss <= 0>> no casualties - <<elseif _loss <= 10>> + <<elseif _loss <= $mercUnits[_j].troops * 0.2>> light casualties - <<elseif _loss <= 30>> + <<elseif _loss <= $mercUnits[_j].troops * 0.4>> moderate casualties - <<elseif _loss <= 60>> + <<elseif _loss <= $mercUnits[_j].troops * 0.6>> heavy casualties <<else>> catastrophic casualties <</if>> + suffered. <<set _med = Math.round(Math.clamp(_loss * $mercUnits[_j].medics * 0.25,1,_loss))>> <<if $mercUnits[_j].medics == 1 && _loss > 0>> - , however some men were saved by the medics attached to this unit. - <<else>> - . + Some men were saved by their medics. <</if>> <<set $mercUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$mercUnits[_j].maxTroops))>> <<set $mercEmployedManpower -= Math.trunc(_loss - _med)>> <<set $mercTotalCasualties += Math.trunc(_loss - _med)>> <<if $mercUnits[_j].training < 100>> <<if random(1,100) > 60>> - Fighting in the field increased the experience of the unit, making it more effective in future fights. + Experience has increased. <<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw index 3054156b433..970d536de5c 100644 --- a/src/SecExp/unitsRebellionReport.tw +++ b/src/SecExp/unitsRebellionReport.tw @@ -2,19 +2,15 @@ <<if $losses == 0>> <<if $irregulars > 0>> - The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology. While without the discipline of your other instruments, they nonetheless provided precious extra firepower and standing strength. - During the battle they suffered no casualties. + The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology. No casualties suffered. <</if>> <<if $deployingBots == 1>> <br> - Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army. - During the battle they suffered no casualties. + Security drones: no casualties suffered. <</if>> <<if $securityForceCreate == 1>> <br> - $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, was called to join the battle aboard their<<if $securityForceVehiclePower >= 4>> armored<</if>> vehicles <<if $securityForceAC130 > 0>>and their AC130<</if>>. - They brought their unmatched strength to crush those that would want you deposed. - During the battle they suffered no casualties. + $securityForceName, <<print commaNum($securityForcePersonnel)>> strong, was called to join the battle: no casualties suffered. <</if>> <<set _count = 0>> <<if $loyalID.length > 0>> @@ -295,7 +291,9 @@ <<set _rand = random(_lossesList.length - 1)>> <<set _lossesList[_rand] += $losses - _count>> <<elseif _count > $losses>> - <br>@@.red;Error: assigned losses higher than actual losses@@ + <<set _diff = _count - $losses>> + <<set _rand = random(_lossesList.length - 1)>> + <<set _lossesList[_rand] = Math.trunc(_lossesList[_rand]-_diff,0,100)>> <</if>> /* assigns the losses and notify the player */ @@ -308,19 +306,19 @@ <<else>> <<set $ACitizens = 100>> <</if>> - The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology. While without the discipline of your other instruments, they nonetheless provided precious extra firepower and standing strength. - During the battle they suffered + The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology: <<if _loss <= 0>> - no casualties. + no casualties <<elseif _loss <= 10>> - light casualties. + light casualties <<elseif _loss <= 30>> - moderate casualties. + moderate casualties <<elseif _loss <= 60>> - heavy casualties. + heavy casualties <<else>> - catastrophic casualties. + catastrophic casualties <</if>> + suffered. <</if>> <<if $secBots.active == 1>> <br> @@ -328,19 +326,19 @@ <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$secBots.troops)>> <<set $secBots.troops -= _loss>> - Your squadron of security drones participated in the battle, dominating the airspace and providing vital intelligence to the rest of the army. - During the battle they suffered + Security drones: <<if _loss <= 0>> - no casualties. + no casualties <<elseif _loss <= 10>> - light casualties. + light casualties <<elseif _loss <= 30>> - moderate casualties. + moderate casualties <<elseif _loss <= 60>> - heavy casualties. + heavy casualties <<else>> - catastrophic casualties. + catastrophic casualties <</if>> + suffered. <<if $secBots.troops <= 0>> <<set $secBots.active = 0>> Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. It will take quite the investment to rebuild them. @@ -354,20 +352,19 @@ <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$securityForcePersonnel)>> <<set $securityForcePersonnel -= _loss>> - $securityForceName, $securityForcePersonnel strong, is called to join the battle aboard their<<if $securityForceVehiclePower >= 4>> armored<</if>> vehicles<<if $securityForceAC130 > 0>> and their AC130<</if>>. - They brought their unmatched strength to crush those that would want you deposed. - During the battle they suffered + $securityForceName, $securityForcePersonnel strong, is called to join the battle: <<if _loss <= 0>> - no casualties. + no casualties <<elseif _loss <= 10>> - light casualties. + light casualties <<elseif _loss <= 30>> - moderate casualties. + moderate casualties <<elseif _loss <= 60>> - heavy casualties. + heavy casualties <<else>> - catastrophic casualties. + catastrophic casualties <</if>> + suffered. <</if>> <<if $deployingMilitia == 1>> <<for _j = 0; _j < $militiaUnits.length; _j++>> @@ -377,31 +374,29 @@ <<set $militiaUnits[_j].battlesFought++>> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$militiaUnits[_j].troops)>> - $militiaUnits[_j].platoonName participated in the battle. They remained loyal to you to the end. - During the battle they suffered + $militiaUnits[_j].platoonName participated in the battle. They remained loyal to you. <<if _loss <= 0>> - no casualties - <<elseif _loss <= 10>> - light casualties - <<elseif _loss <= 30>> - moderate casualties - <<elseif _loss <= 60>> - heavy casualties + No casualties + <<elseif _loss <= $militiaUnits[_j].troops * 0.2>> + Light casualties + <<elseif _loss <= $militiaUnits[_j].troops * 0.4>> + Moderate casualties + <<elseif _loss <= $militiaUnits[_j].troops * 0.6>> + Heavy casualties <<else>> - catastrophic casualties + Catastrophic casualties <</if>> + suffered. <<set _med = Math.round(Math.clamp(_loss * $militiaUnits[_j].medics * 0.25,1,_loss))>> <<if $militiaUnits[_j].medics == 1 && _loss > 0>> - , however some men were saved by the medics attached to this unit. - <<else>> - . + Some men were saved by their medics. <</if>> <<set $militiaUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$militiaUnits[_j].maxTroops))>> <<set $militiaEmployedManpower -= Math.trunc(_loss - _med)>> <<set $militiaTotalCasualties += Math.trunc(_loss - _med)>> <<if $militiaUnits[_j].training < 100>> <<if random(1,100) > 60>> - Fighting in the field increased the experience of the unit, making it more effective in future fights. + Experience has increased. <<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> @@ -427,31 +422,29 @@ <<break>> <</if>> <<set _loss = Math.clamp(_loss,0,$slaveUnits[_j].troops)>> - $slaveUnits[_j].platoonName participated in the battle. They remained loyal to you to the end. - During the battle they suffered + $slaveUnits[_j].platoonName participated in the battle. They remained loyal to you. <<if _loss <= 0>> - no casualties - <<elseif _loss <= 10>> - light casualties - <<elseif _loss <= 30>> - moderate casualties - <<elseif _loss <= 60>> - heavy casualties + No casualties + <<elseif _loss <= $slaveUnits[_j].troops * 0.2>> + Light casualties + <<elseif _loss <= $slaveUnits[_j].troops * 0.4>> + Moderate casualties + <<elseif _loss <= $slaveUnits[_j].troops * 0.6>> + Heavy casualties <<else>> - catastrophic casualties + Catastrophic casualties <</if>> + suffered. <<set _med = Math.round(Math.clamp(_loss * $slaveUnits[_j].medics * 0.25,1,_loss))>> <<if $slaveUnits[_j].medics == 1 && _loss > 0>> - , however some men were saved by the medics attached to this unit. - <<else>> - . + Some men were saved by their medics. <</if>> <<set $slaveUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$slaveUnits[_j].maxTroops))>> <<set $slavesEmployedManpower -= _loss - _med>> <<set $slavesTotalCasualties += _loss - _med>> <<if $slaveUnits[_j].training < 100>> <<if random(1,100) > 60>> - Fighting in the field increased the experience of the unit, making it more effective in future fights. + Experience gained. <<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> @@ -472,31 +465,29 @@ <<set $mercUnits[_j].battlesFought++>> <<set _loss = _lossesList.pluck()>> <<set _loss = Math.clamp(_loss,0,$mercUnits[_j].troops)>> - $mercUnits[_j].platoonName participated in the battle. Mercenaries are a common sight on the modern battlefield and yours are proud to serve their generous contractor. - During the battle they suffered + $mercUnits[_j].platoonName participated in the battle. They remained loyal to you. <<if _loss <= 0>> - no casualties - <<elseif _loss <= 10>> - light casualties - <<elseif _loss <= 30>> - moderate casualties - <<elseif _loss <= 60>> - heavy casualties + No casualties + <<elseif _loss <= $mercUnits[_j].troops * 0.2>> + Light casualties + <<elseif _loss <= $mercUnits[_j].troops * 0.4>> + Moderate casualties + <<elseif _loss <= $mercUnits[_j].troops * 0.6>> + Heavy casualties <<else>> - catastrophic casualties + Catastrophic casualties <</if>> + suffered. <<set _med = Math.round(Math.clamp(_loss * $mercUnits[_j].medics * 0.25,1,_loss))>> <<if $mercUnits[_j].medics == 1 && _loss > 0>> - , however some men were saved by the medics attached to this unit. - <<else>> - . + Some men were saved by their medics.p <</if>> <<set $mercUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$mercUnits[_j].maxTroops))>> <<set $mercEmployedManpower -= Math.trunc(_loss - _med)>> <<set $mercTotalCasualties += Math.trunc(_loss - _med)>> <<if $mercUnits[_j].training < 100>> <<if random(1,100) > 60>> - Fighting in the field increased the experience of the unit, making it more effective in future fights. + Experience gained. <<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> -- GitLab