Merge branch 'SecExp-Fixes' into 'pregmod-master'

SecExp-Fixes

Closes #2303

See merge request pregmodfan/fc-pregmod!7836

src/Mods/SecExp/authorityReport.tw

@@ -120,17 +120,12 @@ Your authority is
 	<<set _authGrowth += $arcologies[0].FSChattelReligionist>>
 <</if>>
 
-<<if $arcologies[0].FSRestart >= 90 && $arcologies[0].FSNeoImperialistLaw2 == 1>>
-	The arcology's society is extremely stratified. The reliance on the Barons by the lower classes greatly increases your reputation.
-	<<set _authGrowth += $arcologies[0].FSRestart>>
-<<elseif $arcologies[0].FSRestart >= 50> && $arcologies[0].FSNeoImperialistLaw2 == 1>
-	The arcology's society is very stratified. The reliance on the Barons by the lower classes increases your reputation.
-	<<set _authGrowth += $arcologies[0].FSRestart>>
-<<elseif $arcologies[0].FSRestart >= 90>>
-	The arcology's society is extremely stratified. The reliance on the Societal Elite by the lower classes greatly increases your reputation.
+<<set _elite = $arcologies[0].FSNeoImperialistLaw2 == 1 ? 'Barons' : 'Societal Elite'>>
+<<if $arcologies[0].FSRestart >= 90>>
+	The arcology's society is extremely stratified. The reliance on the _elite by the lower classes greatly increases your reputation.
 	<<set _authGrowth += $arcologies[0].FSRestart>>
 <<elseif $arcologies[0].FSRestart >= 50>>
-	The arcology's society is very stratified. The reliance on the Societal Elite by the lower classes increases your reputation.
+	The arcology's society is very stratified. The reliance on the _elite by the lower classes increases your reputation.
 	<<set _authGrowth += $arcologies[0].FSRestart>>
 <</if>>
 

src/uncategorized/manageArcology.tw

@@ -550,7 +550,7 @@
 		<</if>>
 		During all battles you lost a total of <<print num($militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties)>> men, while scoring a total of <<print num($SecExp.core.totalKills)>> kills.
 	<</if>>
-	<<if $SecExp.settings.battle.enabled === 1 && _countRebellions > 0>>
+	<<if $SecExp.settings.rebellion.enabled === 1 && _countRebellions > 0>>
 		Your arcology was involved in <<print num(_countRebellions)>> rebellions. You won <<print num($SecExp.rebellions.victories)>> of them, while the rebels defeated your forces in <<print num($SecExp.rebellions.losses)>>.
 	<</if>>
 	</p>