diff --git a/src/facilities/clinic/clinicFramework.js b/src/facilities/clinic/clinicFramework.js index d62ddc09219d6fa049640cf12dd75234977c5d1a..483705b3e8b3e3d6c3d30dd5667bb848f3609b85 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.condition >= 20 && slave.health.illness < 2 && slave.health.shortDamage < 10) && + if ((slave.health.illness < 2 && slave.health.shortDamage < 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/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 8615a3004ff28046bd8273debd985e4500344cc7..b036c869409040ba8d50fdede3d04d5f49032570 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -291,10 +291,8 @@ <<set $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>> <</if>> <</if>> - <<if ($slaves[$i].health.illness > 0)>> - <<elseif ($slaves[$i].health.shortDamage >= 10)>> - <<elseif ($slaves[$i].health.condition <= 40)>> - <<elseif ($slaves[$i].health.shortDamage >= 40)>> + <<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 ($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)>>