JFC tweaking

src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw

@@ -7,60 +7,42 @@
 <<if $JFCOrder == 0>>
 	<span id="JobType">
 	<br><br>
-	<<if ($LieutenantColonel == 0 && $FacilitySupport == 1) || ($Wardeness == 0 && $cellblock == 1) || $Bodyguard == 0>>
+
 		<<link "Security">>
 		<<replace "#JobType">>
-			<<if $LieutenantColonel == 0 && $FacilitySupport == 1>>
-				<br>[[Lieutenant Colonel|Main][$JFCOrder = 1, $Role = "Lieutenant Colonel"]]
-			<</if>>
-			<<if $Bodyguard == 0>>
-				<br>[[Bodyguard|Main][$JFCOrder = 1, $Role = "Bodyguard"]]
-			<</if>>
-			<<if $Wardeness == 0 && $cellblock > 0>>
-				<br>[[Wardeness|Main][$JFCOrder = 1, $Role = "Wardeness"]]
-			<</if>>
+				<br>
+				<<if $SFMODToggle == 1>>
+					<br>[[Lieutenant Colonel|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Lieutenant Colonel"]]
+				<</if>>
+				<br>[[Bodyguard|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Bodyguard"]]
+				<br>[[Wardeness|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Wardeness"]]
+				<br>[[Return|JobFulfillmentCenterOrder]]
 		<</replace>>
 		<</link>>
-	<</if>>
-	<<if $HeadGirl == 0 || ($Schoolteacher == 0 && $schoolroom > 0) || ($Nurse == 0 && $clinic > 0) || $Attendant == 0 && $spa > 0 || ($Stewardess == 0 && $servantsQuarters > 0) || ($Milkmaid == 0 && $dairy > 0)>>
+
 		<br><<link "Management">>
 		<<replace "#JobType">>
-			<<if $HeadGirl == 0>>
-				<br>[[Headgirl|Main][$JFCOrder = 1, $Role = "Headgirl"]]
-			<</if>>
-			<<if $Schoolteacher == 0 && $schoolroom > 0>>
-				<br>[[Teacher|Main][$JFCOrder = 1, $Role = "Teacher"]]
-			<</if>>
-			<<if $Nurse == 0 && $clinic > 0>>
-				<br>[[Nurse|Main][$JFCOrder = 1, $Role = "Nurse"]]
-			<</if>>
-			<<if $Attendant == 0 && $spa > 0>>
-				<br>[[Attendant (normal)|Main][$JFCOrder = 1, $Role = "Attendant"]] | [[Attendant (motherly)|Main][$JFCOrder = 1, $Role = "Motherly Attendant"]]
-			<</if>>
-			<<if $Stewardess == 0 && $servantsQuarters > 0>>
-				<br>[[Stewardess|Main][$JFCOrder = 1, $Role = "Stewardess"]]
-			<</if>>
-			<<if $Milkmaid == 0 && $dairy > 0>>
-				<br>[[Milkmaid|Main][$JFCOrder = 1, $Role = "Milkmaid"]]
-			<</if>>
+				<br>
+				<br>[[Headgirl|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Headgirl"]]
+				<br>[[Teacher|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Teacher"]]
+				<br>[[Nurse|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Nurse"]]
+				<br>[[Attendant (normal)|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Attendant"]] | [[Attendant (motherly)|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Motherly Attendant"]]
+				<br>[[Stewardess|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Stewardess"]]
+				<br>[[Milkmaid|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Milkmaid"]]
+				<br>[[Return|JobFulfillmentCenterOrder]]
 		<</replace>>
 		<</link>>
-	<</if>>
-	<<if ($DJ == 0 && $club > 0) || ($Madam == 0 && $brothel > 0) || ($Lurcher == 0 && $CoursingAssociation == 1) || ($Concubine == 0 && $masterSuite > 0)>>
-		<br><<link "Entertain">>
+
+		<br><<link "Entertainment">>
 		<<replace "#JobType">>
-			<<if $DJ == 0 && $club > 0>>
-				<br>[[DJ|Main][$JFCOrder = 1, $Role = "DJ"]]
-			<</if>>
-			<<if $Madam == 0 && $brothel > 0>>
-				<br>[[Madam|Main][$JFCOrder = 1, $Role = "Madam"]]
-			<</if>>
-			<<if $Concubine == 0 && $masterSuite > 0>>
-				<br>[[Concubine|Main][$JFCOrder = 1, $Role = "Concubine"]]
-			<</if>>
+				<br>
+				<br>[[DJ|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "DJ"]]
+				<br>[[Madam|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Madam"]]
+				<br>[[Concubine|JobFulfillmentCenterOrder][$JFCOrder = 1, $Role = "Concubine"]]
+				<br>[[Return|JobFulfillmentCenterOrder]]
 		<</replace>>
 		<</link>>
-	<</if>>
+
 	</span>
 <<else>>
 	[[Withdraw slave order|JobFulfillmentCenterOrder][$JFCOrder = 0, $Role = ""]]