diff --git a/src/facilities/clinic/clinicFramework.js b/src/facilities/clinic/clinicFramework.js index 483705b3e8b3e3d6c3d30dd5667bb848f3609b85..67700532b72675e8b2ae24f44d79702bcdca9092 100644 --- a/src/facilities/clinic/clinicFramework.js +++ b/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) && + if ((slave.health.illness < 2 && slave.health.shortDamage < 20 && slave.health.condition >= 20) && (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)))) { diff --git a/src/facilities/spa/spaFramework.js b/src/facilities/spa/spaFramework.js index c1e5f8eccc1147af18818ecef7b49b26469fc25a..6ae00525ec47bf33609224a44fbb7f362f5d3fe9 100644 --- a/src/facilities/spa/spaFramework.js +++ b/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 >= 50 && + slave.health.condition >= 60 && slave.health.tired < 20 && slave.trust > 60 && slave.devotion > 60 && diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index b036c869409040ba8d50fdede3d04d5f49032570..3b8df01cb86fb7a4c3d7039c2825b77dd66994ae 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -293,6 +293,7 @@ <</if>> <<if ($slaves[$i].health.illness > 1)>> /* keeping a slave in the clinic for a level 1 illness is hardly worth it */ <<elseif ($slaves[$i].health.shortDamage >= 20)>> /* shortDamage does no real harm, until it gets to 20 */ + <<elseif ($slaves[$i].health.condition >= 40)>> <<elseif ($Nurse != 0) && ($slaves[$i].chem > 15) && ($clinicUpgradeFilters == 1)>> <<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation > 0 || $slaves[$i].pregControl == "speed up")>> <<elseif ($Nurse != 0) && ($slaves[$i].pregAdaptation*1000 < $slaves[$i].bellyPreg || $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33)>> @@ -340,10 +341,12 @@ is receiving treatment in $clinicName. <</if>> <br> $He <<= saRest($slaves[$i])>> - <<if ($slaves[$i].health.illness > 0)>> + <<if ($slaves[$i].health.illness > 1)>> $He stays in the clinic since $he is still sick. - <<elseif ($slaves[$i].health.condition <= 40)>> + <<elseif ($slaves[$i].health.condition < 20)>> $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. <<elseif ($Nurse != 0) && ($slaves[$i].chem > 15) && ($clinicUpgradeFilters == 1)>> $He stays in the clinic as unhealthy chemicals are still being flushed from $his system. <<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation > 0 || $slaves[$i].pregControl == "speed up")>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 40326adbf1d99702c29b91fa16b674eb377f3e2c..45ce162199e1cc9e61612e643353b4886f888aa4 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -287,7 +287,7 @@ <<default>> <<set $slaves[$i].rules.living = "luxurious">> <</switch>> - <<if ($slaves[$i].health.condition >= 50) && ($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 >= 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")>> <p> <span class="slave-name">$slaves[$i].slaveName</span> is feeling well enough to leave $spaName, <span class="noteworthy"> @@ -336,7 +336,7 @@ $He remains in the Spa, stubborn in $his flaw. <<elseif ($slaves[$i].trust < 60) || ($slaves[$i].devotion < 60)>> $He remains in the Spa, as $he is still learning to accept life as a slave. - <<elseif ($slaves[$i].health.condition < 20)>> + <<elseif ($slaves[$i].health.condition < 60)>> $He remains in the Spa, as $his health is still low. <</if>> <br>