diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index a94cb6cee5150f58cdfa8d6082025e43ed8ecbf7..c94e19783e341c49b933200b41a89e9d08b9af4b 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2569,6 +2569,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr <br>''anon'' for head pats. What's next? Handholding? Consensual sex in the missionary position for the sole purpose of reproduction? <br>''anon'' for Physical Idealist's beauty standard. <br>''anon'' for Gender Radicalist's trap preference. +<br>''anonNeo'' for spellchecking. <br>''Bane70'' optimized huge swaths of code with notable professionalism. <br>''Circle Tritagonist'' provided several new collars and outfits. <br>''Qotsafan'' submitted bugfixes. diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index 2510588f68c82e4de4542fce49c065d87a21422b..4e0174cd618c8105d7f7d5b19101ddfbf8127182 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -1133,11 +1133,11 @@ Release rules: _Slave.releaseRules. @@ @@.red; <<if _Slave.hips < -1>> -<<if _Slave.butt > 2 && $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if _Slave.butt > 2 && ($arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disp <</if>> <<elseif _Slave.hips < 0>> -<<if _Slave.butt > 4 && $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if _Slave.butt > 4 && $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disp <</if>> <<elseif _Slave.hips > 2>> @@ -1150,7 +1150,7 @@ Release rules: _Slave.releaseRules. <</if>> <<elseif _Slave.hips > 0>> <<if _Slave.butt > 8>> -<<if $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disp <</if>> <<elseif _Slave.butt <= 2>> @@ -1158,7 +1158,7 @@ Release rules: _Slave.releaseRules. <</if>> <<else>> <<if _Slave.butt > 6>> -<<if $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disp <</if>> <<elseif _Slave.butt <= 1>> @@ -1359,11 +1359,11 @@ _Slave.faceShape face. @@ @@.red; <<if _Slave.hips < -1>> -<<if _Slave.butt > 2 && $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if _Slave.butt > 2 && $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disproportionately big butt. <</if>> <<elseif _Slave.hips < 0>> -<<if _Slave.butt > 4 && $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if _Slave.butt > 4 && $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disproportionately big butt. <</if>> <<elseif _Slave.hips > 2>> @@ -1376,7 +1376,7 @@ _Slave.faceShape face. <</if>> <<elseif _Slave.hips > 0>> <<if _Slave.butt > 8>> -<<if $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disproportionately big butt. <</if>> <<elseif _Slave.butt <= 2>> @@ -1384,7 +1384,7 @@ _Slave.faceShape face. <</if>> <<else>> <<if _Slave.butt > 6>> -<<if $arcologies[0].FSTransformationFetishist < 20 && $arcologies[0].FSHedonisticDecadence < 20>> +<<if $arcologies[0].FSTransformationFetishist < 20 || $arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSHedonisticDecadence < 20 || $arcologies[0].FSHedonisticDecadence == "unset")>> Disproportionately big butt. <</if>> <<elseif _Slave.butt <= 1>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 6c5186493f73c67fd6333a0b6be74d8d02c3a3a0..c7889866868df29b06e9f5dd121b6c1b1aacfe67 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -4749,7 +4749,7 @@ You tell her kindly that you understand, and that she'll be trained to address t <<case "loli">> midget," <<case "preggololi">> - little <<s>>lut," + <<s>>lut loli," <<case "angel">> turkey," <<case "cherub">> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 4c3217b6fcda69aa266d6fb85679c8bb27eb9318..a283f633a6651abcf88dfd7a43748133cf74ffdf 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1139,9 +1139,12 @@ <</if>> <<if _SlaveI.preg > 0>> <<if _SlaveI.pregSource == $relation.ID>> - <<if _SlaveI.origin == "She offered herself to you for enslavement hoping you would preserve her incestuous relationship with her sibling." || _SlaveI.origin == "She offered to become your slave to protect her incestuous relationship.">> + <<if _SlaveI.origin == "She offered herself to you for enslavement hoping you would preserve her incestuous relationship with her sibling.">> She's @@.hotpink;overjoyed@@ to be carrying her sister's child. <<set _SlaveI.devotion += 2>> + <<elseif _SlaveI.origin == "She offered to become your slave to protect her incestuous relationship.">> + She's @@.hotpink;overjoyed@@ to be carrying her <<print $relationType>>'s child. + <<set _SlaveI.devotion += 2>> <<elseif _SlaveI.sexualQuirk == "perverted">> She's even @@.hotpink;aroused@@ by the constant awareness that her $relationType is the parent of the daughter she's carrying. <<set _SlaveI.devotion += 1>>