diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index a4b978c6d04a8a11e09b0b9e8e8d49b724764b8f..846b2e13494e71090ee51ece4c65f9d2f764c71f 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -751,7 +751,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s <<set $rep += $FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel)>> <<set $arcologies[0].FSGenderRadicalist += 0.05*$FSSingleSlaveRep>> <</if>> - <<if $arcologies[0].FSGenderRestart != "unset" && $activeSlave.pubertyXY == 1>> + <<if $arcologies[0].FSRestart != "unset" && $activeSlave.pubertyXY == 1>> Society @@color:green;approves@@ of your promptly gelding her; this advances the idea that all only the elite should breed. <<set $rep += $FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>> <<set $arcologies[0].FSRestart += 0.05*$FSSingleSlaveRep>> diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index be9ab69696373b153ba5ddad6ef6723c2370f85e..2e3b2e95ee679321c3b8fe3451c42af4adc4ca7c 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -371,6 +371,7 @@ She waits anxiously for your decision. <<case "twin">> <<set $activeSlave.origin to "She was recruited into your service by her twin sister.">> + <<set $activeSlave.birthWeek = $eventSlave.birthWeek>> <</switch>> @@ -547,11 +548,11 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo <<set $eventSlave.mother = $missingParentID>> <<set $eventSlave.father = $missingParentID>> <<set $activeSlave.mother = $missingParentID>> - <<set $activeSlave.mother = $missingParentID>> + <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> <<elseif $eventSlave.mother != 0 && $eventSlave.father != 0>> <<set $activeSlave.mother = $eventSlave.mother>> - <<set $activeSlave.mother = $eventSlave.father>> + <<set $activeSlave.father = $eventSlave.father>> <<elseif $eventSlave.mother != 0>> <<set $activeSlave.mother = $eventSlave.mother>> <<set $activeSlave.father = $missingParentID>> @@ -576,11 +577,11 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo <<set $eventSlave.mother = $missingParentID>> <<set $eventSlave.father = $missingParentID>> <<set $activeSlave.mother = $missingParentID>> - <<set $activeSlave.mother = $missingParentID>> + <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> <<elseif $eventSlave.mother != 0 && $eventSlave.father != 0>> <<set $activeSlave.mother = $eventSlave.mother>> - <<set $activeSlave.mother = $eventSlave.father>> + <<set $activeSlave.father = $eventSlave.father>> <<elseif $eventSlave.mother != 0>> <<set $activeSlave.mother = $eventSlave.mother>> <<set $activeSlave.father = $missingParentID>> @@ -605,11 +606,11 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo <<set $eventSlave.mother = $missingParentID>> <<set $eventSlave.father = $missingParentID>> <<set $activeSlave.mother = $missingParentID>> - <<set $activeSlave.mother = $missingParentID>> + <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> <<elseif $eventSlave.mother != 0 && $eventSlave.father != 0>> <<set $activeSlave.mother = $eventSlave.mother>> - <<set $activeSlave.mother = $eventSlave.father>> + <<set $activeSlave.father = $eventSlave.father>> <<elseif $eventSlave.mother != 0>> <<set $activeSlave.mother = $eventSlave.mother>> <<set $activeSlave.father = $missingParentID>> @@ -634,11 +635,11 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo <<set $eventSlave.mother = $missingParentID>> <<set $eventSlave.father = $missingParentID>> <<set $activeSlave.mother = $missingParentID>> - <<set $activeSlave.mother = $missingParentID>> + <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> <<elseif $eventSlave.mother != 0 && $eventSlave.father != 0>> <<set $activeSlave.mother = $eventSlave.mother>> - <<set $activeSlave.mother = $eventSlave.father>> + <<set $activeSlave.father = $eventSlave.father>> <<elseif $eventSlave.mother != 0>> <<set $activeSlave.mother = $eventSlave.mother>> <<set $activeSlave.father = $missingParentID>> @@ -663,11 +664,11 @@ You look up the $activeSlave.relation. She costs ¤$slaveCost, a bargain, but yo <<set $eventSlave.mother = $missingParentID>> <<set $eventSlave.father = $missingParentID>> <<set $activeSlave.mother = $missingParentID>> - <<set $activeSlave.mother = $missingParentID>> + <<set $activeSlave.father = $missingParentID>> <<set $missingParentID-->> <<elseif $eventSlave.mother != 0 && $eventSlave.father != 0>> <<set $activeSlave.mother = $eventSlave.mother>> - <<set $activeSlave.mother = $eventSlave.father>> + <<set $activeSlave.father = $eventSlave.father>> <<elseif $eventSlave.mother != 0>> <<set $activeSlave.mother = $eventSlave.mother>> <<set $activeSlave.father = $missingParentID>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 502d40e66ad97ed3fe51fd89110d61021465bc08..c05adddda8c731dbae64adf5fe4d2149aa327dd5 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1110,48 +1110,97 @@ <</if>> <<if _SlaveI.mother == $slaves[_j].ID || _SlaveI.father == $slaves[_j].ID || areSisters(_SlaveI, $slaves[_j]) > 0>> <<if _SlaveI.rivalry != $slaves[_j].ID>> - _SlaveI.slaveName is @@color:gold;painfully concious@@ that her <<if _SlaveI.mother == $slaves[_j].ID>> - mother + _SlaveI.slaveName is @@color:gold;painfully concious@@ that her mother $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. + <<set _SlaveI.trust -= 1>> + <<set _SlaveI.devotion += 3>> <<elseif _SlaveI.father == $slaves[_j].ID>> - father + _SlaveI.slaveName is @@color:gold;painfully concious@@ that her father $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. + <<set _SlaveI.trust -= 1>> + <<set _SlaveI.devotion += 3>> <<elseif areSisters(_SlaveI, $slaves[_j]) == 1>> - twin sister + _SlaveI.slaveName is @@color:gold;painfully concious@@ that her twin sister $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. + <<set _SlaveI.trust -= 1>> + <<set _SlaveI.devotion += 3>> <<elseif areSisters(_SlaveI, $slaves[_j]) == 2>> - sister + _SlaveI.slaveName is @@color:gold;painfully concious@@ that her sister $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. + <<set _SlaveI.trust -= 1>> + <<set _SlaveI.devotion += 3>> <<elseif areSisters(_SlaveI, $slaves[_j]) == 3>> - half-sister + _SlaveI.slaveName is @@color:gold;painfully concious@@ that her half-sister $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. + <<set _SlaveI.trust -= 1>> + <<set _SlaveI.devotion += 3>> <</if>> - $slaves[_j].slaveName is also your slave and might suffer if either of them displeases you, and @@color:hotpink;tries to obey@@ as best she can. - <<set _SlaveI.trust -= 1>> - <<set _SlaveI.devotion += 3>> <</if>> <</if>> <<else>> <<if totalRelatives(_SlaveI) > 0>> - _SlaveI.slaveName knows that her <<if _SlaveI.mother == $slaves[_j].ID>> - mother + _SlaveI.slaveName knows that her mother $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@color:hotpink;happy@@ for her. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes she'll avoid punishment. + <<else>> + hates being a sex slave, and is @@color:gold;afraid@@ for her. + <<set _SlaveI.trust -= 1>> + <</if>> <<elseif _SlaveI.father == $slaves[_j].ID>> - father + _SlaveI.slaveName knows that her father $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@color:hotpink;happy@@ for her. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes she'll avoid punishment. + <<else>> + hates being a sex slave, and is @@color:gold;afraid@@ for her. + <<set _SlaveI.trust -= 1>> + <</if>> <<elseif $slaves[_j].mother == _SlaveI.ID || $slaves[_j].father == _SlaveI.ID>> - daughter + _SlaveI.slaveName knows that her daughter $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@color:hotpink;happy@@ for her. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes she'll avoid punishment. + <<else>> + hates being a sex slave, and is @@color:gold;afraid@@ for her. + <<set _SlaveI.trust -= 1>> + <</if>> <<elseif areSisters(_SlaveI, $slaves[_j]) == 1>> - twin sister + _SlaveI.slaveName knows that her twin sister $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@color:hotpink;happy@@ for her. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes she'll avoid punishment. + <<else>> + hates being a sex slave, and is @@color:gold;afraid@@ for her. + <<set _SlaveI.trust -= 1>> + <</if>> <<elseif areSisters(_SlaveI, $slaves[_j]) == 2>> - sister + _SlaveI.slaveName knows that her sister $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@color:hotpink;happy@@ for her. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes she'll avoid punishment. + <<else>> + hates being a sex slave, and is @@color:gold;afraid@@ for her. + <<set _SlaveI.trust -= 1>> + <</if>> <<elseif areSisters(_SlaveI, $slaves[_j]) == 3>> - half-sister - <</if>> - $slaves[_j].slaveName - <<if $slaves[_j].devotion > 50>> - loves being your sex slave, and is @@color:hotpink;happy@@ for her. - <<set _SlaveI.devotion += 4>> - <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> - is an obedient sex slave, and hopes she'll avoid punishment. - <<else>> - hates being a sex slave, and is @@color:gold;afraid@@ for her. - <<set _SlaveI.trust -= 1>> + _SlaveI.slaveName knows that her half-sister $slaves[_j].slaveName + <<if $slaves[_j].devotion > 50>> + loves being your sex slave, and is @@color:hotpink;happy@@ for her. + <<set _SlaveI.devotion += 4>> + <<elseif ($slaves[_j].devotion > 20) || ($slaves[_j].trust < -20)>> + is an obedient sex slave, and hopes she'll avoid punishment. + <<else>> + hates being a sex slave, and is @@color:gold;afraid@@ for her. + <<set _SlaveI.trust -= 1>> + <</if>> <</if>> <</if>> <</if>>