Use array.find instead of a twinescript loop to simplify the incubator organ list.

src/pregmod/organFarm.tw

@@ -70,53 +70,26 @@ Organ Production
 <</if>>
 <<if $incubatorSlaves > 0>>
 	<<for _x = 0; _x < $incubatorOrgans.length; _x++>>
-		<<for _w = 0; _w < $incubatorSlaves; _w++>>
-			<<if $tanks[_w].ID == $incubatorOrgans[_x].ID>>
-				<br>
-				$tanks[_w].slaveName's $incubatorOrgans[_x].type,
-				<<if $incubatorOrgans[_x].weeksToCompletion <= 0>>
-					ready to be implanted as soon as $he exits the incubator.
-				<<else>>
-					<<if $organFarmUpgrade == 1>>
-						<<print $incubatorOrgans[_x].weeksToCompletion>>
-					<<elseif $organFarmUpgrade == 2>>
-						<<print Math.ceil($incubatorOrgans[_x].weeksToCompletion/2)>>
-					<<elseif $organFarmUpgrade == 3>>
-						<<print Math.ceil($incubatorOrgans[_x].weeksToCompletion/4)>>
-					<</if>> weeks from completion.
-				<</if>>
-				<<break>>
-			<</if>>
-		<</for>>
-	<</for>>
-	<br>
-<</if>>
-/* TODO: potentially allow organs to be implanted into children in the nursery
-<<set _NL = $NurseryiIDs.length>>
-<<if _NL > 0>>
-	<<for _x = 0; _x < $nurseryOrgans.length; _x++>>
-		<<for _w = 0; _w < _NL; _w++>>
-			<<if $cribs[_w].ID == $nurseryOrgans[_x].ID>>
-				<br>
-				$cribs[_w].slaveName's $nurseryOrgans[_x].type,
-				<<if $nurseryOrgans[_x].weeksToCompletion <= 0>>
-					ready to be implanted as soon as $he exits the nursery.
-				<<else>>
-					<<if $organFarmUpgrade == 1>>
-						<<print $nurseryOrgans[_x].weeksToCompletion>>
-					<<elseif $organFarmUpgrade == 2>>
-						<<print Math.ceil($nurseryOrgans[_x].weeksToCompletion/2)>>
-					<<elseif $organFarmUpgrade == 3>>
-						<<print Math.ceil($nurseryOrgans[_x].weeksToCompletion/4)>>
-					<</if>> weeks from completion.
-				<</if>>
-				<<break>>
+		<<set _tank = $tanks.find((t) => t.ID === $incubatorOrgans[_x].ID)>>
+		<<if def _tank>>
+			<br>
+			_tank.slaveName's $incubatorOrgans[_x].type,
+			<<if $incubatorOrgans[_x].weeksToCompletion <= 0>>
+				ready to be implanted as soon as $he exits the incubator.
+			<<else>>
+				<<if $organFarmUpgrade == 1>>
+					<<print $incubatorOrgans[_x].weeksToCompletion>>
+				<<elseif $organFarmUpgrade == 2>>
+					<<print Math.ceil($incubatorOrgans[_x].weeksToCompletion/2)>>
+				<<elseif $organFarmUpgrade == 3>>
+					<<print Math.ceil($incubatorOrgans[_x].weeksToCompletion/4)>>
+				<</if>> weeks from completion.
 			<</if>>
-		<</for>>
+		<</if>>
 	<</for>>
 	<br>
 <</if>>
-*/
+/* TODO: potentially allow organs to be implanted into children in the nursery */
 
 <<if $completedOrgans.length > 0>>
 	<br>