diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index 76f9900b5db0d8fdd3b21fb0248fbbac2a3820fe..a5e27d3f3247b715a1b34e9fbcdbb47d30bf2191 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -31,10 +31,10 @@ <<set $activeSlave.nationality = "Stateless">> <<set $activeSlave.race = $PC.race>> <<set $activeSlave.skin = $PC.skin>> - <<set $activeSlave.eyeColor = $PC.eyeColor>> - <<set $activeSlave.hColor = $PC.hColor>> - <<set $activeSlave.pubicHColor = $PC.hColor>> - <<set $activeSlave.underArmHColor = $PC.hColor>> + <<set $activeSlave.eyeColor = either($PC.eyeColor, brown, blue, brown, green, hazel, green)>> + <<set $activeSlave.hColor = either($PC.hColor, brown, blonde, black, brown)>> + <<set $activeSlave.pubicHColor = $activeSlave.hColor>> + <<set $activeSlave.underArmHColor = $activeSlave.hColor>> <<else>> <<for $m to 0; $m < $genePool.length; $m++>> <<if $PC.pregSource == $genePool[$m].ID>> @@ -119,8 +119,8 @@ <<set $activeSlave.nationality = "Stateless">> <<set $activeSlave.race = $PC.race>> <<set $activeSlave.skin = $PC.skin>> - <<set $activeSlave.eyeColor = $PC.eyeColor>> - <<set $activeSlave.hColor = $PC.hColor>> + <<set $activeSlave.eyeColor = either($PC.eyeColor, brown, blue, brown, green, hazel, green)>> + <<set $activeSlave.hColor = either($PC.hColor, brown, blonde, black, brown)>> <<set $activeSlave.pubicHColor = $PC.hColor>> <<set $activeSlave.underArmHColor = $PC.hColor>> <<else>> @@ -257,6 +257,9 @@ <<else>> <<set $activeSlave.eyeColor = either($mergeMom.eyeColor, $mergeDad.eyeColor)>> <</if>> + <<if $mergeMom.pregSource == -2 || $mergeMom.pregSource == 0>> + <<set $activeSlave.eyeColor = either($mergeMom.eyeColor, brown, blue, brown, green, hazel, green)>> + <</if>> <<if $mergeMom.hColor == $mergeDad.hColor>> <<set $activeSlave.hColor = $mergeMom.hColor>> <<elseif $mergeMom.hColor == "black">> @@ -282,6 +285,9 @@ <<else>> <<set $activeSlave.hColor = either($mergeMom.hColor, $mergeDad.hColor)>> <</if>> + <<if $mergeMom.pregSource == -2 || $mergeMom.pregSource == 0>> + <<set $activeSlave.hColor = either($mergeMom.hColor, brown, blonde, black, brown)>> + <</if>> <<set $activeSlave.pubicHColor = $activeSlave.hColor>> <<set $activeSlave.underArmHColor = $activeSlave.hColor>> <<if $mom.addict > 0>> diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw index 7d271459173e44d6ff7418c7307008cc92bbfe37..8276f185918674f45b066c9105026196ac959d5e 100644 --- a/src/uncategorized/dairy.tw +++ b/src/uncategorized/dairy.tw @@ -2,7 +2,9 @@ <<nobr>> <<set $nextButton to "Back to Main", $nextLink to "Main", $returnTo to "Dairy", $showEncyclopedia to 1, $encyclopedia to "Slave Dairy">> +<<silently>> DairyRestraintsSetting($dairyRestraintsSetting) +<</silently>> <<if $dairyName != "the Dairy">> <<set $dairyNameCaps to $dairyName.replace("the ", "The ")>> diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw index 24432000502b96568cde66109ac266fb80b91012..21dc078c3f51333cba43891cd787c103860605ab 100644 --- a/src/uncategorized/saRecruitGirls.tw +++ b/src/uncategorized/saRecruitGirls.tw @@ -360,7 +360,7 @@ She uses her extra time and @@color:yellowgreen;recruitment allowance@@ this wee <<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<if totalRelatives($slaves[$i]) > 0>> <<set _recruiterRelation = randomRelatedAvailableSlave($slaves[$i])>> - <<if _recruiterRelation != 0>> + <<if def _recruiterRelation>> <<if ($slaves[$i].energy > 60 || $slaves[$i].sexualQuirk == "tease" || $slaves[$i].sexualQuirk == "perverted") && (_recruiterRelation.energy > 60 || _recruiterRelation.sexualQuirk == "tease" || _recruiterRelation.sexualQuirk == "perverted")>> <<set _seed += 6, _FSmatch++, $arcologies[0].FSEgyptianRevivalist += 0.02*$FSSingleSlaveRep>> <</if>> @@ -658,7 +658,7 @@ She is able to smartly <<if $arcologies[0].FSPaternalist != "unset">>answer<<els <<if $familyTesting == 1>> <<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<if totalRelatives($slaves[$i]) > 0>> - <<if _recruiterRelation != 0>> + <<if def _recruiterRelation>> <<if _recruiterRelation.mother == $slaves[$i].ID || _recruiterRelation.father == $slaves[$i].ID>> <<set $relationType = "daughter">> <<elseif $slaves[$i].mother == _recruiterRelation.ID>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index ac403f6ac034703c3c4622ecadec4309673f69a5..a6efe4992fb46489510fea8667af8f6438e7dfe4 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -602,7 +602,7 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg is -1>><< <</if>> <</if>> <<if $incubator > 0>> -<<if $activeSlave.pregType < 50 && $activeSlave.preg > 3>> +<<if $activeSlave.pregType < 50 && $activeSlave.preg > 3 && $activeSlave.eggType == "human">> <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>> <<else>> <br>