Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dabranch

devNotes/twine JS.txt

@@ -2555,7 +2555,7 @@ window.getSlaveCost = function(s) {
 			cost -= foodCost;
 			break;
 	}
-	if(s.geneticQuirks.fertility == 2 && s.geneticQuirks.hyperFertility == 2) {
+	if(s.geneticQuirks.fertility == 2 && s.geneticQuirks.hyperFertility == 2 && s.preg == 0 && (s.ovaries == 1 || s.mpreg == 1)) {
 		cost += foodCost * .5;
 	}
 	if(s.weight > 130) {
@@ -11535,7 +11535,7 @@ window.WombInit = function(actor) {
 	}
 	//backward compatibility setup. Fully accurate for normal pregnancy only.
-	if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
+	if (actor.womb.length > 0 && actor.womb[0].genetics == undefined && actor.eggType == "human") {
 		var i=0
 		actor.womb.forEach(function(ft){
 			ft.genetics = generateGenetics(actor, actor.pregSource, i);
@@ -11576,10 +11576,14 @@ window.WombImpregnate = function(actor, fCount, fatherID, age, surrogate) {
 		tf.splitted = 0; //marker for already splitted fetus.
 		if (surrogate) {
 			tf.motherID = surrogate.ID; //Initial biological mother ID setup.
-			tf.genetics = generateGenetics(surrogate, fatherID, i+1); //Stored genetic information.
+			if(actor.eggType == "human"){
+				tf.genetics = generateGenetics(surrogate, fatherID, i+1); //Stored genetic information.
+			}
 		} else {
 			tf.motherID = actor.ID; //Initial biological mother ID setup.
-			tf.genetics = generateGenetics(actor, fatherID, i+1); //Stored genetic information.
+			if(actor.eggType == "human"){
+				tf.genetics = generateGenetics(actor, fatherID, i+1); //Stored genetic information.
+			}
 		}
 		tf.ID = generateNewID();

slave variables documentation - Pregmod.txt

@@ -1765,6 +1765,7 @@ pregSource:
 
 accepts ID See Pregnancy Control section for more.
 Who sired her pregnancy
+-8 - an animal
 -7 - designer baby
 -2 - Citizen of your arcology
 -1 - You

src/js/economyJS.tw

@@ -452,7 +452,7 @@ window.getSlaveCost = function(s) {
 			cost -= foodCost;
 			break;
 	}
-	if(s.geneticQuirks.fertility == 2 && s.geneticQuirks.hyperFertility == 2) {
+	if(s.geneticQuirks.fertility == 2 && s.geneticQuirks.hyperFertility == 2 && s.preg == 0 && (s.ovaries == 1 || s.mpreg == 1)) {
 		cost += foodCost * .5;
 	}
 	if(s.weight > 130) {

src/js/wombJS.tw

@@ -52,7 +52,7 @@ window.WombInit = function(actor) {
 	}
 
 	//backward compatibility setup. Fully accurate for normal pregnancy only.
-	if (actor.womb.length > 0 && actor.womb[0].genetics == undefined) {
+	if (actor.womb.length > 0 && actor.womb[0].genetics == undefined && actor.eggType == "human") {
 		var i=0
 		actor.womb.forEach(function(ft){
 			ft.genetics = generateGenetics(actor, actor.pregSource, i);
@@ -93,10 +93,14 @@ window.WombImpregnate = function(actor, fCount, fatherID, age, surrogate) {
 		tf.splitted = 0; //marker for already splitted fetus.
 		if (surrogate) {
 			tf.motherID = surrogate.ID; //Initial biological mother ID setup.
-			tf.genetics = generateGenetics(surrogate, fatherID, i+1); //Stored genetic information.
+			if(actor.eggType == "human"){
+				tf.genetics = generateGenetics(surrogate, fatherID, i+1); //Stored genetic information.
+			}
 		} else {
 			tf.motherID = actor.ID; //Initial biological mother ID setup.
-			tf.genetics = generateGenetics(actor, fatherID, i+1); //Stored genetic information.
+			if(actor.eggType == "human"){
+				tf.genetics = generateGenetics(actor, fatherID, i+1); //Stored genetic information.
+			}
 		}
 		tf.ID = generateNewID();
 

src/pregmod/geneLab.tw

@@ -14,7 +14,7 @@ Genetic Modification
 <hr>
 
 <<if $dispensaryUpgrade == 0>>
-	//The fabricator must upgraded before it can produce treatments to alter genes//
+	//The fabricator must be upgraded before it can produce treatments to alter genes//
 	<br>
 <<else>>
 	The fabricator is capable of producing treatments to alter a slave's genetic code.

src/uncategorized/costsReport.tw

@@ -524,6 +524,15 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
 			<<set _individualCosts -= $foodCost>>
 		<</if>>
 	<</if>>
+	<<if ($slaves[$i].geneticQuirks.fertility == 2 && $slaves[$i].geneticQuirks.hyperFertility == 2 && $slaves[$i].preg == 0 && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1))>>
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;
+		<<if $geneticMappingUpgrade == 1>>
+			<i>Additional dietary supplements due to genetic hyper-fertility:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@
+		<<else>>
+			<i>Adjustment for unusual deitary deficiencies:</i> @@.yellowgreen;<<print cashFormat($foodCost/2)>>@@
+		<</if>>
+		<<set _individualCosts += $foodCost/2>>
+	<</if>>
 	<<if $slaves[$i].drugs == "appetite suppressors">>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;<i>Food saved via suppressed appetite:</i> //reduced by// @@.yellowgreen;<<print cashFormat($foodCost)>>@@
 		<<set _individualCosts -= $foodCost>>

src/utility/descriptionWidgets.tw

@@ -255,6 +255,34 @@
 
 <</widget>>
 
+<<widget "geneticQuirkAssessment">>
+
+<<if $geneticMappingUpgrade == 1>>
+	<<if $activeSlave.geneticQuirks.fertility == 2 && $activeSlave.geneticQuirks.hyperFertility == 2>>
+		$He has a unique genetic condition resulting in inhumanly high
+		<<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>>
+			fertility; risky intercourse will result in multiple pregnancy.
+		<<else>>
+			fertility.
+		<</if>>
+	<<elseif $activeSlave.geneticQuirks.hyperFertility == 2>>
+		$He prone to extreme
+		<<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>>
+			fertility and will likely undergo multiple pregnancy.
+		<<else>>
+			fertility.
+		<</if>>
+	<<elseif $activeSlave.geneticQuirks.fertility == 2>>
+		$He is naturally 
+		<<if $activeSlave.ovaries == 1 || $activeSlave.mpreg == 1>>
+			fertile and prone to having twins.
+		<<else>>
+			fertile.
+		<</if>>
+	<</if>>
+<</if>>
+
+<</widget>>
 
 <<widget "brandDescription">>