From 8eed31eb8ca3f12813f196f912dcf5c9afa2087a Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 25 Feb 2018 20:19:23 -0500
Subject: [PATCH] fixes and seBirthWidgets.tw corrections
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 +
devNotes/twine JS | 5 +-
src/SecExp/securityHQ.tw | 16 +-
src/npc/agent/agentWorkaround.tw | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 157 ++++++++++++-------
src/utility/birthWidgets.tw | 5 +
src/utility/descriptionWidgetsFlesh.tw | 60 +++----
7 files changed, 146 insertions(+), 103 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 0483a79f759..1f05c7bc1e0 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,10 @@
2/25/18
+ 371
+ -cleaned up seBirthWidgets somemore to bring in back in line with original intent
+ -various little fixes
+
370
-various bug fixes
-more stuff from SFanon
diff --git a/devNotes/twine JS b/devNotes/twine JS
index bda2205444a..bd695f54b41 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -7082,10 +7082,7 @@ window.WombNormalizePreg = function(actor)
}
actor.pregType = actor.womb.length;
-
actor.pregSource = actor.womb[0].fatherID;
-
- actor.bellyPreg = WombGetVolume(actor);
}
else if (actor.womb.length == 0 && actor.broodmother < 1)
{
@@ -7101,6 +7098,8 @@ window.WombNormalizePreg = function(actor)
if (actor.pregWeek > 0) // We can't properly set postpartum here, but can normalize obvious error with forgotten property.
actor.pregWeek = 0;
}
+
+ actor.bellyPreg = WombGetVolume(actor);
}
/*:: DTreeJS [script]*/
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 019775ec2fc..e10eb1d6e6e 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -260,7 +260,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<<if $readinessUpgrades.pathways == 0>>
[[Build specialized pathways in the arcology|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.pathways = 1, $readiness += 1, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 1, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 1, but will increase upkeep.//
<<else>>
You have built specialized pathways inside the arcology to quickly move troops around the structure.
<</if>>
@@ -299,35 +299,35 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of two years.
<br>
[[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage == 5 && $rep >= 19500 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one year.
<br>
[[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage == 4 && $rep >= 19500 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of nine months.
<br>
[[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage == 3 && $rep > 18000 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of six months.
<br>
[[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage == 2 && $rep > 16000 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three months.
<br>
[[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage == 1 && $rep > 14000 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one month.
<br>
[[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage == 0 && $rep > 12000 && $reqHelots > 10>>
[[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier, $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by 10, but will increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by 10, but will increase upkeep.//
<<elseif $secUpgrades.coldstorage > 6>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three years.
<<elseif $reqHelots <= 10>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index c90c342ac76..859280c64c0 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -62,5 +62,5 @@ You order $slaves[$i].slaveName to come into your office for orders. The devoted
<</switch>>
It will mean that she'll see much less of you, something such a devoted slave may struggle with. Oppressed by the confusion and strength of her feelings, she begins to cry.
-<br><br>"Thank you, <<Master $slaves[i]>>," she gasps out. "I'll do my be<<s>>t."
+<br><br>"Thank you, <<Master $slaves[$i]>>," she gasps out. "I'll do my be<<s>>t."
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index e4d575e824e..2482e702a31 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -339,7 +339,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<</if>>
<<if _curBabies < 1>>
- to no live ones, but a stillbirth only.
+ to no live ones, but a stillbirth only. /* syntax wise this has problems. Will likely need to be reworked. */
<<elseif _curBabies == 1>>
to a single calf.
<<elseif _curBabies >= 40>>
@@ -372,39 +372,48 @@ This decriptions can be expanded with more outcomes later. But it's not practica
$pronounCap was given @@.orange;a cesarean section@@ due to health concerns.<br><br>
From $possessive womb,
<<else>>
- $pronounCap @@.orange;gave birth@@<<if $diffSize < 1.15>>, but $possessive stomach barely shrank at all. $possessiveCap body gave life to <<elseif $diffSize < 1.3>>, but $possessive overfilled womb barely lost any size. $possessiveCap body gave life to <</if>>
+ $pronounCap @@.orange;gave birth@@
+ <<if $diffSize < 1.15>>
+ , but $possessive stomach barely shrank at all. $possessiveCap body gave life to
+ <<elseif $diffSize < 1.3>>
+ , but $possessive overfilled womb barely lost any size. $possessiveCap body gave life to
+ <</if>>
<</if>>
-
+
<<if _curBabies < 1>>
- no live ones, but a stillbirth only.
+ no live ones, but a stillbirth only
<<elseif _curBabies == 1>>
- a single baby.
+ a single baby
<<elseif _curBabies >= 40>>
- a massive brood of _curBabies babies.
+ a massive brood of _curBabies babies
<<elseif _curBabies >= 20>>
- a brood of _curBabies babies.
+ a brood of _curBabies babies
<<elseif _curBabies >= 10>>
- a squirming pile of _curBabies babies.
+ a squirming pile of _curBabies babies
<<elseif _curBabies == 9>>
- nonuplets.
+ nonuplets
<<elseif _curBabies == 8>>
- octuplets.
+ octuplets
<<elseif _curBabies == 7>>
- septuplets.
+ septuplets
<<elseif _curBabies == 6>>
- sextuplets.
+ sextuplets
<<elseif _curBabies == 5>>
- quintuplets.
+ quintuplets
<<elseif _curBabies == 4>>
- quadruplets.
+ quadruplets
<<elseif _curBabies == 3>>
- triplets.
+ triplets
<<else>>
- twins.
+ twins
+ <</if>>
+ <<if $csec == 1>>
+ entered the world,
+ <<else>>
+ ,
<</if>>
-
<<if _curBabies > 0>>
- Created by
+ created by
<<if $slaves[$i].pregSource == -1>>
your magnificent dick,
<<elseif $slaves[$i].pregSource == -2>>
@@ -418,7 +427,6 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<else>>
$daddy's virile cock and balls,
<</if>>
- <<if _curBabies > 1>>they<<else>>she<</if>> entered the world.
<</if>>
<</if>>
@@ -444,21 +452,25 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<br>
After labor and birth, $possessive belly sags softly.
<</if>>
+ <<else>> /* this was intended for normal birth to draw attention to how long it takes to pass that many children as well as how deflated she'll be after the fact. */
+ <<if $slaves[$i].pregType >= 80>>
+ After an entire day of labor and birth, $possessive belly sags heavily.
+ <<elseif $slaves[$i].pregType >= 40>>
+ After half a day of labor and birth, $possessive belly sags emptily.
+ <<elseif $slaves[$i].pregType >= 20>>
+ After several hours of labor and birth, $possessive belly sags softly.
+ <</if>>
<</if>>
<<if ($slaves[$i].vagina == 0) || ($slaves[$i].mpreg == 1 && $slaves[$i].anus == 0)>>
<<if $slaves[$i].fetish != "mindbroken">>
<br><br>
<<if ($slaves[$i].fetish == "masochist")>>
- Since $pronoun was a virgin, giving birth was a @@.red;terribly painful@@ experience.<<if $slaves[$i].fetishKnown == 0>>$pronounCap seems to have orgasmed several times during the experience, $pronoun appears to @@.lightcoral;really like pain@@.<<else>> However, due to $possessive masochistic streak, $pronoun @@.hotpink;greatly enjoyed@@ said experience<</if>>.
- <<set $slaves[$i].health -= 10>>
- <<set $slaves[$i].devotion += 2>>
- <<set $slaves[$i].fetishKnown = 1>>
+ Since $pronoun was a virgin, giving birth was a @@.red;terribly painful@@ experience.<<if $slaves[$i].fetishKnown == 0>>$pronounCap seems to have orgasmed several times during the experience, $pronoun appears to @@.lightcoral;really like pain@@.<<set $slaves[$i].fetishKnown = 1>><<else>> However, due to $possessive masochistic streak, $pronoun @@.hotpink;greatly enjoyed@@ said experience<</if>>.
+ <<set $slaves[$i].health -= 10, $slaves[$i].devotion += 2>>
<<else>>
Since $pronoun was a virgin, giving birth was a @@.red;terribly painful@@ experience. $pronounCap @@.mediumorchid;despises@@ you for taking $possessive virginity in such a @@.gold;horrifying@@ way.
- <<set $slaves[$i].health -= 40>>
- <<set $slaves[$i].devotion -= 25.0>>
- <<set $slaves[$i].trust -= 25.0>>
+ <<set $slaves[$i].health -= 10, $slaves[$i].devotion -= 25, $slaves[$i].trust -= 25>>
<</if>>
<</if>>
<</if>>
@@ -660,7 +672,7 @@ All in all,
<<if $slaves[$i].pregSource == -1 >>
<<if $slaves[$i].devotion < 20 && ($week-$slaves[$i].weekAcquired >= $slaves[$i].weekAcquired)>>
<br>
- $pronounCap @@.mediumorchid;despises@@ you for using $possessive body to bear your children.
+ $pronounCap @@.mediumorchid;hates@@ you for using $possessive body to bear your children.
<<set $slaves[$i].devotion -= 10>>
<<elseif $slaves[$i].devotion > 50>>
<br>
@@ -694,7 +706,7 @@ All in all,
<<set $failedElite -= 2 * _curBabies>>
<<else>>
<br><br>
- The Societal Elite @@.red;are disappointed@@ that you would allow subhuman filth to dirty society under your watch. Society @@.red;frowns@@ on the unwelcome addition of more subhumans into the world.
+ The Societal Elite @@.red;are disappointed@@ that you would allow subhuman filth to dirty the arcology under your watch. Society @@.red;frowns@@ on the unwelcome addition of more subhumans into the world.
<<set $failedElite += 5 * _curBabies>>
<<set $rep -= 10 * _curBabies>>
<</if>>
@@ -710,9 +722,9 @@ All in all,
/* ----------------------- incubator adding subsection. There is support for broodmothers too. */
<<if _origReserve > 0 && _curBabies > 0>> /*Do we need incubator checks?*/
- <<if _curBabies >= _origReserve >>
+ <<if _curBabies >= _origReserve>>
/*adding normal*/
- <<set _cToIncub = _origReserve >>
+ <<set _cToIncub = _origReserve>>
<<elseif _curBabies < _origReserve && $slaves[$i].womb.length > 0>>
/*broodmother or partial birth, we will wait for next time to get remaining children*/
<<set $slaves[$i].reservedChildren -= _curBabies, _cToIncub = _curBabies>>
@@ -730,10 +742,10 @@ All in all,
<<set $slaves[$i].curBabies.shift()>> /*for now child generation metod for incubator not changed. But here children for incubator removed from array of birthed babies. If we decide later - we can use them for incubator as real objects here. For now they just discarded silently */
<</for>>
<<set $reservedChildren -= _cToIncub>>
- <<set _curBabies = $slaves[$i].curBabies.length >>
+ <<set _curBabies = $slaves[$i].curBabies.length>>
<br><br>
<<if _curBabies > 0>>
- After placing reserved child<<if _cToIncub > 1>>ren<</if>> to the incubator, it's time to care about other<<if _curBabies > 0>>'s<</if>>.
+ After sending $possessive reserved child<<if _cToIncub > 1>>ren<</if>> to $incubatorName, it's time to decide the fate of the other<<if _curBabies > 0>><</if>>.
<</if>>
<</if>>
@@ -746,31 +758,21 @@ All in all,
<<span $dispositionId>>
<<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $slaves[$i].pregSource == -1>>
<<set _lostBabies = 1>>
- Without time loss $possessive child<<if _curBabies > 1>>ren<</if>> collected by the Societal Elite to be raised into upstanding members of the new society.
+ $possessiveCap child<<if _curBabies > 1>>ren<</if>> are collected by the Societal Elite to be raised into upstanding members of the new society.
<<elseif $Cash4Babies == 1>>
- /*<<set _lostBabies = 1>>*/
+ <<set _lostBabies = 1>>
<<set _babyCost = random(-12,12)>>
<<if ($slaves[$i].relationship == -3)>>
You make sure $possessive children are cared for, since $pronoun is your wife. $slaves[$i].slaveName is @@.hotpink;touched@@ by this @@.mediumaquamarine;act of kindness.@@
<<set $slaves[$i].trust += 3, $slaves[$i].devotion += 3>>
- <<set _lostBabies = 1>>
+ <<set _lostBabies = 0>>
<<elseif ($slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your Concubine")>>
$possessiveCap children are guaranteed to be treated well despite the laws you've passed since $pronoun is a member of your harem. $slaves[$i].slaveName is @@.hotpink;touched@@ by this @@.mediumaquamarine;act of kindness.@@
<<set $slaves[$i].trust += 3, $slaves[$i].devotion += 3>>
- <<set _lostBabies = 1>>
-
+ <<set _lostBabies = 0>>
<<else>>
- /*
- <<link 'Just sell them'>>
- <<replace `"#" + $dispositionId`>>
- <<set _babyCost = random(-12,12)>>
- $possessiveCap <<if _count > 1>>babies<<else>>baby<</if>> sold for a total of @@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@
- <<set $cash += _curBabies*(50+_babyCost)>>
- <</replace>>
- <</link>> |
- $possessiveCap <<if _curBabies > 1>>babies<<else>>baby<</if>> sold for a total of @@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@
+ $possessiveCap <<if _curBabies > 1>>babies<<else>>baby<</if>> sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@
<<set $cash += _curBabies*(50+_babyCost)>>
- */
<</if>>
<</if>>
<<if _lostBabies != 1>>
@@ -844,22 +846,59 @@ All in all,
<</replace>>
<</link>>
//Will cost <<print cashFormat(500)>> weekly//
+ /*
<<if $Cash4Babies == 1>>
- | <<link 'Just sell them'>>
- <<replace `"#" + $dispositionId`>>
- <<set _babyCost = random(-12,12)>>
- $possessiveCap <<if _count > 1>>babies<<else>>baby<</if>> sold for a total of @@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@
- <<set $cash += _curBabies*(50+_babyCost)>>
- <</replace>>
- <</link>>
+ <<if $slaves[$i].prestige > 1>>
+ | <<link 'Send them to auction'>>
+ <<replace `"#" + $dispositionId`>>
+ <<set _babyCost = random(-12,100)>>
+ $possessiveCap <<if _count > 1>>babies<<else>>baby<</if>> went for a <<if _curBabies > 1>>total <</if>>bid of @@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@
+ <<if $slaves[$i].devotion > 95>>
+ $pronounCap adheres to your thoughts so strongly that even though you backed out of caring for $possessive child<<if _count > 1>>ren<</if>>, $pronoun still truly believes you are doing $object an honor.
+ <<elseif $slaves[$i].devotion > 50>>
+ $pronounCap is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $possessive child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $possessiveCap trust in your words @@.gold;wavers@@ as $pronoun thinks of $possessive child<<if _count > 1>>ren<</if>>'s future.
+ <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
+ <<elseif $slaves[$i].devotion > 20>>
+ $pronounCap is @@.mediumorchid;devastated@@ by your sudden decision to sell $possessive child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $possessiveCap mind struggles to comprehend @@.gold;such betrayal.@@
+ <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
+ <<else>>
+ For a moment, $pronoun saw a glimmer of good in you; @@.mediumorchid;$pronoun was clearly wrong.@@ $possessiveCap mind struggles to comprehend @@.gold;why $pronoun could ever even thing of trusting such a person.@@
+ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
+ <</if>>
+ <<set $cash += _curBabies*(50+_babyCost)>>
+ <</replace>>
+ <</link>>
+ <</if>>
+ <<else>>
+ | <<link 'Sell them anyway'>>
+ <<replace `"#" + $dispositionId`>>
+ <<set _babyCost = random(-12,12)>>
+ $possessiveCap <<if _count > 1>>babies<<else>>baby<</if>> sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_count*(50+_babyCost))>>.@@
+ <<if $slaves[$i].devotion > 95>>
+ $pronounCap adheres to your thoughts so strongly that even though you backed out of caring for $possessive child<<if _count > 1>>ren<</if>>, $pronoun still truly believes you are doing $object an honor.
+ <<elseif $slaves[$i].devotion > 50>>
+ $pronounCap is @@.mediumorchid;deeply hurt@@ by your sudden decision to sell $possessive child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $possessiveCap trust in your words @@.gold;wavers@@ as $pronoun thinks of $possessive child<<if _count > 1>>ren<</if>>'s future.
+ <<set $slaves[$i].trust -= 5, $slaves[$i].devotion -= 5>>
+ <<elseif $slaves[$i].devotion > 20>>
+ $pronounCap is @@.mediumorchid;devastated@@ by your sudden decision to sell $possessive child<<if _count > 1>>ren<</if>> instead of having <<if _count > 1>>them<<else>>it<</if>> cared for. $possessiveCap mind struggles to comprehend @@.gold;such betrayal.@@
+ <<set $slaves[$i].trust -= 10, $slaves[$i].devotion -= 10>>
+ <<else>>
+ For a moment, $pronoun saw a glimmer of good in you; @@.mediumorchid;$pronoun was clearly wrong.@@ $possessiveCap mind struggles to comprehend @@.gold;why $pronoun could ever even thing of trusting such a person.@@
+ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>>
+ <</if>>
+ <<set $cash += _curBabies*(50+_babyCost)>>
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
+ */
<</capture>>
<</if>>
<</span>>
<<elseif $Cash4Babies == 1 && _curBabies > 0>>
<br><br>
<<set _babyCost = random(-12,12)>>
- $possessiveCap <<if _curBabies > 1>>babies<<else>>baby<</if>> sold for a total of @@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@
+ $possessiveCap <<if _curBabies > 1>>babies<<else>>baby<</if>> sold <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@
<<set $cash += _curBabies*(50+_babyCost)>>
<</if>>
@@ -917,12 +956,8 @@ All in all,
<<if $slaves[$i].health <= -100>>
<br><br>
While attempting to recover, $slaves[$i].slaveName @@.red;passes away@@ from complications. $possessiveCap body was fatally damaged during childbirth.
- <<if _curBabies > 0>>
- But $possessive offspring is healthy, so $possessive legacy will carry on.
- <<if $slaves[$i].breedingMark == 1 && $slaves[$i].pregSource == -1>>
- <br>The Societal Elite @@.red;are furious@@ you would allow an elite child<<if _curBabies > 1>>en<</if>> to perish under your watch.
- <<set $failedElite += 100>>
- <</if>>
+ <<if _curBabies > 0>> /* this needs to include ALL children born fom this batch, incubated ones included. */
+ But $possessive offspring <<if _curBabies > 1>>are<<else>>if<</if>> healthy, so $possessive legacy will carry on.
<</if>>
<<set $activeSlave = $slaves[$i]>>
<<include "Remove activeSlave">>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 8b9895bdcc8..12280b27e71 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1186,6 +1186,11 @@ Feeling childbirth approaching, $slaves[$i].slaveName is helped to her prepared
<</switch>>
+<<if $slaves[$i].breedingMark == 1 && $slaves[$i].pregSource == -1>>
+ <br>The Societal Elite @@.red;are furious@@ you would allow an elite child to perish under your watch<<if _curBabies > 1>>, let alone mulitple<</if>>.
+ <<set $failedElite += 100>>
+<</if>>
+
<</widget>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 8664032beab..242c63fbf0c 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4185,7 +4185,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4212,7 +4212,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4245,7 +4245,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4272,7 +4272,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4305,7 +4305,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4332,7 +4332,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4363,7 +4363,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4388,7 +4388,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4437,7 +4437,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4462,7 +4462,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4508,7 +4508,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4532,7 +4532,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4576,7 +4576,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4600,7 +4600,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4642,7 +4642,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4666,7 +4666,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4706,7 +4706,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4730,7 +4730,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4768,7 +4768,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4792,7 +4792,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4828,7 +4828,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4852,7 +4852,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4886,7 +4886,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4910,7 +4910,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -4942,7 +4942,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -4966,7 +4966,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -5014,7 +5014,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -5038,7 +5038,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
@@ -5081,7 +5081,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<<else>>
@@ -5105,7 +5105,7 @@ $pronounCap has
<<if $activeSlave.inflationMethod == 2>>
There is a distinct curve to $possessive upper belly; the result of a stomach filled with $activeSlave.inflationType.
<<else>>
- $possessiveCaps stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
+ $possessiveCap stomach bulges a little larger thanks to all the $activeSlave.inflationType in $possessive bowels.
<</if>>
<</if>>
<</if>>
--
GitLab