From 064c0965410040036a356531ba375ba4536e7c85 Mon Sep 17 00:00:00 2001
From: hexall90 <hexall90@gmail.com>
Date: Mon, 11 Sep 2017 17:24:08 +0200
Subject: [PATCH] Cosmetic changes to passage formatting to avoid blank lines

---
 src/pregmod/incubator.tw                    | 34 ++++++++++-----------
 src/pregmod/incubatorReport.tw              |  1 +
 src/uncategorized/BackwardsCompatibility.tw |  9 ++++++
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index e7914ba3afa..dba3650d41d 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -186,6 +186,13 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 	There are no systems in place to control a growing child's musculature; they will likely come out frail and weak from rapidly growing. [[Upgrade the growth tanks with muscle monitoring systems|Incubator][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $incubatorUpgradeMuscles = 1]] //Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
 <</if>>
 
+<br>
+<<if $incubatorUpgradeReproduction == 1>>
+	Advanced monitoring and hormone injection systems have been installed in the tanks to influence a developing child's reproductive organs.
+<<else>>
+	There are no systems in place to control a growing child's reproductive capability. [[Upgrade the growth tanks with hormone monitoring systems|Incubator][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $incubatorUpgradeReproduction = 1]] //Costs ¤<<print Math.trunc(50000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
+<</if>>
+
 <br>
 <<if $incubatorUpgradeGrowthStims == 1>>
 	Advanced monitoring and stimulants injection systems have been installed in the tanks to monitor and maintain a developing child's height.
@@ -195,13 +202,6 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 	There are no systems in place to control a growing child's height and the medical facilities lack the capability to fabricate growth stimulants.
 <</if>>
 
-<br>
-<<if $incubatorUpgradeReproduction == 1>>
-	Advanced monitoring and hormone injection systems have been installed in the tanks to influence a developing child's reproductive organs.
-<<else>>
-	There are no systems in place to control a growing child's reproductive capability. [[Upgrade the growth tanks with hormone monitoring systems|Incubator][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $incubatorUpgradeReproduction = 1]] //Costs ¤<<print Math.trunc(50000*$upgradeMultiplierArcology)>> and will increase upkeep costs//
-<</if>>
-
 <<if $incubatorSlaves > 0>>
 <<for $i = 0; $i < $incubatorSlaves; $i++>>
 		<<if $tanks[$i].growTime <= 0>>
@@ -275,16 +275,6 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 	<</if>>
 <</if>>
 <br>
-<<if $incubatorUpgradeGrowthStims == 1>>
-	<<if $incubatorGrowthStimsSetting == 2>>
-		She is injected with higher than reccomended amounts of stimulants; exceeding expected final height is likely. [[Limit|Incubator][$incubatorGrowthStimsSetting = 1]] | [[Disable|Incubator][$incubatorGrowthStimsSetting = 0]]
-	<<elseif $incubatorGrowthStimsSetting == 1>>
-		She is injected with the reccomended amounts of stimulants; she will grow to her full expected height. [[Overload|Incubator][$incubatorGrowthStimsSetting = 2]] | [[Disable|Incubator][$incubatorGrowthStimsSetting = 0]]
-	<<elseif $incubatorGrowthStimsSetting == 0>>
-		Growth stimulants injection systems are offline; she will develop normally. [[Activate|Incubator][$incubatorGrowthStimsSetting = 1]]
-	<</if>>
-<</if>>
-<br>
 <<if $incubatorUpgradeReproduction == 1>>
 	<<if $incubatorReproductionSetting == 2>>
 		Hormone levels are purposefully set higher than recommended; over-active reproductive systems likely. [[Limit|Incubator][$incubatorReproductionSetting = 1]] | [[Disable|Incubator][$incubatorReproductionSetting = 0]]
@@ -294,6 +284,16 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 		Reproduction management systems are offline; children will undergo normal puberty. [[Activate|Incubator][$incubatorReproductionSetting = 1]]
 	<</if>>
 <</if>>
+<br>
+<<if $incubatorUpgradeGrowthStims == 1>>
+	<<if $incubatorGrowthStimsSetting == 2>>
+		She is injected with higher than reccomended amounts of stimulants; exceeding expected final height is likely. [[Limit|Incubator][$incubatorGrowthStimsSetting = 1]] | [[Disable|Incubator][$incubatorGrowthStimsSetting = 0]]
+	<<elseif $incubatorGrowthStimsSetting == 1>>
+		She is injected with the reccomended amounts of stimulants; she will grow to her full expected height. [[Overload|Incubator][$incubatorGrowthStimsSetting = 2]] | [[Disable|Incubator][$incubatorGrowthStimsSetting = 0]]
+	<<elseif $incubatorGrowthStimsSetting == 0>>
+		Growth stimulants injection systems are offline; she will develop normally. [[Activate|Incubator][$incubatorGrowthStimsSetting = 1]]
+	<</if>>
+<</if>>
 
 <<if $readySlaves == 1>>
 	<<for $i = 0; $i < $incubatorSlaves; $i++>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index fef2039c4e6..1a7ec47012d 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -205,6 +205,7 @@
 		<</if>>
 		<<set $tanks[_inc].height = Math.clamp($tanks[_inc].height, 0, _heightLimit)>>
 	<<else>>
+		<br>
 		With the stimulants injections offline, her body is left to develop naturally.
 	<</if>>
 	
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c21cc144a20..1b2166e578b 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -439,6 +439,9 @@
 <<if ndef $incubatorUpgradeReproduction>>
 	<<set $incubatorUpgradeReproduction = 0>>
 <</if>>
+<<if ndef $incubatorUpgradeGrowthStims>>
+	<<set $incubatorUpgradeGrowthStims = 0>>
+<</if>>
 <<if ndef $incubatorWeightSetting>>
 	<<set $incubatorWeightSetting = 0>>
 <</if>>
@@ -448,6 +451,9 @@
 <<if ndef $incubatorReproductionSetting>>
 	<<set $incubatorReproductionSetting = 0>>
 <</if>>
+<<if ndef $incubatorGrowthStimsSetting>>
+	<<set $incubatorGrowthStimsSetting = 0>>
+<</if>>
 <<if ndef $incubatorName>>
 	<<set $incubatorName = "the Incubator">>
 <</if>>
@@ -1667,6 +1673,9 @@ Setting missing global variables:
 <<if ndef $dispensaryUpgrade>>
 	<<set $dispensaryUpgrade = 0>>
 <</if>>
+<<if ndef $growthStim>>
+	<<set $growthStim = 0>>
+<</if>>
 <<if ndef $ImplantProductionUpgrade>>
 	<<set $ImplantProductionUpgrade = 0>>
 <</if>>
-- 
GitLab