diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index 76f18de06ba35e10122e1f6d252958317d3cf364..fc2f6b751c4383b2a52b05fef32d42c4ce69633b 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -1546,7 +1546,6 @@ Target destination: <b><span id="targetLocation">$activeChild.targetLocation</sp <<if $cheatMode>> <br>''Cheatmode:'' <<link "Retrieve immediately" "Nursery Retrieval Workaround">> - <<set $nurseryOldID = $cribs[$i].ID>> <<set $readySlave = $cribs.pluck([$i], [$i])>> <</link>> <</if>> diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw index 46b0c7e404c21743e281022ac5a2aae8e2bbfa92..0a15f53b40e3736bd75083d1a11e66a9ae767c36 100644 --- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw +++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw @@ -13,7 +13,7 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco /* TODO: <<if $nurseryOrgans.length > 0>> <<for _i = 0; _i < $nurseryOrgans.length; _i++>> - <<if $nurseryOrgans[_i].ID == $nurseryOldID>> + <<if $nurseryOrgans[_i].ID == $activeSlave.ID>> <<set _newOrgan = {type: $nurseryOrgans[_i].type, weeksToCompletion: $nurseryOrgans[_i].weeksToCompletion, ID: $activeSlave.ID}>> <<if _newOrgan.weeksToCompletion <= 0>> <<set $completedOrgans.push($nurseryOrgans[_i])>> diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js index ec19f95653090d18e7e08ddd8554e8fc9cf570ac..a20b79001d1aba4cd9223a03c2443746ad232564 100644 --- a/src/facilities/nursery/widgets/utils/nurseryUtils.js +++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js @@ -35,8 +35,6 @@ App.Facilities.Nursery.childList = function childList() { } if (child.actualAge >= 18) { - V.nurseryOldID = child.ID; - if (child.targetLocation === "freedom") { V.freedSlaves.push(child); }