diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 19b345963f5a02ad8a82f7139e2277c468cc35d2..c5c7f059bb31b3ce05b173f5248dbccedea2c2be 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -1,5 +1,5 @@ :: Body Modification [nobr] - + <<set $nextButton to "Continue">> <<set $nextLink to "Body Modification Degradation">> @@ -7,7 +7,7 @@ <<set $brandApplied to 0>> -$activeSlave.slaveName is lying strapped down on the table in your body modification studio. She is entirely at your mercy. +$activeSlave.slaveName is lying strapped down on the table in your body modification studio. $pronounCap is entirely at your mercy. <<if ($activeSlave.nipplesPiercing + $activeSlave.lipsPiercing + $activeSlave.vaginaPiercing + $activeSlave.anusPiercing + $activeSlave.clitPiercing) < 10>> <br> @@ -17,11 +17,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.earPiercing == 0>> - Her ears have not been pierced. + $possessiveCap ears have not been pierced. <<elseif $activeSlave.earPiercing == 1>> - Her earlobes are conventionally pierced. + $possessiveCap earlobes are conventionally pierced. <<elseif $activeSlave.earPiercing is 2>> - Her ears are heavily pierced, with multiple lobe piercings and a row of helix piercings. + $possessiveCap ears are heavily pierced, with multiple lobe piercings and a row of helix piercings. <</if>> <<if $activeSlave.earPiercing == 0>> [[Pierce them|Body Modification][$activeSlave.earPiercing to 1,$cash -= $modCost]] @@ -35,11 +35,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.nosePiercing == 0>> - Her nose has not been pierced. + $possessiveCap nose has not been pierced. <<elseif $activeSlave.nosePiercing == 1>> - She has a simple stud in her nose. + $pronounCap has a simple stud in $possessive nose. <<elseif $activeSlave.nosePiercing is 2>> - She has nasal studs and a large septum ring. + $pronounCap has nasal studs and a large septum ring. <</if>> <<if $activeSlave.nosePiercing == 0>> [[Pierce it|Body Modification][$activeSlave.nosePiercing to 1,$cash -= $modCost]] @@ -53,11 +53,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.eyebrowPiercing == 0>> - Her eyebrows have not been pierced. + $possessiveCap eyebrows have not been pierced. <<elseif $activeSlave.eyebrowPiercing == 1>> - She has a simple stud in one eyebrow. + $pronounCap has a simple stud in one eyebrow. <<elseif $activeSlave.eyebrowPiercing is 2>> - She has multiple eyebrow rings. + $pronounCap has multiple eyebrow rings. <</if>> <<if $activeSlave.eyebrowPiercing == 0>> [[Pierce them|Body Modification][$activeSlave.eyebrowPiercing to 1,$cash -= $modCost]] @@ -71,11 +71,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.navelPiercing == 1>> - Her navel bears a simple stud. + $possessiveCap navel bears a simple stud. <<elseif $activeSlave.navelPiercing is 2>> - Her navel is pierced with a ring, which has a short length of light chain dangling from it. + $possessiveCap navel is pierced with a ring, which has a short length of light chain dangling from it. <<else>> - Her navel is unpierced. + $possessiveCap navel is unpierced. <</if>> <<if $activeSlave.navelPiercing < 1>> [[Pierce it|Body Modification][$activeSlave.navelPiercing to 1,$cash -= $modCost]] @@ -89,12 +89,12 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.corsetPiercing == 1>> - She has a corset piercing, a ladder of rings down either side of her back. + $pronounCap has a corset piercing, a ladder of rings down either side of $possessive back. <<else>> - Her back is unpierced. + $possessiveCap back is unpierced. <</if>> <<if $activeSlave.corsetPiercing == 0>> - [[Give her corset piercings|Body Modification][$activeSlave.corsetPiercing to 1,$degradation += 2,$cash -= $modCost]] + [[Give $possessive corset piercings|Body Modification][$activeSlave.corsetPiercing to 1,$degradation += 2,$cash -= $modCost]] <<else>> //[[Remove corset piercings|Body Modification][$activeSlave.corsetPiercing to 0,$cash -= $modCost]]// <</if>> @@ -102,11 +102,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.nipplesPiercing == 0>> - Her nipples are fresh and unpierced. + $possessiveCap nipples are fresh and unpierced. <<elseif $activeSlave.nipplesPiercing == 1>> - Her nipples bear a simple piercing. + $possessiveCap nipples bear a simple piercing. <<elseif $activeSlave.nipplesPiercing is 2>> - Her nipples are heavily pierced with several rings and studs, and there is a chain between them. + $possessiveCap nipples are heavily pierced with several rings and studs, and there is a chain between them. <</if>> <<if $activeSlave.nipplesPiercing == 0>> [[Pierce them|Body Modification][$activeSlave.nipplesPiercing to 1,$cash -= $modCost]] @@ -120,9 +120,9 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.areolaePiercing == 1>> - She has a ring of stud piercings around the borders of each of her areolae. + $pronounCap has a ring of stud piercings around the borders of each of $possessive areolae. <<else>> - The edges of her areolae are unpierced. + The edges of $possessive areolae are unpierced. <</if>> <<if $activeSlave.areolaePiercing == 0>> [[Pierce them|Body Modification][$activeSlave.areolaePiercing to 1,$degradation += 1,$cash -= $modCost]] @@ -133,11 +133,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.lipsPiercing == 0>> - Her lips are unpierced. + $possessiveCap lips are unpierced. <<elseif $activeSlave.lipsPiercing == 1>> - She has a simple lip piercing for a stud. + $pronounCap has a simple lip piercing for a stud. <<elseif $activeSlave.lipsPiercing is 2>> - Her lips are heavily pierced. + $possessiveCap lips are heavily pierced. <</if>> <<if $activeSlave.lipsPiercing == 0>> [[Pierce them|Body Modification][$activeSlave.lipsPiercing to 1,$cash -= $modCost]] @@ -151,11 +151,11 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.tonguePiercing == 0>> - Her tongue is unpierced. + $possessiveCap tongue is unpierced. <<elseif $activeSlave.tonguePiercing == 1>> - She has a simple tongue stud. + $pronounCap has a simple tongue stud. <<elseif $activeSlave.tonguePiercing is 2>> - Her tongue is heavily pierced. + $possessiveCap tongue is heavily pierced. <</if>> <<if $activeSlave.tonguePiercing == 0>> [[Pierce it|Body Modification][$activeSlave.tonguePiercing to 1,$cash -= $modCost]] @@ -169,29 +169,29 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if ($activeSlave.clitPiercing == 0) && ($activeSlave.vagina != -1)>> - Her clit is unpierced. + $possessiveCap clit is unpierced. <<elseif ($activeSlave.clitPiercing == 1) && ($activeSlave.vagina != -1)>> - She has a simple clitoral stud. + $pronounCap has a simple clitoral stud. <<elseif ($activeSlave.clitPiercing is 2) && ($activeSlave.vagina != -1)>> - She has a big ring in her clit. + $pronounCap has a big ring in $possessive clit. <<elseif ($activeSlave.clitPiercing > 2) && ($activeSlave.vagina != -1)>> - She has a smart piercing in her clit. + $pronounCap has a smart piercing in $possessive clit. <<elseif ($activeSlave.clitPiercing == 0)>> - Her dickhead is unpierced. + $possessiveCap dickhead is unpierced. <<elseif ($activeSlave.clitPiercing == 1)>> - She has a simple dickhead stud. + $pronounCap has a simple dickhead stud. <<elseif ($activeSlave.clitPiercing is 2)>> - She has a big ring in her dickhead. + $pronounCap has a big ring in $possessive dickhead. <<elseif ($activeSlave.clitPiercing > 2)>> - She has a smart frenulum piercing. + $pronounCap has a smart frenulum piercing. <</if>> <<if $activeSlave.clitPiercing == 0>> - [[Pierce her|Body Modification][$activeSlave.clitPiercing to 1,$cash -= $modCost]] + [[Pierce|Body Modification][$activeSlave.clitPiercing to 1,$cash -= $modCost]] <<elseif $activeSlave.clitPiercing == 1>> - [[Give her a big piercing|Body Modification][$activeSlave.clitPiercing to 2,$cash -= $modCost,$degradation += 1]] + [[Big piercing|Body Modification][$activeSlave.clitPiercing to 2,$cash -= $modCost,$degradation += 1]] <</if>> <<if $activeSlave.clitPiercing != 3>> - | [[Give her a smart piercing|Body Modification][$activeSlave.clitPiercing to 3,$activeSlave.clitSetting to "all",$cash -=$SPcost,$degradation += 1]] //Costs ¤$SPcost, unlocks options to mold sexuality// + | [[Smart piercing|Body Modification][$activeSlave.clitPiercing to 3,$activeSlave.clitSetting to "all",$cash -=$SPcost,$degradation += 1]] //Costs ¤$SPcost, unlocks options to mold sexuality// <</if>> <<if $activeSlave.clitPiercing > 0>> //[[Remove piercings|Body Modification][$activeSlave.clitPiercing to 0,$cash -= $modCost]]// @@ -200,16 +200,16 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <<if ($activeSlave.vagina != -1)>> <br> <<if ($activeSlave.vaginaPiercing == 0)>> - Her pussylips are unpierced. + $possessiveCap pussylips are unpierced. <<elseif ($activeSlave.vaginaPiercing == 1)>> - She has a simple row of studs down her labia. + $pronounCap has a simple row of studs down $possessive labia. <<elseif ($activeSlave.vaginaPiercing is 2)>> - She has a row of big rings down her labia. + $pronounCap has a row of big rings down $possessive labia. <</if>> <<if $activeSlave.vaginaPiercing == 0>> - [[Pierce her|Body Modification][$activeSlave.vaginaPiercing to 1,$cash -= $modCost]] + [[Pierce $possessive|Body Modification][$activeSlave.vaginaPiercing to 1,$cash -= $modCost]] <<elseif $activeSlave.vaginaPiercing == 1>> - [[Give her huge piercings|Body Modification][$activeSlave.vaginaPiercing to 2,$cash -= $modCost,$degradation += 1]] + [[Huge piercings|Body Modification][$activeSlave.vaginaPiercing to 2,$cash -= $modCost,$degradation += 1]] <</if>> <<if $activeSlave.vaginaPiercing > 0>> //[[Remove piercings|Body Modification][$activeSlave.vaginaPiercing to 0,$cash -= $modCost]]// @@ -219,23 +219,23 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <<if ($activeSlave.dick > 0)>> <br> <<if ($activeSlave.dickPiercing == 0)>> - Her shaft is unpierced. + $possessiveCap shaft is unpierced. <<elseif ($activeSlave.dickPiercing == 1)>> - She has a simple row of studs down her cock. + $pronounCap has a simple row of studs down $possessive cock. <<elseif ($activeSlave.dickPiercing is 2)>> - She has a row of big rings down her cock. + $pronounCap has a row of big rings down $possessive cock. <</if>> <<if ($activeSlave.balls != 0)>> <<if ($activeSlave.dickPiercing == 1)>> - She has a couple of studs in her ballsack. + $pronounCap has a couple of studs in $possessive ballsack. <<elseif ($activeSlave.dickPiercing is 2)>> - She has a row of rings down the center of her ballsack, all the way from the base of her shaft to her perineum. + $pronounCap has a row of rings down the center of $possessive ballsack, all the way from the base of $possessive shaft to $possessive perineum. <</if>> <</if>> <<if $activeSlave.dickPiercing == 0>> - [[Pierce her|Body Modification][$activeSlave.dickPiercing to 1,$cash -= $modCost]] + [[Pierce|Body Modification][$activeSlave.dickPiercing to 1,$cash -= $modCost]] <<elseif $activeSlave.dickPiercing == 1>> - [[Give her huge piercings|Body Modification][$activeSlave.dickPiercing to 2,$cash -= $modCost,$degradation += 1]] + [[Huge piercings|Body Modification][$activeSlave.dickPiercing to 2,$cash -= $modCost,$degradation += 1]] <</if>> <<if $activeSlave.dickPiercing > 0>> //[[Remove piercings|Body Modification][$activeSlave.dickPiercing to 0,$cash -= $modCost]]// @@ -244,20 +244,20 @@ $activeSlave.slaveName is lying strapped down on the table in your body modifica <br> <<if $activeSlave.anusPiercing == 0>> - Her perineum has not been pierced. + $possessiveCap perineum has not been pierced. <<elseif ($activeSlave.anusPiercing == 1) && ($activeSlave.vagina < 0)>> - She has a simple piercing between the base of her cock and her asshole. + $pronounCap has a simple piercing between the base of $possessive cock and $possessive asshole. <<elseif $activeSlave.anusPiercing == 1>> - She has a simple piercing between her pussy and her asshole. + $pronounCap has a simple piercing between $possessive pussy and $possessive asshole. <<elseif ($activeSlave.anusPiercing is 2) && ($activeSlave.vagina < 0)>> - She has a big ring between between the base of her cock and her asshole and studs in a ring around her anus. + $pronounCap has a big ring between between the base of $possessive cock and $possessive asshole and studs in a ring around $possessive anus. <<elseif $activeSlave.anusPiercing is 2>> - She has a big ring between her pussy and her asshole and studs in a ring around her anus. + $pronounCap has a big ring between $possessive pussy and $possessive asshole and studs in a ring around $possessive anus. <</if>> <<if $activeSlave.anusPiercing == 0>> - [[Pierce it|Body Modification][$activeSlave.anusPiercing to 1,$cash -= $modCost]] + [[Pierce|Body Modification][$activeSlave.anusPiercing to 1,$cash -= $modCost]] <<elseif $activeSlave.anusPiercing == 1>> - [[Pierce all around her butthole|Body Modification][$activeSlave.anusPiercing to 2,$cash -= $modCost,$degradation += 1]] + [[Pierce rim|Body Modification][$activeSlave.anusPiercing to 2,$cash -= $modCost,$degradation += 1]] <</if>> <<if $activeSlave.anusPiercing > 0>> //[[Remove piercings|Body Modification][$activeSlave.anusPiercing to 0,$cash -= $modCost]]// @@ -338,11 +338,11 @@ Your brand design is ''$brandDesign.'' <<if ($arcologies[0].FSSubjugationist != "unset") && ($activeSlave.race is $arcologies[0].FSSubjugationistRace)>> | //FS// [[Racial Slur|Body Modification][$brandDesign to "a racial slur"]] <</if>> <<if ($arcologies[0].FSRepopulationFocus != "unset")>> -| //FS// [[Birth Count|Body Modification][$brandDesign to "the number of children she has birthed"]] <</if>> +| //FS// [[Birth Count|Body Modification][$brandDesign to "the number of children "+$object+" she has birthed"]] <</if>> <<if ($arcologies[0].FSGenderRadicalist != "unset") or ($arcologies[0].FSGenderFundamentalist != "unset")>> | //FS// [[Gender Symbol|Body Modification][$brandDesign to "a gender symbol"]] <</if>> <<if ($arcologies[0].FSPaternalist != "unset")>> -| //FS// [[Personal Symbol|Body Modification][$brandDesign to "her own personal symbol"]] <</if>> +| //FS// [[Personal Symbol|Body Modification][$brandDesign to $possessive+" own personal symbol"]] <</if>> <<if ($arcologies[0].FSDegradationist != "unset")>> | //FS// [[Chain Symbol|Body Modification][$brandDesign to "a chain symbol"]] <</if>> <<if ($arcologies[0].FSBodyPurist != "unset")>> @@ -350,17 +350,17 @@ Your brand design is ''$brandDesign.'' <<if ($arcologies[0].FSTransformationFetishist != "unset")>> | //FS// [[Scalpel|Body Modification][$brandDesign to "a scalpel"]] <</if>> <<if ($arcologies[0].FSYouthPreferentialist != "unset")>> -| //FS// [[Virginity Status|Body Modification][$brandDesign to "her virginity status"]] <</if>> +| //FS// [[Virginity Status|Body Modification][$brandDesign to $possessive+" virginity status"]] <</if>> <<if ($arcologies[0].FSMaturityPreferentialist != "unset")>> -| //FS// [[Sexual Skill Info|Body Modification][$brandDesign to "her sexual skills"]] <</if>> +| //FS// [[Sexual Skill Info|Body Modification][$brandDesign to $possessive+" sexual skills"]] <</if>> <<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>> -| //FS// [[Breast Floor|Body Modification][$brandDesign to "her absolute minimum breast size"]] <</if>> +| //FS// [[Breast Floor|Body Modification][$brandDesign to $possessive+" absolute minimum breast size"]] <</if>> <<if ($arcologies[0].FSAssetExpansionist != "unset")>> -| //FS// [[Breast Ceiling|Body Modification][$brandDesign to "her absolute maximum breast size"]] <</if>> +| //FS// [[Breast Ceiling|Body Modification][$brandDesign to $possessive+" absolute maximum breast size"]] <</if>> <<if ($arcologies[0].FSPastoralist != "unset")>> -| //FS// [[Product Quality|Body Modification][$brandDesign to "her body product quality"]] <</if>> +| //FS// [[Product Quality|Body Modification][$brandDesign to $possessive+" body product quality"]] <</if>> <<if ($arcologies[0].FSPhysicalIdealist != "unset")>> -| //FS// [[Deadlift Info|Body Modification][$brandDesign to "her deadlift record"]] <</if>> +| //FS// [[Deadlift Info|Body Modification][$brandDesign to $possessive+" deadlift record"]] <</if>> <<if ($arcologies[0].FSChattelReligionist != "unset")>> | //FS// [[Religious Symbol|Body Modification][$brandDesign to "a religious symbol"]] <</if>> <<if ($arcologies[0].FSRomanRevivalist != "unset")>> @@ -379,10 +379,10 @@ Custom brand design: <<textbox "$brandDesign" $brandDesign "Body Modification">> <br> <<if $activeSlave.brand != 0>> - She has $activeSlave.brand branded into the flesh of her $activeSlave.brandLocation. | [[Remove Brand|Body Modification][$brandApplied to 0, $activeSlave.brand to 0,$cash -= $modCost,$degradation -= 10]] + $pronounCap has $activeSlave.brand branded into the flesh of $possessive $activeSlave.brandLocation. | [[Remove Brand|Body Modification][$brandApplied to 0, $activeSlave.brand to 0,$cash -= $modCost,$degradation -= 10]] <<else>> - [[Brand her|Body Modification][$brandApplied to 1,$activeSlave.brand to $brandDesign,$activeSlave.brandLocation to $brandTarget,$cash -= $modCost,$degradation += 10]] - //Branding will slightly reduce her beauty but may slowly increase your reputation.// + [[Brand|Body Modification][$brandApplied to 1,$activeSlave.brand to $brandDesign,$activeSlave.brandLocation to $brandTarget,$cash -= $modCost,$degradation += 10]] + //Branding will slightly reduce $possessive beauty but may slowly increase your reputation.// <</if>> <br><br> @@ -1002,9 +1002,9 @@ __Apply full-body tattoos:__ <</if>> <<if $activeSlave.boobsTat == 0>> - Her chest and breasts are not tattooed. + $possessiveCap chest and breasts are not tattooed. <<else>> - Her chest and breasts are tattooed with $activeSlave.boobsTat. + $possessiveCap chest and breasts are tattooed with $activeSlave.boobsTat. <</if>> <<if $activeSlave.boobsTat == 0>> <br> @@ -1023,9 +1023,9 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.buttTat == 0>> - Her buttocks are not tattooed. + $possessiveCap buttocks are not tattooed. <<else>> - Her buttocks are tattooed with $activeSlave.buttTat. + $possessiveCap buttocks are tattooed with $activeSlave.buttTat. <</if>> <<if $activeSlave.buttTat == 0>> <br> @@ -1045,9 +1045,9 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.lipsTat == 0>> - She has no facial tattoos. + $pronounCap has no facial tattoos. <<else>> - Her face is tattooed with $activeSlave.lipsTat. + $possessiveCap face is tattooed with $activeSlave.lipsTat. <</if>> <<if $activeSlave.lipsTat == 0>> <br> @@ -1066,9 +1066,9 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.shouldersTat == 0>> - She has no shoulder tattoos. + $pronounCap has no shoulder tattoos. <<else>> - Her shoulders are tattooed with $activeSlave.shouldersTat. + $possessiveCap shoulders are tattooed with $activeSlave.shouldersTat. <</if>> <<if $activeSlave.shouldersTat == 0>> <br> @@ -1088,9 +1088,9 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.backTat == 0>> - She has no back tattoo. + $pronounCap has no back tattoo. <<else>> - Her back is tattooed with $activeSlave.backTat. + $possessiveCap back is tattooed with $activeSlave.backTat. <</if>> <<if $activeSlave.backTat == 0>> <br> @@ -1111,9 +1111,9 @@ __Apply full-body tattoos:__ <<if $activeSlave.amp != 1>> <<if $activeSlave.armsTat == 0>> - She has no arm tattoos. + $pronounCap has no arm tattoos. <<else>> - Her <<if $activeSlave.amp < 0>>prosthetic <</if>>arms are <<if $activeSlave.amp < 0>>indelibly marked<<else>>tattooed<</if>> with $activeSlave.armsTat. + $possessiveCap <<if $activeSlave.amp < 0>>prosthetic <</if>>arms are <<if $activeSlave.amp < 0>>indelibly marked<<else>>tattooed<</if>> with $activeSlave.armsTat. <</if>> <<if $activeSlave.armsTat == 0>> <br> @@ -1135,9 +1135,9 @@ __Apply full-body tattoos:__ <<if $activeSlave.amp != 1>> <<if $activeSlave.legsTat == 0>> - She has no leg tattoos. + $pronounCap has no leg tattoos. <<else>> - Her <<if $activeSlave.amp < 0>>prosthetic <</if>>legs are <<if $activeSlave.amp < 0>>indelibly marked<<else>>tattooed<</if>> with $activeSlave.legsTat. + $possessiveCap <<if $activeSlave.amp < 0>>prosthetic <</if>>legs are <<if $activeSlave.amp < 0>>indelibly marked<<else>>tattooed<</if>> with $activeSlave.legsTat. <</if>> <<if $activeSlave.legsTat == 0>> <br> @@ -1158,9 +1158,9 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.stampTat == 0>> - She has no lower back tattoos. + $pronounCap has no lower back tattoos. <<else>> - Her lower back is tattooed with $activeSlave.stampTat. + $possessiveCap lower back is tattooed with $activeSlave.stampTat. <</if>> <<if $activeSlave.stampTat == 0>> <br> @@ -1181,9 +1181,9 @@ __Apply full-body tattoos:__ <<if $activeSlave.preg > 30 && $activeSlave.pregType < 10>> <<if $activeSlave.bellyTat == 0>> - She has no navel tattoos. + $pronounCap has no navel tattoos. <<else>> - Her navel is tattooed with $activeSlave.bellyTat. + $possessiveCap navel is tattooed with $activeSlave.bellyTat. <</if>> <<if $activeSlave.bellyTat == 0>> <br> @@ -1199,9 +1199,9 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.vaginaTat == 0>> - Her abdomen and pubis have not been tattooed. + $possessiveCap abdomen and pubis have not been tattooed. <<else>> - Her abdomen and pubis are tattooed with $activeSlave.vaginaTat. + $possessiveCap abdomen and pubis are tattooed with $activeSlave.vaginaTat. <</if>> <<if $activeSlave.vaginaTat == 0>> <br> @@ -1221,9 +1221,9 @@ __Apply full-body tattoos:__ <<if $activeSlave.dick > 0>> <br> <<if $activeSlave.dickTat == 0>> - Her dick has not been tattooed. + $possessiveCap dick has not been tattooed. <<else>> - Her dick is tattooed with $activeSlave.dickTat. + $possessiveCap dick is tattooed with $activeSlave.dickTat. <</if>> <<if $activeSlave.dickTat == 0>> <br> @@ -1242,11 +1242,11 @@ __Apply full-body tattoos:__ <br> <<if $activeSlave.anusTat == 0>> - Her anus is brown and unbleached. + $possessiveCap anus is brown and unbleached. <<elseif $activeSlave.anusTat is "bleached">> - Her anus is bleached and looks like a sexual organ. + $possessiveCap anus is bleached and looks like a sexual organ. <<else>> - Her anus is tattooed with $activeSlave.anusTat. + $possessiveCap anus is tattooed with $activeSlave.anusTat. <</if>> <<if $activeSlave.anusTat == 0>> [[Bleach it|Body Modification][$activeSlave.anusTat to "bleached",$cash -= $modCost]] @@ -1266,10 +1266,10 @@ __Apply full-body tattoos:__ <br> <<if ($activeSlave.customTat is " ")>> - Give her a custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">> + Give $possessive a custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">> <<else>> - She has a custom tattoo: $activeSlave.customTat - Change her custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">> //For more than one tat, just use commas// + $pronounCap has a custom tattoo: $activeSlave.customTat + Change $possessive custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "Slave Interact">> //For more than one tat, just use commas// <</if>> <<if $activeSlave.customTat != "">> //[[Remove custom tattoo|Body Modification][$activeSlave.customTat to "",$cash -= $modCost]]// diff --git a/src/uncategorized/defaultRules.tw b/src/uncategorized/defaultRules.tw index ff64f835266dc86b87de928af12d7a3c484d4565..f8f2867fca35cfac2bacf260423a9d4a2e9aec3d 100644 --- a/src/uncategorized/defaultRules.tw +++ b/src/uncategorized/defaultRules.tw @@ -273,148 +273,8 @@ <</if>> <</if>> -<<set _tmp to lastEyeColorRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.eyeColor isnot "no default setting")>> -<<if ($activeSlave.eyeColor isnot _currentRule.eyeColor)>> - <<set $activeSlave.eyeColor to _currentRule.eyeColor>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName has been given $activeSlave.eyeColor contact lenses. -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastMakeupRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.makeup isnot "no default setting")>> -<<if ($activeSlave.makeup isnot _currentRule.makeup)>> - <<set $activeSlave.makeup to _currentRule.makeup>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName has been assigned the standard makeup. -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastNailsRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if ($activeSlave.amp != 1)>> -<<if (_currentRule.nails isnot "no default setting")>> -<<if ($activeSlave.nails isnot _currentRule.nails)>> - <<set $activeSlave.nails to _currentRule.nails>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName has been assigned the standard nails. -<</if>> -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastHColorRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.hColor isnot "no default setting")>> -<<if ($activeSlave.hColor isnot _currentRule.hColor)>> - <<set $activeSlave.hColor to _currentRule.hColor>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's hair has been dyed _currentRule.hColor. -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastHStyleRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.hStyle isnot "no default setting")>> -<<if ($activeSlave.hStyle isnot _currentRule.hStyle)>> -<br>$activeSlave.slaveName's hair has been -<<if (_currentRule.hStyle is "shaved")>> - <<set $activeSlave.hLength to 0>> - shaved. -<<else>> - restyled. -<</if>> -<<set $activeSlave.hStyle to _currentRule.hStyle>> -<<set $cash -= $modCost>> -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastHLengthRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.hLength isnot "no default setting")>> -<<if ($activeSlave.hLength isnot _currentRule.hLength)>> -<<if ($activeSlave.hLength > _currentRule.hLength)>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's hair has been cut; it -<<else>> - <<set $cash -= $modCost*Math.trunc((_currentRule.hLength-$activeSlave.hLength)/10)>> - <br>$activeSlave.slaveName has been given extensions; her hair -<</if>> -is now _currentRule.hLength cm long. -<<set $activeSlave.hLength to _currentRule.hLength>> -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastPubicHColorRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.pubicHColor isnot "no default setting")>> -<<if ($activeSlave.pubicHColor isnot _currentRule.pubicHColor)>> - <<set $activeSlave.pubicHColor to _currentRule.pubicHColor>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's pubic hair, if present, has been dyed _currentRule.pubicHColor. -<</if>> -<</if>> -<</if>> - -<<set _tmp to lastPubicHStyleRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.pubicHStyle isnot "no default setting")>> -<<if ($activeSlave.pubicHStyle isnot _currentRule.pubicHStyle)>> - <<set $activeSlave.pubicHStyle to _currentRule.pubicHStyle>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's pubic hair has been restyled; it is now _currentRule.pubicHStyle. -<</if>> -<</if>> -<</if>> - <</if>> /* CLOSES FUCKDOLL CHECK */ -<<if ndef _currentRule.underArmHColor>> -<<set _currentRule.underArmHColor to "no default setting">> -<</if>> - -<<if (_currentRule.underArmHColor isnot "no default setting")>> -<<if ($activeSlave.underArmHColor isnot _currentRule.underArmHColor)>> - <<set $activeSlave.underArmHColor to _currentRule.underArmHColor>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's underarm hair, if present, has been dyed _currentRule.underArmHColor. - <</if>> -<</if>> -/* -<<set _tmp to lastUnderArmHColorRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.underArmHColor isnot "no default setting")>> -<<if ($activeSlave.underArmHColor isnot _currentRule.underArmHColor)>> - <<set $activeSlave.underArmHColor to _currentRule.underArmHColor>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's underarm hair, if present, has been dyed _currentRule.underArmHColor. -<</if>> -<</if>> -<</if>> -*/ -<<if ndef _currentRule.underArmHStyle>> -<<set _currentRule.underArmHStyle to "no default setting">> -<</if>> - -<<set _tmp to lastUnderArmHStyleRule($activeSlave, $defaultRules)>> -<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> -<<if (_currentRule.underArmHStyle isnot "no default setting")>> -<<if ($activeSlave.underArmHStyle isnot _currentRule.underArmHStyle)>> - <<set $activeSlave.underArmHStyle to _currentRule.underArmHStyle>> - <<set $cash -= $modCost>> - <br>$activeSlave.slaveName's underarm hair has been restyled; it is now _currentRule.underArmHStyle. -<</if>> -<</if>> -<</if>> - <<if (_currentRule.growth isnot "no default setting")>> <<if ($activeSlave.indentureRestrictions < 2)>> <<if (_currentRule.growth is "girlish")>> @@ -913,7 +773,145 @@ is now _currentRule.hLength cm long. <</if>> <</if>> -<<if $activeSlave.fuckdoll == 0>> +<<set _tmp to lastEyeColorRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.eyeColor isnot "no default setting")>> +<<if ($activeSlave.eyeColor isnot _currentRule.eyeColor)>> + <<set $activeSlave.eyeColor to _currentRule.eyeColor>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName has been given $activeSlave.eyeColor contact lenses. +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastMakeupRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.makeup isnot "no default setting")>> +<<if ($activeSlave.makeup isnot _currentRule.makeup)>> + <<set $activeSlave.makeup to _currentRule.makeup>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName has been assigned the standard makeup. +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastNailsRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if ($activeSlave.amp != 1)>> +<<if (_currentRule.nails isnot "no default setting")>> +<<if ($activeSlave.nails isnot _currentRule.nails)>> + <<set $activeSlave.nails to _currentRule.nails>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName has been assigned the standard nails. +<</if>> +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastHColorRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.hColor isnot "no default setting")>> +<<if ($activeSlave.hColor isnot _currentRule.hColor)>> + <<set $activeSlave.hColor to _currentRule.hColor>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's hair has been dyed _currentRule.hColor. +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastHStyleRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.hStyle isnot "no default setting")>> +<<if ($activeSlave.hStyle isnot _currentRule.hStyle)>> +<br>$activeSlave.slaveName's hair has been +<<if (_currentRule.hStyle is "shaved")>> + <<set $activeSlave.hLength to 0>> + shaved. +<<else>> + restyled. +<</if>> +<<set $activeSlave.hStyle to _currentRule.hStyle>> +<<set $cash -= $modCost>> +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastHLengthRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.hLength isnot "no default setting")>> +<<if ($activeSlave.hLength isnot _currentRule.hLength)>> +<<if ($activeSlave.hLength > _currentRule.hLength)>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's hair has been cut; it +<<else>> + <<set $cash -= $modCost*Math.trunc((_currentRule.hLength-$activeSlave.hLength)/10)>> + <br>$activeSlave.slaveName has been given extensions; her hair +<</if>> +is now _currentRule.hLength cm long. +<<set $activeSlave.hLength to _currentRule.hLength>> +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastPubicHColorRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.pubicHColor isnot "no default setting")>> +<<if ($activeSlave.pubicHColor isnot _currentRule.pubicHColor)>> + <<set $activeSlave.pubicHColor to _currentRule.pubicHColor>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's pubic hair, if present, has been dyed _currentRule.pubicHColor. +<</if>> +<</if>> +<</if>> + +<<set _tmp to lastPubicHStyleRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.pubicHStyle isnot "no default setting")>> +<<if ($activeSlave.pubicHStyle isnot _currentRule.pubicHStyle)>> + <<set $activeSlave.pubicHStyle to _currentRule.pubicHStyle>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's pubic hair has been restyled; it is now _currentRule.pubicHStyle. +<</if>> +<</if>> +<</if>> + +<<if ndef _currentRule.underArmHColor>> +<<set _currentRule.underArmHColor to "no default setting">> +<</if>> + +<<if (_currentRule.underArmHColor isnot "no default setting")>> +<<if ($activeSlave.underArmHColor isnot _currentRule.underArmHColor)>> + <<set $activeSlave.underArmHColor to _currentRule.underArmHColor>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's underarm hair, if present, has been dyed _currentRule.underArmHColor. + <</if>> +<</if>> + +<<set _tmp to lastUnderArmHColorRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.underArmHColor isnot "no default setting")>> +<<if ($activeSlave.underArmHColor isnot _currentRule.underArmHColor)>> + <<set $activeSlave.underArmHColor to _currentRule.underArmHColor>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's underarm hair, if present, has been dyed _currentRule.underArmHColor. +<</if>> +<</if>> +<</if>> + +<<if ndef _currentRule.underArmHStyle>> +<<set _currentRule.underArmHStyle to "no default setting">> +<</if>> + +<<set _tmp to lastUnderArmHStyleRule($activeSlave, $defaultRules)>> +<<if (_tmp != null) && (_tmp.ID is _currentRule.ID)>> +<<if (_currentRule.underArmHStyle isnot "no default setting")>> +<<if ($activeSlave.underArmHStyle isnot _currentRule.underArmHStyle)>> + <<set $activeSlave.underArmHStyle to _currentRule.underArmHStyle>> + <<set $cash -= $modCost>> + <br>$activeSlave.slaveName's underarm hair has been restyled; it is now _currentRule.underArmHStyle. +<</if>> +<</if>> +<</if>> <<if (_currentRule.nipplesPiercing == 0)>> <<if $activeSlave.nipplesPiercing != 0>> @@ -1305,8 +1303,6 @@ is now _currentRule.hLength cm long. <</if>> <</if>> -<</if>> /* CLOSES FUCKDOLL CHECK */ - <<if (_currentRule.pornFameSpending isnot "no default setting")>> <<if ($activeSlave.devotion > 95)>> <<if ($activeSlave.trust > 95)>> diff --git a/src/uncategorized/degradingName.tw b/src/uncategorized/degradingName.tw index 3c36fa02e094db2cde3c56c601317519b662db96..f933f190b323213aec5e945d42e3ab85c016d767 100644 --- a/src/uncategorized/degradingName.tw +++ b/src/uncategorized/degradingName.tw @@ -1,8 +1,12 @@ :: Degrading Name - + <<silently>> -<<if ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>> +<<if $activeSlave.fuckdoll > 0>> + <<set $activeSlave.slaveName to "Fuckdoll No. " + random(1000,9999)>> +<<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting >= 2)>> + <<set $activeSlave.slaveName to "Bioreactor No. " + random(1000,9999)>> +<<else>> <<set $prefixes to []>> @@ -261,11 +265,6 @@ <<set $activeSlave.slaveName to $activeSlave.slaveName+$seed>> -<<else>> - -<<set $activeSlave.slaveName to "Bioreactor No." + $activeSlave.ID+1>> - <</if>> <</silently>> - diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 2bc5eee2d0403c8992e3ab6a703adbe50a0bc407..9430a12d909a7d2e1a1db0825e1bedd76456f1d0 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4387,13 +4387,14 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSTransformationFetishist/$FSLockinLevel), $arcologies[0].FSTransformationFetishist += 0.05*$FSSingleSlaveRep*$pornFameBonus>> <<set _transformed = 1>> <</if>> - <<if _transformed != 1>> - Society @@color:red;mildly disapproves@@ of $slaves[$i].slaveName's lack of obvious transformations; $pronoun does not advance the ideal of body modification. - <<set $repGain -= 0.5*$FSSingleSlaveRep*($arcologies[0].FSTransformationFetishist/$FSLockinLevel), $arcologies[0].FSTransformationFetishist -= 0.025*$FSSingleSlaveRep*$pornFameBonus>> - <</if>> <<if $slaves[$i].fuckdoll > 0>> Society @@color:green;mildly approves@@ of your owning a Fuckdoll. <<set $repGain += 0.5*$FSSingleSlaveRep*($arcologies[0].FSTransformationFetishist/$FSLockinLevel), $arcologies[0].FSTransformationFetishist += 0.025*$FSSingleSlaveRep*$pornFameBonus>> + <<set _transformed = 1>> + <</if>> + <<if _transformed == 0>> + Society @@color:red;mildly disapproves@@ of $slaves[$i].slaveName's lack of obvious transformations; $pronoun does not advance the ideal of body modification. + <<set $repGain -= 0.5*$FSSingleSlaveRep*($arcologies[0].FSTransformationFetishist/$FSLockinLevel), $arcologies[0].FSTransformationFetishist -= 0.025*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <</if>> @@ -4468,13 +4469,13 @@ and ($slaves[$i].clothes != "a slutty qipao") and ($slaves[$i].clothes != "restr <<set $repGain += 0.5*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel), $arcologies[0].FSChattelReligionist += 0.025*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<if ($slaves[$i].clothes is "a chattel habit") || ($slaves[$i].clothes is "a fallen nuns habit") || ($slaves[$i].clothes is "a penitent nuns habit") || ($slaves[$i].clothes is "a hijab and abaya") || ($slaves[$i].clothes is "a succubus outfit")>> - Society @@color:green;mildly approves@@ of $possessive religiously themed clothing, strengthening the connection between sexual servitude and faith. - <<set $repGain += 0.5*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel), $arcologies[0].FSChattelReligionist += 0.025*$FSSingleSlaveRep*$pornFameBonus>> + Society @@color:green;mildly approves@@ of $possessive religiously themed clothing, strengthening the connection between sexual servitude and faith. + <<set $repGain += 0.5*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel), $arcologies[0].FSChattelReligionist += 0.025*$FSSingleSlaveRep*$pornFameBonus>> <<elseif ($slaves[$i].clothes is "uncomfortable straps") or ($slaves[$i].clothes is "shibari ropes") or ($slaves[$i].clothes is "a nice maid outfit") or ($slaves[$i].clothes is "nice business attire") or ($slaves[$i].clothes is "a nice nurse outfit") or ($slaves[$i].clothes is "a kimono") or ($slaves[$i].clothes is "conservative clothing") or ($slaves[$i].clothes is "a military uniform") or ($slaves[$i].clothes is "no clothing")>> - Society accepts $possessive spartan clothing, seeing it as permissible under the new religious mores. - <<else>> - Society @@color:red;mildly disapproves@@ of $possessive unnecessarily gaudy attire; this slows acceptance of a link between faith and sexual servitude. - <<set $repGain -= 0.5*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel), $arcologies[0].FSChattelReligionist -= 0.025*$FSSingleSlaveRep*$pornFameBonus>> + Society accepts $possessive spartan clothing, seeing it as permissible under the new religious mores. + <<elseif ($slaves[$i].fuckdoll == 0)>> + Society @@color:red;mildly disapproves@@ of $possessive unnecessarily gaudy attire; this slows acceptance of a link between faith and sexual servitude. + <<set $repGain -= 0.5*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel), $arcologies[0].FSChattelReligionist -= 0.025*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<if ($slaves[$i].devotion > 95)>> Society @@color:green;approves@@ of $possessive devotion to you as a companion to religious devotion, seeing both as the model for holy slaves. diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 817807f21e146b24a19e23b8b6a4e7c4364888fd..06810b1fa2c808118b1ace0ee3ec7b63277618f1 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -9,13 +9,13 @@ <</nobr>>\ \ -$activeSlave.slaveName is seated in the auto salon. She is awaiting your artistic pleasure. +$activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your artistic pleasure. <<nobr>> <<if $activeSlave.eyes > -1>> -Her vision is normal, and she +$possessiveCap vision is normal, and $pronoun <<if $activeSlave.eyewear is "none">> has no eyewear. <<else>> @@ -29,7 +29,7 @@ Her vision is normal, and she <<else>> -She is nearsighted, and she +$pronounCap is nearsighted, and $pronoun <<if $activeSlave.eyewear is "none">> has no eyewear. <<else>> @@ -46,11 +46,11 @@ She is nearsighted, and she <</nobr>> <<nobr>> -Her eyes are $activeSlave.eyeColor. +$possessiveCap eyes are $activeSlave.eyeColor. <br> -Give her cosmetic contact lenses: +Give $possessive cosmetic contact lenses: [[Blue|Salon][$activeSlave.eyeColor to "blue",$cash -= $modCost]] | [[Black|Salon][$activeSlave.eyeColor to "black",$cash -= $modCost]] | [[Brown|Salon][$activeSlave.eyeColor to "brown",$cash -= $modCost]] @@ -76,17 +76,17 @@ Give her cosmetic contact lenses: <<nobr>> <<if $activeSlave.makeup == 1>> - She's wearing minimal makeup. + $pronounCap's wearing minimal makeup. <<elseif $activeSlave.makeup is 2>> - She's wearing expensive, luxurious makeup. + $pronounCap's wearing expensive, luxurious makeup. <<elseif $activeSlave.makeup is 3>> - Her makeup is color-coordinated with her $activeSlave.hColor hair. + $possessiveCap makeup is color-coordinated with $possessive $activeSlave.hColor hair. <<elseif $activeSlave.makeup is 4>> - She's wearing stereotypical, garish streetwalker makeup. + $pronounCap's wearing stereotypical, garish streetwalker makeup. <<elseif $activeSlave.lipsTat is "permanent makeup">> - Her face appears to bear very heavy, slutty makeup, but on closer inspection, the makeup is actually tattooed on. + $possessiveCap face appears to bear very heavy, slutty makeup, but on closer inspection, the makeup is actually tattooed on. <<else>> - Her face is makeup-free. + $possessiveCap face is makeup-free. <</if>> <br> @@ -94,37 +94,37 @@ Give her cosmetic contact lenses: [[Makeup-free|Salon][$activeSlave.makeup to 0,$cash -= $modCost]] | [[Nice makeup|Salon][$activeSlave.makeup to 1,$cash -= $modCost]] | [[Gorgeous makeup|Salon][$activeSlave.makeup to 2,$cash -= $modCost]] -| [[Color-coordinate her makeup with her hair|Salon][$activeSlave.makeup to 3,$cash -= $modCost]] +| [[Color-coordinate makeup with hair|Salon][$activeSlave.makeup to 3,$cash -= $modCost]] | [[Slutty makeup|Salon][$activeSlave.makeup to 4,$cash -= $modCost]] <</nobr>> <<nobr>> <<if $activeSlave.amp == 1>> - She has no hands, and thus, no nails. + $pronounCap has no hands, and thus, no nails. <<elseif $activeSlave.nails == 1>> - Her nails are long and elegant. + $possessiveCap nails are long and elegant. <<elseif $activeSlave.nails is 2>> - Her nails are color-coordinated with her $activeSlave.hColor hair. + $possessiveCap nails are color-coordinated with $possessive $activeSlave.hColor hair. <<elseif $activeSlave.nails is 3>> - Her nails are sharp and claw-like. + $possessiveCap nails are sharp and claw-like. <<elseif $activeSlave.nails is 4>> - Her nails are bright and glittery. + $possessiveCap nails are bright and glittery. <<elseif $activeSlave.nails is 5>> - Her nails are long and garish, streetwalker-style. + $possessiveCap nails are long and garish, streetwalker-style. <<else>> - Her nails are neatly clipped. + $possessiveCap nails are neatly clipped. <</if>> <br> <<if $activeSlave.amp != 1>> -[[Clip her nails|Salon][$activeSlave.nails to 0,$cash -= $modCost]] -| [[Extend her nails|Salon][$activeSlave.nails to 1,$cash -= $modCost]] -| [[Color-coordinate her nails with her hair|Salon][$activeSlave.nails to 2,$cash -= $modCost]] -| [[Give her sharp, claw-like nails|Salon][$activeSlave.nails to 3,$cash -= $modCost]] -| [[Give her bright, glittery nails|Salon][$activeSlave.nails to 4,$cash -= $modCost]] -| [[Give her long and garish, streetwalker-style nails|Salon][$activeSlave.nails to 5,$cash -= $modCost]] +[[Clip nails|Salon][$activeSlave.nails to 0,$cash -= $modCost]] +| [[Extend nails|Salon][$activeSlave.nails to 1,$cash -= $modCost]] +| [[Color-coordinate nails with hair|Salon][$activeSlave.nails to 2,$cash -= $modCost]] +| [[Sharp, claw-like nails|Salon][$activeSlave.nails to 3,$cash -= $modCost]] +| [[Bright, glittery nails|Salon][$activeSlave.nails to 4,$cash -= $modCost]] +| [[Streetwalker-style nails|Salon][$activeSlave.nails to 5,$cash -= $modCost]] <</if>> <</nobr>> @@ -134,22 +134,22 @@ Give her cosmetic contact lenses: <<set $lightenableSkin to ["dark", "olive", "black", "brown", "light brown", "tanned"]>> <<set $bleachableSkin to ["lightened", "white", "fair", "light"]>> -Her skin is $activeSlave.skin. +$possessiveCap skin is $activeSlave.skin. <<if ($tannableSkin.indexOf($activeSlave.skin) != -1)>> <br> - [[Tan her|Salon][$activeSlave.skin to "tanned",$cash -= $modCost]] + [[Tan|Salon][$activeSlave.skin to "tanned",$cash -= $modCost]] <<elseif ($lightenableSkin.indexOf($activeSlave.skin) != -1)>> <br> - [[Lighten her skin|Salon][$activeSlave.skin to "lightened",$cash -= $modCost]] + [[Lighten skin|Salon][$activeSlave.skin to "lightened",$cash -= $modCost]] <</if>> <<if ($bleachableSkin.indexOf($activeSlave.skin) != -1)>> <br> - [[Bleach her skin|Salon][$activeSlave.skin to "pale",$cash -= $modCost]] + [[Bleach skin|Salon][$activeSlave.skin to "pale",$cash -= $modCost]] <</if>> <<if $activeSlave.skin != "black">> <br> - [[Darken her skin|Salon][$activeSlave.skin to "dark",$cash -= $modCost]] + [[Darken skin|Salon][$activeSlave.skin to "dark",$cash -= $modCost]] <</if>> <</nobr>> @@ -157,22 +157,22 @@ Her skin is $activeSlave.skin. <<nobr>> <<if ($activeSlave.markings is "beauty mark")>> - She has a prominent mole on her face, which + $pronounCap has a prominent mole on $possessive face, which <<if $activeSlave.face > 1>> - qualifies as a beauty mark and enhances her attractiveness due to her facial beauty. - <<elseif $activeSlave.face < 1>> - detracts from her attractiveness. + qualifies as a beauty mark and enhances $possessive attractiveness due to $possessive facial beauty. + <<elseif $activeSlave.face > 1>> + detracts from $possessive attractiveness. <<else>> - qualifies as a beauty mark since she's pretty, having no significant impact on her beauty. + qualifies as a beauty mark since $pronoun's pretty, having no significant impact on $possessive beauty. <</if>> [[Remove it|Salon][$activeSlave.markings to "none",$cash -= $modCost]] <</if>> <<if ($activeSlave.markings is "birthmark")>> - She has a large birthmark, which + $pronounCap has a large birthmark, which <<if $activeSlave.prestige > 0>> - enhances her attractiveness due to her prestige. + enhances $possessive attractiveness due to $possessive prestige. <<else>> - detracts from her attractiveness. + detracts from $possessive attractiveness. <</if>> [[Bleach it|Salon][$activeSlave.markings to "none",$cash -= $modCost]] <</if>> @@ -181,11 +181,11 @@ Her skin is $activeSlave.skin. <<nobr>> -Her hair is $activeSlave.hColor. +$possessiveCap hair is $activeSlave.hColor. <br> -Dye her hair: +Dye $possessive hair: [[Blonde|Salon][$activeSlave.hColor to "blonde",$cash -= $modCost]] | [[Golden|Salon][$activeSlave.hColor to "golden",$cash -= $modCost]] | [[Platinum Blonde|Salon][$activeSlave.hColor to "platinum blonde",$cash -= $modCost]] @@ -211,12 +211,12 @@ Dye her hair: <</nobr>> <<nobr>> -Her hair is $activeSlave.hStyle. +$possessiveCap hair is $activeSlave.hStyle. <br> <<if $activeSlave.hLength > 1>> -Style her hair: +Style $possessive hair: [[Neat|Salon][$activeSlave.hStyle to "neat",$cash -= $modCost]] | [[Shaved|Salon][$activeSlave.hStyle to "shaved",$activeSlave.hLength to 0,$cash -= $modCost]] | [[Trimmed short|Salon][$activeSlave.hStyle to "trimmed",$activeSlave.hLength to 10,$cash -= $modCost]] @@ -234,7 +234,7 @@ Style her hair: | [[Afro|Salon][$activeSlave.hStyle to "afro",$cash -= $modCost]] | [[Shaved sides|Salon][$activeSlave.hStyle to "strip",$cash -= $modCost]] <<else>> - //Her hair is too short to style meaningfully// + //$possessiveCap hair is too short to style meaningfully// <</if>> <br> //General hairstyles will conform to hair length and clothing choices.// @@ -242,21 +242,21 @@ Style her hair: <</nobr>> <<nobr>> -Her hair is $activeSlave.hLength cm long. +$possessiveCap hair is $activeSlave.hLength cm long. <br> <<if $activeSlave.hLength == 1>> [[Apply hair growth stimulating treatment|Salon][$activeSlave.hLength to 1,$cash -= $modCost]] <<elseif $activeSlave.hLength < 150>> - [[Give her extensions|Salon][$activeSlave.hLength += 10,$cash -= $modCost]] + [[Extensions|Salon][$activeSlave.hLength += 10,$cash -= $modCost]] <<else>> - //Her hair is extremely long// + //$possessiveCap hair is extremely long// <</if>> <br> -Cut her hair: +Cut $possessive hair: <<if $activeSlave.hLength > 5>> [[Very short|Salon][$activeSlave.hLength to 5,$cash -= $modCost]] <<if $activeSlave.hLength > 10>> @@ -272,18 +272,18 @@ Cut her hair: | [[Very long|Salon][$activeSlave.hLength = 100,$cash -= $modCost]] <</if>> <<else>> - //Her hair is already very short// + //$possessiveCap hair is already very short// <</if>> <</nobr>> <<nobr>> -Her pubic hair, if present, is $activeSlave.pubicHColor. +$possessiveCap pubic hair, if present, is $activeSlave.pubicHColor. <br> -Dye her pubic hair: +Dye $possessive pubic hair: [[Blonde|Salon][$activeSlave.pubicHColor to "blonde",$cash -= $modCost]] | [[Golden|Salon][$activeSlave.pubicHColor to "golden",$cash -= $modCost]] | [[Platinum blonde|Salon][$activeSlave.pubicHColor to " platinum blonde",$cash -= $modCost]] @@ -308,12 +308,12 @@ Dye her pubic hair: <</nobr>> <<nobr>> -Her pubic hair is $activeSlave.pubicHStyle. +$possessiveCap pubic hair is $activeSlave.pubicHStyle. <br> -Style her pubic hair: - [[Hairless|Salon][$activeSlave.pubicHStyle to "hairless",$cash -= $modCost]] +Style $possessive pubic hair: + [[Hairless|Salon][$activeSlave.pubicHStyle to "hairless",$cash -= $modCost]] | [[Waxed|Salon][$activeSlave.pubicHStyle to "waxed",$cash -= $modCost]] | [[Landing strip|Salon][$activeSlave.pubicHStyle to "in a strip",$cash -= $modCost]] | [[Neat|Salon][$activeSlave.pubicHStyle to "neat",$cash -= $modCost]] @@ -324,11 +324,11 @@ Style her pubic hair: <<nobr>> -Her armpit hair, if present, is $activeSlave.underArmHColor. +$possessiveCap armpit hair, if present, is $activeSlave.underArmHColor. <br> -Dye her armpit hair: +Dye $possessive armpit hair: [[Blonde|Salon][$activeSlave.underArmHColor to "blonde",$cash -= $modCost]] | [[Golden|Salon][$activeSlave.underArmHColor to "golden",$cash -= $modCost]] | [[Platinum blonde|Salon][$activeSlave.underArmHColor to " platinum blonde",$cash -= $modCost]] @@ -353,11 +353,11 @@ Dye her armpit hair: <</nobr>> <<nobr>> -Her armpit hair is $activeSlave.underArmHStyle. +$possessiveCap armpit hair is $activeSlave.underArmHStyle. <br> -Style her armpit hair: +Style $possessive armpit hair: [[Hairless|Salon][$activeSlave.underArmHStyle to "hairless",$cash -= $modCost]] | [[Waxed|Salon][$activeSlave.underArmHStyle to "waxed",$cash -= $modCost]] | [[Shaved|Salon][$activeSlave.underArmHStyle to "shaved",$cash -= $modCost]] diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index e3dab87617ecf920002868e2e08088efe04488b3..bd882bb269e19b47c72ff8e15d7e5416348136ad 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -416,10 +416,8 @@ __Fucktoy use preference__: <strong><span id="hole"><<print $activeSlave.toyHole __Body modification__: [[Use remote surgery|Remote Surgery][$degradation to 0]] -<<if $activeSlave.fuckdoll == 0>> - | [[Use body mod studio|Body Modification][$degradation to 0]] - | [[Use auto salon|Salon][$degradation to 0]] -<</if>> +| [[Use body mod studio|Body Modification][$degradation to 0]] +| [[Use auto salon|Salon][$degradation to 0]] <br> @@ -546,7 +544,7 @@ __Aphrodisiacs__: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs <br> <span id="fertilityblock"> -<<if $activeSlave.clothes != "a Fuckdoll suit">> +<<if $activeSlave.fuckdoll == 0>> <<if ($activeSlave.preg < -1)>> //She is sterile// <<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 0))>> @@ -770,14 +768,11 @@ __Diet Base__: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum B <<if $activeSlave.standardReward isnot "situational">> <<click "Situational">><<set $activeSlave.standardReward to "situational">><<replace "#standardReward">><<print $activeSlave.standardReward>><</replace>><</click>> <</if>> -<</if>> - -<<if $activeSlave.assignmentVisible == 1>> -<br> -__Non-Assignment Orgasm Rules__: ''$activeSlave.releaseRules.'' -[[Permit masturbation and interslave sex|Slave Interact][$activeSlave.releaseRules to "permissive"]] -| [[Let her get off with other slaves|Slave Interact][$activeSlave.releaseRules to "sapphic"]] -| [[Only with you|Slave Interact][$activeSlave.releaseRules to "restrictive"]] + <br> + __Non-Assignment Orgasm Rules__: ''$activeSlave.releaseRules.'' + [[Permit masturbation and interslave sex|Slave Interact][$activeSlave.releaseRules to "permissive"]] + | [[Let her get off with other slaves|Slave Interact][$activeSlave.releaseRules to "sapphic"]] + | [[Only with you|Slave Interact][$activeSlave.releaseRules to "restrictive"]] <</if>> <<if $activeSlave.clitPiercing is 3>> diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw index 1581e30da1e4ba59dc96d5ca9b6a56f6e0181557..c492ca0ecec9ae508610ba7f09f1083108bd469d 100644 --- a/src/uncategorized/slaveSummary.tw +++ b/src/uncategorized/slaveSummary.tw @@ -678,6 +678,7 @@ will <</if>> <<set $slaves[_i] to _Slave>> +<<if _Slave.fuckdoll == 0>> <<if $abbreviateRules == 1>> <<switch _Slave.livingRules>> <<case "luxurious">> @@ -741,6 +742,7 @@ Typical punishment: _Slave.standardPunishment. Typical reward: _Slave.standardReward. Release rules: _Slave.releaseRules. <</if>> +<</if>> <<if _Slave.tired != 0>>Tired.<</if>> diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index 6b645c29241db1d9f89144865948e6ea9237893e..9ce668e620b25032c79ab58324b348321c1cdde7 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -792,7 +792,7 @@ $possessiveCap $pronounCap cannot get to $possessive feet unaided, and uses a wheeled stand to support $possessive boobs when $pronoun must walk or remain upright. <</if>> <<else>> - Together they are nearly the same size as $possessive torso, making &object about half boob. + Together they are nearly the same size as $possessive torso, making $object about half boob. <</if>> <<if ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>> <<if $boobAccessibility == 1>> @@ -3741,7 +3741,7 @@ $pronounCap's got a <</if>> <</if>> <</if>> -<<if $activeSlave.fuckdoll > 0>>Every one of them runs through the suit's material, securing it to the Fuckdoll's member.<</if>> +<<if $activeSlave.fuckdoll > 0>><<if $activeSlave.dickPiercing > 0>>Every one of them runs through the suit's material, securing it to the Fuckdoll's member.<</if>><</if>> <</if>> @@ -7923,7 +7923,6 @@ $pronounCap has <<elseif ((($activeSlave.preg > 0) and ($activeSlave.pregType >= 10)) or ($activeSlave.preg > 10) or ($activeSlave.bellyAccessory is "a small empathy belly"))>> - <<if ($activeSlave.bellyAccessory is "an extreme corset")>> $activeSlave.slaveName's growing belly is tightly compressed by $possessive corset causing $object distress. <<elseif ($activeSlave.bellyAccessory is "a corset")>> @@ -8362,9 +8361,9 @@ $pronounCap has $possessiveCap popped navel is pierced with a big ring. <</if>> It's eyecatching, since most of her piercings are hidden by the suit. + <<else>> + $possessiveCap navel piercing runs through the suit's material. <</if>> - <<else>> - $possessiveCap navel piercing runs through the suit's material. <</if>> <<if $activeSlave.physicalAge >= 13>> <<if ($activeSlave.preg > 20 and $activeSlave.pregType >= 10)>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 8f37e734bae7b5c651488093d26bb60513e3c1f3..87317605111146d4be5b6d59aa8c10e16d1d52d0 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -325,7 +325,7 @@ %/ <<widget "SlaveInteractFertility">> <<replace #fertilityblock>> -<<if $activeSlave.clothes != "a Fuckdoll suit">> +<<if $activeSlave.fuckdoll == 0>> <<if ($activeSlave.preg < -1)>> //She is sterile// <<elseif ($activeSlave.pubertyXX == 0) && (($activeSlave.ovaries > 0) || ($activeSlave.mpreg == 0))>> @@ -1473,10 +1473,11 @@ $args[2]: icon UI Display for vector art, 1 for on. <</if>> <<if $args[0].fuckdoll != 0>> <<print "<object type='image/svg+xml' data=" + _folderLoc + "/outfit/boob " +_boobSize +" latex.svg'" + "/></object>">> + <<if $args[0].lactation > 0>><<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">><</if>> <<else>> <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize +".svg'" + "/></object>">> + <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">> <</if>> -<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/boob " +_boobSize + " areola.svg'" + "/></object>">> <<if$args[0].nipplesPiercing ==1>> <<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/boob " +_boobSize +" piercing.svg'" + "/></object>">> <<elseif$args[0].nipplesPiercing ==2>>