From 39b173dd43ba4cfc5a54714e4a848d304ee47c9f Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Tue, 16 Oct 2018 17:34:26 -0400
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 20 ++++++++++++--------
src/js/generateNewSlaveJS.tw | 20 ++++++++++++--------
src/pregmod/incubatorReport.tw | 2 +-
3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index df28c9afdc8..b1e31d0224f 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -30989,6 +30989,10 @@ window.GenerateNewSlave = (function(){
if (passage() == "Slave Markets" && V.slaveMarket == "corporate" && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") {
slave.race = V.captureUpgradeRace;
}
+ slave.origRace = slave.race;
+ slave.origEye = slave.eyeColor;
+ slave.origHColor = slave.hColor;
+ slave.origSkin = slave.skin;
};
function GenerateXXSlave() {
@@ -31068,19 +31072,19 @@ window.GenerateNewSlave = (function(){
slave.height = Math.round(Height.random(slave));
if (slave.physicalAge <= 13) {
if (slave.height > Height.mean(slave) * 170/172.5) {
- slave.hips = jsEither(-2, -1, -1, 0, 1);
- slave.shoulders = jsEither(-1, -1, 0, 0, 0, 1);
+ slave.hips = jsEither([-2, -1, -1, 0, 1]);
+ slave.shoulders = jsEither([-1, -1, 0, 0, 0, 1]);
} else {
- slave.hips = jsEither(-2, -2, -1, -1, 0);
- slave.shoulders = jsEither(-2, -1, -1, 0, 0, 1);
+ slave.hips = jsEither([-2, -2, -1, -1, 0]);
+ slave.shoulders = jsEither([-2, -1, -1, 0, 0, 1]);
}
} else {
if (slave.height > Height.mean(slave) * 170/172.5) {
- slave.hips = jsEither(-2, -1, -1, 0, 1);
- slave.shoulders = jsEither(-1, 0, 1, 1, 2, 2);
+ slave.hips = jsEither([-2, -1, -1, 0, 1]);
+ slave.shoulders = jsEither([-1, 0, 1, 1, 2, 2]);
} else {
- slave.hips = jsEither(-2, -2, -1, -1, 0);
- slave.shoulders = jsEither(-1, 0, 0, 1, 1, 2);
+ slave.hips = jsEither([-2, -2, -1, -1, 0]);
+ slave.shoulders = jsEither([-1, 0, 0, 1, 1, 2]);
}
}
if (slave.physicalAge < 13) {
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index 056ca833fe7..b26003b4863 100644
--- a/src/js/generateNewSlaveJS.tw
+++ b/src/js/generateNewSlaveJS.tw
@@ -64,6 +64,10 @@ window.GenerateNewSlave = (function(){
if (passage() == "Slave Markets" && V.slaveMarket == "corporate" && V.captureUpgradeRace != "unselected" && V.captureUpgradeRace != "none") {
slave.race = V.captureUpgradeRace;
}
+ slave.origRace = slave.race;
+ slave.origEye = slave.eyeColor;
+ slave.origHColor = slave.hColor;
+ slave.origSkin = slave.skin;
};
function GenerateXXSlave() {
@@ -143,19 +147,19 @@ window.GenerateNewSlave = (function(){
slave.height = Math.round(Height.random(slave));
if (slave.physicalAge <= 13) {
if (slave.height > Height.mean(slave) * 170/172.5) {
- slave.hips = jsEither(-2, -1, -1, 0, 1);
- slave.shoulders = jsEither(-1, -1, 0, 0, 0, 1);
+ slave.hips = jsEither([-2, -1, -1, 0, 1]);
+ slave.shoulders = jsEither([-1, -1, 0, 0, 0, 1]);
} else {
- slave.hips = jsEither(-2, -2, -1, -1, 0);
- slave.shoulders = jsEither(-2, -1, -1, 0, 0, 1);
+ slave.hips = jsEither([-2, -2, -1, -1, 0]);
+ slave.shoulders = jsEither([-2, -1, -1, 0, 0, 1]);
}
} else {
if (slave.height > Height.mean(slave) * 170/172.5) {
- slave.hips = jsEither(-2, -1, -1, 0, 1);
- slave.shoulders = jsEither(-1, 0, 1, 1, 2, 2);
+ slave.hips = jsEither([-2, -1, -1, 0, 1]);
+ slave.shoulders = jsEither([-1, 0, 1, 1, 2, 2]);
} else {
- slave.hips = jsEither(-2, -2, -1, -1, 0);
- slave.shoulders = jsEither(-1, 0, 0, 1, 1, 2);
+ slave.hips = jsEither([-2, -2, -1, -1, 0]);
+ slave.shoulders = jsEither([-1, 0, 0, 1, 1, 2]);
}
}
if (slave.physicalAge < 13) {
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index 1bc64ade9cf..186822b6a4d 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -140,7 +140,7 @@
<<if $incubatorUpgradeGrowthStims == 1 && $incubatorGrowthStimsSetting != 0>>
<br>
- <<set _heightLimit = Math.trunc(Math.clamp((Height.mean($tanks[_inc].height) * 1.25),0,274))>>
+ <<set _heightLimit = Math.trunc(Math.clamp((Height.mean($tanks[_inc]) * 1.25),0,274))>>
<<set _heightLimitAge = Height.forAge($tanks[_inc].height, $tanks[_inc])>>
<<if $tanks[_inc].inducedNCS == 1>>
/*
--
GitLab