From cd163aa812353ec6c8092b6387dcec90198acb8d Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Sun, 1 Apr 2018 11:54:30 -0400 Subject: [PATCH] More fixes --- src/SecExp/rebellionEvents.tw | 18 +++++++++--------- src/SecExp/unitsBattleReport.tw | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/SecExp/rebellionEvents.tw b/src/SecExp/rebellionEvents.tw index 16395a3a69a..73093a64f9d 100644 --- a/src/SecExp/rebellionEvents.tw +++ b/src/SecExp/rebellionEvents.tw @@ -25,9 +25,9 @@ <<if _rand == 0>> This week several slaves were found plotting the death of their master. They were quickly dealt with, but their owner's choice of punishment did little to calm tensions in the arcology. <<elseif _rand == 1>> - This week a large group of slaves attempted to escape. Several were recaptured, but others were deemed to dangerous and were shot on sight. The unfortunate circumstances raised the disapproval of many citizens, either because of the waste of good slaves or the brutality with which the operation was carried. With a bit of luck, however, the incident will be soon forgotten. + This week a large group of slaves attempted to escape. Several were recaptured, but others were deemed too dangerous and were shot on sight. The unfortunate circumstances raised the disapproval of many citizens, either because of the waste of good slaves or the brutality with which the operation was carried. With a bit of luck, however, the incident will be soon forgotten. <<elseif _rand == 2>> - This week books of unknown origin and dangerous content were found in the possession of several slaves. They were mostly sociopolitical treaties, making it clear that the intent of the responsible was to fan the fire of rebellion. The books were quickly collected and archived, hopefully this affair will not have lasting consequences. + This week books of unknown origin and dangerous content were found in the possession of several slaves. They were mostly sociopolitical treaties, making it clear that the intent of the ones responsible was to fan the fire of rebellion. The books were quickly collected and archived, hopefully this affair will not have lasting consequences. <<elseif _rand == 3>> This week a citizen was caught giving refuge to an escaped slave. He was not able to pay for the value of the stolen goods, so he was processed as the case required and the slave returned to their rightful master. Many questions however remain without answers. <<elseif _rand == 4>> @@ -46,13 +46,13 @@ <<elseif _rand == 1>> This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology. <<elseif _rand == 2>> - This week a famous citizen was assaulted and brutally murdered by his slaves. The responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom. + This week a famous citizen was assaulted and brutally murdered by his slaves. The ones responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom. <<elseif _rand == 3>> This week a group of slavers entering the arcology was assaulted. Many reported heavy injuries, but fortunately there were no casualties. The attackers were disguised, but the security systems already identified several slaves who were likely part of the group, based on camera feeds. <<elseif _rand == 4>> This week the waterways were found infected by a virulent pathogen. The cause was later found to be a diseased slave that died while in the maintenance tunnels. It's not clear if the slave was there because of orders given to him or if he was trying to escape. <<else>> - This week a sleeper cell of a famous anti slavery organization was discovered in the low levels of the arcology. The group however was aware of the coming security forces and repeated before they could be dealt with. + This week a sleeper cell of a famous anti slavery organization was discovered in the low levels of the arcology. The group however was aware of the coming security forces and retreated before they could be dealt with. <</if>> <<set $tension += random(5,10)>> <<case 3>> @@ -63,7 +63,7 @@ <<elseif _rand == 1>> This week a number of shops were burned to the ground by rioting slaves and sympathetic citizens. It took considerable effort for the security forces to take control of the situation. Harsh punishment is required and scheduled for the instigators. <<elseif _rand == 2>> - This week a mass escape attempt was barely stopped before becoming a catastrophe. Many citizens were trampled by their terrorized peers of the desperate horde of slaves. It will take some time to restore the streets involved to working order. + This week a mass escape attempt was barely stopped before becoming a catastrophe. Many citizens were trampled by the desperate horde of slaves. It will take some time to restore the streets involved to working order. <<elseif _rand == 3>> This week a number of riots inflamed the arcology. Many slaves took violent actions against citizens and security personnel. The number of victims keeps getting higher as still now the last sparks of revolt are still active. <</if>> @@ -73,7 +73,7 @@ <<if _rand == 0>> This week a citizen refused to pay rent, claiming ideological opposition to the arcology's owner policies. He was quickly dealt with, but his words might not have fallen silent yet. <<elseif _rand == 1>> - This week books of unknown origin and dangerous content were found in the possession of several citizens. They were mostly sociopolitical treaties, making it clear that the intent of the responsible was to fan the fire of rebellion. Most of them were bought and archived, but a few are still circling between the citizens of the arcology. + This week books of unknown origin and dangerous content were found in the possession of several citizens. They were mostly sociopolitical treaties, making it clear that the intent of the ones responsible was to fan the fire of rebellion. Most of them were bought and archived, but a few are still circling between the citizens of the arcology. <<elseif _rand == 2>> This week a citizen was caught giving refuge to other citizens, who would be liable to be enslaved because of their debts. The situation was quickly resolved, but the misplaced generosity of that citizen might have inflamed a few souls. <<elseif _rand == 3>> @@ -89,9 +89,9 @@ <<case 5>> <<set _rand = random(0,5)>> <<if _rand == 0>> - This week a factory was subject to a strike by a group of citizens protesting against the owner. They were promptly arrested and the factory returned to its rightful proprietor by our security department. + This week a factory was subject to a strike by a group of citizens protesting against the owner. They were promptly arrested and the factory returned to its rightful proprietor by your security department. <<elseif _rand == 1>> - This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by our forces. + This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by your forces. <<elseif _rand == 2>> This week the security department registered the formation of several assemblies of citizens, whose purpose seems to be political in nature. For now no further steps were taken, but it's a worrying sign of further political opposition within the arcology. <<elseif _rand == 3>> @@ -109,7 +109,7 @@ <<elseif _rand == 1>> This week several factories were set aflame by their workers. The security department worked day and night to control the fire and apprehend the criminals behind the act. Many are known dissidents, but there are a fair few new faces within them. This is a worrying sign. <<elseif _rand == 2>> - This week numerous riots exploded all over the arcology. Many citizens went in the streets to protest against the arcology owner and its supporters. The security forces slowly managed to stop the rioters, with no little trouble and only through generous use of violence. + This week numerous riots exploded all over the arcology. Many citizens took to the streets to protest against the arcology owner and its supporters. The security forces slowly managed to stop the rioters, with no small amount of trouble and only through generous use of violence. <<elseif _rand == 3>> This week a massive protest of citizens and slaves gathered just outside the penthouse. The crowd was dispersed only after several hours. There were several victims from both sides and no shortage of injured. <</if>> diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw index 9a8f3187082..e45d6025cf4 100644 --- a/src/SecExp/unitsBattleReport.tw +++ b/src/SecExp/unitsBattleReport.tw @@ -114,7 +114,7 @@ catastrophic casualties <</if>> suffered. - <<if $secBots.troops <= 0>> + <<if $secBots.troops <= 5>> <<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>> @@ -175,7 +175,7 @@ <<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> - <<if $militiaUnits[_j].troops <= 0>> + <<if $militiaUnits[_j].troops <= 5>> <<set $militiaUnits[_j].active = 0>> <br>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. The remnants will be sent home honored as veterans or reorganized in a new unit. <<elseif $militiaUnits[_j].troops <= 10>> @@ -217,7 +217,7 @@ <<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> - <<if $slaveUnits[_j].troops <= 0>> + <<if $slaveUnits[_j].troops <= 5>> <<set $slaveUnits[_j].active = 0>> <br>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. The survivors will be sent home honored as veterans or reorganized in a new unit. <<elseif $slaveUnits[_j].troops <= 10>> @@ -259,7 +259,7 @@ <<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>> <</if>> <</if>> - <<if $mercUnits[_j].troops <= 0>> + <<if $mercUnits[_j].troops <= 5>> <<set $mercUnits[_j].active = 0>> <br>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. The remnants will be sent home honored as veterans or reorganized in a new unit. <<elseif $mercUnits[_j].troops <= 10>> -- GitLab