diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js index f6b912922e2d06e641bdb93fd21a7f09a2d6c867..34159b977d15c480b5bdf1b1cc34236fe91b9c24 100644 --- a/src/js/extendedFamilyModeJS.js +++ b/src/js/extendedFamilyModeJS.js @@ -403,7 +403,7 @@ window.relativeTerm = return "mother"; } else if (slave1.father === slave2.ID) { return "father"; - } else if (areSisters(slave2, slave1)) { + } else if (areSisters(slave2, slave1) === 1) { if (slave2.genes === "XY" && State.variables.diversePronouns) { return "twin brother"; } else { diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw index 9c17a50ca0a626e51a0843298f5e8c32c5ebd735..fa7bf8037bbdf45ad5662bfba382f2fb229bb5e6 100644 --- a/src/uncategorized/arcologyDescription.tw +++ b/src/uncategorized/arcologyDescription.tw @@ -662,7 +662,6 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el a slave successfully rapes <</if>> in gladiatorial combat. - <</if>> /% End: mod to remove mention of gladiators dying if inappropriate. %/ <<elseif $arcologies[0].FSAztecRevivalistDecoration >= 80>> The sound of prayer and chanting echoes across the space, briefly accompanied by a sacrifice's <<if $arcologies[0].FSPaternalist != "unset">>moaning<<else>>last scream<</if>> as the rite completes. diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 8a2aaaf47771b728a2b945f0455ec87a8edc0aa0..dba2a5b22e19475e640a4d1a71b0be09f5541839 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1468,6 +1468,7 @@ $He has Deal with $his hair: +<<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>> <br> <<if $activeSlave.bald == 0 && $activeSlave.hStyle != "bald">> $He naturally grows $activeSlave.origHColor hair from $his head. @@ -1484,7 +1485,7 @@ Deal with $his hair: <</if>> <br> <<if ($activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless") || ($activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless")>> - $He <<if $activeSlave.physicalAge >= 12>>naturally grows<<else>>will someday grow<</if>> $activeSlave.origHColor body hair. + $He <<if $activeSlave.physicalAge >= _pubertyAge>>naturally grows<<elseif $activeSlave.physicalAge >= _pubertyAge-1>>is beginning to grow<<else>>will someday grow<</if>> $activeSlave.origHColor body hair. [["Surgically remove " + $his + " ability to grow body hair"|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$surgeryType = "body hair removal"]] <<else>> $His $activeSlave.skin skin is silky smooth and hair free from $his neck to $his <<if !hasAnyLegs($activeSlave)>>hips<<else>>toes<</if>>. diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index b19a1ec39a22f665a978ab71f350aa2adfc4bc1c..b948a14ce18ec3fd8d41426a521b77a7af9f6041 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -837,10 +837,13 @@ Dye or paint: /* PUBIC HAIR */ -<<if $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless" && $activeSlave.physicalAge >= 12>> +<<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>> +<<if $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless" && $activeSlave.physicalAge >= _pubertyAge-1>> <br><br>$His - <<if $activeSlave.pubicHStyle == "in a strip">> + <<if $activeSlave.physicalAge < _pubertyAge>> + wispy pubic hair, which is just starting to grow in, + <<elseif $activeSlave.pubicHStyle == "in a strip">> pubic hair, which is shaved into a strip, <<else>> $activeSlave.pubicHStyle pubic hair @@ -898,16 +901,21 @@ Dye or paint: | [[Bushy in the front|Salon][$activeSlave.pubicHStyle = "bushy in the front and neat in the rear",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Bushy|Salon][$activeSlave.pubicHStyle = "bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Very Bushy|Salon][$activeSlave.pubicHStyle = "very bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] - + <<else>> <br><br>$His groin is completely hairless. <</if>> /* UNDERARM HAIR */ -<<if $activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless" && $activeSlave.physicalAge >= 12>> +<<if $activeSlave.underArmHStyle != "bald" && $activeSlave.underArmHStyle != "hairless" && $activeSlave.physicalAge >= _pubertyAge-1>> - <br><br>$His $activeSlave.underArmHStyle underarm hair + <br><br>$His + <<if $activeSlave.physicalAge < _pubertyAge>> + wispy underarm hair + <<else>> + $activeSlave.underArmHStyle underarm hair + <</if>> <<if $activeSlave.underArmHStyle == "waxed">> would be $activeSlave.underArmHColor if present. <<else>>