diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js index 104dc99e52fb425f4a494e4c61659172813b4391..7a7633203d6c5a0a7f1fff15a1fd937e17e2cdb6 100644 --- a/src/endWeek/saStayConfined.js +++ b/src/endWeek/saStayConfined.js @@ -101,7 +101,11 @@ window.saStayConfined = function saStayConfined(slave) { } t += ` so <span class="noteworthy">`; - + if (slave.assignment === "be confined in the cellblock") { + State.temporary.brokenSlaves++; + State.temporary.DL--; + State.temporary.dI--; + } if (V.assignmentRecords[slave.ID]) { let oldJob = V.assignmentRecords[slave.ID]; assignJobSafely(slave, oldJob); @@ -120,12 +124,6 @@ window.saStayConfined = function saStayConfined(slave) { } t += `</span>`; - - if (slave.assignment === "be confined in the cellblock") { - State.temporary.brokenSlaves++; - State.temporary.DL--; - State.temporary.dI--; - } } return t; }; diff --git a/src/js/assignJS.js b/src/js/assignJS.js index 95a855b7804f579a622c7ad3419782036c08c4eb..870e411d199347cd7f28dc4978c05a74097a7435 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -410,7 +410,7 @@ window.assignJobSafely = function assignJobSafely(slave, assignmentStr){ if (V.assignmentRecords[slave.ID] === "choose her own job") { slave.choosesOwnAssignment = 1; assignJob(slave, "rest"); - } else if (!App.Utils.jobForAssignment(assignmentStr).canEmploy(slave).length) { // If nothing complains about job requirements not being met + } else if (!App.Utils.jobForAssignment(assignmentStr).canEmploy(slave).length) { // If nothing complains about job requirements not being met assignJob(slave, assignmentStr); } else { assignJob(slave, "rest");