From a38e28b6a0fd256c489069425410c630f3030549 Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Tue, 21 Jun 2022 11:02:49 -0400
Subject: [PATCH] Better farmyard gates

---
 src/endWeek/saWorkTheFarm.js                  |  4 ++-
 src/facilities/farmyard/food/saProduceFood.js |  2 +-
 .../farmyard/shows/saFarmyardShows.js         | 26 ++++++++++---------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index bc5d56aa327..b4b15afad14 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -59,7 +59,9 @@ App.SlaveAssignment.workTheFarm = function(slave) {
 			V.mods.food.total += foodAmount;
 			incomeStats.food += foodAmount;
 
-			return App.Facilities.Farmyard.produceFood(slave);
+			if (V.farmyardShows !== 2) {
+				return App.Facilities.Farmyard.produceFood(slave);
+			}
 		}
 	}
 
diff --git a/src/facilities/farmyard/food/saProduceFood.js b/src/facilities/farmyard/food/saProduceFood.js
index d5e89f19b89..26fe219c3ba 100644
--- a/src/facilities/farmyard/food/saProduceFood.js
+++ b/src/facilities/farmyard/food/saProduceFood.js
@@ -123,7 +123,7 @@ App.Facilities.Farmyard.produceFood = function(slave) {
 	}
 
 	function shows() {
-		if (V.farmyardShows > 0) {
+		if (V.farmyardShows === 1) {
 			return `Since ${he} also has to put on shows for your citizens, ${he} can only work on food production for half of ${his} shift, cutting down on the amount of food ${he} would have otherwise produced.`;
 		}
 	}
diff --git a/src/facilities/farmyard/shows/saFarmyardShows.js b/src/facilities/farmyard/shows/saFarmyardShows.js
index 46a9d47fdf5..99d5431d120 100644
--- a/src/facilities/farmyard/shows/saFarmyardShows.js
+++ b/src/facilities/farmyard/shows/saFarmyardShows.js
@@ -385,18 +385,20 @@ App.Facilities.Farmyard.putOnShows = function(slave) {
 	}
 
 	function energy() {
-		if (slave.energy > 95) {
-			return `The fact that ${he} is a nymphomaniac helps ${him} to go for longer, allowing ${him} to really put on an amazing show.`;
-		} else if (slave.energy > 80) {
-			return `The fact that ${his} sex drive is so powerful helps ${him} to really put on good shows.`;
-		} else if (slave.energy > 60) {
-			return `The fact that ${his} sex drive is so good helps ${him} to put on good shows.`;
-		} else if (slave.energy > 40) {
-			return `${His} average sex drive allows ${him} to put on a decent show.`;
-		} else if (slave.energy > 20) {
-			return `The fact that ${his} sex drive is so poor affects ${his} performance.`;
-		} else {
-			return `The fact that ${his} sex drive is nonexistent really hinders ${his} ability to put on a decent show.`;
+		if (V.seeBestiality) {
+			if (slave.energy > 95) {
+				return `The fact that ${he} is a nymphomaniac helps ${him} to go for longer, allowing ${him} to really put on an amazing show.`;
+			} else if (slave.energy > 80) {
+				return `The fact that ${his} sex drive is so powerful helps ${him} to really put on good shows.`;
+			} else if (slave.energy > 60) {
+				return `The fact that ${his} sex drive is so good helps ${him} to put on good shows.`;
+			} else if (slave.energy > 40) {
+				return `${His} average sex drive allows ${him} to put on a decent show.`;
+			} else if (slave.energy > 20) {
+				return `The fact that ${his} sex drive is so poor affects ${his} performance.`;
+			} else {
+				return `The fact that ${his} sex drive is nonexistent really hinders ${his} ability to put on a decent show.`;
+			}
 		}
 	}
 
-- 
GitLab