From d31f9fc57593b9d675c487665fd542c28523c30c Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 31 Oct 2020 17:22:13 -0700
Subject: [PATCH] Solo subordinate slaves take it easy their first week
 returning to duty.

---
 src/endWeek/saServeYourOtherSlaves.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index 3dd3ed3f4cd..edac3785044 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -231,6 +231,11 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
 		} else if (!canMove(slave)) {
 			r.push(`Since ${he}'s completely immobile, ${he}'s especially vulnerable.`);
 		}
+		// week-end reassignment (returning to previous job) can fuck up the subslave count if she's the only one...normally this should never happen
+		if (App.EndWeek.saVars.subSlaveRatio === 0) {
+			r.push(`${He}'s just returning to ${his} job, so ${he} doesn't get much action this week.`);
+			return;
+		}
 		const subSlaves = App.EndWeek.saVars.subSlaveMap.get(0) || [];
 		if ((V.dormitoryPopulation + V.roomsPopulation - subSlaves.length) > 5) {
 			const load = App.EndWeek.saVars.subSlaveRatio;
@@ -1448,7 +1453,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
 				if (slave.fetishStrength < 100) {
 					slave.fetishStrength++;
 				}
-			} else if (fetishChange > jsRandom(0, 100) && slave.fetish !== "masochist" && slave.fetish !== "submissive" && App.EndWeek.saVars.subSlaveRatio <= 0.8) {
+			} else if (fetishChange > jsRandom(0, 100) && slave.fetish !== "masochist" && slave.fetish !== "submissive" && between(App.EndWeek.saVars.subSlaveRatio, 0, 0.8)) {
 				r.push(`Being used as much as ${he} is starts to take a toll on ${him} sexuality; <span class="lightcoral">${he} begins to enjoy being your chattel's fucktoy.</span>`);
 				slave.fetish = "submissive";
 				slave.fetishStrength = 65;
-- 
GitLab