From e0798c43482fb806967b4ea3079c58cbb2d91524 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Thu, 13 Sep 2018 11:39:14 -0700
Subject: [PATCH] Reverted to messier style

---
 src/pregmod/farmyard.tw | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/pregmod/farmyard.tw b/src/pregmod/farmyard.tw
index 8eb797fd2ab..3973e7f58d6 100644
--- a/src/pregmod/farmyard.tw
+++ b/src/pregmod/farmyard.tw
@@ -41,36 +41,36 @@ $farmyardNameCaps is not dissimilar to a warehouse in its basic size and form, b
 <br><br>
 
 <<if $farmyardUpgrade == 0>>
-	[[Upgrade the water pump|Farmyard][$cash -= Math.trunc(1000*$upgradeMultiplierArcology),$farmyardUpgrade += 1,$farmyardUpgradeList.push("The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces.")]]
+	[[Upgrade the water pump|Farmyard][$cash -= Math.trunc(1000*$upgradeMultiplierArcology),$farmyardUpgrade += 1]]
 	//Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and slightly increases crop yield.//
 	<br>
 <<elseif $farmyardUpgrade == 1>>
-	[[Use a higher-quality fertilizer|Farmyard][$cash -= Math.trunc(2000*$upgradeMultiplierArcology),$farmyardUpgrade += 1,$farmyardUpgradeList.push("$farmyardNameCaps is using a higher-quality fertilizer, increasing the amount of crops it produces.")]]
+	[[Use a higher-quality fertilizer|Farmyard][$cash -= Math.trunc(2000*$upgradeMultiplierArcology),$farmyardUpgrade += 1]]
 	//Costs <<print cashFormat(Math.trunc(2000*$upgradeMultiplierArcology))>> and slightly increases upkeep costs and crop yield.//
-	<br>
-	<<print $farmyardUpgradeList>>
+	<br>	
+	The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces.
 <<elseif $farmyardUpgrade == 2>>
-	[[Purchase a hydroponics system|Farmyard][$cash -= Math.trunc(5000*$upgradeMultiplierArcology),$farmyardUpgrade += 1,$farmyardUpgradeList.push("$farmyardNameCaps is outfitted with an advanced hydroponics system, slightly reducing the amount of water your crops consume.")]]
+	[[Purchase a hydroponics system|Farmyard][$cash -= Math.trunc(5000*$upgradeMultiplierArcology),$farmyardUpgrade += 1]]
 	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and slightly decreases upkeep costs.//
 	<br>
-	<<print $farmyardUpgradeList>>
+	The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces. $farmyardNameCaps is using a higher-quality fertilizer, increasing the amount of crops it produces.
 <<elseif $farmyardUpgrade == 3>>
-	[[Upgrade the machinery to increase the yield of crops|Farmyard][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $farmyardUpgrade += 1,$farmyardUpgradeList.push("The machinery in $farmyardName has been upgraded, and is more efficient.")]]
+	[[Upgrade the machinery to increase the yield of crops|Farmyard][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $farmyardUpgrade += 1]]
 	//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>> and moderately decreases upkeep costs.//
 	<br>
-	<<print $farmyardUpgradeList>>
+	The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces. $farmyardNameCaps is using a higher-quality fertilizer, increasing the amount of crops it produces. $farmyardNameCaps is outfitted with an advanced hydroponics system, slightly reducing the amount of water your crops consume.
 <<elseif $farmyardUpgrade == 4>>
-	[[Purchase genetically modified seeds|Farmyard][$cash -= Math.trunc(20000*$upgradeMultiplierArcology),$farmyardUpgrade += 1,$farmyardUpgradeList.push("$farmyardNameCaps is using genetically modified seeds, moderately increasing the amount of crops it produces.")]]
+	[[Purchase genetically modified seeds|Farmyard][$cash -= Math.trunc(20000*$upgradeMultiplierArcology),$farmyardUpgrade += 1]]
 	//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>> and moderately increases crop yield.//
 	<br>
-	<<print $farmyardUpgradeList>>
+	The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces. $farmyardNameCaps is using a higher-quality fertilizer, increasing the amount of crops it produces. $farmyardNameCaps is outfitted with an advanced hydroponics system, slightly reducing the amount of water your crops consume. The machinery in $farmyardName has been upgraded, and is more efficient.
 <<elseif $farmyardUpgrade == 5>>
-	[[Purchase an R&D lab to experiment on different plant types|Farmyard][$cash -= Math.trunc(50000*$upgradeMultiplierArcology),$farmyardUpgrade += 1,$farmyardLab = 1,$farmyardUpgradeList.push("A high-tech metal door, complete with retinal and fingerprint scanners, stands at the far end of $farmyardName.")]]
+	[[Purchase an R&D lab to experiment on different plant types|Farmyard][$cash -= Math.trunc(50000*$upgradeMultiplierArcology),$farmyardUpgrade = 6,$farmyardLab = 1]]
 	//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>> and unlocks the Research Lab.//
 	<br>
-	<<print $farmyardUpgradeList>>
+	The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces. $farmyardNameCaps is using a higher-quality fertilizer, increasing the amount of crops it produces. $farmyardNameCaps is outfitted with an advanced hydroponics system, slightly reducing the amount of water your crops consume. The machinery in $farmyardName has been upgraded, and is more efficient. $farmyardNameCaps is using genetically modified seeds, moderately increasing the amount of crops it produces.
 <<elseif $farmyardUpgrade == 6>>
-	<<print $farmyardUpgradeList>>
+	The water pump in $farmyardName is a more efficient model, slightly improving the amount of crops $farmyardName produces. $farmyardNameCaps is using a higher-quality fertilizer, increasing the amount of crops it produces. $farmyardNameCaps is outfitted with an advanced hydroponics system, slightly reducing the amount of water your crops consume. The machinery in $farmyardName has been upgraded, and is more efficient. $farmyardNameCaps is using genetically modified seeds, moderately increasing the amount of crops it produces. A high-tech metal door, complete with retinal and fingerprint scanners, stands at the far end of $farmyardName.
 <</if>>
 
 <<if $seeBestiality == 1>>
@@ -107,13 +107,13 @@ $farmyardNameCaps is not dissimilar to a warehouse in its basic size and form, b
 
 <<if $farmyardLab == 1>>
 	<br><br>
-	A <<link "research and development lab">><</link>> has been built at one end of $farmyardName. @@.red;ALPHA CONTENT!@@
+	A <<link "research and development lab" "FarmyardLab">><</link>> has been built at one end of $farmyardName. @@.red;ALPHA CONTENT!@@
 <</if>>
 
 <br><br>
 
 <<link "Decommission $farmyardName and return this sector to manufacturing">>
-	<<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardUpgrade = 0, $farmyardUpgradeList = [], $farmyardLab = 0, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0>>
+	<<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardUpgrade = 0, $farmyardUpgradeList = [], $farmyardLab = 0, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0>>
 	<<for _i = 0; _i < $sectors.length; _i++>>
 		<<if $sectors[_i].type == "Farmyard">><<set $sectors[_i].type = "Manufacturing">><<break>><</if>>
 	<</for>>
-- 
GitLab