From eb224a19ecfd41a855364d930891589da1cb0852 Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Tue, 21 May 2019 00:31:05 -0400
Subject: [PATCH] Revert changes to rulesAssistant.js
---
src/js/rulesAssistant.js | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 034984c6069..b3afe04950d 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -93,7 +93,6 @@ window.ruleApplied = function(slave, rule) {
* remove slave from the facility described by the rule
* @param {App.Entity.SlaveState} slave
* @param {Object} rule
- * @returns {string}
*/
window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
const V = State.variables;
@@ -195,10 +194,9 @@ window.RAFacilityRemove = function RAFacilityRemove(slave, rule) {
/**
* return whether the rule applies to the slave
- * @param {function} cond // I think
+ * @param {{function:boolean|string, data, specialSlaves, selectedSlaves, excludedSlaves, assignment}} cond
* @param {App.Entity.SlaveState} slave
- * @returns {boolean}
- */
+ * @returns {boolean} flag */
window.ruleAppliesP = function ruleAppliesP(cond, slave) {
let flag;
@@ -227,8 +225,7 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) {
let assignment = slave.assignment;
if (assignment === "be your Concubine") { assignment = "serve in the master suite"; }
- if (cond.specialSlaves !== -1) {
- // not "Include", which means "doesn't matter"
+ if (cond.specialSlaves !== -1) { // not "Include", which means "doesn't matter"
flag = flag && (cond.specialSlaves == isLeaderP(slave)); // eslint-disable-line eqeqeq
}
@@ -406,7 +403,7 @@ window.RulesDeconfliction = function RulesDeconfliction(slave) {
/**
* Creates a table to summarize RA
* @returns {string}
- */
+*/
window.RASummaryCell = function RASummaryCell() {
const V = State.variables;
let r = "";
@@ -428,11 +425,9 @@ window.RASummaryCell = function RASummaryCell() {
/* A row for every condition the RA can set. */
/* start loop for row*/
- for (i = 0; i < keys.length; i++) {
- /* i is for rows/"what they are fed" */
+ for (i = 0; i < keys.length; i++) { /* i is for rows/"what they are fed" */
/* Check if this row will have anything interesting*/
- for (j = 0; j < rules.length; j++) {
- /* j is the rule set it comes from/"obediant slaves" */
+ for (j = 0; j < rules.length; j++) { /* j is the rule set it comes from/"obediant slaves" */
values = V.defaultRules[j].set[keys[i]];
if (values && values !== "no default setting") {
display++;
--
GitLab