From 54c9a643fd9c7281541f838e0dd5753eabcff16f Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Mon, 27 May 2019 15:59:19 -0400
Subject: [PATCH] Removed num() from slaveSummaryWidgets
---
src/js/slaveSummaryWidgets.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 4c7ff1f1563..a2f01f7d017 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -940,7 +940,7 @@ window.SlaveSummaryUncached = (function() {
} else if ((slave.preg >= 36) && (slave.broodmother > 0)) {
r += `<strong>Perm preg</strong>`;
} else if (slave.pregKnown === 1) {
- r += `<strong>${capFirstChar(num(slave.pregWeek))} wks preg</strong>`;
+ r += `<strong>${slave.pregWeek} wks preg</strong>`;
}
r += `</span> `;
if (slave.induce === 1) {
@@ -1027,9 +1027,9 @@ window.SlaveSummaryUncached = (function() {
r += `May be pregnant.`;
} else if (slave.pregKnown === 1) {
if (slave.pregType < 2 || slave.broodmother > 0) {
- r += `${capFirstChar(num(slave.pregWeek))} weeks pregnant.`;
+ r += `${slave.pregWeek} weeks pregnant.`;
} else {
- r += `${capFirstChar(num(slave.pregWeek))} weeks pregnant with `;
+ r += `${slave.pregWeek} weeks pregnant with `;
if (slave.pregType >= 40) {
r += `a tremendous brood of offspring.`;
} else if (slave.pregType >= 20) {
@@ -2424,7 +2424,7 @@ window.SlaveSummaryUncached = (function() {
function long_age(slave) {
r += `<span class="pink">`;
if (V.showAgeDetail === 1) {
- r += `Age ` + `${num(slave.actualAge)}` + `.`;
+ r += `Age ` + `${slave.actualAge}` + `.`;
} else if (slave.actualAge >= 40) {
r += `Forties.`;
} else if (slave.actualAge >= 35) {
@@ -2449,10 +2449,10 @@ window.SlaveSummaryUncached = (function() {
*/
if (((slave.geneMods.NCS === 0) || (slave.visualAge >= slave.physicalAge))) {
if (slave.actualAge !== slave.physicalAge) {
- r += `${num(slave.physicalAge)}` + ` year old body. `;
+ r += `${slave.physicalAge}` + ` year old body. `;
}
if (slave.visualAge !== slave.physicalAge) {
- r += `Looks ` + `${num(slave.visualAge)}` + `. `;
+ r += `Looks ` + `${slave.visualAge}` + `. `;
}
} else {
/*
@@ -2464,7 +2464,7 @@ window.SlaveSummaryUncached = (function() {
** say: 'Age 1. 11 year old body.' -- this conflicts with the way NCS works though, because she hasn't
** visually aged, so our change here makes it say 'Age 1. Appears to have a 10 year old body.'
*/
- r += `Appears to have a ` + `${num(slave.visualAge)}` + ` year old body. `;
+ r += `Appears to have a ` + `${slave.visualAge}` + ` year old body. `;
}
if (slave.geneMods.NCS === 1) {
r += `(<span class="orange">NCS</span>) `;
--
GitLab