Merge branch 'secExp-fixes' into 'pregmod-master'

secExp-fixes

Closes #2391

See merge request !8015

src/Mods/SecExp/rebellionReport.tw

@@ -482,10 +482,10 @@
 
 /* garrisons */
 <<if $garrison.reactor == 0>>
-	<<if random(1,100) <= (75 - ($SecExp.buildings.riotCenter.fort.reactor * 25))>>
+	<<if random(1,100) <= (75 - (($SecExp.buildings.riotCenter ? $SecExp.buildings.riotCenter.fort.reactor : 0) * 25))>>
 		Unfortunately during the fighting a group of slaves infiltrated the reactor complex and sabotaged it, causing massive power fluctuations and blackouts.
 		It will take @@.red;time and money to repair the damage.@@
-		<<set $garrison.reactorTime = $repairTime + random(1) - $SecExp.buildings.riotCenter.fort.reactor, IncreasePCSkills('engineering', 0.1)>>
+		<<set $garrison.reactorTime = $repairTime + random(1) - ($SecExp.buildings.riotCenter ? $SecExp.buildings.riotCenter.fort.reactor : 0), IncreasePCSkills('engineering', 0.1)>>
 		<<run cashX(-2000, "war")>>
 	<<else>>
 		While the reactor was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
@@ -494,10 +494,10 @@
 	The garrison assigned to the reactor protected it from the multiple sabotage attempts carried out by the rebels.
 <</if>>
 <<if $garrison.waterway == 0>>
-	<<if random(1,100) <= (75 - ($SecExp.buildings.riotCenter.fort.waterway * 25))>>
+	<<if random(1,100) <= (75 - (($SecExp.buildings.riotCenter ? $SecExp.buildings.riotCenter.fort.waterway : 0) * 25))>>
 		Unfortunately during the fighting a group of slaves infiltrated the water management complex and sabotaged it, causing huge water leaks throughout the arcology and severely limiting the water supply.
 		It will take @@.red;time and money to repair the damage.@@
-		<<set $garrison.waterwayTime = $repairTime + random(1) - $SecExp.buildings.riotCenter.fort.waterway, IncreasePCSkills('engineering', 0.1)>>
+		<<set $garrison.waterwayTime = $repairTime + random(1) - ($SecExp.buildings.riotCenter ? $SecExp.buildings.riotCenter.fort.waterway : 0), IncreasePCSkills('engineering', 0.1)>>
 		<<run cashX(-2000, "war")>>
 	<<else>>
 		While the water management complex was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
@@ -506,10 +506,10 @@
 	The garrison assigned to the water management complex protected it from the sabotage attempt of the rebels.
 <</if>>
 <<if $garrison.assistant == 0>>
-	<<if random(1,100) <= (75 - ($SecExp.buildings.riotCenter.fort.assistant * 25))>>
+	<<if random(1,100) <= (75 - (($SecExp.buildings.riotCenter ? $SecExp.buildings.riotCenter.fort.assistant : 0) * 25))>>
 		Unfortunately during the fighting a group of slaves infiltrated the facility housing $assistant.name's mainframe and sabotaged it. Without its AI, the arcology will be next to impossible to manage.
 		It will take @@.red;time and money to repair the damage.@@
-		<<set $garrison.assistantTime = $repairTime + random(1) - $SecExp.buildings.riotCenter.fort.assistant, IncreasePCSkills('engineering', 0.1)>>
+		<<set $garrison.assistantTime = $repairTime + random(1) - ($SecExp.buildings.riotCenter ? $SecExp.buildings.riotCenter.fort.assistant : 0), IncreasePCSkills('engineering', 0.1)>>
 		<<run cashX(-2000, "war")>>
 	<<else>>
 		While the $assistant.name's mainframe was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
@@ -900,4 +900,4 @@
 <</if>>
 <<set $slaveRebellion = 0>>
 <<set $citizenRebellion = 0>>
-<<set $SecExp.rebellions.tension = Math.clamp($SecExp.rebellions.tension - random(50,100), 0, 100)>>
+<<set $SecExp.rebellions.tension = Math.clamp($SecExp.rebellions.tension - random(50,100), 0, 100)>>
\ No newline at end of file