Merge branch 'fixes' into 'pregmod-master'

More authority report fixes

See merge request pregmodfan/fc-pregmod!8383

src/Mods/SecExp/js/authorityReport.js

 App.SecExp.authorityReport = function() {
 	let authGrowth = 0;
-	let r = V.useTabs === 0 ? [`Authority`] : [];
-	let t = `<br>Your authority is `;
+	let r = V.useTabs === 0 ? [`<h2>Authority</h2>`] : [];
+	r.push(`<br>Your authority is`);
 
 	if (V.SecExp.core.authority > 19500) {
-		r.push(t + `nearly absolute. The arcology is yours to command as it pleases you.`);
+		r.push(`nearly absolute. The arcology is yours to command as it pleases you.`);
 	} else if (V.SecExp.core.authority > 15000) {
-		r.push(t +`extremely high. There's little you cannot do within the walls of your arcology.`);
+		r.push(`extremely high. There's little you cannot do within the walls of your arcology.`);
 	} else if (V.SecExp.core.authority > 10000) {
-		r.push(t +`high. You command respect and fear in equal measure.`);
+		r.push(`high. You command respect and fear in equal measure.`);
 	} else if (V.SecExp.core.authority > 5000) {
-		r.push(t +`moderate. You command some respect from your citizens.`);
+		r.push(`moderate. You command some respect from your citizens.`);
 	} else {
-		r.push(t + `low. You command no respect or fear from your citizens.`);
+		r.push(`low. You command no respect or fear from your citizens.`);
 	}
 
 	if (V.PC.career === "wealth") {
@@ -192,7 +192,7 @@ App.SecExp.authorityReport = function() {
 		let slave, citizen;
 		const CSratio = V.ACitizens / V.ASlaves;
 		r.push(`<br><br><strong>Slaves security analysis:</strong>`);
-		r.push(t + authorityEffects('slaves').text); slave = authorityEffects('slaves').bonus;
+		r.push(authorityEffects('slaves').text); slave = authorityEffects('slaves').bonus;
 		if (CSratio <= 0.4) {
 			r.push(`There are a lot more slaves than citizens, making some doubt their masters are strong enough to stop them.`);
 			slave += 30;
@@ -338,95 +338,93 @@ App.SecExp.authorityReport = function() {
 				rand = random(0, 4);
 			}
 
-			t = `<br><br>`;
+			r.push(`<br><br>`);
 			const {HeU, heU, hisU, himU, himselfU} = getNonlocalPronouns(V.seeDicks).appendSuffix("U");
 			switch (miniEvent) {
 				case 1:
 					if (rand === 0) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 1) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 2) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 3) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 4) {
-						r.push(t + `This week a member of a well known anti-slavery group was caught trying to infiltrate the arcology. During the capture attempt shots were fired and several guards were injured, and in the end the fugitive unfortunately managed to escape. Reports indicate several slaves helped the criminal, some going as far as using themselves as shields against the bullets of the security drones.`);
+						r.push(`This week a member of a well known anti-slavery group was caught trying to infiltrate the arcology. During the capture attempt shots were fired and several guards were injured, and in the end the fugitive unfortunately managed to escape. Reports indicate several slaves helped the criminal, some going as far as using themselves as shields against the bullets of the security drones.`);
 					} else if (rand === 5) {
-						r.push(t + `This week a slave was caught attempting to sabotage a machine in one of the factories. ${HeU} explained ${hisU} action as "trying to defend ${himselfU} from a dangerous machine". Reports confirmed that the apparatus is indeed quite deadly, having killed several slaves since it was installed, but the expert way ${heU} handled the sabotage leaves open the possibility of a deliberate plan or even external help.`);
+						r.push(`This week a slave was caught attempting to sabotage a machine in one of the factories. ${HeU} explained ${hisU} action as "trying to defend ${himselfU} from a dangerous machine". Reports confirmed that the apparatus is indeed quite deadly, having killed several slaves since it was installed, but the expert way ${heU} handled the sabotage leaves open the possibility of a deliberate plan or even external help.`);
 					} else {
-						r.push(t + `This week a slave was found dead in one of the sewer tunnels. It seems ${heU} was stabbed repeatedly with a sharp object. ${HeU} was fairly famous for ${hisU} capabilities as a slave trainer; ${hisU} old master spent not an insignificant amount of money trying to find ${himU} once he realized ${heU} was missing. The episode might have been a simple mugging gone wrong, but ${hisU} activities as a slave breaker might have played a role in ${hisU} homicide.`);
+						r.push(`This week a slave was found dead in one of the sewer tunnels. It seems ${heU} was stabbed repeatedly with a sharp object. ${HeU} was fairly famous for ${hisU} capabilities as a slave trainer; ${hisU} old master spent not an insignificant amount of money trying to find ${himU} once he realized ${heU} was missing. The episode might have been a simple mugging gone wrong, but ${hisU} activities as a slave breaker might have played a role in ${hisU} homicide.`);
 					}
 					break;
 				case 2:
 					if (rand === 0) {
-						r.push(t + `This week some strange reports came in: it seems some assemblies of slaves were observed several nights in a row. The slaves were traced and their masters notified, but many suspect there may be something deeper than a few slaves congregating in the night.`);
+						r.push(`This week some strange reports came in: it seems some assemblies of slaves were observed several nights in a row. The slaves were traced and their masters notified, but many suspect there may be something deeper than a few slaves congregating in the night.`);
 					} else if (rand === 1) {
-						t += `This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end `;
-						t += `your ${V.mercenaries >= 1 ? 'mercenaries' : 'security drones'}`;
-						r.push(t + ` managed to destroy the old tunnels they were using to ship out slaves out of the arcology.`);
+						r.push(`This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end your ${V.mercenaries >= 1 ? 'mercenaries' : 'security drones'} managed to destroy the old tunnels they were using to ship out slaves out of the arcology.`);
 					} else if (rand === 2) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 3) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 4) {
-						r.push(t + `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${himU} or if heU was trying to escape.`);
+						r.push(`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${himU} or if heU was trying to escape.`);
 					} else {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					}
 					break;
 				case 3:
 					if (rand === 0) {
-						r.push(t + `This week a group of slaves took control of one of the manufacturing plants and barricaded themselves inside. It took several days of negotiations and skirmishes to finally end this little insurrection. Many of the slaves involved will be executed in the next few days.`);
+						r.push(`This week a group of slaves took control of one of the manufacturing plants and barricaded themselves inside. It took several days of negotiations and skirmishes to finally end this little insurrection. Many of the slaves involved will be executed in the next few days.`);
 					} else if (rand === 1) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 2) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 3) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					}
 					break;
 				case 4:
 					if (rand === 0) {
-						r.push(t + `This week a citizen refused to pay rent, claiming ideological opposition to the arcology's ownership policies. He was quickly dealt with, but his words might not have fallen silent yet.`);
+						r.push(`This week a citizen refused to pay rent, claiming ideological opposition to the arcology's ownership policies. He was quickly dealt with, but his words might not have fallen silent yet.`);
 					} else if (rand === 1) {
-						r.push(t + `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 amongst the citizens of the arcology.`);
+						r.push(`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 amongst the citizens of the arcology.`);
 					} else if (rand === 2) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 3) {
-						r.push(t + `This week a citizen died in one of the factories. His death sparked some outrage, even some talk of protests against the owners of the factory, but things seem to have calmed down for now.`);
+						r.push(`This week a citizen died in one of the factories. His death sparked some outrage, even some talk of protests against the owners of the factory, but things seem to have calmed down for now.`);
 					} else if (rand === 4) {
-						r.push(t + `This week a citizen refused to be evicted from his house. After some negotiations the man was forcibly removed from the property by your security forces. Unfortunately the forced entry caused some damage to the building.`);
+						r.push(`This week a citizen refused to be evicted from his house. After some negotiations the man was forcibly removed from the property by your security forces. Unfortunately the forced entry caused some damage to the building.`);
 					} else if (rand === 5) {
-						r.push(t + `This week a citizen refused to be enslaved as his contract established. With an impressive display of his rhetoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones.`);
+						r.push(`This week a citizen refused to be enslaved as his contract established. With an impressive display of his rhetoric capabilities he managed to gather a small crowd agreeing with his position. The impromptu assembly was promptly disrupted by the drones.`);
 					} else {
 						r.push(`This week a security drone was found disabled and stripped of important electronic components. It seems the act was not dictated by greed, as the most precious parts of the drone were left on the machine, but rather to cover up something that the drone saw.`);
 					}
 					break;
 				case 5:
 					if (rand === 0) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 1) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 2) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 3) {
-						r.push(t + `This week there was a protest against one of the wealthiest citizen of the arcology. Many criticize his near monopoly. Supporters of the citizen met the protesters on the streets and it was just thanks to the intervention of the security drones that violence was avoided.`);
+						r.push(`This week there was a protest against one of the wealthiest citizen of the arcology. Many criticize his near monopoly. Supporters of the citizen met the protesters on the streets and it was just thanks to the intervention of the security drones that violence was avoided.`);
 					} else if (rand === 4) {
-						r.push(t + `This week several cameras were sabotaged and in many cases damaged beyond repair. A group of anonymous citizens claims to be responsible; their motivation is apparently the excessive surveillance in the arcology and their attack a response to the breach of their privacy.`);
+						r.push(`This week several cameras were sabotaged and in many cases damaged beyond repair. A group of anonymous citizens claims to be responsible; their motivation is apparently the excessive surveillance in the arcology and their attack a response to the breach of their privacy.`);
 					} else {
-						r.push(t + `This week several citizens barricaded themselves in a private brothel. It seems their intention is to protest against the use of ex-citizens in the sex trade, claiming that such a position is unfitting for them. The problem was quickly resolved with the intervention of the security department.`);
+						r.push(`This week several citizens barricaded themselves in a private brothel. It seems their intention is to protest against the use of ex-citizens in the sex trade, claiming that such a position is unfitting for them. The problem was quickly resolved with the intervention of the security department.`);
 					}
 					break;
 				case 6:
 					if (rand === 0) {
-						r.push(t + `This week the arcology was shaken by a number of strikes throughout the manufacturing levels. Many lament the predatory nature of Free Cities society, many other just want to cause damage to their perceived oppressors. It was a significant effort for the security department to stop all protests.`);
+						r.push(`This week the arcology was shaken by a number of strikes throughout the manufacturing levels. Many lament the predatory nature of Free Cities society, many other just want to cause damage to their perceived oppressors. It was a significant effort for the security department to stop all protests.`);
 					} else if (rand === 1) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 2) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					} else if (rand === 3) {
-						r.push(t + `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.`);
+						r.push(`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.`);
 					}
 					break;
 			}