From df2fe51acab94ecf984f32fa2ededcffb662fce6 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 28 Feb 2019 13:00:43 -0600
Subject: [PATCH] AssortedThings
---
TODO.txt | 16 +++++++-------
src/js/utilJS.js | 2 +-
src/npc/acquisition.tw | 20 ++++++++++++------
src/npc/startingGirls/commitStartingGirl.tw | 23 +++++++++++----------
src/npc/startingGirls/startingGirls.tw | 2 +-
src/uncategorized/RESS.tw | 10 ++++-----
src/uncategorized/reShowerPunishment.tw | 4 ++--
src/uncategorized/saServeThePublic.tw | 8 +++----
src/uncategorized/saWhore.tw | 6 +++---
src/utility/descriptionWidgets.tw | 4 ++--
src/utility/descriptionWidgetsPiercings.tw | 2 +-
src/utility/extendedFamilyWidgets.tw | 16 ++++++++------
12 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/TODO.txt b/TODO.txt
index a8ce562749c..155de57b220 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,15 +1,15 @@
-further development:
--specialized slave schools
--fortifications
--more levels for militia edict (further militarize society)
--conquering other arcologies?
+Further Development:
+- specialized slave schools
+- fortifications
+- more levels for militia edict (further militarize society)
+- conquering other arcologies?
Events:
--famous criminal escapes to the arcology, followed by another arcology police force
+-famous criminal escapes to the arcology, followed by another arcology's police force
Bugs:
--sometimes troop counts breaks
--sometimes rebel numbers have fractionary parts
+- sometimes troop counts breaks
+- sometimes rebel numbers have fractionary parts
Rules Assistant:
- find a way for the new intense drugs to fit in
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 80ac899eaf3..547798ba739 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1421,7 +1421,7 @@ window.originPronounReplace = /** @param {App.Entity.SlaveState} slave */ functi
case "You acquired her in the last stages of your career as a noted private military contractor.":
case "You never thought you would be capable of impregnating yourself, but years of pleasuring yourself with yourself after missions managed to create her.":
case "A fresh capture once overpowered you and had his way with you. You kept her as a painful reminder to never lower your guard again.":
- case "Your slaving troop kept several girls as fucktoys, you sired her in your favorite.":
+ case "Your slaving troop kept several girls as fucktoys, and you sired her in your favorite.":
case "You enslaved her personally during the last stages of your slaving career.":
case "You sired her in yourself after an arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
case "You conceived her after a male arcology owner, impressed by your work, rewarded you with a night you'll never forget.":
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 41873388045..a8f11887940 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -37,16 +37,24 @@
<</if>>
<<set $PC.geneticQuirks.fertility = 2>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].origin == "She was another of your late master's servants. She spent nine months in your womb, courtesy of your master.">>
- <<set $PC.births += 1>>
- <<set $PC.birthMaster += 1>>
+ <<if $slaves[$i].mother == -1>>
+ <<set $PC.births += 1>>
+ <<if $slaves[$i].father == -1>>
+ <<set $PC.birthSelf += 1>>
+ <<else>>
+ <<set $PC.birthMaster += 1>>
+ <</if>>
<</if>>
<</for>>
<<elseif $PC.career == "escort">>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].origin == "She was the result of unprotected sex with a client. He paid you quite well to enjoy your body as you grew heavy with his child.">>
- <<set $PC.births += 1>>
- <<set $PC.birthClient += 1>>
+ <<if $slaves[$i].mother == -1>>
+ <<set $PC.births += 1>>
+ <<if $slaves[$i].father == -1>>
+ <<set $PC.birthSelf += 1>>
+ <<else>>
+ <<set $PC.birthClient += 1>>
+ <</if>>
<</if>>
<</for>>
<<else>>
diff --git a/src/npc/startingGirls/commitStartingGirl.tw b/src/npc/startingGirls/commitStartingGirl.tw
index 54cb7ac4058..36f076a0850 100644
--- a/src/npc/startingGirls/commitStartingGirl.tw
+++ b/src/npc/startingGirls/commitStartingGirl.tw
@@ -45,11 +45,13 @@
<br>
<<if $familyTesting == 1>>
/* Not needed due to stuffedanon's work
- <<if $activeSlave.actualAge >= 34>>
+ <<if $activeSlave.actualAge >= ($fertilityAge + $minimumSlaveAge)>>
<<if $activeSlave.ovaries>>
<br>
[[Daughter|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "mother", $startingGirlCopied = 1]]
<</if>>
+ <</if>>
+ <<if $activeSlave.actualAge >= ($potencyAge + $minimumSlaveAge)>>
<<if $activeSlave.balls>>
<br>
[[Dick-daughter|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "father", $startingGirlCopied = 1]]
@@ -57,13 +59,15 @@
<</if>>
/% I'm aware this term is ridiculous. If anyone can come up with a better word to reconcile all slaves being female with the act of fatherhood and the masculine nature of the word father, I'm all ears. Wrote myself into a corner on this one. %/
<</if>>
- <<if $activeSlave.actualAge <= 28>>
+ <<if $activeSlave.actualAge <= ($retirementAge - $fertilityAge)>>
<<if $activeSlave.mother <= 0>>
<br>
[[Mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.mother = $IDNumber, $startingGirlRelation = "daughter", $startingGirlCopied = 1]]
<<else>>
//This slave already has a mother.//
<</if>>
+ <</if>>
+ <<if $activeSlave.actualAge <= ($retirementAge - $potencyAge)>>
<<if $seeDicks>>
<<if $activeSlave.father <= 0>>
<br>
@@ -74,13 +78,13 @@
<</if>>
<</if>>
<</if>>
- <<if $activeSlave.actualAge < 44>>
+ <<if $activeSlave.actualAge < $retirementAge>>
<br>
[[Older Sister|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "older sister", $startingGirlCopied = 1]]
<</if>>
<br>
[[Twin|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "twin", $startingGirlCopied = 1]]
- <<if $activeSlave.actualAge > 19>>
+ <<if $activeSlave.actualAge > $minimumSlaveAge>>
<br>
[[Younger Sister|RG AS Dump][$returnTo = "Starting Girls", $startingGirlRelation = "younger sister", $startingGirlCopied = 1]]
<</if>>
@@ -89,30 +93,27 @@
<<else>>
<br>
- <<if $activeSlave.actualAge <= 8 && ($PC.career == "servant" || $PC.career == "escort") && ($PC.vagina == 1)>>
- <<else>>
<<if $activeSlave.actualAge >= ($fertilityAge + $minimumSlaveAge)>>
<br>
[[Daughter|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "mother", $startingGirlRelation = "mother", $activeSlave.birthsTotal += 1, $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
<</if>>
- <<if $activeSlave.actualAge <= 24>>
+ <<if $activeSlave.actualAge <= ($retirementAge - $fertilityAge)>>
<br>
[[Mother|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "daughter", $startingGirlRelation = "daughter", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
<</if>>
- <<if $activeSlave.actualAge < 44>>
+ <<if $activeSlave.actualAge < $retirementAge>>
<br>
[[Older Sister|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "sister", $startingGirlRelation = "older sister", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
<</if>>
<br>
[[Twin|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "twin", $startingGirlRelation = "twin", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
- <<if $activeSlave.actualAge > $minimumSlaveAge+1>>
+ <<if $activeSlave.actualAge > $minimumSlaveAge>>
<br>
[[Younger Sister|RG AS Dump][$returnTo = "Starting Girls", $activeSlave.relation = "sister", $startingGirlRelation = "younger sister", $activeSlave.relationTarget = $activeSlave.ID+1, $startingGirlCopied = 1]]
<</if>>
- <</if>>
<</if>>
<<elseif $activeSlave.relation == 0>>
- <br>[[Add another slave, related to the previous slave|Commit Starting Girl][$createRelatedSlave = 1]]
+ <br>[[Add another slave, related to the previous slave|Commit Starting Girl][$createRelatedSlave = 1]]
<</if>>
<</if>>
<br>[[Stop adding slaves and take control of the arcology|Acquisition]]
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 6be5c85f459..4060319843c 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -218,7 +218,7 @@ __You are customizing this slave:__
<<set $activeSlave.origin = "A fresh capture once overpowered you and had his way with you. You kept her as a painful reminder to never lower your guard again.">>
<<set $activeSlave.customTat = "She has your tiny slaving emblem tattooed behind her left ear.">>
<<elseif $activeSlave.father == -1>>
- <<set $activeSlave.origin = "Your slaving troop kept several girls as fucktoys, you sired her in your favorite.">>
+ <<set $activeSlave.origin = "Your slaving troop kept several girls as fucktoys, and you sired her in your favorite.">>
<<set $activeSlave.customTat = "She has your tiny slaving emblem tattooed behind her left ear.">>
<<else>>
<<set $activeSlave.origin = "You enslaved her personally during the last stages of your slaving career.">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2386713be19..72d70ef5783 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -19601,7 +19601,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<case "devoted shortstack">>
-<<link "Show $him why you like having short girls around">>
+<<link "Show $him why you like having short <<= $girl>>s around">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You hook your arms underneath $his own, pulling $him off of the ground in one swift yank upwards. Taken off guard by $his sudden vertical ascension, $he clings to your chest instinctively,
@@ -19669,7 +19669,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
<</replace>>
<</link>><<if ($activeSlave.anus == 0) || ($activeSlave.vagina == 0)>> //This option will take virginity//<</if>>
-<br><<link "Show $him that short girls can still serve">>
+<br><<link "Show $him that short <<= $girl>>s can still serve">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You lightly place your palms on $his shoulders and apply a little pressure<<if $PC.dick == 0>>as you don a strap-on<</if>>. From your towering position above $him, you easily push $him down to $his knees with little more than a gradual increase in force. From your standing position<<if $activeSlave.belly >= 300000>>, after straddling $his _belly belly<</if>>, your <<if $PC.dick == 0>>phallus<<else>>cock<</if>> hovers above $his head, tantalizingly out of the immediate reach of $his lips.
@@ -19699,7 +19699,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.oralCount += 1, $oralTotal += 1, $activeSlave.trust += 4>>
<</link>>
<<if canDoAnal($activeSlave)>>
-<br><<link "Show $him that short girls are easier to abuse">>
+<br><<link "Show $him that short <<= $girl>>s are easier to abuse">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You inform $him that you find shorter slaves easier to abuse, smiling widely as an expression of horror spreads across $his face. This expression soon changes to one of shock and pain as you slap $him open-handed across the face, the sheer force of the strike sending $him reeling. A few slaps later and you have $activeSlave.slaveName on all fours begging for mercy as you punish the cheeks of $his ass with spank after spank. When you suddenly shove <<if $PC.dick == 0>>a dildo<<else>>your cock<</if>> up $his ass $he spasms so harshly from the pain that $he reflexively tries to get away, only to be subdued by the weight and strength of your larger, more powerful form. For the next ten minutes, $he gets beaten and choked if $he offers even token resistance to the brutal anal rape. Soon, tears run down the short length of $his body as $he shakes from the force of each excessive thrust into $his anus. The next time you decide to buttfuck $him, $he's @@.gold;terrified into compliance@@ by the knowledge of how little physical resistance $he can muster against you.
@@ -19709,10 +19709,10 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</link>><<if $activeSlave.anus == 0>>//This option will take anal virginity//<</if>>
<</if>>
<<if ($arcade > 0)>>
- <br><<link "Show $him that short girls are amusing in the arcade">>
+ <br><<link "Show $him that short <<= $girl>>s are amusing in the arcade">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You inform $activeSlave.slaveName that short girls like $him are delightfully amusing when immured in the arcade. Magnanimous as you are, you have two other slaves drag $him off to be installed in the arcade for a day, so that $he too may see the humor in having short girls serve in the arcade. Though $arcadeName has arcade pens to match any height of slave, you have $activeSlave.slaveName confined in a pen built for a much taller slave. Although $his head and neck protrude from one side of the pen without issue, $he is too short for $his ass to fill the other opening. As a result, $he must use the tips of $his toes maintain an unsteady grip on the rear opening, forcing $him to maintain an extremely taxing stretch just to keep $his body held aloft within the pen. Customers are unable to fuck $his holes but readily delight in watching $him squirm to keep $his body extended and horizontal, even with hard cocks brutally fucking $his face. Somewhere in the grueling, 18-hour marathon of relentless throat fucking, $his precarious position slips and $his lower half tumbles into the interior of the pen proper. Until an attendant rescues $him, $his neck is held crooked at an unnatural angle by $his restraints, as the rest of $his body dangles beneath it. $His ordeal forces $him to accept that a short $girl's place is as an @@.hotpink;amusing arcade hole,@@ though $he can't find the humor@@.gold;in such a terrible plight.@@ Furthermore, $his intense exertions during $his stay @@.red;negatively effects $his health.@@ Your other slaves take note of what you do to short girls who ask questions about their place in your penthouse.
+ You inform $activeSlave.slaveName that short <<= $girl>>s like $him are delightfully amusing when immured in the arcade. Magnanimous as you are, you have two other slaves drag $him off to be installed in the arcade for a day, so that $he too may see the humor in having short <<= $girl>>s serve in the arcade. Though $arcadeName has arcade pens to match any height of slave, you have $activeSlave.slaveName confined in a pen built for a much taller slave. Although $his head and neck protrude from one side of the pen without issue, $he is too short for $his ass to fill the other opening. As a result, $he must use the tips of $his toes maintain an unsteady grip on the rear opening, forcing $him to maintain an extremely taxing stretch just to keep $his body held aloft within the pen. Customers are unable to fuck $his holes but readily delight in watching $him squirm to keep $his body extended and horizontal, even with hard cocks brutally fucking $his face. Somewhere in the grueling, 18-hour marathon of relentless throat fucking, $his precarious position slips and $his lower half tumbles into the interior of the pen proper. Until an attendant rescues $him, $his neck is held crooked at an unnatural angle by $his restraints, as the rest of $his body dangles beneath it. $His ordeal forces $him to accept that a short $girl's place is as an @@.hotpink;amusing arcade hole,@@ though $he can't find the humor@@.gold;in such a terrible plight.@@ Furthermore, $his intense exertions during $his stay @@.red;negatively effects $his health.@@ Your other slaves take note of what you do to short <<= $girl>>s who ask questions about their place in your penthouse.
<<set $activeSlave.devotion += 5, $activeSlave.trust -= 5, $activeSlave.health -= 5, $activeSlave.oralCount += 55, $oralTotal += 55>>
<<set $activeSlave.publicCount += 55>>
<</replace>>
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index afd53e8bce8..91732022a3f 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -57,7 +57,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was
<<else>>
arousal is obvious. Though the respectful regime you require secures $him from the fear of being used, $activeSlave.slaveName nonverbally offers $his superior oral, out of obvious gratitude that whatever $he did is being treated so leniently, and perhaps out of a desire to be in $HeadGirl.slaveName's good graces.
<</if>>
- In no time at all, $activeSlave.slaveName's $activeSlave.hColor head descends to obscure $HeadGirl.slaveName's groin. The <<if $HeadGirl.face > 95>>heartrendingly gorgeous<<elseif $HeadGirl.face <= 95>>wonderfully pretty<<elseif $HeadGirl.face <= 40>>approachably lovely<<elseif $HeadGirl.face <= 10>>not unattractive<<else>>homely<</if>> <<if $HeadGirl.physicalAge > 25>>woman's<<else>>girl's<</if>> head cranes back with orgasm before long; that diligent scrub must have been quite stimulating.
+ In no time at all, $activeSlave.slaveName's $activeSlave.hColor head descends to obscure $HeadGirl.slaveName's groin. The <<if $HeadGirl.face > 95>>heartrendingly gorgeous<<elseif $HeadGirl.face <= 95>>wonderfully pretty<<elseif $HeadGirl.face <= 40>>approachably lovely<<elseif $HeadGirl.face <= 10>>not unattractive<<else>>homely<</if>> <<if $HeadGirl.physicalAge > 25>>_woman2's<<else>>_girl2's<</if>> head cranes back with orgasm before long; that diligent scrub must have been quite stimulating.
<br><br>
$activeSlave.slaveName stays in the shower to clean $himself, so $HeadGirl.slaveName exits to see you watching the denouement. _He2 @@.hotpink;smiles,@@ murmuring a greeting, and hurries over to give you a peck on the cheek, leaning in as best _he2 can to keep _his2 moist body away from your suit. "Thi<<s>> i<<s>> the life, <<Master>>," _he2 whispers.
<<set $activeSlave.oralCount += 1>>
@@ -95,7 +95,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was
<<replace "#result">>
You strip off your suit and walk into the steam, producing a surprised but welcoming greeting from your Head Girl and a muffled, submissive noise from $activeSlave.slaveName. $HeadGirl.slaveName is held more or less stationary by the slave _he2's straddling, so you step in, hook a dominant arm around _his2 waist, and kiss _him2. There's precisely one person in this arcology who's allowed to treat _him2 as _hersP, and it's you. _He2 relaxes into you with gratitude as you shoulder the burden of being the leader in this little area of your empire, lifting it from _his2 shoulders for now.
<br><br>
- You run a hand up the side of _his2 neck, bringing it to rest with your fingers cupping _him2 under the ear and your thumb running up along _his2 temple. _He2 shivers, unable to concentrate despite all _his2 poise, the ongoing oral service blending into your intense closeness. Right now, _he2's the <<if $HeadGirl.physicalAge > 25>>woman's<<else>>girl's<</if>> for you, so you snap your fingers next to the ear of the slave <<if $HeadGirl.vagina > -1>>eating _him2 out<<else>>blowing _him2<</if>>, point at the dropped sponge, and then point at yourself. The oral stops as $activeSlave.slaveName hurries to scrub you, starting at your feet, but your Head Girl doesn't care. You're kissing _him2.
+ You run a hand up the side of _his2 neck, bringing it to rest with your fingers cupping _him2 under the ear and your thumb running up along _his2 temple. _He2 shivers, unable to concentrate despite all _his2 poise, the ongoing oral service blending into your intense closeness. Right now, _he2's the <<if $HeadGirl.physicalAge > 25>>_woman2<<else>>_girl2<</if>> for you, so you snap your fingers next to the ear of the slave <<if $HeadGirl.vagina > -1>>eating _him2 out<<else>>blowing _him2<</if>>, point at the dropped sponge, and then point at yourself. The oral stops as $activeSlave.slaveName hurries to scrub you, starting at your feet, but your Head Girl doesn't care. You're kissing _him2.
<br><br>
_He2 gently strokes your <<if $PC.dick == 1>>rapidly hardening member, smiling into your mouth at the speed with which it stiffens<<if $PC.vagina == 1>>, and teases your pussylips with mischievous fingers<</if>><<else>>flushed cunt, smiling into your mouth at the moisture that instantly coats _his2 fingertips<</if>>. You reach out in turn,
<<if $HeadGirl.vagina > -1>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 69097595bc2..945ee83735b 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -788,13 +788,13 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<<if ($seeRace == 1)>>
<<if ($slaves[$i].race == "white")>>
- The public tastes favor white girls like $slaves[$i].slaveName.
+ The public tastes favor white <<= $girl>>s like $slaves[$i].slaveName.
<</if>>
<</if>>
<<if $arcologies[0].FSSupremacist != "unset">>
<<if $slaves[$i].race != $arcologies[0].FSSupremacistRace>>
- Some citizens fetishize girls of the servile races.
+ Some citizens fetishize <<= $girl>>s of the servile races.
<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist != "unset">>
@@ -804,11 +804,11 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">>
<<if ($slaves[$i].nationality == "Japanese") || ($slaves[$i].nationality == "Edo Revivalist")>>
- As a proper Japanese girl, $he is considered extremely desirable.
+ As a proper Japanese $girl, $he is considered extremely desirable.
<</if>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<<if ($slaves[$i].nationality == "Chinese") || ($slaves[$i].nationality == "Chinese Revivalist")>>
- As a proper Chinese girl, $he is considered extremely desirable.
+ As a proper Chinese $girl, $he is considered extremely desirable.
<</if>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index ced9f38af70..b27fcd8273e 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -804,7 +804,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<if ($seeRace == 1)>>
<<if ($slaves[$i].race == "white")>>
- Many customers prefer white girls like $slaves[$i].slaveName.
+ Many customers prefer white <<= $girl>>s like $slaves[$i].slaveName.
<</if>>
<</if>>
@@ -820,11 +820,11 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<<if $arcologies[0].FSEdoRevivalist != "unset">>
<<if ($slaves[$i].nationality == "Japanese") || ($slaves[$i].nationality == "Edo Revivalist")>>
- As a proper Japanese girl, $he is considered extremely desirable.
+ As a proper Japanese $girl, $he is considered extremely desirable.
<</if>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<<if ($slaves[$i].nationality == "Chinese") || ($slaves[$i].nationality == "Chinese Revivalist")>>
- As a proper Chinese girl, $he is considered extremely desirable.
+ As a proper Chinese $girl, $he is considered extremely desirable.
<</if>>
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 5d22b2e7788..3a7e0549768 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -329,8 +329,8 @@
<<print "You never thought you would be capable of impregnating yourself, but years of pleasuring yourself with yourself after missions managed to create $him.">>
<<case "A fresh capture once overpowered you and had his way with you. You kept her as a painful reminder to never lower your guard again.">>
<<print "A fresh capture once overpowered you and had his way with you. You kept $him as a painful reminder to never lower your guard again.">>
- <<case "Your slaving troop kept several girls as fucktoys, you sired her in your favorite.">>
- <<print "Your slaving troop kept several girls as fucktoys, you sired $him in your favorite.">>
+ <<case "Your slaving troop kept several girls as fucktoys, and you sired her in your favorite.">>
+ <<print "Your slaving troop kept several girls as fucktoys, and you sired $him in your favorite.">>
<<case "You enslaved her personally during the last stages of your slaving career.">>
<<print "You enslaved $him personally during the last stages of your slaving career.">>
<<case "You sired her in yourself after an arcology owner, impressed by your work, rewarded you with a night you'll never forget.">>
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index b061c126c13..3fed4f157fd 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -509,7 +509,7 @@ $He has a corset piercing, a ladder of steel rings running up each side of $his
<</if>>
<<case "cutoffs and a t-shirt">>
- they're laced together with a simple ribbon, but the effect makes it clear that this is one kinky girl.
+ they're laced together with a simple ribbon, but the effect makes it clear that this is one kinky $girl.
<<case "a slutty outfit">>
they're laced together with a simple ribbon, tightly enough that $he's aware they're there.
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 4fe1f9f6c6a..b17033cfb18 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -1045,7 +1045,9 @@
<<set $activeSlave.mother = 0>>
<<redisplayFamily>>
<</link>>
-<<if $PC.vagina == 1 && (($PC.actualAge - $activeSlave.actualAge) >= $fertilityAge) && $saveImported == 0>> | <<link "You">><<set $activeSlave.mother = $PC.ID>><<redisplayFamily>><</link>><</if>>
+<<if $PC.vagina == 1 && (($PC.actualAge - $activeSlave.actualAge) >= $fertilityAge) && $saveImported == 0>>
+| <<link "You">><<set $activeSlave.mother = $PC.ID>><<redisplayFamily>><</link>>
+<</if>>
<<for _efw = 0; _efw < $slaves.length; _efw++>>
<<if $slaves[_efw].vagina > 0 && (($slaves[_efw].actualAge - $activeSlave.actualAge) >= $fertilityAge) && $slaves[_efw].newGamePlus == 0>>
|
@@ -1065,7 +1067,9 @@
<<set $activeSlave.father = 0>>
<<redisplayFamily>>
<</link>>
-<<if ($PC.dick == 1) && (($PC.actualAge - $activeSlave.actualAge) >= $potencyAge) && $saveImported == 0>> | <<link "You">><<set $activeSlave.father = $PC.ID>><<redisplayFamily>><</link>><</if>>
+<<if ($PC.dick == 1) && (($PC.actualAge - $activeSlave.actualAge) >= $potencyAge) && $saveImported == 0>>
+| <<link "You">><<set $activeSlave.father = $PC.ID>><<redisplayFamily>><</link>>
+<</if>>
<<for _efw = 0; _efw < $slaves.length; _efw++>>
<<if ($slaves[_efw].dick > 0) && ((($slaves[_efw].actualAge - $activeSlave.actualAge) >= $potencyAge)) && $slaves[_efw].newGamePlus == 0>>
|
@@ -1085,7 +1089,7 @@
<<set $activeSlave.mother = 0>>
<<redisplayFamily>>
<</link>>
-<<if $saveImported == 0>>
+<<if ($activeSlave.mother != $PC.ID) && ($PC.mother != $activeSlave.ID) && ($saveImported == 0)>>
|
<<link "You">>
<<if $PC.mother != 0>>
@@ -1127,7 +1131,7 @@
<<replace '#sameFatherNames'>><</replace>>
<<redisplayFamily>>
<</link>>
-<<if $saveImported == 0>>
+<<if ($activeSlave.father != $PC.ID) && ($PC.father != $activeSlave.ID) && ($saveImported == 0)>>
|
<<link "You">>
<<if $PC.father != 0>>
@@ -1175,7 +1179,7 @@
<<redisplayFamily>>
<</link>>
<<if $activeSlave.vagina >= 0>>
- <<if ($activeSlave.actualAge - $PC.actualAge) >= $fertilityAge && $saveImported == 0>>
+ <<if ($activeSlave.actualAge - $PC.actualAge) >= $fertilityAge && ($saveImported == 0)>>
|
<<link "You">>
<<set $PC.mother = $activeSlave.ID>>
@@ -1220,7 +1224,7 @@
<<redisplayFamily>>
<</link>>
<<if $activeSlave.dick > 0>>
- <<if ($activeSlave.actualAge - $PC.actualAge) >= $fertilityAge && $saveImported == 0>>
+ <<if ($activeSlave.actualAge - $PC.actualAge) >= $potencyAge && ($saveImported == 0)>>
|
<<link "You">>
<<set $PC.father = $activeSlave.ID>>
--
GitLab