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

Superfetation still should respect infertility and contraceptives

See merge request !4583

src/js/pregJS.js

@@ -121,7 +121,7 @@ window.setPregType = function(actor) {
 				}
 			}
 			ovum = Math.clamp(ovum, 0, 8);
-		} else if (actor.pregType === 0 || actor.geneticQuirks.superfetation > 1) {
+		} else if (actor.pregType === 0 || (actor.geneticQuirks.superfetation > 1 && actor.pregType >= 0)) {
 			if (actor.eggType === "horse" || actor.eggType === "cow") {
 				if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
 					ovum += jsEither([0, 0, 0, 0, 0, 0, 1]);