From dc87cb0bd44ed93f5c21f6edbe4732b50050207f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 24 Jun 2020 04:18:58 -0400 Subject: [PATCH] fixes --- src/interaction/slaveInteract.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js index a4e7be72cf7..3fb401eab73 100644 --- a/src/interaction/slaveInteract.js +++ b/src/interaction/slaveInteract.js @@ -1465,10 +1465,15 @@ App.UI.SlaveInteract.fertility = function(slave) { fertility.textContent = "postpartum"; } else if (slave.preg === 0) { fertility.textContent = "fertile"; - } else if (slave.preg < 4) { + } else if (slave.preg < 4 && (slave.broodmother === 0 || slave.broodmotherOnHold === 1)) { fertility.textContent = "may be pregnant"; + } else if (slave.preg < 2) { + fertility.textContent = "1 week pregnant"; } else { fertility.textContent = `${Math.trunc(slave.preg * 1000) / 1000} weeks pregnant`; // * and / needed to avoid seeing something like 20.1000000008 in some cases. + if (slave.broodmother > 0) { + fertility.textContent += " broodmother"; + } } fertility.textContent += ". "; fertilityblock.appendChild(fertility); -- GitLab