From e1c2c7756efe114c500513c8de5877a16fd81658 Mon Sep 17 00:00:00 2001
From: Anony <solosenpai@protonmail.com>
Date: Fri, 17 Jan 2020 16:14:02 -0800
Subject: [PATCH] Remove organ farm upgrades to top section for consistency

---
 src/pregmod/organFarm.tw | 100 +++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw
index 2e5cc1e60f2..52e1290ba53 100644
--- a/src/pregmod/organFarm.tw
+++ b/src/pregmod/organFarm.tw
@@ -44,6 +44,56 @@ The Organ Farm
 	<br>
 <</if>>
 
+<<if ($youngerOvaries != 1) && ($rep <= 10000*_PCSkillCheck)>>
+	//You lack the reputation to access designs for cloning fertile ovaries for menopausal slaves.//
+	<br>
+<<elseif ($youngerOvaries != 1) && ($rep > 10000*_PCSkillCheck)>>
+	[[Purchase designs for cloning fertile ovaries for menopausal slaves|Organ Farm][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $youngerOvaries = 1]]
+	//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the growth of younger, fertile ovaries for menopausal slaves. Restored fertility will only last for a couple years at most.//
+	<br>
+<<elseif ($youngerOvaries > 0)>>
+	The organ farm is capable of growing fertile ovaries for postmenopausal slaves.
+	<br>
+<</if>>
+
+<<if $asexualReproduction == 1>>
+	The organ farm is capable of growing modified ovary pairs capable of self-fertilization.
+	<br>
+<</if>>
+
+<<if $seePreg != 0 && $seeBestiality == 1 && $cheatMode == 1>>
+	<<if $farmyardLabUpgrades.animalOvaries > 0>>
+		<<if $animalOvaries < 1>>
+			//You lack the required designs for cloning animal ovaries for slaves.//
+			<br>
+		<<else>>
+			The organ farm is capable of growing animal ovaries for slaves.
+			<br>
+		<</if>>
+	<</if>>
+
+	<<if $farmyardLabUpgrades.animalTesticles > 0>>
+		<<if $animalTesticles < 1>>
+			//You lack the required designs for cloning animal testicles for slaves.//
+			<br>
+		<<else>>
+			The organ farm is capable of growing animal testicles for slaves.
+			<br>
+		<</if>>
+	<</if>>
+
+	<<if $farmyardLabUpgrades.animalMpreg > 0 && $arcologies[0].FSGenderRadicalistResearch == 1>>
+		<<if $animalMpreg < 1>>
+			//You lack the required designs for cloning animal anal wombs and ovaries for slaves.//
+			<br>
+		<<else>>
+			The organ farm is capable of growing animal anal wombs and ovaries for slaves.
+			<br>
+		<</if>>
+	<</if>>
+<</if>>
+
 <br>
 Organ Production
 <hr>
@@ -105,56 +155,6 @@ Organ Production
 	<br>
 <</if>>
 
-<<if ($youngerOvaries != 1) && ($rep <= 10000*_PCSkillCheck)>>
-	//You lack the reputation to access designs for cloning fertile ovaries for menopausal slaves.//
-	<br>
-<<elseif ($youngerOvaries != 1) && ($rep > 10000*_PCSkillCheck)>>
-	[[Purchase designs for cloning fertile ovaries for menopausal slaves|Organ Farm][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $youngerOvaries = 1]]
-	//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the growth of younger, fertile ovaries for menopausal slaves. Restored fertility will only last for a couple years at most.//
-	<br>
-<<elseif ($youngerOvaries > 0)>>
-	The organ farm is capable of growing fertile ovaries for postmenopausal slaves.
-	<br>
-<</if>>
-
-<<if $asexualReproduction == 1>>
-	The organ farm is capable of growing modified ovary pairs capable of self-fertilization.
-	<br>
-<</if>>
-
-<<if $seePreg != 0 && $seeBestiality == 1 && $cheatMode == 1>>
-	<<if $farmyardLabUpgrades.animalOvaries > 0>>
-		<<if $animalOvaries < 1>>
-			//You lack the required designs for cloning animal ovaries for slaves.//
-			<br>
-		<<else>>
-			The organ farm is capable of growing animal ovaries for slaves.
-			<br>
-		<</if>>
-	<</if>>
-
-	<<if $farmyardLabUpgrades.animalTesticles > 0>>
-		<<if $animalTesticles < 1>>
-			//You lack the required designs for cloning animal testicles for slaves.//
-			<br>
-		<<else>>
-			The organ farm is capable of growing animal testicles for slaves.
-			<br>
-		<</if>>
-	<</if>>
-
-	<<if $farmyardLabUpgrades.animalMpreg > 0 && $arcologies[0].FSGenderRadicalistResearch == 1>>
-		<<if $animalMpreg < 1>>
-			//You lack the required designs for cloning animal anal wombs and ovaries for slaves.//
-			<br>
-		<<else>>
-			The organ farm is capable of growing animal anal wombs and ovaries for slaves.
-			<br>
-		<</if>>
-	<</if>>
-<</if>>
-
 <br>
 Future Societies Research
 <hr>
-- 
GitLab