Merge branch 'luxembourg' into 'pregmod-master'

recETS Changes

See merge request pregmodfan/fc-pregmod!3061

src/npc/newSlaveIncestSex.tw

@@ -5,56 +5,56 @@
 /* setup pronouns (switch on vagina for sisters and herms regardless of genes) */
 <<set _oneshe = "she" >>
 <<set _oneher = "her" >>
-<<if $sissy.vagina == -1 >>
+<<if $relative.vagina == -1 >>
 	<<set _oneshe = "he" >>
 	<<set _oneher = "his" >>
 <</if>>
 <<set _othershe = "she" >>
 <<set _otherher = "her" >>
-<<if $activeSlave.vagina == -1 >>
+<<if $relative2.vagina == -1 >>
 	<<set _othershe = "he" >>
 	<<set _otherher = "his" >>
 <</if>>
 
 /* setup identifiers */
 <<if $familyTesting == 1 >>
-	<<set _one = relativeTerm($activeSlave, $sissy)>> /* sissy is active's blank */
-	<<set _other = relativeTerm($sissy, $activeSlave)>> /* active is sissy's blank */
+	<<set _one = relativeTerm($relative2, $relative)>> /* relative is relative2's blank */
+	<<set _other = relativeTerm($relative, $relative2)>> /* relative2 is relative's blank */
 <<else>>
-	<<if $sissy.actualAge == $activeSlave.actualAge>>
+	<<if $relative.actualAge == $relative2.actualAge>>
 		<<set _one = "twin">>
 		<<set _other = "twin">>
 	<<else>>
-		<<set _one = $sissy.relation >>
-		<<set _other = $activeSlave.relation >>
+		<<set _one = $relative.relation>>
+		<<set _other = $relative2.relation>>
 	<</if>>
 <</if>>
 
 /* gender relation descriptions */
 /* TODO: is there a function for gender-aware relationships? */
-<<if $sissy.vagina == -1 >>
+<<if $relative.vagina == -1 >>
 	<<set _one = _one.replace("mother","father").replace("sister","brother").replace("daughter","son") >>
 <</if>>
-<<if $activeSlave.vagina == -1 >>
+<<if $relative2.vagina == -1 >>
 	<<set _other = _other.replace("mother","father").replace("sister","brother").replace("daughter","son") >>
 <</if>>
 
 <<if _one == _other >>
 /* two sisters / brothers: identify by age */
-	<<if $sissy.actualAge > $activeSlave.actualAge>>
+	<<if $relative.actualAge > $relative2.actualAge>>
 		<<set _onelong = "older "+_one >>
 		<<set _otherlong = "younger "+_other >>
-	<<elseif $sissy.actualAge < $activeSlave.actualAge>>
+	<<elseif $relative.actualAge < $relative2.actualAge>>
 		/* Note: this is never true (at least without extended family mode) */
 		<<set _onelong = "younger "+_one >>
 		<<set _otherlong = "older "+_other >>
 	<<else>> /* twins, no real differentiation */
-		<<if $sissy.vagina == -1 && _one != "brother">>
+		<<if $relative.vagina == -1 && _one != "brother">>
 			<<set _onelong = _one + " brother">>
 		<<elseif _one != "sister">>
 			<<set _onelong = _one + " sister">>
 		<</if>>
-		<<if $activeSlave.vagina == -1 && _one != "brother">>
+		<<if $relative2.vagina == -1 && _one != "brother">>
 			<<set _otherlong = _other + " brother" >>
 		<<elseif _one != "sister">>
 			<<set _otherlong = _other + " sister" >>
@@ -69,13 +69,13 @@
 <<set _actions = [] >>
 <<set _secretions = [] >>
 <<set _genitals = [] >>
-<<if ($sissy.dick == 0) || ($activeSlave.dick == 0) >>
+<<if ($relative.dick == 0) || ($relative2.dick == 0) >>
 	/* at least one vagina is present */
 	<<run _actions.push("clit-flinging tongue-action") >> /* TODO: check oral skill of slaves */
 	<<run _secretions.push("femcum") >>
 	<<run _genitals.push("licked wet cunt") >>
 <</if>>
-<<if ($sissy.dick != 0) || ($activeSlave.dick != 0) >>
+<<if ($relative.dick != 0) || ($relative2.dick != 0) >>
 	/* at least one penis is present */
 	<<run _actions.push("nose-pressed-against-balls deep-throats") >> /* TODO: check oral skill of slaves */
 	<<run _secretions.push("semen") >>
@@ -88,13 +88,13 @@
 <</if>>
 
 <<if $debugMode >>
-SISSY SLAVE (FIRST): <br/>
-_one ($sissy.relation) <br/>
-$sissy.physicalAge <br/>
+RELATIVE SLAVE (FIRST): <br/>
+_one ($relative.relation) <br/>
+$relative.physicalAge <br/>
 _oneshe / _oneher <br/>
-ACTIVE SLAVE (SECOND): <br/>
-_other ($activeSlave.relation) <br/>
-$activeSlave.physicalAge <br/>
+RELATIVE2 SLAVE (SECOND): <br/>
+_other ($relative2.relation) <br/>
+$relative2.physicalAge <br/>
 _othershe / _otherher <br/>
 <</if>>
 
@@ -105,27 +105,27 @@ Now that you own them, you want to see proof of their love for each other. You o
 Hesitantly, they assume the 69 position on your couch. They have either never done this in front of a stranger or have never had sex this way before. You remind them that they are sex slaves now. They need to follow all orders, including sexual ones, so this is a relatively gentle start.
 <br/><br/>
 <<if _one == "twin">>One _one<<else>>The _onelong<</if>> shows more boldness as _oneshe lowers _oneher head towards _oneher _otherlong's privates.
