From 54c2b0fc7600035588df0cdea3cc04dbdba4a69d Mon Sep 17 00:00:00 2001
From: Transhumanist01 <13112-Transhumanist01@users.noreply.gitgud.io>
Date: Sat, 23 May 2020 07:11:09 -0700
Subject: [PATCH] Update generateGenetics.js
---
src/js/generateGenetics.js | 61 ++++++--------------------------------
1 file changed, 9 insertions(+), 52 deletions(-)
diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js
index a4876875a96..1a9bdaf1265 100644
--- a/src/js/generateGenetics.js
+++ b/src/js/generateGenetics.js
@@ -98,31 +98,14 @@ globalThis.generateGenetics = (function() {
genes.father = setFatherID(actor2);
genes.fatherName = setFatherName(father, activeFather, actor2);
genes.nationality = setNationality(father, mother);
- if (activeFather.advancedGeneticModification.dominantGenetics > 0 && activeMother.advancedGeneticModification.dominantGenetics === 0) {
- genes.geneticQuirks = activeFather.geneticQuirks;
- genes.skin = father.skin;
- genes.race = father.race;
- genes.intelligence = setIntelligence(father, actor2);
- genes.face = setFace(father, actor2, genes.geneticQuirks);
- genes.eyeColor = father.eyeColor(father, actor2);
- genes.hColor = father.hColor;
- } else if (activeMother.advancedGeneticModification.dominantGenetics > 0 && activeFather.advancedGeneticModification.dominantGenetics === 0) {
- genes.geneticQuirks = activeMother.geneticQuirks;
- genes.skin = mother.skin;
- genes.race = mother.race;
- genes.intelligence = setIntelligence(mother, actor2);
- genes.face = setFace(mother, actor2, genes.geneticQuirks);
- genes.eyeColor = mother.eyeColor(father, actor2);
- genes.hColor = mother.hColor;
- } else {
- 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);
+ genes.hColor = setHColor(father, mother, actor2);
}
if (genes.geneticQuirks.heterochromia === 2) {
genes.geneticQuirks.heterochromia = setHeterochromaticEyeColor(father, mother, actor2);
@@ -1078,33 +1061,7 @@ globalThis.generateGenetics = (function() {
advancedGeneticModification.breedingFreak = 0;
}
}
-
- // metabolism
- if (mother.advancedGeneticModification.efficientMetabolism === 1 || father.advancedGeneticModification.efficientMetabolism === 1 ) {
- advancedGeneticModification.breedingFreak = 1;
- }
-
- // dominant genetics
- if (mother.advancedGeneticModification.dominantGenetics === 1 || father.advancedGeneticModification.dominantGenetics === 1 ) {
- advancedGeneticModification.breedingFreak = 1;
- }
-
- // cardio
- if (mother.overhauledCardiovascularSystem === 1 || overhauledCardiovascularSystem === 1 ) {
- advancedGeneticModification.breedingFreak = 1;
- }
-
-
- // immortality
- if (mother.advancedGeneticModification.immortality === 1 || father.advancedGeneticModification.immortality === 1 ) {
- advancedGeneticModification.breedingFreak = 1;
- }
-
- // herm
- if (mother.advancedGeneticModification.trueHermaphroditism === 1 || father.advancedGeneticModification.trueHermaphroditism === 1 ) {
- advancedGeneticModification.breedingFreak = 1;
- }
-
+
return clone(quirks);
}
--
GitLab