diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 6c7f790943db7b324a355f10f22692283d5e374b..e063ae5201f5cef8502f1a78a26bf2950f395e9d 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1490,89 +1490,21 @@ <</if>> <<if _SlaveI.mother == $slaves[_j].ID || _SlaveI.father == $slaves[_j].ID || areSisters(_SlaveI, $slaves[_j]) > 0>> <<if _SlaveI.rivalry != $slaves[_j].ID>> - <<if _SlaveI.mother == $slaves[_j].ID>> - _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his mother $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can. - <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>> - <<elseif _SlaveI.father == $slaves[_j].ID>> - _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his father $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can. - <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>> - <<else>> _SlaveI.slaveName is @@.gold;painfully conscious@@ that $his <<print relativeTerm(_SlaveI, $slaves[_j])>> $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can. <<set _SlaveI.trust -= 1, _SlaveI.devotion += 3>> <</if>> - <</if>> <</if>> <<else>> <<if totalRelatives(_SlaveI) > 0>> - <<if _SlaveI.mother == $slaves[_j].ID>> - _SlaveI.slaveName knows that $his mother $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@.hotpink;happy@@ for _him2. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes _he2'll avoid punishment. - <<else>> - hates being a sex slave, and is @@.gold;afraid@@ for _him2. - <<set _SlaveI.trust -= 1>> - <</if>> - <<elseif _SlaveI.father == $slaves[_j].ID>> - _SlaveI.slaveName knows that $his father $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@.hotpink;happy@@ for _him2. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes _he2'll avoid punishment. - <<else>> - hates being a sex slave, and is @@.gold;afraid@@ for _him2. - <<set _SlaveI.trust -= 1>> - <</if>> - <<elseif $slaves[_j].mother == _SlaveI.ID || $slaves[_j].father == _SlaveI.ID>> - _SlaveI.slaveName knows that $his daughter $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@.hotpink;happy@@ for _him2. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes _he2'll avoid punishment. - <<else>> - hates being a sex slave, and is @@.gold;afraid@@ for _him2. - <<set _SlaveI.trust -= 1>> - <</if>> + _SlaveI.slaveName knows that $his <<print relativeTerm(_SlaveI, $slaves[_j])>> $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@.hotpink;happy@@ for _him2. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes _he2'll avoid punishment. <<else>> - <<switch areSisters(_SlaveI, $slaves[_j])>> - <<case 1>> - _SlaveI.slaveName knows that $his twin sister $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@.hotpink;happy@@ for _him2. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes _he2'll avoid punishment. - <<else>> - hates being a sex slave, and is @@.gold;afraid@@ for _him2. - <<set _SlaveI.trust -= 1>> - <</if>> - <<case 2>> - _SlaveI.slaveName knows that $his sister $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@.hotpink;happy@@ for _him2. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes _he2'll avoid punishment. - <<else>> - hates being a sex slave, and is @@.gold;afraid@@ for _him2. - <<set _SlaveI.trust -= 1>> - <</if>> - <<case 3>> - _SlaveI.slaveName knows that $his half-sister $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@.hotpink;happy@@ for _him2. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes _he2'll avoid punishment. - <<else>> - hates being a sex slave, and is @@.gold;afraid@@ for _him2. - <<set _SlaveI.trust -= 1>> - <</if>> - <</switch>> + hates being a sex slave, and is @@.gold;afraid@@ for _him2. + <<set _SlaveI.trust -= 1>> <</if>> <</if>> <</if>> @@ -1587,15 +1519,15 @@ <<setLocalPronouns $slaves[_K] 2>> _SlaveI.slaveName <<if _SlaveI.trust < -20>> - <<if _SlaveI.relation == "mother">> + <<if _SlaveI.relation == "mother" || _SlaveI.relation == "father">> is @@.gold;agonizingly aware@@ that $his child $slaves[_K].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does $his best@@ to protect _him2. <<set _SlaveI.trust -= 4, _SlaveI.devotion += 4>> <<else>> - is @@.gold;painfully conscious@@ that $his <<if _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can. + is @@.gold;painfully conscious@@ that $his <<print relativeTerm(_SlaveI, $slaves[_K])>> $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best $he can. <<set _SlaveI.trust -= 2, _SlaveI.devotion += 2>> <</if>> <<else>> - knows that $his <<if _SlaveI.relation == "mother">>daughter<<elseif _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName + knows that $his <<print relativeTerm(_SlaveI, $slaves[_K])>> $slaves[_K].slaveName <<if $slaves[_K].devotion > 50>> loves being your sex slave, and is @@.hotpink;happy@@ for _him2. <<set _SlaveI.devotion += 2>>