Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod 0.9.9.6 v23.

See merge request !57

src/pregmod/testGenetics.tw

+:: test genetics [nobr]
+
+<<set $nextButton to "Back", $nextLink to "Main">>
+<<set _seed = 0>>
+
+All slave array slaves MUST be present in genePool or else there is a malfunction.
+<br>Name ID Origin
+<br><br>
+
+genePool:
+<<for _i to 0; _i < $genePool.length; _i++>>
+	<br>
+	$genePool[_i].slaveName $genePool[_i].ID $genePool[_i].origin
+<</for>>
+
+<br><br>
+
+slaves:
+<<for _i to 0; _i < $slaves.length; _i++>>
+	<br>
+	<<for _k to 0; _k < $genePool.length; _k++>>
+		<<if $slaves[_i].ID == $genePool[_k].ID>>
+			<<set _seed = 1>>
+			<<break>>
+		<</if>>
+	<</for>>
+	<<if _seed == 1>>
+		@@color:green;$slaves[_i].slaveName $slaves[_i].ID $slaves[_i].origin@@
+	<<else>>
+		@@color:red;$slaves[_i].slaveName $slaves[_i].ID $slaves[_i].origin@@
+	<</if>>
+<</for>>
\ No newline at end of file

src/uncategorized/options.tw

@@ -5,6 +5,10 @@
 
 This save was created using FC version $ver.
 
+<br><br>
+Genetics array test:
+<<click "Run Test">><<goto "test genetics">><</click>>
+
 <br><br>
 
 <<if ($autosave == 0)>>

src/uncategorized/remoteSurgery.tw

@@ -2173,7 +2173,7 @@ $pronounCap has doorway-jamming hips.
 		[[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget=0, $activeSlave.choosesOwnAssignment=0, $activeSlave.assignment="rest", $activeSlave.assignmentVisible=1, $activeSlave.sentence=0, $activeSlave.training=0, $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1, $surgeryType to "fuckdoll"]] //This is permanent and will greatly restrict $possessive//
 	<</if>>
 <<else>>
-	$pronounCap is encased in a Fuckdoll suit. [[Extract it|Surgery Degradation][$activeSlave.fuckdoll=0, $surgeryType to "fuckdollExtraction"]] 
+	$pronounCap is encased in a Fuckdoll suit. [[Extract it|Surgery Degradation][$activeSlave.fuckdoll=0, $surgeryType to "fuckdollExtraction", $activeSlave.clothes = "none", $activeSlave.shoes = "none"]] 
 <</if>>
 <</if>>
 

src/uncategorized/saRelationships.tw

@@ -1063,7 +1063,7 @@
 
 		<<if (_SlaveI.relationship >= 4)>>
 			/% I don't think this code block ever runs due to the double trust in the && as it can't be < -20 and > -10 at the same time %/
-			<<if (_SlaveI.devotion > 20) || ((_SlaveI.devotion >= -20) && (_SlaveI.trust < -20)) || (_SlaveI.trust > -10))>>
+			<<if (_SlaveI.devotion > 20) || ((_SlaveI.devotion >= -20) && (_SlaveI.trust < -20)) || (_SlaveI.trust > -10)>>
 			<<if _SlaveJ.devotion > 75>>
 			<<if _SlaveJ.trust > 50>>
 			<<if _SlaveJ.intelligence > 0>>