From d18930f381aed2e9c078b4b8ed9616e30bc33b62 Mon Sep 17 00:00:00 2001
From: Transhumanist01 <MerbeusMorra@mail.ru>
Date: Wed, 3 Jun 2020 17:30:56 +0400
Subject: [PATCH] first fix
---
src/js/generateGenetics.js | 1 -
src/js/generateNewSlaveJS.js | 4 ++
src/js/physicalDevelopment.js | 54 ++++++++++++++++++++++++++
src/uncategorized/saLongTermEffects.tw | 14 +++----
src/utility/descriptionWidgets.tw | 6 +--
5 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index 173a776d912..fb4fe947965 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -1090,7 +1090,6 @@ globalThis.generateGenetics = (function() {
quirks.androgyny = 1;
}
}
-
return clone(quirks);
}
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index bfc69f0bd15..2195b030776 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1245,6 +1245,10 @@ globalThis.GenerateNewSlave = (function() {
if (chance >= 9900) {
slave.geneticQuirks.hyperFertility = 1;
}
+ chance = jsRandom(1, 100000);
+ if (chance < 3) {
+ slave.geneticQuirks.uterineHypersensitivity = 1;
+ }
if (chance === 777) {
slave.geneticQuirks.albinism = 2;
} else if (chance >= 19500) {
diff --git a/src/js/physicalDevelopment.js b/src/js/physicalDevelopment.js
index 029fb46fbee..a4bee9e7264 100644
--- a/src/js/physicalDevelopment.js
+++ b/src/js/physicalDevelopment.js
@@ -1969,6 +1969,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 20) {
+ slave.hips++;
+ }
+ }
}
} else if (slave.hormoneBalance >= 100) {
if (slave.physicalAge === 8) {
@@ -2037,6 +2043,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 40) {
+ slave.hips++;
+ }
+ }
}
} else if (slave.hormoneBalance <= -200) {
if (slave.physicalAge === 8) {
@@ -2063,6 +2075,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 95) {
+ slave.hips++;
+ }
+ }
}
} else if (slave.hormoneBalance <= -100) {
if (slave.physicalAge === 8) {
@@ -2089,6 +2107,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 90) {
+ slave.hips++;
+ }
+ }
}
} else {
if (slave.physicalAge === 8) {
@@ -2121,6 +2145,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 60) {
+ slave.hips++;
+ }
+ }
}
}
}
@@ -2196,6 +2226,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 20) {
+ slave.hips++;
+ }
+ }
}
} else if (slave.hormoneBalance >= 100) {
if (slave.physicalAge === 8) {
@@ -2264,6 +2300,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 40) {
+ slave.hips++;
+ }
+ }
}
} else if (slave.hormoneBalance <= -200) {
if (slave.physicalAge === 14) {
@@ -2280,6 +2322,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 95) {
+ slave.hips++;
+ }
+ }
}
} else {
if (slave.physicalAge === 14) {
@@ -2288,6 +2336,12 @@ globalThis.physicalDevelopment = (function physicalDevelopment() {
slave.hips++;
}
}
+ } else if (geneticQuirks.uterineHypersensitivity === 2) {
+ if (slave.hips < 3) {
+ if (jsRandom(1, 100) > 60) {
+ slave.hips++;
+ }
+ }
}
}
}
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 8b3ecbf7d35..92bda2dba29 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7453,18 +7453,14 @@
<<set $slaves[$i].butt += .1>>
<</if>>
-<<if $slaves[$i].advancedGeneticModification.uterineHypersensitivity == 2 && $slaves[$i].vaginaLube < 2 && $slaves[$i].vagina > 0>>
+<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2 && $slaves[$i].vaginaLube < 2 && $slaves[$i].vagina > 0>>
$His vagina begins to @@.lime;produce more sexual fluid@@ due to his genetic trait.
<<set $slave.vaginaLube += 1>>
<</if>>
-
-<<if $slaves[$i].advancedGeneticModification.uterineHypersensitivity == 2 && $slaves[$i].hips < 3 && random(70-$slaves[$i].physicalAge,300) < $slaves[$i].hormoneBalance>>
- $His genetic quirk causes &his hips to @@.lime;widen.@@
- <<set $slave.hips += 1>>
-<</if>>
<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>
<<if $slaves[$i].preg <= 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1)>>
+ <<set $slaves[$i].need = ($slaves[$i].need*2)>>
<<if $slaves[$i].fetish != "pregnancy">>
<<if $slaves[$i].fetishStrength > 60>>
$He feels a constant need to breed which @@.coral;overshadows any other fetishes $he has.@@
@@ -7495,6 +7491,7 @@
<<set $slaves[$i].fetishStrength += 1>>
<</if>>
<<elseif $slaves[$i].preg > 0 && $slaves[$i].belly <= 60000>>
+ <<set $slaves[$i].need = ($slaves[$i].need*1.5)>>
<<if $slaves[$i].fetish != "pregnancy">>
<<if $slaves[$i].fetishStrength > 60>>
Due to a heavily modified reproductive system $his huge pregnancy fills $him with pleasure and sense of accomplishment, @@.coral;distracting $him from $his fetish.@@
@@ -7508,6 +7505,7 @@
<<set $slaves[$i].fetishStrength += 2>>
<</if>>
<<elseif $slaves[$i].preg > 0 && $slaves[$i].belly <= 120000>>
+ <<set $slaves[$i].need = ($slaves[$i].need*0.9)>>
<<if $slaves[$i].fetish != "pregnancy">>
<<if $slaves[$i].fetishStrength > 60>>
Due to a heavily modified reproductive system $his enormous pregnancy fills $him with pleasure and sometimes causes small orgasms from fetal movement, @@.coral;causing $him to slowly lose interest in $his current fetish.@@
@@ -7521,6 +7519,7 @@
<<set $slaves[$i].fetishStrength += 3>>
<</if>>
<<elseif $slaves[$i].preg > 0 && $slaves[$i].belly <= 300000>>
+ <<set $slaves[$i].need = ($slaves[$i].need*0.7)>>
<<if $slaves[$i].fetish != "pregnancy">>
<<if $slaves[$i].fetishStrength > 60>>
Due to a heavily modified reproductive system $his gigantic pregnancy fills $him with pleasure and often causes small orgasms from fetal movement, @@.coral;causing $him to slowly lose interest in $his current fetish.@@
@@ -7534,7 +7533,8 @@
<<set $slaves[$i].fetishStrength += 5>>
<</if>>
<<elseif $slaves[$i].preg > 0>>
- <<if $slaves[$i].fetish != "pregnancy" && $slaves[$i].belly > 300000>>
+ <<set $slaves[$i].need = ($slaves[$i].need*0.5)>>
+ <<if $slaves[$i].fetish != "pregnancy">>
<<if $slaves[$i].fetishStrength > 60>>
Due to a heavily modified reproductive system $his hyperpregnancy fills $him with great pleasure which keeps $him in near constant orgasm from fetal movement, @@.coral;causing $him to rapidly lose interest in $his current fetish.@@
<<set $slaves[$i].fetishStrength -= 10>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 32a6d67452e..ab49e734bc3 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -134,12 +134,12 @@
<</if>>
<<if $activeSlave.geneticQuirks.uterineHypersensitivity == 2>>
<<if isFertile($activeSlave)>>
- $He is a product of genetic engineering, that makes his reproduction organs optimized for pleasurable pregnancy and birth.
+ $He posses a rare genetic trait, that makes his reproduction organs optimized for pleasurable pregnancy and birth.
<<else>>
- $He is a product of genetic engineering, that makes his reproduction organs optimized for pleasurable pregnancy and birth; not that it matters when $he can't get pregnant.
+ $He posses a rare genetic trait, that makes his reproduction organs optimized for pleasurable pregnancy and birth; not that it matters when $he can't get pregnant.
<</if>>
<<elseif $activeSlave.geneticQuirks.uterineHypersensitivity == 1 && $geneticMappingUpgrade >= 2>>
- $He is a carrier of a genetic flaw that causes uterine hypersensitivity.
+ $He is a carrier of a genetic trait that causes uterine hypersensitivity.
<</if>>
<<if $activeSlave.geneticQuirks.macromastia == 2 && $activeSlave.geneticQuirks.gigantomastia == 2>>
$He has an abnormal strain of gigantomastia and will experience constant excessive breast growth.
--
GitLab