From d60efa3809e5341abf1c7b9a8810851518a5a992 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 23 Feb 2020 23:12:42 -0500
Subject: [PATCH] finish
---
src/js/slaveInteract.js | 81 +++++++++---------------------
src/uncategorized/slaveInteract.tw | 3 --
2 files changed, 25 insertions(+), 59 deletions(-)
diff --git a/src/js/slaveInteract.js b/src/js/slaveInteract.js
index 1e8a616edf0..16507727fe1 100644
--- a/src/js/slaveInteract.js
+++ b/src/js/slaveInteract.js
@@ -1231,19 +1231,19 @@ App.UI.SlaveInteract.incubator = function(slave) {
let link = document.createElement('div');
link.className = "choices";
if (_WL - _reservedNursery === 0) {
- title.textContent = `${His} children are already reserved for V.nurseryName`;
+ title.textContent = `${His} children are already reserved for ${V.nurseryName}`;
title.style.fontStyle = "italic";
} else {
V.freeTanks = (V.incubator - V.tanks.length);
if (_reservedIncubator > 0) {
if (_WL === 1) {
- title.textContent = `${His} child will be placed in V.incubatorName. `;
+ title.textContent = `${His} child will be placed in ${V.incubatorName}. `;
} else if (_reservedIncubator < _WL) {
- title.textContent = `${_reservedIncubator} of ${his} children will be placed in V.incubatorName.`;
+ title.textContent = `${_reservedIncubator} of ${his} children will be placed in ${V.incubatorName}.`;
} else if (_WL === 2) {
- title.textContent = `Both of ${his} children will be placed in V.incubatorName. `;
+ title.textContent = `Both of ${his} children will be placed in ${V.incubatorName}. `;
} else {
- title.textContent = `All ${_reservedIncubator} of ${his} children will be placed in V.incubatorName. `;
+ title.textContent = `All ${_reservedIncubator} of ${his} children will be placed in ${V.incubatorName}. `;
}
if ((_reservedIncubator + _reservedNursery < _WL) && (V.reservedChildren < V.freeTanks)) {
link.appendChild(
@@ -1254,9 +1254,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
if (_reservedIncubator > 0) {
@@ -1269,9 +1267,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1285,9 +1281,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1301,9 +1295,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1316,9 +1308,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
if (_reservedIncubator > 1) {
@@ -1331,9 +1321,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1359,9 +1347,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
title.appendChild(tank);
@@ -1375,9 +1361,7 @@ App.UI.SlaveInteract.incubator = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("incubator");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1424,13 +1408,13 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.freeCribs = (V.nursery - V.cribs.length);
if (_reservedNursery > 0) {
if (_WL === 1) {
- title.textContent = `${His} child will be placed in V.nurseryName. `;
+ title.textContent = `${His} child will be placed in ${V.nurseryName}. `;
} else if (_reservedNursery < _WL) {
- title.textContent = `_reservedNursery of ${his} children will be placed in V.nurseryName.`;
+ title.textContent = `_reservedNursery of ${his} children will be placed in ${V.nurseryName}.`;
} else if (_WL === 2) {
- title.textContent = `Both of ${his} children will be placed in V.nurseryName. `;
+ title.textContent = `Both of ${his} children will be placed in ${V.nurseryName}. `;
} else {
- title.textContent = `All ${_reservedNursery} of ${his} children will be placed in V.nurseryName. `;
+ title.textContent = `All ${_reservedNursery} of ${his} children will be placed in ${V.nurseryName}. `;
}
if ((_reservedIncubator + _reservedNursery < _WL) && (V.reservedChildrenNursery < V.freeCribs)) {
link.appendChild(
@@ -1441,9 +1425,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("nursery");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
@@ -1457,9 +1439,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("nursery");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1472,9 +1452,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
WombCleanGenericReserve(slave, "nursery", 9999);
App.UI.SlaveInteract.refreshAll(slave);
// TODO: Copying this from the SC, but it's not three lines like the others? -LCD
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1487,9 +1465,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
WombAddToGenericReserve(slave, "nursery", 9999);
App.UI.SlaveInteract.refreshAll(slave);
// TODO: Copying this from the SC, but it's not three lines like the others? -LCD
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1502,8 +1478,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("nursery");
App.UI.SlaveInteract.refreshAll(slave);
- },
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
@@ -1517,9 +1492,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("nursery");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
@@ -1545,9 +1518,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("nursery");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
title.appendChild(crib);
@@ -1561,9 +1532,7 @@ App.UI.SlaveInteract.nursery = function(slave) {
V.slaves[V.slaveIndices[slave.ID]] = slave;
V.reservedChildren = FetusGlobalReserveCount("nursery");
App.UI.SlaveInteract.refreshAll(slave);
- },
- [],
- "Slave Interact" // TODO: may no longer need to do this anymore if refreshing in DOM
+ }
)
);
}
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 8306ad87550..526916a50c7 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -251,9 +251,6 @@
<span id="nursery"></span>
<script>App.UI.SlaveInteract.nursery(V.activeSlave)</script>
-<br><br><br> Old shit: <br>
-
-
<<if $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<<if $activeSlave.breedingMark == 0 && $activeSlave.fuckdoll == 0 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
<br>
--
GitLab