From 2ea673d3bb36062ccde277a47d229b77febba4d8 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 3 Jun 2019 23:37:53 -0500
Subject: [PATCH] PregSourceFix
---
src/uncategorized/saLongTermEffects.tw | 6 +++---
src/uncategorized/slaveInteract.tw | 2 +-
src/utility/birthWidgets.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 20 ++++++++++++++++++++
src/utility/miscWidgets.tw | 2 +-
5 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 3fb28dd5f5d..d5e3103012d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5440,12 +5440,12 @@
<<= FutureSocieties.ChangePorn("Eugenics", 1)>>
<</if>>
<<if $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
- <<if $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1>>
- The Societal Elite @@.green;are pleased@@ your child is growing within $him. The mark covering $his lower belly, coupled with $his gravidity and blessing, @@.green;enamors@@ your populace.
+ <<if $slaves[$i].pregKnown == 1 && ($slaves[$i].pregSource == -1 || $slaves[$i].pregSource == -6)>>
+ The Societal Elite @@.green;are pleased@@ <<if $slaves[$i].pregSource == -1>>your<<elseif $slaves[$i].pregSource == -6>>an Elite<</if>> child is growing within $him. The mark covering $his lower belly, coupled with $his gravidity and blessing, @@.green;enamors@@ your populace.
<<set $failedElite -= 5+$slaves[$i].pregType>>
<<= FutureSocieties.ChangePorn("Eugenics", 3)>>
<<if $slaves[$i].abortionTat > 0>>
- The tally of aborted children adorning $his middle @@.red;is worrying,@@ however.
+ The <<if $slaves[$i].abortionTat > 1>>tally of aborted children<<else>>tattoo marking an aborted child<</if>> adorning $his middle @@.red;is worrying,@@ however.
<<= FutureSocieties.ChangePorn("Eugenics", -1)>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index da87e1b8204..e08cf78d329 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1230,7 +1230,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<<elseif ($activeSlave.preg > $activeSlave.pregData.minLiveBirth)>>
<<link "Give $him a cesarean section" "csec">><</link>>
- <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
+ <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && ($activeSlave.pregSource == -1 || $activeSlave.pregSource == -6)>>
//You are forbidden from aborting an Elite child//
<<elseif ($activeSlave.preg > 0)>>
<<link "Abort $his pregnancy" "Abort">><</link>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 9f7cd6d99fb..ce8a6393dfd 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1270,7 +1270,7 @@ Feeling childbirth approaching, $slaves[$i].slaveName is helped to $his prepared
<</switch>>
-<<if $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1 && $eugenicsFullControl != 1>>
+<<if $slaves[$i].breedingMark == 1 && $propOutcome == 1 && ($slaves[$i].pregSource == -1 || $slaves[$i].pregSource == -6) && $eugenicsFullControl != 1>>
<br>The Societal Elite @@.red;are furious@@ you would allow an elite child to perish under your watch<<if _curBabies > 1>>, let alone multiple<</if>>.
<<set $failedElite += 100>>
<</if>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 4fad09b01ed..8f591d5e20f 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -15354,24 +15354,32 @@ $He has
<<elseif $activeSlave.bellyPreg >= 15000>>
<<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is ripe with your child.
+ <<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -6>>
+ Your eugenics obsessed society is pleased that $he is ripe with an Elite child.
<<else>>
Your eugenics obsessed society finds $his huge pregnant belly absolutely disgusting.
<</if>>
<<elseif $activeSlave.bellyPreg >= 10000>>
<<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is heavy with your child.
+ <<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -6>>
+ Your eugenics obsessed society is pleased that $he is heavy with an Elite child.
<<else>>
Your eugenics obsessed society finds $his big pregnant belly absolutely disgusting.
<</if>>
<<elseif $activeSlave.bellyPreg >= 5000>>
<<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is swollen with your child.
+ <<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -6>>
+ Your eugenics obsessed society is pleased that $he is swollen with an Elite child.
<<else>>
Your eugenics obsessed society finds $his pregnant belly disgusting.
<</if>>
<<elseif $activeSlave.bellyPreg >= 1500>>
<<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is swelling with your child.
+ <<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -6>>
+ Your eugenics obsessed society is pleased that $he is swelling with an Elite child.
<<else>>
Your eugenics obsessed society finds $his developing pregnancy insulting.
<</if>>
@@ -16317,6 +16325,12 @@ $He has
all of them fathered by your citizens.
<<elseif $activeSlave.pregSource == -3>>
all of them fathered by your former Master. He was quite the busy man.
+ <<elseif $activeSlave.pregSource == -4>>
+ all of them fathered by another arcology owner.
+ <<elseif $activeSlave.pregSource == -5>>
+ all of them fathered by one of your clients.
+ <<elseif $activeSlave.pregSource == -6>>
+ all of them fathered by the Societal Elite.
<<elseif $activeSlave.pregSource == -9>>
all of them fathered by the Futanari Sisters, given how far along $he is and $his history.
<<elseif $activeSlave.pregSource == 0>>
@@ -16338,6 +16352,12 @@ $He has
Tests show $his womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>>children <<else>>a child <</if>>fathered by one of your citizens.
<<elseif $activeSlave.pregSource == -3>>
Tests show $his womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>>children <<else>>a child <</if>>fathered by your former Master. He was quite the busy man.
+ <<elseif $activeSlave.pregSource == -4>>
+ Tests show $his womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>>children <<else>>a child <</if>>fathered by another arcology owner.
+ <<elseif $activeSlave.pregSource == -5>>
+ Tests show $his womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>>children <<else>>a child <</if>>fathered by one of your clients.
+ <<elseif $activeSlave.pregSource == -6>>
+ Tests show $his womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>>children <<else>>a child <</if>>fathered by the Societal Elite.
<<elseif $activeSlave.pregSource == -9>>
$His womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>>children <<else>>a child <</if>>fathered by the Futanari Sisters, given how far along $he is and $his history.
<<elseif $activeSlave.pregSource == 0>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 6bcf1cbc479..c7f2caf605c 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -334,7 +334,7 @@ Call as <<SlaveInteractFertility>>
<</if>>
<<elseif ($activeSlave.preg > $activeSlave.pregData.minLiveBirth)>>
[["Give " + $him + " a cesarean section"|csec]]
- <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
+ <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && ($activeSlave.pregSource == -1 || $activeSlave.pregSource == -6)>>
//You are forbidden from aborting an Elite child//
<<elseif ($activeSlave.preg > 0)>>
[["Abort " + $his + " pregnancy"|Abort]]
--
GitLab