From fac8c08ea7c1df1f9448e033d654ebf3b2a3a5eb Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 19 Oct 2020 15:16:48 -0700
Subject: [PATCH] Fix and clean up incubator release logic
---
js/003-data/gameVariableData.js | 1 -
src/facilities/incubator/incubatorInteract.js | 46 +++++++------------
.../incubator/incubatorRetrievalWorkaround.tw | 4 +-
3 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index a447a669517..026c65e29ec 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -588,7 +588,6 @@ App.Data.resetOnNGPlus = {
incubator: 0,
incubatorBulkRelease: 0,
incubatorOrgans: [],
- incubatorOldID: 0,
incubatorUpgradeSpeed: 5,
incubatorUpgradeWeight: 0,
incubatorUpgradeMuscles: 0,
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index 1469610c2f7..a56943dfd9a 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -951,7 +951,6 @@ App.UI.incubator = function() {
App.UI.DOM.link(
"Retrieve immediately",
() => {
- V.incubatorOldID = V.tanks[i].ID;
V.readySlave = V.tanks[i];
V.tanks.splice(i, 1);
},
@@ -1673,35 +1672,24 @@ App.UI.incubator = function() {
}
function release() {
+ const multiple = (V.incubatorBulkRelease === 1) && V.tanks.filter(t => t.growTime <= 0).length > 1;
+
+ const singleRelease = () => {
+ const baby = V.tanks.find(t => t.growTime <= 0);
+ V.tanks.delete(baby);
+ V.readySlave = baby;
+ };
+
+ const multipleRelease = () => {
+ V.newSlavePool = V.tanks.deleteWith(t => t.growTime <= 0);
+ };
+
if (V.readySlaves === 1) {
- if (V.incubatorBulkRelease === 1) {
- V.newSlavePool = [];
- for (let _inc = 0; _inc < V.tanks.length; _inc++) {
- if (V.tanks[_inc].growTime <= 0) {
- V.incubatorOldID = V.tanks[_inc].ID;
- /* single slave case */
- const _tempObject = {object: V.tanks[_inc], ID: V.tanks[_inc].ID};
- V.newSlavePool.push(clone(_tempObject));
- V.tanks.splice(_inc, 1);
- _inc--;
- }
- }
- if (V.newSlavePool.length === 1) {
- V.readySlave = V.newSlavePool[0].object;
- V.newSlavePool = 0;
- return App.UI.DOM.passageLink(`Release ready tank`, "Incubator Retrieval Workaround");
- }
+ if (multiple) {
+ return App.UI.DOM.passageLink(`Release ready tanks`, "Incubator Retrieval Workaround", multipleRelease);
} else {
- for (let _inc = 0; _inc < incubatorSlaves; _inc++) {
- if (V.tanks[_inc].growTime <= 0) {
- V.incubatorOldID = V.tanks[_inc].ID;
- V.readySlave = V.tanks[_inc];
- V.tanks.splice(_inc, 1);
- break;
- }
- }
+ return App.UI.DOM.passageLink(`Release ready tank`, "Incubator Retrieval Workaround", singleRelease);
}
- return App.UI.DOM.passageLink(`Release ready tanks`, "Incubator Retrieval Workaround");
}
return new DocumentFragment();
}
@@ -1753,8 +1741,8 @@ App.UI.incubator = function() {
/**
*
* @param {string} id
- * @param {HTMLElement} element
- * @returns {HTMLElement}
+ * @param {Node} element
+ * @returns {HTMLSpanElement}
*/
function makeSpanIded(id, element) {
const span = document.createElement("span");
diff --git a/src/facilities/incubator/incubatorRetrievalWorkaround.tw b/src/facilities/incubator/incubatorRetrievalWorkaround.tw
index cb888d4f58a..f89e5c35906 100644
--- a/src/facilities/incubator/incubatorRetrievalWorkaround.tw
+++ b/src/facilities/incubator/incubatorRetrievalWorkaround.tw
@@ -15,7 +15,7 @@
<<if $readySlave.tankBaby != 3>>
<<if $incubatorOrgans.length > 0>>
<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
- <<if $incubatorOrgans[_irw].ID == $incubatorOldID>>
+ <<if $incubatorOrgans[_irw].ID == $readySlave.ID>>
<<set _newOrgan = {type: $incubatorOrgans[_irw].type, weeksToCompletion: $incubatorOrgans[_irw].weeksToCompletion, ID: $activeSlave.ID}>>
<<if _newOrgan.weeksToCompletion <= 0>>
<<set $completedOrgans.push($incubatorOrgans[_irw])>>
@@ -47,7 +47,7 @@
<<for _irw = 0; _irw < $newSlavePool.length; _irw++>>
<br><br>
- <<set _newSlave = $newSlavePool[_irw].object>>
+ <<set _newSlave = $newSlavePool[_irw]>>
Name: <<= SlaveFullName(_newSlave)>>
<br>Mother:
--
GitLab