diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 01dbe4308c022e29a007cec820457efa5b966bd8..5dc48369e702f9dc857c6c1f23382fbf3e96c7a1 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 6bc095da5dc9dcf54f75f5647c50f84a65c3518f..a81ea6ab44c99e3cedec3859a05c3a78b4ec8607 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>>
diff --git a/src/pregmod/physicalDevelopment.tw b/src/pregmod/physicalDevelopment.tw
index 2f4771bdbaae6c53de60abde0083dbcc389782e8..207cd8993f7f0ec122b448d877883cd074375ea3 100644
--- a/src/pregmod/physicalDevelopment.tw
+++ b/src/pregmod/physicalDevelopment.tw
@@ -54,10 +54,24 @@
<<set $args[0].height += 5>>
<</if>>
<<else>>
- <<if $args[0].height <= 91>>
- <<set $args[0].height += either(8,8,9,9,9,10)>>
- <<elseif $args[0].height <= 101>>
- <<set $args[0].height += 5>>
+ <<if $args[0].geneticQuirks.dwarfism == 2 && $args[0].geneticQuirks.gigantism != 2>>
+ <<if $args[0].height <= 77>>
+ <<set $args[0].height += either(2,2,3,3,4,4)>>
+ <<elseif $args[0].height <= 82>>
+ <<set $args[0].height += 1>>
+ <</if>>
+ <<elseif $args[0].geneticQuirks.gigantism == 2>>
+ <<if $args[0].height <= 101>>
+ <<set $args[0].height += either(8,8,9,9,9,10)>>
+ <<elseif $args[0].height <= 116>>
+ <<set $args[0].height += 7>>
+ <</if>>
+ <<else>>
+ <<if $args[0].height <= 91>>
+ <<set $args[0].height += either(8,8,9,9,9,10)>>
+ <<elseif $args[0].height <= 101>>
+ <<set $args[0].height += 5>>
+ <</if>>
<</if>>
<</if>>
<<set $args[0].pregAdaptation = 5>>
@@ -2785,8 +2799,18 @@
<</if>>
<<case 18>>
<<if $args[0].hormoneBalance >= 200>>
- <<if $args[0].height <= 174>>
- <<set $args[0].height += either(0,0,1,1)>>
+ <<if $args[0].geneticQuirks.dwarfism == 2 && $args[0].geneticQuirks.gigantism != 2>>
+ <<if $args[0].height <= 146>>
+ <<set $args[0].height += either(0,0,0,1)>>
+ <</if>>
+ <<elseif $args[0].geneticQuirks.gigantism == 2>>
+ <<if $args[0].height <= 274>>
+ <<set $args[0].height += either(0,1,2,3)>>
+ <</if>>
+ <<else>>
+ <<if $args[0].height <= 174>>
+ <<set $args[0].height += either(0,0,1,1)>>
+ <</if>>
<</if>>
<<if $args[0].hips < 2>>
<<if random(1,100) > 20>>
@@ -2881,8 +2905,18 @@
<</if>>
<</if>>
<<else>>
- <<if $args[0].height <= 174>>
- <<set $args[0].height += either(0,0,1,1,1,2)>>
+ <<if $args[0].geneticQuirks.dwarfism == 2 && $args[0].geneticQuirks.gigantism != 2>>
+ <<if $args[0].height <= 146>>
+ <<set $args[0].height += either(0,0,0,1)>>
+ <</if>>
+ <<elseif $args[0].geneticQuirks.gigantism == 2>>
+ <<if $args[0].height <= 274>>
+ <<set $args[0].height += either(3,4,4,5,5,6)>>
+ <</if>>
+ <<else>>
+ <<if $args[0].height <= 174>>
+ <<set $args[0].height += either(0,0,1,1,1,2)>>
+ <</if>>
<</if>>
<<if $args[0].waist < 20>>
<<if random(1,100) > 60>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 61d2b1084f7ce5355de6b581f063e9d32dbf9518..d8a5ee9159cd21ec47bfb55cd34ca347dbc28584 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1425,6 +1425,14 @@ $He has
<br>
[[Albinism prevention treatment|Surgery Degradation][$activeSlave.geneticQuirks.albinism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
<</if>>
+ <<if $activeSlave.geneticQuirks.dwarfism == 2>>
+ <br>
+ [[Dwarfism correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.dwarfism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ <</if>>
+ <<if $activeSlave.geneticQuirks.gigantism == 2>>
+ <br>
+ [[Gigantism correction treatment|Surgery Degradation][$activeSlave.geneticQuirks.gigantism = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
+ <</if>>
<<if $activeSlave.geneticQuirks.pFace == 2>>
<br>
[[Prevent passing of perfect faces|Surgery Degradation][$activeSlave.geneticQuirks.pFace = 0,cashX(forceNeg($surgeryCost*4), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $activeSlave.chem += 100,$surgeryType = "gene treatment"]]
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index effd7f8868d5a02a0b82941ebc18100fbac6a6d0..3ee5db23bfe16de308a761f4f8bb85f782b94041 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -88,6 +88,13 @@
<<if $activeSlave.geneticQuirks.albinism == 2>>
$He is an albino.
<</if>>
+ <<if $activeSlave.geneticQuirks.dwarfism == 2 && $activeSlave.geneticQuirks.gigantism == 2>>
+ $He has both dwarfism and gigantism.
+ <<elseif $activeSlave.geneticQuirks.dwarfism == 2>>
+ $He has dwarfism.
+ <<elseif $activeSlave.geneticQuirks.gigantism == 2>>
+ $He has gigantism.
+ <</if>>
<<if $activeSlave.geneticQuirks.heterochromia == 2>>
$He carries a gene that allows $his eyes to be two different colors.
<</if>>