Skip to content
Snippets Groups Projects
Commit bec14f34 authored by pregmodfan's avatar pregmodfan
Browse files

Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod...

Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod into pregmod-newcontent1_0-fixes
parents 4729ad8b 62d75dde
Branches
Tags
2 merge requests!3002Pregmod v1032 initial merge,!2939Pregmod newcontent1 0 fixes
...@@ -8,7 +8,7 @@ window.generateGenetics = (function() { ...@@ -8,7 +8,7 @@ window.generateGenetics = (function() {
let activeMother; let activeMother;
let father; let father;
let activeFather; let activeFather;
let V let V;
function generateGenetics(actor1, actor2, x) { function generateGenetics(actor1, actor2, x) {
V = State.variables; V = State.variables;
...@@ -41,6 +41,8 @@ window.generateGenetics = (function() { ...@@ -41,6 +41,8 @@ window.generateGenetics = (function() {
genes.sexualFlaw = setSexualFlaw(father, mother); genes.sexualFlaw = setSexualFlaw(father, mother);
genes.behavioralFlaw = setBehavioralFlaw(father, mother); genes.behavioralFlaw = setBehavioralFlaw(father, mother);
genes.fetish = setFetish(father, mother); genes.fetish = setFetish(father, mother);
return genes;
} }
// gender // gender
...@@ -446,6 +448,7 @@ window.generateGenetics = (function() { ...@@ -446,6 +448,7 @@ window.generateGenetics = (function() {
return Math.clamp(face, -100, 100); return Math.clamp(face, -100, 100);
} }
return genes; return generateGenetics;
})(); })();
\ No newline at end of file
...@@ -426,12 +426,8 @@ You arrange yourself to give birth, relaxing until your body urges you to begin ...@@ -426,12 +426,8 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<if _curBabies == 1>> <<if _curBabies == 1>>
<<if $PC.pregSource < 1 && $PC.pregSource != -1 && $PC.reservedChildren > 0>> $PC.curBabies[0]
<<set $missingParent = $missingParentID>> <<set $activeSlave = applyGenetics($PC, $PC.curBabies[0])
<<set $missingParentID-->>
<</if>>
<<include "Generate Child">>
<<if $activeSlave.race == $PC.race>> <<if $activeSlave.race == $PC.race>>
<<set _PCDegree++>> <<set _PCDegree++>>
...@@ -476,10 +472,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin ...@@ -476,10 +472,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
<<elseif _curBabies > 1>> <<elseif _curBabies > 1>>
<<set _identicalChildGen = 0, _shiftDegree = 0>> <<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++>> <<for _p = 0; _p < _curBabies; _p++>>
<<if _identicalChildGen == 0>> <<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*/ <<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*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment