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

Added missing ) and fiddled with NG+ compatibility

See merge request pregmodfan/fc-pregmod!3401

src/init/storyInit.tw

@@ -100,6 +100,20 @@ You should have received a copy of the GNU General Public License along with thi
 				<<if $slaves[_k].womb[_sInit].fatherID > 0>>
 					<<set $slaves[_k].womb[_sInit].fatherID += 1200000>>
 				<</if>>
+				<<if $slaves[_k].womb[_sInit].genetics.father > 0>>
+					<<set $slaves[_k].womb[_sInit].genetics.father += 1200000>>
+				<<elseif $freshPC == 1 && $slaves[_k].womb[_sInit].genetics.father == -1>>
+					<<set $slaves[_k].womb[_sInit].genetics.father = -12000000>>
+				<<elseif $slaves[_k].womb[_sInit].genetics.father < -1>>
+					<<set $slaves[_k].womb[_sInit].genetics.father -= 1200000>>
+				<</if>>
+				<<if $slaves[_k].womb[_sInit].genetics.mother > 0>>
+					<<set $slaves[_k].womb[_sInit].genetics.mother += 1200000>>
+				<<elseif $freshPC == 1 && $slaves[_k].womb[_sInit].genetics.mother == -1>>
+					<<set $slaves[_k].womb[_sInit].genetics.mother = -12000000>>
+				<<elseif $slaves[_k].womb[_sInit].genetics.mother < -1>>
+					<<set $slaves[_k].womb[_sInit].genetics.mother -= 1200000>>
+				<</if>>
 			<</for>>
 		<</if>>
 		<<if $slaves[_k].cloneID != 0>>

src/uncategorized/costsBudget.tw

@@ -752,7 +752,7 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
 				<td><i>[[Research Lab][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] ($researchLab.menials menial slaves)</i></td>
 				<td></td>
 				<td><i>@@.red;-+<<print cashFormat(Math.trunc(100*$researchLab.menials))>>@@</i></td>
-				<td><i>@@.red;-<<print cashFormat(Math.abs(Math.trunc(100*$researchLab.menials))>>@@</i></td>
+				<td><i>@@.red;-<<print cashFormat(Math.abs(Math.trunc(100*$researchLab.menials)))>>@@</i></td>
 			</tr>
 		<</if>>
 	<</if>>