From cd250caa557215aa6c857830f5a438c1bd30af09 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Mon, 15 Jul 2019 18:20:06 -0500 Subject: [PATCH] PreSwitch --- src/facilities/nursery/childInteract.tw | 14 ++++++++------ src/uncategorized/slaveInteract.tw | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index d8e9aa3ca12..198d3724cec 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -181,7 +181,7 @@ | <<link "Check $his deadliness @@.red;FOR TESTING@@">><<replace "#miniscene">><<set $childSex = 1>><<include "Deadliness">><br> <</replace>><</link>> <</if>> | <<link "Abuse $him">><<replace "#miniscene">><<set $childSex = 1>><<include "FAbuse">><</replace>><</link>> - <<if $seeIncest != 0>> + <<if $seeIncest == 1>> <<if $familyTesting == 1>> <<for $i = 0; $i < _SL; $i++>> <<if $activeChild.mother == $slaves[$i].ID>> @@ -195,19 +195,20 @@ <<if $activeChild.sisters > 0>> <<set $relation = 0>> <<for $i = 0; $i < _SL; $i++>> + <<setLocalPronouns $slaves[$i] 2>> <<if areSisters($activeChild, $slaves[$i]) > 0 && !isSlaveAvailable($slaves[$i])>> <<set $relation++>> <</if>> <</for>> <<if $relation == $activeChild.sisters>> <<if $activeChild.sisters == 1>> - //$His sister is unavailable// + //$His _sister2 is unavailable// <<else>> //$His sisters are unavailable// <</if>> <<else>> <<if $activeChild.sisters == 1>> - | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>> + | <<link "Fuck $him with $his _sister2">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>> <<else>> | <<link "Fuck $him with one of $his sisters">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "sister">><<include "FRelation">><br> <</replace>><</link>> <</if>> @@ -215,14 +216,15 @@ <</if>> <<else>> <<if ($activeChild.relation != 0)>> - <<set _assayedSlave = getSlave($activeChild.relationTarget)>> + <<set _assayedSlave = getSlave($activeSlave.relationTarget)>> <<if isSlaveAvailable(_assayedSlave)>> + <<setLocalPronouns _assayedSlave 2>> <<if ($activeChild.relation == "mother")>> - | <<link "Fuck $him with $his daughter">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>> + | <<link "Fuck $him with $his _daughter2">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>> <<elseif ($activeChild.relation == "daughter")>> | <<link "Fuck $him with $his mother">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>> <<elseif ($activeChild.relation == "sister")>> - | <<link "Fuck $him with $his sister">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>> + | <<link "Fuck $him with $his _sister2">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>> <<elseif ($activeChild.relation == "twin")>> | <<link "Fuck $him with $his twin">><<replace "#miniscene">><<set $childSex = 1>><<set $partner = "relation">><<include "FRelation">><br> <</replace>><</link>> <</if>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 44ecf45118c..33058ff520a 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -241,7 +241,7 @@ <</if>> <</if>> | <<link "Abuse $him">><<replace "#miniscene">><<include "FAbuse">><</replace>><</link>> - <<if $seeIncest != 0>> + <<if $seeIncest == 1>> <<if $familyTesting == 1>> <<for $i = 0; $i < _SL; $i++>> <<if $activeSlave.mother == $slaves[$i].ID>> -- GitLab