diff --git a/src/init/dummy.tw b/src/init/dummy.tw index a130edbea9c455ac8186268183611e1ec563e8db..aba903ccb03ff4bc0e4593dac0ec93b242bc7a23 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -1,4 +1,4 @@ -:: dummy +:: dummy /* This is special passage to avoid false positive error in sanityCheck build script. Do not uncomment anything! @@ -21,5 +21,6 @@ $activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVe $drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs $PC.origRace, $PC.origSkin $SFIDs, $SupportFacilityDecoration, $SupportFacilityEfficiency -$isReady, $fatherID, +$isReady, $fatherID, +$servantsQuartersSpots */ diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw index e1a6642663ad743a46bad9fd908316e08262f617..31d72ef2ef5682f5a6791327dc7783a0f786b165 100644 --- a/src/npc/fRelation.tw +++ b/src/npc/fRelation.tw @@ -79,7 +79,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off <<else>> licking _his2 anus while _he2 humps _himself2 up and down on your cock. <</if>> - Your use of $slaves[$partner].slaveName's mature body is the focus. _He2 finds _himself2 caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $active.slaveName's mouth tour _his2 body. When you finish in _his2 <<if ($slaves[$partner].dick > 0)>>asshole, _his2 daughter hastens to lavish attention on $his mother's well fucked, cum filled butt.<<else>>pussy, _his2 daughter hastens to lavish attention on $his mother's well fucked, cum filled cunt.<</if>> + Your use of $slaves[$partner].slaveName's mature body is the focus. _He2 finds _himself2 caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $activeSlave.slaveName's mouth tour _his2 body. When you finish in _his2 <<if ($slaves[$partner].dick > 0)>>asshole, _his2 daughter hastens to lavish attention on $his mother's well fucked, cum filled butt.<<else>>pussy, _his2 daughter hastens to lavish attention on $his mother's well fucked, cum filled cunt.<</if>> <<set $activeSlave.oralCount += 2, $slaves[$partner].oralCount += 2, $oralTotal += 2>> <<PartnerVCheck>> <<elseif canDoVaginal($activeSlave) && canDoVaginal($slaves[$partner]) && canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && (_activeSlaveRel == "twin")>> @@ -106,7 +106,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off <<BothVCheck>> <<PartnerVCheck>> <<elseif ["friend with benefits", "lover", "slave wife"].includes(_activeSlaveRel) && ($activeSlave.devotion > 20) && ($slaves[$partner].devotion > 20)>> - $activeSlave.slaveName and $slaves[$partner].slaveName eagerly repair to the couch and arrange themselves face to face so they can make out and enjoy each other's bodies as you enjoy theirs. You decide not to set up an elaborate threesome, and just <<if ($PC.dick == 0)>>engage in a little tribadism with<<else>>fuck<</if>> whatever hole catches your eye next. They rarely break their intimate kissing, forming between the two of them a loving entity on the couch with all sorts of interesting parts to experience. They're sex slaves, and you're fucking them, but they're also lovers who are very comfortable in each others' arms, kissing, fondling each other, and <<if ($PC.dick == 0)>>enjoying your pussy loving<<else>>taking your dick<</if>>. + $activeSlave.slaveName and $slaves[$partner].slaveName eagerly retire to the couch and arrange themselves face to face so they can make out and enjoy each other's bodies as you enjoy theirs. You decide not to set up an elaborate threesome, and just <<if ($PC.dick == 0)>>engage in a little tribadism with<<else>>fuck<</if>> whatever hole catches your eye next. They rarely break their intimate kissing, forming between the two of them a loving entity on the couch with all sorts of interesting parts to experience. They're sex slaves, and you're fucking them, but they're also lovers who are very comfortable in each others' arms, kissing, fondling each other, and <<if ($PC.dick == 0)>>enjoying your pussy loving<<else>>taking your dick<</if>>. <<BothVCheck>> <<PartnerVCheck>> <<else>> diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw index 3cbef015dc492b5e01c1ab6306c97305155d25a6..49f24ac6e0a3165ac62c850548fdbd1c80cf9f9e 100644 --- a/src/uncategorized/bodyModification.tw +++ b/src/uncategorized/bodyModification.tw @@ -20,7 +20,7 @@ <<set $activeSlave.health -= 10>> <<unset $brandApplied>> <</if>> - <<if $activeSlave.fuckdoll == 0>> + <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <<if $degradation > 1>> <<if $degradation > 5>> <<if $activeSlave.devotion <= 50 && $activeSlave.trust < -50>> @@ -59,7 +59,7 @@ <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>> <<elseif $activeSlave.devotion <= 95>> @@.mediumorchid;saddened@@ you decided to take out $possessive tongue piercings yourself. $pronounCap's afraid this means something about $possessive future as a suck slut. - <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>> + <<set $activeSlave.devotion += ($activeSlave.tonguePiercing-_slaveBeforeSession.tonguePiercing)*2>> <</if>> <</if>> <</if>> @@ -129,7 +129,7 @@ <<set $activeSlave.devotion += ($activeSlave.dickPiercing-_slaveBeforeSession.dickPiercing)*2>> <<elseif $activeSlave.devotion <= 95>> @@.mediumorchid;saddened@@ you decided to take out $possessive dick<<if $activeSlave.scrotum>> and ballsack<</if>> piercings yourself. $pronounCap passionately loves using $possessive penis, and $pronoun's concerned you're planning to let $object do less of that. - <<set $activeSlave.devotion += ($activeSlave.dickPiercing-_slaveBeforeSession.dickPiercing)*2>> + <<set $activeSlave.devotion += ($activeSlave.dickPiercing-_slaveBeforeSession.dickPiercing)*2>> <</if>> <</if>> <</if>> @@ -145,7 +145,7 @@ <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>> <<elseif $activeSlave.devotion <= 95>> @@.mediumorchid;saddened@@ you decided to take out $possessive backdoor piercings yourself. $pronounCap will miss the constant anal titillation, and $pronoun's worried this means you're becoming less interested in her butthole. - <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>> + <<set $activeSlave.devotion += ($activeSlave.anusPiercing-_slaveBeforeSession.anusPiercing)*2>> <</if>> <</if>> <</if>> @@ -247,7 +247,7 @@ <<case "bleached">> horrified, and then shudders convulsively, but can't look away. <<case "flowers" "tribal patterns">> - torn between fascination at the intricate design and horror at having her anus permanently tattooed. + torn between fascination at the intricate design and horror at having her anus permanently tattooed. <<case "advertisements" "rude words" "sacrilege" "sacrament" "degradation" "possessive" "paternalist">> her mouth working as she spells out the words tattooed in a ring around her asshole. She starts to cry as their meaning sinks in. <<default>> @@ -337,25 +337,25 @@ /*DESCRIPTIONS */ <br><br> -Piercings: +Piercings: <<if _piercingCount == 0>> Her smooth $activeSlave.skin skin is completely unpierced. <</if>> -<<if $activeSlave.earPiercing > 0 >><br> <<earPiercingDescription>><</if>> -<<if $activeSlave.nosePiercing > 0 >><br> <<nosePiercingDescription>><</if>> -<<if $activeSlave.eyebrowPiercing > 0 >><br> <<eyebrowPiercingDescription>><</if>> -<<if $activeSlave.lipsPiercing > 0 >><br> <<lipsPiercingDescription>><</if>> -<<if $activeSlave.tonguePiercing > 0 >><br> <<tonguePiercingDescription>><</if>> -<<if $activeSlave.nipplesPiercing > 0 >><br> <<nipplesPiercingDescription>><</if>> -<<if $activeSlave.areolaePiercing > 0 >><br> <<areolaePiercingDescription>><</if>> +<<if $activeSlave.earPiercing > 0 >><br> <<earPiercingDescription>><</if>> +<<if $activeSlave.nosePiercing > 0 >><br> <<nosePiercingDescription>><</if>> +<<if $activeSlave.eyebrowPiercing > 0 >><br> <<eyebrowPiercingDescription>><</if>> +<<if $activeSlave.lipsPiercing > 0 >><br> <<lipsPiercingDescription>><</if>> +<<if $activeSlave.tonguePiercing > 0 >><br> <<tonguePiercingDescription>><</if>> +<<if $activeSlave.nipplesPiercing > 0 >><br> <<nipplesPiercingDescription>><</if>> +<<if $activeSlave.areolaePiercing > 0 >><br> <<areolaePiercingDescription>><</if>> <<if $activeSlave.navelPiercing > 0 >><br> <<navelPiercingDescription>><</if>> -<<if $activeSlave.corsetPiercing > 0 >><br> <<CorsetPiercingDescription>><</if>> -<<if $activeSlave.clitPiercing > 0 >><br> <<clitPiercingDescription>><</if>> -<<if $activeSlave.vaginaPiercing > 0 >><br> <<vaginaPiercingDescription>><</if>> -<<if $activeSlave.dickPiercing > 0 >><br> <<dickPiercingDescription>><</if>> -<<if $activeSlave.anusPiercing > 0 >><br> <<anusPiercingDescription>><</if>> +<<if $activeSlave.corsetPiercing > 0 >><br> <<CorsetPiercingDescription>><</if>> +<<if $activeSlave.clitPiercing > 0 >><br> <<clitPiercingDescription>><</if>> +<<if $activeSlave.vaginaPiercing > 0 >><br> <<vaginaPiercingDescription>><</if>> +<<if $activeSlave.dickPiercing > 0 >><br> <<dickPiercingDescription>><</if>> +<<if $activeSlave.anusPiercing > 0 >><br> <<anusPiercingDescription>><</if>> <br><<chastityPiercingDescription>> @@ -408,7 +408,7 @@ Choose piercing style: <</if>> <<if ($activeSlave.dick > 0)>> <<if $activeSlave.dickPiercing != 1>><<set $activeSlave.dickPiercing = 1>> <<set $cash -= $modCost>><</if>> - <</if>> + <</if>> <<if $activeSlave.anusPiercing != 1>><<set $activeSlave.anusPiercing = 1>> <<set $cash -= $modCost>><</if>> <<goto "Body Modification">> <</link>> @@ -434,7 +434,7 @@ Choose piercing style: <<if ($activeSlave.vagina != -1)>> <<if $activeSlave.vaginaPiercing != 1>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 1, $cash -= $modCost]]<</if>> <</if>> -<<if ($activeSlave.dick > 0)>> +<<if ($activeSlave.dick > 0)>> <<if $activeSlave.dickPiercing != 1>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 1, $cash -= $modCost]]<</if>> <</if>> <<if $activeSlave.anusPiercing != 1>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 1, $cash -= $modCost]]<</if>> @@ -464,7 +464,7 @@ Choose piercing style: <</if>> <<if ($activeSlave.dick > 0)>> <<if $activeSlave.dickPiercing != 2>><<set $activeSlave.dickPiercing = 2>> <<set $cash -= $modCost, $degradation += 1>><</if>> - <</if>> + <</if>> <<if $activeSlave.anusPiercing != 2>><<set $activeSlave.anusPiercing = 2>> <<set $cash -= $modCost, $degradation += 1>><</if>> <<goto "Body Modification">> <</link>> @@ -490,7 +490,7 @@ Choose piercing style: <<if ($activeSlave.vagina != -1)>> <<if $activeSlave.vaginaPiercing != 2>> | [[Vagina|Body Modification][$activeSlave.vaginaPiercing = 2, $cash -= $modCost,$degradation += 1]]<</if>> <</if>> -<<if ($activeSlave.dick > 0)>> +<<if ($activeSlave.dick > 0)>> <<if $activeSlave.dickPiercing != 2>> | [[Dick|Body Modification][$activeSlave.dickPiercing = 2, $cash -= $modCost,$degradation += 1]]<</if>> <</if>> <<if $activeSlave.anusPiercing != 2>> | [[Anus|Body Modification][$activeSlave.anusPiercing = 2, $cash -= $modCost,$degradation += 1]]<</if>> @@ -554,7 +554,7 @@ Remove piercings from: /* TATTOOS */ -Tattoos: +Tattoos: <<if $activeSlave.shouldersTat != 0>> <br> <<shouldersTatDescription>><<set _hasTat = 1>><</if>> <<if $activeSlave.lipsTat != 0>> <br> <<lipsTatDescription>><<set _hasTat = 1>><</if>> <<if $activeSlave.boobsTat != 0>> <br> <<boobsTatDescription>><<set _hasTat = 1>><</if>> @@ -840,10 +840,10 @@ Custom Tats: <br><br> -/* Branding */ +/* Branding */ -Branding: +Branding: <<if $activeSlave.brand != 0>> <<brandDescription>> [[Remove Brand|Body Modification][$brandApplied = 0, $activeSlave.brand = 0,$cash -= $modCost,$degradation -= 10]] @@ -1008,6 +1008,6 @@ Choose a site for branding: <<set $cash -= $modCost>> <<set $degradation += 10>> <<goto "Body Modification">> - <</link>>? + <</link>>? <</if>> //Branding will slightly reduce $possessive beauty but may slowly increase your reputation.// diff --git a/src/uncategorized/bodyModificationDegradation.tw b/src/uncategorized/bodyModificationDegradation.tw index 7f3f3be727cf9d0d673b92ff3485466d900514d7..c6da6e33359b2cf1b61ad8a421051590f7789988 100644 --- a/src/uncategorized/bodyModificationDegradation.tw +++ b/src/uncategorized/bodyModificationDegradation.tw @@ -2,6 +2,6 @@ <<if ($degradation == 0)>> <<goto "Slave Interact">> -<<else>> +<<elseif $degradation > 0 && $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <<goto "Body Modification Reaction">> <</if>> diff --git a/src/uncategorized/bodyModificationReaction.tw b/src/uncategorized/bodyModificationReaction.tw index 94874e9de3ac4f31d80025c62d14977b7ef71b40..7fc7123efcdc853830356b385fb2fd54726e8b13 100644 --- a/src/uncategorized/bodyModificationReaction.tw +++ b/src/uncategorized/bodyModificationReaction.tw @@ -12,7 +12,7 @@ As you cast off her bindings<<if canSee($activeSlave)>> and <<if ($activeSlave.a <<set $brandApplied = 0>> <<set $activeSlave.health -= 10>> <</if>> - +<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <<if ($degradation > 10) && ($activeSlave.devotion <= 50) && ($activeSlave.trust < -50)>> She is appalled by the whorish spectacle you have made of her. She @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect her submission. <<set $activeSlave.trust -= 10>> @@ -42,7 +42,7 @@ As you cast off her bindings<<if canSee($activeSlave)>> and <<if ($activeSlave.a <<else>> She shows no real reaction to your modifications. <</if>> - +<</if>> <<set $degradation = 0>> <</nobr>>\