health tweaks

src/facilities/clinic/clinicFramework.js

@@ -41,7 +41,7 @@ App.Entity.Facilities.ClinicPatientJob = class extends App.Entity.Facilities.Fac
 	checkRequirements(slave) {
 		let r = super.checkRequirements(slave);
 
-		if ((slave.health.illness < 2 && slave.health.shortDamage < 20 && slave.health.condition >= 20) &&
+		if ((slave.health.illness === 0 && slave.health.shortDamage < 20 && slave.health.condition >= 40) &&
 			(V.Nurse === 0 || ((slave.chem <= 15 || this.facility.upgrade("Filters") !== 1) &&
 				(V.bellyImplants !== 1 || slave.bellyImplant <= -1) &&
 				(slave.pregKnown !== 1 || (this.facility.option("SpeedGestation") <= 0 && slave.pregControl !== "speed up")) && (slave.pregAdaptation * 1000 >= slave.bellyPreg && slave.preg <= slave.pregData.normalBirth / 1.33)))) {

src/facilities/spa/spaFramework.js

@@ -46,7 +46,7 @@ App.Entity.Facilities.SpaAssigneeJob = class extends App.Entity.Facilities.Facil
 			(
 				slave.devotion < -20 ||
 				(
-					slave.health.condition >= 60 &&
+					slave.health.condition >= 20 &&
 					slave.health.tired < 20 &&
 					slave.trust > 60 &&
 					slave.devotion > 60 &&

src/js/health.js

@@ -30,7 +30,7 @@ window.healthDamage = function healthDamage(slave, damage) {
 	damage = Math.max(Math.trunc(damage), 0);
 	H.shortDamage += damage;
 	H.condition -= damage;
-	H.health = H.condition - H.longDamage - H.shortDamage;
+	H.health = H.condition - H.longDamage;
 };
 
 /**
@@ -48,7 +48,7 @@ window.healthCure = function healthCure(slave, cure) {
 	}
 	H.shortDamage -= cure;
 	H.condition += cure;
-	H.health = H.condition - H.longDamage - H.shortDamage;
+	H.health = H.condition - H.longDamage;
 };
 
 /**

src/uncategorized/clinicReport.tw

@@ -343,7 +343,7 @@
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;$He <<= saRest($slaves[$i])>>
 		<<if ($slaves[$i].health.illness > 0)>>
 			$He stays in the clinic since $he is still sick.
-		<<elseif ($slaves[$i].health.condition <= 20)>>
+		<<elseif ($slaves[$i].health.condition <= 40)>>
 			$He stays in the clinic since $his health is still poor.
 		<<elseif ($slaves[$i].health.shortDamage >= 20)>>
 			$He stays in the clinic to recover from $his injuries.

src/uncategorized/spaReport.tw

@@ -287,7 +287,7 @@
 	<<default>>
 		<<set $slaves[$i].rules.living = "luxurious">>
 	<</switch>>
-	<<if ($slaves[$i].health.condition >= 60) && ($slaves[$i].health.tired < 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
+	<<if ($slaves[$i].health.condition >= 20) && ($slaves[$i].health.tired < 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
 		<p>
 			<span class="slave-name">$slaves[$i].slaveName</span> is feeling well enough to leave $spaName,
 			<span class="noteworthy">