diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js index fb4fe947965c1e466e174b0eaca32f05eb9a34ec..621991900e5eb82036a4e4070b14471b1271b71c 100644 --- a/src/js/generateGenetics.js +++ b/src/js/generateGenetics.js @@ -98,18 +98,17 @@ globalThis.generateGenetics = (function() { genes.father = setFatherID(actor2); genes.fatherName = setFatherName(father, activeFather, actor2); genes.nationality = setNationality(father, mother); - genes.geneticQuirks = setGeneticQuirks(activeFather, activeMother, genes.gender); - genes.skin = setSkin(father, mother, actor2); - genes.race = setRace(father, mother, actor2); - genes.intelligence = setIntelligence(father, mother, activeMother, actor2); - genes.face = setFace(father, mother, activeMother, actor2, genes.geneticQuirks); - genes.faceShape = setFaceShape(father, mother, genes.geneticQuirks); - genes.eyeColor = setEyeColor(father, mother, actor2); - genes.hColor = setHColor(father, mother, actor2); - } + genes.geneticQuirks = setGeneticQuirks(activeFather, activeMother, genes.gender); + genes.skin = setSkin(father, mother, actor2); + genes.race = setRace(father, mother, actor2); + genes.intelligence = setIntelligence(father, mother, activeMother, actor2); + genes.face = setFace(father, mother, activeMother, actor2, genes.geneticQuirks); + genes.faceShape = setFaceShape(father, mother, genes.geneticQuirks); + genes.eyeColor = setEyeColor(father, mother, actor2); if (genes.geneticQuirks.heterochromia === 2) { - genes.geneticQuirks.heterochromia = setHeterochromaticEyeColor(father, mother, actor2); - } + genes.geneticQuirks.heterochromia = setHeterochromaticEyeColor(father, mother, actor2); + } + genes.hColor = setHColor(father, mother, actor2); genes.underArmHStyle = setUnderArmHStyle(father, mother); genes.pubicHStyle = setPubicHStyle(father, mother); genes.markings = setMarkings(father, mother); @@ -832,10 +831,27 @@ globalThis.generateGenetics = (function() { // Uterine Hypersensitivity if (mother.geneticQuirks.uterineHypersensitivity === 2) { - if (sex === "XX") { - quirks.uterineHypersensitivity = 2; + chance = jsRandom(0, 1000); + if (father !== 0) { + if (father.geneticQuirks.uterineHypersensitivity >= 1) { + if (sex === "XX") { + quirks.uterineHypersensitivity = 2; + } else { + quirks.uterineHypersensitivity = 1; + } + } } else { - quirks.uterineHypersensitivity = 1; + if (sex === "XX") { + if (chance > 700) { + quirks.uterineHypersensitivity = 2; + } else if (chance > 500) { + quirks.uterineHypersensitivity = 1; + } + } else { + if (chance > 500) { + quirks.uterineHypersensitivity = 1; + } + } } } else if (mother.geneticQuirks.uterineHypersensitivity === 1) { chance = jsRandom(0, 1000); diff --git a/src/pregmod/saAgent.tw b/src/pregmod/saAgent.tw index 761ab20e20b8ee8f5762e452d0621806f12abddf..fbb357207b937150cdfb909aff89fd09f5cbf05a 100644 --- a/src/pregmod/saAgent.tw +++ b/src/pregmod/saAgent.tw @@ -525,16 +525,12 @@ <<if ($slaves[$i].hStyle != "shaved" && $slaves[$i].bald != 1 && $slaves[$i].haircuts == 0) && ($slaves[$i].hLength < 150)>> <<set $slaves[$i].hLength += 1>> <</if>> - -<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 1 && $slaves[$i].vagina < 4 && $slaves[$i].vagina > 0>> - <<set $slave.vagina += 1>> -<</if>> <<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 1 && $slaves[$i].vaginaLube < 2 && $slaves[$i].vagina > 0>> <<set $slave.vaginaLube += 1>> <</if>> -<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 1 && $slaves[$i].hips < 3 && random(70-$slaves[$i].physicalAge,300) < $slaves[$i].hormoneBalance>> +<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 1 && $slaves[$i].hips < 3 && random(70-$slaves[$i].physicalAge,300) < $slaves[$i].hormoneBalance && slave.physicalAge > 9 && slave.physicalAge < 20)>> <<set $slave.hips += 1>> <</if>>