From d1bf17f2d1a32a981177df6e516df7995af97cb4 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 1 May 2019 20:23:53 -0400
Subject: [PATCH] fixes
---
src/js/generateMarketSlave.js | 6 +++---
src/pregmod/incubator.tw | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 01dbe4308c0..5dc48369e70 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -21,7 +21,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
}
V.one_time_age_overrides_pedo_mode = 1;
if (V.corpSpecRaces.length > 0) {
- V.fixedRace = jsEither([V.corpSpecRaces]);
+ V.fixedRace = jsEither(V.corpSpecRaces);
}
if (V.corpSpecGender === 1) {
r += `Slaves without pussies are not trained. `;
@@ -73,7 +73,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
if (V.corpSpecRaces.length === 12) {
r += `There is no racial element to trainee selection. `;
} else if (V.corpSpecRaces.length === 1) {
- const corpSpecRace = jsEither([V.corpSpecRaces]);
+ const corpSpecRace = jsEither(V.corpSpecRaces);
r += `The corporation specializes in ${corpSpecRace} slaves. `;
} else {
r += `The corporation selects slaves based on race. `/*getting into the specifics of which races exactly is a hellhole I'd rather not jump into*/ ;
@@ -1055,7 +1055,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
V.fixedRace = V.arcologies[0].FSSupremacistRace;
} else if (V.arcologies[0].FSSubjugationistLawME === 1) {
const races = setup.filterRacesLowercase.filter(race => race !== V.arcologies[0].FSSubjugationistRace);
- V.fixedRace = jsEither([races]);
+ V.fixedRace = jsEither(races);
}
V.activeSlave = GenerateNewSlave();
V.activeSlave.origin = "You purchased her indenture contract, making her yours for as long as it lasts.";
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 6bc095da5dc..a81ea6ab44c 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -81,7 +81,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
<<set _pregWeek = $slaves[_u].pregWeek>>
<<set _slaveName = SlaveFullName($slaves[_u])>>
<div class="possible" @id="_slaveId" @data-preg-count="_pregCount" @data-reserved-spots="_reservedIncubator" @data-preg-week="_pregWeek" @data-name="_slaveName">
- <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek weeks pregnant with
+ <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].pregWeek week<<if $slaves[_u].pregWeek > 1>>s<</if>> pregnant with
<<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>>
<<elseif $slaves[_u].pregSource == -1>>your
<<elseif $slaves[_u].pregSource == -2>>a citizen's
@@ -410,7 +410,8 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<set _readySlaves = 1>>
<br>$He is ready to be released from $his tank.
<<else>>
- <br>$His growth is currently being accelerated. $He will be ready for release in about <<print Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> weeks.
+ <<set _weekDisplay = Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>>
+ <br>$His growth is currently being accelerated. $He will be ready for release in about _weekDisplay week<<if _weekDisplay > 1>>s<</if>>.
<</if>>
<br>The tank is imprinting $him with basic life and sexual skills, though $he will still be very naïve and inexperienced on release.
<<if $tanks[$i].tankBaby == 2>>
--
GitLab