From 25d194683f1e8edbb5b9c07e3710ced3dd8a768a Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Thu, 28 Dec 2017 18:23:27 +1300 Subject: [PATCH] Additional number check and slight reworking. --- src/SecExp/secBarracks.tw | 10 +++++----- src/SecExp/widgets/unitsWidgets.tw | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index ae758e2a636..eb531b11bea 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -6,7 +6,7 @@ The Barracks <hr> __Upgrades__ <br> -While for many a sore sight in a free city, the barracks stand proud before you. +While this a sore sight for many citiens of $arcologies[0].name, the barracks stand proud before you. <<if $secBarracksUpgrades.size == 0>> The building is relatively small and able to house a limited number of units. <<elseif $secBarracksUpgrades.size == 1>> @@ -139,7 +139,7 @@ While for many a sore sight in a free city, the barracks stand proud before you. <hr> __Units__ <br> -Your maximum number of units is <<print $maxUnits>>, currently you have <<print $activeUnits>>. <<if $secBarracksUpgrades.luxury > 0>>The barracks provide <<print $secBarracksUpgrades.luxury * 5>>% bonus morale in case of a battle.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</if>> +Your maximum number of units is <<print $maxUnits>>, currently you have <<print $activeUnits>>. <<if $secBarracksUpgrades.luxury > 0>>The barracks provides <<print $secBarracksUpgrades.luxury * 5>>% bonus morale when battle occurs.<</if>><<if $secBarracksUpgrades.training > 0>> The training facility will increase the effectiveness of your units with time.<</if>> <<if $arcologies[0].FSRomanRevivalist != "unset" || $arcologies[0].FSChineseRevivalist != "unset" || $arcologies[0].FSArabianRevivalist != "unset" || $arcologies[0].FSEdoRevivalist != "unset" || $arcologies[0].FSEgyptianRevivalist != "unset" || $arcologies[0].FSAztecRevivalist != "unset">> <</if>> <br> @@ -177,7 +177,7 @@ __Security Drones__ __Slaves__ <br>/* slaves */ -You are free to organize your menial slaves into fighting units. Currently you have <<print $helots>> slaves available, while <<print $slavesEmployedManpower>> are already employed as soldiers. During all your battles you lost a total of <<print $slavesTotalCasualties>>. +You are free to organize your menial slaves into fighting units. Currently you have <<print <<print commaNum($helots)>> slaves available, while <<print <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print <<print commaNum($slavesTotalCasualties)>>. <<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>> <<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>> <<silently>><<MenialPopCap>><</silently>> @@ -358,7 +358,7 @@ __Militia__ <<elseif $militiaRecruitment == 2>> By establishing obligatory military service to obtain citizenship you have enlarged your manpower pool to be approximately 5% of the arcology's citizens population. <</if>> - Your current total manpower is <<print $militiaTotalManpower>>, of which <<print $militiaEmployedManpower>> is in active duty. You lost in total <<print $militiaTotalCasualties>> citizens, leaving you with <<print $militiaFreeManpower>> available citizens. + Your current total manpower is <<print <<print commaNum($militiaTotalManpower)>>, of which <<print <<print commaNum($militiaEmployedManpower_>> is in active duty. You lost in total <<print <<print commaNum($militiaTotalCasualties)>> citizens, leaving you with <<print <<print commaNum($militiaFreeManpower)>> available citizens. <br> <<set _mL = $militiaUnits.length>> <<if $militiaFreeManpower > 0 && $activeUnits < $maxUnits>> @@ -523,7 +523,7 @@ __Militia__ __Mercenaries__ <br>/* mercenaries */ With the installation of a mercenary company in the arcology, many other are attracted to your free city, hoping to land a contract with you. - You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print $mercTotalManpower>> mercenaries in your arcology, of which <<print $mercEmployedManpower>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print $mercTotalCasualties>> mercenaries have died defending your arcology. + You are able to organize them in units to use in the defense of the arcology. Excluding the defense force you set up, there are <<print <<print commaNum($mercTotalManpower)>> mercenaries in your arcology, of which <<print <<print commaNum($mercEmployedManpower)>> actively employed and <<print $mercFreeManpower>> not yet under contract. In total <<print <<print commaNum($mercTotalCasualties)>> mercenaries have died defending your arcology. <br> <<set _meL = $mercUnits.length>> <<if $mercFreeManpower > 0 && $activeUnits < $maxUnits>> diff --git a/src/SecExp/widgets/unitsWidgets.tw b/src/SecExp/widgets/unitsWidgets.tw index 61029b72784..4a95af800e6 100644 --- a/src/SecExp/widgets/unitsWidgets.tw +++ b/src/SecExp/widgets/unitsWidgets.tw @@ -140,7 +140,7 @@ <<widget "secBotsDescription">> <<if $secBots.active == 1>> - <strong>The security drones</strong> assemble in an ordered line in front of you, ready to receive their orders. All <<print $secBots.troops>> stand before you in absolute silence. + <strong>The <<print $secBots.troops>> security drones</strong> are assembled in an ordered line in front of you, absolutely silent and ready to receive their orders. <<if $secBots.troops < $secBots.maxTroops>> The unit is not at its full strength of $secBots.maxTroops drones.<</if>> <<if $secBots.equip == 0>> They are equipped with light weaponry, mainly anti-riot non lethal weapons. Not particularly effective in battle. @@ -178,4 +178,4 @@ <</for>> <<set $args[0].ID = _newID>> -<</widget>> \ No newline at end of file +<</widget>> -- GitLab