From 4e43eafe8e03e41f6eb07f4dbddfc9cef826e38e Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 7 Mar 2017 23:44:55 -0500 Subject: [PATCH] Roll back! --- src/pregmod/newChildIntro.tw | 35 +++++++++++++++++++++++++++- src/uncategorized/saRelationships.tw | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw index 840a336440a..a28b81590d3 100644 --- a/src/pregmod/newChildIntro.tw +++ b/src/pregmod/newChildIntro.tw @@ -45,6 +45,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<set $activeSlave.birthName = $activeSlave.slaveName>> $assistantName registers the new girl as "<<print $activeSlave.slaveName>>" in your registry. <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<if $activeSlave.mother > 0>> <<for _j to 0; _j < $slaves.length; _j++>> @@ -55,6 +58,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName picks a name she thinks you might find attractive; from now on her daughter will be known as "<<print $activeSlave.slaveName>>". <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].relationship == -4>> @@ -63,6 +69,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName picks a name suitable for your daughter; from now on she will be known as "<<print $activeSlave.slaveName>>". <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].ID == $Bodyguard.ID>> @@ -71,6 +80,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. She hopes you'll find it fitting her station. <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].ID == $HeadGirl.ID>> @@ -79,6 +91,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. and hopes it will be a name your other slaves will learn to respect. <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>> @@ -87,6 +102,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName picks a name she hopes you'll like; from now on her daughter will be known as "<<print $activeSlave.slaveName>>". <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <</if>> @@ -102,6 +120,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName picks a name she thinks you might find attractive; from now on her daughter will be known as "<<print $activeSlave.slaveName>>". <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].relationship == -4>> @@ -110,6 +131,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName picks a name suitable for your daughter; from now on she will be known as "<<print $activeSlave.slaveName>>". <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].ID == $Bodyguard.ID>> @@ -118,6 +142,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. She hopes you'll find it fitting her station. <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].ID == $HeadGirl.ID>> @@ -126,6 +153,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName decides on "<<print $activeSlave.slaveName>>" for her daughter. and hopes it will be a name your other slaves will learn to respect. <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>> @@ -134,6 +164,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank <<ParentNames $slaves[_j], $activeSlave>> After some careful consideration, $slaves[_j].slaveName picks a name she hopes you'll like; from now on her daughter will be known as "<<print $activeSlave.slaveName>>". <</replace>> + <<replace "#newName">> + ''__@@color:pink;$activeSlave.slaveName@@__'' + <</replace>> <</click>> <<break>> <</if>> @@ -144,7 +177,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank <br><br> -<span id="newName"> ''__@@color:pink;$activeSlave.slaveName@@__''</span> now stands before your desk +<span id="newName">''__@@color:pink;$activeSlave.slaveName@@__''</span> now stands before your desk <<if $activeSlave.mother > 0 && $activeSlave.father > 0>> alongside her mother _tempMom.slaveName and father _tempDad.slaveName. <<elseif $activeSlave.mother > 0>> diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 85a86c37fe5..8aa2c5629ee 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1,6 +1,6 @@ :: SA relationships [nobr] -<<set _SL = $slaves.length, _SlaveI = _SlaveI, _SlaveJ = null, _J = -1, _K = -1>> +<<set _SL = $slaves.length, _SlaveI = $slaves[$i], _SlaveJ = null, _J = -1, _K = -1>> <<if _SlaveI.fuckdoll == 0>> <<if _SlaveI.relationship == 0>> <<if (_SlaveI.devotion + _SlaveI.trust > 175) && (random(1,3) == 1)>> -- GitLab