diff --git a/src/SecExp/rebellionOptions.tw b/src/SecExp/rebellionOptions.tw index c1e9876e541b4673b0e97b02f4f1113e26be7ce1..c709fd5c0114ce59720e780df8c1ba18148f6245 100644 --- a/src/SecExp/rebellionOptions.tw +++ b/src/SecExp/rebellionOptions.tw @@ -97,10 +97,10 @@ <</if>> <</if>> <</for>> - <<if $securityForceActive == 1>>and $securityForceName, $securityForcePersonnel strong<</if>> + <<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>> are called to defend the arcology from this menace. <<else>> - <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, $securityForcePersonnel strong<</if>><</if>> + <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and <<print commaNum($securityForceName, $securityForcePersonnel)>> strong<</if>><</if>> are called to defend the arcology from this menace. <</if>> <hr> @@ -195,7 +195,7 @@ <<if $securityForceActive == 1>>and $securityForceName, $securityForcePersonnel strong<</if>> are called to defend the arcology from this menace. <<else>> - <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, $securityForcePersonnel strong<</if>><</if>> + <<if $arcologyUpgrade.drones == 1>>Your security drones<<if $securityForceActive == 1>>and $securityForceName, <<print commaNum($securityForcePersonnel)>> strong<</if>><</if>> are called to defend the arcology from this menace. <</if>> <hr> @@ -310,4 +310,4 @@ We can dedicate some of our forces to the protection of the vital parts of the a <<set $foughtThisWeek = 1>> <<goto "rebellionHandler">> <</link>> - \ No newline at end of file + diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw index c5265e23009ab043c255f4aaf1a9bcd3a0ec8cb7..bae1d58b67102b7c4b25d95b140b01722061b354 100644 --- a/src/SecExp/rebellionReport.tw +++ b/src/SecExp/rebellionReport.tw @@ -83,7 +83,7 @@ <hr> <<if $slaveRebellion == 1>> - Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print Math.trunc($attackTroops)>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, $troopCount strong, fought with them street by street + Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print Math.trunc($attackTroops)>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print commaNum($troopCount)>> strong, fought with them street by street <<if $enemyLosses != $attackTroops>> inflicting <<print $enemyLosses>> casualties, while sustaining <<print $losses>> casualties themselves. <<else>> @@ -831,4 +831,4 @@ <<set $citizenProgress = 0>> <<set $slaveProgress = Math.clamp($slaveProgress - random(50,100), 0, 100)>> <</if>> -<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>> \ No newline at end of file +<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>> diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw index 9e1435158469270b2baf78d84c73d15bdb47f01a..619b14664dbf62bb8edb98990284b62d5bb96c48 100644 --- a/src/SecExp/unitsRebellionReport.tw +++ b/src/SecExp/unitsRebellionReport.tw @@ -297,7 +297,7 @@ <<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>>. + $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 <<if _loss <= 0>> @@ -334,7 +334,7 @@ catastrophic casualties <</if>> <<set _med = Math.round(Math.clamp(_loss * $militiaUnits[_j].medics * 0.25,1,_loss))>> - <<if $militiaUnits[_j].medics == 1>> + <<if $militiaUnits[_j].medics == 1 && _loss > 0>> , however some men were saved by the medics attached to this unit. <<else>> . @@ -384,7 +384,7 @@ catastrophic casualties <</if>> <<set _med = Math.round(Math.clamp(_loss * $slaveUnits[_j].medics * 0.25,1,_loss))>> - <<if $slaveUnits[_j].medics == 1>> + <<if $slaveUnits[_j].medics == 1 && _loss > 0>> , however some men were saved by the medics attached to this unit. <<else>> . @@ -429,7 +429,7 @@ catastrophic casualties <</if>> <<set _med = Math.round(Math.clamp(_loss * $mercUnits[_j].medics * 0.25,1,_loss))>> - <<if $mercUnits[_j].medics == 1>> + <<if $mercUnits[_j].medics == 1 && _loss > 0>> , however some men were saved by the medics attached to this unit. <<else>> . @@ -660,4 +660,4 @@ <</if>> <<else>> <br>@@.red;Error: losses are a negative number or NaN@@ -<</if>> \ No newline at end of file +<</if>> diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw index fa5cad1f3d63539d7b9fe0b5f9b50c1eea08a92e..1b3a190e7d93499d9b2bd932aa507a323d314cc8 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/SecExp/weaponsManufacturing.tw @@ -29,7 +29,7 @@ many small old world nations as the advanced technology that free cities have av <</if>> <br> <<if $weapHelots> 0>>Assigned here are $weapHelots slaves working to produce as much equipment as possible<<else>>There are no assigned menial slaves here. The spaces is manned exclusively by low rank citizens.<</if>> -You own $helots free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapHelots>> free slots. +You own <<print commaNum($helots)>> free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapHelots>> free slots. <br> <<silently>><<MenialPopCap>><</silently>> <<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>> diff --git a/src/pregmod/SecForceEX/securityForceTradeShow.tw b/src/pregmod/SecForceEX/securityForceTradeShow.tw index cfb8830f1d7b4f8c34ea2d54e36e0d89691bcd9d..a36697c5e3743db85a539532fd02825a965ced04 100644 --- a/src/pregmod/SecForceEX/securityForceTradeShow.tw +++ b/src/pregmod/SecForceEX/securityForceTradeShow.tw @@ -52,16 +52,12 @@ <<elseif $OverallTradeShowAttendance >= 1>> - <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, do you still need me back here in change of $securityForceName? - <span id="choice2"> +The (bi-yearly) security trade show has finally come around and even though you've already granted The Colonel permission to attend, she's decided to come and ask for the leave personally. - <<link "Yes">> - <<replace "#choice2">> - <br>The look of disappointement is bearly noticable on The Colonel's face. - <</replace>> - <</link>> +<br><br> + <span id="choice2"> - <<link "No,">> + <<link "Grant leave">> <<replace "#choice2">><br> <br>"Thanks <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>" @@ -145,6 +141,12 @@ <</replace>> <</link>> + + <<link "Request she remain on base">> + <<replace "#choice2">> + <br>The look of disappointement is bearly noticable on The Colonel's face. + <</replace>> + <</link>> </span> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 2227570fc1f62b9e6e2298e909dcf0cd31e32791..6750834de70219fb2464ce8617173669d9fb1ab8 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -740,6 +740,7 @@ An escape attempt occurs and is stopped almost before you are informed of it. << <<if $activeSlave.indentureRestrictions > 0>> <br><br> This behavior has violated her indenture contract, allowing you to apply more severe punishments that might otherwise breach it. + <<set $activeSlave.indentureRestrictions = 0>> <</if>> <<case "not my name">> diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw index 5f566b0a8b002573a3ca9ed0bce1927ada77286c..0b8f96812a3932c97413aa67cf40d0229b2927a5 100644 --- a/src/uncategorized/barracks.tw +++ b/src/uncategorized/barracks.tw @@ -67,8 +67,6 @@ As you enter the main bay of the armory, lined with modern arms and armor and a Their sleek prototype armor is equipped with advanced restraining weapons. <<case "Rangers">> Their gear has a heavy Western influence; everyone carries heavy revolvers everywhere, and the armor sports rope lariats for lassoing 'cattle.' - <<default>> - Their armor has been modified to help them blend into whatever AO they find themsleves in. Insignias are clearly visable and displayed with obvious pride. <</switch>> <</if>> There are doors to magazines, armories, and training areas to all sides, and muffled gunfire can be heard from the latter.