diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 661f625c95c44f77f688aafa71e936caf16016b7..4c0c6bd21affdb52af6b0fd994b660552961a0f4 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -321,7 +321,7 @@ window.isFertile = function(slave) {
WombInit(slave);
- if (slave.womb.length > 0 && slave.superfetation < 1 && slave.ovaImplant < 1) { /* currently pregnant without superfetation */
+ if (slave.womb.length > 0 && slave.geneticQuirks.superfetation < 2 && slave.ovaImplant < 1) { /* currently pregnant without superfetation */
return false;
} else if (slave.womb.length > 0) { /* temp failure condition to prevent current double preg bug */
return false;
@@ -9972,7 +9972,7 @@ window.generateGenetics = (function() {
function generateGenetics(actor1, actor2, x) {
V = State.variables;
- genes = {gender: "XX", name: "blank", 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", geneticFlaws: 0};
+ genes = {gender: "XX", name: "blank", 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};
mother = (actor1 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor1; }) : V.PC;
activeMother = (actor1 > 0) ? V.slaves[actor1] : V.PC;
father = (actor2 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor2; })
@@ -10487,9 +10487,9 @@ window.WombImpregnate = function(actor, fCount, fatherID, age) {
tf = {}; //new Object
tf.age = age; //initial age
tf.fatherID = fatherID; //We can store who is father too.
- tf.sex = Math.round(Math.random())+1; // 1 = male, 2 = female. For possible future usage, just as concept now.
tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
+ tf.genetics = generateGenetics(actor.ID, fatherID, i+1); //Stored genetic information.
try {
if (actor.womb.length == 0) {
@@ -10707,9 +10707,9 @@ window.fetalSplit = function(actor) {
var nft = {};
nft.age = actor.preg;
nft.fatherID = actor.pregSource;
- nft.sex = Math.round(Math.random())+1;
nft.volume = 1;
nft.identical = 0;
+ nft.genetics = 0;
actor.womb.forEach(function(s){
if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
@@ -10717,8 +10717,8 @@ window.fetalSplit = function(actor) {
nft = {};
nft.age = s.age;
nft.fatherID = s.fatherID;
- nft.sex = s.sex;
nft.volume = s.volume;
+ nft.genetics = deepCopy(s.genetics);
actor.womb.push(nft);
s.identical = 1;
}
@@ -32257,7 +32257,6 @@ window.BaseSlave = function BaseSlave() {
pregSource: 0,
pregType: 0,
pregAdaptation: 50,
- superfetation: 0,
ovaImplant: 0,
wombImplant: "none",
broodmother: 0,
@@ -32345,6 +32344,7 @@ window.BaseSlave = function BaseSlave() {
behavioralQuirk: "none",
sexualFlaw: "none",
sexualQuirk: "none",
+ 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},
oralCount: 0,
vaginalCount: 0,
analCount: 0,
@@ -32539,11 +32539,6 @@ window.GenerateNewSlave = (function(){
slave.ovaries = 1;
slave.pubertyXY = 0;
slave.energy = jsRandom(1,85);
- /* Superfetation as rare genetic disorder 1 from 100, not active for now.
- if (jsRandom(0,99) < 1) {
- slave.superfetation = 1;
- }
- */
generateXXBodyProportions();
generateVagina();
@@ -35266,7 +35261,6 @@ window.slavePregnancyDatatypeCleanup = function slavePregnancyDatatypeCleanup(sl
if (slave.pregAdaptation !== 0) {
slave.pregAdaptation = Math.max(+slave.pregAdaptation, 0) || 50;
}
- slave.superfetation = Math.clamp(+slave.superfetation, 0, 1) || 0;
slave.ovaImplant = Math.clamp(+slave.ovaImplant, -1, 2) || 0;
slave.broodmother = Math.clamp(+slave.broodmother, 0, 3) || 0;
slave.broodmotherFetuses = Math.max(+slave.broodmotherFetuses, 0) || 0;
diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw
index 61315ab5cec553721b4b858b5ea4b1a1029adbdd..e4274e131406847485a718b2cdeb2908fc929988 100644
--- a/src/js/datatypeCleanupJS.tw
+++ b/src/js/datatypeCleanupJS.tw
@@ -201,7 +201,6 @@ window.slavePregnancyDatatypeCleanup = function slavePregnancyDatatypeCleanup(sl
if (slave.pregAdaptation !== 0) {
slave.pregAdaptation = Math.max(+slave.pregAdaptation, 0) || 50;
}
- slave.superfetation = Math.clamp(+slave.superfetation, 0, 1) || 0;
slave.ovaImplant = Math.clamp(+slave.ovaImplant, -1, 2) || 0;
slave.broodmother = Math.clamp(+slave.broodmother, 0, 3) || 0;
slave.broodmotherFetuses = Math.max(+slave.broodmotherFetuses, 0) || 0;
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 41f33d1f27003c46652cb64788d06ef42b80d672..b0d6cb311f0c50ce7498ecc6bc72cb74f2f367b6 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -12,7 +12,7 @@ window.generateGenetics = (function() {
function generateGenetics(actor1, actor2, x) {
V = State.variables;
- genes = {gender: "XX", name: "blank", 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", geneticFlaws: 0};
+ genes = {gender: "XX", name: "blank", 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};
mother = (actor1 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor1; }) : V.PC;
activeMother = (actor1 > 0) ? V.slaves[actor1] : V.PC;
father = (actor2 > 0) ? V.genePool.findIndex(function(s) { return s.ID == actor2; })
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index cb98f3fd60a1713914c3b22e37a4afb643f2fab2..ef2f543963fee5b5dceaac263c26f70409829799 100644
--- a/src/js/generateNewSlaveJS.tw
+++ b/src/js/generateNewSlaveJS.tw
@@ -71,11 +71,6 @@ window.GenerateNewSlave = (function(){
slave.ovaries = 1;
slave.pubertyXY = 0;
slave.energy = jsRandom(1,85);
- /* Superfetation as rare genetic disorder 1 from 100, not active for now.
- if (jsRandom(0,99) < 1) {
- slave.superfetation = 1;
- }
- */
generateXXBodyProportions();
generateVagina();
diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index b66e8de51d5c7fd471c827297bfde017ced207b8..a43cba18c0cd84259e5b368ee6a01a3f9b007e00 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -1506,7 +1506,6 @@ window.BaseSlave = function BaseSlave() {
pregSource: 0,
pregType: 0,
pregAdaptation: 50,
- superfetation: 0,
ovaImplant: 0,
wombImplant: "none",
broodmother: 0,
@@ -1594,6 +1593,7 @@ window.BaseSlave = function BaseSlave() {
behavioralQuirk: "none",
sexualFlaw: "none",
sexualQuirk: "none",
+ 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},
oralCount: 0,
vaginalCount: 0,
analCount: 0,
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 099eab5e9716623775090a9411b923580afc0117..cc8212777d422dea86ed16eb8dd1c1e5fa287da4 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -318,7 +318,7 @@ window.isFertile = function(slave) {
WombInit(slave);
- if (slave.womb.length > 0 && slave.superfetation < 1 && slave.ovaImplant < 1) { /* currently pregnant without superfetation */
+ if (slave.womb.length > 0 && slave.geneticQuirks.superfetation < 2 && slave.ovaImplant < 1) { /* currently pregnant without superfetation */
return false;
} else if (slave.womb.length > 0) { /* temp failure condition to prevent current double preg bug */
return false;
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index ca6a44655a6a8036b602a1fbaa57ec2798ad1cad..9430be37d6352bf1351f3a1ef230be42532b672c 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -74,9 +74,9 @@ window.WombImpregnate = function(actor, fCount, fatherID, age) {
tf = {}; //new Object
tf.age = age; //initial age
tf.fatherID = fatherID; //We can store who is father too.
- tf.sex = Math.round(Math.random())+1; // 1 = male, 2 = female. For possible future usage, just as concept now.
tf.volume = 1; //Initial, to create property. Updated with actual data after WombGetVolume call.
tf.identical = 0; //Initial, to create property. Updated with actual data during fetalSplit call.
+ tf.genetics = generateGenetics(actor.ID, fatherID, i+1); //Stored genetic information.
try {
if (actor.womb.length == 0) {
@@ -248,6 +248,9 @@ window.WombNormalizePreg = function(actor)
actor.pregType = actor.womb.length;
actor.pregSource = actor.womb[0].fatherID;
+
+ if (actor.womb[0])
+
} else if (actor.womb.length == 0 && actor.broodmother < 1) {
//not broodmother
// console.log("preg fixing");
@@ -295,9 +298,9 @@ window.fetalSplit = function(actor) {
var nft = {};
nft.age = actor.preg;
nft.fatherID = actor.pregSource;
- nft.sex = Math.round(Math.random())+1;
nft.volume = 1;
nft.identical = 0;
+ nft.genetics = 0;
actor.womb.forEach(function(s){
if ((jsRandom(1,1000) >= 1000) && s.identical !== 1)
@@ -305,8 +308,8 @@ window.fetalSplit = function(actor) {
nft = {};
nft.age = s.age;
nft.fatherID = s.fatherID;
- nft.sex = s.sex;
nft.volume = s.volume;
+ nft.genetics = deepCopy(s.genetics);
actor.womb.push(nft);
s.identical = 1;
}
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index f0d2d761d428c07bdfdf307efbe6b0c7db7e3404..80fc05e9f3109e5c388bfcbb870db69ae6436761 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -54,6 +54,12 @@
<<set WombImpregnate($PC, $PC.pregType, $PC.pregSource, $PC.preg)>>
<</if>>
<</if>>
+ <<if $PC.career == "servant">>
+ <<set $PC.geneticQuirks.fertility = 2>>
+ <</if>>
+ <<if $PC.dick == 1>>
+ <<set $PC.geneticQuirks.wellHung = 2>>
+ <</if>>
<<set $PC.ovaryAge = $PC.physicalAge>>
<<else>> /*testtest*/
<<set $PC.sisters = 0>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index efdc7c69a2411309b8b08339b956dac0fcfbf74e..7a275800db1f516940412244fb7f2130fc281b6a 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"}>>
+ <<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 WombInit($PC)>>
@@ -95,7 +95,7 @@
<<set $args[0].genetics = {}>>
<</if>>
<<if ndef $args[0].geneticQuirks>>
- <<set $args[0].geneticQuirks = {macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, androgyny: 0}>>
+ <<set $args[0].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}>>
<</if>>
<<if ndef $args[0].geneMods>>
<<set $args[0].geneMods = {NCS: 0, rapidCellGrowth: 0}>>
@@ -107,6 +107,9 @@
<<if ndef $args[0].wombImplant>>
<<set $args[0].wombImplant = "none">>
<</if>>
+<<if def $args[0].superfetation>>
+ <<unset $args[0].superfetation>>
+<</if>>
<</widget>>