diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js index 85381a0bffb75da7cc84650701ae359a4eade18c..85523a58c13b96584a521b896c1c02a898c4d3f6 100644 --- a/src/js/slaveListing.js +++ b/src/js/slaveListing.js @@ -196,26 +196,67 @@ App.UI.SlaveList.render = function() { } } if (slave.assignment === "get treatment in the clinic") { + let list = []; + let i; if (slave.health <= 40) { - assignment.innerText += ` for poor health`; - } else if ((V.Nurse !== 0) && (slave.chem > 15) && (V.clinicUpgradeFilters === 1)) { - assignment.innerText += ` for unhealthy chemicals`; - } else if ((V.Nurse !== 0) && (slave.pregKnown === 1) && (V.clinicSpeedGestation >= 0 || slave.pregControl === "speed up")) { - assignment.innerText += ` to hurry the pregnancy along safely`; - } else if ((V.Nurse !== 0) && (slave.pregAdaptation*1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth/1.33)) { - assignment.innerText += ` while waiting for the child to be born`; - } else if ((V.Nurse !== 0) && (V.clinicInflateBelly > 0) && (slave.bellyImplant >= 0) && (slave.bellyImplant <= (V.arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))) { - assignment.innerText += ` to fill implants`; + list.push(`poor health`); + } + 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 "; + } else { + assignment.innerText += ", preparing to check out"; + } + for (i = 0; i < list.length; i++) { + assignment.innerText += list[i]; + if (i === (list.length - 2)) { + assignment.innerText += " and "; + } else if (i < (list.length - 2)) { + assignment.innerText += ", "; + } } } else if (slave.assignment === "rest in the spa") { + let list = []; + let i; if (slave.fetish === "mindbroken") { assignment.innerText += `, mindbroken`; - } else if ((slave.sexualFlaw !== "none") || (slave.behavioralFlaw !== "none")) { - assignment.innerText += `, flawed`; - } else if ((slave.trust < 60) || (slave.devotion < 60)) { - assignment.innerText += `, learning to accept life as a slave`; - } else if (slave.health < 20) { - assignment.innerText += ` for poor health`; + } else { + if ((slave.sexualFlaw !== "none") || (slave.behavioralFlaw !== "none")) { + list.push(`overcoming flaws`); + } + if ((slave.trust < 60) || (slave.devotion < 60)) { + list.push(`learning to accept life as a slave`); + } + if (slave.health < 20) { + list.push(`improving in health`); + } + if (list.length > 0) { + assignment.innerText += ", "; + } else { + assignment.innerText += ", but preparing to move out"; + } + for (i = 0; i < list.length; i++) { + assignment.innerText += list[i]; + if (i === (list.length - 2)) { + assignment.innerText += " and "; + } else if (i < (list.length - 2)) { + assignment.innerText += ", "; + } + } } } else if (slave.assignment === "learn in the schoolroom") { let lessons = []; diff --git a/src/js/wombJS.js b/src/js/wombJS.js index 7631d07380d272a9c303286ddad6c718b238cf16..6d41042d2dea249be95d089fc05f15fde5720783 100644 --- a/src/js/wombJS.js +++ b/src/js/wombJS.js @@ -19,7 +19,7 @@ $children = WombBirth($slave, $birth_ready_age) - for actual birth. Return array WombFlush($slave) - clean womb (array). Can be used at broodmother birthstorm or abortion situations in game. But birthstorm logically should use WombBirth($slave, 35) or so before - some children in this event is live capable, others is not. -$slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes. +$slave.bellyPreg = WombGetVolume($slave) - return double, with current womb volume in CC - for updating $slave.bellyPreg, or if need to update individual fetuses sizes. */ diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw index 2b02d40a2c2856a0d08d95a3294bd8c9f563461e..c6ba898f6ee1a5e22a9f72cba6d837ff2ad3d217 100644 --- a/src/pregmod/saClothes.tw +++ b/src/pregmod/saClothes.tw @@ -615,6 +615,7 @@ <</if>> They're so high they're a bit @@.red;unhealthy@@ for $his legs. <<set $slaves[$i].health -= 2>> + <</if>> <<else>> $His P-Limb <<if hasBothLegs($slaves[$i])>>legs work<<else>>leg works<</if>> just as well in extreme heels as <<if hasBothLegs($slaves[$i])>>they do<<else>>it does<</if>> out of them. <</if>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 8349004f283cafdd02993616a19ca48c7e2b1427..bf589e3444438502706786b7e25c18fd288df461 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -424,7 +424,7 @@ is <<if $week-$activeSlave.weekAcquired >= 1>> and <<else>> - $He + $he <</if>> has had little or no sexual experience <<if $activeSlave.weekAcquired != 0>>as your slave<<else>>in your new arcology<</if>> yet. <</if>>