From a79353c341a74a13ba56a9250730fa17f70dc853 Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Sat, 25 May 2019 14:57:43 -0400
Subject: [PATCH] Added missing num()s
---
src/js/slaveSummaryWidgets.js | 10 +++++-----
src/uncategorized/storyCaption.tw | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 44975ded1dc..86ef97ca04b 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -962,7 +962,7 @@ window.SlaveSummaryUncached = (function() {
} else if ((slave.preg >= 36) && (slave.broodmother > 0)) {
r += `<strong>Perm preg</strong>`;
} else if (slave.pregKnown === 1) {
- r += `<strong>${slave.pregWeek} wks preg</strong>`;
+ r += `<strong>${capFirstChar(num(slave.pregWeek))} wks preg</strong>`;
}
r += `</span> `;
if (slave.induce === 1) {
@@ -2446,7 +2446,7 @@ window.SlaveSummaryUncached = (function() {
function long_age(slave) {
r += `<span class="pink">`;
if (V.showAgeDetail === 1) {
- r += `Age ` + `${slave.actualAge}` + `.`;
+ r += `Age ` + `${num(slave.actualAge)}` + `.`;
} else if (slave.actualAge >= 40) {
r += `Forties.`;
} else if (slave.actualAge >= 35) {
@@ -2471,10 +2471,10 @@ window.SlaveSummaryUncached = (function() {
*/
if (((slave.geneMods.NCS === 0) || (slave.visualAge >= slave.physicalAge))) {
if (slave.actualAge !== slave.physicalAge) {
- r += `${slave.physicalAge}` + ` year old body. `;
+ r += `${num(slave.physicalAge)}` + ` year old body. `;
}
if (slave.visualAge !== slave.physicalAge) {
- r += `Looks ` + `${slave.visualAge}` + `. `;
+ r += `Looks ` + `${num(slave.visualAge)}` + `. `;
}
} else {
/*
@@ -2486,7 +2486,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 ` + `${slave.visualAge}` + ` year old body. `;
+ r += `Appears to have a ` + `${num(slave.visualAge)}` + ` year old body. `;
}
if (slave.geneMods.NCS === 1) {
r += `(<span class="orange">NCS</span>) `;
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 9dac3116fe4..007907bc1c7 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -186,7 +186,7 @@
<</if>>
Upkeep |
<</if>><<print cashFormat($costs)>>
- <br><br>@@.pink;Total Sex Slaves@@ | <<print num(_SL)>>
+ <br><br>@@.pink;Total Sex Slaves@@ | <<print capFirstChar(num(_SL))>>
<br>@@.pink;Penthouse Beds@@ |
<<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>>
<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>>
@@ -258,7 +258,7 @@
<<else>>
@@color:rgb(0,255,0);unknown@@
<</if>>
- (<<print num($rep)>>)
+ (<<print capFirstChar(num($rep))>>)
</span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
@@ -364,7 +364,7 @@
<<else>>
@@color:rgb(211,0,204);harmless@@
<</if>>
- (<<print num($authority)>>)
+ (<<print capFirstChar(num($authority))>>)
</span>
<<if (_Pass == "Main")>>
<<if ($cheatMode) && ($cheatModeM)>>
--
GitLab