From 37f8aff87a6663deefe87a4c2978b138aac815f4 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 23 Jan 2020 18:16:28 -0500
Subject: [PATCH] strip
---
src/js/assignJS.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 4643dd8615c..95a855b7804 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -19,7 +19,7 @@ window.assignJob = function assignJob(slave, job) {
/* Tracking for the following cases: */
if (V.assignmentRecords[slave.ID] === "choose her own job") { // if choosesOwnAssignment was set before removeJob (and wipes it out), it's saved in assignmentRecords. We don't want to overwrite that here, as we want to be able to get it back.
- slave.choosesOwnAssignment = 1;
+ //
} else {
switch (job.toLowerCase()) {
case "be confined in the cellblock":
@@ -407,7 +407,8 @@ window.assignJob = function assignJob(slave, job) {
};
window.assignJobSafely = function assignJobSafely(slave, assignmentStr){
- if (slave.choosesOwnAssignment === 1) {
+ 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
assignJob(slave, assignmentStr);
--
GitLab