From 0ae4ab72e7b25c2c879de5e624e7bd739253e703 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 25 Jul 2018 23:50:38 -0400
Subject: [PATCH] breeding mark only matters when appropriate
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++
devNotes/twine JS.txt | 56 ++++++++++----------
src/js/DefaultRules.tw | 52 +++++++++---------
src/js/assayJS.tw | 2 +-
src/js/fresult.tw | 2 +-
src/npc/descriptions/fFuckdollWidgets.tw | 4 +-
src/npc/fPCImpreg.tw | 2 +-
src/npc/fRelation.tw | 2 +-
src/npc/fSlaveImpregConsummate.tw | 2 +-
src/pregmod/csec.tw | 4 +-
src/pregmod/fSlaveSelfImpreg.tw | 2 +-
src/pregmod/huskSlaveSwapWorkaround.tw | 2 +-
src/pregmod/newChildIntro.tw | 8 +--
src/pregmod/widgets/seBirthWidgets.tw | 6 +--
src/uncategorized/bodyModification.tw | 5 ++
src/uncategorized/futureSociety.tw | 2 +-
src/uncategorized/matchmaking.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 2 +-
src/uncategorized/reNickname.tw | 2 +-
src/uncategorized/remoteSurgery.tw | 26 ++++-----
src/uncategorized/saHormoneEffects.tw | 4 +-
src/uncategorized/saLongTermEffects.tw | 12 ++---
src/uncategorized/saPleaseYou.tw | 4 +-
src/uncategorized/saRecruitGirls.tw | 8 +--
src/uncategorized/seWedding.tw | 4 +-
src/uncategorized/sellSlave.tw | 7 ++-
src/uncategorized/slaveInteract.tw | 36 ++++++-------
src/uncategorized/slaveSold.tw | 2 +-
src/uncategorized/slaveSummary.tw | 34 ++++++------
src/uncategorized/wardrobeUse.tw | 14 ++---
src/utility/assayWidgets.tw | 15 +++++-
src/utility/birthWidgets.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 33 ++++++++----
src/utility/miscWidgets.tw | 10 ++--
34 files changed, 203 insertions(+), 170 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index b6b4cd3f7b9..23b0f2a67d6 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,11 @@
7/25/2018
+ 5
+ -fixes
+ -marked breeders are now only special in Eugenics societies that have embraced them
+ -tweaked beauty prestige multipliers
+
4
-more porn balance tweaks
-fixes and edits
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 3f24d236b3f..b1f2e1887b0 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -8416,7 +8416,7 @@ window.DegradingName = function DegradingName(slave) {
if (slave.labia > 1) {
suffixes.push("Curtains", "Flower", "Lips");
}
- if (slave.breedingMark === 1) {
+ if (slave.breedingMark === 1 && V.propOutcome === 1) {
suffixes.push("Breeder", "Oven", "Womb");
}
if (slave.butt > 5) {
@@ -10445,7 +10445,7 @@ window.FResult = (function() {
if (slave.preg > 10) V.FResult += 2;
else V.FResult -= 2;
} else if (V.arcologies[0].FSRestart > 20) {
- if (slave.bellyPreg >= 500 && slave.breedingMark === 1)
+ if (slave.bellyPreg >= 500 && slave.breedingMark === 1 && V.propResult === 1)
V.FResult += 1;
else if (slave.preg > 10)
V.FResult -= 10;
@@ -11843,7 +11843,7 @@ window.DefaultRules = (function() {
break;
case "be confined in the arcade":
- if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && slave.breedingMark != 1))
+ if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && (slave.breedingMark != 1 || V.propOutcome === 0)))
break;
else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -11879,7 +11879,7 @@ window.DefaultRules = (function() {
break;
case "work in the brothel":
- if ((V.brothelSlaves < V.brothel && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && slave.breedingMark != 1))
+ if ((V.brothelSlaves < V.brothel && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark != 1 || V.propOutcome === 0)))
break;
else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -11888,7 +11888,7 @@ window.DefaultRules = (function() {
break;
case "serve in the club":
- if ((V.clubSlaves < V.club && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && slave.breedingMark != 1))
+ if ((V.clubSlaves < V.club && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark != 1 || V.propOutcome === 0)))
break;
else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -11900,7 +11900,7 @@ window.DefaultRules = (function() {
if ((V.dairy > V.dairySlaves+V.bioreactorsXY+V.bioreactorsXX+V.bioreactorsHerm+V.bioreactorsBarren)) {
if ((slave.indentureRestrictions > 0) && (V.dairyRestraintsSetting > 1))
break;
- else if (((slave.indentureRestrictions > 1) && (V.dairyRestraintsSetting > 0)) || (slave.breedingMark == 1 && V.dairyRestriantsSettings > 0) || ((V.dairyPregSetting > 0) && ((slave.bellyImplant != -1) || (slave.broodmother !== 0))))
+ else if (((slave.indentureRestrictions > 1) && (V.dairyRestraintsSetting > 0)) || (slave.breedingMark == 1 && V.propOutcome == 1 && V.dairyRestriantsSettings > 0) || ((V.dairyPregSetting > 0) && ((slave.bellyImplant != -1) || (slave.broodmother !== 0))))
break;
else {
if ((slave.lactation > 0 || ((V.dairySlimMaintainUpgrade === 0 || V.dairySlimMaintain === 0) && (slave.boobs > 300 || slave.dick === 0 || V.dairyImplantsSetting == 1) && V.dairyImplantsSetting != 2)) || (slave.balls > 0)) {
@@ -11989,7 +11989,7 @@ window.DefaultRules = (function() {
break;
case "work a glory hole":
- if (slave.indentureRestrictions <= 0 && slave.breedingMark != 1)
+ if (slave.indentureRestrictions <= 0 && (slave.breedingMark != 1 || V.propOutcome === 0))
break;
else
delete rule.setAssignment;
@@ -11998,7 +11998,7 @@ window.DefaultRules = (function() {
case "whore":
case "serve the public":
case "stay confined":
- if ((slave.fuckdoll === 0) && slave.breedingMark != 1)
+ if ((slave.fuckdoll === 0) && (slave.breedingMark != 1 || V.propOutcome === 0))
break;
else
delete rule.setAssignment;
@@ -12216,21 +12216,21 @@ window.DefaultRules = (function() {
break;
case "long dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for her pussy.`;
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for her pussy.`;
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
@@ -12273,21 +12273,21 @@ window.DefaultRules = (function() {
break;
case "long dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for her pussy.`;
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for her pussy.`;
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
@@ -12330,21 +12330,21 @@ window.DefaultRules = (function() {
break;
case "long dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length dildo for her pussy.`;
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length large dildo for her pussy.`;
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
@@ -12460,21 +12460,21 @@ window.DefaultRules = (function() {
break;
case "long plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "plug";
}
break;
case "long, large plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "huge plug";
} else {
@@ -12517,21 +12517,21 @@ window.DefaultRules = (function() {
break;
case "long plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "plug";
}
break;
case "long, large plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "huge plug";
} else {
@@ -12874,12 +12874,12 @@ window.DefaultRules = (function() {
break;
case "female hormone injections":
- if (!(slave.breedingMark != 1 && (slave.ovaries == 1 || slave.mpreg == 1) && slave.pubertyXX === 0))
+ if (!((slave.breedingMark != 1 || V.propOutcome == 0) && (slave.ovaries == 1 || slave.mpreg == 1) && slave.pubertyXX === 0))
flag = false;
break;
case "male hormone injections":
- if (!(slave.breedingMark != 1 && slave.balls > 0 && slave.pubertyXY === 0))
+ if (!((slave.breedingMark != 1 || V.propOutcome == 0) && slave.balls > 0 && slave.pubertyXY === 0))
flag = false;
break;
@@ -12939,7 +12939,7 @@ window.DefaultRules = (function() {
break;
case "super fertility drugs":
- if (!(slave.indentureRestrictions < 1 && slave.breedingMark !== 1))
+ if (!(slave.indentureRestrictions < 1 && (slave.breedingMark !== 1 || V.propOutcome == 0)))
flag = false;
break;
@@ -12989,7 +12989,7 @@ window.DefaultRules = (function() {
break;
case "female hormone injections":
- if (!(slave.breedingMark !== 1 && (slave.ovaries === 1 || slave.mpreg === 1) && slave.pubertyXX === 0))
+ if (!((slave.breedingMark !== 1 || V.propOutcome == 0) && (slave.ovaries === 1 || slave.mpreg === 1) && slave.pubertyXX === 0))
flag = false;
break;
@@ -13273,7 +13273,7 @@ window.DefaultRules = (function() {
}
function ProcessPregnancyDrugs(slave, rule) {
- if (slave.pregKnown == 1 && rule.pregSpeed != "no default setting" && slave.breedingMark != 1 && slave.indentureRestrictions < 1 && slave.broodmother === 0) {
+ if (slave.pregKnown == 1 && rule.pregSpeed != "no default setting" && (slave.breedingMark != 1 || V.propOutcome == 0) && slave.indentureRestrictions < 1 && slave.broodmother === 0) {
if (rule.pregSpeed == "slow" && slave.preg < 35) {
slave.pregControl = "slow gestation";
r += `<br>${slave.slaveName} is pregnant, so she has been put on the gestation slowing agents.`;
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 9cfa0ca6aa2..459d6769568 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -87,7 +87,7 @@ window.DefaultRules = (function() {
break;
case "be confined in the arcade":
- if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && slave.breedingMark != 1))
+ if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && (slave.breedingMark != 1 || V.propOutcome === 0)))
break;
else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -123,7 +123,7 @@ window.DefaultRules = (function() {
break;
case "work in the brothel":
- if ((V.brothelSlaves < V.brothel && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && slave.breedingMark != 1))
+ if ((V.brothelSlaves < V.brothel && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark != 1 || V.propOutcome === 0)))
break;
else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -132,7 +132,7 @@ window.DefaultRules = (function() {
break;
case "serve in the club":
- if ((V.clubSlaves < V.club && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && slave.breedingMark != 1))
+ if ((V.clubSlaves < V.club && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark != 1 || V.propOutcome === 0)))
break;
else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -144,7 +144,7 @@ window.DefaultRules = (function() {
if ((V.dairy > V.dairySlaves+V.bioreactorsXY+V.bioreactorsXX+V.bioreactorsHerm+V.bioreactorsBarren)) {
if ((slave.indentureRestrictions > 0) && (V.dairyRestraintsSetting > 1))
break;
- else if (((slave.indentureRestrictions > 1) && (V.dairyRestraintsSetting > 0)) || (slave.breedingMark == 1 && V.dairyRestriantsSettings > 0) || ((V.dairyPregSetting > 0) && ((slave.bellyImplant != -1) || (slave.broodmother !== 0))))
+ else if (((slave.indentureRestrictions > 1) && (V.dairyRestraintsSetting > 0)) || (slave.breedingMark == 1 && V.propOutcome == 1 && V.dairyRestriantsSettings > 0) || ((V.dairyPregSetting > 0) && ((slave.bellyImplant != -1) || (slave.broodmother !== 0))))
break;
else {
if ((slave.lactation > 0 || ((V.dairySlimMaintainUpgrade === 0 || V.dairySlimMaintain === 0) && (slave.boobs > 300 || slave.dick === 0 || V.dairyImplantsSetting == 1) && V.dairyImplantsSetting != 2)) || (slave.balls > 0)) {
@@ -233,7 +233,7 @@ window.DefaultRules = (function() {
break;
case "work a glory hole":
- if (slave.indentureRestrictions <= 0 && slave.breedingMark != 1)
+ if (slave.indentureRestrictions <= 0 && (slave.breedingMark != 1 || V.propOutcome === 0))
break;
else
delete rule.setAssignment;
@@ -242,7 +242,7 @@ window.DefaultRules = (function() {
case "whore":
case "serve the public":
case "stay confined":
- if ((slave.fuckdoll === 0) && slave.breedingMark != 1)
+ if ((slave.fuckdoll === 0) && (slave.breedingMark != 1 || V.propOutcome === 0))
break;
else
delete rule.setAssignment;
@@ -460,21 +460,21 @@ window.DefaultRules = (function() {
break;
case "long dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for her pussy.`;
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for her pussy.`;
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
@@ -517,21 +517,21 @@ window.DefaultRules = (function() {
break;
case "long dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length dildo for her pussy.`;
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length large dildo for her pussy.`;
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
@@ -574,21 +574,21 @@ window.DefaultRules = (function() {
break;
case "long dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length dildo for her pussy.`;
slave.vaginalAccessory = "dildo";
}
break;
case "long, large dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length large dildo for her pussy.`;
slave.vaginalAccessory = "large dildo";
}
break;
case "long, huge dildo":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
@@ -704,21 +704,21 @@ window.DefaultRules = (function() {
break;
case "long plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "plug";
}
break;
case "long, large plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "huge plug";
} else {
@@ -761,21 +761,21 @@ window.DefaultRules = (function() {
break;
case "long plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "plug";
}
break;
case "long, large plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "large plug";
}
break;
case "long, huge plug":
- if (slave.breedingMark == 1) {
+ if (slave.breedingMark == 1 && V.propOutcome == 1) {
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 her anus.`;
slave.buttplug = "huge plug";
} else {
@@ -1118,12 +1118,12 @@ window.DefaultRules = (function() {
break;
case "female hormone injections":
- if (!(slave.breedingMark != 1 && (slave.ovaries == 1 || slave.mpreg == 1) && slave.pubertyXX === 0))
+ if (!((slave.breedingMark != 1 || V.propOutcome == 0) && (slave.ovaries == 1 || slave.mpreg == 1) && slave.pubertyXX === 0))
flag = false;
break;
case "male hormone injections":
- if (!(slave.breedingMark != 1 && slave.balls > 0 && slave.pubertyXY === 0))
+ if (!((slave.breedingMark != 1 || V.propOutcome == 0) && slave.balls > 0 && slave.pubertyXY === 0))
flag = false;
break;
@@ -1183,7 +1183,7 @@ window.DefaultRules = (function() {
break;
case "super fertility drugs":
- if (!(slave.indentureRestrictions < 1 && slave.breedingMark !== 1))
+ if (!(slave.indentureRestrictions < 1 && (slave.breedingMark !== 1 || V.propOutcome == 0)))
flag = false;
break;
@@ -1233,7 +1233,7 @@ window.DefaultRules = (function() {
break;
case "female hormone injections":
- if (!(slave.breedingMark !== 1 && (slave.ovaries === 1 || slave.mpreg === 1) && slave.pubertyXX === 0))
+ if (!((slave.breedingMark !== 1 || V.propOutcome == 0) && (slave.ovaries === 1 || slave.mpreg === 1) && slave.pubertyXX === 0))
flag = false;
break;
@@ -1517,7 +1517,7 @@ window.DefaultRules = (function() {
}
function ProcessPregnancyDrugs(slave, rule) {
- if (slave.pregKnown == 1 && rule.pregSpeed != "no default setting" && slave.breedingMark != 1 && slave.indentureRestrictions < 1 && slave.broodmother === 0) {
+ if (slave.pregKnown == 1 && rule.pregSpeed != "no default setting" && (slave.breedingMark != 1 || V.propOutcome == 0) && slave.indentureRestrictions < 1 && slave.broodmother === 0) {
if (rule.pregSpeed == "slow" && slave.preg < 35) {
slave.pregControl = "slow gestation";
r += `<br>${slave.slaveName} is pregnant, so she has been put on the gestation slowing agents.`;
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index b2de9885055..3724e489279 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -1791,7 +1791,7 @@ window.DegradingName = function DegradingName(slave) {
if (slave.labia > 1) {
suffixes.push("Curtains", "Flower", "Lips");
}
- if (slave.breedingMark === 1) {
+ if (slave.breedingMark === 1 && V.propOutcome === 1) {
suffixes.push("Breeder", "Oven", "Womb");
}
if (slave.butt > 5) {
diff --git a/src/js/fresult.tw b/src/js/fresult.tw
index 4341ca791cc..1622e867e4a 100644
--- a/src/js/fresult.tw
+++ b/src/js/fresult.tw
@@ -138,7 +138,7 @@ window.FResult = (function() {
if (slave.preg > 10) V.FResult += 2;
else V.FResult -= 2;
} else if (V.arcologies[0].FSRestart > 20) {
- if (slave.bellyPreg >= 500 && slave.breedingMark === 1)
+ if (slave.bellyPreg >= 500 && slave.breedingMark === 1 && V.propResult === 1)
V.FResult += 1;
else if (slave.preg > 10)
V.FResult -= 10;
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index 529abb47d15..8d70eb3e701 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -167,8 +167,8 @@ You repeat this ritual throughout the week, ensuring that it will be an @@.lime;
<<= knockMeUp($activeSlave, 100, 2, -1, 1)>>
-<<if $arcologies[0].FSRestart != "unset">>
- <<if $activeSlave.breedingMark != 1>>
+<<if $arcologies[0].FSRestart != "unset" && $eugenicsFullControl != 1>>
+ <<if $activeSlave.breedingMark != 1 || $propOutcome == 0>>
Rumors spread about you knocking up your playthings; the Societal Elite are @@.red; very displeased@@ by these rumors.
<<set $failedElite += 5>>
<</if>>
diff --git a/src/npc/fPCImpreg.tw b/src/npc/fPCImpreg.tw
index 62988a633c8..27a735404e8 100644
--- a/src/npc/fPCImpreg.tw
+++ b/src/npc/fPCImpreg.tw
@@ -115,7 +115,7 @@ You repeat this ritual throughout the week, ensuring that $activeSlave.slaveName
<<= knockMeUp($activeSlave, 100, 2, -1, 1)>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if $activeSlave.breedingMark != 1>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $eugenicsFullControl != 1>>
Rumors spread about you fucking your slaves pregnant; the Societal Elite are @@.red; very displeased@@ by these rumors.
<<set $failedElite += 5>>
<</if>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index c19e8374bb0..4f5e93c3f78 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -75,7 +75,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<else>>
licking _his2 anus while _he2 humps _himself2 up and down on your cock.
<</if>>
- Your use of $slaves[$partner].slaveName's mature body is the focus. _He2 finds _himself2 caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $activeSlave.slaveName's mouth tour _his2 body. When you finish in _his2 <<if ($slaves[$partner].dick > 0)>>asshole, _his2 daughter hastens to lavish attention on $his _partnerRel's well fucked, cum filled butt.<<else>>pussy, _his2 daughter hastens to lavish attention on $his _partnerRel's well fucked, cum filled cunt.<</if>>
+ Your use of $slaves[$partner].slaveName's <<if $slaves[$partner].physicalAge >= 24>>mature<<else>>surprisingly young<</if>> body is the focus. _He2 finds _himself2 caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $activeSlave.slaveName's mouth tour _his2 body. When you finish in _his2 <<if ($slaves[$partner].dick > 0)>>asshole, _his2 daughter hastens to lavish attention on $his _partnerRel's well fucked, cum filled butt.<<else>>pussy, _his2 daughter hastens to lavish attention on $his _partnerRel's well fucked, cum filled cunt.<</if>>
<<set $activeSlave.oralCount += 2, $slaves[$partner].oralCount += 2, $oralTotal += 2>>
<<= PartnerVCheck()>>
<<elseif canDoVaginal($activeSlave) && canDoVaginal($slaves[$partner]) && canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && (_activeSlaveRel == "twin")>>
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index 20745093481..c7999ee6f1b 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -272,7 +272,7 @@ Next, you see to $activeSlave.slaveName.
Throughout the week, you keep $activeSlave.slaveName's <<if $activeSlave.mpreg == 1>>ass<<else>>pussy<</if>> intimate with $impregnatrix.slaveName's cock. In the end, you are certain $activeSlave.slaveName is carrying $impregnatrix.slaveName's child.
-<<if $arcologies[0].FSRestart != "unset">>
+<<if $arcologies[0].FSRestart != "unset" && $eugenicsFullControl != 1>>
Rumors spread about you breeding your slaves; the Societal Elite are @@.red;displeased@@ by these rumors.
<<set $failedElite += 1>>
<</if>>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 13ac02332b8..ffa3170ded9 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -154,7 +154,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<if _incubated != 2 && _curBabies > 0 >>
<span id="_disposition">
<<if _incubated == 1>>the rest<</if>>
- <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1 && $propOutcome == 1>>
<<set _lostBabies = 1>>
handed off to the Societal Elite to be raised into upstanding members of the new society.
<<elseif $Cash4Babies == 1 && ($activeSlave.relationship != -3) && ($activeSlave.assignment != "serve in the master suite") && ($activeSlave.assignment != "be your Concubine")>>
@@ -285,7 +285,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<if $arcologies[0].FSRestart != "unset" && _curBabies > 0>>
<br><br>
- <<if $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<if $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1 && $propOutcome == 1>>
The Societal Elite @@.green;are pleased@@ at the new additions to their class.
<<set $failedElite -= 2*_curBabies>>
<<else>>
diff --git a/src/pregmod/fSlaveSelfImpreg.tw b/src/pregmod/fSlaveSelfImpreg.tw
index 4e8825fa764..2f233fa468e 100644
--- a/src/pregmod/fSlaveSelfImpreg.tw
+++ b/src/pregmod/fSlaveSelfImpreg.tw
@@ -174,7 +174,7 @@ You repeat this ritual throughout the week, ensuring that $activeSlave.slaveName
<<= knockMeUp($activeSlave, 100, 2, $activeSlave.ID, 1)>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if $activeSlave.breedingMark != 1>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $eugenicsFullControl != 1>>
Rumors spread about you having your slaves breed; the Societal Elite are @@.red; very displeased@@ by these rumors.
<<set $failedElite += 5>>
<</if>>
diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw
index ce39f57a185..09449d87ad2 100644
--- a/src/pregmod/huskSlaveSwapWorkaround.tw
+++ b/src/pregmod/huskSlaveSwapWorkaround.tw
@@ -13,7 +13,7 @@ __Select an eligible slave:__
<<if $slaves[_i].fuckdoll == 0>>
<<if ($slaves[_i].PLimb == 0) || ($slaves[_i].PLimb == 1 && $slaves[_i].amp == 1)>>
<<if ($slaves[_i].indenture == -1)>>
- <<if ($slaves[_i].breedingMark == 0)>>
+ <<if ($slaves[_i].breedingMark == 0 || $propOutcome == 0)>>
<<if ($slaves[_i].reservedChildren == 0)>>
<<if ($slaves[_i].ID != $activeSlave.ID)>>
<br><<print "[[$slaves[_i].slaveName|Husk Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= 10000]]">>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index d8279f16a9d..9e984bd8a7b 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -245,7 +245,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
alone, having no family<<if $activeSlave.mother == -1 || $activeSlave.father == -1>>, other than you,<</if>> in your stock.
<</if>>
<<if $arcologies[0].FSRestartDecoration == 100 && def _tempMom>>
- <<if _tempMom.breedingMark == 1>>
+ <<if _tempMom.breedingMark == 1 && $propOutcome == 1>>
The Societal Elite are waiting to inspect the child of their eugenics programs.
<<if $arcologies[0].FSSupremacist > 20 && $activeSlave.race != $arcologies[0].FSSupremacistRace>>
They take one look at the $activeSlave.race <<if $activeSlave.race == "mixed race">>mutt<<else>>dog<</if>> you've sired for them and @@.red;leave in a huff.@@
@@ -646,10 +646,10 @@ You slowly strip down, gauging her reactions to your show, until you are fully n
You perform a careful medical examination to verify fertility, and then forcefully take the girl's virginity. Whenever you feel able, you drain your balls into her cunt, only allowing her to wander off when scans verify a fertilized ovum. She didn't properly understand the scans, so she just thought it was sex; she won't realize what happened for some months at least, and in the mean time, will think she is just getting fat. Though once her child starts kicking, she might make the connection between sex and pregnancy.
<</if>>
<<= VaginalVCheck()>>
- <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>>
+ <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0 && $eugenicsFullControl != 1>>
The Societal Elite @@.red;disapprove@@ of this breach of eugenics.
<<set $failedElite += 5>>
- <<elseif $activeSlave.breedingMark == 1>>
+ <<elseif $activeSlave.breedingMark == 1 && $propOutcome == 1>>
The Societal Elite @@.green;are pleased@@ that you are promptly putting a child in her.
<<set $failedElite -= 5>>
<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
@@ -995,7 +995,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily s
<<if $arcologies[0].FSRestart >= 10>>
<<if $activeSlave.preg != -2 && $activeSlave.ovaries > 0>>
-<<if $activeSlave.breedingMark == 0>>
+<<if $activeSlave.breedingMark == 0 || $propOutcome == 0>>
<br><<link "Sterilize her">>
<<set $activeSlave.preg = -2>>
<<set $activeSlave.pregType = 0>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 4a0c0b86720..de8faaa03b4 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -730,8 +730,8 @@ All in all,
<</if>>
/* ------ Social reactions--------------- */
-<<if $arcologies[0].FSRestart != "unset">>
- <<if $slaves[$i].breedingMark == 1 && $slaves[$i].pregSource == -1>>
+<<if $arcologies[0].FSRestart != "unset" && $eugenicsFullControl != 1>>
+ <<if $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1>>
<br><br>
The Societal Elite @@.green;are pleased@@ at the new additions to their class.
<<set $failedElite -= 2 * _curBabies>>
@@ -813,7 +813,7 @@ All in all,
<<set _count = _curBabies>>
<br><br>
<<span $dispositionId>>
- <<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $slaves[$i].pregSource == -1>>
+ <<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1>>
<<set _lostBabies = 1>>
$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>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index ee6a1c5aba8..78fee7233fb 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1011,3 +1011,8 @@ Choose a site for branding:
<</link>>?
<</if>>
//Branding will slightly reduce $possessive beauty but may slowly increase your reputation.//
+
+<<if $activeSlave.breedingMark == 1 && $propOutcome == 0>>
+ <br>
+ $pronounCap has an intricate tattoo on $possessive lower belly that suggests $pronoun was made to be bred. [[Remove it|Body Modification][$activeSlave.breedingMark = 0]]
+<</if>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 0746dc9f0d2..c2323b79bc9 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -681,7 +681,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<if $eugenicsFullControl != 1>>
The Societal Elite will not permit you to abandon Eugenics.
<<else>>
- //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 2, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 2, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $propOutcome = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//
<</if>>
<br>
<<FSChangeDecoration "FSRestart">>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 493ec1041fb..594683b8747 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -342,7 +342,7 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
<<set $cash -= 10000>>
<</replace>>
<</link>>
-<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0) && $eventSlave.breedingMark != 1>>
+<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0) && ($eventSlave.breedingMark != 1 || $propOutcome == 0)>>
<br> <<link "Orgiastic ceremony">>
<<replace "#result2">>
You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index c20e6a258dc..ece8c280d22 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -97,7 +97,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $familyTesting == 0 && ($activeSlave.indenture < 0) && ($activeSlave.relation == 0)>>
<<if random(1,100) <= 5>>
<<set $activeSlave.recruiter = "twin">>
- <<elseif ($activeSlave.actualAge > 32) && ($activeSlave.vagina != 0) && (random(1,100) <= 41)>>
+ <<elseif ($activeSlave.actualAge > 32) && ($activeSlave.vagina != 0) && $activeSlave.trueVirgin != 1 && (random(1,100) <= 41)>>
<<set $activeSlave.recruiter = "mother">>
<<elseif ($activeSlave.actualAge < 24) && (random(1,100) <= 40)>>
<<set $activeSlave.recruiter = "daughter">>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 73c2e056631..7b0c7aece2e 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -182,7 +182,7 @@
<<if ($activeSlave.eyes == -2)>>
<<set $qualifiedNicknames.push("blind")>>
<</if>>
-<<if $activeSlave.breedingMark == 1>>
+<<if $activeSlave.breedingMark == 1 && $propOutcome == 1>>
<<set $qualifiedNicknames.push("mark")>>
<</if>>
<<if ($activeSlave.broodmother > 1) && ($activeSlave.preg >= 37)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 044f15a8e62..3cb829a4075 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -361,12 +361,12 @@ Work on her chest:
<</if>>
<</if>>
<<if ($activeSlave.boobs >= 7000) && ($activeSlave.boobsImplant == 0)>>
- <<if $activeSlave.indentureRestrictions >= 2 || $activeSlave.breedingMark == 1>>
+ <<if $activeSlave.indentureRestrictions >= 2 || ($activeSlave.breedingMark == 1 && $propOutcome == 1)>>
<<else>>
| [[Mastectomy|Surgery Degradation][$activeSlave.boobs = 300, $activeSlave.breastMesh = 0, $activeSlave.health -= 30,$cash -= $surgeryCost, $surgeryType = "mastectomy+"]]
<</if>>
<<elseif ($activeSlave.boobs >= 2000) && ($activeSlave.boobsImplant == 0)>>
- <<if $activeSlave.indentureRestrictions >= 2 || $activeSlave.breedingMark == 1>>
+ <<if $activeSlave.indentureRestrictions >= 2 || ($activeSlave.breedingMark == 1 && $propOutcome == 1)>>
<<else>>
| [[Mastectomy|Surgery Degradation][$activeSlave.boobs = 300, $activeSlave.breastMesh = 0, $activeSlave.health -= 30,$cash -= $surgeryCost, $surgeryType = "mastectomy"]]
<</if>>
@@ -520,7 +520,7 @@ waist.
<</if>>
<</if>>
<<if ($activeSlave.waist >= -95) && ($activeSlave.waist < -75) && ($seeExtreme == 1)>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
[[Remove ribs to severely narrow her waist|Surgery Degradation][$activeSlave.waist = -100,$cash -= $surgeryCost, $activeSlave.health -= 40,$surgeryType = "ribs"]]
<</if>>
<</if>>
@@ -556,7 +556,7 @@ $pronounCap's
<<if $activeSlave.indentureRestrictions >= 2>>
//$possessiveCap indenture forbids elective surgery//
-<<elseif $activeSlave.breedingMark == 1>>
+<<elseif $activeSlave.breedingMark == 1 && $porpOutcome == 1>>
//You are forbidden from affecting $possessive fertility//
<<elseif $activeSlave.preg > 0 || $activeSlave.inflation > 0 || $activeSlave.broodmother > 0>>
//$pronounCap is unable to support an abdominal implant at this time//
@@ -748,7 +748,7 @@ Work on her sex:
<</if>>
<<if ($activeSlave.preg > -2) && ($activeSlave.preg < 1) && ($activeSlave.vagina > -1) && ($activeSlave.ovaries != 0)>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
[[Sterilize|Surgery Degradation][$activeSlave.preg = -2,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ster"]]
<</if>>
<<elseif ($activeSlave.preg < 1) && ($activeSlave.vagina > -1) && ($activeSlave.ovaries != 0) && ($activeSlave.preg != -3)>>
@@ -756,7 +756,7 @@ Work on her sex:
<</if>>
<<if ($activeSlave.ovaries == 1) && ($activeSlave.preg < 1)>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if ($activeSlave.pubertyXX == 0)>>
<br>
$pronounCap has ovaries but has not had $possessive first period.
@@ -785,7 +785,7 @@ Work on her sex:
<<else>>
$possessiveCap body cannot support being a broodmother.
<</if>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if isFertile($activeSlave)>>
[[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg = 1,$activeSlave.pregWeek = 1,$activeSlave.pregKnown = 1,$activeSlave.pregType = 1,$activeSlave.broodmother = 1,$activeSlave.broodmotherFetuses = 1,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "preg"]] //This will have severe effects on $possessive health and mind//
<</if>>
@@ -798,7 +798,7 @@ Work on her sex:
<br>
$possessiveCap anal womb cannot be removed while $pronoun is pregnant.
<<else>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<br>
[[Remove anal reproductive organs|Surgery Degradation][$activeSlave.mpreg = 0,$cash -= $surgeryCost, $activeSlave.health -= 30,$surgeryType = "mpreg removed"]]
<</if>>
@@ -839,13 +839,13 @@ Work on her sex:
<</if>>
<<if ($activeSlave.vagina > -1) && ($activeSlave.dick > 0)>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<br>
Since $pronoun has both a penis and a vagina, it's possible to remove $possessive pussy and leave $possessive sexually functional.
[[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",$cash -= $surgeryCost,$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $possessive ovaries as well//<</if>>
<</if>>
<<elseif $activeSlave.vagina > -1>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<br>
$possessiveCap pussy can be removed at the cost of $possessive sexual functionality, leaving $object a null.
[[Remove pussy|Surgery Degradation][$activeSlave.vagina = -1,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregSource = 0,$activeSlave.vaginalSkill = 0,$activeSlave.vaginalAccessory = "none",$cash -= $surgeryCost,$activeSlave.health -= 20,$surgeryType = "vaginaRemoval"]] <<if $activeSlave.ovaries == 1>>//This will remove $possessive ovaries as well//<</if>>
@@ -888,7 +888,7 @@ Work on her sex:
<</if>>
<</if>>
-<<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+<<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if ($activeSlave.vagina == -1) && ($activeSlave.dick != 0)>>
[[Convert genitalia to female|Surgery Degradation][$activeSlave.dick = 0,$activeSlave.dickAccessory = "none",$activeSlave.dickTat = 0,$activeSlave.foreskin = 0,$activeSlave.scrotum = 0,$activeSlave.balls = 0,$activeSlave.vasectomy = 0,$activeSlave.vagina = 0,$activeSlave.preg = -2,$activeSlave.vaginalSkill = 0,$cash -= $surgeryCost, $activeSlave.health -= 40, $surgeryType = "mtf"]]
<</if>>
@@ -1497,7 +1497,7 @@ Work on her structurally:
<<if $seeExtreme == 1>>
<<if $activeSlave.fuckdoll == 0>>
<br>$pronounCap is a normal sex slave, not a living sex toy.
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
[[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget=0, $activeSlave.sentence=0, $activeSlave.training=0, $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels",$activeSlave.legAccessory="none", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1, $activeSlave.inflation=0, $activeSlave.inflationType="none", $activeSlave.inflationMethod=0, $activeSlave.milkSource=0, $activeSlave.cumSource=0, $surgeryType = "fuckdoll"]] //This is permanent and will greatly restrict $possessive//
<</if>>
<<else>>
@@ -1512,7 +1512,7 @@ Work on her structurally:
<<elseif $activeSlave.fetish == "mindbroken">>
<br>$possessiveCap mind is gone; $pronoun has either been chemically lobotomized, or has lost $possessive mind due to extreme abuse.
<</if>>
- <<if $activeSlave.indentureRestrictions < 1 && $activeSlave.breedingMark != 1>>
+ <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if $activeSlave.fetish != "mindbroken">>
[[Chemically lobotomize|Surgery Degradation][$activeSlave.fetish = "mindbroken",$activeSlave.fetishKnown = 1,$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "mindbreak"]]
//Warning: this is permanent and irreversible. It will destroy $possessive will and $possessive ability to remember anything but the simplest skills.//
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index b7631b69971..d85c4d9705e 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -962,9 +962,9 @@
<</if>>
<<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
-<<if ($slaves[$i].hormoneBalance <= 20)>>
+<<if ($slaves[$i].hormoneBalance <= 20) && $slaves[$i].hormones < 1>>
<<if ($slaves[$i].dick > 0)>>
-<<if ($slaves[$i].devotion > 0)>>
+<<if ($slaves[$i].devotion > 20)>>
<<if ($slaves[$i].boobs < 800 && $slaves[$i].butt < 3) || ($slaves[$i].faceShape == "masculine") || ($slaves[$i].shoulders > $slaves[$i].hips) || ($slaves[$i].balls > 4)>>
<<if ($slaves[$i].career == "a Futanari Sister")>>
$pronounCap wishes $pronoun were more feminine, but isn't unhappy to be off hormones, since $pronoun likes being a stiff dicked futa.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 9f392bb165a..d0aa38a3c16 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2268,8 +2268,8 @@
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
Living in a society that rejects her paraphilia
- <<if $slaves[$i].breedingMark == 1>>
- would have mentally and emotionally crippled her; but as a designated breeder , she can't help but @@.hotpink;love her role@@ in society.
+ <<if $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
+ would have mentally and emotionally crippled her; but as a designated breeder, she can't help but @@.hotpink;love her role@@ in society.
<<set $slaves[$i].devotion++>>
<<else>>
@@.mediumorchid;mentally and emotionally cripples@@ her.
@@ -3048,7 +3048,7 @@
Allowing her to indulge in her fetish to the point of obsession advances hedonism and @@.green;bolsters your reputation.@@
<<FSChange "Hedonism" 2>>
<</if>>
- <<elseif $slaves[$i].bellyPreg > 100 && $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $slaves[$i].devotion > 75>>
+ <<elseif $slaves[$i].bellyPreg > 100 && $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1 && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].devotion > 75>>
She's been marked to be the bearer of your offspring and is growing larger by the day with your child. She is to be nothing more than a vessel for your children, and as such @@.yellow;has become obsessed with carrying them.@@
<<set $slaves[$i].sexualFlaw = "breeder">>
<<set $slaves[$i].fetishStrength = 100>>
@@ -4916,7 +4916,7 @@
<</if>>
<</if>>
-<<if ($slaves[$i].breedingMark == 1) && ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
+<<if ($slaves[$i].breedingMark == 1 && $propOutcome == 1) && ($slaves[$i].fuckdoll == 0) && ($slaves[$i].fetish != "mindbroken")>>
<<if ($slaves[$i].devotion <= -20)>>
She views the mark of the Societal Elite @@.mediumorchid;with disgust@@ as it brands her as nothing more than your breeding bitch.
<<set $slaves[$i].devotion -= 10>>
@@ -5342,7 +5342,7 @@
Society is @@.green;mildly pleased@@ at you keeping $possessive dick in check.
<<FSChangePorn "Eugenics" 1>>
<</if>>
- <<if $slaves[$i].breedingMark == 1>>
+ <<if $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $eugenicsFullControl != 1>>
<<if $slaves[$i].pregKnown == 1 && $slaves[$i].pregSource == -1>>
The Societal Elite @@.green;are pleased@@ your child is growing in within <<print $object>>. The mark covering $possessive lower belly, coupled with $possessive gravidity and blessing, @@.green;enamors@@ your populace.
<<set $failedElite -= 5+$slaves[$i].pregType>>
@@ -7721,7 +7721,7 @@
<</if>>
<</if>>
-<<if $slaves[$i].breedingMark == 1>>
+<<if $slaves[$i].breedingMark == 1 && $propPass == 1 && $eugenicsFullControl != 1>>
<<if $slaves[$i].preg > 3 || $slaves[$i].pregKnown == 1>>
<<if $slaves[$i].pregSource != -1>>
$slaves[$i].slaveName's weekly health checkup revealed she is pregnant with an unacceptable child. @@.red;Its life has been terminated, you have been fined <<print cashFormat(100000)>>, and your rep among the Elite has been severely damaged.@@
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index b3f75c7665b..262ff9cbe93 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -1187,7 +1187,7 @@ serves you this week.
<<elseif $slaves[$i].relationship == -3 && $slaves[$i].devotion > 50>>
<<set _multiplier += 0.06>>
<</if>>
-<<if $arcologies[0].FSRestart > 50 && $slaves[$i].breedingMark == 1>>
+<<if $arcologies[0].FSRestart > 50 && $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
<<set _multiplier += 0.04>>
<</if>>
<<if $arcologies[0].FSRepopulationFocus > 50 && $slaves[$i].bellyPreg >= 5000>>
@@ -1243,7 +1243,7 @@ Keeping $object as nothing but your personal
<<elseif $slaves[$i].relationship == -3 && $slaves[$i].devotion > 50>>
$possessiveCap satisfaction with $possessive wifely duties is obvious, @@.green;bringing attention@@ to the slave future you're building.
<</if>>
- <<if $arcologies[0].FSRestart > 50 && $slaves[$i].breedingMark == 1>>
+ <<if $arcologies[0].FSRestart > 50 && $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
$possessiveCap breeding mark and $possessive place near you as a breeding toy is obvious, @@.green;bringing attention@@ to how beautiful a pairing you make.
<</if>>
<<if $arcologies[0].FSRepopulationFocus > 50 && $slaves[$i].bellyPreg >= 5000>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index e3f05ef6d4e..6b27f45ec76 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -549,9 +549,9 @@
<<set _FSdefend++, $arcologies[0].FSRepopulationFocus += 0.01*$FSSingleSlaveRep>>
<</if>>
<<elseif $arcologies[0].FSRestart != "unset">>
- <<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].breedingMark == 1>>
+ <<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
<<set _seed += 4, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>>
- <<elseif $slaves[$i].breedingMark == 1>>
+ <<elseif $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
<<set _seed += 1>>
<<elseif $slaves[$i].bellyPreg < 100>>
<<if ($slaves[$i].ovaries == 0 && $slaves[$i].balls == 0)>>
@@ -746,9 +746,9 @@
Being both unintelligent and inexperienced, her attempts to emphasize the joys of pregnancy only come off as someone who likes big bellies, no matter their source.
<</if>>
<<elseif $arcologies[0].FSRestart != "unset">>
- <<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].breedingMark == 1>>
+ <<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
She prominently displays her pregnancy and the mark branded upon it signifying the superior child growing within her. Her audience is enamored by her distinct status.
- <<elseif $slaves[$i].breedingMark == 1>>
+ <<elseif $slaves[$i].breedingMark == 1 && $propOutcome == 1>>
She prominently displays the mark branded over her womb, but without the curve of pregnancy beneath it, it only goes so far.
<<elseif $slaves[$i].bellyPreg < 100>>
<<if ($slaves[$i].dick > 0 && $slaves[$i].balls == 0)>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index 7b625b544b6..e03755e6dd4 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -273,7 +273,7 @@
<</if>>
<<if $weddingPlanned == 3>>
- The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife, and her womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.<</if>>
+ The ceremony to bind <<= SlaveFullName($activeSlave)>> to you as your slave wife, and her womb to you as your private breeding ground, is a polite affair which you host in the lower floor of your penthouse. <<if $arcologies[0].FSRestart != "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>Barely anyone is there, mostly lower-class citizens, several accompanied by their slaves. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. There is a distinct air of unrest in the room, as if the absent Elites' distaste of your actions came in their place.<<else>>All the arcology's most prominent citizens are there, most with a favored slave or two and some even with their slave wives. Many of your other slaves, that is your slaves who are not being married and fucked pregnant tonight, are present to serve your guests, but are dressed more conservatively than usual. When assignations between citizen and slave develop, guests are politely encouraged to perform them in side rooms rather than out in view of the main gathering.<</if>>
<br><br>
$activeSlave.slaveName appears after everyone has had a chance to socialize,<<if ($activeSlave.amp == 1)>> carried by another slave since she's a quadruple amputee and she cannot walk,<</if>> wearing beautiful bridal lingerie in
<<if ($activeSlave.vagina == 0)>>
@@ -511,7 +511,7 @@
<<set $desc = "a framed shot of you impregnating " + $activeSlave.slaveName + " at your wedding">>
<</if>>
<<set $trinkets.push($desc)>>
- <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 0>>
+ <<if $arcologies[0].FSRestart != "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0) && $eugenicsFullControl != 1>>
You have @@.red;angered@@ the Societal Elite by this public showing of everything they stand against.
<<set $failedElite += 250>>
<</if>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index b0c28eea13b..6556004ae05 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -1,7 +1,6 @@
:: Sell Slave [nobr]
-<<set $nextButton = "Back">>
-<<set $nextLink = "Slave Interact">>
+<<set $nextButton = "Back", $nextLink = "Slave Interact">>
You prepare her for sale. Her response to being put up for purchase is
<<if $activeSlave.devotion < -50>>muted; perhaps she hopes a new master will be less hateful than you.
@@ -22,7 +21,7 @@ You prepare her for sale. Her response to being put up for purchase is
<<slaveCost $activeSlave>>
<<set $slaveCost = (random(70,80)*Math.trunc($slaveCost/100))>>
-<<if $activeSlave.breedingMark == 1>>
+<<if $activeSlave.breedingMark == 1 && $propOutcome == 1>>
Since you are selling a breeding slave, she will be sent to auction before other members of the Societal Elite.
<<else>>
<<if $showAppraisal == 1>>
@@ -629,7 +628,7 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
<br><br>
-<<if $activeSlave.breedingMark == 1>>
+<<if $activeSlave.breedingMark == 1 && $propOutcome == 1>>
<<set $buyer = 0>>
<<set $seed = 500*Math.trunc(($slaveCost*1.1)/500)>>
<br>The current offer for her stands at ''<<print cashFormat($seed)>>''.
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 33ed865451a..4393ed254ff 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -338,7 +338,7 @@
<</if>>
<</if>>
<</if>>
-<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && $activeSlave.breedingMark == 0>>
+<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>
<<set _activeSlaveRepSacrifice = repGainSacrifice()>>
| <<link "Sacrifice $him on the altar" "Aztec Slave Sacrifice">><<set $sacrificeType = "life">><</link>>//This will kill $him and gain you _activeSlaveRepSacrifice reputation//
<</if>>
@@ -472,7 +472,7 @@
<<link "Rest">> <<= removeJob($activeSlave, $activeSlave.assignment)>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
| <<link "Fucktoy">> <<= assignJob($activeSlave, "please you")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
- <<if ($activeSlave.indentureRestrictions <= 0) && $activeSlave.breedingMark != 1>>
+ <<if ($activeSlave.indentureRestrictions <= 0) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Gloryhole">> <<= assignJob($activeSlave, "work a glory hole")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
@@ -499,7 +499,7 @@
/*| //Too resistant to be a servant// */
<</if>>
- <<if $activeSlave.breedingMark != 1>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Whore">> <<= assignJob($activeSlave, "whore")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
| <<link "Public Servant">> <<= assignJob($activeSlave, "serve the public")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
@@ -523,7 +523,7 @@
<br>Transfer to:
<<if $arcade != 0>>
- <<if $arcade > $arcadeSlaves && ($activeSlave.indentureRestrictions <= 0) && $activeSlave.breedingMark != 1>>
+ <<if $arcade > $arcadeSlaves && ($activeSlave.indentureRestrictions <= 0) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
[[Arcade|Assign][$assignTo = "Arcade", $i = -1]] /* $i = -1 tells Assign to use $activeSlave as-is */
<<else>>Arcade<</if>>
<<if _numFacilities-- > 1>>|<</if>>
@@ -567,14 +567,14 @@
<</if>>
<<if $brothel != 0>>
- <<if $brothel > $brothelSlaves && ((($activeSlave.devotion > 50) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50) || ($activeSlave.trust > 50)) && $activeSlave.breedingMark != 1)>>
+ <<if $brothel > $brothelSlaves && ((($activeSlave.devotion > 50) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50) || ($activeSlave.trust > 50)) && ($activeSlave.breedingMark != 1 || $propOutcome == 0))>>
[[Brothel|Assign][$assignTo = "Brothel", $i = -1]] /* $i = -1 tells Assign to use $activeSlave as-is */
<<else>>Brothel<</if>>
<<if _numFacilities-- > 1>>|<</if>>
<</if>>
<<if $club != 0>>
- <<if $club > $clubSlaves && ((($activeSlave.devotion > 50) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50) || ($activeSlave.trust > 50)) && $activeSlave.breedingMark != 1)>>
+ <<if $club > $clubSlaves && ((($activeSlave.devotion > 50) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50) || ($activeSlave.trust > 50)) && ($activeSlave.breedingMark != 1 || $propOutcome == 0))>>
[[Club|Assign][$assignTo = "Club", $i = -1]] /* $i = -1 tells Assign to use $activeSlave as-is */
<<else>>Club<</if>>
<<if _numFacilities-- > 1>>|<</if>>
@@ -584,7 +584,7 @@
<<set _dairySeed = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
<<if $dairy <= $dairySlaves+_dairySeed>>
Dairy
- <<elseif((($activeSlave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || (($activeSlave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || ($activeSlave.breedingMark == 1 && $dairyRestraintsSetting > 0) || (($dairyPregSetting > 0) && (($activeSlave.bellyImplant != -1) || ($activeSlave.broodmother > 0))))>>
+ <<elseif((($activeSlave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || (($activeSlave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || ($activeSlave.breedingMark == 1 && $propOutcome == 1 && $dairyRestraintsSetting > 0) || (($dairyPregSetting > 0) && (($activeSlave.bellyImplant != -1) || ($activeSlave.broodmother > 0))))>>
Dairy
<<elseif (($activeSlave.lactation > 0) || ($activeSlave.balls > 0)) || (($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) && ($dairySlimMaintainUpgrade == 0))>>
[[Dairy|Assign][$assignTo = "Dairy", $i = -1]] /* $i = -1 tells Assign to use $activeSlave as-is */
@@ -762,7 +762,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>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Extreme corset">><<set $activeSlave.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
<</if>>
<<if isItemAccessible("a small empathy belly")>> /* works for all of them */
@@ -779,16 +779,16 @@
<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>>
+ <<if isItemAccessible("long plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<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>>
+ <<if isItemAccessible("long, large plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<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>>
<<if isItemAccessible("long, huge plug")>>
- <<if $activeSlave.breedingMark != 1 && $activeSlave.anus >= 2>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $activeSlave.anus >= 2>>
| <<link "Long and huge">><<set $activeSlave.buttplug = "long, huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
<</if>>
<</if>>
@@ -801,15 +801,15 @@
<br>Vaginal accessory: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
<<link "None">><<set $activeSlave.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
| <<link "Dildo">><<set $activeSlave.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
- <<if isItemAccessible("long dildo") && $activeSlave.breedingMark != 1>>
+ <<if isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<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>>
+ <<if isItemAccessible("long, large dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<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>>
- <<if isItemAccessible("long, huge dildo") && $activeSlave.breedingMark != 1>>
+ <<if isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if $activeSlave.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeSlave.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>><</if>>
<</if>>
| <<link "Chastity belt">><<set $activeSlave.vaginalAccessory = "chastity belt",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
@@ -930,7 +930,7 @@
<</if>>
<</if>>
| <<link "Fertility">><<set $activeSlave.drugs = "fertility drugs">><<SlaveInteractDrugs>><</link>>
- <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && $activeSlave.breedingMark != 1>>
+ <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Fertility+">><<set $activeSlave.drugs = "super fertility drugs">><<SlaveInteractDrugs>><</link>>
<</if>>
<<if ($activeSlave.dick > 0)>>
@@ -1002,7 +1002,7 @@
| Weight loss pills
<</if>>
<</if>>
- <<if $precociousPuberty == 1 && $pubertyHormones == 1 && $activeSlave.breedingMark != 1>>
+ <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $activeSlave.pubertyXX == 0>>
| <<link "Female hormone injections">><<set $activeSlave.drugs = "female hormone injections">><<SlaveInteractDrugs>><</link>>
<</if>>
@@ -1074,14 +1074,14 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<</if>>
<<elseif ($activeSlave.preg > 35)>>
| <<link "Give $him a cesarean section" "csec">><</link>>
- <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<elseif ($activeSlave.preg > 0) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $activeSlave.pregSource == -1>>
//You are forbidden from aborting an elite child//
<<elseif ($activeSlave.preg > 0)>>
<<link "Abort $his pregnancy" "Abort">><</link>>
<</if>>
<</if>>
<</if>>
-<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
+<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
<br>
__Pregnancy control__: <<if $activeSlave.pregControl == "labor supressors">>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 >= 38)>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index b902b25bc64..44c81e12f65 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -242,7 +242,7 @@
<<case "elite auction">>
$activeSlave.slaveName is quickly escorted out by her new master. She is rarely seen in public anymore, but her records show she is settling well into being her new owner's breeder.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
- <<if ($slaves[_ss].breedingMark != 1)>>
+ <<if ($slaves[_ss].breedingMark != 1 && $propOutcome == 1)>>
<<run clearSummaryCache($slaves[_ss])>>
<<set $slaves[_ss].devotion -= 5>>
<<set $seed = 1>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 06a23e24fcf..7c4b714933c 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -3,12 +3,12 @@
<<set setup.passagePreFilters = setup.passagePreFilters || {
"Main": s => (s.assignmentVisible == 1),
"Personal Attention Select": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0),
- "Agent Select": s => (s.fuckdoll == 0 && s.devotion >= 20 && s.intelligence > 0 && s.intelligenceImplant > 0 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && s.breedingMark != 1),
- "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && s.breedingMark != 1),
+ "Agent Select": s => (s.fuckdoll == 0 && s.devotion >= 20 && s.intelligence > 0 && s.intelligenceImplant > 0 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)),
+ "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
"HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canSee(s) && canTalk(s)),
"Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
- ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && s.breedingMark != 1)
+ ($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
|| ($Flag != 0 && s.assignment == "live with your Head Girl"))),
"Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1)),
"Spa": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
@@ -20,12 +20,12 @@
($Flag == 0 && s.assignment != "work in the brothel")
|| ($Flag == 1 && s.assignment == "work in the brothel")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Madam.ID))),
- "Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence > -2 && canWalk(s) && canSee(s) && s.breedingMark != 1),
+ "Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence > -2 && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Club": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "serve in the club")
|| ($Flag == 1 && s.assignment == "serve in the club")
|| ($Flag != 0 && $Flag != 1 && s.ID == $DJ.ID))),
- "DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence > -2 && canTalk(s) && canWalk(s) && s.breedingMark != 1),
+ "DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence > -2 && canTalk(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
"Clinic": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "get treatment in the clinic")
|| ($Flag == 1 && s.assignment == "get treatment in the clinic")
@@ -275,7 +275,7 @@
<<case "Brothel">>
<<if $Flag == 0>>
<<if $brothel <= $brothelSlaves>><<continue>><</if>>
- <<if _Slave.breedingMark != 1>>
+ <<if (_Slave.breedingMark != 1 || $propOutcome == 0)>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
@@ -300,7 +300,7 @@
<<case "Club">>
<<if $Flag == 0>>
<<if $club <= $clubSlaves>><<continue>><</if>>
- <<if _Slave.breedingMark != 1>>
+ <<if (_Slave.breedingMark != 1 || $propOutcome == 0)>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
@@ -378,7 +378,7 @@
<<elseif (_Slave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)>>
<br>//_Slave.slaveName's indenture allows only free range milking.//
<<continue>>
- <<elseif _Slave.breedingMark == 1 && $dairyRestraintsSetting > 0>>
+ <<elseif _Slave.breedingMark == 1 && $propOutcome == 1 && $dairyRestraintsSetting > 0>>
<br>//_Slave.slaveName may only be a free range cow//
<<continue>>
<<elseif ($dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.broodmother != 0))>>
@@ -486,7 +486,7 @@
<<if $Flag == 0>>
<<if _Slave.assignment == "be confined in the arcade">><<continue>><</if>>
<<if $arcade <= $arcadeSlaves && $arcadeUpgradeFuckdolls != 1>><<continue>><</if>>
- <<if _Slave.breedingMark != 1>>
+ <<if (_Slave.breedingMark != 1 || $propOutcome == 0)>>
<<if (_Slave.indentureRestrictions <= 0)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
@@ -510,7 +510,7 @@
<<elseif (_Slave.indentureRestrictions > 1)>>
<br>//_Slave.slaveName's indenture forbids fighting.//
<<continue>>
- <<elseif _Slave.breedingMark == 1>>
+ <<elseif (_Slave.breedingMark != 1 || $propOutcome == 0)>>
<br>//_Slave.slaveName may not participate in combat//
<<continue>>
<<else>>
@@ -582,7 +582,7 @@ will
<<else>>
| Fucktoy
<</if>>
- <<if _Slave.indentureRestrictions <= 0 && _Slave.breedingMark != 1>>
+ <<if _Slave.indentureRestrictions <= 0 && (_Slave.breedingMark != 1 || $propOutcome == 0)>>
<<if _Slave.assignment != "work a glory hole">>
| <<link "Gloryhole" "Main">><<= assignJob($slaves[_ssi], "work a glory hole")>><</link>>
<<else>>
@@ -604,12 +604,12 @@ will
<<else>>
| House Servant
<</if>>
- <<if (_Slave.assignment != "whore") && _Slave.breedingMark != 1>>
+ <<if (_Slave.assignment != "whore") && (_Slave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Whore" "Main">><<= assignJob($slaves[_ssi], "whore")>><</link>>
<<else>>
| Whore
<</if>>
- <<if (_Slave.assignment != "serve the public") && _Slave.breedingMark != 1>>
+ <<if (_Slave.assignment != "serve the public") && (_Slave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Public Servant" "Main">><<= assignJob($slaves[_ssi], "serve the public")>><</link>>
<<else>>
| Public Servant
@@ -645,7 +645,7 @@ will
<</if>>
<<if $arcade != 0>>
- <<if $arcade > $arcadeSlaves && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
+ <<if $arcade > $arcadeSlaves && (_Slave.indentureRestrictions <= 0) && (_Slave.breedingMark != 1 || $propOutcome == 0)>>
[[Arcade|Assign][$assignTo = "Arcade", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
<<else>>Arcade<</if>>
<<if _numFacilities-- > 1>>|<</if>>
@@ -689,14 +689,14 @@ will
<</if>>
<<if $brothel != 0>>
- <<if $brothel > $brothelSlaves && (((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) && _Slave.breedingMark != 1)>>
+ <<if $brothel > $brothelSlaves && (((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) && (_Slave.breedingMark != 1 || $propOutcome == 0))>>
[[Brothel|Assign][$assignTo = "Brothel", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
<<else>>Brothel<</if>>
<<if _numFacilities-- > 1>>|<</if>>
<</if>>
<<if $club != 0>>
- <<if $club > $clubSlaves && (((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) && _Slave.breedingMark != 1)>>
+ <<if $club > $clubSlaves && (((_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)) && (_Slave.breedingMark != 1 || $propOutcome == 0))>>
[[Club|Assign][$assignTo = "Club", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
<<else>>Club<</if>>
<<if _numFacilities-- > 1>>|<</if>>
@@ -706,7 +706,7 @@ will
<<set _dairySeed = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
<<if $dairy <= $dairySlaves+_dairySeed>>
Dairy
- <<elseif (((_Slave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || ((_Slave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || (_Slave.breedingMark == 1 && $dairyRestraintsSetting > 0) || (($dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.broodmother > 0))))>>
+ <<elseif (((_Slave.indentureRestrictions > 0) && ($dairyRestraintsSetting > 1)) || ((_Slave.indentureRestrictions > 1) && ($dairyRestraintsSetting > 0)) || (_Slave.breedingMark == 1 && $propOutcome == 1 && $dairyRestraintsSetting > 0) || (($dairyPregSetting > 0) && ((_Slave.bellyImplant != -1) || (_Slave.broodmother > 0))))>>
Dairy
<<elseif ((_Slave.lactation > 0) || (_Slave.balls > 0)) || (($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) && ($dairySlimMaintainUpgrade == 0))>>
[[Dairy|Assign][$assignTo = "Dairy", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 12706f252f1..02c874546da 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -646,7 +646,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>>
<<replace "#bellyAccessoryDescription">><br>//<<clothingCorsetDescription>><<CorsetPiercingDescription>>//<</replace>>
<</link>>
-<<if $activeSlave.breedingMark != 1>>
+<<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Extreme corset">>
<<set $activeSlave.bellyAccessory = "an extreme corset">>
<<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>>
@@ -702,7 +702,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
- <<if isItemAccessible("long dildo") && $activeSlave.breedingMark != 1>>
+ <<if isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Long dildo">>
<<set $activeSlave.vaginalAccessory = "long dildo">>
<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
@@ -716,7 +716,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
- <<if isItemAccessible("long, large dildo") && $activeSlave.breedingMark != 1>>
+ <<if isItemAccessible("long, large dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Large and long dildo">>
<<set $activeSlave.vaginalAccessory = "long, large dildo">>
<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
@@ -731,7 +731,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
- <<if isItemAccessible("long, huge dildo") && $activeSlave.breedingMark != 1>>
+ <<if isItemAccessible("long, huge dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Huge and long dildo">>
<<set $activeSlave.vaginalAccessory = "long, huge dildo">>
<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
@@ -806,7 +806,7 @@ Anal accessory: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<<replace "#buttplug">>$activeSlave.buttplug<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
-<<if isItemAccessible("long plug") && $activeSlave.breedingMark != 1>>
+<<if isItemAccessible("long plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Long">>
<<set $activeSlave.buttplug = "long plug">>
<<replace "#buttplug">>$activeSlave.buttplug<</replace>>
@@ -818,7 +818,7 @@ Anal accessory: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<<replace "#buttplug">>$activeSlave.buttplug<</replace>>
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>>
-<<if isItemAccessible("long, large plug") && $activeSlave.breedingMark != 1>>
+<<if isItemAccessible("long, large plug") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Long and large">>
<<set $activeSlave.buttplug = "long, large plug">>
<<replace "#buttplug">>$activeSlave.buttplug<</replace>>
@@ -831,7 +831,7 @@ Anal accessory: ''<span id="buttplug">$activeSlave.buttplug</span>.''
<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
<</link>><</if>>
<<if isItemAccessible("long, huge plug")>>
- <<if $activeSlave.breedingMark != 1 && $activeSlave.anus >= 2>>
+ <<if ($activeSlave.breedingMark != 1 || $propOutcome == 0) && $activeSlave.anus >= 2>>
| <<link "Long and huge">>
<<set $activeSlave.buttplug = "long, huge plug">>
<<replace "#buttplug">>$activeSlave.buttplug<</replace>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 8615dd404bb..52b484a0535 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -757,7 +757,7 @@
<<set $beauty += $args[0].births*($arcologies[0].FSRepopulationFocus/75)>>
<</if>>
<<elseif $arcologies[0].FSRestart > 40>>
-<<if $args[0].breedingMark == 1>>
+<<if $args[0].breedingMark == 1 && $propOutcome == 1>>
<<if $args[0].preg > 5 && $args[0].pregSource == -1>>
<<set $beauty += $arcologies[0].FSRestart>> /*100*/
<</if>>
@@ -1075,6 +1075,13 @@
<<if $args[0].prestige > 0>>
<<set $beauty += ($beauty*$args[0].prestige*0.5)>>
<</if>>
+<<if $args[0].prestige >= 3>>
+ <<set $beauty += ($beauty*.5)>>
+<<elseif $args[0].prestige == 2>>
+ <<set $beauty += ($beauty*0.25)>>
+<<elseif $args[0].prestige == 1>>
+ <<set $beauty += ($beauty*0.1)>>
+<</if>>
<<if $args[0].pornPrestige == 3>>
<<set $beauty += ($beauty*1.0)>>
<<elseif $args[0].pornPrestige == 2>>
@@ -1084,7 +1091,11 @@
<</if>>
<<if $args[0].breedingMark == 1>>
- <<set $beauty = Math.trunc($beauty*2)>>
+ <<if $propOutcome == 1>>
+ <<set $beauty = Math.trunc($beauty*2)>>
+ <<else>>
+ <<set $beauty += 2>>
+ <</if>>
<</if>>
<<if $beauty < 1>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 3a3a6f19885..01f6b1af2fa 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -1186,7 +1186,7 @@ Feeling childbirth approaching, $slaves[$i].slaveName is helped to her prepared
<</switch>>
-<<if $slaves[$i].breedingMark == 1 && $slaves[$i].pregSource == -1>>
+<<if $slaves[$i].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1 && $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 e989341faca..ae4cfbdbab7 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -11965,25 +11965,25 @@ $He has
<<elseif $activeSlave.bellyPreg >= 300000>>
Your eugenics obsessed society views $his massive pregnant belly as complete degeneracy.
<<elseif $activeSlave.bellyPreg >= 15000>>
- <<if $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is ripe with your child.
<<else>>
Your eugenics obsessed society finds $his huge pregnant belly absolutely disgusting.
<</if>>
<<elseif $activeSlave.bellyPreg >= 10000>>
- <<if $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is heavy with your child.
<<else>>
Your eugenics obsessed society finds $his big pregnant belly absolutely disgusting.
<</if>>
<<elseif $activeSlave.bellyPreg >= 5000>>
- <<if $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is swollen with your child.
<<else>>
Your eugenics obsessed society finds $his pregnant belly disgusting.
<</if>>
<<elseif $activeSlave.bellyPreg >= 1500>>
- <<if $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<if $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
Your eugenics obsessed society is pleased that $he is swelling with your child.
<<else>>
Your eugenics obsessed society finds $his developing pregnancy insulting.
@@ -12082,8 +12082,13 @@ $He has
$He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation.
<</if>>
<</if>>
- <<if ($activeSlave.breedingMark == 1)>>
- The Societal Elites' mark designating $his as a breeder is prominently displayed across $his lower belly, beneath $his navel.
+ <<if $activeSlave.breedingMark == 1>>
+ <<if $propOutcome == 1>>
+ The Societal Elites' mark designating $his as a breeder is prominently displayed across $his lower belly, beneath $his navel.
+ <<else>>
+ An alluring tattoo is prominently displayed across $his lower belly, beneath $his navel, urging $him to be bred.
+ <</if>>
+ <</if>>
<</if>>
<<if _heavyBelly == 1>>
<<if canWalk($activeSlave)>>
@@ -14953,8 +14958,12 @@ $He has
$He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation.
<</if>>
-<<if ($activeSlave.breedingMark == 1)>>
- The Societal Elites' mark designating $his as a breeder is prominently displayed across $his lower belly, beneath $his navel.
+<<if $activeSlave.breedingMark == 1>>
+ <<if $propOutcome == 1>>
+ The Societal Elites' mark designating $his as a breeder is prominently displayed across $his lower belly, beneath $his navel.
+ <<else>>
+ An alluring tattoo is prominently displayed across $his lower belly, beneath $his navel, urging $him to be bred.
+ <</if>>
<</if>>
<<if $activeSlave.physicalAge >= 13>>
@@ -15879,8 +15888,12 @@ $He has
$He has $activeSlave.brand branded into the flesh of $his $activeSlave.brandLocation.
<</if>>
-<<if ($activeSlave.breedingMark == 1)>>
- The Societal Elites' mark designating $his as a breeder is prominently displayed across $his lower belly, beneath $his navel.
+<<if $activeSlave.breedingMark == 1>>
+ <<if $propOutcome == 1>>
+ The Societal Elites' mark designating $his as a breeder is prominently displayed across $his lower belly, beneath $his navel.
+ <<else>>
+ An alluring tattoo is prominently displayed across $his lower belly, beneath $his navel, urging $him to be bred.
+ <</if>>
<</if>>
<</widget>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index ab9f0fe06b8..f37c9d96cea 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -200,7 +200,7 @@
<</if>>
<</if>>
| <<link "Fertility">><<set $activeSlave.drugs = "fertility drugs">><<SlaveInteractDrugs>><</link>>
- <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && $activeSlave.breedingMark != 1>>
+ <<if ($seeHyperPreg == 1) && ($activeSlave.indentureRestrictions < 1) && ($superFertilityDrugs == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
| <<link "Fertility+">><<set $activeSlave.drugs = "super fertility drugs">><<SlaveInteractDrugs>><</link>>
<</if>>
<<if ($activeSlave.dick > 0)>>
@@ -272,7 +272,7 @@
| Weight loss pills
<</if>>
<</if>>
- <<if $precociousPuberty == 1 && $pubertyHormones == 1 && $activeSlave.breedingMark != 1>>
+ <<if $precociousPuberty == 1 && $pubertyHormones == 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
<<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $activeSlave.pubertyXX == 0>>
| <<link "Female hormone injections">><<set $activeSlave.drugs = "female hormone injections">><<SlaveInteractDrugs>><</link>>
<</if>>
@@ -328,7 +328,7 @@
<</if>>
<<elseif ($activeSlave.preg > 35)>>
[[Give her a cesarean section|csec]]
- <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
//You are forbidden from aborting an elite child//
<<elseif ($activeSlave.preg > 0)>>
[[Abort her pregnancy|Abort]]
@@ -372,14 +372,14 @@
<</if>>
<<elseif ($activeSlave.preg > 35)>>
[[Give it a cesarean section|csec]]
- <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $activeSlave.pregSource == -1>>
+ <<elseif ($activeSlave.preg > 0) && $activeSlave.breedingMark == 1 && $propOutcome == 1 && $activeSlave.pregSource == -1>>
//You are forbidden from aborting an elite child//
<<elseif ($activeSlave.preg > 0)>>
[[Abort its pregnancy|Abort]]
<</if>>
<</if>>
<</if>>
-<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
+<<if ($activeSlave.pregKnown == 1) && ($pregSpeedControl == 1) && ($activeSlave.breedingMark != 1 || $propOutcome == 0) && ($activeSlave.indentureRestrictions < 1) && ($activeSlave.broodmother == 0) && $seePreg != 0>>
<br>
__Pregnancy control__: <<if $activeSlave.pregControl == "labor supressors">>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 >= 38)>>
--
GitLab