diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 173a6fa47ceb39d80cfb643b20a98de36f94a7b4..3c43be115f4a98e6020988feed522fb583b1ffeb 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -671,7 +671,7 @@ window.saChoosesOwnClothes = (function() {
}
}
}
-
+
if (V.arcologies[0].FSSubjugationist > 0) {
if (V.arcologies[0].FSSubjugationistRace === "black") {
if (isItemAccessible("a klan robe")) {
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f7227f046fb5f09859dbf29f1f01c3ef548dea5
--- /dev/null
+++ b/src/endWeek/saNanny.js
@@ -0,0 +1,27 @@
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+window.saNanny = function saNanny(slave) {
+ "use strict";
+ const V = State.variables;
+ /* eslint-disable */
+ const pronouns = getPronouns(slave);
+ const he = pronouns.pronoun;
+ const him = pronouns.object;
+ const his = pronouns.possessive;
+ const hers = pronouns.possessivePronoun;
+ const himself = pronouns.objectReflexive;
+ const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
+ /* eslint-enable */
+
+ let t = `works as a nanny this week. `;
+
+ if (V.Matron) {
+ t += `effects here`;
+ }
+
+ return t;
+};
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 6b27488a8d3fa167d7f4afb44af44e959b9c239f..3a92b56428890c54e727b7b33e505f2e32be4c90 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -129,4 +129,6 @@ $new
$interfaceTail
$currentTarget
$upgrade
+
+$W.O.L
%/
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 6bc856d5fe1e3f8054a2aeb1439cff33c35aca66..12d66183801c4fcaa74ea169d9130202d75cdb8a 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -44,8 +44,6 @@ window.hasVisibleHeterochromia = function hasVisibleHeterochromia(slave) {
*/
window.isLeaderP = function isLeaderP(slave) {
const V = State.variables;
- /**
- * @type {App.Entity.SlaveState[]}*/
const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, V.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Farmer, V.Stewardess, V.Schoolteacher, V.Wardeness];
return leaders.some(leader => leader.ID && leader.ID === slave.ID);
};
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 66dd60d6f0efc74ba889ee39ccc364696e20f9c3..5e93b736e17bd07e4e84718655ce55ef343ea8ed 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1594,7 +1594,7 @@ window.GenerateNewSlave = (function() {
}
}
if (slave.geneticQuirks.rearLipedema === 2) {
- slave.butt += jsRandom(.2 * slave.physicalAge, .5 * slave.physicalAge);
+ slave.butt += jsRandom(0.2 * slave.physicalAge, 0.5 * slave.physicalAge);
slave.butt = Math.clamp(slave.butt, 0, 24);
}
if (slave.geneticQuirks.macromastia === 3) {
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index 177fd0e483b8ab9dea1d73afe0a8c601103b3a55..21bfd46266162170d8cb2b45a5578c0be0e00692 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -121,38 +121,38 @@ window.setPregType = function(actor) {
}
}
ovum = Math.clamp(ovum, 0, 8);
- } else if (actor.pregType === 0) {
+ } else if (actor.pregType === 0 || actor.geneticQuirks.superfetation > 1) {
if (actor.eggType === "horse" || actor.eggType === "cow") {
if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([0, 0, 0, 0, 0, 0, 1]);
- fertilityStack += .8;
+ fertilityStack += 0.8;
} else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
- fertilityStack += .4;
+ fertilityStack += 0.4;
} else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
- fertilityStack += .2;
+ fertilityStack += 0.2;
}
if (actor.ovaImplant === "fertility") {
- fertilityStack += .3;
+ fertilityStack += 0.3;
}
if (actor.hormones === 2) {
- fertilityStack += .2;
+ fertilityStack += 0.2;
}
if (actor.hormoneBalance >= 200) {
- fertilityStack += .3;
+ fertilityStack += 0.3;
}
if (actor.diet === "fertility") {
- fertilityStack += .3;
+ fertilityStack += 0.3;
}
if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
- fertilityStack += .5;
+ fertilityStack += 0.5;
}
if (State.variables.reproductionFormula === 1 && (State.variables.week - actor.weekAcquired > 0)) {
- fertilityStack += .2;
+ fertilityStack += 0.2;
}
if (actor.drugs === "super fertility drugs") {
fertilityStack += 1.6;
} else if (actor.drugs === "fertility drugs") {
- fertilityStack += .6;
+ fertilityStack += 0.6;
}
fertilityStack = Math.floor(fertilityStack);
if (State.variables.seeHyperPreg === 1) {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index b3afe04950d86170278960e82d319ed0591caf57..d0460d7b5f2e25b792d4ab91721b3d525bf238fa 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -93,6 +93,7 @@ window.ruleApplied = function(slave, rule) {
* remove slave from the facility described by the rule
* @param {App.Entity.SlaveState} slave
* @param {Object} rule
+ * @returns {string}
*/
window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
const V = State.variables;
@@ -194,7 +195,7 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
/**
* return whether the rule applies to the slave
- * @param {{function:boolean|string, data, specialSlaves, selectedSlaves, excludedSlaves, assignment}} cond
+ * @param {function} cond // I think
* @param {App.Entity.SlaveState} slave
* @returns {boolean} flag */
window.ruleAppliesP = function ruleAppliesP(cond, slave) {
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index ffce2d69b0d2f06289879a348514b17e90958bbb..658f0f6f6340f35703b8adb71cba33183a518373 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -544,10 +544,11 @@ window.Height = (function() {
/**
* FIXME: JSdoc syntax error
* Helper method - table lookup for nationality/race combinations
- * @param {{ [table: string]: number; }} table
+ * @param {object} table // I think
* @param {string|Object} nationality
* @param {string} race
* @param {undefined} [def]
+ * @returns {object} // I think
*/
const nationalityMeanHeight = function(table, nationality, race, def) {
return table[`${nationality}.${race}`] || table[nationality] || table[`.${race}`] || table[""] || def;
@@ -784,9 +785,9 @@ window.Intelligence = (function() {
let maxIntelligence = 100;
/**
- * FIXME: JSdoc syntax error
* Configuration method for the above values
- * @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} [conf]
+ * @param {object} [conf] // I'm pretty sure
+ * @returns {object}
*/
const _config = function(conf) {
if (_.isUndefined(conf)) {
@@ -862,8 +863,8 @@ window.Intelligence = (function() {
/**
* FIXME: JSdoc syntax error
- * @param {{ mean: number; limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; } | { limitMult: number[]; limitIntelligence: number[]; skew: number; spread: number; mean?: undefined; }} settings
- * @returns {number}
+ * @param {boolean} settings // no idea for this one
+ * @returns {object}
*/
const _randomIntelligence = function(settings) {
if (settings) {
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 70961bb38aaf2a48324614e9c16a55d13017378f..387cd21d8f9b64d5117b4921bd9686b7a90cf4b4 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -66,54 +66,13 @@
<br>
<<for _ap = 0; _ap < _WL; _ap++>>
<<capture _ap>>
- <br>
- Ova: $PC.womb[_ap].genetics.name
-
- <<if $geneticMappingUpgrade >= 1>>
- <br>
- Gender: $PC.womb[_ap].genetics.gender
- <br>
- Father ID: $PC.womb[_ap].genetics.father
- <br>
- Father Name: $PC.womb[_ap].genetics.fatherName
- <br>
- Mother ID: $PC.womb[_ap].genetics.mother
- <br>
- Mother Name: $PC.womb[_ap].genetics.motherName
- <br>
- Nationality: $PC.womb[_ap].genetics.nationality
+ <<if $PC.womb[_ap].age >=2 >>
<br>
- Race: $PC.womb[_ap].genetics.race
- <br>
- Skin tone: $PC.womb[_ap].genetics.skin
- <br>
- Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
- <br>
- Face index: $PC.womb[_ap].genetics.face out of 100
- <br>
- Eye Color: $PC.womb[_ap].genetics.eyeColor
- <br>
- Hair Color: $PC.womb[_ap].genetics.hColor
- <<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
- <br>
- Body hair: none
- <<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">>
- <br>
- Body hair: lacks underarm hair
- <<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
- <br>
- Body hair: lacks pubic hair
- <</if>>
- <<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">>
- <br>
- Markings: $PC.womb[_ap].genetics.markings
- <</if>>
- <<else>>
- <<if $PC.womb[_ap].age > 13>>
+ Ova: $PC.womb[_ap].genetics.name
+
+ <<if $geneticMappingUpgrade >= 1>>
<br>
Gender: $PC.womb[_ap].genetics.gender
- <</if>>
- <<if $PC.womb[_ap].age > 5>>
<br>
Father ID: $PC.womb[_ap].genetics.father
<br>
@@ -122,59 +81,111 @@
Mother ID: $PC.womb[_ap].genetics.mother
<br>
Mother Name: $PC.womb[_ap].genetics.motherName
+ <br>
+ Nationality: $PC.womb[_ap].genetics.nationality
+ <br>
+ Race: $PC.womb[_ap].genetics.race
+ <br>
+ Skin tone: $PC.womb[_ap].genetics.skin
+ <br>
+ Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
+ <br>
+ Face index: $PC.womb[_ap].genetics.face out of 100
+ <br>
+ Eye Color: $PC.womb[_ap].genetics.eyeColor
+ <br>
+ Hair Color: $PC.womb[_ap].genetics.hColor
+ <<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: none
+ <<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">>
+ <br>
+ Body hair: lacks underarm hair
+ <<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: lacks pubic hair
+ <</if>>
+ <<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">>
+ <br>
+ Markings: $PC.womb[_ap].genetics.markings
+ <</if>>
+ <<else>>
+ <<if $PC.womb[_ap].age > 13>>
+ <br>
+ Gender: $PC.womb[_ap].genetics.gender
+ <</if>>
+ <<if $PC.womb[_ap].age > 5>>
+ <br>
+ Father ID: $PC.womb[_ap].genetics.father
+ <br>
+ Father Name: $PC.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $PC.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $PC.womb[_ap].genetics.motherName
+ <</if>>
+ <</if>>
+ <<if $incubator > 0 || $nursery > 0>>
+ <br>
+ Reserved: $PC.womb[_ap].reserve
<</if>>
- <</if>>
- <<if $incubator > 0 || $nursery > 0>>
- <br>
- Reserved: $PC.womb[_ap].reserve
- <</if>>
- <br><br>
+ <br><br>
- Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
- <<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
- <br>
- <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
- <<if $surgeryUpgrade == 1>>
- | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]]
+ Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
+ <<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
+ <br>
+ <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
+ <<if $surgeryUpgrade == 1>>
+ | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]]
+ <</if>>
<</if>>
- <</if>>
- <<if $incubator > 0>>
- <br>
- <<if $PC.womb[_ap].reserve === "incubator">>
- <<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">>
- <<set $PC.womb[_ap].reserve = "">>
- <<set $reservedChildren-->>
- <</link>>
- <<elseif $freeTanks - $reservedChildren > 0>>
- <<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">>
- <<if $PC.womb[_ap].reserve === "nursery">>
+ <<if $incubator > 0>>
+ <br>
+ <<if $PC.womb[_ap].reserve === "incubator">>
+ <<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">>
+ <<set $PC.womb[_ap].reserve = "">>
+ <<set $reservedChildren-->>
+ <</link>>
+ <<elseif $freeTanks - $reservedChildren > 0>>
+ <<link "Keep this child in $incubatorName" "Analyze PC Pregnancy">>
+ <<if $PC.womb[_ap].reserve === "nursery">>
+ <<set $reservedChildrenNursery-->>
+ <</if>>
+ <<set $PC.womb[_ap].reserve = "incubator">>
+ <<set $reservedChildren++>>
+ <</link>>
+ <<else>>
+ There is not enough free space to keep this child in $incubatorName.
+ <</if>>
+ <</if>>
+ <<if $nursery > 0>>
+ <br>
+ <<if $PC.womb[_ap].reserve === "nursery">>
+ <<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
+ <<set $PC.womb[_ap].reserve = "">>
<<set $reservedChildrenNursery-->>
- <</if>>
- <<set $PC.womb[_ap].reserve = "incubator">>
- <<set $reservedChildren++>>
- <</link>>
- <<else>>
- There is not enough free space to keep this child in $incubatorName.
+ <</link>>
+ <<elseif $freeCribs - $reservedChildrenNursery > 0>>
+ <<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">>
+ <<if $PC.womb[_ap].reserve === "incubator">>
+ <<set $reservedChildren-->>
+ <</if>>
+ <<set $PC.womb[_ap].reserve = "nursery">>
+ <<set $reservedChildrenNursery++>>
+ <</link>>
+ <<else>>
+ There is not enough free space to keep this child in $nurseryName.
+ <</if>>
<</if>>
- <</if>>
- <<if $nursery > 0>>
+ <<else>>
<br>
- <<if $PC.womb[_ap].reserve === "nursery">>
- <<link "Don't keep this child in $nurseryName" "Analyze PC Pregnancy">>
- <<set $PC.womb[_ap].reserve = "">>
- <<set $reservedChildrenNursery-->>
- <</link>>
- <<elseif $freeCribs - $reservedChildrenNursery > 0>>
- <<link "Keep this child in $nurseryName" "Analyze PC Pregnancy">>
- <<if $PC.womb[_ap].reserve === "incubator">>
- <<set $reservedChildren-->>
- <</if>>
- <<set $PC.womb[_ap].reserve = "nursery">>
- <<set $reservedChildrenNursery++>>
- <</link>>
- <<else>>
- There is not enough free space to keep this child in $nurseryName.
+ Unindefined ova found, no detailed data available.<br>
+ Age: too early for scan.
+ <br>
+ <<link "Terminate ovum" "Analyze PC Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
+ <<if $surgeryUpgrade == 1>>
+ | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $PC, $wombIndex = _ap, $nextLink = "Analyze PC Pregnancy"]]
<</if>>
<</if>>
<br><br><hr style="margin:0"><br>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 23f05afee63992c204e4112550557f56f4312bcf..b7154970bd21ae41d65c4a9bc536bf42460285f8 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -16,9 +16,14 @@
<br><br>
Overall statistics:
- <br> Fetal count: $activeSlave.womb.length
- <br> Estimated womb volume: <<print num(Math.round($activeSlave.bellyPreg))>> cc
-
+ <<set _cc = Math.round($activeSlave.bellyPreg)>>
+ <<set _safecc = Math.round($activeSlave.pregAdaptation*2000)>>
+ <<if $geneticMappingUpgrade > 0>>
+ <br> Estimated pregnancy adaptation raiting: <<print num(Math.round($activeSlave.pregAdaptation))>>
+ <br> Estimated safe womb volume: <<= num(_safecc)>> cc
+ <</if>>
+ <br> Current fetal count: $activeSlave.womb.length
+ <br> Estimated womb volume: <<if _safecc < _cc && $geneticMappingUpgrade > 0>>@@.red;<<= num(_cc)>>@@<<else>><<= num(_cc)>><</if>> cc
<br><br>
Furthest developed pregnancy:
<br> Fetal development week: $activeSlave.preg
@@ -70,56 +75,15 @@
<br>
<<for _ap = 0; _ap < _WL; _ap++>>
<<capture _ap>>
- <br>
- Ova: $activeSlave.womb[_ap].genetics.name
- <br>
- Age: $activeSlave.womb[_ap].age
-
- <<if $geneticMappingUpgrade >= 1>>
- <br>
- Gender: $activeSlave.womb[_ap].genetics.gender
- <br>
- Father ID: $activeSlave.womb[_ap].genetics.father
- <br>
- Father Name: $activeSlave.womb[_ap].genetics.fatherName
- <br>
- Mother ID: $activeSlave.womb[_ap].genetics.mother
- <br>
- Mother Name: $activeSlave.womb[_ap].genetics.motherName
+ <<if $activeSlave.womb[_ap].age >=2 >>
<br>
- Nationality: $activeSlave.womb[_ap].genetics.nationality
+ Ova: $activeSlave.womb[_ap].genetics.name
<br>
- Race: $activeSlave.womb[_ap].genetics.race
- <br>
- Skin tone: $activeSlave.womb[_ap].genetics.skin
- <br>
- Intelligence index: $activeSlave.womb[_ap].genetics.intelligence out of 100
- <br>
- Face index: $activeSlave.womb[_ap].genetics.face out of 100
- <br>
- Eye Color: $activeSlave.womb[_ap].genetics.eyeColor
- <br>
- Hair Color: $activeSlave.womb[_ap].genetics.hColor
- <<if $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless" && $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
- <br>
- Body hair: none
- <<elseif $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless">>
- <br>
- Body hair: lacks underarm hair
- <<elseif $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
- <br>
- Body hair: lacks pubic hair
- <</if>>
- <<if $activeSlave.womb[_ap].genetics.markings == "freckles" || $activeSlave.womb[_ap].genetics.markings == "heavily freckled">>
- <br>
- Markings: $activeSlave.womb[_ap].genetics.markings
- <</if>>
- <<else>>
- <<if $activeSlave.womb[_ap].age > 13>>
+ Age: $activeSlave.womb[_ap].age
+
+ <<if $geneticMappingUpgrade >= 1>>
<br>
Gender: $activeSlave.womb[_ap].genetics.gender
- <</if>>
- <<if $activeSlave.womb[_ap].age > 5>>
<br>
Father ID: $activeSlave.womb[_ap].genetics.father
<br>
@@ -128,59 +92,111 @@
Mother ID: $activeSlave.womb[_ap].genetics.mother
<br>
Mother Name: $activeSlave.womb[_ap].genetics.motherName
+ <br>
+ Nationality: $activeSlave.womb[_ap].genetics.nationality
+ <br>
+ Race: $activeSlave.womb[_ap].genetics.race
+ <br>
+ Skin tone: $activeSlave.womb[_ap].genetics.skin
+ <br>
+ Intelligence index: $activeSlave.womb[_ap].genetics.intelligence out of 100
+ <br>
+ Face index: $activeSlave.womb[_ap].genetics.face out of 100
+ <br>
+ Eye Color: $activeSlave.womb[_ap].genetics.eyeColor
+ <br>
+ Hair Color: $activeSlave.womb[_ap].genetics.hColor
+ <<if $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless" && $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: none
+ <<elseif $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless">>
+ <br>
+ Body hair: lacks underarm hair
+ <<elseif $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: lacks pubic hair
+ <</if>>
+ <<if $activeSlave.womb[_ap].genetics.markings == "freckles" || $activeSlave.womb[_ap].genetics.markings == "heavily freckled">>
+ <br>
+ Markings: $activeSlave.womb[_ap].genetics.markings
+ <</if>>
+ <<else>>
+ <<if $activeSlave.womb[_ap].age > 13>>
+ <br>
+ Gender: $activeSlave.womb[_ap].genetics.gender
+ <</if>>
+ <<if $activeSlave.womb[_ap].age > 5>>
+ <br>
+ Father ID: $activeSlave.womb[_ap].genetics.father
+ <br>
+ Father Name: $activeSlave.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $activeSlave.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $activeSlave.womb[_ap].genetics.motherName
+ <</if>>
+ <</if>>
+ <<if $incubator > 0 || $nursery > 0>>
+ <br>
+ Reserved: $activeSlave.womb[_ap].reserve
<</if>>
- <</if>>
- <<if $incubator > 0 || $nursery > 0>>
- <br>
- Reserved: $activeSlave.womb[_ap].reserve
- <</if>>
- <br><br>
+ <br><br>
- Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$activeSlave.womb[_ap].genetics.name = _tempName]]
- <<if $activeSlave.womb[_ap].age < 4 && ($activeSlave.womb[_ap].fatherID != -1 || $activeSlave.breedingMark == 0)>>
- <br>
- <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
- <<if $surgeryUpgrade == 1>>
- | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $activeSlave, $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]]
+ Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$activeSlave.womb[_ap].genetics.name = _tempName]]
+ <<if $activeSlave.womb[_ap].age < 4 && ($activeSlave.womb[_ap].fatherID != -1 || $activeSlave.breedingMark == 0)>>
+ <br>
+ <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
+ <<if $surgeryUpgrade == 1>>
+ | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $activeSlave, $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]]
+ <</if>>
<</if>>
- <</if>>
- <<if $incubator > 0>>
- <br>
- <<if $activeSlave.womb[_ap].reserve === "incubator">>
- <<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
- <<set $activeSlave.womb[_ap].reserve = "">>
- <<set $reservedChildren-->>
- <</link>>
- <<elseif $freeTanks - $reservedChildren > 0>>
- <<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
- <<if $activeSlave.womb[_ap].reserve === "nursery">>
+ <<if $incubator > 0>>
+ <br>
+ <<if $activeSlave.womb[_ap].reserve === "incubator">>
+ <<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
+ <<set $activeSlave.womb[_ap].reserve = "">>
+ <<set $reservedChildren-->>
+ <</link>>
+ <<elseif $freeTanks - $reservedChildren > 0>>
+ <<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
+ <<if $activeSlave.womb[_ap].reserve === "nursery">>
+ <<set $reservedChildrenNursery-->>
+ <</if>>
+ <<set $activeSlave.womb[_ap].reserve = "incubator">>
+ <<set $reservedChildren++>>
+ <</link>>
+ <<else>>
+ There is not enough free space to keep this child in $incubatorName.
+ <</if>>
+ <</if>>
+ <<if $nursery > 0>>
+ <br>
+ <<if $activeSlave.womb[_ap].reserve === "nursery">>
+ <<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
+ <<set $activeSlave.womb[_ap].reserve = "">>
<<set $reservedChildrenNursery-->>
- <</if>>
- <<set $activeSlave.womb[_ap].reserve = "incubator">>
- <<set $reservedChildren++>>
- <</link>>
- <<else>>
- There is not enough free space to keep this child in $incubatorName.
+ <</link>>
+ <<elseif $freeCribs - $reservedChildrenNursery > 0>>
+ <<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
+ <<if $activeSlave.womb[_ap].reserve === "incubator">>
+ <<set $reservedChildren-->>
+ <</if>>
+ <<set $activeSlave.womb[_ap].reserve = "nursery">>
+ <<set $reservedChildrenNursery++>>
+ <</link>>
+ <<else>>
+ There is not enough free space to keep this child in $nurseryName.
+ <</if>>
<</if>>
- <</if>>
- <<if $nursery > 0>>
+ <<else>>
<br>
- <<if $activeSlave.womb[_ap].reserve === "nursery">>
- <<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
- <<set $activeSlave.womb[_ap].reserve = "">>
- <<set $reservedChildrenNursery-->>
- <</link>>
- <<elseif $freeCribs - $reservedChildrenNursery > 0>>
- <<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
- <<if $activeSlave.womb[_ap].reserve === "incubator">>
- <<set $reservedChildren-->>
- <</if>>
- <<set $activeSlave.womb[_ap].reserve = "nursery">>
- <<set $reservedChildrenNursery++>>
- <</link>>
- <<else>>
- There is not enough free space to keep this child in $nurseryName.
+ Unindefined ova found, no detailed data available.<br>
+ Age: too early for scan.
+ <br>
+ <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($activeSlave, _ap)>><</link>>
+ <<if $surgeryUpgrade == 1>>
+ | [[Transplant ovum|Ova Transplant Workaround][$donatrix = $activeSlave, $wombIndex = _ap, $nextLink = "Analyze Pregnancy"]]
<</if>>
<</if>>
<br><br><hr style="margin:0"><br>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index cffa513f2fba12568e9e8fec03281bea4f8da53e..250ecc4710ae4bcf293fea6e7ba0805609a292c3 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -484,7 +484,7 @@ In total, you have given birth to:
You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
<</if>>
<</if>>
-<<if ($PC.preg > 1 && $pregnancyMonitoringUpgrade == 1)>>
+<<if ($PC.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
<br>[[Inspect pregnancy|Analyze PC Pregnancy]]
<</if>>
<<if $PC.preg >= 0 && $PC.vagina == 1>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 326b8ec64e6addb2741c36054197d6fe5f1739f9..5e641dc1102be935a6446c533d5880588be541af 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -916,7 +916,7 @@ The failure of a prominent organization within your arcology has @@.red;affected
<<if $slaves[$i].origin == "$He was given to you by a failed branch campus of Nueva Universidad de Libertad right after $his graduation.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<else>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 945fdef0531ebb4984c9ecbc1d3c787fcd91f22b..a9cb225757c1ea42a80cd65dbf439eccb751877c 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1201,7 +1201,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
<<elseif $activeSlave.preg >= -1>>
Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
- <<if ($activeSlave.preg > 1 && $activeSlave.broodmother == 0 && $pregnancyMonitoringUpgrade == 1)>>
+ <<if ($activeSlave.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
[[Inspect pregnancy|Analyze Pregnancy]] |
<</if>>
<<if ($activeSlave.preg == 0)>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index b3196c39923b4630c40f7d6401f0adb6f5515b30..fcf386e64d47f657fbb6e853149f407c0919b44f 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -1113,7 +1113,7 @@
<</if>>
<<case "concert hall">>
- As $activeSlave.slaveName know spends all $his time backstage, $he's rarely seen again. Occasionally, however, a roadie will bring $him outside as he hauls the equipment, and $he jacks him off.
+ As $activeSlave.slaveName now spends all $his time backstage, $he's rarely seen again. Occasionally, however, a roadie will bring $him outside as he hauls the equipment, and $he jacks him off.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].hears < 0)>>
<<run clearSummaryCache($slaves[_ss])>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 1c4a8b868cd15e3cdee572ab581da4b005238abd..6bcf1cbc479ff65982cce7f5e10a8c8a016631a1 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -313,6 +313,9 @@ Call as <<SlaveInteractFertility>>
[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
<<elseif ($activeSlave.preg >= -1)>>
Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+ <<if ($activeSlave.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
+ [[Inspect pregnancy|Analyze Pregnancy]] |
+ <</if>>
<<if ($activeSlave.preg == 0)>>
<<link "Use contraceptives">><<set $activeSlave.preg = -1>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<elseif ($activeSlave.preg == -1)>>