diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js index f8d4ff599e6d09926e159471b15d136de28b4d1b..672d3b4ca4b2d56914725abf23dff021b3a70b01 100644 --- a/src/endWeek/reports/clinicReport.js +++ b/src/endWeek/reports/clinicReport.js @@ -66,7 +66,7 @@ App.EndWeek.clinicReport = function() { idleBonus++; healthBonus++; } else { - S.Nurse.skill.nurse += jsRandom(1, Math.ceil((S.Nurse.intelligence+S.Nurse.intelligenceImplant)/15) + 8); + S.Nurse.skill.nurse += jsRandom(1, Math.ceil((S.Nurse.intelligence + S.Nurse.intelligenceImplant) / 15) + 8); } if (S.Nurse.fetish === "dom") { r.push(`${He} raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions.`); @@ -78,7 +78,7 @@ App.EndWeek.clinicReport = function() { idleBonus++; healthBonus++; } - if (S.Nurse.intelligence+S.Nurse.intelligenceImplant > 50) { + if (S.Nurse.intelligence + S.Nurse.intelligenceImplant > 50) { r.push(`The diagnostic equipment is state-of-the-art, but ${he}'s smart and perceptive enough that on occasion, ${he} can add meaningfully to its medical scans.`); idleBonus++; healthBonus++; @@ -339,24 +339,33 @@ App.EndWeek.clinicReport = function() { /* Evaluate why the slave even needs to be here, and eject her if she doesn't */ const {He, he, his} = getPronouns(slave); - let remainReason = ""; + const remainReasons = []; if (slave.health.illness > 0) { - remainReason = `${He} stays in the clinic since ${he} is still sick.`; - } else if (slave.health.shortDamage >= 20) { - remainReason = `${He} stays in the clinic to recover from ${his} injuries.`; - } else if (slave.health.condition <= 40) { - remainReason = `${He} stays in the clinic since ${his} health is still poor.`; - } else if (S.Nurse && (slave.chem > 15) && (V.clinicUpgradeFilters === 1)) { - remainReason = `${He} stays in the clinic as unhealthy chemicals are still being flushed from ${his} system.`; - } else if (S.Nurse && (slave.pregKnown === 1) && (V.clinicSpeedGestation > 0 || slave.pregControl === "speed up")) { - remainReason = `${He} stays in the clinic to hurry ${his} pregnancy along safely.`; - } else if (S.Nurse && (V.clinicObservePregnancy === 1) && (slave.pregAdaptation * 1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth / 1.33)) { - remainReason = `${He} stays in the clinic waiting for the child to be born.`; - } else if (S.Nurse && (V.clinicInflateBelly > 0) && (slave.bellyImplant >= 0) && (slave.bellyImplant <= (V.arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))) { - remainReason = `${He} stays in the clinic as ${his} implants can still receive more filling.`; - } else { + remainReasons.push(`since ${he} is still sick`); + } + if (slave.health.shortDamage >= 20) { + remainReasons.push(`to recover from ${his} injuries`); + } + if (slave.health.condition <= 40) { + remainReasons.push(`since ${his} health is still poor`); + } + if (S.Nurse) { + if (slave.chem > 15 && V.clinicUpgradeFilters === 1) { + remainReasons.push(`to have unhealthy chemicals flushed from ${his} system`); + } + if (slave.pregKnown === 1 && (V.clinicSpeedGestation > 0 || slave.pregControl === "speed up")) { + remainReasons.push(`to hurry ${his} pregnancy along safely`); + } + if (V.clinicObservePregnancy === 1 && (slave.pregAdaptation * 1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth / 1.33)) { + remainReasons.push(`to wait for the child to be born`); + } + if (V.clinicInflateBelly > 0 && slave.bellyImplant >= 0 && (slave.bellyImplant <= (V.arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))) { + remainReasons.push(`as ${his} implants can still receive more filling`); + } + } + + if (remainReasons.length === 0) { const reassignment = App.UI.DOM.appendNewElement("p", frag, ''); - const {he, his} = getPronouns(slave); let r = []; r.push(`<span class="slave-name">${slave.slaveName}</span> has been cured${(S.Nurse && V.clinicUpgradeFilters > 0) ? ' and purified' : ''},`); r.push(`<span class="noteworthy">`); @@ -396,7 +405,9 @@ App.EndWeek.clinicReport = function() { } const patientContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent"); $(patientContent).append(`${He} ${App.SlaveAssignment.rest(slave)} `); - $(patientContent).append(remainReason); + if (remainReasons.length > 0) { + $(patientContent).append(`${He} stays in the clinic ${arrayToSentence(remainReasons)}.`); + } slaveEntry.append(App.SlaveAssignment.standardSlaveReport(slave, false)); } else { // discard return values silently