From e9ca4602ca4e6958ad65018c0270685c1341e681 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sun, 4 Nov 2018 14:36:37 -0500 Subject: [PATCH] pronoun work and condensed about 4 for loops in dairyReport.tw --- src/uncategorized/RETS.tw | 2 +- src/uncategorized/addCustomDescriptors.tw | 76 +++---- src/uncategorized/arcadeReport.tw | 4 +- src/uncategorized/assistantEvents.tw | 3 +- src/uncategorized/attendantSelect.tw | 3 +- src/uncategorized/bgSelect.tw | 3 +- src/uncategorized/brothelReport.tw | 68 +++--- src/uncategorized/cellblockReport.tw | 46 ++-- src/uncategorized/clinicReport.tw | 68 +++--- src/uncategorized/clubReport.tw | 24 +- src/uncategorized/concubineSelect.tw | 3 +- src/uncategorized/dairy.tw | 26 ++- src/uncategorized/dairyReport.tw | 258 +++++++++++++--------- 13 files changed, 338 insertions(+), 246 deletions(-) diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index 0d0292525d0..f535a5ae6a5 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -1166,7 +1166,7 @@ $he adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of <<else>> _He2 orgasms powerfully, _his2 abs tightening. When $activeSlave.slaveName lets _him2 up, <</if>> - _he2 looks pleased with _himself, and @@.mediumaquamarine;a little more confident,@@ too. + _he2 looks pleased with _himself2, and @@.mediumaquamarine;a little more confident,@@ too. <<set $subSlave.devotion += 2, $subSlave.trust += 2, $subSlave.analCount++>> <<set $analTotal++>> <<set $activeSlave.penetrativeCount++>> diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw index b0807898274..350709a4dd7 100644 --- a/src/uncategorized/addCustomDescriptors.tw +++ b/src/uncategorized/addCustomDescriptors.tw @@ -7,33 +7,33 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo <br><br> <<if $activeSlave.devotion >= -50>> - <<if $activeSlave.customTitle != "">>You have instructed her to always refer to you as $activeSlave.customTitle, which, should she lisp, comes out as $activeSlave.customTitleLisp<<else>>You expect her to refer to you as all your other slaves do<</if>>. + <<if $activeSlave.customTitle != "">>You have instructed $him to always refer to you as $activeSlave.customTitle, which, should $he lisp, comes out as $activeSlave.customTitleLisp<<else>>You expect $him to refer to you as all your other slaves do<</if>>. <br> <span id="result"> <<if $activeSlave.customTitle == "">> - <<link "Set a custom title for her to address you as">> + <<link "Set a custom title for $him to address you as">> <<replace "#result">> Custom title: <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>> <<link "Apply">> <<replace "#result">> - She'll try her best to call you $activeSlave.customTitle. + $He'll try $his best to call you $activeSlave.customTitle. <<set $activeSlave.customTitleLisp = lispReplace($activeSlave.customTitle)>> <</replace>> <</link>> <</replace>> <</link>> <<else>> - She's trying her best to call you <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>> + $He's trying $his best to call you <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>> <br> <<link "Apply">> <<replace "#result">> - She'll try her best to call you $activeSlave.customTitle. + $He'll try $his best to call you $activeSlave.customTitle. <<set $activeSlave.customTitleLisp = lispReplace($activeSlave.customTitle)>> <</replace>> <</link>> | <<link "Stop using a custom title">> <<replace "#result">> - She will no longer refer to you with a special title. + $He will no longer refer to you with a special title. <<set $activeSlave.customTitle = "">> <<set $activeSlave.customTitleLisp = "">> <</replace>> @@ -41,39 +41,39 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo <</if>> </span> <<else>> - //You must break her will further before she will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $activeSlave.customTitleLisp && $activeSlave.customTitleLisp != "">> For now, she intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if def $activeSlave.customTitle && $activeSlave.customTitle != "">> For now, she intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>// + //You must break $his will further before $he will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $activeSlave.customTitleLisp && $activeSlave.customTitleLisp != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if def $activeSlave.customTitle && $activeSlave.customTitle != "">> For now, $he intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>// <</if>> <br><br> <<if ((($activeSlave.devotion >= -50) || ($activeSlave.trust < -20)) && ($activeSlave.birthName != $activeSlave.slaveName)) || (($activeSlave.devotion > 20) || ($activeSlave.trust < -20))>> - Change her given name<<if $activeSlave.birthName != $activeSlave.slaveName>> (her birth name was $activeSlave.birthName)<</if>>: <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "Rename">> - <<link "Restore her birth name">><<set $activeSlave.slaveName = $activeSlave.birthName>><<goto "Rename">><</link>> + Change $his given name<<if $activeSlave.birthName != $activeSlave.slaveName>> ($his birth name was $activeSlave.birthName)<</if>>: <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "Rename">> + <<link "Restore $his birth name" "Rename">><<set $activeSlave.slaveName = $activeSlave.birthName>><</link>> <<if $arcologies[0].FSPastoralist != "unset">> - <<if $activeSlave.lactation > 0>> - | <<link "Give her a random cow given name">><<set $activeSlave.slaveName = setup.cowSlaveNames.random()>><<goto "Rename">><</link>> - <</if>> + <<if $activeSlave.lactation > 0>> + | <<link "Give $him a random cow given name" "Rename">><<set $activeSlave.slaveName = setup.cowSlaveNames.random()>><</link>> + <</if>> <</if>> <<if $arcologies[0].FSChattelReligionist != "unset">> - | <<link "Give her a random devotional given name">><<set $activeSlave.slaveName = setup.chattelReligionistSlaveNames.random()>><<goto "Rename">><</link>> + | <<link "Give $him a random devotional given name" "Rename">><<set $activeSlave.slaveName = setup.chattelReligionistSlaveNames.random()>><</link>> <</if>> <br><br> - Change her surname<<if $activeSlave.birthSurname != $activeSlave.slaveSurname>> (her birth surname was $activeSlave.birthSurname)<</if>>: + Change $his surname<<if $activeSlave.birthSurname != $activeSlave.slaveSurname>> ($his birth surname was $activeSlave.birthSurname)<</if>>: <<if $activeSlave.slaveSurname>> <<textbox "$activeSlave.slaveSurname" $activeSlave.slaveSurname "Rename">> <<else>> <<textbox "$activeSlave.slaveSurname" "" "Rename">> <</if>> - <<link "Restore her birth surname">><<set $activeSlave.slaveSurname = $activeSlave.birthSurname>><<goto "Rename">><</link>> + <<link "Restore $his birth surname" "Rename">><<set $activeSlave.slaveSurname = $activeSlave.birthSurname>><</link>> <<if $activeSlave.slaveSurname>> - | <<link "Take her surname away">><<set $activeSlave.slaveSurname = 0>><<goto "Rename">><</link>> + | <<link "Take $his surname away" "Rename">><<set $activeSlave.slaveSurname = 0>><</link>> <</if>> <<if $activeSlave.relationship >= 5>> <<for _i = 0; _i < $slaves.length; _i++>> <<if $activeSlave.relationshipTarget == $slaves[_i].ID>> <<if $slaves[_i].slaveSurname>> <<if $activeSlave.slaveSurname != $slaves[_i].slaveSurname>> - | <<link "Give her her wife's surname">><<set $activeSlave.slaveSurname = $slaves[_i].slaveSurname>><<goto "Rename">><</link>> + | <<link "Give $him $his wife's surname" "Rename">><<set $activeSlave.slaveSurname = $slaves[_i].slaveSurname>><</link>> <<break>> <</if>> <</if>> @@ -83,76 +83,76 @@ You may enter custom descriptors for your slave's hair color, hair style, tattoo <<if $activeSlave.relationship == -3>> <<if $PC.surname>> <<if $activeSlave.slaveSurname != $PC.surname>> - | <<link "Give her your surname">><<set $activeSlave.slaveSurname = $PC.surname>><<goto "Rename">><</link>> + | <<link "Give $him your surname" "Rename">><<set $activeSlave.slaveSurname = $PC.surname>><</link>> <</if>> <</if>> <</if>> <<if $arcologies[0].FSRomanRevivalist != "unset">> - | <<link "Give her a random full Roman name">><<set $activeSlave.slaveName = setup.romanSlaveNames.random(), $activeSlave.slaveSurname = setup.romanSlaveSurnames.random()>><<goto "Rename">><</link>> + | <<link "Give $him a random full Roman name" "Rename">><<set $activeSlave.slaveName = setup.romanSlaveNames.random(), $activeSlave.slaveSurname = setup.romanSlaveSurnames.random()>><</link>> <<elseif $arcologies[0].FSAztecRevivalist != "unset">> - | <<link "Give her a random full Aztec name">><<set $activeSlave.slaveName = setup.aztecSlaveNames.random(), $activeSlave.slaveSurname = 0>><<goto "Rename">><</link>> + | <<link "Give $him a random full Aztec name" "Rename">><<set $activeSlave.slaveName = setup.aztecSlaveNames.random(), $activeSlave.slaveSurname = 0>><</link>> <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">> - | <<link "Give her a random full ancient Egyptian name">><<set $activeSlave.slaveName = setup.ancientEgyptianSlaveNames.random(), $activeSlave.slaveSurname = 0>><<goto "Rename">><</link>> + | <<link "Give $him a random full ancient Egyptian name" "Rename">><<set $activeSlave.slaveName = setup.ancientEgyptianSlaveNames.random(), $activeSlave.slaveSurname = 0>><</link>> <<elseif $arcologies[0].FSEdoRevivalist != "unset">> - | <<link "Give her a random full feudal Japanese name">><<set $activeSlave.slaveName = setup.edoSlaveNames.random(), $activeSlave.slaveSurname = setup.edoSlaveSurnames.random()>><<goto "Rename">><</link>> + | <<link "Give $him a random full feudal Japanese name" "Rename">><<set $activeSlave.slaveName = setup.edoSlaveNames.random(), $activeSlave.slaveSurname = setup.edoSlaveSurnames.random()>><</link>> <</if>> <<if $arcologies[0].FSDegradationist > -1>> - | <<link "Give her a degrading full name">><<run DegradingName($activeSlave)>><<goto "Rename">><</link>> + | <<link "Give $him a degrading full name" "Rename">><<run DegradingName($activeSlave)>><</link>> <</if>> <<else>> - //You must break her will further before you can successfully force a new name on her.// + //You must break $his will further before you can successfully force a new name on $him.// <</if>> <br><br> <<switch $activeSlave.hStyle>> <<case "tails" "dreadlocks" "cornrows">> -Her hair is in $activeSlave.hStyle. +$His hair is in $activeSlave.hStyle. <<case "ponytail">> -Her hair is in a $activeSlave.hStyle. +$His hair is in a $activeSlave.hStyle. <<default>> -Her hair is $activeSlave.hStyle. +$His hair is $activeSlave.hStyle. <</switch>> Custom hair description: <<textbox "$activeSlave.hStyle" $activeSlave.hStyle "Add custom descriptors">> <br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'back in a ponytail'// <br><br> -Her hair is $activeSlave.hColor in color. +$His hair is $activeSlave.hColor in color. Custom hair color: <<textbox "$activeSlave.hColor" $activeSlave.hColor "Add custom descriptors">> <br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'black with purple highlights'// <br><br> <<if $activeSlave.eyeColor != $activeSlave.origEye>> - She is wearing $activeSlave.eyeColor lenses. + $He is wearing $activeSlave.eyeColor lenses. <<else>> - She has $activeSlave.eyeColor eyes. + $He has $activeSlave.eyeColor eyes. <</if>> Custom eye color: <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "Add custom descriptors">> <br> //For best results, use a short, uncapitalized and unpunctuated description; for example: 'blue'// <br><br> -Change her custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Add custom descriptors">> <br> //For best results, use complete sentences; for example: 'She has blue stars tattooed along her cheekbones.'// +Change $his custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Add custom descriptors">> <br> //For best results, use complete sentences; for example: 'She has blue stars tattooed along her cheekbones.'// <br><br> -Change her origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "Add custom descriptors">> +Change $his origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "Add custom descriptors">> <br> //For best results, use complete, capitalized and punctuated sentences; for example: 'She followed you home from the pet store.'// <br><br> -Change her custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "Add custom descriptors">> +Change $his custom description: <<textbox "$activeSlave.customDesc" $activeSlave.customDesc "Add custom descriptors">> <br> //For best results, use complete, capitalized and punctuated sentences; for example: 'She has a beauty mark above her left nipple.'// <br><br> -Change her custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "Add custom descriptors">> +Change $his custom label: <<textbox "$activeSlave.customLabel" $activeSlave.customLabel "Add custom descriptors">> <br> //For best results, use a short phrase; for example: 'Breeder.'// <br><br> <<if ndef $activeSlave.customImage>><<set $activeSlave.customImage = 0>><</if>> -Assign her a custom image: +Assign $him a custom image: <<if $activeSlave.customImage != 0>> <<textbox "$activeSlave.customImage" $activeSlave.customImage "Add custom descriptors">> <<else>> <<textbox "$activeSlave.customImage" "" "Add custom descriptors">> <</if>> -<<link "Reset">><<set $activeSlave.customImage = 0, $activeSlave.customImageFormat = "png">><<goto "Add custom descriptors">><</link>> +<<link "Reset" "Add custom descriptors">><<set $activeSlave.customImage = 0, $activeSlave.customImageFormat = "png">><</link>> <br> //File must be in// <tt><select id="customImageFormatSelector" style="border: none;"><option value="png">PNG</option><option value="jpg">JPG</option><option value="gif">GIF</option><option value="webm">WEBM</option></select></tt> //format. Place file in the \resources folder. Enter the filename without the extension. For example, for a file with the path// <tt>\bin\resources\headgirl.<span id="customImageFormatValue">png</span></tt>, //enter //<tt>headgirl</tt>. <<script>> jQuery(function() { @@ -168,11 +168,11 @@ jQuery(function() { <<if $seeImages == 1 && $imageChoice == 1>> <br><br> <<if ndef $activeSlave.customHairVector>><<set $activeSlave.customHairVector = 0>><</if>> - Assign her a custom hair SVG image: + Assign $him a custom hair SVG image: <<if $activeSlave.customHairVector != 0>> <<textbox "$activeSlave.customHairVector" $activeSlave.customHairVector "Add custom descriptors">> <<else>> <<textbox "$activeSlave.customHairVector" "" "Add custom descriptors">> <</if>> - <<link "Reset">><<set $activeSlave.customHairVector = 0>><<goto "Add custom descriptors">><</link>> + <<link "Reset" "Add custom descriptors">><<set $activeSlave.customHairVector = 0>><</link>> <</if>> \ No newline at end of file diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw index 3035e0e49c1..34edfde6d53 100644 --- a/src/uncategorized/arcadeReport.tw +++ b/src/uncategorized/arcadeReport.tw @@ -27,6 +27,7 @@ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$ArcadeiIDs[_dI]]>> + <<setLocalPronouns $slaves[$i]>> /* Perform facility based rule changes */ <<set $slaves[$i].clothes = "no clothing">> @@ -228,7 +229,8 @@ <<elseif _Con > -1>> <<set $activeSlave = $slaves[_Con]>> <</if>> - <br> $activeSlave.slaveName is low-quality and surplus to the needs of the arcade, so she has been converted into a Fuckdoll. + <<setLocalPronouns $activeSlave>> + <br> $activeSlave.slaveName is low-quality and surplus to the needs of the arcade, so $he has been converted into a Fuckdoll. <<include "Remove activeSlave">> <<if $activeSlave == 0>> /% if not zero then technically there was an error INVALID SLAVE %/ <<set $fuckdolls++, _SL-->> diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw index 78932083516..fafe1d9f27e 100644 --- a/src/uncategorized/assistantEvents.tw +++ b/src/uncategorized/assistantEvents.tw @@ -40,7 +40,8 @@ One morning, after seeing to an immense pile of business with $assistantName pro <<break>> <</if>> <</for>> -One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. She's become very helpful monitoring, training, and disciplining slaves. Tonight, she's added an unmistakable tone of sexual satiation in her voice. "<<= properTitle()>>, I enjoyed my duties today," she purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked her earlier?" That's how she refers to a slave having one of the penthouse's advanced sex toys used on her, since $assistantName controls them. +<<setLocalPronouns $activeSlave>> +One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. She's become very helpful monitoring, training, and disciplining slaves. Tonight, she's added an unmistakable tone of sexual satiation in her voice. "<<= properTitle()>>, I enjoyed my duties today," she purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked $him earlier?" That's how she refers to a slave having one of the penthouse's advanced sex toys used on $him, since $assistantName controls them. <br><br> She continues more seriously, <<if _smartPiercings == 0>> diff --git a/src/uncategorized/attendantSelect.tw b/src/uncategorized/attendantSelect.tw index 0073f42da6e..77c148e8886 100644 --- a/src/uncategorized/attendantSelect.tw +++ b/src/uncategorized/attendantSelect.tw @@ -3,7 +3,8 @@ <<set $nextButton = "Back", $nextLink = "Spa", $showEncyclopedia = 1, $encyclopedia = "Attendant">> <<showallAssignmentFilter>> <<if ($Attendant != 0)>> - ''__@@.pink;<<= SlaveFullName($Attendant)>>@@__'' is serving as your Attendant.<br><br>She will help pamper and counsel your slaves. + <<setLocalPronouns $Attendant>> + ''__@@.pink;<<= SlaveFullName($Attendant)>>@@__'' is serving as your Attendant.<br><br>$He will help pamper and counsel your slaves. <<else>> You have not selected an Attendant. <</if>> diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw index 2c003271d03..f500a46ffa0 100644 --- a/src/uncategorized/bgSelect.tw +++ b/src/uncategorized/bgSelect.tw @@ -3,7 +3,8 @@ <<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Bodyguard">> <<showallAssignmentFilter>> <<if ($Bodyguard != 0)>> - ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>She will remain close to you at all times and guard your person. + <<setLocalPronouns $Bodyguard>> + ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard.<br><br>$He will remain close to you at all times and guard your person. <<else>> You have not selected a bodyguard. <</if>> diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw index 82be24245e0..ff651eb0c1c 100644 --- a/src/uncategorized/brothelReport.tw +++ b/src/uncategorized/brothelReport.tw @@ -46,18 +46,19 @@ /% Make sure we have registered living expenses as for any other slave %/ <<run getSlaveStatisticData($Madam, $facility.brothel)>> <<set $Madam = $slaves[_FLs]>> + <<setLocalPronouns $Madam>> <<= SlaveFullName($Madam)>> is serving as the Madam. <<if $Madam.relationship == -3 && $Madam.devotion > 50>> - As your loving wife, she does her best to attract attention to your brothel. + As your loving wife, $he does $his best to attract attention to your brothel. <<set $madamCashBonus += 0.25>> <</if>> <<if (_FLsFetish == 1)>> - She isn't above sampling the merchandise herself; before long it's obvious to her girls that she @@.lightcoral;really likes fucking them.@@ + $He isn't above sampling the merchandise herself; before long it's obvious to $his girls that $he @@.lightcoral;really likes fucking them.@@ <<elseif (_FLsFetish == 2)>> - She's careful that all of the whores under her supervision are all warmed up and ready to get fucked every morning, and she @@.lightsalmon;becomes more dominant.@@ + $He's careful that all of the whores under $his supervision are all warmed up and ready to get fucked every morning, and $he @@.lightsalmon;becomes more dominant.@@ <</if>> <<if ($Madam.whoreSkill <= 10)>> - Though $Madam.slaveName does her best to manage the brothel, with her lack of skill she can do little. + Though $Madam.slaveName does $his best to manage the brothel, with $his lack of skill $he can do little. <<elseif ($Madam.whoreSkill <= 30)>> $Madam.slaveName's basic skills marginally @@.yellowgreen;improve@@ business at $brothelName. <<set $madamCashBonus += 0.05>> @@ -72,32 +73,32 @@ <<set $madamCashBonus += 0.20>> <</if>> <<if ($Madam.actualAge > 35)>> - Her age and experience also contribute. + $His age and experience also contribute. <<set $madamCashBonus += 0.05>> <<elseif $AgePenalty == 0>> <<set $madamCashBonus += 0.05>> <</if>> <<if setup.madamCareers.includes($Madam.career)>> - She has experience from her life before she was a slave that helps her in the seedy business of selling other people's bodies for sex. + $He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex. <<set $madamCashBonus += 0.05>> <<elseif $Madam.skillMD >= $masteredXP>> - She has experience from working for you that helps her in the seedy business of selling other people's bodies for sex. + $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex. <<set $madamCashBonus += 0.05>> <<else>> <<set $slaves[_FLs].skillMD += random(1,Math.ceil(($Madam.intelligence+$Madam.intelligenceImplant)/15) + 8)>> <</if>> <<if ($Madam.intelligence+$Madam.intelligenceImplant > 15)>> - She is a clever manager. + $He is a clever manager. <<set $madamCashBonus += 0.05*Math.floor(($Madam.intelligence+$Madam.intelligenceImplant)/32)>> <</if>> <<if ($Madam.dick > 2) && (canPenetrate($Madam))>> - Her turgid dick helps her manage the bitches. + $His turgid dick helps $him manage the bitches. <<set $madamCashBonus += 0.05>> <</if>> <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$BrothiIDs[_dI]]>> <<if $Madam.rivalryTarget == $slaves[$i].ID>> - She forces her <<print rivalryTerm($Madam)>>, to service all the men in the brothel. + $He forces $his <<print rivalryTerm($Madam)>>, to service all the men in the brothel. <<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 2>> <<if canDoVaginal($slaves[$i])>> <<set $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> @@ -113,62 +114,70 @@ <<set $slaves[_FLs].rivalry++, $Madam.rivalry++, $slaves[$i].rivalry++>> <</if>> <<elseif $Madam.relationshipTarget == $slaves[$i].ID>> - She dotes over her <<print relationshipTerm($Madam)>>, $slaves[$i].slaveName, making sure she is safe, but unfortunately driving potential customers away from her. + <<setLocalPronouns $slaves[$i] 2>> + $He dotes over $his <<print relationshipTerm($Madam)>>, $slaves[$i].slaveName, making sure _he2 is safe, but unfortunately driving potential customers away from _him2. <<set $slaves[$i].devotion++, $madamCashBonus -= 0.05>> <<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>> - She pays special attention to her <<print relativeTerm($Madam.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure she is treated well and showing off her skills. + <<setLocalPronouns $slaves[$i] 2>> + $He pays special attention to $his <<print relativeTerm($Madam.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure _he2 is treated well and showing off _his2 skills. <<set $slaves[$i].trust++, $madamCashBonus += 0.05>> <<elseif $Madam.relationTarget == $slaves[$i].ID && $familyTesting == 0>> - She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she is treated well and showing off her skills. + <<setLocalPronouns $slaves[$i] 2>> + $He pays special attention to $his $slaves[$i].relation, $slaves[$i].slaveName, making sure _he2 is treated well and showing off _his2 skills. <<set $slaves[$i].trust++, $madamCashBonus += 0.05>> <</if>> <<if $slaves[$i].prestigeDesc == "She is a famed Free Cities whore, and commands top prices.">> - She makes sure to promote $slaves[$i].slaveName, the famed whore, in order to capitalize on her popularity. + <<setLocalPronouns $slaves[$i] 2>> + $He makes sure to promote $slaves[$i].slaveName, the famed whore, in order to capitalize on _his2 popularity. <<set $madamCashBonus += 0.15>> <<elseif $slaves[$i].prestigeDesc == "She is a famed Free Cities slut, and can please anyone.">> - She makes sure to promote $slaves[$i].slaveName, the famed entertainer, in order to capitalize on her popularity. + <<setLocalPronouns $slaves[$i] 2>> + $He makes sure to promote $slaves[$i].slaveName, the famed entertainer, in order to capitalize on _his2 popularity. <<set $madamCashBonus += 0.15>> <<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">> + <<setLocalPronouns $slaves[$i] 2>> <<if ($arcologies[0].FSPhysicalIdealist != "unset")>> <<if ($slaves[$i].muscles > 60) && ($slaves[$i].weight < 30) && ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>> - She shows off how even a cow like $slaves[$i].slaveName can achieve physical perfection. + $He shows off how even a cow like $slaves[$i].slaveName can achieve physical perfection. <<set $madamCashBonus += 0.15>> <<else>> - A<<if ($slaves[$i].muscles < 30)>>n unmuscled,<</if>><<if ($slaves[$i].weight > 30)>> fat,<</if>> 'prestigious' <<if ($slaves[$i].lactation > 0)>>cow<<elseif (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>mass of titflesh<<else>>slave<</if>> like $slaves[$i].slaveName is woefully out of fashion, so $Milkmaid.slaveName tries to draw attention away from her. + A<<if ($slaves[$i].muscles < 30)>>n unmuscled,<</if>><<if ($slaves[$i].weight > 30)>> fat,<</if>> 'prestigious' <<if ($slaves[$i].lactation > 0)>>cow<<elseif (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>mass of titflesh<<else>>slave<</if>> like $slaves[$i].slaveName is woefully out of fashion, so $Milkmaid.slaveName tries to draw attention away from _him2. <</if>> <<else>> <<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>> - She makes sure to massage $slaves[$i].slaveName's huge breasts to get the milk flowing before enticing clients to suckle and play with her. + $He makes sure to massage $slaves[$i].slaveName's huge breasts to get the milk flowing before enticing clients to suckle and play with _him2. <<set $madamCashBonus += 0.10>> <<else>> - She would like to show off $slaves[$i].slaveName's huge udders, but $slaves[$i].slaveName <<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>> doesn't exactly have huge udders anymore. <</if>> + $He would like to show off $slaves[$i].slaveName's huge udders, but $slaves[$i].slaveName <<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>> doesn't exactly have huge udders anymore. <</if>> <</if>> <</if>> <<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">> - <<if $arcologies[0].FSGenderFundamentalist != "unset">> + <<setLocalPronouns $slaves[$i] 2>> + <<if $arcologies[0].FSGenderFundamentalist != "unset">> /* this needs review - doesn't fit right. An XY slave would be expected to be masculine. */ <<if ($slaves[$i].balls == 0) && ($slaves[$i].dick == 0) && ($slaves[$i].vagina > -1)>> - She uses $slaves[$i].slaveName as an example of how even a huge-balled freak like her can be restored to proper femininity. + $He uses $slaves[$i].slaveName as an example of how even a huge-balled freak like _him2 can be restored to proper femininity. <<set $madamCashBonus += 0.20>> <<else>> - She tries to hide $slaves[$i].slaveName, 'her' body being notorious for defiance of conventional femininity. + $He tries to hide $slaves[$i].slaveName, 'her' body being notorious for defiance of conventional femininity. <</if>> <<else>> <<if (($slaves[$i].balls > 5) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>> - She shows off $slaves[$i].slaveName's copious loads by putting a condom over her dick and teasing her till she bursts it. The show draws multiple clients that want to play with her oversized junk and messy orgasms. + $He shows off $slaves[$i].slaveName's copious loads by putting a condom over _his2 dick and teasing _him2 till _he2 bursts it. The show draws multiple clients that want to play with _his2 oversized junk and messy orgasms. <<set $madamCashBonus += 0.15>> <<else>> - She would love to show off $slaves[$i].slaveName's copious loads, but $slaves[$i].slaveName<<if $slaves[$i].dick == 0>> doesn't have a dick.<<elseif $slaves[$i].balls == 0>>'s not producing cum. <<else>>'s orgasms just aren't messy enough. <</if>> + $He would love to show off $slaves[$i].slaveName's copious loads, but $slaves[$i].slaveName<<if $slaves[$i].dick == 0>> doesn't have a dick.<<elseif $slaves[$i].balls == 0>>'s not producing cum. <<else>>'s orgasms just aren't messy enough. <</if>> <</if>> <</if>> <<elseif $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder.">> + <<setLocalPronouns $slaves[$i] 2>> <<if $slaves[$i].bellyPreg >= 5000>> - She makes sure $slaves[$i].slaveName's growing pregnancy is well taken care of, even if it means driving away potential customers away when the mother-to-be needs a rest. + $He makes sure $slaves[$i].slaveName's growing pregnancy is well taken care of, even if it means driving away potential customers away when the mother-to-be needs a rest. <<set $madamCashBonus -= 0.05>> <<elseif canGetPregnant($slaves[$i])>> - She makes sure to play off $slaves[$i].slaveName's fame and fertility by enticing potential customers to be the one to claim her womb by filling it with their child. + $He makes sure to play off $slaves[$i].slaveName's fame and fertility by enticing potential customers to be the one to claim _his2 womb by filling it with their child. <<set $madamCashBonus += 0.15>> <<else>> - She would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately she <<if $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 1500>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 5000>>already pregnant, but not enough to be exciting<<else>>is unable to get knocked up<</if>>. + $He would love to play off of $slaves[$i].slaveName's fame and fertility, but unfortunately _he2 <<if $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 1500>>is already pregnant and not far enough along to show it<<elseif $slaves[$i].pregKnown == 1 && $slaves[$i].bellyPreg < 5000>>already pregnant, but not enough to be exciting<<else>>is unable to get knocked up<</if>>. <</if>> <</if>> <</for>> @@ -186,12 +195,12 @@ <<if (_DL+$slavesGettingHelp < 5)>> <<set $i = _FLs>> /* apply following SA passages to facility leader */ <<if $showEWD != 0>> - <br> She <<include "SA whore">> + <br> $He <<include "SA whore">> <<else>> <<silently>><<include "SA whore">><</silently>> <</if>> <<set _seed = $cash-_oldCash, $cash += Math.trunc(0.5*_seed), _seed = Math.trunc(1.5*_seed), _profits += _seed>> - <br> Since she doesn't have enough whores to manage to keep her busy, she sees $beauty customers herself (<<print Math.trunc($beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>@@. She can charge more for her time, since many citizens find it erotic to fuck the Madam. + <br> Since $he doesn't have enough whores to manage to keep $him busy, $he sees $beauty customers $himself (<<print Math.trunc($beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>@@. $He can charge more for $his time, since many citizens find it erotic to fuck the Madam. <</if>> <</if>> <<if (_DL > 0)>><br><br><</if>> @@ -278,6 +287,7 @@ <<set _oldCash = $cash>> <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$BrothiIDs[_dI]]>> + <<setLocalPronouns $slaves[$i]>> <<if ($legendaryWombID == 0) && ($slaves[$i].amp != 1) && ($slaves[$i].preg > 30) && ($slaves[$i].broodmother == 0) && ($slaves[$i].eggType == "human") && ($slaves[$i].births > 10) && ($slaves[$i].devotion > 50) && ($slaves[$i].prestige == 0)>> <<set $legendaryWombID = $slaves[$i].ID>> <</if>> diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 4f6d70d2f24..caaa84eda15 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -11,6 +11,7 @@ <<if ($Wardeness != 0)>> <<set _FLs = $slaveIndices[$Wardeness.ID]>> + <<setLocalPronouns $Wardeness>> <<if ($slaves[_FLs].health < -80)>> <<set $slaves[_FLs].health += 20>> @@ -49,75 +50,77 @@ <<= SlaveFullName($Wardeness)>> is serving as the Wardeness. <<if $Wardeness.relationship == -3 && $Wardeness.devotion > 50>> <<set _devBonus++, _trustMalus++, _idleBonus++>> - As your wife, she tries her best to break the disobedient slaves to your will. + As your wife, $he tries $his best to break the disobedient slaves to your will. <</if>> <<if (_FLsFetish == 1)>> - One day she demands obedience. The next day she strikes a slave when it isn't given. The next, she seems more excited than embarrassed when beating a prisoner. Soon, she's looking for an excuse to punish. She's @@.pink;become more of a sadist.@@ + One day $he demands obedience. The next day $he strikes a slave when it isn't given. The next, $he seems more excited than embarrassed when beating a prisoner. Soon, $he's looking for an excuse to punish. $He's @@.pink;become more of a sadist.@@ <<elseif (_FLsFetish == 2)>> - Being not only allowed but encouraged to get off while punishing prisoners @@.lightsalmon;deepens her sadism.@@ + Being not only allowed but encouraged to get off while punishing prisoners @@.lightsalmon;deepens $his sadism.@@ <</if>> <<if setup.wardenessCareers.includes($Wardeness.career)>> <<set _devBonus++, _trustMalus++, _idleBonus++>> - She has experience with detecting security issues and grinding down potential miscreants from her life before she was a slave, making her more effective. + $He has experience with detecting security issues and grinding down potential miscreants from $his life before $he was a slave, making $him more effective. <<elseif $Wardeness.skillWA >= $masteredXP>> <<set _devBonus++, _trustMalus++, _idleBonus++>> - She has experience with detecting security issues and grinding down potential miscreants from working for you, making her more effective. + $He has experience with detecting security issues and grinding down potential miscreants from working for you, making $him more effective. <<else>> <<set $slaves[_FLs].skillWA += random(1,Math.ceil(($Wardeness.intelligence+$Wardeness.intelligenceImplant)/15) + 8)>> <</if>> <<if $Wardeness.fetish == "sadist">> - She uses the prisoners to gratify her sadism, terrifying them and quickly breaking their resistance. + $He uses the prisoners to gratify $his sadism, terrifying them and quickly breaking their resistance. <<elseif $Wardeness.energy > 95>> - She is so sexually depraved that she constantly molests the prisoners, breaking them to a life of servitude. + $He is so sexually depraved that $he constantly molests the prisoners, breaking them to a life of servitude. <</if>> <<if $Wardeness.sexualFlaw == "malicious">> <<set _devBonus++, _trustMalus += 2, _idleBonus += 2>> - Sexual abuse of prisoners has become an end for her, not a means. She inspires her prisoners to do everything possible to qualify to get away from her, even as she slowly grinds away their interest in sex to do it. + Sexual abuse of prisoners has become an end for $him, not a means. $He inspires $his prisoners to do everything possible to qualify to get away from $him, even as $he slowly grinds away their interest in sex to do it. <</if>> <<if ($Wardeness.dick > 2) && (canPenetrate($Wardeness))>> <<set _devBonus++, _trustMalus++, _idleBonus++>> - Her molestation of the prisoners is more varied and effective because she has a dick to fuck them with. + $His molestation of the prisoners is more varied and effective because $he has a dick to fuck them with. <</if>> <<if ($Wardeness.muscles > 35)>> <<set _devBonus++, _trustMalus++, _idleBonus++>> - She is strong enough to restrain anyone that tries anything with her own hands. + $He is strong enough to restrain anyone that tries anything with $his own hands. <</if>> <<if ($Wardeness.devotion > 95)>> <<set _devBonus++, _trustMalus++, _idleBonus++>> - Her devotion to you is so absolute that she sees breaking bitches for your service as a noble calling. + $His devotion to you is so absolute that $he sees breaking bitches for your service as a noble calling. <</if>> <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$CellBiIDs[_dI]]>> <<if $Wardeness.rivalryTarget == $slaves[$i].ID>> - She greatly enjoys breaking her <<print rivalryTerm($Wardeness)>>, $slaves[$i].slaveName's will. + $He greatly enjoys breaking $his <<print rivalryTerm($Wardeness)>>, $slaves[$i].slaveName's will. <<set $slaves[$i].devotion++, $slaves[$i].trust -= 3>> <<if random(1,100) > 30>> <<set $Wardeness.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>> <</if>> <<elseif $Wardeness.relationshipTarget == $slaves[$i].ID>> - She hates having to break her <<print relationshipTerm($Wardeness)>>, $slaves[$i].slaveName, but her devotion to you wins out in the end. + $He hates having to break $his <<print relationshipTerm($Wardeness)>>, $slaves[$i].slaveName, but $his devotion to you wins out in the end. <<set $slaves[$i].devotion++, $slaves[$i].trust -= 3>> <<if random(1,100) >= 50>> - Her and $slaves[$i].slaveName's relationship has been shattered by these events. + $His and $slaves[$i].slaveName's relationship has been shattered by these events. <<set $Wardeness.relationship = 0, $Wardeness.relationshipTarget = 0, $slaves[_FLs].relationship = 0, $slaves[_FLs].relationshipTarget = 0, $slaves[$i].relationship = 0, $slaves[$i].relationshipTarget = 0>> <</if>> <<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>> - She shows her <<print relativeTerm($Wardeness.ID,$slaves[$i].ID)>> $slaves[$i].slaveName no mercy, making sure she understands her place. + <<setLocalPronouns $slaves[$i] 2>> + $He shows $his <<print relativeTerm($Wardeness.ID,$slaves[$i].ID)>> $slaves[$i].slaveName no mercy, making sure _he2 understands _his2 place. <<set $slaves[$i].devotion++, $slaves[$i].trust-->> <<elseif $Wardeness.relationTarget == $slaves[$i].ID && $familyTesting == 0>> - She shows her $slaves[$i].relation $slaves[$i].slaveName no mercy, making sure she understands her place. + <<setLocalPronouns $slaves[$i] 2>> + $He shows $his $slaves[$i].relation $slaves[$i].slaveName no mercy, making sure _he2 understands _his2 place. <<set $slaves[$i].devotion++, $slaves[$i].trust-->> <</if>> <</for>> <<if (_DL < $cellblock)>> <<set _seed = random(1,10)+(($cellblock-_DL)*(random(150,170)+(_idleBonus*10))), $cash += _seed>> - <br> Since she doesn't have enough prisoners to manage to keep her busy, she works on citizens' slaves, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@ + <br> Since $he doesn't have enough prisoners to manage to keep $him busy, $he works on citizens' slaves, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@ <</if>> <<if (_DL > 0)>><br><br><</if>> <</if>> <<if (_DL > 0)>> - <<if (_DL == 1)>>''One slave is being confined in $cellblockName until she is willing to obey.''<<else>>''_DL slaves are being confined in $cellblockName until they are willing to obey.''<</if>> + <<if (_DL == 1)>>''One slave is being confined in $cellblockName until they are willing to obey.''<<else>>''_DL slaves are being confined in $cellblockName until they are willing to obey.''<</if>> <</if>> <<if ($Wardeness != 0)>> @@ -158,6 +161,7 @@ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$CellBiIDs[_dI]]>> + <<setLocalPronouns $slaves[$i]>> <<if ($slaves[$i].devotion <= 20)>> <<if ($slaves[$i].trust >= -20)>> <<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2))>> @@ -276,19 +280,19 @@ <<if (_softenedQuirks > 0)>> $cellblockNameCaps's advanced compliance systems successfully softened <<if (_softenedQuirks == 1)>> - one slave's mental flaw into an @@.green;appealing quirk,@@ though the constant correction caused her @@.mediumorchid;considerable anguish.@@ + one slave's mental flaw into an @@.green;appealing quirk,@@ though the constant correction caused them @@.mediumorchid;considerable anguish.@@ <<else>> _softenedQuirks slaves' mental flaws into @@.green;appealing quirks,@@ though the constant correction caused them @@.mediumorchid;considerable anguish.@@ <</if>> <</if>> <<if (_brokenSlaves > 0)>> <<if (_brokenSlaves == 1)>> - One slave is now willing to @@.hotpink;do as she's told@@ and has been released. + One slave is now willing to @@.hotpink;do as they're told@@ and has been released. <<else>> _brokenSlaves slaves are now willing to @@.hotpink;do as they're told@@ and have been released. <</if>> <<if $cellblockDecoration != "standard">> - <br><br> $cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on <<if _brokenSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ imprisoned. + <br><br> $cellblockNameCaps's $cellblockDecoration atmosphere @@.hotpink;had an impact on them while they were@@ imprisoned. <</if>> <</if>> <</if>> diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index da2cbdabf15..068ce849760 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -39,39 +39,40 @@ <</if>> <</if>> <<set $Nurse = $slaves[_FLs]>> + <<setLocalPronouns $Nurse>> <<= SlaveFullName($Nurse)>> is serving as the clinical nurse. <<if $Nurse.relationship == -3 && $Nurse.devotion > 50>> - She does her best to be a caring and nurturing wife. + $He does $his best to be a caring and nurturing wife. <<set _healthBonus += 2>> <</if>> <<if (_FLsFetish == 1)>> - Her job involves giving naked sex slaves orders for their own good. Even though most of these commands are medical rather than sexual, she can be forgiven for not always seeing the difference, and @@.lightsalmon;becomes more dominant.@@ + $His job involves giving naked sex slaves orders for their own good. Even though most of these commands are medical rather than sexual, $he can be forgiven for not always seeing the difference, and @@.lightsalmon;becomes more dominant.@@ <<elseif (_FLsFetish == 2)>> - Every new patient in the clinic is a new target for her authority. @@.lightsalmon;She becomes more dominant.@@ + Every new patient in the clinic is a new target for $his authority. @@.lightsalmon;$He becomes more dominant.@@ <</if>> <<if setup.nurseCareers.includes($Nurse.career)>> - She has experience with medicine from her life before she was a slave, and can often recognize conditions before even the medical scanners can. + $He has experience with medicine from $his life before $he was a slave, and can often recognize conditions before even the medical scanners can. <<set _idleBonus++, _healthBonus++>> <<elseif $Nurse.skillNU >= $masteredXP>> - She has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can. + $He has experience with medicine from working for you, and can often recognize conditions before even the medical scanners can. <<set _idleBonus++, _healthBonus++>> <<else>> <<set $slaves[_FLs].skillNU += random(1,Math.ceil(($Nurse.intelligence+$Nurse.intelligenceImplant)/15) + 8)>> <</if>> <<if ($Nurse.fetish == "dom")>> - She raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions. + $He raps out commands with the confidence of long and partly sexual experience, so patients are inclined to follow even unpleasant medical instructions. <<set _idleBonus++, _healthBonus++>> <</if>> <<if ($Nurse.muscles > 5)>> - She's strong enough to gently but firmly restrain resistant slaves, allowing her to be sparing with the inescapable but less healthy restraints. + $He's strong enough to gently but firmly restrain resistant slaves, allowing $him to be sparing with the inescapable but less healthy restraints. <<set _idleBonus++>> <</if>> <<if ($Nurse.intelligence+$Nurse.intelligenceImplant > 50)>> - The diagnostic equipment is state-of-the-art, but she's smart and perceptive enough that on occasion, she can add meaningfully to its medical scans. + The diagnostic equipment is state-of-the-art, but $he's smart and perceptive enough that on occasion, $he can add meaningfully to its medical scans. <<set _idleBonus++, _healthBonus++>> <</if>> <<if ($Nurse.face > 40)>> - Patients rarely object to seeing her gorgeous face hovering over them. + Patients rarely object to seeing $his gorgeous face hovering over them. <<set _idleBonus++, _devBonus++>> <</if>> <<if ($Nurse.muscles > 5) || ($slaves[_FLs].devotion >= 60)>> @@ -80,31 +81,36 @@ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$CliniciIDs[_dI]]>> <<if $Nurse.rivalryTarget == $slaves[$i].ID>> - She purposefully neglects the needs of her <<print rivalryTerm($Nurse)>>, $slaves[$i].slaveName, hindering her recovery and deepening their dislike for each other. + <<setLocalPronouns $slaves[$i] 2>> + $He purposefully neglects the needs of $his <<print rivalryTerm($Nurse)>>, $slaves[$i].slaveName, hindering _his2 recovery and deepening their dislike for each other. <<set $slaves[$i].devotion--, $slaves[$i].trust--, $slaves[$i].health -= 3>> <<if random(1,100) > 65>> <<set $Nurse.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>> <</if>> <<elseif $Nurse.relationshipTarget == $slaves[$i].ID>> - She dedicates most of her attention to her <<print relationshipTerm($Nurse)>>, $slaves[$i].slaveName, making sure she has everything she needs and more. This lavish attention detracts from her overall effectiveness. + <<setLocalPronouns $slaves[$i] 2>> + $He dedicates most of $his attention to $his <<print relationshipTerm($Nurse)>>, $slaves[$i].slaveName, making sure _he2 has everything _he2 needs and more. This lavish attention detracts from $his overall effectiveness. <<set _idleBonus -= 3, $slaves[$i].devotion++, $slaves[$i].trust++, $slaves[$i].health += 3>> <<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>> - She makes sure to spend extra time caring for her <<print relativeTerm($Nurse.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName. + $He makes sure to spend extra time caring for $his <<print relativeTerm($Nurse.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName. <<set $slaves[$i].trust++, $slaves[$i].health++>> <<elseif $Nurse.relationTarget == $slaves[$i].ID && $familyTesting == 0>> - She makes sure to spend extra time caring for her $slaves[$i].relation, $slaves[$i].slaveName. + $He makes sure to spend extra time caring for $his $slaves[$i].relation, $slaves[$i].slaveName. <<set $slaves[$i].trust++, $slaves[$i].health++>> <</if>> <<switch $slaves[$i].prestigeDesc>> <<case "She is a famed Free Cities whore, and commands top prices.">> - She does her best to aid the famous whore, $slaves[$i].slaveName, making sure to pay special attention to her worn holes. + <<setLocalPronouns $slaves[$i] 2>> + $He does $his best to aid the famous whore, $slaves[$i].slaveName, making sure to pay special attention to _his2 worn holes. <<set $slaves[$i].health += 2>> <<case "She is a famed Free Cities slut, and can please anyone.">> - She does her best to aid the famous entertainer, $slaves[$i].slaveName, making sure she can show off as soon as possible. + <<setLocalPronouns $slaves[$i] 2>> + $He does $his best to aid the famous entertainer, $slaves[$i].slaveName, making sure _he2 can show off as soon as possible. <<set $slaves[$i].health += 2>> <<case "She is remembered for winning best in show as a cockmilker.">> + <<setLocalPronouns $slaves[$i] 2>> <<if ($slaves[$i].balls > 4) && ($slaves[$i].dick != 0)>> - She does her best to aid the dribbling $slaves[$i].slaveName, paying special attention to her huge cock and balls as well as making sure to milk her erect dick hourly. + $He does $his best to aid the dribbling $slaves[$i].slaveName, paying special attention to _his2 huge cock and balls as well as making sure to milk _his2 <<if canAchieveErection($slaves[$i])>>erect <</if>>dick hourly. <<set $slaves[$i].health += 4>> <<if (random(1,100) > 65) && (($Nurse.fetish == "none") || ($Nurse.fetish == "cumslut"))>> <<if $Nurse.fetish == "none">> @@ -115,8 +121,9 @@ <</if>> <</if>> <<case "She is remembered for winning best in show as a dairy cow.">> + <<setLocalPronouns $slaves[$i] 2>> <<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>> - She does her best to aid the leaking $slaves[$i].slaveName, paying special attention to her huge breasts as well as making sure to milk her hourly. + $He does $his best to aid the leaking $slaves[$i].slaveName, paying special attention to _his2 huge breasts as well as making sure to milk _him2 hourly. <<set $slaves[$i].health += 4>> <<if (random(1,100) > 65) && (($Nurse.fetish == "none") || ($Nurse.fetish == "boobs"))>> <<if $Nurse.fetish == "none">> @@ -127,18 +134,20 @@ <</if>> <</if>> <<case "She is remembered for winning best in show as a breeder.">> + <<setLocalPronouns $slaves[$i] 2>> <<if $slaves[$i].bellyPreg >= 1500>> - She does her best to aid the pregnant $slaves[$i].slaveName, paying special attention to her swollen belly and the welfare of the life within. + $He does $his best to aid the pregnant $slaves[$i].slaveName, paying special attention to _his2 swollen belly and the welfare of the life within. <<set $slaves[$i].health += 6>> <<elseif $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>> - She does her best to aid the breeder $slaves[$i].slaveName, paying special attention to her fertility and reproductive organs. + $He does $his best to aid the breeder $slaves[$i].slaveName, paying special attention to _his2 fertility and reproductive organs. <<set $slaves[$i].health += 4>> <<else>> - She lays out plans on how to restore the breeder $slaves[$i].slaveName to her former gravid glory. + $He lays out plans on how to restore the breeder $slaves[$i].slaveName to _his2 former gravid glory. <</if>> <</switch>> <<if $slaves[$i].bellyImplant > -1 && $clinicInflateBelly == 1>> - <br>''@@.pink;$slaves[$i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of inert filler steadily flowing into her belly implant, slowly pushing her belly further and further out. Careful attention, along with several drug injections, were used to make sure her body was able to safely adjust to the implant's rapid growth. + <<setLocalPronouns $slaves[$i] 2>> + <br>''@@.pink;$slaves[$i].slaveName@@'' spent a lot of time during the week under IV-like stands with bags of inert filler steadily flowing into _his2 belly implant, slowly pushing _his2 belly further and further out. Careful attention, along with several drug injections, were used to make sure _his2 body was able to safely adjust to the implant's rapid growth. <<set $slaves[$i].bellyImplant += 5000, $slaves[$i].health -= 10>> <<if ($slaves[$i].devotion > 50)>> <<set $slaves[$i].devotion += 4, $slaves[$i].trust += 3>> @@ -149,11 +158,12 @@ <</if>> <<if $slaves[$i].bellyImplant > ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000)>> <<set $slaves[$i].bellyImplant = ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000)>> - She is filled to the maximum that her implant can stand. + _He2 is filled to the maximum that _his2 implant can stand. <</if>> <</if>> <<if $slaves[$i].pregKnown == 1 && $slaves[$i].preg < 40 && $slaves[$i].pregControl == "speed up">> - <br>''@@.pink;$slaves[$i].slaveName@@'' spends most of her time on bedrest being filled with rapid gestation agents and concentrated slave food. All she can do is <<if $slaves[$i].amp != 1 && canSee($slaves[$i])>>watch and feel her belly pushing further and further out with life<<elseif $slaves[$i].amp != 1>>watch her belly bulging further and further out with life<<elseif !canSee($slaves[$i])>>feel her belly pushing further and further out with life beneath her fingers<<else>>feel the every growing pressure inside her abdomen<</if>>. Careful attention, along with numerous drug injections, are used to make sure her body is able to safely adjust to her pregnancy's rapid growth. + <<setLocalPronouns $slaves[$i] 2>> + <br>''@@.pink;$slaves[$i].slaveName@@'' spends most of _his2 time on bedrest being filled with rapid gestation agents and concentrated slave food. All _he2 can do is <<if $slaves[$i].amp != 1 && canSee($slaves[$i])>>watch and feel _his2 belly pushing further and further out with life<<elseif $slaves[$i].amp != 1>>watch _his2 belly bulging further and further out with life<<elseif !canSee($slaves[$i])>>feel _his2 belly pushing further and further out with life beneath _his2 fingers<<else>>feel the every growing pressure inside _his2 abdomen<</if>>. Careful attention, along with numerous drug injections, are used to make sure _his2 body is able to safely adjust to _his2 pregnancy's rapid growth. <<set $slaves[$i].health -= 10>> <<if ($slaves[$i].devotion > 50)>> <<set $slaves[$i].devotion += 2, $slaves[$i].trust += 1>> @@ -164,16 +174,16 @@ <</if>> <<if $slaves[$i].preg >= 35 && $slaves[$i].pregControl == "speed up">> <<set $slaves[$i].pregControl = "none">> - ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of her womb, ''@@.yellow;her course of rapid gestation agents is finished''. + ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of _his2 womb, ''@@.yellow;_his2 course of rapid gestation agents is finished''. <</if>> <<elseif $slaves[$i].preg > 2 && $slaves[$i].pregKnown == 0>> - During her tests, she discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@ + During $his tests, $he discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@ <<set $slaves[$i].pregKnown = 1>> <</if>> <</for>> <<if (_DL < $clinic)>> <<set _seed = random(1,10)+(($clinic-_DL)*(random(150,170)+(_idleBonus*10))), $cash += _seed>> - <br> Since she doesn't have enough girls to occupy all her time, the clinic takes in citizens' slaves on a contract basis and she helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@ + <br> Since $he doesn't have enough girls to occupy all $his time, the clinic takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@ <</if>> <<if (_DL > 0)>><br><br><</if>> <</if>> @@ -220,6 +230,8 @@ <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$CliniciIDs[_dI]]>> + <<setLocalPronouns $slaves[$i]>> + <<if $slaves[$i].devotion < 45>> <<set $slaves[$i].devotion += 4>> <</if>> @@ -255,7 +267,7 @@ <<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation >= 0 || $slaves[$i].pregControl == "speed up")>> <<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>> <<else>> - <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' has been returned to health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>, so @@.yellow;her assignment has defaulted to rest.@@ + <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' has been returned to health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>, so @@.yellow;$his assignment has defaulted to rest.@@ <<= removeJob($slaves[$i], "get treatment in the clinic")>> <<set _restedSlaves++, _dI--, _DL-->> <<continue>> @@ -309,7 +321,7 @@ <</if>> been returned to @@.green;health<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purity<</if>>@@ and will be released from the clinic before the end of the week. <<if $clinicDecoration != "standard">> - <br><br> $clinicNameCaps's $clinicDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she was<<else>>them while they were<</if>>@@ getting treatment. + <br><br> $clinicNameCaps's $clinicDecoration atmosphere @@.hotpink;had an impact on them while they were@@ getting treatment. <</if>> <</if>> <<if _DL > 0 || $Nurse != 0>> diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 35580c91c68..f59e5d9fc85 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -46,22 +46,23 @@ /% Make sure we have registered living expenses as for any other slave %/ <<run getSlaveStatisticData($DJ, $facility.club)>> <<set $DJ = $slaves[_FLs]>> + <<setLocalPronouns $DJ>> <<= SlaveFullName($DJ)>> is performing as the DJ. <<if $DJ.relationship == -3 && $DJ.devotion > 50>> - She tries her best to be your energetic, cheerful wife. + $He tries $his best to be your energetic, cheerful wife. <<set $DJRepBonus += 0.1>> <</if>> <<if (_FLsFetish == 1)>> - She's expected to be the innovative, beautiful DJ spinning beats one minute, and come out of her booth to grind on the floor the next; she enjoys the interplay, and finds greater @@.lightcoral;pleasure in exhibitionism.@@ + $He's expected to be the innovative, beautiful DJ spinning beats one minute, and come out of $his booth to grind on the floor the next; $he enjoys the interplay, and finds greater @@.lightcoral;pleasure in exhibitionism.@@ <<elseif (_FLsFetish == 2)>> - Every day she gets to enjoy hundreds of stares on her skin, and @@.lightsalmon;becomes more of an exhibitionist.@@ + Every day $he gets to enjoy hundreds of stares on $his skin, and @@.lightsalmon;becomes more of an exhibitionist.@@ <</if>> <<if $DJ.eyes == -2>> - Her lack of eyesight doesn't slow her down; rather, it strengthens her other senses. Her tracks have a distinct sound, since she experiences noise as her sight. + $His lack of eyesight doesn't slow $him down; rather, it strengthens $his other senses. $His tracks have a distinct sound, since $he experiences noise as $his sight. <<set $DJRepBonus += 0.15>> <</if>> <<if ($DJ.entertainSkill <= 10)>> - Though $DJ.slaveName does her best to lead on the club, with her lack of skill she can do little. + Though $DJ.slaveName does $his best to lead on the club, with $his lack of skill $he can do little. <<elseif ($DJ.entertainSkill <= 30)>> $DJ.slaveName's basic skills marginally @@.green;improve@@ the atmosphere on $clubName. <<set $DJRepBonus += 0.05>> @@ -76,22 +77,22 @@ <<set $DJRepBonus += 0.20>> <</if>> <<if ($DJ.muscles > 5) && ($DJ.muscles <= 95)>> - Her toned body helps her lead her fellow club girls by letting her dance all night. + $His toned body helps $him lead $his fellow club girls by letting $him dance all night. <<set $DJRepBonus += 0.05>> <</if>> <<if ($DJ.intelligence+$DJ.intelligenceImplant > 15)>> - She's smart enough to make an actual contribution to the music, greatly enhancing the entire experience. + $He's smart enough to make an actual contribution to the music, greatly enhancing the entire experience. <<set $DJRepBonus += 0.05*Math.floor(($DJ.intelligence+$DJ.intelligenceImplant)/32)>> <</if>> <<if ($DJ.face > 95)>> - Her great beauty is a further draw, even when she's in her DJ booth, but especially when she comes out to dance. + $His great beauty is a further draw, even when $he's in $his DJ booth, but especially when $he comes out to dance. <<set $DJRepBonus += 0.05>> <</if>> <<if setup.DJCareers.includes($DJ.career)>> - She has musical experience from her life before she was a slave, a grounding that gives her tracks actual depth. + $He has musical experience from $his life before $he was a slave, a grounding that gives $his tracks actual depth. <<set $DJRepBonus += 0.05>> <<elseif $DJ.skillDJ >= $masteredXP>> - She has musical experience from working for you, giving her tracks actual depth. + $He has musical experience from working for you, giving $his tracks actual depth. <<set $DJRepBonus += 0.05>> <<else>> <<set $slaves[_FLs].skillDJ += random(1,Math.ceil(($DJ.intelligence+$DJ.intelligenceImplant)/15) + 8)>> @@ -110,7 +111,7 @@ <<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].entertainSkill >= 100) && ($slaves[_FLs].devotion > 50)>> <<set $legendaryEntertainerID = $slaves[_FLs].ID>> <</if>> - <br> Since she doesn't have enough sluts in $clubName to make it worthwhile for her to be on stage 24/7, she spends her extra time slutting it up herself. She has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut. + <br> Since $he doesn't have enough sluts in $clubName to make it worthwhile for $him to be on stage 24/7, $he spends $his extra time slutting it up $himself. $He has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut. <<if $showEWD != 0>> <br> She <<include "SA serve the public">> <<else>> @@ -197,6 +198,7 @@ <<if (_DL > 0)>> <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$ClubiIDs[_dI]]>> + <<setLocalPronouns $slaves[$i]>> <<if ($legendaryEntertainerID == 0) && ($slaves[$i].prestige == 0) && ($slaves[$i].entertainSkill >= 100) && ($slaves[$i].devotion > 50)>> <<set $legendaryEntertainerID = $slaves[$i].ID>> <</if>> diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw index de211911a9a..7ba78201ccc 100644 --- a/src/uncategorized/concubineSelect.tw +++ b/src/uncategorized/concubineSelect.tw @@ -3,7 +3,8 @@ <<set $nextButton = "Back", $nextLink = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Concubine">> <<showallAssignmentFilter>> <<if ($Concubine != 0)>> - ''__@@.pink;<<= SlaveFullName($Concubine)>>@@__'' is serving as your Concubine.<br><br>She will take the lead in seeing to your pleasure. + <<setLocalPronouns $Concubine>> + ''__@@.pink;<<= SlaveFullName($Concubine)>>@@__'' is serving as your Concubine.<br><br>$He will take the lead in seeing to your pleasure. <<else>> You have not selected a Concubine. <</if>> diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw index 07e98448df9..8208a5b8ff1 100644 --- a/src/uncategorized/dairy.tw +++ b/src/uncategorized/dairy.tw @@ -26,7 +26,8 @@ DairyRestraintsSetting($dairyRestraintsSetting) <</if>> <<if ($Milkmaid != 0) && ($dairyRestraintsSetting == 2)>> - $Milkmaid.slaveName has been removed from her position as Milkmaid, since an industrialized dairy automates her duties. + <<setLocalPronouns $Milkmaid>> + $Milkmaid.slaveName has been removed from $his position as Milkmaid, since an industrialized dairy automates $his duties. <<= removeJob($Milkmaid, "be the Milkmaid")>> <br><br> <</if>> @@ -40,8 +41,9 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<if $dairyPregSettingChanged == 1>> <<for _Di = 0; _Di < _DL; _Di++>> <<set _i = $slaveIndices[$DairyiIDs[_Di]]>> + <<setLocalPronouns $slaves[_i]>> <<if ($slaves[_i].vagina > -1) && ($slaves[_i].vagina < 3)>> - $slaves[_i].slaveName's milking machine ejects her, since it cannot fit the mandated dildo into her tight cunt. + $slaves[_i].slaveName's milking machine ejects $him, since it cannot fit the mandated dildo into $his tight cunt. <<= removeJob($slaves[_i], "work in the dairy")>> <<set _DL--, _Di-->> <</if>> @@ -51,7 +53,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $slaves[_i].reservedChildren = 0>> <<set $slaves[_i].reservedChildrenNursery = 0>> <<if (($slaves[_i].broodmother > 0) || ($slaves[_i].bellyImplant != -1))>> - $slaves[_i].slaveName's milking machine ejects her, since it detected a foreign body in her womb blocking its required functions. + $slaves[_i].slaveName's milking machine ejects $him, since it detected a foreign body in $his womb blocking its required functions. <<= removeJob($slaves[_i], "work in the dairy")>> <<set _DL--, _Di-->> <</if>> @@ -76,8 +78,9 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<if $dairyStimulatorsSettingChanged == 1>> <<for _Di = 0; _Di < _DL; _Di++>> <<set _i = $slaveIndices[$DairyiIDs[_Di]]>> + <<setLocalPronouns $slaves[_i]>> <<if ($slaves[_i].anus < 3)>> - $slaves[_i].slaveName's milking machine ejects her, since it cannot fit its massive anal dildo up her tight asshole. + $slaves[_i].slaveName's milking machine ejects $him, since it cannot fit its massive anal dildo up $his tight asshole. <<= removeJob($slaves[_i], "work in the dairy")>> <<set _DL--, _Di-->> <</if>> @@ -88,7 +91,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<else>> they begin to struggle wildly. As the constant assrape that will define their existences for the foreseeable future begins in earnest, their wriggling <</if>> - gradually diminishes as each slave is exhausted and slumps within her restraints. The machines take no notice, and continue the relentless sodomy.<br><br> + gradually diminishes as each slave is exhausted and slumps within their restraints. The machines take no notice, and continue the relentless sodomy.<br><br> <<elseif $dairyStimulatorsSettingChanged == -1>> In unison, the milking machines withdraw their gargantuan dildos from the slaves' loosened anuses. <<if $dairyFeedersSetting < 2>> @@ -102,8 +105,9 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<if $dairyRestraintsSetting == 1>> <<for _Di = 0; _Di < _DL; _Di++>> <<set _i = $slaveIndices[$DairyiIDs[_Di]]>> + <<setLocalPronouns $slaves[_i]>> <<if ($slaves[_i].indentureRestrictions >= 2)>> - $slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from restraint for milking. + $slaves[_i].slaveName's milking machine declines to restrain $him, since $he is encoded as an indentured servant protected from restraint for milking. <<= removeJob($slaves[_i], "work in the dairy")>> <<set _DL--, _Di-->> <</if>> @@ -117,8 +121,9 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<if $dairyRestraintsSetting == 1>> <<for _Di = 0; _Di < _DL; _Di++>> <<set _i = $slaveIndices[$DairyiIDs[_Di]]>> + <<setLocalPronouns $slaves[_i]>> <<if ($slaves[_i].indentureRestrictions >= 1)>> - $slaves[_i].slaveName's milking machine declines to restrain her, since she is encoded as an indentured servant protected from being restrained for milking. + $slaves[_i].slaveName's milking machine declines to restrain $him, since $he is encoded as an indentured servant protected from being restrained for milking. <<= removeJob($slaves[_i], "work in the dairy")>> <<set _DL--, _Di-->> <</if>> @@ -502,15 +507,16 @@ $dairyNameCaps <<set $Flag = 2>> <<include "Slave Summary">> <<if canAchieveErection($Milkmaid) && $Milkmaid.pubertyXY == 1>> + <<setLocalPronouns $Milkmaid>> <br> <<if $milkmaidImpregnates == 1>> - Keeping the cows pregnant is part of her job. [[Order her to stop impregnating|Dairy][$milkmaidImpregnates = 0]] + Keeping the cows pregnant is part of $his job. <<link "Order $him to stop impregnating" "Dairy">><<set $milkmaidImpregnates = 0>><</link>> <<elseif $seePreg != 0>> - She could be directed to keep the cows pregnant herself. [[Order her to impregnate|Dairy][$milkmaidImpregnates = 1]] + $He could be directed to keep the cows pregnant $himself. << "Order $him to impregnate" "Dairy">><<set $milkmaidImpregnates = 1>><</link>> <</if>> <</if>> <<elseif $dairyRestraintsSetting > 1>> - //Current milking machine settings make a Milkmaid superfluous by replacing her duties with automation// + //Current milking machine settings make a Milkmaid superfluous by replacing their duties with automation// <<else>> You do not have a slave serving as a Milkmaid. [[Appoint one|Milkmaid Select]] <</if>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 8d2fad7becc..7110c79c8eb 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -13,6 +13,81 @@ <<if ($Milkmaid != 0)>> <<set _FLs = $slaveIndices[$Milkmaid.ID]>> + <<set _milkmaidImpregnated = 0, _milkers = 0, _cummers = 0, _breeders = 0, _prostateStim = 0>> + + <<if (_DL > 0)>> + <<for _dI = 0; _dI < _DL; _dI++>> + <<set _i = $slaveIndices[$DairyiIDs[_dI]]>> + <<if $slaves[_i].lactation > 0>> + <<set _milkers++>> + <</if>> + <<if $slaves[_i].balls > 0 && $slaves[_i].ballType == "human">> + <<set _cummers++>> + <</if>> + <<if ($slaves[_i].bellyPreg >= 500 && $dairyPregSetting > 0)>> + <<set _breeders++>> + <</if>> + <<if ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>> + <<if (canImpreg($slaves[_i], $Milkmaid))>> + <<set $slaves[_i].preg = 1, $slaves[_i].pregSource = $Milkmaid.ID, $slaves[_i].pregKnown = 1, $slaves[_i].pregWeek = 1, _milkmaidImpregnated++>> + <<if $slaves[_i].mpreg == 1>> + <<set $slaves[_i].analCount += 10, $analTotal += 10>> + <<else>> + <<ser $slaves[_i].vaginalCount += 10, $vaginalTotal += 10>> + <</if>> + <<set $slaves[_i].pregType = setPregType($slaves[_i])>> + <<set WombImpregnate($slaves[_i], $slaves[_i].pregType, $Milkmaid.ID, 1)>> + <</if>> + <</if>> + /* how much effort the MM must take to force a slave into a stall */ + <<if $slaves[_i].devotion <= 20>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].trust < 20>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].muscles >= 30>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].weight >= 70>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].weight >= 160>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].boobs >= 20000>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].balls >= 30>> + <<set _MMWorkout++>> + <</if>> + <<if $slaves[_i].belly >= 5000>> + <<set _MMWorkout++>> + <</if>> + <<if !canWalk($slaves[_i])>> /* big bonus if they can't move themselves and are fat as cows */ + <<if $slaves[_i].weight >= 70>> + <<set _MMWorkout += 2>> + <</if>> + <<if $slaves[_i].weight >= 160>> + <<set _MMWorkout += 2>> + <</if>> + <<if $slaves[_i].boobs >= 20000>> + <<set _MMWorkout += 2>> + <</if>> + <<if $slaves[_i].balls >= 30>> + <<set _MMWorkout += 2>> + <</if>> + <<if $slaves[_i].belly >= 5000>> + <<set _MMWorkout += 2>> + <</if>> + <</if>> + <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid)) && _prostateStim != 1>> + <<if ($slaves[_i].balls > 0) && ($slaves[_i].prostate > 0)>> + <<set _prostateStim = 1>> + <</if>> + <</if>> + <</for>> + <</if>> <<if $slaves[_FLs].health < 90>> <<set $slaves[_FLs].curatives = 2>> @@ -38,109 +113,87 @@ <<set $slaves[_FLs].livingRules = "luxurious">> <</if>> <<if $slaves[_FLs].fetishStrength <= 95>> - <<if $slaves[_FLs].fetish != "boobs">> - <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>> - <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">> + <<if _milkers >= _cummers && _milkers >= _breeders>> + <<if $slaves[_FLs].fetish != "boobs">> + <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>> + <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">> + <</if>> + <<elseif $slaves[_FLs].fetishKnown == 0>> + <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>> + <<else>> + <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>> + <</if>> + <<elseif _cummers >= _breeders>> + <<if $slaves[_FLs].fetish != "cumslut">> + <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>> + <<set _FLsFetish = 3, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "cumslut">> + <</if>> + <<elseif $slaves[_FLs].fetishKnown == 0>> + <<set _FLsFetish = 3, $slaves[_FLs].fetishKnown = 1>> + <<else>> + <<set _FLsFetish = 4, $slaves[_FLs].fetishStrength += 4>> <</if>> - <<elseif $slaves[_FLs].fetishKnown == 0>> - <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>> <<else>> - <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>> + <<if $slaves[_FLs].fetish != "pregnancy">> + <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>> + <<set _FLsFetish = 5, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "pregnancy">> + <</if>> + <<elseif $slaves[_FLs].fetishKnown == 0>> + <<set _FLsFetish = 5, $slaves[_FLs].fetishKnown = 1>> + <<else>> + <<set _FLsFetish = 6, $slaves[_FLs].fetishStrength += 4>> + <</if>> <</if>> <</if>> <<run getSlaveStatisticData($Milkmaid, $facility.dairy)>> <<set $Milkmaid = $slaves[_FLs], $i = _FLs>> + <<setLocalPronouns $Milkmaid>> <<= SlaveFullName($Milkmaid)>> is serving as your Milkmaid. <<if $Milkmaid.relationship == -3 && $Milkmaid.devotion > 50>> <<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>> - She tries her best to be your perfect farmwife. + $He tries $his best to be your perfect farmwife. <</if>> - <<if (_DL > 0) && ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>> - <<set _milkmaidImpregnated = 0>> - <<for _dI = 0; _dI < _DL; _dI++>> - <<set $i = $slaveIndices[$DairyiIDs[_dI]]>> - <<if (canImpreg($slaves[$i], $Milkmaid))>> - <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Milkmaid.ID, $slaves[$i].pregKnown = 1, $slaves[$i].pregWeek = 1, _milkmaidImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> - <<set $slaves[$i].pregType = setPregType($slaves[$i])>> - <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $Milkmaid.ID, 1)>> - <</if>> - <</for>> - <<if _milkmaidImpregnated > 0>> - It's her responsibility to keep her charges pregnant, and she constantly - <<if _milkmaidImpregnated == 1>> - breeds the one fertile cow. - <<else>> - fills the _milkmaidImpregnated cows' cunts with her cum. - <</if>> - <<if $Milkmaid.career == "a breeding bull">> - She was conditioned to fill empty wombs, so she takes a @@.hotpink;deep pleasure@@ in her job. - <<set $slaves[_FLs].devotion++>> - <</if>> - <<set _Tmult = (_milkmaidImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Milkmaid.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>> - <<set $slaves[_FLs].need = 0>> + <<if _milkmaidImpregnated > 0>> + It's $his responsibility to keep $his charges pregnant, and $he constantly + <<if _milkmaidImpregnated == 1>> + breeds the one fertile cow. + <<else>> + fills the _milkmaidImpregnated cows' cunts with $his cum. + <</if>> + <<if $Milkmaid.career == "a breeding bull">> + $He was conditioned to fill empty wombs, so $he takes a @@.hotpink;deep pleasure@@ in $his job. + <<set $slaves[_FLs].devotion++>> + <<elseif ($Milkmaid.fetish == "pregnancy" && $Milkmaid.fetishKnown == 1)>> + $He has a pregnancy fetish, so $he finds $his job @@.hotpink;quite enjoyable,@@ especially when $he gets to watch the cows swell with $his children. + <<set $slaves[_FLs].devotion += Math.ceil($slaves[_FLs].fetishStrength/25)>> + <<set $slaves[_FLs].fetishStrength += 2>> <</if>> + <<set _Tmult = (_milkmaidImpregnated * 10), $slaves[_FLs].penetrativeCount += _Tmult, $Milkmaid.penetrativeCount += _Tmult, $penetrativeTotal += _Tmult>> + <<set $slaves[_FLs].need = 0>> <</if>> <<if (_FLsFetish == 1)>> - In her line of work, she touches more breasts than even you do. She lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when she touches their creamy nipples. She has @@.lightcoral;become more of a breast girl.@@ + In $his line of work, $he touches more breasts than even you do. $He lives in an atmosphere of quivering, heaving, milky breastflesh; of girls who shudder and moan when $he touches their creamy nipples. $He has @@.lightcoral;become more of a breast $girl.@@ <<elseif (_FLsFetish == 2)>> - It's a hard life, pulling teats and washing cows, but it does @@.lightsalmon;make her more of a breast fetishist.@@ + It's a hard life, pulling teats and washing cows, but it does @@.lightsalmon;make $him more of a breast fetishist.@@ + <<elseif (_FLsFetish == 3)>> + In $his line of work, $he touches more dicks and balls than most sluts. $He lives in an atmosphere of constant orgasm and ejaculation; of girls who shudder and moan when $he touches their engorged members. $He has @@.lightcoral;become more of a cum $girl.@@ + <<elseif (_FLsFetish == 4)>> + It's a hard life, cupping balls, cleaning dicks, and observing semen quality, but it does @@.lightsalmon;make $him more of a cum fetishist.@@ + <<elseif (_FLsFetish == 5)>> + In $his line of work, $he fondles more pregnancies than most clinics. $He lives in an atmosphere of swollen, hanging, baby-filled bellies; of girls who shudder and moan when $he runs $his hands across their bellies. $He has @@.lightcoral;grown a taste for girls laden with child.@@ + <<elseif (_FLsFetish == 6)>> + It's a hard life, washing bellies and inspecting pussies, but it does @@.lightsalmon;make $him more of a pregnancy fetishist.@@ <</if>> <<if ($Milkmaid.muscles > 30)>> <<set $milkmaidHealthBonus++>> - Her muscles help her handle the fattest or most reluctant cow. - <</if>> - <<if $dairyRestraintsSetting != 2>> /* how much effort the MM must take to force a slave into a stall */ - <<for _dI = 0; _dI < _DL; _dI++>> - <<set $i = $slaveIndices[$DairyiIDs[_dI]]>> - <<if $slaves[$i].devotion <= 20>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].trust < 20>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].muscles >= 30>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].weight >= 70>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].weight >= 160>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].boobs >= 20000>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].balls >= 30>> - <<set _MMWorkout++>> - <</if>> - <<if $slaves[$i].belly >= 5000>> - <<set _MMWorkout++>> - <</if>> - <<if !canWalk($slaves[$i])>> /* big bonus if they can't move themselves and are fat as cows */ - <<if $slaves[$i].weight >= 70>> - <<set _MMWorkout += 2>> - <</if>> - <<if $slaves[$i].weight >= 160>> - <<set _MMWorkout += 2>> - <</if>> - <<if $slaves[$i].boobs >= 20000>> - <<set _MMWorkout += 2>> - <</if>> - <<if $slaves[$i].balls >= 30>> - <<set _MMWorkout += 2>> - <</if>> - <<if $slaves[$i].belly >= 5000>> - <<set _MMWorkout += 2>> - <</if>> - <</if>> - <</for>> + $His muscles help $him handle the fattest or most reluctant cow. <</if>> <<if (_MMWorkout > random(1,30)) && $Milkmaid.muscles < 60>> - Constantly having to wrestle unruly or aiding heavy cows into their stalls forces her to @@.lime;build muscle.@@ + Constantly having to wrestle unruly or aiding heavy cows into their stalls forces $him to @@.lime;build muscle.@@ <<set $slaves[_FLs].muscles++>> <</if>> <<if ($Milkmaid.oralSkill > 30)>> - Her skilled tongue helps her keep her girls happy. + $His skilled tongue helps $him keep $his girls happy. <</if>> <<if ($Milkmaid.oralSkill < 90)>> <<set $skillIncrease = 3>> @@ -148,68 +201,67 @@ <</if>> <<if ($Milkmaid.sexualQuirk == "caring")>> <<set $milkmaidTrustBonus++>> - She's very caring, and does her best to get the cows to trust her. + $He's very caring, and does $his best to get the cows to trust $him. <</if>> <<if ($Milkmaid.behavioralQuirk == "funny")>> <<set $milkmaidTrustBonus++>> - She's funny, and does her best to get the cows to trust her by keeping them laughing. + $He's funny, and does $his best to get the cows to trust $him by keeping them laughing. <</if>> <<if setup.milkmaidCareers.includes($Milkmaid.career)>> <<set $milkmaidHealthBonus++>> - She has career experience dealing with milk animals. + $He has career experience dealing with milk animals. <<elseif $Milkmaid.skillMM >= $masteredXP>> <<set $milkmaidHealthBonus++>> - She has experience dealing with milk animals from working for you. + $He has experience harvesting slave products from working for you. <<else>> <<set $slaves[_FLs].skillMM += random(1,Math.ceil(($Milkmaid.intelligence+$Milkmaid.intelligenceImplant)/15) + 8)>> <</if>> - <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>> - <<for _dI = 0; _dI < _DL; _dI++>> - <<set $i = $slaveIndices[$DairyiIDs[_dI]]>> - <<if ($slaves[$i].balls > 0) && ($slaves[$i].prostate > 0)>> - She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating. - <<set $slaves[_FLs].need -= 50>> - <<break>> - <</if>> - <</for>> + <<if _prostateStim == 1>> + $He uses $his turgid cock to give prostate stimulation to slaves that need help ejaculating. + <<set $slaves[_FLs].need -= 50>> <</if>> <<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>> <<for _dI = 0; _dI < _DL; _dI++>> <<set $i = $slaveIndices[$DairyiIDs[_dI]]>> <<if $Milkmaid.rivalryTarget == $slaves[$i].ID>> - She either neglects or harasses her <<print rivalryTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure she is unhappy and uncomfortable. + <<setLocalPronouns $slaves[$i] 2>> + $He either neglects or harasses $his <<print rivalryTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure _he2 is unhappy and uncomfortable. <<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>> <<if random(1,100) > 65>> <<set $Milkmaid.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>> <</if>> <<elseif $Milkmaid.relationshipTarget == $slaves[$i].ID>> - She dotes over her <<print relationshipTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure she is happy and comfortable. + <<setLocalPronouns $slaves[$i] 2>> + $He dotes over $his <<print relationshipTerm($Milkmaid)>>, $slaves[$i].slaveName, making sure _he2 is happy and comfortable. <<set $slaves[$i].devotion++, $slaves[$i].trust++>> <<elseif $familyTesting == 1 && totalRelatives($slaves[$i]) > 0>> - She pays special attention to her <<print relativeTerm($Milkmaid.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure she is well kept and happy. + <<setLocalPronouns $slaves[$i] 2>> + $He pays special attention to $his <<print relativeTerm($Milkmaid.ID,$slaves[$i].ID)>>, $slaves[$i].slaveName, making sure _he2 is well kept and happy. <<set $slaves[$i].trust++>> <<elseif $Milkmaid.relationTarget == $slaves[$i].ID && $familyTesting == 0>> - She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she is well kept and happy. + <<setLocalPronouns $slaves[$i] 2>> + $He pays special attention to $his $slaves[$i].relation, $slaves[$i].slaveName, making sure _he2 is well kept and happy. <<set $slaves[$i].trust++>> <</if>> <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">> <<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>> - She spends extra time with $slaves[$i].slaveName, the well-known cow. She is fascinated by $slaves[$i].slaveName's massive $slaves[$i].boobs cc breasts and spends extra time massaging and kneading them to maximize production. + $He spends extra time with $slaves[$i].slaveName, the well-known cow. $He is fascinated by $slaves[$i].slaveName's massive $slaves[$i].boobs cc breasts and spends extra time massaging and kneading them to maximize production. <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>> <<else>> - She is disappointed that the well-known cow $slaves[$i].slaveName<<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>>'s breasts have shrunken considerably from their heyday.<</if>> + $He is disappointed that the well-known cow $slaves[$i].slaveName<<if ($slaves[$i].lactation == 0)>> isn't producing milk anymore. <<else>>'s breasts have shrunken considerably from their heyday.<</if>> <</if>> <</if>> <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">> <<if (($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>> - She spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them. + $He spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. $He can't help but massage the cow's dick and testes to stimulate them further and coax more from them. <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>> <<else>> - She is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>> + $He is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>> <</if>> <</if>> <<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[$i].bellyPreg >= 1500>> - She spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable. + <<setLocalPronouns $slaves[$i] 2>> + $He spends extra time with $slaves[$i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by _his2 growing pregnancy and popular womb. $He makes sure _his2 belly and its occupants are nice and comfortable. <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>> <</if>> <</for>> -- GitLab