Merge branch 'pregmod-master' into 'pregmod-master'

simple fix to #164

Closes #164

See merge request pregmodfan/fc-pregmod!2146

src/utility/assignWidgets.tw

@@ -246,10 +246,10 @@
 			<<set $args[0].assignment = "rest">>
 	<</switch>>
 
-	<<set $args[0].assignmentVisible = 1, $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
-	<<if $args[0].livingRules == "luxurious">>
+	<<if $args[0].livingRules == "luxurious" && $args[0].assignmentVisible != 1>>
 		<<set $args[0].livingRules = "normal">>
 	<</if>>
+	<<set $args[0].assignmentVisible = 1, $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
 
 	<<if _wi >= 0>>
 		<<set $slaves[_wi] = $args[0]>> /* save changes to slave array */