Remove facility head workaround passages

src/facilities/farmyard/farmerSelect.tw

@@ -10,6 +10,6 @@
 <</if>>
 
 <br><br>''Appoint a Farmer from your obedient slaves:''
-<br><br>[[None|Farmer Workaround][$i = -1]]
+<br><br>[[None|Farmyard][removeJob($Farmer, "be the Farmer")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.farmyard)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.farmyard, "Farmyard")>>

src/facilities/farmyard/farmerSelectWorkaround.tw

-:: Farmer Workaround [silently]
-
-<<if $Farmer != 0>>
-	<<= removeJob($Farmer, "be the Farmer")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the Farmer")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Farmer = $slaves[$i]>>
-<</if>>
-
-<<goto "Farmyard">>

src/facilities/nursery/matronSelect.tw

@@ -10,6 +10,6 @@
 <</if>>
 
 <br><br>''Appoint a Matron from your devoted slaves:''
-<br><br>[[None|Matron Workaround][$i = -1]]
+<br><br>[[None|Nursery][removeJob($Matron, "be the Matron")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.nursery)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.nursery, "Nursery")>>

src/facilities/nursery/matronWorkaround.tw

-:: Matron Workaround [silently]
-
-<<if $Matron != 0>>
-	<<= removeJob($Matron, "be the Matron")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the Matron")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Matron = $slaves[$i]>>
-<</if>>
-
-<<goto "Nursery">>
\ No newline at end of file

src/uncategorized/attendantWorkaround.tw

-:: Attendant Workaround [silently]
-
-<<if $Attendant != 0>>
-	<<= removeJob($Attendant, "be the Attendant")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the Attendant")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Attendant = $slaves[$i]>>
-<</if>>
-
-<<goto "Spa">>

src/uncategorized/bodyguardWorkaround.tw

-:: Bodyguard Workaround [silently]
-
-<<if $Bodyguard != 0>>
-	<<= removeJob($Bodyguard, "guard you")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "guard you")>>
-	<<set $Bodyguard = $slaves[$i]>>
-<</if>>
-
-<<goto "Main">>

src/uncategorized/concubineSelect.tw

@@ -10,6 +10,6 @@
 <</if>>
 
 <br><br>''Appoint a Concubine from your devoted slaves:''
-<br><br>[[None|Concubine Workaround][$i = -1]]
+<br><br>[[None|Master Suite][removeJob($Concubine, "be your Concubine")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.masterSuite)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.masterSuite, "Master Suite")>>

src/uncategorized/concubineWorkaround.tw

-:: Concubine Workaround [silently]
-
-<<if $Concubine != 0>>
-	<<= removeJob($Concubine, "be your Concubine")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be your Concubine")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Concubine = $slaves[$i]>>
-<</if>>
-
-<<goto "Master Suite">>

src/uncategorized/djSelect.tw

@@ -10,6 +10,6 @@
 <</if>>
 
 <br><br>''Appoint a DJ from your devoted slaves:''
-<br><br>[[None|DJ Workaround][$i = -1]]
+<br><br>[[None|Club][removeJob($DJ, "be the DJ")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.club)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.club, "Club")>>

src/uncategorized/djWorkaround.tw

-:: DJ Workaround [silently]
-
-<<if $DJ != 0>>
-	<<= removeJob($DJ, "be the DJ")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the DJ")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $DJ = $slaves[$i]>>
-<</if>>
-
-<<goto "Club">>

src/uncategorized/hgSelect.tw

@@ -89,6 +89,6 @@ _HGName
 <</if>>
 
 <br><br>''Appoint a Head Girl from among your devoted slaves:''
-<br><br>[[None|HG Workaround][$i = -1]]
+<br><br>[[None|Main][removeJob($HeadGirl, "be your Head Girl")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.headGirlSuite, "HG Workaround")>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.headGirlSuite, "Main")>>

src/uncategorized/hgWorkaround.tw

-:: HG Workaround [silently]
-
-<<if $HeadGirl != 0>>
-	<<= removeJob($HeadGirl, "be your Head Girl")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be your Head Girl")>>
-	<<set $HeadGirl = $slaves[$i]>>
-<</if>>
-
-<<set $HGTimeInGrade = 0>>
-
-<<goto "Main">>

src/uncategorized/madamSelect.tw

@@ -10,6 +10,6 @@
 <</if>>
 
 <br><br>''Appoint a Madam from your devoted slaves:''
-<br><br>[[None|Madam Workaround][$i = -1]]
+<br><br>[[None|Brothel][removeJob($Madam, "be the Madam")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.brothel)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.brothel, "Brothel")>>

src/uncategorized/madamWorkaround.tw

-:: Madam Workaround [silently]
-
-<<if $Madam != 0>>
-	<<= removeJob($Madam, "be the Madam")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the Madam")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Madam = $slaves[$i]>>
-<</if>>
-
-<<goto "Brothel">>

src/uncategorized/milkmaidSelect.tw

@@ -10,6 +10,6 @@
 <</if>>
 
 <br><br>''Appoint a Milkmaid from your obedient slaves:''
-<br><br>[[None|Milkmaid Workaround][$i = -1]]
+<br><br>[[None|Dairy][removeJob($Milkmaid, "be the Milkmaid")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.dairy)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.dairy, "Dairy")>>

src/uncategorized/milkmaidWorkaround.tw

-:: Milkmaid Workaround [silently]
-
-<<if $Milkmaid != 0>>
-	<<= removeJob($Milkmaid, "be the Milkmaid")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the Milkmaid")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Milkmaid = $slaves[$i]>>
-<</if>>
-
-<<goto "Dairy">>

src/uncategorized/nurseSelect.tw

@@ -10,7 +10,7 @@
 <</if>>
 
 <br><br>''Appoint a Nurse from your devoted slaves:''
-<br><br>[[None|Nurse Workaround][$i = -1]]
+<br><br>[[None|Clinic][removeJob($Nurse, "be the Nurse")]]
 <br><br>
 
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.clinic)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.clinic, "Clinic")>>

src/uncategorized/nurseWorkaround.tw

-:: Nurse Workaround [silently]
-
-<<if $Nurse != 0>>
-	<<= removeJob($Nurse, "be the Nurse")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "be the Nurse")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Nurse = $slaves[$i]>>
-<</if>>
-
-<<goto "Clinic">>

src/uncategorized/recruiterSelect.tw

@@ -63,6 +63,6 @@
 <br>&nbsp; //"Facilities" doesn't include training slots in cellblock, schoolroom, spa, clinic (but does include those leaders)//
 
 <br><br>''Appoint a recruiter from among your devoted slaves:''
-<br>[[None|Recruiter Workaround][$i = -1]]
+<br>[[None|Main][removeJob($Recruiter, "recruit girls")]]
 <br><br>
-<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.penthouse)>>
+<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.penthouse, "Main")>>

src/uncategorized/recruiterWorkaround.tw

-:: Recruiter Workaround [silently]
-
-<<if $Recruiter != 0>>
-	<<= removeJob($Recruiter, "recruit girls")>>
-<</if>>
-<<if $i > -1>>
-	<<= assignJob($slaves[$i], "recruit girls")>>
-	<<set $slaves[$i].rules.living = "luxurious">>
-	<<set $Recruiter = $slaves[$i]>>
-<</if>>
-
-<<goto "Main">>