Merge branch 'PopulationFixes' into 'pregmod-master'

Population minor fixes

See merge request !3056

src/uncategorized/arcmgmt.tw

@@ -222,9 +222,9 @@ _topClassP = 1>>
 	_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSArabianRevivalist, 100) / 20) * 0.025>>
 <</if>>
 <<if $arcologies[0].FSChineseRevivalist != "unset">>
-	<<set _FSScore += Math.min($arcologies[0].FSDegradationist, 100),
-	_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.02,
-	_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.025>>
+	<<set _FSScore += Math.min($arcologies[0].FSChineseRevivalist, 100),
+	_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSChineseRevivalist, 100) / 20) * 0.02,
+	_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSChineseRevivalist, 100) / 20) * 0.025>>
 <</if>>
 <<if $arcologies[0].FSAztecRevivalist != "unset">>
 	<<set _FSScore += Math.min($arcologies[0].FSAztecRevivalist, 100),
@@ -571,7 +571,11 @@ $helots -= _expirationPC,
 $fuckdolls -= _expirationFD,
 $menialBioreactors -= _expirationBR>>
 <<if _expiration > 1>>
-	@@.red;<<print _expiration>> slaves died@@ due to the tough working conditions in your arcology.
+	<<if _expirationFS <= 0.5>>
+		@@.red;<<print _expiration>> slaves passed away@@ due to natural causes.
+	<<else>> 
+		@@.red;<<print _expiration>> slaves died@@ due to the tough working conditions in your arcology.
+	<</if>>
 	<<if _expirationPC > 1>>
 		Of which @@.red;<<print _expirationPC>> were yours.@@
 	<<elseif _expirationPC > 0>>
@@ -586,7 +590,7 @@ $lowerClass -= _enslaved>>
 /*Bad weather switch*/
 <<if $weatherToday.severity > 3>>
 	<<if $secExp == 1>>
-		<<if $docks && $railway < 4>>
+		<<if $docks < 4 && $railway < 4>>
 			<<set _weatherFreeze = 1>>
 			<br>//The terrible weather is @@.red;preventing people from entering or leaving@@ your arcology. Improving your transport infrastructure will prevent this from happening.//
 		<<else>>
@@ -600,11 +604,11 @@ $lowerClass -= _enslaved>>
 	<</if>>
 <<elseif $weatherToday.severity > 2>>
 	<<if $secExp == 1>>
-		<<if $docks && $railway < 3>>
+		<<if $docks < 3 && $railway < 3>>
 			<<set _weatherFreeze = 1>>
 			<br>//The terrible weather is @@.red;preventing people from entering or leaving@@ your arcology. Improving your transport infrastructure will prevent this from happening.//
 		<<else>>
-			<<set _weatherFeeze = 0>>
+			<<set _weatherFreeze = 0>>
 		<</if>>
 	<<elseif $antiWeatherFreeze < 1>>
 		<<set _weatherFreeze = 1>>
@@ -616,6 +620,27 @@ $lowerClass -= _enslaved>>
 	<<set _weatherFreeze = 0>>
 <</if>>
 
+/*For enslavement that happens despite the weather*/
+<<if _weatherFreeze == 1>>
+	<<if _enslaved > 0>>
+		<<if _enslaved < 4>>
+			<<set _enslavedPC = 1,
+			_enslavedNPC = _enslaved - 1>>
+		<<else>>
+			<<set _enslavedPC = Math.trunc(_enslaved / 4),
+			_enslavedNPC = _enslaved - _enslavedPC>>
+		<</if>>
+		<<set $helots += _enslavedPC,
+		$NPCSlaves += _enslavedNPC>>
+	<</if>>
+	<<if _enslaved > 1>>
+		<br>In total @@.green;<<print _enslaved>> lower class citizens@@ were enslaved for failing to pay their debts.
+		<br>@@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>.
+	<<elseif _enslaved > 0>>
+		<br>@@.green;As arcology owner you claimed the slave.@@
+	<</if>>
+<</if>>
+
 /*Bunch of visitor stuff*/
 <<if _weatherFreeze == 0>>
 <<set _FSScore = _FSScore / $FSCreditCount>>