diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 558fb8c3851c69db1e4178da06400fdd9d9dc09e..a7f48ff960dea669936d5f26534027584c5755b0 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 72bc9a5d5320bc748f5f1cf75ff45849e4b7d020..cd21c718be9a0076639205eb4cf0244cb2546763 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 b796356fa751c780ef4a6ae402798272509aff67..7d45b1d21360e8a40043884d2ebb3d8b0ec054ca 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>>