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

Increase spa tiredness gate

See merge request pregmodfan/fc-pregmod!7208

src/facilities/spa/spaFramework.js

@@ -46,7 +46,7 @@ App.Entity.Facilities.SpaAssigneeJob = class extends App.Entity.Facilities.Facil
 			(
 				slave.devotion < -20 ||
 				(
-					slave.health.tired < 20 &&
+					slave.health.tired <= 30 &&
 					slave.trust > 60 &&
 					slave.devotion > 60 &&
 					slave.sexualFlaw === "none" &&

src/uncategorized/spaReport.tw

@@ -283,7 +283,7 @@
 	<<default>>
 		<<set _slave.rules.living = "luxurious">>
 	<</switch>>
-	<<if (_slave.health.condition >= 20) && (_slave.health.tired < 20) && (_slave.trust > 60) && (_slave.devotion > 60) && (_slave.fetish != "mindbroken") && (_slave.sexualFlaw == "none") && (_slave.behavioralFlaw == "none")>>
+	<<if (_slave.health.condition >= 20) && (_slave.health.tired <= 30) && (_slave.trust > 60) && (_slave.devotion > 60) && (_slave.fetish != "mindbroken") && (_slave.sexualFlaw == "none") && (_slave.behavioralFlaw == "none")>>
 		<p>
 			<span class="slave-name">_slave.slaveName</span> is feeling well enough to leave $spaName,
 			<span class="noteworthy">