-<<if $activeSlave.dick == 0 >>
+<<if $relative2.dick == 0 >>
 Carefully, _oneshe spreads _oneher _other's labia. Then _oneshe continues to give _oneher _other's exposed pussy a few experimental licks. At first, _oneher efforts seem to be futile, but after a while the _otherlong's clit becomes engorged and _otherher juices start flowing.
 <<else>>
 Uncertain, _oneshe grabs _oneher <<if _other == "twin">>_other<<else>>_otherlong<</if>>'s penis. Then _oneshe puts _oneher _other's flaccid member into _oneher mouth and gives it an experimental suck. At first, _oneher efforts seem to be futile, but after a while the _otherlong sports a nice, hard erection.
 <</if>>
 As the _other's arousal grows, _othershe becomes more eager to please _otherher _onelong, too. Going down on _otherher's lover's genitals, _othershe starts to mimic _otherher ministrations.
-	<<if ($sissy.dick == 0) != ($activeSlave.dick == 0) >>
-	Of course, _othershe has to adapt _otherher actions <<if $sissy.dick == 0 >>from the feelings on _otherher dick to the pussy pressed against _otherher lips.<<else>>from the feelings at _otherher pussy to the dick in _otherher mouth.<</if>>
+	<<if ($relative.dick == 0) != ($relative2.dick == 0) >>
+	Of course, _othershe has to adapt _otherher actions <<if $relative.dick == 0 >>from the feelings on _otherher dick to the pussy pressed against _otherher lips.<<else>>from the feelings at _otherher pussy to the dick in _otherher mouth.<</if>>
 	<</if>>
 <br/><br/>
 You can tell how uncomfortable they are with you watching them, but as they become increasingly worked up, they lose their inhibitions. Soon, you are watching some fairly enthralling <<print $RecETSevent.replace("incest","") >> incest action at your office<<if _actions.length >>, including some enthusiastic <<print _actions.join(" and ")>><</if>>. Eventually, they bring each other to impressive mutual orgasms. Their lusty moans are muffled only by each others' crotches. Spent, exhausted, and with their faces covered in each others <<print _secretions.join(" and ")>>, they untangle to rest comfortably on your couch.
 <br/><br/>
 You indicate them to present themselves to you. Still shaking from the aftershocks of their orgasms, they stand side by side in front of you, panting, naked and with their	_genitals dripping mixed juices. You simply nod, showing your approval. They are visibly relieved, and not only sexually. They are more confident of having made the right choice in enslaving themselves to you, since you seem @@.mediumaquamarine;trustworthy@@ and @@.hotpink;sympathetic.@@ They hug again, kissing and licking the sexual fluids off each others' stained faces.
 <</replace>>
-<<set $sissy.devotion += 4>>
-<<set $sissy.trust += 4>>
-<<set $sissy.oralCount += 1>>
+<<set $relative.devotion += 4>>
+<<set $relative.trust += 4>>
+<<set $relative.oralCount += 1>>
 <<set $oralTotal += 1>>
-<<set $activeSlave.devotion += 4>>
-<<set $activeSlave.trust += 4>>
-<<set $activeSlave.oralCount += 1>>
+<<set $relative2.devotion += 4>>
+<<set $relative2.trust += 4>>
+<<set $relative2.oralCount += 1>>
 <<set $oralTotal += 1>>
 <</link>>
 
@@ -133,13 +133,13 @@ You indicate them to present themselves to you. Still shaking from the aftershoc
 <<link "Show them how cruel life in your arcology can be">>		TODO: this needs to be written 
 <<replace "#result">>
 <</replace>>
-<<set $sissy.devotion -= 4>>
-<<set $sissy.trust -= 4>>
-<<set $sissy.oralCount += 1>>
+<<set $relative.devotion -= 4>>
+<<set $relative.trust -= 4>>
+<<set $relative.oralCount += 1>>
 <<set $oralTotal += 1>>
-<<set $activeSlave.devotion -= 4>>
-<<set $activeSlave.trust -= 4>>
-<<set $activeSlave.oralCount += 1>>
+<<set $relative2.devotion -= 4>>
+<<set $relative2.trust -= 4>>
+<<set $relative2.oralCount += 1>>
 <<set $oralTotal += 1>>
 <</link>>
 */

src/uncategorized/BackwardsCompatibility.tw

@@ -3705,7 +3705,9 @@ Done!
 <<if def $individualCosts>>
 	<<unset $individualCosts>>
 <</if>>
-
+<<if def $sissy>>
+	<<unset $sissy>>
+<</if>>
 <<if $DefaultBirthDestination === "">>
 	<<set $DefaultBirthDestination = "anywhere">>
 <</if>>

src/uncategorized/nextWeek.tw

@@ -375,7 +375,7 @@
 <<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $qualifiedNicknames = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $qualifiedFS = [], $eligibleSlaves = [], $slavesInLine = []>>
 
 /% Slave Objects using 0 instead of null. Second most memory eaten up. %/
-<<set $activeSlave = 0, $eventSlave = 0, $slaveWithoutBonuses = 0, $subSlave = 0, $milkTap = 0, $relation = 0>>
+<<set $activeSlave = 0, $eventSlave = 0, $slaveWithoutBonuses = 0, $subSlave = 0, $milkTap = 0, $relation = 0, $relative = 0, $relative2 = 0>>
 
 /% Slave Objects that never get zeroed so null them here. Second most memory eaten up. %/
 <<set $beforeGingering = null, $sibling = null>>