diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index c3547e8a06287d5539dca82ff52508f2405036cf..8443fa745d2952ee15f40a1d3013b6100c68c809 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -18,8 +18,8 @@ window.DefaultRules = (function() {
({he, him, his} = getPronouns(slave));
const slaveReadOnly = createReadonlyProxy(slave);
const {rule, ruleIds} = runWithReadonlyProxy(()=>ProcessSlaveRules(slaveReadOnly));
- if (ruleIds.length === 0) { return r; } // no rules apply
slave.currentRules = ruleIds;
+ if (ruleIds.length === 0) { return r; } // no rules apply
AssignJobToSlave(slave, rule);
if (slave.fuckdoll === 0) {
@@ -86,8 +86,7 @@ window.DefaultRules = (function() {
/** @type {App.RA.Rule[]} */
const rules = V.defaultRules.filter((x) => ruleAppliesP(x.condition, slave));
const ruleIds = [], assignments = [];
- for(const rule of rules)
- {
+ for(const rule of rules) {
ruleIds.push(rule.ID);
assignments.push(ProcessAssignments(slave, Object.assign({}, rule.set)));
}
@@ -1334,12 +1333,12 @@ window.DefaultRules = (function() {
}
break;
- case "psychostimulants":
+ case "psychostimulants": {
let origIntel = V.genePool.find(s => s.ID === slave.ID).intelligence;
if (!((slave.intelligence < 100) && (slave.intelligence < origIntel + 15))) {
flag = false;
}
- break;
+ } break;
case "breast injections":
if (slave.boobs >= 48000) {
@@ -2904,19 +2903,19 @@ window.DefaultRules = (function() {
* @param {App.RA.RuleSetters} rule
*/
function ProcessLabel(slave, rule) {
- //mass removal of old tags, variant from '*' mask.
+ // mass removal of old tags, variant from '*' mask.
if (rule.removeLabel !== null && rule.removeLabel !== '' && rule.removeLabel === '*') {
slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, "");
r += `<br>All ${slave.slaveName}'s tags is removed.`;
}
- //mass removal of old tags, variant from GUI swith.
+ // mass removal of old tags, variant from GUI swith.
if (rule.labelTagsClear === true) {
slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, "");
r += `<br>All ${slave.slaveName}'s tags is removed.`;
}
- //removing tags selected for removal.
+ // removing tags selected for removal.
let tags = [], i;
if (rule.removeLabel != null && rule.removeLabel !== '') {
tags = rule.removeLabel.split("|");
@@ -2929,7 +2928,7 @@ window.DefaultRules = (function() {
}
}
- //finally adding new tags.
+ // finally adding new tags.
tags = [];
if (rule.label != null && rule.label !== '') {
tags = rule.label.split("|");
@@ -2946,14 +2945,13 @@ window.DefaultRules = (function() {
const rxCheckEqual = /[^!=<>]=[^=<>]/gi;
const compileCheck = function(code) {
try {
- //TODO: This should use a cached Function, which should be the same as below.
+ // TODO: This should use a cached Function, which should be the same as below.
new Function(`return ${code}`);
- }
- catch(e) {
+ } catch(e) {
return false;
}
return true;
- }
+ };
window.RuleHasError = (rule) => rule.condition.function === "custom"
&&(rule.condition.data.match(rxCheckEqual)
|| !compileCheck(rule.condition.data));
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 7cff916011d3998a9abf14e7164471c415ec43f3..098c47ce5ab3b28caa6fa6ff6288f6b9159b45e7 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -304,18 +304,16 @@ window.rulesAssistantOptions = (function() {
return;
}
const selected = this.children.filter(listItem => _.isEqual(listItem.data, what));
- if(selected != null && selected.length == 1)
- {
+ if(selected != null && selected.length === 1) {
this.selectItem(selected[0]);
- }
- else if(this._allowNullValue) {
+ } else if(this._allowNullValue) {
this.setValue(null);
}
}
setValue(what) {
if(what == null && !this._allowNullValue) { what = ""; }
this.realValue = what;
- if(this[_blockCallback]) return;
+ if(this[_blockCallback]) { return; }
try {
this[_blockCallback] = true;
this.setTextValue(what);
@@ -358,12 +356,11 @@ window.rulesAssistantOptions = (function() {
let selected;
if(dataValue == null) {
selected = this.children.filter(listItem => listItem.data == null);
- }
- else {
+ } else {
selected = this.children.filter(listItem => this.dataEqual(listItem.data, dataValue));
}
if (selected.length > 1) { debugger; throw Error(`Multiple shortcuts matched ${JSON.stringify(dataValue)}`); }
- if (selected.length == 1) {
+ if (selected.length === 1) {
const listItem = selected[0];
listItem.select(false);
if(this.selectedItem != null
@@ -754,13 +751,12 @@ window.rulesAssistantOptions = (function() {
}
dataEqual(left, right) {
- debugger;
if (left == null && right == null) { return true; }
if (left == null || right == null) { return false; }
- //ignore the operator
+ // ignore the operator
if(_.isObject(left )) { left = left .val; }
if(_.isObject(right)) { right = right.val; }
- return left == right;
+ return left === right;
}
}
@@ -1055,7 +1051,7 @@ window.rulesAssistantOptions = (function() {
// buttons for selecting the current rule
class RuleSelector extends List {
constructor() {
- super("Current rule", V.defaultRules.map(i => [(i.name + (!!RuleHasError(i) ? " <span class='yellow'>[!]</span>" : "")), i]), false);
+ super("Current rule", V.defaultRules.map(i => [(i.name + (RuleHasError(i) ? " <span class='yellow'>[!]</span>" : "")), i]), false);
this.setValue(current_rule.name);
this.onchange = function(rule) {
V.currentRule = rule.ID;
@@ -1266,13 +1262,12 @@ window.rulesAssistantOptions = (function() {
textarea.innerHTML = data;
$(textarea).blur(() => {
current_rule.condition.data = textarea.value;
- //TODO: this would be a good place to cache the Function object that will be used by RuleHasError and ruleAppliesP
+ // TODO: this would be a good place to cache the Function object that will be used by RuleHasError and ruleAppliesP
reload();
});
elem.appendChild(textarea);
- if(RuleHasError(current_rule))
- {
+ if(RuleHasError(current_rule)) {
const errorMessage = document.createElement("div");
$(errorMessage).addClass("yellow");
errorMessage.innerText = "WARNING: There are errors in this condition. Please ensure the syntax is correct and equality is either '==' or '===', not '='";
@@ -2668,7 +2663,7 @@ window.rulesAssistantOptions = (function() {
default:
return value;
}
- }
+ };
class DietBaseList extends List {
constructor() {
// TODO: better data structure?
@@ -2682,7 +2677,7 @@ window.rulesAssistantOptions = (function() {
["Milk-Based", {cum: 0, milk: 2}],
];
super("Diet base", pairs, false);
- this.setValue({cum: current_rule.set.dietCum, milk: current_rule.set.dietMilk });
+ this.setValue({cum: current_rule.set.dietCum, milk: current_rule.set.dietMilk});
this.onchange = (value) => {
current_rule.set.dietCum = value.cum;
current_rule.set.dietMilk = value.milk;
@@ -2692,8 +2687,7 @@ window.rulesAssistantOptions = (function() {
setTextValue(what) {
if(what.cum == null && what.milk == null) {
super.setTextValue(capFirstChar(noDefaultSetting.text));
- }
- else {
+ } else {
super.setTextValue(`Cum: ${dietAddedText(what.cum)}, Milk: ${dietAddedText(what.milk)}`);
}
}
@@ -2979,13 +2973,10 @@ window.rulesAssistantOptions = (function() {
this.shapelist.setValue(val);
} else {
let list = val.split(' ');
- if(list.length == 2)
- {
+ if(list.length === 2) {
this.colorlist.setValue(list[0]);
this.shapelist.setValue(list[1]);
- }
- else if(list.length == 1)
- {
+ } else if(list.length === 1) {
this.colorlist.trySetValue(list[0]);
this.shapelist.trySetValue(list[0]);
}