From c713a9f1eb664ff5bb8081fd4946548ad5efa3fe Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sun, 9 Dec 2018 11:11:55 -0500
Subject: [PATCH] Fixes
---
src/js/assayJS.tw | 6 +++---
src/pregmod/widgets/pregmodWidgets.tw | 2 ++
src/uncategorized/slaveSummary.tw | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index 558fb8c3851..a7f48ff960d 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -150,13 +150,13 @@ window.TatScore = function(slave) {
tatScore += 1;
}
if (slave.bellyTat !== 0) {
- if (((slave.preg > $activeSlave.pregData.normalBirth/1.33) && (slave.pregType >= 20)) || (slave.belly >= 300000)) {
+ if (((slave.preg > slave.pregData.normalBirth/1.33) && (slave.pregType >= 20)) || (slave.belly >= 300000)) {
tatScore += 0.75;
- } else if (((slave.preg > $activeSlave.pregData.normalBirth/2) && (slave.pregType >= 20)) || ((slave.preg > $activeSlave.pregData.normalBirth/1.33) && (slave.pregType >= 10)) || (slave.belly >= 150000)) {
+ } else if (((slave.preg > slave.pregData.normalBirth/2) && (slave.pregType >= 20)) || ((slave.preg > slave.pregData.normalBirth/1.33) && (slave.pregType >= 10)) || (slave.belly >= 150000)) {
tatScore += 1;
} else if ((slave.belly >= 10000) || (slave.bellyImplant >= 8000)) {
tatScore += 1;
- } else if (((slave.preg >= $activeSlave.pregData.normalBirth/4) && (slave.pregType >= 20)) || ((slave.preg > $activeSlave.pregData.normalBirth/4) && (slave.pregType >= 10)) || (slave.belly >= 5000)) {
+ } else if (((slave.preg >= slave.pregData.normalBirth/4) && (slave.pregType >= 20)) || ((slave.preg > slave.pregData.normalBirth/4) && (slave.pregType >= 10)) || (slave.belly >= 5000)) {
tatScore += 0.5;
} else if (slave.belly >= 1500) {
tatScore += 0.25;
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 72bc9a5d532..cd21c718be9 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1272,5 +1272,7 @@ extremely pale -5
s.geneMods.rapidCellGrowth = 0;
}
}
+ s.pregType = s.pregType || 0;
+ WombInit(s);
})>>
<</widget>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index b796356fa75..7d45b1d2136 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -597,12 +597,12 @@
[[_slaveName|Rules Slave Exclude Workaround][$activeSlave = $slaves[_ssi]]]''__
<<else>>
<br>__''
- [[_slaveName|Rules Slave NoExclude Workaround][$activeSlave = $slaves+_ssi]]]''__
+ [[_slaveName|Rules Slave NoExclude Workaround][$activeSlave = $slaves[_ssi]]]''__
<</if>>
<<case "Matchmaking">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
-<<case "Dinner Party Preperations">>
+<<case "Dinner Party Preparations">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</switch>>
--
GitLab