From 73fca50defc88546ba4b18387049a903e82b5d68 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 25 Feb 2019 21:39:28 -0500 Subject: [PATCH] Agent children don't go to incubator --- src/js/assignJS.js | 2 ++ src/pregmod/incubator.tw | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/assignJS.js b/src/js/assignJS.js index e411ecc39d4..b44407d86da 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -285,6 +285,8 @@ window.assignJob = function assignJob(slave, job) { slave.assignment = job; slave.assignmentVisible = 0; slave.useRulesAssistant = 0; /* non-visible roles exempt from Rules Assistant */ + WombCleanGenericReserve(slave, 'incubator', 9999); + WombCleanGenericReserve(slave, 'nursery', 9999); if (job === "be your agent") { V.leaders.push(slave); } diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index fae743fe30a..829c41b4856 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -72,7 +72,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<for _u = 0; _u < _SL; _u++>> <<setLocalPronouns $slaves[_u]>> <<if $slaves[_u].preg > 0 && $slaves[_u].broodmother == 0 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">> - <<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>> + <<if ($slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0) || $activeSlave.assignment == "be your agent" || "live with your agent">> <<else>> <<set _slaveId = "slave-" + $slaves[_u].ID>> <<set _WL = $slaves[_u].womb.length>> -- GitLab