From 456c52a7507b89c15af087de0ecea5e5055aaf52 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 21 Nov 2018 03:27:15 -0500
Subject: [PATCH] Testing starts, tweaks to function compatibility, pregnancy
analysis for player and surrogacy.
---
devNotes/twine JS.txt | 180 +++++++++-----
player variables documentation - Pregmod.txt | 45 ++++
src/events/intro/introSummary.tw | 4 +
src/js/pregJS.tw | 21 +-
src/js/wombJS.tw | 30 +++
src/npc/acquisition.tw | 41 +++-
src/npc/databases/cheatmodeDatabase.tw | 24 +-
src/pregmod/analyzePlayerPregnancy.tw | 225 ++++++++++++++++++
src/pregmod/analyzePregnancy.tw | 53 ++++-
src/pregmod/managePersonalAffairs.tw | 6 +
src/pregmod/ovaTransplantWorkaround.tw | 50 ++++
src/pregmod/pcPregIntro.tw | 8 +
src/pregmod/personalNotes.tw | 2 +-
src/pregmod/surrogacy.tw | 59 +++++
src/pregmod/surrogacyWorkaround.tw | 85 +++++++
.../widgets/playerDescriptionWidgets.tw | 20 ++
src/pregmod/widgets/pregmodWidgets.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 6 +
src/uncategorized/managePenthouse.tw | 1 -
src/utility/miscWidgets.tw | 4 +-
20 files changed, 781 insertions(+), 85 deletions(-)
create mode 100644 src/pregmod/analyzePlayerPregnancy.tw
create mode 100644 src/pregmod/ovaTransplantWorkaround.tw
create mode 100644 src/pregmod/surrogacy.tw
create mode 100644 src/pregmod/surrogacyWorkaround.tw
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 2f2ee6dcdbb..390c6d59015 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1676,7 +1676,25 @@ window.setPregType = function(actor) {
if(typeof actor.readyOva == "number" && actor.readyOva != 0) {
ovum = actor.readyOva; //just single override; for delayed impregnation cases
} else if(actor.ID == -1) {
- if(actor.birthMaster > 0) { // Predisposed to twins
+ if(actor.geneticQuirks.fertility == 2 && actor.geneticQuirks.hyperFertility == 2) { // Do not mix with sperm
+ if(actor.fertDrugs == 1) {
+ ovum += jsEither([2, 3, 3, 3, 3, 4, 4, 5]);
+ } else {
+ ovum += jsEither([1, 1, 2, 2, 3, 3, 4]);
+ }
+ if(actor.forcedFertDrugs > 0) {
+ ovum += jsEither([3, 3, 4, 4, 5]);
+ }
+ } else if(actor.geneticQuirks.hyperFertility == 2) { // Predisposed to multiples
+ if(actor.fertDrugs == 1) {
+ ovum += jsEither([1, 2, 2, 2, 2, 3, 3, 4]);
+ } else {
+ ovum += jsEither([0, 1, 1, 1, 1, 1, 2, 3]);
+ }
+ if(actor.forcedFertDrugs > 0) {
+ ovum += jsEither([2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4]);
+ }
+ } else if(actor.geneticQuirks.fertility == 2) { // Predisposed to twins
if(actor.fertDrugs == 1) {
ovum += jsEither([1, 1, 2, 2, 2, 2, 3, 3]);
} else {
@@ -1695,6 +1713,7 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4]);
}
}
+ Math.clamp(ovum, 0, 8);
} else if(actor.pregType == 0) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
if(actor.hormones == 2) {
@@ -9975,7 +9994,7 @@ window.generateGenetics = (function() {
V = State.variables;
genes = {gender: "XX", name: "blank", surname: 0, mother: 0, motherName: "none", father: 0, fatherName: "none", nationality: "Stateless", race: "white", intelligence: 0, face: 0, eyeColor: "brown", hColor: "black", skin: "white", markings: "none", behavioralFlaw: "none", sexualFlaw: "none", pubicHSyle: "bushy", underArmHStyle: "bushy", geneticQuirks: 0};
if (actor1.ID > 0) {
- mother = V.genePool.findIndex(function(s) { return s.ID == actor1.ID; });
+ mother = V.genePool.find(function(s) { return s.ID == actor1.ID; });
if (mother === undefined) {
mother = actor1;
}
@@ -9987,7 +10006,7 @@ window.generateGenetics = (function() {
activeMother = V.PC;
mother = V.PC;
}
- father = (actor2 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor2; })
+ father = (actor2 > 0) ? V.genePool.find(function(s) { return s.ID == actor2; })
: (actor2 == -1) ? V.PC
: 0;
activeFather = (father !== 0 && father.ID > 0) ? V.slaves[V.slaveIndices[actor2]]
@@ -9999,7 +10018,7 @@ window.generateGenetics = (function() {
genes.mother = setMotherID(actor1.ID);
genes.motherName = setMotherName(activeMother);
genes.father = setFatherID(actor2);
- genes.fatherName = setFatherName(father, activeFather);
+ genes.fatherName = setFatherName(father, activeFather, actor2);
genes.nationality = setNationality(father, mother);
genes.skin = setSkin(father, mother);
genes.race = setRace(father, mother, actor2);
@@ -10023,7 +10042,7 @@ window.generateGenetics = (function() {
if (V.seeDicksAffectsPregnancy == 1) {
gender = Math.floor(Math.random()*100) < V.seeDicks ? "XY" : "XX";
} else if (V.adamPrinciple == 1) {
- if (father) {
+ if (father !== 0) {
if (father.genes == "XX") {
gender = "XX";
} else {
@@ -10067,9 +10086,9 @@ window.generateGenetics = (function() {
}
// fatherName
- function setFatherName(father, activeFather) {
+ function setFatherName(father, activeFather, actor2) {
let fatherName;
- if (father) {
+ if (father !== 0) {
if (father.ID == -1) {
fatherName = activeFather.name;
if (activeFather.surname !== 0 && activeFather.surname !== "") { fatherName + " " + activeFather.surname; }
@@ -10077,13 +10096,34 @@ window.generateGenetics = (function() {
fatherName = activeFather.slaveName;
if (activeFather.slaveSurname !== 0 && activeFather.slaveSurname !== "") { fatherName + " " + activeFather.slaveSurname; }
}
- return fatherName;
+ } else {
+ switch(actor2) {
+ case -2:
+ case -5:
+ fatherName = "citizen";
+ break;
+ case -3:
+ fatherName = "Your Master";
+ break;
+ case -4:
+ fatherName = "Another arcology owner";
+ break;
+ case -6:
+ fatherName = "The Societal Elite";
+ break;
+ case -7:
+ fatherName = "Lab designed";
+ break;
+ default:
+ fatherName = "Unknown";
+ }
}
+ return fatherName;
}
// nationality
function setNationality(father, mother) {
- return (!father) ? "Stateless"
+ return (father === 0) ? "Stateless"
: (father.nationality == mother.nationality) ? mother.nationality
: "Stateless";
}
@@ -10091,7 +10131,7 @@ window.generateGenetics = (function() {
// race
function setRace(father, mother, actor2) {
let race;
- if (father) {
+ if (father !== 0) {
race = (mother.origRace == father.origRace) ? mother.origRace
: (jsRandom(1,4)) == 4 ? jsEither([father.origRace, mother.origRace])
: "mixed race";
@@ -10123,12 +10163,12 @@ window.generateGenetics = (function() {
'light brown': 16,
dark: 15,
'dark olive': 14,
- bronzed: 13,
- tanned: 12,
+ bronze: 13,
+ tan: 12,
natural: 11,
olive: 10,
'light olive': 9,
- lightened: 8,
+ light: 8,
light: 7,
white: 6,
fair: 5,
@@ -10139,7 +10179,7 @@ window.generateGenetics = (function() {
'pure white': 0
};
let momSkinIndex = mother ? (skinToMelanin[mother.origSkin] || 11) : 7;
- let dadSkinIndex = father ? (skinToMelanin[father.origSkin] || 11) : 7;
+ let dadSkinIndex = father !== 0 ? (skinToMelanin[father.origSkin] || 11) : 7;
let skinIndex = Math.round(Math.random() * (dadSkinIndex - momSkinIndex) + momSkinIndex);
return [
'pure white',
@@ -10150,12 +10190,12 @@ window.generateGenetics = (function() {
'fair',
'white',
'light',
- 'lightened',
+ 'light',
'light olive',
'olive',
'natural',
- 'tanned',
- 'bronzed',
+ 'tan',
+ 'bronzw',
'dark olive',
'dark',
'light brown',
@@ -10170,7 +10210,7 @@ window.generateGenetics = (function() {
// eyeColor
function setEyeColor(father, mother, actor2) {
let eyeColor;
- if (father) {
+ if (father !== 0) {
if (mother.origEye == father.origEye) {
eyeColor = mother.origEye;
} else if (mother.origEye == "red" || mother.origEye == "pale red" || mother.origEye == "light red" || mother.origEye == "pale gray" || mother.origEye == "milky white") {
@@ -10203,7 +10243,7 @@ window.generateGenetics = (function() {
// hColor
function setHColor(father, mother, actor2) {
let hairColor;
- if (father) {
+ if (father !== 0) {
if (mother.origHColor == father.origHColor) {
hairColor = mother.origHColor;
} else if (mother.origHColor == "white") {
@@ -10232,7 +10272,7 @@ window.generateGenetics = (function() {
// underArmHairStyle
function setUnderArmHStyle(father, mother) {
let hair;
- if (father) {
+ if (father !== 0) {
if (mother.underArmHStyle == "hairless" && father.underArmHStyle == "hairless") {
hair = "hairless";
} else if (mother.underArmHStyle == "hairless" || father.underArmHStyle == "hairless") {
@@ -10251,7 +10291,7 @@ window.generateGenetics = (function() {
// pubicHairStyle
function setPubicHStyle(father, mother) {
let hair;
- if (father) {
+ if (father !== 0) {
if (mother.pubicHStyle == "hairless" && father.pubicHStyle == "hairless") {
hair = "hairless";
} else if (mother.pubicHStyle == "hairless" || father.pubicHStyle == "hairless") {
@@ -10276,7 +10316,7 @@ window.generateGenetics = (function() {
markings = "none";
}
if (markings == "none") {
- if (father) {
+ if (father !== 0) {
markings = jsEither([mother.markings, father.markings, "none", "none"]);
} else {
markings = jsEither([mother.markings, mother.markings, "none", "none"]);
@@ -10288,7 +10328,7 @@ window.generateGenetics = (function() {
// sexualFlaw
function setSexualFlaw(father, mother) {
let flaw;
- if (father) {
+ if (father !== 0) {
flaw = jsEither([mother.sexualFlaw, father.sexualFlaw, "none", "none"]);
} else {
flaw = jsEither([mother.sexualFlaw, mother.sexualFlaw, "none", "none"]);
@@ -10299,7 +10339,7 @@ window.generateGenetics = (function() {
// behavioralFlaw
function setBehavioralFlaw(father, mother) {
let flaw;
- if (father) {
+ if (father !== 0) {
flaw = jsEither([mother.behavioralFlaw, father.behavioralFlaw, "none", "none"]);
} else {
flaw = jsEither([mother.behavioralFlaw, mother.behavioralFlaw, "none", "none"]);
@@ -10310,7 +10350,7 @@ window.generateGenetics = (function() {
// fetish
function setFetish(father, mother) {
let fetish;
- if (father) {
+ if (father !== 0) {
fetish = jsEither(["none", "none", "none", "none", "none", father.fetish, mother.fetish]);
} else {
fetish = jsEither(["none", "none", "none", "none", "none", mother.fetish, mother.fetish]);
@@ -10325,7 +10365,7 @@ window.generateGenetics = (function() {
if (mother.ID == -1) {
if (actor2 == -6) {
smarts = jsRandom(90,100);
- } else if (father) {
+ } else if (father !== 0) {
if (father.intelligence < mother.intelligence) {
smarts = jsRandom(father.intelligence, mother.intelligence);
} else {
@@ -10337,7 +10377,7 @@ window.generateGenetics = (function() {
} else {
smarts = jsRandom(50,100);
}
- } else if (father) {
+ } else if (father !== 0) {
if (father.intelligence < mother.intelligence) {
smarts = jsRandom(father.intelligence, mother.intelligence);
} else {
@@ -10347,11 +10387,11 @@ window.generateGenetics = (function() {
smarts = jsRandom(60,100);
}
} else {
- smarts = mother.inelligence;
+ smarts = mother.intelligence;
}
if (V.inbreeding == 1) {
if (mother.ID != -1) {
- if (father && father.ID == -1 && activeMother.breedingMark != 1) {
+ if (father !== 0 && father.ID == -1 && activeMother.breedingMark != 1) {
if (smarts >= -95 && jsRandom(1,100) < 40) {
smarts -= jsRandom(1,10);
if (smarts >= -95 && jsRandom(1,100) < 20) {
@@ -10377,7 +10417,7 @@ window.generateGenetics = (function() {
if (mother.ID == -1) {
if (actor2 == -6) {
face = jsRandom(90,100);
- } else if (father) {
+ } else if (father !== 0) {
if (father.face < mother.face) {
face = jsRandom(father.face, mother.face);
} else {
@@ -10389,21 +10429,21 @@ window.generateGenetics = (function() {
} else {
face = jsRandom(20,100);
}
- } else if (father) {
- if (father.intelligence < mother.intelligence) {
- face = jsRandom(father.intelligence, mother.intelligence);
+ } else if (father !== 0) {
+ if (father.face < mother.face) {
+ face = jsRandom(father.face, mother.face);
} else {
- face = jsRandom(mother.intelligence, father.intelligence);
+ face = jsRandom(mother.face, father.face);
}
if (activeMother.breedingMark == 1 && face < 60) {
face = jsRandom(60,100);
}
} else {
- face = mother.inelligence;
+ face = mother.face;
}
if (V.inbreeding == 1) {
if (mother.ID != -1) {
- if (father && father.ID == -1 && activeMother.breedingMark != 1) {
+ if (father !== 0 && father.ID == -1 && activeMother.breedingMark != 1) {
if (face > -100 && jsRandom(1,100) > 60) {
face -= jsRandom(2,20);
}
@@ -10874,6 +10914,7 @@ window.WombImpregnate = function(actor, fCount, fatherID, age) {
tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
tf.reserve = ""; //Initial, to create property. Used later to mark if this child is to be kept.
tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
+ tf.splitted = 0; //marker for already splitted fetus.
tf.genetics = generateGenetics(actor, fatherID, i+1); //Stored genetic information.
try {
@@ -10892,6 +10933,36 @@ window.WombImpregnate = function(actor, fCount, fatherID, age) {
MissingParentIDCorrection(actor);
};
+window.WombSurrogate = function(actor, fCount, mother, fatherID, age) {
+ var i;
+ var tf;
+ for (i=0; i<fCount; i++) {
+ tf = {}; //new Object
+ tf.age = age; //initial age
+ tf.motherID = mother.ID; //Initial biological mother ID setup.
+ tf.fatherID = fatherID; //We can store who is father too.
+ tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
+ tf.reserve = ""; //Initial, to create property. Used later to mark if this child is to be kept.
+ tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
+ tf.splitted = 0; //marker for already splitted fetus.
+ tf.genetics = generateGenetics(mother, fatherID, i+1); //Stored genetic information.
+
+ try {
+ if (actor.womb.length == 0) {
+ actor.pregWeek = age;
+ actor.preg = age;
+ }
+ actor.womb.push(tf);
+ } catch(err){
+ WombInit(actor);
+ actor.womb.push(tf);
+ alert("WombImpregnate warning - " + actor.slaveName+" "+err);
+ }
+
+ }
+ MissingParentIDCorrection(actor);
+};
+
window.WombProgress = function(actor, ageToAdd) {
var i, ft;
ageToAdd = Math.ceil(ageToAdd*10)/10;
@@ -11099,26 +11170,25 @@ window.WombSort = function(actor) {
actor.womb.sort((a, b) => { return b.age - a.age; });
};
-window.fetalSplit = function(actor) {
+//now function work with chance. Literary we give it "one from X" as chance.
+window.fetalSplit = function(actor, chance) {
var i, ft;
- var nft = {};
- nft.age = actor.preg;
- nft.fatherID = actor.pregSource;
- nft.volume = 1;
- nft.identical = 0;
- nft.genetics = 0;
- nft.reserve = "";
+ var nft;
actor.womb.forEach(function(s){
- if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
+ if ((jsRandom(1,chance) >= chance) && s.splitted !== 1)
{
nft = {};
nft.age = s.age;
nft.fatherID = s.fatherID;
+ nft.motherID = s.motherID;
nft.volume = s.volume;
+ nft.reserve = ""; //splitted fetus is new separate, reserve - it's not genetic to split.
nft.genetics = deepCopy(s.genetics);
+ s.splitted = 1; //this is marker that this is already splitted fetus (to not split second time in loop), only source fetus needed it.
+ nft.identical = 1; //this is marker that this fetus has at least one twin.
+ s.identical = 1; //this is marker that this fetus has at least one twin.
actor.womb.push(nft);
- s.identical = 1;
}
});
WombNormalizePreg(actor);
@@ -11146,7 +11216,7 @@ window.WombRemoveFetus = function(actor, fetusNum)
{
WombInit(actor);
if (actor.womb.length >= fetusNum){
- ft = actor.womb[fetusNum];
+ let ft = actor.womb[fetusNum];
actor.womb.splice(fetusNum, 1);
WombSort(actor);
return ft;
@@ -11190,10 +11260,12 @@ window.WombCleanYYFetuses = function(actor)
{
var reserved = [];
- let i = actor.womb.length;
+ var i = actor.womb.length-1;
+ var ft;
+
while (i >= 0)
{
- let ft = actor.womb(i);
+ ft = actor.womb[i];
if (ft.genetics.gender == "YY")
{
@@ -11320,10 +11392,12 @@ window.WombRemoveReservedFetuses = function(actor, type)
{
var reserved = [];
- let i = actor.womb.length;
+ var i = actor.womb.length-1;
+ var ft;
+
while (i >= 0)
{
- let ft = actor.womb(i);
+ ft = actor.womb[i];
if (ft.reserve == type)
{
@@ -11381,12 +11455,12 @@ window.BCReserveInit = function()
}
/* alt
-window.fetalSplit = function(actor)
+window.fetalSplit = function(actor, chance)
{
var i, ft, nft;
actor.womb.forEach(function(s){
- if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
+ if ((jsRandom(1,chance) >= chance) && s.identical !== 1)
{
nft = deepCopy(s);
actor.womb.push(nft);
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index b9605fe73be..ea047b2f143 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -478,6 +478,51 @@ ovaryAge:
How old your ovaries are
Used to delay menopause temporarily
+eggType:
+
+Used for compatibility.
+"human"
+
+ballType:
+
+Used for compatibility.
+"human"
+
storedCum:
How many units of your cum are stored away for artificially inseminating slaves
+
+behavioralFlaw:
+
+Used for compatibility.
+"none"
+
+behavioralQuirk:
+
+Used for compatibility.
+"none"
+
+sexualFlaw:
+
+Used for compatibility.
+"none"
+
+sexualQuirk:
+
+Used for compatibility.
+"none"
+
+fetish:
+
+Used for compatibility.
+"none"
+
+pubicHStyle:
+
+Used for compatibility.
+"hairless"
+
+underArmHStyle:
+
+Used for compatibility.
+"hairless"
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index ac5e0b35e03..046a0125d54 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -756,6 +756,9 @@ __''Player Character''__
''not'' on contraceptives. You ''can'' get pregnant.
[[Take contraceptives|Intro Summary][$PC.preg = -1]]
| [[Too late for that|Intro Summary][$PC.preg = 16, $PC.pregType = 1]]
+ <<elseif $PC.preg > 42>>
+ ''<<print $PC.preg>> weeks pregnant with octuplets'' and your water just broke.
+ [[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0, $PC.labor = 0]]
<<elseif $PC.preg > 37>>
''<<print $PC.preg>> weeks pregnant'' and going to go into labor soon.
[[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0]]
@@ -763,6 +766,7 @@ __''Player Character''__
''<<print $PC.preg>> weeks pregnant'' so there is no need to worry about contraceptives.
[[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0]]
| [[Ready to drop|Intro Summary][$PC.preg = 40]]
+ | [[Stuffed to capacity|Intro Summary][$PC.preg = 43, $PC.pregType = 8, $PC.labor = 1]]
<</if>>
<<if $PC.births > 0>>
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 3cbec66b5cd..bca970ae9b8 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -72,7 +72,25 @@ window.setPregType = function(actor) {
if(typeof actor.readyOva == "number" && actor.readyOva != 0) {
ovum = actor.readyOva; //just single override; for delayed impregnation cases
} else if(actor.ID == -1) {
- if(actor.birthMaster > 0) { // Predisposed to twins
+ if(actor.geneticQuirks.fertility == 2 && actor.geneticQuirks.hyperFertility == 2) { // Do not mix with sperm
+ if(actor.fertDrugs == 1) {
+ ovum += jsEither([2, 3, 3, 3, 3, 4, 4, 5]);
+ } else {
+ ovum += jsEither([1, 1, 2, 2, 3, 3, 4]);
+ }
+ if(actor.forcedFertDrugs > 0) {
+ ovum += jsEither([3, 3, 4, 4, 5]);
+ }
+ } else if(actor.geneticQuirks.hyperFertility == 2) { // Predisposed to multiples
+ if(actor.fertDrugs == 1) {
+ ovum += jsEither([1, 2, 2, 2, 2, 3, 3, 4]);
+ } else {
+ ovum += jsEither([0, 1, 1, 1, 1, 1, 2, 3]);
+ }
+ if(actor.forcedFertDrugs > 0) {
+ ovum += jsEither([2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4]);
+ }
+ } else if(actor.geneticQuirks.fertility == 2) { // Predisposed to twins
if(actor.fertDrugs == 1) {
ovum += jsEither([1, 1, 2, 2, 2, 2, 3, 3]);
} else {
@@ -91,6 +109,7 @@ window.setPregType = function(actor) {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4]);
}
}
+ Math.clamp(ovum, 0, 8);
} else if(actor.pregType == 0) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
if(actor.hormones == 2) {
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index 499bc78d679..5aed77beff2 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -104,6 +104,36 @@ window.WombImpregnate = function(actor, fCount, fatherID, age) {
MissingParentIDCorrection(actor);
};
+window.WombSurrogate = function(actor, fCount, mother, fatherID, age) {
+ var i;
+ var tf;
+ for (i=0; i<fCount; i++) {
+ tf = {}; //new Object
+ tf.age = age; //initial age
+ tf.motherID = mother.ID; //Initial biological mother ID setup.
+ tf.fatherID = fatherID; //We can store who is father too.
+ tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
+ tf.reserve = ""; //Initial, to create property. Used later to mark if this child is to be kept.
+ tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
+ tf.splitted = 0; //marker for already splitted fetus.
+ tf.genetics = generateGenetics(mother, fatherID, i+1); //Stored genetic information.
+
+ try {
+ if (actor.womb.length == 0) {
+ actor.pregWeek = age;
+ actor.preg = age;
+ }
+ actor.womb.push(tf);
+ } catch(err){
+ WombInit(actor);
+ actor.womb.push(tf);
+ alert("WombImpregnate warning - " + actor.slaveName+" "+err);
+ }
+
+ }
+ MissingParentIDCorrection(actor);
+};
+
window.WombProgress = function(actor, ageToAdd) {
var i, ft;
ageToAdd = Math.ceil(ageToAdd*10)/10;
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 29db50b3a6f..831728a100e 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -12,15 +12,28 @@
<<if $PC.vagina == 1>>
<<set $PC.births = 0>>
<<if $PC.career == "servant">>
- <<if $PC.actualAge >= 50 >>
- <<set $PC.births = 9>>
- <<set $PC.birthMaster = 9>>
- <<elseif $PC.actualAge >= 35>>
- <<set $PC.births = 6>>
- <<set $PC.birthMaster = 6>>
- <<else>>
- <<set $PC.births = 3>>
- <<set $PC.birthMaster = 3>>
+ <<if $PC.pregType != 8>>
+ <<if $PC.actualAge >= 50>>
+ <<set $PC.births = 9>>
+ <<set $PC.birthMaster = 9>>
+ <<elseif $PC.actualAge >= 35>>
+ <<set $PC.births = 6>>
+ <<set $PC.birthMaster = 6>>
+ <<else>>
+ <<set $PC.births = 3>>
+ <<set $PC.birthMaster = 3>>
+ <</if>>
+ <<else>> /* Master kept you pregged up */
+ <<if $PC.actualAge >= 50>>
+ <<set $PC.births = 70>>
+ <<set $PC.birthMaster = 70>>
+ <<elseif $PC.actualAge >= 35>>
+ <<set $PC.births = 40>>
+ <<set $PC.birthMaster = 40>>
+ <<else>>
+ <<set $PC.births = 16>>
+ <<set $PC.birthMaster = 16>>
+ <</if>>
<</if>>
<<set $PC.geneticQuirks.fertility = 2>>
<<for $i = 0; $i < $slaves.length; $i++>>
@@ -46,10 +59,16 @@
<</if>>
<<if $PC.preg > 0>>
<<set $PC.pregWeek = $PC.preg>>
- <<set $PC.pregType = 1>>
+ <<if $PC.pregType != 8>>
+ <<set $PC.pregType = 1>>
+ <<else>>
+ <<set $PC.geneticQuirks.hyperFertility = 2>>
+ <</if>>
<<if $PC.career == "servant">>
<<set $PC.pregSource = -3>>
- <<set $PC.pregType += random(0,0,1)>>
+ <<if $PC.pregType != 8>>
+ <<set $PC.pregType += random(0,0,1)>>
+ <</if>>
<<elseif $PC.career == "escort">>
<<set $PC.pregSource = -5>>
<</if>>
diff --git a/src/npc/databases/cheatmodeDatabase.tw b/src/npc/databases/cheatmodeDatabase.tw
index 5dc13cf9451..26e3bb4eb41 100644
--- a/src/npc/databases/cheatmodeDatabase.tw
+++ b/src/npc/databases/cheatmodeDatabase.tw
@@ -4,9 +4,9 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Miss Anne", _HS.birthName = "Lindy Anne", _HS.ID = 990000, _HS.relation = "mother", _HS.relationTarget = 990004, _HS.relationship = 4, _HS.relationshipTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990002, _HS.assignment = "be your Head Girl", _HS.birthWeek = random(0,51), _HS.actualAge = 42, _HS.physicalAge = 42, _HS.visualAge = 42, _HS.ovaryAge = 42, _HS.ageImplant = 1, _HS.health = 50, _HS.devotion = 100, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "honey blonde", _HS.skin = "pale", _HS.hStyle = "long", _HS.waist = -55, _HS.boobs = 1000, _HS.boobsImplant = 600, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.lips = 35, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.intelligence = 100, _HS.energy = 65, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "'Miss Anne' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She speaks with the rich accent of the Old South.">>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100>>
+ <<set _HS.genes = "XX", _HS.vagina = 2, _HS.ovaries = 1, _HS.vaginalSkill = 100, _HS.pubertyXX = 1>>
<<else>>
- <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1>>
+ <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1, _HS.pubertyXY = 1>>
<</if>>
<<run newSlave(_HS)>>
<<set $HeadGirl = clone(_HS)>>
@@ -15,9 +15,9 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Cornelia", _HS.birthName = "Cora", _HS.ID = 990001, _HS.relation = "mother", _HS.relationTarget = 990002, _HS.relationship = 4, _HS.relationshipTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.ageImplant = 1, _HS.health = 10, _HS.devotion = 100, _HS.muscles = 20, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "dark", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1200, _HS.boobsImplant = 1000, _HS.areolae = 2, _HS.butt = 5, _HS.buttImplant = 3, _HS.preg = -2, _HS.face = 15, _HS.faceImplant = 65, _HS.lips = 35, _HS.lipsImplant = 10, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 100, _HS.clothes = "a slave gown", _HS.energy = 65, _HS.attrXX = 80, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She speaks with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 0>>
- <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1>>
+ <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.pubertyXY = 1>>
<<else>>
- <<set _HS.genes = "XX", _HS.vagina = 3, _HS.ovaries = 1>>
+ <<set _HS.genes = "XX", _HS.vagina = 3, _HS.ovaries = 1, _HS.pubertyXX = 1>>
<</if>>
<<run newSlave(_HS)>>
//_HS.slaveName,//
@@ -25,9 +25,9 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Sheba", _HS.birthName = "Shaneequa", _HS.ID = 990002, _HS.relation = "daughter", _HS.relationTarget = 990001, _HS.rivalry = 1, _HS.rivalryTarget = 990000, _HS.assignment = "whore", _HS.birthWeek = random(0,51), _HS.actualAge = 19, _HS.physicalAge = 19, _HS.visualAge = 19, _HS.ovaryAge = 19, _HS.health = 10, _HS.devotion = 12, _HS.height = 175, _HS.race = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 1600, _HS.boobsImplant = 600, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 6, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.anus = 1, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.oralSkill = 35, _HS.analSkill = 35, _HS.whoreSkill = 35, _HS.entertainSkill = 35, _HS.clothes = "a slave gown", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "A large letter S is branded into the back of her left hand.", _HS.customDesc = "She speaks with the demeaning accent of slaves from the Old South.", _HS.mother = 990001>>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35>>
+ <<set _HS.genes = "XX", _HS.vagina = 1, _HS.ovaries = 1, _HS.vaginalSkill = 35, _HS.pubertyXX = 1>>
<<else>>
- <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 2, _HS.balls = 2, _HS.scrotum = 2, _HS.foreskin = 2, _HS.prostate = 1>>
+ <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 2, _HS.balls = 2, _HS.scrotum = 2, _HS.foreskin = 2, _HS.prostate = 1, _HS.pubertyXY = 1>>
<</if>>
<<run newSlave(_HS)>>
//_HS.slaveName,//
@@ -35,9 +35,9 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Cornflower", _HS.birthName = "Alysa", _HS.ID = 990003, _HS.relation = "daughter", _HS.relationTarget = 990005, _HS.relationship = 3, _HS.relationshipTarget = 990005, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -100, _HS.heels = 1, _HS.voice = 0, _HS.boobs = 6000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.butt = 3, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.oralSkill = 15, _HS.analSkill = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customTat = "A pretty blue cornflower is tattooed on each of her cheeks.", _HS.customDesc = "She once spoke with the demeaning accent of slaves from the Old South.", _HS.mother = 990005>>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.vaginalSkill = 15>>
+ <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.pubertyXX = 1>>
<<else>>
- <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.dickTat = "bovine patterns">>
+ <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 3, _HS.balls = 3, _HS.scrotum = 3, _HS.foreskin = 3, _HS.prostate = 1, _HS.dickTat = "bovine patterns", _HS.pubertyXY = 1>>
<</if>>
<<run newSlave(_HS)>>
//_HS.slaveName,//
@@ -45,9 +45,9 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Miss Lily", _HS.birthName = "Lillian", _HS.ID = 990004, _HS.relation = "daughter", _HS.relationTarget = 990000, _HS.assignment = "guard you", _HS.birthWeek = random(0,51), _HS.health = 20, _HS.devotion = 30, _HS.muscles = 50, _HS.height = 175, _HS.eyeColor = "green", _HS.hColor = "straw blonde", _HS.skin = "pale", _HS.hLength = 40, _HS.hStyle = "in a short ponytail", _HS.waist = -55, _HS.boobs = 600, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.preg = -2, _HS.anus = 2, _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.analSkill = 35, _HS.combatSkill = 1, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "buttslut", _HS.fetishKnown = 1, _HS.customTat = "'Miss Lily' is tattooed in lovely flowing script over her collarbone.", _HS.customDesc = "She once spoke with the rich accent of the Old South.", _HS.mother = 990000>>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.ovaries = 1>>
+ <<set _HS.genes = "XX", _HS.ovaries = 1, _HS.pubertyXX = 1>>
<<else>>
- <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1>>
+ <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 4, _HS.balls = 4, _HS.scrotum = 4, _HS.foreskin = 4, _HS.prostate = 1, _HS.pubertyXY = 1>>
<</if>>
<<run newSlave(_HS)>>
<<set $Bodyguard = clone(_HS)>>
@@ -56,9 +56,9 @@
<<set _HS = clone($activeSlave)>>
<<set _HS.slaveName = "Lilac", _HS.birthName = "Lillian", _HS.ID = 990005, _HS.relation = "mother", _HS.relationTarget = 990003, _HS.relationship = 3, _HS.relationshipTarget = 990003, _HS.assignment = "get milked", _HS.birthWeek = random(0,51), _HS.actualAge = 36, _HS.physicalAge = 36, _HS.visualAge = 36, _HS.ovaryAge = 36, _HS.health = 20, _HS.devotion = 12, _HS.muscles = 50, _HS.height = 190, _HS.race = "black", _HS.hColor = "black", _HS.pubicHColor = "black", _HS.skin = "brown", _HS.hLength = 0, _HS.hStyle = "shaved bald", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 8000, _HS.nipples = "huge", _HS.areolae = 2, _HS.boobsTat = "bovine patterns", _HS.lactation = 2, _HS.butt = 4, _HS.buttTat = "bovine patterns", _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "bovine patterns", _HS.anus = 3, _HS.anusTat = "bovine patterns", _HS.makeup = 1, _HS.nails = 1, _HS.earPiercing = 1, _HS.nosePiercing = 2, _HS.shouldersTat = "bovine patterns", _HS.armsTat = "bovine patterns", _HS.legsTat = "bovine patterns", _HS.stampTat = "bovine patterns", _HS.oralSkill = 15, _HS.analSkill = 35, _HS.energy = 65, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1, _HS.customTat = "A pretty purple lilac is tattooed on each of her cheeks.", _HS.customDesc = "She once spoke with the demeaning accent of slaves from the Old South.">>
<<if $seeDicks != 100>>
- <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.vaginalSkill = 15>>
+ <<set _HS.genes = "XX", _HS.vagina = 1, _HS.vaginaTat = "bovine patterns", _HS.ovaries = 1, _HS.vaginalSkill = 15, _HS.pubertyXX = 1>>
<<else>>
- <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 5, _HS.balls = 5, _HS.scrotum = 5, _HS.foreskin = 5, _HS.prostate = 1, _HS.dickTat = "bovine patterns">>
+ <<set _HS.genes = "XY", _HS.vagina = -1, _HS.dick = 5, _HS.balls = 5, _HS.scrotum = 5, _HS.foreskin = 5, _HS.prostate = 1, _HS.dickTat = "bovine patterns", _HS.pubertyXY = 1>>
<</if>>
<<run newSlave(_HS)>>
//and _HS.slaveName.//
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
new file mode 100644
index 00000000000..54312276a75
--- /dev/null
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -0,0 +1,225 @@
+:: Analyze PC Pregnancy [nobr]
+
+<<set $nextButton = "Continue", $nextLink = "Manage Personal Affairs">>
+
+<<set _WL = $PC.womb.length, _incubatorReservations = WombReserveCount($PC, "incubator"), _nurseryReservations = WombReserveCount($PC, "nursery")>>
+
+//You make yourself comfortable and prep your stomach for examination. <<PlayerBelly>>//
+
+<br><br>
+Overall statistics:
+<br> Fetal count: $PC.womb.length
+<br> Estimated womb volume: <<print commaNum(Math.round($PC.belly))>> cc
+
+<br><br>
+Furthest developed pregnancy:
+<br> Fetal development week: $PC.preg
+
+<<if $incubator + $nursery > 0>>
+<br><br>
+<<if $incubator > 0>>
+ <<if _incubatorReservations > 0>>
+ <<link "Remove all of your children from $incubatorName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($PC, "incubator", "")>>
+ <<set $reservedChildren -= _incubatorReservations>>
+ <</link>> |
+ <</if>>
+ <<if _incubatorReservations < _WL && ($reservedChildren + _WL - _incubatorReservations <= $freeTanks)>>
+ <<link "Keep all of your children in $incubatorName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($PC, "nursery", "incubator")>>
+ <<run WombChangeReserveType($PC, "", "incubator")>>
+ <<set $reservedChildrenNursery -= _nurseryReservations>>
+ <<set $reservedChildren += _WL - _incubatorReservations>>
+ <</link>>
+ <<elseif _incubatorReservations < _WL>>
+ There is not enough free space in $incubatorName for the rest of your children.
+ <</if>>
+<</if>>
+<br>
+<<if $nursery > 0>>
+ <<if _nurseryReservations > 0>>
+ <<link "Remove all of your children from $nurseryName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($PC, "nursery", "")>>
+ <<set $reservedChildrenNursery -= _nurseryReservations>>
+ <</link>> |
+ <</if>>
+ <<if _nurseryReservations < _WL && ($reservedChildrenNursery + _WL - _nurseryReservations <= $freeCribs)>>
+ <<link "Keep all of your children in $nurseryName" "Analyze Pregnancy">>
+ <<run WombChangeReserveType($PC, "incubator", "nursery")>>
+ <<run WombChangeReserveType($PC, "", "nursery")>>
+ <<set $reservedChildren -= _incubatorReservations>>
+ <<set $reservedChildrenNursery += _WL - _nurseryReservations>>
+ <</link>>
+ <<elseif _nurseryReservations < _WL>>
+ There is not enough free space in $nurseryName for the rest of your children.
+ <</if>>
+<</if>>
+<</if>>
+
+<br><br>
+Deep scan:
+
+<br>
+<<for _ap = 0; _ap < _WL; _ap++>>
+<<capture _ap>>
+ <br>
+ Ova: $PC.womb[_ap].genetics.name
+ <br>
+ Gender: $PC.womb[_ap].genetics.gender
+ <br>
+ Father ID: $PC.womb[_ap].genetics.father
+ <br>
+ Father Name: $PC.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $PC.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $PC.womb[_ap].genetics.motherName
+ <br>
+ Nationality: $PC.womb[_ap].genetics.nationality
+ <br>
+ Race: $PC.womb[_ap].genetics.race
+ <br>
+ Skin tone: $PC.womb[_ap].genetics.skin
+ <br>
+ Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
+ <br>
+ Face index: $PC.womb[_ap].genetics.face out of 100
+ <br>
+ Eye Color: $PC.womb[_ap].genetics.eyeColor
+ <br>
+ Hair Color: $PC.womb[_ap].genetics.hColor
+ <<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: none
+ <<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">>
+ <br>
+ Body hair: lacks underarm hair
+ <<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: lacks pubic hair
+ <</if>>
+ <<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">>
+ <br>
+ Markings: $PC.womb[_ap].genetics.markings
+ <</if>>
+ <br><br>
+
+ Underarm Hair Style: $PC.womb[_ap].genetics.underArmHStyle
+ <br>
+ Pubic Hair Style: $PC.womb[_ap].genetics.pubicHStyle
+ <br>
+ Markings: $PC.womb[_ap].genetics.markings
+ <br>
+ Sexual Flaw: $PC.womb[_ap].genetics.sexualFlaw
+ <br>
+ Behavioral Flaw: $PC.womb[_ap].genetics.behavioralFlaw
+ <br>
+ Fetish: $PC.womb[_ap].genetics.fetish
+ <br><br>
+
+ Reserved: $PC.womb[_ap].reserve
+
+ <<if $geneticMappingUpgrade == 1>>
+ <br>
+ Gender: $PC.womb[_ap].genetics.gender
+ <br>
+ Father ID: $PC.womb[_ap].genetics.father
+ <br>
+ Father Name: $PC.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $PC.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $PC.womb[_ap].genetics.motherName
+ <br>
+ Nationality: $PC.womb[_ap].genetics.nationality
+ <br>
+ Race: $PC.womb[_ap].genetics.race
+ <br>
+ Skin tone: $PC.womb[_ap].genetics.skin
+ <br>
+ Intelligence index: $PC.womb[_ap].genetics.intelligence out of 100
+ <br>
+ Face index: $PC.womb[_ap].genetics.face out of 100
+ <br>
+ Eye Color: $PC.womb[_ap].genetics.eyeColor
+ <br>
+ Hair Color: $PC.womb[_ap].genetics.hColor
+ <<if $PC.womb[_ap].genetics.underArmHStyle == "hairless" && $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: none
+ <<elseif $PC.womb[_ap].genetics.underArmHStyle == "hairless">>
+ <br>
+ Body hair: lacks underarm hair
+ <<elseif $PC.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: lacks pubic hair
+ <</if>>
+ <<if $PC.womb[_ap].genetics.markings == "freckles" || $PC.womb[_ap].genetics.markings == "heavily freckled">>
+ <br>
+ Markings: $PC.womb[_ap].genetics.markings
+ <</if>>
+ <<else>>
+ <<if $PC.womb[_ap].age > 13>>
+ <br>
+ Gender: $PC.womb[_ap].genetics.gender
+ <</if>>
+ <<if $PC.womb[_ap].age > 5>>
+ <br>
+ Father ID: $PC.womb[_ap].genetics.father
+ <br>
+ Father Name: $PC.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $PC.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $PC.womb[_ap].genetics.motherName
+ <</if>>
+ <</if>>
+
+ <br><br>
+
+ Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
+ <<if $PC.womb[_ap].age < 4>>
+ <br>
+ <<link "Terminate ovum" "Analyze Pregnancy">><<run WombRemoveFetus($PC, _ap)>><</link>>
+ <</if>>
+ <<if $incubator > 0>>
+ <br>
+ <<if $PC.womb[_ap].reserve === "incubator">>
+ <<link "Don't keep this child in $incubatorName" "Analyze Pregnancy">>
+ <<set $PC.womb[_ap].reserve = "">>
+ <<set $reservedChildren-->>
+ <</link>>
+ <<elseif $freeTanks - $reservedChildren > 0>>
+ <<link "Keep this child in $incubatorName" "Analyze Pregnancy">>
+ <<if $PC.womb[_ap].reserve === "nursery">>
+ <<set $reservedChildrenNursery-->>
+ <</if>>
+ <<set $PC.womb[_ap].reserve = "incubator">>
+ <<set $reservedChildren++>>
+ <</link>>
+ <<else>>
+ There is not enough free space to keep this child in $incubatorName.
+ <</if>>
+ <</if>>
+ <<if $nursery > 0>>
+ <br>
+ <<if $PC.womb[_ap].reserve === "nursery">>
+ <<link "Don't keep this child in $nurseryName" "Analyze Pregnancy">>
+ <<set $PC.womb[_ap].reserve = "">>
+ <<set $reservedChildrenNursery-->>
+ <</link>>
+ <<elseif $freeCribs - $reservedChildrenNursery > 0>>
+ <<link "Keep this child in $nurseryName" "Analyze Pregnancy">>
+ <<if $PC.womb[_ap].reserve === "incubator">>
+ <<set $reservedChildren-->>
+ <</if>>
+ <<set $PC.womb[_ap].reserve = "nursery">>
+ <<set $reservedChildrenNursery++>>
+ <</link>>
+ <<else>>
+ There is not enough free space to keep this child in $nurseryName.
+ <</if>>
+ <</if>>
+ <br><br><hr style="margin:0"><br>
+<</capture>>
+<</for>>
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index f63964b3962..beb3213c65b 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -122,13 +122,60 @@ Deep scan:
<br><br>
Reserved: $activeSlave.womb[_ap].reserve
- <br>
<<if $geneticMappingUpgrade == 1>>
- <<else>>
- <<if $activeSlave.womb[_ap].age > 5>>
+ <br>
+ Gender: $activeSlave.womb[_ap].genetics.gender
+ <br>
+ Father ID: $activeSlave.womb[_ap].genetics.father
+ <br>
+ Father Name: $activeSlave.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $activeSlave.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $activeSlave.womb[_ap].genetics.motherName
+ <br>
+ Nationality: $activeSlave.womb[_ap].genetics.nationality
+ <br>
+ Race: $activeSlave.womb[_ap].genetics.race
+ <br>
+ Skin tone: $activeSlave.womb[_ap].genetics.skin
+ <br>
+ Intelligence index: $activeSlave.womb[_ap].genetics.intelligence out of 100
+ <br>
+ Face index: $activeSlave.womb[_ap].genetics.face out of 100
+ <br>
+ Eye Color: $activeSlave.womb[_ap].genetics.eyeColor
+ <br>
+ Hair Color: $activeSlave.womb[_ap].genetics.hColor
+ <<if $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless" && $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: none
+ <<elseif $activeSlave.womb[_ap].genetics.underArmHStyle == "hairless">>
+ <br>
+ Body hair: lacks underarm hair
+ <<elseif $activeSlave.womb[_ap].genetics.pubicHStyle == "hairless">>
+ <br>
+ Body hair: lacks pubic hair
<</if>>
+ <<if $activeSlave.womb[_ap].genetics.markings == "freckles" || $activeSlave.womb[_ap].genetics.markings == "heavily freckled">>
+ <br>
+ Markings: $activeSlave.womb[_ap].genetics.markings
+ <</if>>
+ <<else>>
<<if $activeSlave.womb[_ap].age > 13>>
+ <br>
+ Gender: $activeSlave.womb[_ap].genetics.gender
+ <</if>>
+ <<if $activeSlave.womb[_ap].age > 5>>
+ <br>
+ Father ID: $activeSlave.womb[_ap].genetics.father
+ <br>
+ Father Name: $activeSlave.womb[_ap].genetics.fatherName
+ <br>
+ Mother ID: $activeSlave.womb[_ap].genetics.mother
+ <br>
+ Mother Name: $activeSlave.womb[_ap].genetics.motherName
<</if>>
<</if>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 99f40be0b8d..579c438c0e3 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -463,6 +463,12 @@ In total, you have given birth to:
You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
<</if>>
<</if>>
+<<if ($PC.preg > 1 && $pregnancyMonitoringUpgrade == 1)>>
+ <br>[[Inspect pregnancy|Analyze PC Pregnancy]]
+<</if>>
+<<if $PC.preg >= 0>>
+ <br>[[Harvest and implant an egg|Surrogacy Workaround][$donatrix = $PC, $impregnatrix = "Undecided", $receptrix = "Undecided", $nextLink = "Manage Personal Affairs"]]
+<</if>>
<<if $arcologies[0].FSRestartDecoration >= 100>>
<<if $playerBred == 0>>
diff --git a/src/pregmod/ovaTransplantWorkaround.tw b/src/pregmod/ovaTransplantWorkaround.tw
new file mode 100644
index 00000000000..5202cbf54f9
--- /dev/null
+++ b/src/pregmod/ovaTransplantWorkaround.tw
@@ -0,0 +1,50 @@
+:: Ova Transplant Workaround [nobr]
+
+<<set $nextButton = "Back", $impregnatrix = 0, _eligibility = 0, _eligibilityI = 0>>
+
+//$activeSlave.slaveName is prepped for fertilization; now you must select a target to harvest sperm from.//
+
+<br><br>
+
+__Select an eligible slave to serve as the semen donatrix:__
+
+<br>
+
+<<for _ai = 0; _ai < $slaves.length; _ai++>>
+ <<if $slaves[_ai].balls > 0 && $slaves[_ai].pubertyXY == 1 && canBreed($activeSlave, $slaves[_ai])>>
+ <<set _name = SlaveFullName($slaves[_ai])>>
+ <br><<print "[[_name|Surgery Degradation][$impregnatrix = $slaves[" + _ai + "], $cash -= $surgeryCost, $surgeryType = 'insemination']]">>
+ <<set _eligibility = 1>>
+ <</if>>
+<</for>>
+<<if (_eligibility == 0)>>
+ <br>//You have no slaves with potent sperm.//
+<</if>>
+
+/* Disabled until .pregSource can manage to comprehend this
+<<if $incubatorSlaves > 0 && $incubatorReproductionSetting == 2>>
+ <br><br>
+
+ __Incubator settings are resulting in large-scale fluid secretion. Select an eligible incubatee to milk for semen:__
+
+ <br>
+ <<for _ai = 0; _ai < $tanks.length; _ai++>>
+ <<if $tanks[_ai].balls > 0 && $tanks[_ai].dick > 0 && canBreed($activeSlave, $tanks[_ai])>>
+ <br><<print "[[$tanks[_ai].slaveName|Surgery Degradation][$impregnatrix = $tanks[" + _ai + "], $cash -= $surgeryCost, $surgeryType = 'insemination']]">>
+ <<set _eligibilityI = 1>>
+ <</if>>
+ <</for>>
+ <<if (_eligibilityI == 0)>>
+ <br>//You have no growing slaves producing sperm.//
+ <</if>>
+<</if>>
+*/
+
+<<if $PC.dick == 1>>
+ <br>
+ [[Use your own|Surgery Degradation][$impregnatrix = $PC, $cash -= $surgeryCost, $surgeryType = "insemination"]]
+<<elseif $PC.storedCum > 0>>
+ <br>
+ [[Use a vial of your own|Surgery Degradation][$impregnatrix = $PC, $cash -= $surgeryCost, $surgeryType = "insemination", $PC.storedCum--]]
+ //You have enough sperm stored away to inseminate $PC.storedCum more slave<<if $PC.storedCum > 1>>s<</if>>.//
+<</if>>
diff --git a/src/pregmod/pcPregIntro.tw b/src/pregmod/pcPregIntro.tw
index 43723712cf0..f94e020ddfd 100644
--- a/src/pregmod/pcPregIntro.tw
+++ b/src/pregmod/pcPregIntro.tw
@@ -12,9 +12,17 @@ You're
<<elseif $PC.preg == 0>>
fertile and you know the risks.
[[Safe|PC Preg Intro][$PC.preg = -1]] | [[About that...|PC Preg Intro][$PC.preg = 10]]
+<<elseif $PC.preg > 42>>
+ proudly pregnant with octuplets and they are coming right now.
+ [[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0, $PC.labor = 0]]
+<<elseif $PC.preg > 37>>
+ <<print $PC.preg>> weeks pregnant and very close to being due.
+ [[Not pregnant|Intro Summary][$PC.preg = 0, $PC.pregType = 0]]
+ | [[Overdid the fertility agents|PC Preg Intro][$PC.preg = 43, $PC.pregType = 8, $PC.labor = 1]]
<<else>>
already pregnant.
[[Fertile|PC Preg Intro][$PC.preg = 0]]
+ | [[Make that very pregnant|PC Preg Intro][$PC.preg = 40]]
<</if>>
<br>
//Being or becoming pregnant will raise difficulty.//
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
index 315165bb21f..fd49e685bba 100644
--- a/src/pregmod/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -35,7 +35,7 @@
<<set $PC.boobsBonus++>>
<</if>>
<<elseif $PC.boobsBonus == -3>>
- <<if random(1,100) > 75>>
+ <<if random(1,100) > 75>>/*
Your once tiny breasts have @@.lime;become swollen@@ lately with your new pregnancy. Quick measurements show you've actually gone up a cup size over the course of your pregnancy.
<<set $PC.boobsBonus++>>
<</if>>
diff --git a/src/pregmod/surrogacy.tw b/src/pregmod/surrogacy.tw
new file mode 100644
index 00000000000..c9dc8667f7e
--- /dev/null
+++ b/src/pregmod/surrogacy.tw
@@ -0,0 +1,59 @@
+:: Surrogacy [nobr]
+
+<<set $nextButton = "Continue">>
+
+<<switch $surgeryType>>
+
+<<case "surrogacy">>
+
+ <<if $receptrix.ID == -1>>
+ Since the surgery required only a local anesthetic, you remain fully aware of the procedure as the autosurgery carries it out. You slowly rise to your feet, a hand to your lower belly, appreciating the new life growing within you.
+ <<set $PC.pregKnown = 1>>
+ <<run WombSurrogate($PC, 1, $donatrix, $impregnatrix.ID, 1)>>
+ <<run WombUpdatePregVars($PC)>>
+ <<else>>
+ <<set $receptrix.pregKnown = 1>>
+ <<run WombSurrogate($receptrix, 1, $donatrix, $impregnatrix.ID, 1)>>
+ <<run WombUpdatePregVars($receptrix)>>
+ <<setLocalPronouns $receptrix>>
+ <<if $receptrix.fetish == "mindbroken">>
+ $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ <<elseif ($receptrix.fetish == "pregnancy") && ($receptrix.fetishStrength > 60) && ($receptrix.fetishKnown == 1)>>
+ <<if canSee($receptrix)>>
+ Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. $He was overjoyed at the sight of the syringe containing $his future child emptying into $his womb.
+ <<else>>
+ $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ <</if>>
+ $He is @@.hotpink; filled with joy@@ over the life settling into $his womb and can't wait to see the result. $He's so pleased that $he now @@.mediumaquamarine;trusts@@ your plans for $his body.
+ <<set $receptrix.trust += 4, $receptrix.devotion += 10>>
+ <<elseif ($receptrix.devotion > 50)>>
+ <<if canSee($receptrix)>>
+ Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. $He watched the syringe containing $his new pregnancy empty into $his womb with rapt attention.
+ <<else>>
+ $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ <</if>>
+ $He's @@.hotpink;grateful@@ that you think $him worthy of carrying this child, and a little nervous about how $he'll perform as a surrogate.
+ <<set $receptrix.devotion += 4>>
+ <<elseif ($receptrix.devotion >= -20)>>
+ <<if canSee($receptrix)>>
+ Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. From the syringe making contact with $his skin, to the egg's delivery into $his womb and $his subsequent impregnation, $he couldn't look away.
+ <<else>>
+ $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ <</if>>
+ $He understands the realities of $his life as a slave, so it isn't much of a shock. $He is @@.gold;sensibly fearful@@ of your total power over $his body.
+ <<set $receptrix.trust -= 10>>
+ <<else>>
+ <<if canSee($receptrix)>>
+ Since the surgery required only a local anesthetic, $he remained fully aware throughout the procedure. The moment $he realized what was happening, $he shut $his eyes tight, only opening them again as $he feels the slight tingle of the injector exiting $his lower abdomen.
+ <<else>>
+ $He leaves the surgery with a certain warmth in $his lower abdomen, $he knows that $he has been impregnated.
+ <</if>>
+ $He does not understand the realities of $his life as a slave at a core level, so $he's @@.mediumorchid;terrified and angry@@ that you have forced $him to bear this child, even more so as $he realizes $he doesn't know who the father is. $He is @@.gold;sensibly fearful@@ of your total power over $his body and the future of the life $he now harbors within $him.
+ <<set $receptrix.trust -= 15, $receptrix.devotion -= 15>>
+ <</if>>
+ <<set _surr = $slaves.findIndex(function(s) { return s.ID == $receptrix.ID; })>>
+ <<set $slaves[_surr] = $receptrix>>
+ <</if>>
+
+
+<</switch>>
\ No newline at end of file
diff --git a/src/pregmod/surrogacyWorkaround.tw b/src/pregmod/surrogacyWorkaround.tw
new file mode 100644
index 00000000000..e2f8fe30c28
--- /dev/null
+++ b/src/pregmod/surrogacyWorkaround.tw
@@ -0,0 +1,85 @@
+:: Surrogacy Workaround [nobr]
+
+<<set $nextButton = "Cancel", _eligibility = 0, _eligibilityI = 0, _eligibility2 = 0>>
+<<if $donatrix.ID == $PC.ID>>
+ <<set _donatrixID = -1>>
+<<else>>
+ <<set _donatrixID = 0>>
+<</if>>
+<<if $impregnatrix != "Undecided" && $impregnatrix.ID == -1>><<set _impreg = PlayerName()>><<elseif $impregnatrix != "Undecided">><<set _impreg = SlaveFullName($impregnatrix)>><<else>><<set _impreg = $impregnatrix>><</if>>
+<<if $receptrix != "Undecided" && $receptrix.ID == -1>><<set _recieve = PlayerName()>><<elseif $receptrix != "Undecided">><<set _recieve = SlaveFullName($receptrix)>><<else>><<set _recieve = $receptrix>><</if>>
+
+//<<if _donatrixID == -1>>You've prepared yourself to have an egg taken from your ovaries<<else>>$activeSlave.slaveName is prepped to have an egg harvested from $his ovaries<</if>>; now you must select a target to fertilize it and who will carry it to term.//
+
+<br><br>
+
+
+_impreg will provide the seed and _recieve shall carry it.
+[[Implant fertilized ovum|Surrogacy][$cash -= $surgeryCost, $surgeryType = 'surrogacy']]
+
+<br><br>
+
+__Semen donatrix: _impreg __
+
+<br>
+<<for _sw = 0; _sw < $slaves.length; _sw++>>
+<<capture _sw>>
+ <<if $slaves[_sw].balls > 0 && $slaves[_sw].pubertyXY == 1 && isSlaveAvailable($slaves[_sw]) && canBreed($donatrix, $slaves[_sw])>>
+ <<set _name = SlaveFullName($slaves[_sw])>>
+ <br><<print "[[_name|Surrogacy Workaround][$impregnatrix = $slaves[" + _sw + "]]]">>
+ <<set _eligibility = 1>>
+ <</if>>
+<</capture>>
+<</for>>
+<<if (_eligibility == 0)>>
+ <br>//You have no slaves with potent sperm.//
+<</if>>
+
+<<if $incubatorSlaves > 0 && $incubatorReproductionSetting == 2>>
+ <br><br>
+
+ __Incubator settings are resulting in large-scale fluid secretion. Select an eligible incubatee to milk for semen:__
+
+ <br>
+ <<for _sw3 = 0; _sw3 < $tanks.length; _sw3++>>
+ <<capture _sw3>>
+ <<if $tanks[_sw3].balls > 0 && $tanks[_sw3].dick > 0 && canBreed($donatrix, $tanks[_sw3])>>
+ <<set _name3 = $tanks[_sw3].slaveName>>
+ <<print "[[_name3|Surrogacy Workaround][$impregnatrix = $tanks[" + _sw3 + "]]]">>
+ <<set _eligibilityI = 1>>
+ <</if>>
+ <</capture>>
+ <</for>>
+ <<if (_eligibilityI == 0)>>
+ <br>//You have no growing slaves producing sperm.//
+ <</if>>
+<</if>>
+
+<<if $PC.dick == 1>>
+ <br>
+ [[Use your own|Surrogacy Workaround][$impregnatrix = $PC]]
+<</if>>
+
+<br><br>
+
+__Chosen surrogate: _recieve __
+
+<br>
+
+<<for _sw1 = 0; _sw1 < $slaves.length; _sw1++>>
+<<capture _sw1>>
+ <<if ($slaves[_sw1].ovaries > 0 || $slaves[_sw1].mpreg > 0) && isSlaveAvailable($slaves[_sw1]) && $slaves[_sw1].preg >= 0 && $slaves[_sw1].preg < 4 && $slaves[_sw1].pubertyXX == 1>>
+ <<set _name2 = SlaveFullName($slaves[_sw1])>>
+ <br><<print "[[_name2|Surrogacy Workaround][$receptrix = $slaves[" + _sw1 + "]]]">>
+ <<set _eligibility2 = 1>>
+ <</if>>
+<</capture>>
+<</for>>
+<<if (_eligibility2 == 0)>>
+ <br>//You have no slaves capable of acting as a surrogate.//
+<</if>>
+
+<<if $PC.vagina == 1 && $PC.preg >= 0 && $PC.preg < 4>>
+ <br>
+ [[Use your own womb|Surrogacy Workaround][$receptrix = $PC]]
+<</if>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index f6ab8ee02bf..a5ee364c832 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -510,6 +510,26 @@
<</if>>
<</if>>
<</if>>
+<<elseif _passage == "Analyze PC Pregnancy">>
+ <<if $PC.belly >= 120000>>
+ You shudder at the cool touch of the sensor running along the curve of your sensitve pregnancy. While you've devised a way to scan the distant peak of your navel and the depths of your underbelly, you failed to take into account just how excited your children would get over the attention. Every pass is a battle against your kicking brood.
+ <<elseif $PC.belly >= 90000>>
+ You shudder at the cool touch of the sensor running along the curve of your pregnancy. It takes some stretching, but you can just barely scan yourself without assistance. If you grow much larger, you'll have to call in help for those places that elude your reach.
+ <<elseif $PC.belly >= 45000>>
+ You shudder at the cool touch of the sensor running along the curve of your pregnancy. It's quite a tiring endeavor to scan the entire thing, given just how far it extends from your body.
+ <<elseif $PC.belly >= 14000>>
+ You shudder at the cool touch of the sensor running along the curve of your pregnancy. It takes some effort to scan the entire thing, given how large it has grown.
+ <<elseif $PC.belly >= 5000>>
+ You shudder at the cool touch of the sensor running along the curve of your pregnancy.
+ <<elseif $PC.belly >= 1500>>
+ You shudder at the cool touch of the sensor running along the curve of your growing pregnancy.
+ <<elseif $PC.belly >= 500>>
+ You shudder at the cool touch of the sensor running along the curve of your early pregnancy.
+ <<elseif $PC.belly >= 100>>
+ You shudder at the cool touch of the sensor against the slight swell of your lower belly.
+ <<elseif $PC.belly < 100>>
+ You shudder slightly at the cool touch of the sensor against your skin.
+ <</if>>
<<else>>
<<if $PC.preg > 0>>
<<if $PC.belly >= 120000>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 3c6ba5c63e8..b72d1196ad2 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,7 +1,7 @@
:: pregmod widgets [nobr widget]
<<widget "initPC">>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}}>>
+ <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", pupil: "circular", sclerae: "white", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 100, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, reservedChildrenNursery: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35, eggType: "human", ballType: "human", storedCum: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", fetish: "none", pubicHStyle: "hairless", underArmHStyle: "hairless", geneticQuirks: {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}}>>
<<set WombInit($PC)>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 96bbfd60e09..13406528d66 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -354,6 +354,12 @@
<<if ndef $PC.underArmHStyle>>
<<set $PC.underArmHStyle = "hairless">>
<</if>>
+<<if ndef $PC.eggType>>
+ <<set $PC.eggType = "human">>
+<</if>>
+<<if ndef $PC.ballType>>
+ <<set $PC.ballType = "human">>
+<</if>>
<<if $releaseID < 1032>>
<<if $PC.pregSource == -1>>
<<set $PC.pregSource = -6>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index c8edc85d3f0..8d7254ac99d 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -329,7 +329,6 @@ __Penthouse Upgrades__
<<if $rep > 14000>>
[[Install a genetic sequencer|Dispensary][$cash -= 120000, $geneticMappingUpgrade = 15, $PC.engineering += .1]]
//Costs <<print cashFormat(120000)>>//
- <br> //Will allow for the identification of genetic abnormalities and production of specialized treatments.//
<<else>>
//You lack the reputation to purchase a cutting-edge genetic sequencer//
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index ae458c65110..6e192884bc2 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -309,7 +309,7 @@
//Her pregnancy implant is turned off<<if $activeSlave.broodmotherCountDown > 0>>; she is expected to be completely emptied of her remaining brood in $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>><<else>>.<</if>>//
[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
<<elseif ($activeSlave.preg >= -1)>>
- __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
<<if ($activeSlave.preg == 0)>>
<<link "Use contraceptives">><<set $activeSlave.preg = -1>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<<elseif ($activeSlave.preg == -1)>>
@@ -349,7 +349,7 @@
//Its pregnancy implant is turned off; it expected to be completely emptied of its remaining brood in $activeSlave.broodmotherCountDown week $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>//
[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
<<elseif ($activeSlave.preg >= -1)>>
- __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+ Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
<<if ($activeSlave.preg == 0)>>
<<link "Use contraceptives">><<set $activeSlave.preg = -1>>
<<SlaveInteractImpreg>>
--
GitLab