From d33f970170015bde275cfbd31b56bc1a6ec6919f Mon Sep 17 00:00:00 2001 From: lowercase-donkey <lowercasedonkey@gmail.com> Date: Sat, 3 Aug 2019 20:14:06 -0400 Subject: [PATCH] simplify clinic a bit fix --- src/js/slaveListing.js | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js index e39bad90f9c..85523a58c13 100644 --- a/src/js/slaveListing.js +++ b/src/js/slaveListing.js @@ -201,17 +201,20 @@ App.UI.SlaveList.render = function() { if (slave.health <= 40) { list.push(`poor health`); } - if ((V.Nurse !== 0) && (slave.chem > 15) && (V.clinicUpgradeFilters === 1)) { - list.push(`unhealthy chemicals`); - } - if ((V.Nurse !== 0) && (slave.pregKnown === 1) && (V.clinicSpeedGestation >= 0 || slave.pregControl === "speed up")) { - list.push(`safely hurrying pregnancy along`); - } - if ((V.Nurse !== 0) && (slave.pregAdaptation*1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth/1.33)) { - list.push(`observation while waiting for the child to be born`); - } - if ((V.Nurse !== 0) && (V.clinicInflateBelly > 0) && (slave.bellyImplant >= 0) && (slave.bellyImplant <= (V.arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))) { - list.push(`implant filling`); + if (V.Nurse !== 0) { + if ((slave.chem > 15) && (V.clinicUpgradeFilters === 1)) { + list.push(`unhealthy chemicals`); + } + if ((V.clinicInflateBelly > 0) && (slave.bellyImplant >= 0) && (slave.bellyImplant <= (V.arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))) { + list.push(`implant filling`); + } + if ((slave.pregKnown === 1) && (V.clinicSpeedGestation >= 0 || slave.pregControl === "speed up") && ((slave.pregAdaptation*1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth/1.33))) { + list.push(`observation of accelerated pregnancy`); + } else if ((slave.pregKnown === 1) && (V.clinicSpeedGestation >= 0 || slave.pregControl === "speed up")) { + list.push(`safely hurrying pregnancy along`); + } else if ((slave.pregAdaptation*1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth/1.33)) { + list.push(`observation during pregnancy`); + } } if (list.length > 0) { assignment.innerText += " for "; -- GitLab