From f25c8d9f049138fca713687ebd45d381d3b11beb Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Sun, 12 Jan 2020 18:49:35 -0800 Subject: [PATCH] Remove facility head workaround passages --- src/facilities/farmyard/farmerSelect.tw | 4 ++-- src/facilities/farmyard/farmerSelectWorkaround.tw | 12 ------------ src/facilities/nursery/matronSelect.tw | 4 ++-- src/facilities/nursery/matronWorkaround.tw | 12 ------------ src/uncategorized/attendantWorkaround.tw | 12 ------------ src/uncategorized/bodyguardWorkaround.tw | 11 ----------- src/uncategorized/concubineSelect.tw | 4 ++-- src/uncategorized/concubineWorkaround.tw | 12 ------------ src/uncategorized/djSelect.tw | 4 ++-- src/uncategorized/djWorkaround.tw | 12 ------------ src/uncategorized/hgSelect.tw | 4 ++-- src/uncategorized/hgWorkaround.tw | 13 ------------- src/uncategorized/madamSelect.tw | 4 ++-- src/uncategorized/madamWorkaround.tw | 12 ------------ src/uncategorized/milkmaidSelect.tw | 4 ++-- src/uncategorized/milkmaidWorkaround.tw | 12 ------------ src/uncategorized/nurseSelect.tw | 4 ++-- src/uncategorized/nurseWorkaround.tw | 12 ------------ src/uncategorized/recruiterSelect.tw | 4 ++-- src/uncategorized/recruiterWorkaround.tw | 12 ------------ src/uncategorized/schoolteacherSelect.tw | 4 ++-- src/uncategorized/schoolteacherWorkaround.tw | 12 ------------ src/uncategorized/stewardessSelect.tw | 4 ++-- src/uncategorized/stewardessWorkaround.tw | 12 ------------ src/uncategorized/wardenessSelect.tw | 4 ++-- src/uncategorized/wardenessWorkaround.tw | 12 ------------ 26 files changed, 24 insertions(+), 192 deletions(-) delete mode 100644 src/facilities/farmyard/farmerSelectWorkaround.tw delete mode 100644 src/facilities/nursery/matronWorkaround.tw delete mode 100644 src/uncategorized/attendantWorkaround.tw delete mode 100644 src/uncategorized/bodyguardWorkaround.tw delete mode 100644 src/uncategorized/concubineWorkaround.tw delete mode 100644 src/uncategorized/djWorkaround.tw delete mode 100644 src/uncategorized/hgWorkaround.tw delete mode 100644 src/uncategorized/madamWorkaround.tw delete mode 100644 src/uncategorized/milkmaidWorkaround.tw delete mode 100644 src/uncategorized/nurseWorkaround.tw delete mode 100644 src/uncategorized/recruiterWorkaround.tw delete mode 100644 src/uncategorized/schoolteacherWorkaround.tw delete mode 100644 src/uncategorized/stewardessWorkaround.tw delete mode 100644 src/uncategorized/wardenessWorkaround.tw diff --git a/src/facilities/farmyard/farmerSelect.tw b/src/facilities/farmyard/farmerSelect.tw index 0ba102d974c..2012c5272da 100644 --- a/src/facilities/farmyard/farmerSelect.tw +++ b/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")>> diff --git a/src/facilities/farmyard/farmerSelectWorkaround.tw b/src/facilities/farmyard/farmerSelectWorkaround.tw deleted file mode 100644 index 46096741a17..00000000000 --- a/src/facilities/farmyard/farmerSelectWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/facilities/nursery/matronSelect.tw b/src/facilities/nursery/matronSelect.tw index a6d934a53ca..2ea2b90e101 100644 --- a/src/facilities/nursery/matronSelect.tw +++ b/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")>> diff --git a/src/facilities/nursery/matronWorkaround.tw b/src/facilities/nursery/matronWorkaround.tw deleted file mode 100644 index 1f992d869b1..00000000000 --- a/src/facilities/nursery/matronWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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 diff --git a/src/uncategorized/attendantWorkaround.tw b/src/uncategorized/attendantWorkaround.tw deleted file mode 100644 index 74f91da19e8..00000000000 --- a/src/uncategorized/attendantWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/bodyguardWorkaround.tw b/src/uncategorized/bodyguardWorkaround.tw deleted file mode 100644 index 6da994d4579..00000000000 --- a/src/uncategorized/bodyguardWorkaround.tw +++ /dev/null @@ -1,11 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw index 5bc559bd433..d2270e40cdd 100644 --- a/src/uncategorized/concubineSelect.tw +++ b/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")>> diff --git a/src/uncategorized/concubineWorkaround.tw b/src/uncategorized/concubineWorkaround.tw deleted file mode 100644 index c46d0521188..00000000000 --- a/src/uncategorized/concubineWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/djSelect.tw b/src/uncategorized/djSelect.tw index e84f616be37..5f308c3f734 100644 --- a/src/uncategorized/djSelect.tw +++ b/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")>> diff --git a/src/uncategorized/djWorkaround.tw b/src/uncategorized/djWorkaround.tw deleted file mode 100644 index 2ea4f341c1c..00000000000 --- a/src/uncategorized/djWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw index e7f18078a22..0bc0e07d468 100644 --- a/src/uncategorized/hgSelect.tw +++ b/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")>> diff --git a/src/uncategorized/hgWorkaround.tw b/src/uncategorized/hgWorkaround.tw deleted file mode 100644 index 3aac26edb9e..00000000000 --- a/src/uncategorized/hgWorkaround.tw +++ /dev/null @@ -1,13 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/madamSelect.tw b/src/uncategorized/madamSelect.tw index 85f07ad8351..33e6f913d83 100644 --- a/src/uncategorized/madamSelect.tw +++ b/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")>> diff --git a/src/uncategorized/madamWorkaround.tw b/src/uncategorized/madamWorkaround.tw deleted file mode 100644 index d713b9064f1..00000000000 --- a/src/uncategorized/madamWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/milkmaidSelect.tw b/src/uncategorized/milkmaidSelect.tw index f85d344ca00..506ef717a08 100644 --- a/src/uncategorized/milkmaidSelect.tw +++ b/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")>> diff --git a/src/uncategorized/milkmaidWorkaround.tw b/src/uncategorized/milkmaidWorkaround.tw deleted file mode 100644 index aef3a03b600..00000000000 --- a/src/uncategorized/milkmaidWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/nurseSelect.tw b/src/uncategorized/nurseSelect.tw index 20b5a750ecb..05ff8a69c37 100644 --- a/src/uncategorized/nurseSelect.tw +++ b/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")>> diff --git a/src/uncategorized/nurseWorkaround.tw b/src/uncategorized/nurseWorkaround.tw deleted file mode 100644 index 74db4eb27ff..00000000000 --- a/src/uncategorized/nurseWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw index f21248fbc81..a9e7d26a262 100644 --- a/src/uncategorized/recruiterSelect.tw +++ b/src/uncategorized/recruiterSelect.tw @@ -63,6 +63,6 @@ <br> //"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")>> diff --git a/src/uncategorized/recruiterWorkaround.tw b/src/uncategorized/recruiterWorkaround.tw deleted file mode 100644 index 204afff5a64..00000000000 --- a/src/uncategorized/recruiterWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: 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">> diff --git a/src/uncategorized/schoolteacherSelect.tw b/src/uncategorized/schoolteacherSelect.tw index edc0e250557..1bd868c8977 100644 --- a/src/uncategorized/schoolteacherSelect.tw +++ b/src/uncategorized/schoolteacherSelect.tw @@ -10,6 +10,6 @@ <</if>> <br><br>''Appoint a Schoolteacher from your devoted slaves:'' -<br><br>[[None|Schoolteacher Workaround][$i = -1]] +<br><br>[[None|Schoolroom][removeJob($Schoolteacher, "be the Schoolteacher")]] <br><br> -<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.schoolroom)>> +<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.schoolroom, "Schoolroom")>> diff --git a/src/uncategorized/schoolteacherWorkaround.tw b/src/uncategorized/schoolteacherWorkaround.tw deleted file mode 100644 index 5097c95eeae..00000000000 --- a/src/uncategorized/schoolteacherWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: Schoolteacher Workaround [silently] - -<<if $Schoolteacher != 0>> - <<= removeJob($Schoolteacher, "be the Schoolteacher")>> -<</if>> -<<if $i > -1>> - <<= assignJob($slaves[$i], "be the Schoolteacher")>> - <<set $slaves[$i].rules.living = "luxurious">> - <<set $Schoolteacher = $slaves[$i]>> -<</if>> - -<<goto "Schoolroom">> diff --git a/src/uncategorized/stewardessSelect.tw b/src/uncategorized/stewardessSelect.tw index 9a300a7a9f0..b6cbac5a252 100644 --- a/src/uncategorized/stewardessSelect.tw +++ b/src/uncategorized/stewardessSelect.tw @@ -10,6 +10,6 @@ <</if>> <br><br>''Appoint a Stewardess from your devoted slaves:'' -<br><br>[[None|Stewardess Workaround][$i = -1]] +<br><br>[[None|Servants' Quarters][removeJob($Stewardess, "be the Stewardess")]] <br><br> -<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.servantsQuarters)>> +<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.servantsQuarters, "Servants' Quarters")>> diff --git a/src/uncategorized/stewardessWorkaround.tw b/src/uncategorized/stewardessWorkaround.tw deleted file mode 100644 index 92c6ae83a28..00000000000 --- a/src/uncategorized/stewardessWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: Stewardess Workaround [silently] - -<<if $Stewardess != 0>> - <<= removeJob($Stewardess, "be the Stewardess")>> -<</if>> -<<if $i > -1>> - <<= assignJob($slaves[$i], "be the Stewardess")>> - <<set $slaves[$i].rules.living = "luxurious">> - <<set $Stewardess = $slaves[$i]>> -<</if>> - -<<goto "Servants' Quarters">> diff --git a/src/uncategorized/wardenessSelect.tw b/src/uncategorized/wardenessSelect.tw index c356d1dc21b..1664e43eeb2 100644 --- a/src/uncategorized/wardenessSelect.tw +++ b/src/uncategorized/wardenessSelect.tw @@ -10,6 +10,6 @@ <</if>> <br><br>''Appoint a Wardeness from your devoted slaves:'' -<br><br>[[None|Wardeness Workaround][$i = -1]] +<br><br>[[None|Cellblock][removeJob($Wardeness, "be the Wardeness")]] <br><br> -<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.cellblock)>> +<<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.cellblock, "Cellblock")>> diff --git a/src/uncategorized/wardenessWorkaround.tw b/src/uncategorized/wardenessWorkaround.tw deleted file mode 100644 index 57a3607a0c4..00000000000 --- a/src/uncategorized/wardenessWorkaround.tw +++ /dev/null @@ -1,12 +0,0 @@ -:: Wardeness Workaround [silently] - -<<if $Wardeness != 0>> - <<= removeJob($Wardeness, "be the Wardeness")>> -<</if>> -<<if $i > -1>> - <<= assignJob($slaves[$i], "be the Wardeness")>> - <<set $slaves[$i].rules.living = "luxurious">> - <<set $Wardeness = $slaves[$i]>> -<</if>> - -<<goto "Cellblock">> -- GitLab