From d9599ce1b46cc8d2685f8413fa3c0f536f338f41 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 22 Jan 2019 16:16:25 -0500 Subject: [PATCH] Added missing ) and fiddled with NG+ compatibility --- src/init/storyInit.tw | 14 ++++++++++++++ src/uncategorized/costsBudget.tw | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 6d4e879aab9..3b43788d1f0 100644 --- a/src/init/storyInit.tw +++ b/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>> diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw index fd8914d6b90..079dd9a3c44 100644 --- a/src/uncategorized/costsBudget.tw +++ b/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>> -- GitLab