Merge branch 'fixes' into 'pregmod-master'

Fixes

Closes #402

See merge request !3243

devNotes/twine JS.txt

@@ -33724,8 +33724,6 @@ window.BaseSlave = function BaseSlave() {
 		HGExclude: 0,
 		ballType: "human",
 		eggType: "human",
-		reservedChildren: 0,
-		reservedChildrenNursery: 0,
 		choosesOwnChastity: 0,
 		pregControl: "none",
 		readyLimbs: [],
@@ -36835,8 +36833,6 @@ window.slavePregnancyDatatypeCleanup = function slavePregnancyDatatypeCleanup(sl
 	slave.ovaries = Math.clamp(+slave.ovaries, 0, 1) || 0;
 	slave.vasectomy = Math.clamp(+slave.vasectomy, 0, 1) || 0;
 	slave.mpreg = Math.clamp(+slave.mpreg, 0, 1) || 0;
-	slave.reservedChildren = WombReserveCount(slave, "incubator") || 0;
-	slave.reservedChildrenNursery = WombReserveCount(slave, "nursery") || 0;
 	if (slave.pregAdaptation !== 0) {
 		slave.pregAdaptation = Math.max(+slave.pregAdaptation, 0) || 50;
 	}
@@ -37407,8 +37403,6 @@ window.childPregnancyDatatypeCleanup = function childPregnancyDatatypeCleanup(ch
 	child.ovaries = Math.clamp(+child.ovaries, 0, 1) || 0;
 	child.vasectomy = Math.clamp(+child.vasectomy, 0, 1) || 0;
 	child.mpreg = Math.clamp(+child.mpreg, 0, 1) || 0;
-	child.reservedChildren = WombReserveCount(child, "incubator") || 0;
-	child.reservedChildrenNursery = WombReserveCount(child, "nursery") || 0;
 	if (child.pregAdaptation !== 0) {
 		child.pregAdaptation = Math.max(+child.pregAdaptation, 0) || 50;
 	}
@@ -37808,8 +37802,6 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
 		V.playerAging = Math.clamp(+V.playerAging, 0, 2) || 2;
 	}
 	PC.newVag = Math.clamp(+PC.newVag, 0, 1) || 0;
-	PC.reservedChildren = WombReserveCount(PC, "incubator") || 0;
-	PC.reservedChildrenNursery = WombReserveCount(PC, "nursery") || 0;
 	PC.fertDrugs = Math.clamp(+PC.fertDrugs, 0, 1) || 0;
 	PC.forcedFertDrugs = Math.max(+PC.forcedFertDrugs, 0) || 0;
 	PC.staminaPills = Math.clamp(+PC.staminaPills, 0, 1) || 0;
@@ -37818,6 +37810,7 @@ window.PCDatatypeCleanup = function PCDatatypeCleanup() {
 	PC.lactation = Math.max(+PC.lactation, 0) || 0;
 	PC.lactationDuration = Math.max(+PC.lactationDuration, 0) || 0;
 	generatePlayerPronouns(PC);
+
 	if (PC.age !== undefined) {
 		delete PC.age;
 	}
@@ -37875,6 +37868,15 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.fuckdolls = Math.max(+V.fuckdolls, 0) || 0;
 	V.menialBioreactors = Math.max(+V.menialBioreactors, 0) || 0;
+	V.assistant = Math.clamp(+V.assistant, 0, 1) || 0;
+	if (typeof V.assistantPronouns != "object") {
+		V.assistantPronouns = {};
+	}
+	if (typeof V.marketAssistantPronouns != "object") {
+		V.marketAssistantPronouns = {};
+	}
+	generateAssistantPronouns();
+
 	V.foodCost = Math.trunc(2500/V.economy);
 	V.drugsCost = Math.trunc(10000/V.economy);
 	V.rulesCost = Math.trunc(10000/V.economy);

src/js/datatypeCleanupJS.tw

@@ -1229,10 +1229,16 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.GDP = Math.max(+V.GDP, 1) || 278.6;
 	V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0;
 	V.menials = Math.max(+V.menials, 0) || 0;
-	V.fuckdolls = Math.max(+V.fuckdolls , 0) || 0;
-	V.menialBioreactors = Math.max(+V.menialBioreactors , 0) || 0;
+	V.fuckdolls = Math.max(+V.fuckdolls, 0) || 0;
+	V.menialBioreactors = Math.max(+V.menialBioreactors, 0) || 0;
 
 	V.assistant = Math.clamp(+V.assistant, 0, 1) || 0;
+	if (typeof V.assistantPronouns != "object") {
+		V.assistantPronouns = {};
+	}
+	if (typeof V.marketAssistantPronouns != "object") {
+		V.marketAssistantPronouns = {};
+	}
 	generateAssistantPronouns();
 
 	V.foodCost = Math.trunc(2500/V.economy);

src/js/slaveGenerationJS.tw

@@ -1698,8 +1698,6 @@ window.BaseSlave = function BaseSlave() {
 		HGExclude: 0,
 		ballType: "human",
 		eggType: "human",
-		reservedChildren: 0,
-		reservedChildrenNursery: 0,
 		choosesOwnChastity: 0,
 		pregControl: "none",
 		readyLimbs: [],