Bugfixes and advanced chem cleaning

src/init/storyInit.tw

@@ -541,6 +541,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 <<set $clinic = 0>>
 <<set $clinicUpgradeFilters = 0>>
 <<set $clinicUpgradeScanner = 0>>
+<<set $clinicUpgradePurge = 0>>
 <<set $clinicName = "the Clinic">>
 <<set $clinicNameCaps = "The Clinic">>
 <<set $arcadeSlaves = 0>>

src/uncategorized/clinic.tw

@@ -89,7 +89,11 @@ $clinicNameCaps
 
 <br>
 <<if $clinicUpgradeFilters == 1>>
-	The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities.
+	<<if $clinicUpgradePurge == 1>>
+		The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatability. Patients will likely be ill for the duration of the treatment.
+	<<else>>
+		The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= Math.trunc(150000*$upgradeMultiplierArcology), $clinicUpgradePurge to 1]] //Costs ¤<<print Math.trunc(150000*$upgradeMultiplierArcology)>> and may cause health problems in slaves//
+	<</if>>
 <<else>>
 	It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $clinicUpgradeFilters to 1]] //Costs ¤<<print Math.trunc(50000*$upgradeMultiplierArcology)>>//
 <</if>>

src/uncategorized/clinicReport.tw

@@ -105,6 +105,13 @@
 	<<if ($slaves[$i].chem > 15)>>
 	<<if ($clinicUpgradeFilters == 1)>>
 		<<set $slaves[$i].chem -= 5>>
+		<<if $clinicUpgradePurge == 1>>
+			<<set $slaves[$i].chem -= 50>>
+			<<set slaves[$i].chem = Math.clamp(slaves[$i].chem, 0, 10000)>>
+			<<if $slaves[$i].health > -50>>
+				<<set $slaves[$i].health = -50>>
+			<</if>>
+		<</if>>
 	<</if>>
 	<</if>>
 	<<if ($slaves[$i].health >= 40)>>

src/uncategorized/freeRangeDairyAssignmentScene.tw

@@ -73,7 +73,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 <<if $familyTesting == 1>>
 	<<if $activeSlave.father > 0>>
 		<<for $i to 0; $i < $slaves.length; $i++>>
-			<<if $activeSlave.father == $slaves[$i].ID && isAvailable($slaves[$i])>>
+			<<if $activeSlave.father == $slaves[$i].ID && isSlaveAvailable($slaves[$i])>>
 				<<set $assayedSlave to $slaves[$i]>>
 				<<set $assayType to "father">>
 				<<set $assayedSlaveAvailable = 1>>
@@ -83,7 +83,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 	<</if>>
 	<<if $activeSlave.sisters > 0>>
 		<<for $i to 0; $i < $slaves.length; $i++>>
-			<<if areSisters($activeSlave, $relation) == 3 && isAvailable($relation)>>
+			<<if areSisters($activeSlave, $relation) == 3 && isSlaveAvailable($relation)>>
 				<<set $assayedSlave to $relation[$i]>>
 				<<set $assayType to "half-sister">>
 				<<set $assayedSlaveAvailable = 1>>
@@ -93,7 +93,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 	<</if>>
 	<<if $activeSlave.mother > 0>>
 		<<for $i to 0; $i < $slaves.length; $i++>>
-			<<if $activeSlave.mother == $slaves[$i].ID && isAvailable($slaves[$i])>>
+			<<if $activeSlave.mother == $slaves[$i].ID && isSlaveAvailable($slaves[$i])>>
 				<<set $assayedSlave to $slaves[$i]>>
 				<<set $assayType to "mother">>
 				<<set $assayedSlaveAvailable = 1>>
@@ -103,7 +103,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 	<</if>>
 	<<if $activeSlave.sisters > 0>>
 		<<for $i to 0; $i < $slaves.length; $i++>>
-			<<if areSisters($activeSlave, $slaves[$i]) == 2 && isAvailable($slaves[$i])>>
+			<<if areSisters($activeSlave, $slaves[$i]) == 2 && isSlaveAvailable($slaves[$i])>>
 				<<set $assayedSlave to $slaves[$i]>>
 				<<set $assayType to "sister">>
 				<<set $assayedSlaveAvailable = 1>>
@@ -113,7 +113,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 	<</if>>
 	<<if $activeSlave.daughters > 0>>
 		<<for $i to 0; $i < $slaves.length; $i++>>
-			<<if ($slaves[$i].mother == $activeSlave.ID || $slaves[$i].father == $activeSlave.ID) && isAvailable($slaves[$i])>>
+			<<if ($slaves[$i].mother == $activeSlave.ID || $slaves[$i].father == $activeSlave.ID) && isSlaveAvailable($slaves[$i])>>
 				<<set $assayedSlave to $slaves[$i]>>
 				<<set $assayType to "daughter">>
 				<<set $assayedSlaveAvailable = 1>>
@@ -123,7 +123,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 	<</if>>
 	<<if $activeSlave.sisters > 0>>
 		<<for $i to 0; $i < $slaves.length; $i++>>
-			<<if areSisters($activeSlave, $slaves[$i]) == 1 && isAvailable($slaves[$i])>>
+			<<if areSisters($activeSlave, $slaves[$i]) == 1 && isSlaveAvailable($slaves[$i])>>
 				<<set $assayedSlave to $slaves[$i]>>
 				<<set $assayType to "twin">>
 				<<set $assayedSlaveAvailable = 1>>

src/uncategorized/main.tw

@@ -25,6 +25,9 @@
 <<if ndef $incubatorReproductionSetting>>
  	<<set $incubatorReproductionSetting = 0>>
 <</if>>
+<<if ndef $clinicUpgradePurge>>
+ 	<<set $clinicUpgradePurge = 0>>
+<</if>>
 
 <<set $currentRule to $defaultRules[0]>>
 

src/uncategorized/saLongTermEffects.tw

@@ -2037,7 +2037,7 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr
 	She was once a Fuckdoll, leaving her @@color:hotpink;willing to obey on an instinctual level.@@
 	<<set $slaves[$i].devotion += 5>>
 <<elseif $slaves[$i].career is "a slave since birth">>
-	The tank's imprinting lef ta lasting impression on her; deep down she @@color:hotpink;knows you are to be obeyed@@ and @@color:mediumaquamarine;trusted,@@ even if she can't understand why.
+	The tank's imprinting left a lasting impression on her; deep down she @@color:hotpink;knows you are to be obeyed@@ and @@color:mediumaquamarine;trusted,@@ even if she can't understand why.
 	<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
 <<elseif $slaves[$i].career is "a breeder">>
 	<<if $slaves[$i].preg > 1 && $arcologies[0].FSRepopulation != "unset">>