Merge branch 'pregmod-dev' into 'pregmod-master'

corrected twineJS and fixed adam principle generation

See merge request pregmodfan/fc-pregmod!3262

src/js/generateGenetics.tw

@@ -57,7 +57,7 @@ window.generateGenetics = (function() {
 			activeFather = 0;
 		}
 
-		genes.gender = setGender(father);
+		genes.gender = setGender(father, mother);
 		genes.name = setName(x);
 		genes.mother = setMotherID(actor1.ID);
 		genes.motherName = setMotherName(activeMother);
@@ -82,14 +82,16 @@ window.generateGenetics = (function() {
 	}
 
 	// gender
-	function setGender(father) {
+	function setGender(father, mother) {
 		let gender;
 		if (V.seeDicksAffectsPregnancy == 1) {
 			gender = Math.floor(Math.random()*100) < V.seeDicks ? "XY" : "XX";
 		} else if (V.adamPrinciple == 1) {
 			if (father !== 0) {
-				if (father.genes == "XX") {
+				if (father.genes == "XX" && mother.genes == "XX") {
 					gender = "XX";
+				} else if (father.genes != mother.genes) {
+					gender = jsEither(["XX", "XY"]);
 				} else {
 					gender = jsEither(["XX", "XY", "XY", "YY"]);
 				}