diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js index 7a86300876ee1bb426a4f9061de2ab6c7a793c39..5d6c2d3ca92433d4f9850394b7f6798c2c4aba5f 100644 --- a/src/js/rulesAssistant.js +++ b/src/js/rulesAssistant.js @@ -63,96 +63,96 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) { let r = ""; if (!rule.facilityRemove) return r; switch(rule.setAssignment) { - case "be confined in the arcade": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.arcadeName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "be confined in the arcade": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.arcadeName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "work in the brothel": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.brothelName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "work in the brothel": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.brothelName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "serve in the club": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${clubName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "serve in the club": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${clubName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "work in the dairy": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.dairyName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "work in the dairy": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.dairyName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "work as farmhand": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.farmyardName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave. rule.removalAssignment); - } - break; + case "work as farmhand": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.farmyardName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave. rule.removalAssignment); + } + break; - case "rest in the spa": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.spaName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "rest in the spa": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.spaName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "work as a nanny": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.nurseryName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "work as a nanny": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.nurseryName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "get treatment in the clinic": - if (slave.assignment === rule.setAssignment) { - r += `<br>{slave.slaveName} has been removed from ${V.clinicName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "get treatment in the clinic": + if (slave.assignment === rule.setAssignment) { + r += `<br>{slave.slaveName} has been removed from ${V.clinicName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "serve in the master suite": - if (slave.assignment === rule.setAssignment) { - r += `<br>{slave.slaveName} has been removed from ${V.masterSuiteName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "serve in the master suite": + if (slave.assignment === rule.setAssignment) { + r += `<br>{slave.slaveName} has been removed from ${V.masterSuiteName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "live with your Head Girl": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${HGSuiteName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "live with your Head Girl": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${HGSuiteName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "work as a servant": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.servantsQuartersName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "work as a servant": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.servantsQuartersName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "learn in the schoolroom": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.schoolroomName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "learn in the schoolroom": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.schoolroomName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; - case "be confined in the cellblock": - if (slave.assignment === rule.setAssignment) { - r += `<br>${slave.slaveName} has been removed from ${V.cellblockName} and has been assigned to ${rule.removalAssignment}.`; - assignJob(slave, rule.removalAssignment); - } - break; + case "be confined in the cellblock": + if (slave.assignment === rule.setAssignment) { + r += `<br>${slave.slaveName} has been removed from ${V.cellblockName} and has been assigned to ${rule.removalAssignment}.`; + assignJob(slave, rule.removalAssignment); + } + break; } }; @@ -163,24 +163,24 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) { // attribute / function check switch (cond.function) { - case true: // always applies - flag = true; - break; - case false: // never applies - flag = false; - break; - case "between": // between two values of a slave's attribute - flag = between( - slave[cond.data.attribute], - cond.data.value[0], - cond.data.value[1]); - break; - case "belongs": // the attribute belongs in the list of values - flag = cond.data.value.includes(slave[cond.data.attribute]); - break; - case "custom": // user provided JS function - flag = eval(cond.data)(slave); - break; + case true: // always applies + flag = true; + break; + case false: // never applies + flag = false; + break; + case "between": // between two values of a slave's attribute + flag = between( + slave[cond.data.attribute], + cond.data.value[0], + cond.data.value[1]); + break; + case "belongs": // the attribute belongs in the list of values + flag = cond.data.value.includes(slave[cond.data.attribute]); + break; + case "custom": // user provided JS function + flag = eval(cond.data)(slave); + break; } // assignment / facility / special slaves / specific slaves check let assignment = slave.assignment;