From 8f918327807d0f3ab64609f36933d22af0236f49 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 14 Nov 2018 16:16:02 -0500
Subject: [PATCH] fix to generateGenetics.tw
---
src/js/generateGenetics.tw | 9 ++++++---
src/pregmod/sePlayerBirth.tw | 13 +++----------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 50d6be2670f..022dc612591 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -8,7 +8,7 @@ window.generateGenetics = (function() {
let activeMother;
let father;
let activeFather;
- let V
+ let V;
function generateGenetics(actor1, actor2, x) {
V = State.variables;
@@ -41,6 +41,8 @@ window.generateGenetics = (function() {
genes.sexualFlaw = setSexualFlaw(father, mother);
genes.behavioralFlaw = setBehavioralFlaw(father, mother);
genes.fetish = setFetish(father, mother);
+
+ return genes;
}
// gender
@@ -446,6 +448,7 @@ window.generateGenetics = (function() {
return Math.clamp(face, -100, 100);
}
- return genes;
+ return generateGenetics;
-})();
\ No newline at end of file
+})();
+
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 96342a4de1a..b0fe7e08e26 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -426,12 +426,8 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if _curBabies == 1>>
- <<if $PC.pregSource < 1 && $PC.pregSource != -1 && $PC.reservedChildren > 0>>
- <<set $missingParent = $missingParentID>>
- <<set $missingParentID-->>
- <</if>>
-
- <<include "Generate Child">>
+ $PC.curBabies[0]
+ <<set $activeSlave = applyGenetics($PC, $PC.curBabies[0])
<<if $activeSlave.race == $PC.race>>
<<set _PCDegree++>>
@@ -476,10 +472,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<elseif _curBabies > 1>>
<<set _identicalChildGen = 0, _shiftDegree = 0>>
- <<if $PC.pregSource < 1 && $PC.pregSource != -1 && $PC.reservedChildren > 0>>
- <<set $missingParent = $missingParentID>>
- <<set $missingParentID-->>
- <</if>>
+
<<for _p = 0; _p < _curBabies; _p++>>
<<if _identicalChildGen == 0>>
<<if _p == $PC.curBabies.length-1 && $PC.curBabies.length > 1 && $PC.curBabies[_p].identical == 1>> /* catch for improperly placed identical twin flag to still generate*/
--
GitLab