From d36655c84c62ef4b1ccba0c4dbe46ee5a06ea9ca Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Fri, 30 Aug 2019 22:42:31 -0400
Subject: [PATCH] fix evac all

---
 src/facilities/farmyard/farmyard.tw | 2 +-
 src/facilities/nursery/nursery.tw   | 2 +-
 src/uncategorized/arcade.tw         | 2 +-
 src/uncategorized/brothel.tw        | 2 +-
 src/uncategorized/cellblock.tw      | 2 +-
 src/uncategorized/clinic.tw         | 2 +-
 src/uncategorized/club.tw           | 2 +-
 src/uncategorized/dairy.tw          | 4 ++--
 src/uncategorized/masterSuite.tw    | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index 20f483fd166..751eef03387 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -91,7 +91,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
 		<<if $Farmer != 0>>
 			<<= assignJob($Farmer, "rest")>>
 		<</if>>
-		<<for _FyL > 0>>
+		<<for $FarmyardiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$FarmyardiIDs[0]]], "rest")>>
 		<</for>>
 	<</link>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index b8ee37387ef..8c31898bc24 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -95,7 +95,7 @@ $nurseryNameCaps
 		<<if $Matron>>
 			<<= assignJob($Matron, "rest")>>
 		<</if>>
-		<<for _NL > 0>>
+		<<for $NurseryiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$NurseryiIDs[0]]], "rest")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index ce3ce29a36f..6d78fe70a23 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -85,7 +85,7 @@ $arcadeNameCaps
 <<if _AL > 0>>
 	<<set _NewPop = _AL+$dormitoryPopulation>>
 	<<link "Remove all slaves" "Arcade">>
-		<<for _AL > 0>>
+		<<for $ArcadeiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$ArcadeiIDs[0]]], "work a glory hole")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 125efef5578..711d45a26b1 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -159,7 +159,7 @@ $brothelNameCaps
 		<<if $Madam != 0>>
 			<<= assignJob($Madam, "rest")>>
 		<</if>>
-		<<for _BL > 0>>
+		<<for $BrothiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$BrothiIDs[0]]], "whore")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index ec33bc3502f..75ccd6a0fcb 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -84,7 +84,7 @@ $cellblockNameCaps
 		<<if $Wardeness != 0>>
 			<<= assignJob($Wardeness, "rest")>>
 		<</if>>
-		<<for _CL > 0>>
+		<<for $CellBiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$CellBiIDs[0]]], "stay confined")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index d2137246c68..3cd55f2b0af 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -84,7 +84,7 @@ $clinicNameCaps
 		<<if $Nurse != 0>>
 			<<= assignJob($Nurse, "rest")>>
 		<</if>>
-		<<for _CL > 0>>
+		<<for $CliniciIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$CliniciIDs[0]]], "rest")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index b0846050042..e8c366f6d75 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -160,7 +160,7 @@ $clubNameCaps
 		<<if $DJ != 0>>
 			<<= assignJob($DJ, "rest")>>
 		<</if>>
-		<<for _CL > 0>>
+		<<for $ClubiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$ClubiIDs[0]]], "serve the public")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 0d92193b7b2..f99ca7c1c83 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -1,6 +1,6 @@
 :: Dairy [nobr]
 
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length, _DL = _DL>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length, _DL = $DairyiIDs.length>>
 
 <<SlaveIDSort $DairyiIDs>>
 <<if $dairyName != "the Dairy">>
@@ -327,7 +327,7 @@
 		<<if $Milkmaid != 0>>
 			<<= assignJob($Milkmaid, "rest")>>
 		<</if>>
-		<<for _DL > 0>>
+		<<for $DairyiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$DairyiIDs[0]]], "get milked")>>
 		<</for>>
 	<</link>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 2dfc51a57e4..7ddf6ee5796 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -330,7 +330,7 @@ $masterSuiteNameCaps is furnished
 		<<if $Concubine != 0>>
 			<<= assignJob($Concubine, "rest")>>
 		<</if>>
-		<<for _MsL > 0>>
+		<<for $MastSiIDs.length > 0>>
 			<<= assignJob($slaves[$slaveIndices[$MastSiIDs[0]]], "please you")>>
 		<</for>>
 	<</link>>
-- 
GitLab