From 807848dc6316c01645025d2d0e5df3e40f3af692 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 25 Jun 2019 18:03:56 -0500
Subject: [PATCH] OtherChecks
---
.../mod_EditSlaveCheatDatatypeCleanupNew.tw | 2 +-
src/facilities/nursery/childInteract.tw | 16 +++++++-------
src/js/DefaultRules.js | 16 +++++++-------
src/npc/agent/agentSelect.tw | 2 +-
src/npc/fFeelings.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 16 +++++++-------
src/uncategorized/sellSlave.tw | 4 ++--
src/uncategorized/slaveInteract.tw | 22 +++++++++----------
src/utility/miscWidgets.tw | 6 ++---
9 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index b4963b908db..844e6c82805 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -175,7 +175,7 @@
<<print "Slave's physical age is equal to or higher than male puberty age, puberty set to 1 (post-puberty)" >><br>
<<set $tempSlave.pubertyXY = 1>>
<</if>>
-<<if $tempSlave.breedingMark == 1 && ["be a subordinate slave", "be confined in the arcade", "be the DJ", "be the Madam", "live with your Head Girl", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel", "work in the dairy"].includes($tempSlave.assignment)>>
+<<if $tempSlave.breedingMark == 1 $propOutcome == 1 && $eugenicsFullControl != 1 && $arcologies[0].FSRestart != "unset" && ["be a subordinate slave", "be confined in the arcade", "be the DJ", "be the Madam", "live with your Head Girl", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel", "work in the dairy"].includes($tempSlave.assignment)>>
<<print "Eugenics breeding marked slave detected in questionable use, defaulting slave assignment to 'rest'">><br>
<<= assignJob($tempSlave, "rest")>>
<</if>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 3269fc9b548..ef5d21ea06c 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -502,7 +502,7 @@
<br>Torso accessory: ''<span id="bellyAccessory">$activeChild.bellyAccessory</span>.''
<<link "None">><<set $activeChild.bellyAccessory = "none">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
| <<link "Tight corset">><<set $activeChild.bellyAccessory = "a corset">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
-<<if ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+<<if ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Extreme corset">><<set $activeChild.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeChild.bellyAccessory<</replace>><</link>>
<</if>>
<<if ($activeChild.belly > 10000)>>
@@ -522,16 +522,16 @@
<br>Anal accessory: ''<span id="buttplug">$activeChild.buttplug</span>.''
<<link "None">><<set $activeChild.buttplug = "none", $activeChild.buttplugAttachment = "none">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
| <<link "Normal">><<set $activeChild.buttplug = "plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
-<<if isItemAccessible("long plug") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+<<if isItemAccessible("long plug") && ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long">><<set $activeChild.buttplug = "long plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<</if>>
| <<link "Large">><<set $activeChild.buttplug = "large plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
-<<if isItemAccessible("long, large plug") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+<<if isItemAccessible("long, large plug") && ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long and large">><<set $activeChild.buttplug = "long, large plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<</if>>
<<if $activeChild.anus >= 2>>| <<link "Huge">><<set $activeChild.buttplug = "huge plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>><</if>>
<<if isItemAccessible("long, huge plug")>>
- <<if ($activeChild.breedingMark != 1 || $propOutcome == 0) && $activeChild.anus >= 2>>
+ <<if ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset") && $activeChild.anus >= 2>>
| <<link "Long and huge">><<set $activeChild.buttplug = "long, huge plug">><<replace "#buttplug">>$activeChild.buttplug<</replace>><</link>>
<</if>>
<</if>>
@@ -548,15 +548,15 @@
<br>Vaginal accessory: ''<span id="vaginalAccessory">$activeChild.vaginalAccessory</span>.''
<<link "None">><<set $activeChild.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
| <<link "Dildo">><<set $activeChild.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
- <<if isItemAccessible("long dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long dildo">><<set $activeChild.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
<</if>>
| <<link "Large dildo">><<set $activeChild.vaginalAccessory = "large dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
- <<if isItemAccessible("long, large dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long, large dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Large and long dildo">><<set $activeChild.vaginalAccessory = "long, large dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>>
<</if>>
<<if $activeChild.vagina >= 2>>| <<link "Huge dildo">><<set $activeChild.vaginalAccessory = "huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
- <<if isItemAccessible("long, huge dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long, huge dildo") && ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<<if $activeChild.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeChild.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
<</if>>
<</if>>
@@ -762,7 +762,7 @@
| Weight loss pills
<</if>>
<</if>>
- <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeChild.breedingMark != 1 || $propOutcome == 0)>>
+ <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeChild.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<<if ($activeChild.ovaries == 1 || $activeChild.mpreg == 1) && $activeChild.pubertyXX == 0>>
| <<link "Female hormone injections">><<set $activeChild.drugs = "female hormone injections">><<SlaveInteractDrugs>><</link>>
<</if>>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 258885c1e39..5371e9ca59e 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -117,7 +117,7 @@ window.DefaultRules = (function() {
break;
case "be confined in the arcade":
- if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.arcologies[0].FSRestart === "unset"))) {
+ if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -989,21 +989,21 @@ window.DefaultRules = (function() {
break;
case "long plug":
- if (slave.breedingMark === 1 && V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length plug for ${his} anus.`;
slave.buttplug = "plug";
}
break;
case "long, large plug":
- if (slave.breedingMark === 1 && V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length large plug for ${his} anus.`;
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
- if (slave.breedingMark === 1 && V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length huge plug for ${his} anus.`;
slave.buttplug = "huge plug";
} else {
@@ -1050,21 +1050,21 @@ window.DefaultRules = (function() {
break;
case "long plug":
- if (slave.breedingMark === 1 && V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length plug for ${his} anus.`;
slave.buttplug = "plug";
}
break;
case "long, large plug":
- if (slave.breedingMark === 1 && V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length large plug for ${his} anus.`;
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
- if (slave.breedingMark === 1 && V.propOutcome === 1 && V.arcologies[0].FSRestart !== "unset") {
+ if (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset") {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so ${slave.slaveName} has been given a standard length huge plug for ${his} anus.`;
slave.buttplug = "huge plug";
} else {
@@ -1567,7 +1567,7 @@ window.DefaultRules = (function() {
break;
case "super fertility drugs":
- if (!(slave.indentureRestrictions < 1 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.arcologies[0].FSRestart === "unset"))) {
+ if (!(slave.indentureRestrictions < 1 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
flag = false;
}
break;
diff --git a/src/npc/agent/agentSelect.tw b/src/npc/agent/agentSelect.tw
index 6228d77cdbf..52490fc1de9 100644
--- a/src/npc/agent/agentSelect.tw
+++ b/src/npc/agent/agentSelect.tw
@@ -4,7 +4,7 @@
''Appoint an Agent from your devoted slaves:''
<<= App.UI.SlaveList.slaveSelectionList(
- s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || State.variables.propOutcome === 0 || State.variables.arcologies[0].FSRestart === "unset")),
+ s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || State.variables.propOutcome === 0 || State.variables.eugenicsFullControl !== 1 || State.variables.arcologies[0].FSRestart === "unset")),
(slave, index) => App.UI.passageLink(SlaveFullName(slave), 'Agent Workaround', `$i = ${index}`),
s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)
)>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 21ebe376221..e62ba4484ce 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -1397,7 +1397,7 @@ My favorite part of my body i<<s>>
<<if $arcologies[0].FSSlimnessEnthusiast >= 10>>
<<if ($activeSlave.weight > 30)>>
I know I'm an ugly fat <<s>>lut. I wi<<sh>> I were <<s>>lim.
- <<elseif $activeSlave.belly >= 1500 && $arcologies[0].FSRestart != "unset" && $propOutcome == 0 && $activeSlave.breedingMark == 0>>
+ <<elseif $activeSlave.belly >= 1500 && $arcologies[0].FSRepopulationFocus != "unset" && $propOutcome == 0 && $activeSlave.breedingMark == 0>>
I know I'm an ugly fat <<s>>lut. I wi<<sh>> my belly wa<<s>>n't <<s>>o big.
<<elseif $activeSlave.butt > 3>>
I know I'm an ugly, fat a<<ss>>ed <<s>>lut. I wi<<sh>> it wa<<s>> <<s>>maller.
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 881a054aad6..92687c30e64 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -700,7 +700,7 @@ waist.
<</if>>
<</if>>
<<if ($activeSlave.waist >= -95) && ($activeSlave.waist < -75) && ($seeExtreme == 1)>>
- <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $arcologies[0].FSRestart == "unset")>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
[["Remove ribs to severely narrow " + $his + " waist"|Surgery Degradation][$activeSlave.waist = -100,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40,$surgeryType = "ribs"]]
<</if>>
<</if>>
@@ -747,7 +747,7 @@ $He's
<<if $activeSlave.indentureRestrictions >= 2>>
//$His indenture forbids elective surgery//
-<<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
+<<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1 && $eugenicsFullControl != 1 && $arcologies[0].FSRestart != "unset">>
//You are forbidden from affecting $his fertility//
<<elseif $activeSlave.preg > 0 || $activeSlave.inflation > 0 || $activeSlave.broodmother > 0>>
//$He is unable to support an abdominal implant at this time//
@@ -968,7 +968,7 @@ Work on $his sex:
<</if>>
<<if ($activeSlave.preg > -2) && ($activeSlave.preg < 1) && ($activeSlave.ovaries != 0 || $activeSlave.mpreg != 0)>>
- <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $arcologies[0].FSRestart == "unset")>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
[[Sterilize|Surgery Degradation][$activeSlave.preg = -2,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "ster"]]
<</if>>
<<elseif ($activeSlave.preg < 1) && ($activeSlave.ovaries != 0 || $activeSlave.mpreg != 0) && ($activeSlave.preg != -3)>>
@@ -1005,7 +1005,7 @@ Work on $his sex:
<</if>>
<</if>>
- <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $arcologies[0].FSRestart == "unset")>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<br>
<<if $activeSlave.ovaries == 1>>
<<if $activeSlave.preg > 0>>
@@ -1041,7 +1041,7 @@ Work on $his sex:
The implant firmware has already been adjusted.
<</if>>
<</if>>
- <<elseif $activeSlave.indentureRestrictions > 0 || ($activeSlave.breedingMark == 1 && $propOutcome == 1 && $arcologies[0].FSRestart != "unset")>>
+ <<elseif $activeSlave.indentureRestrictions > 0 || ($activeSlave.breedingMark == 1 && $propOutcome == 1 && $eugenicsFullControl != 1 && $arcologies[0].FSRestart != "unset")>>
//$He is protected from extreme surgery//
<<elseif isFertile($activeSlave) && $activeSlave.ovaryAge <= 46>>
$He could be made into a broodmother.
@@ -1098,12 +1098,12 @@ Work on $his sex:
<</if>>
<<if $activeSlave.vagina > -1>>
- <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $arcologies[0].FSRestart == "unset")>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| [[Remove pussy|Surgery Degradation][surgeryAmp($activeSlave, "vagina"), $surgeryType = "vaginaRemoval", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]] <<if $activeSlave.ovaries == 1>>//This will remove $his ovaries as well//<</if>>
<</if>>
<</if>>
-<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $arcologies[0].FSRestart == "unset")>>
+<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<<if ($activeSlave.vagina == -1) && ($activeSlave.dick != 0)>>
| [[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.chastityPenis = 0,$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.ballType = "human",$activeSlave.vasectomy = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.skill.vaginal = 0,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 40, $surgeryType = "mtf"]]
<</if>>
@@ -1761,7 +1761,7 @@ Work on $him structurally:
<<elseif $activeSlave.fetish == "mindbroken">>
<br>$His mind is gone; $he has either been chemically lobotomized, or has lost $his mind due to extreme abuse.
<</if>>
- <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $arcologies[0].FSRestart == "unset")>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<<if $activeSlave.fetish != "mindbroken">>
[[Chemically lobotomize|Surgery Degradation][$activeSlave.fetish = "mindbroken",$activeSlave.fetishKnown = 1,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20,$surgeryType = "mindbreak"]]
//Warning: this is permanent and irreversible. It will destroy $his will and $his ability to remember anything but the simplest skills.//
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index afc00fd28d1..5025e1466cd 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -41,7 +41,7 @@ You prepare $him for sale. $His response to being put up for purchase is
<<set $slaveCost = slaveCost($activeSlave)>>
<<set $slaveCost = (random(70,80)*Math.trunc($slaveCost/100))>>
-<<if $activeSlave.breedingMark == 1 && $propOutcome == 1>>
+<<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
Since you are selling a breeding slave, $he will be sent to auction before other members of the Societal Elite.
<<else>>
<<if $showAppraisal == 1>>
@@ -705,7 +705,7 @@ __Financial Records__
<br><br>
-<<if $activeSlave.breedingMark == 1 && $propOutcome == 1>>
+<<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $arcologies[0].FSRestart != "unset">>
<<set $buyer = 0>>
<<set _Price = 500*Math.trunc(($slaveCost*1.1)/500)>>
<br>The current offer for $him stands at ''<<print cashFormat(_Price)>>''.
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index a695c4a2a13..9b7b5128402 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -392,7 +392,7 @@
<</if>>
<</if>>
<<set _activeSlaveRepSacrifice = repGainSacrifice($activeSlave, $arcologies[0])>>
-<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>
+<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Sacrifice $him on the altar" "Aztec Slave Sacrifice">><<set $sacrificeType = "life">><</link>>//This will kill $him and gain you _activeSlaveRepSacrifice reputation//
<</if>>
@@ -872,7 +872,7 @@
<br>Torso accessory: ''<span id="bellyAccessory">$activeSlave.bellyAccessory</span>.''
<<link "None">><<set $activeSlave.bellyAccessory = "none">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
| <<link "Tight corset">><<set $activeSlave.bellyAccessory = "a corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
- <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Extreme corset">><<set $activeSlave.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
<</if>>
<<if ($activeSlave.belly > 10000)>>
@@ -892,17 +892,17 @@
<br>Anal accessory: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<<link "None">><<set $activeSlave.buttplug = "none", $activeSlave.buttplugAttachment = "none">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
| <<link "Normal">><<set $activeSlave.buttplug = "plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
- <<if isItemAccessible("long plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long">><<set $activeSlave.buttplug = "long plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
<</if>>
| <<link "Large">><<set $activeSlave.buttplug = "large plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
- <<if isItemAccessible("long, large plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long, large plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long and large">><<set $activeSlave.buttplug = "long, large plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
<</if>>
<<if $activeSlave.anus >= 2>>
| <<link "Huge">><<set $activeSlave.buttplug = "huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
<<if isItemAccessible("long, huge plug")>>
- <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long and huge">><<set $activeSlave.buttplug = "long, huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
<</if>>
<</if>>
@@ -929,16 +929,16 @@
| <<link "Smart bullet vibrator">><<set $activeSlave.vaginalAccessory = "smart bullet vibrator">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
<</if>>
| <<link "Dildo">><<set $activeSlave.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
- <<if isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Long dildo">><<set $activeSlave.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
<</if>>
| <<link "Large dildo">><<set $activeSlave.vaginalAccessory = "large dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
- <<if isItemAccessible("long, large dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long, large dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Large and long dildo">><<set $activeSlave.vaginalAccessory = "long, large dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
<</if>>
<<if $activeSlave.vagina >= 2>>
| <<link "Huge dildo">><<set $activeSlave.vaginalAccessory = "huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
- <<if isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Huge and long dildo">><<set $activeSlave.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
<</if>>
<</if>>
@@ -1086,7 +1086,7 @@
<</if>>
<</if>>
| <<link "Fertility">><<set $activeSlave.drugs = "fertility drugs">><<SlaveInteractDrugs>><</link>>
- <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Fertility+">><<set $activeSlave.drugs = "super fertility drugs">><<SlaveInteractDrugs>><</link>>
<</if>>
<<if ($activeSlave.dick > 0)>>
@@ -1161,7 +1161,7 @@
| Weight loss pills
<</if>>
<</if>>
- <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $activeSlave.pubertyXX == 0>>
| <<link "Female hormone injections">><<set $activeSlave.drugs = "female hormone injections">><<SlaveInteractDrugs>><</link>>
<</if>>
@@ -1251,7 +1251,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<</if>>
<</if>>
-<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
+<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset") && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
<br>
__Pregnancy control__: <<if $activeSlave.pregControl == "labor suppressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation speed<<elseif $activeSlave.pregControl == "speed up">>Faster gestation speed, staffed clinic recommended<<else>>Normal gestation and birth<</if>>.
<<if ($activeSlave.preg >= $activeSlave.pregData.minLiveBirth)>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index a93168de812..7dffadc095f 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -200,7 +200,7 @@ Call as <<SlaveInteractDrugs>>
<</if>>
<</if>>
| <<link "Fertility">><<set $activeSlave.drugs = "fertility drugs">><<SlaveInteractDrugs>><</link>>
- <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
| <<link "Fertility+">><<set $activeSlave.drugs = "super fertility drugs">><<SlaveInteractDrugs>><</link>>
<</if>>
<<if ($activeSlave.dick > 0)>>
@@ -275,7 +275,7 @@ Call as <<SlaveInteractDrugs>>
| Weight loss pills
<</if>>
<</if>>
- <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
+ <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
<<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $activeSlave.pubertyXX == 0>>
| <<link "Female hormone injections">><<set $activeSlave.drugs = "female hormone injections">><<SlaveInteractDrugs>><</link>>
<</if>>
@@ -344,7 +344,7 @@ Call as <<SlaveInteractFertility>>
<</if>>
<</if>>
<</if>>
-<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
+<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset") && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
<br>
__Pregnancy control__: <<if $activeSlave.pregControl == "labor suppressors">>Labor is suppressed<<elseif $activeSlave.pregControl == "slow gestation">>Slowed gestation speed<<elseif $activeSlave.pregControl == "speed up">>Faster gestation speed, staffed clinic recommended<<else>>Normal gestation and birth<</if>>.
<<if ($activeSlave.preg >= $activeSlave.pregData.minLiveBirth)>>
--
GitLab