Skip to content
Snippets Groups Projects
Commit c713a9f1 authored by kopareigns's avatar kopareigns
Browse files

Fixes

parent da3350b9
No related branches found
No related tags found
1 merge request!3104Fixes
Hide whitespace changes
Inline Side-by-side
src/js/assayJS.tw
+ 3
− 3
View file @ c713a9f1
...@@ -150,13 +150,13 @@ window.TatScore = function(slave) { ...@@ -150,13 +150,13 @@ window.TatScore = function(slave) {
tatScore += 1; tatScore += 1;
} }
if (slave.bellyTat !== 0) { 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; 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; tatScore += 1;
} else if ((slave.belly >= 10000) || (slave.bellyImplant >= 8000)) { } else if ((slave.belly >= 10000) || (slave.bellyImplant >= 8000)) {
tatScore += 1; 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; tatScore += 0.5;
} else if (slave.belly >= 1500) { } else if (slave.belly >= 1500) {
tatScore += 0.25; tatScore += 0.25;
......
src/pregmod/widgets/pregmodWidgets.tw
+ 2
− 0
View file @ c713a9f1
...@@ -1272,5 +1272,7 @@ extremely pale -5 ...@@ -1272,5 +1272,7 @@ extremely pale -5
s.geneMods.rapidCellGrowth = 0; s.geneMods.rapidCellGrowth = 0;
} }
} }
s.pregType = s.pregType || 0;
WombInit(s);
})>> })>>
<</widget>> <</widget>>
src/uncategorized/slaveSummary.tw
+ 2
− 2
View file @ c713a9f1
...@@ -597,12 +597,12 @@ ...@@ -597,12 +597,12 @@
[[_slaveName|Rules Slave Exclude Workaround][$activeSlave = $slaves[_ssi]]]''__ [[_slaveName|Rules Slave Exclude Workaround][$activeSlave = $slaves[_ssi]]]''__
<<else>> <<else>>
<br>__'' <br>__''
[[_slaveName|Rules Slave NoExclude Workaround][$activeSlave = $slaves+_ssi]]]''__ [[_slaveName|Rules Slave NoExclude Workaround][$activeSlave = $slaves[_ssi]]]''__
<</if>> <</if>>
<<case "Matchmaking">> <<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>> <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]]] [[_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>> <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]]] [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</switch>> <</switch>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment