Merge branch 'patch-2' into 'pregmod-master'

Update householdLiquidator.tw: oppositeSex and fathers

See merge request !6622

src/uncategorized/householdLiquidator.tw

@@ -3,6 +3,7 @@
 <<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Household Liquidations">>
 <<set $introType = "liquidator", $newSlavesDone = 0, $newSlaveIndex = 0, _newSlaves = []>>
 
+
 <<if random(1,100) > 50>>
 
 <<set $oneTimeDisableDisability = 1>>
@@ -16,10 +17,16 @@
 <<run setMissingParents($activeSlave)>>
 <<set $activeSlave.canRecruit = 0>>
 
+/% Create opposite sex chance of relative %/
+<<set _oppositeSex = 0>>
+<<if $activeSlave.genes != GenerateChromosome()>>
+    <<set _oppositeSex = 1>>
+<</if>>
+
 The household liquidator is offering a set of siblings for sale. As usual, you will only be permitted to inspect the older, but there is a guarantee that the younger will be similar.
 <br><br>
 
-<<set _relativeSlave = generateRelatedSlave($activeSlave, "younger sibling")>>
+<<set _relativeSlave = generateRelatedSlave($activeSlave, "younger sibling", _oppositeSex)>>
 <<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
 
 <<set _slaveCost = slaveCost($activeSlave)>>
@@ -28,30 +35,36 @@ The household liquidator is offering a set of siblings for sale. As usual, you w
 
 <<elseif random(1,100) > 20>>
 
-/% Begin younger mothers submod. %/
+/% Begin younger parents submod. %/
 <<set $activeSlaveOneTimeMinAge = $fertilityAge + $minimumSlaveAge>>
 <<set $activeSlaveOneTimeMaxAge = 42>>
-<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter who can be a slave. %/
-/% End younger mothers submod. %/
+<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a child who can be a slave. %/
+/% End younger parents submod. %/
 <<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave("XX")>>
+<<set $activeSlave = GenerateNewSlave()>>
 <<set $activeSlave.origin = "You bought $him from the household liquidator.">>
 <<set $activeSlave.devotion = random(-75,-25)>>
 <<set $activeSlave.trust = random(-45,-25)>>
 <<set $activeSlave.oldDevotion = $activeSlave.devotion>>
 <<set $activeSlave.oldTrust = $activeSlave.trust>>
 <<run setHealth($activeSlave, jsRandom(-50, 20))>>
-<<set $activeSlave.boobs += 100>>
+<<if $activeSlave.vagina > -1>><<set $activeSlave.boobs += 100>><</if>>
 <<set $activeSlave.butt += 1>>
 <<if $activeSlave.vagina > -1>><<set $activeSlave.vagina += 1>><</if>>
-<<set $activeSlave.counter.birthsTotal = 1>>
+<<if $activeSlave.vagina > -1>><<set $activeSlave.counter.birthsTotal = 1>><</if>>
 <<set $activeSlave.canRecruit = 0>>
 
+/% Create opposite sex chance of relative %/
+<<set _oppositeSex = 0>>
+<<if $activeSlave.genes != GenerateChromosome()>>
+    <<set _oppositeSex = 1>>
+<</if>>
+
 <<setLocalPronouns $activeSlave>>
-The household liquidator is offering a mother and $his daughter for sale. As usual, you will only be permitted to inspect the mother, but there is a guarantee that the daughter will be similar.
+The household liquidator is offering a $mother and $his <<if $activeSlave.genes == "XX" && _oppositeSex == 1>>son<<elseif $activeSlave.genes == "XY" && _oppositeSex == 1>>daughter<<else>>$daughter<</if>> for sale. As usual, you will only be permitted to inspect the $mother, but there is a guarantee that the <<if $activeSlave.genes == "XX" && _oppositeSex == 1>>son<<elseif $activeSlave.genes == "XY" && _oppositeSex == 1>>daughter<<else>>$daughter<</if>> will be similar.
 <br><br>
 
-<<set _relativeSlave = generateRelatedSlave($activeSlave, "child")>>
+<<set _relativeSlave = generateRelatedSlave($activeSlave, "child", _oppositeSex)>>
 <<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
 
 <<set _slaveCost = slaveCost($activeSlave)>>