diff --git a/css/rulesAssistant/activationConditions.css b/css/rulesAssistant/activationConditions.css
index 2acfd18cb8dbd87a79e6d275fb3c96e26fd45511..30433fac3bd515130016db82b527fe0ea4c8cc4f 100644
--- a/css/rulesAssistant/activationConditions.css
+++ b/css/rulesAssistant/activationConditions.css
@@ -37,3 +37,28 @@
min-width: 10em;
min-height: 2em;
}
+
+/* Encyclopedia help entry */
+
+.rule-help-getter-table {
+ display: grid;
+ grid-template-columns: max-content auto auto;
+ /*grid-column-gap: 1em;*/
+}
+
+.rule-help-getter-table .head {
+ font-weight: bold;
+ position: sticky;
+ top: -1em;
+ background-color: #111;
+}
+
+.rule-help-getter-table > div {
+ padding: 0 0.5em
+}
+
+.rule-help-getter-table > :nth-child(6n+4),
+.rule-help-getter-table > :nth-child(6n+5),
+.rule-help-getter-table > :nth-child(6n+6) {
+ background-color: #222;
+}
diff --git a/devTools/types/FC/RA.d.ts b/devTools/types/FC/RA.d.ts
index 775bfe4b32a5653f001aa8d265b38fc69d6bcd0e..d9c75fff29ffea78e0b574b757ee501e71f33834 100644
--- a/devTools/types/FC/RA.d.ts
+++ b/devTools/types/FC/RA.d.ts
@@ -10,7 +10,6 @@ declare namespace FC {
interface RuleConditions {
activation: PostFixRule;
- assignment: Assignment[];
selectedSlaves: number[];
excludedSlaves: number[];
applyRuleOnce: boolean;
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 433523bd7030119ecb475ee930452fe4eadc945e..4024db4a2190f215a8d620065b342ae66a979bf8 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -2229,6 +2229,9 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
case "chem":
count += addBetween("vchem");
break;
+ case "lactation":
+ count += addBetween("vlactation");
+ break;
}
if (count === 0) {
count++;
@@ -2242,12 +2245,154 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
cond.activation = [false, 1, "and"];
}
} catch (e) {
- console.log("everything broke", e.message, JSON.parse(JSON.stringify(cond)));
+ console.log("condition broke", e.message, JSON.parse(JSON.stringify(cond)));
cond.activation = [false, 1, "and"];
} finally {
delete cond.function;
delete cond.data;
}
+
+ // assignments
+ try {
+ if (cond.assignment.length > 0) {
+ const rule = [];
+ for (const assignment of cond.assignment) {
+ switch (assignment) {
+ case Job.REST:
+ rule.push("vrest");
+ break;
+ case Job.CHOICE:
+ rule.push("vchoice");
+ break;
+ case Job.FUCKTOY:
+ rule.push("vfucktoy");
+ break;
+ case Job.CLASSES:
+ rule.push("vclasses");
+ break;
+ case Job.HOUSE:
+ rule.push("vhouse");
+ break;
+ case Job.WHORE:
+ rule.push("vwhore");
+ break;
+ case Job.PUBLIC:
+ rule.push("vpublic");
+ break;
+ case Job.SUBORDINATE:
+ rule.push("vsubordinate");
+ break;
+ case Job.MILKED:
+ rule.push("vmilked");
+ break;
+ case Job.GLORYHOLE:
+ rule.push("vgloryhole");
+ break;
+ case Job.CONFINEMENT:
+ rule.push("vconfinement");
+ break;
+ case Job.BODYGUARD:
+ rule.push("vbodyguard");
+ break;
+ case Job.RECRUITER:
+ rule.push("vrecruiter");
+ break;
+ case Job.HEADGIRL:
+ rule.push("vheadgirl");
+ break;
+ case Job.ARCADE:
+ rule.push("varcade");
+ break;
+ case Job.MADAM:
+ rule.push("vmadam");
+ break;
+ case Job.BROTHEL:
+ rule.push("vbrothel");
+ break;
+ case Job.WARDEN:
+ rule.push("vwarden");
+ break;
+ case Job.CELLBLOCK:
+ rule.push("vcellblock");
+ break;
+ case Job.DJ:
+ rule.push("vdj");
+ break;
+ case Job.CLUB:
+ rule.push("vclub");
+ break;
+ case Job.NURSE:
+ rule.push("vnurse");
+ break;
+ case Job.CLINIC:
+ rule.push("vclinic");
+ break;
+ case Job.MILKMAID:
+ rule.push("vmilkmaid");
+ break;
+ case Job.DAIRY:
+ rule.push("vdairy");
+ break;
+ case Job.FARMER:
+ rule.push("vfarmer");
+ break;
+ case Job.FARMYARD:
+ rule.push("vfarmyard");
+ break;
+ case Job.HEADGIRLSUITE:
+ rule.push("vheadgirlsuite");
+ break;
+ case Job.CONCUBINE:
+ rule.push("vconcubine");
+ break;
+ case Job.MASTERSUITE:
+ rule.push("vmastersuite");
+ break;
+ case Job.MATRON:
+ rule.push("vmatron");
+ break;
+ case Job.NURSERY:
+ rule.push("vnursery");
+ break;
+ case Job.TEACHER:
+ rule.push("vteacher");
+ break;
+ case Job.SCHOOL:
+ rule.push("vschool");
+ break;
+ case Job.STEWARD:
+ rule.push("vsteward");
+ break;
+ case Job.QUARTER:
+ rule.push("vquarter");
+ break;
+ case Job.ATTENDANT:
+ rule.push("vattendant");
+ break;
+ case Job.SPA:
+ rule.push("vspa");
+ break;
+ }
+ }
+ rule.push(rule.length, "or");
+
+ if (!App.RA.Activation.Editor.validateRule(rule)) {
+ rule = [false, 1, "or"];
+ }
+
+ cond.activation.pop();
+ const length = cond.activation.pop();
+ cond.activation.push(...rule);
+ cond.activation.push(length + 1, "and");
+ if (!App.RA.Activation.Editor.validateRule(cond.activation)) {
+ cond.activation = [false, 1, "and"];
+ }
+ }
+ } catch (e) {
+ console.log("assignments broke", e.message, JSON.parse(JSON.stringify(cond)));
+ } finally {
+ delete cond.assignment;
+ }
}
function addBetween(key) {
diff --git a/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js b/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js
new file mode 100644
index 0000000000000000000000000000000000000000..3154391870ae7ee099e613dc8430ca8436a94a0b
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaRAActivationEditor.js
@@ -0,0 +1,61 @@
+App.Encyclopedia.addArticle("RA Condition Editor", function() {
+ /**
+ * @param {ReadonlyMap<string, Getter<*>>} getters
+ */
+ function getterTable(getters) {
+ const container = document.createElement("p");
+ container.classList.add("rule-help-getter-table");
+
+ App.UI.DOM.appendNewElement("div", container, "Name", "head");
+ App.UI.DOM.appendNewElement("div", container, "Description", "head");
+ App.UI.DOM.appendNewElement("div", container, "Requirements", "head");
+
+ for (const getter of getters.values()) {
+ if (getter.visible && !getter.visible()) {
+ continue;
+ }
+ App.UI.DOM.appendNewElement("div", container, getter.name);
+ App.UI.DOM.appendNewElement("div", container, getter.description);
+ const div = document.createElement("div");
+ if (getter.requirements) {
+ div.append(getter.requirements);
+ }
+ container.append(div);
+ }
+
+ return container;
+ }
+
+ const acc = new SpacedTextAccumulator();
+
+ acc.push("The rule conditions handle 3 different data types: Boolean, Numeric and String. Not all aggregators accept all data types.",
+ "Numeric and Boolean can be used interchangeably, the conversion is as follows:",
+ "Putting a Numeric value into a boolean aggregator will interpret 0 as false and all other values as true.",
+ "Putting a Boolean value into a numeric aggregator will interpret false as 0 and true as 1.");
+ acc.toParagraph();
+
+ App.UI.DOM.appendNewElement("h2", acc.container(), "Predefined data getters");
+
+ acc.push("There are a number of predefined getters which read values either from a slave or from the global state. They always have a predefined data type.");
+ acc.toParagraph();
+
+ let c = acc.container();
+ App.UI.DOM.appendNewElement("h3", c, "Boolean getters");
+ c.append(getterTable(App.RA.Activation.getterManager.booleanGetters));
+ App.UI.DOM.appendNewElement("h3", c, "Assignment getters");
+ acc.push("A special type of boolean getters checking if the slave has the given assignment");
+ acc.toParagraph();
+ c = acc.container();
+ c.append(getterTable(App.RA.Activation.getterManager.assignmentGetters));
+ App.UI.DOM.appendNewElement("h3", c, "Number getters");
+ c.append(getterTable(App.RA.Activation.getterManager.numberGetters));
+ App.UI.DOM.appendNewElement("h3", c, "String getters");
+ c.append(getterTable(App.RA.Activation.getterManager.stringGetters));
+ App.UI.DOM.appendNewElement("h3", c, "Custom getters");
+ acc.push("If greater freedom is required for the conditions needed, a custom data getter can be used.",
+ "It operates on a context object with the following properties: slave: The slave currently tested against.",
+ "It is required to explicitly set the return type. If the actual return type does not match the set type, the condition evaluation will fail!");
+ acc.toParagraph();
+
+ return acc.container();
+}, "obtainingSlaves");
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 63bcdcb02133888f37d803cbd59c3819502847e1..3a3709ff5f93f2066a7df7f8a9341592641f28fb 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -123,10 +123,8 @@ globalThis.ruleAppliesP = function(rule, slave) {
}
}
- // assignment / facility / special slaves / specific slaves check
- if (cond.assignment.length > 0 && !cond.assignment.includes(slave.assignment)) {
- return false;
- } else if (cond.selectedSlaves.length > 0 && !cond.selectedSlaves.includes(slave.ID)) {
+ // special slaves / specific slaves check
+ if (cond.selectedSlaves.length > 0 && !cond.selectedSlaves.includes(slave.ID)) {
return false;
} else if (cond.excludedSlaves.includes(slave.ID)) {
return false;
@@ -173,7 +171,6 @@ App.RA.newRule = function() {
function emptyConditions() {
return {
activation: [true, 1, "and"],
- assignment: [],
selectedSlaves: [],
excludedSlaves: [],
applyRuleOnce: false,
diff --git a/src/js/rulesAssistantActivationCondition.js b/src/js/rulesAssistantActivationCondition.js
index 50a46072b8fcb0d3d7f10cf2d7748ed54fdecb46..1ca6a25dd150fde5b5eb51700b1e2a897aeab85c 100644
--- a/src/js/rulesAssistantActivationCondition.js
+++ b/src/js/rulesAssistantActivationCondition.js
@@ -1,9 +1,6 @@
/**
* TODO add encyclopedia entry
*
- * Numeric and Boolean checks can be used interchangeably.
- * Putting a Numeric value into a boolean aggregator will interpret 0 as false and all other values as true.
- * Putting a Boolean value into a numeric aggregator will interpret false as 0 and true as 1.
*/
App.RA.Activation.Editor = (function() {
@@ -76,6 +73,7 @@ App.RA.Activation.Editor = (function() {
} else {
ruleDiv.append("Rule saved");
}
+ ruleDiv.append(" ", App.Encyclopedia.Dialog.linkDOM("Help", "RA Condition Editor"));
ruleDiv.append(currentRule.render());
outerDiv.append(ruleDiv);
@@ -95,6 +93,7 @@ App.RA.Activation.Editor = (function() {
div.append(new RulePartProvider(() => new RulePair("eq")).render());
div.append(new RulePartProvider(() => new RuleNegate()).render());
div.append(new RulePartProvider(() => new RuleMapCheck(App.RA.Activation.getterManager.booleanDefault)).render());
+ div.append(new RulePartProvider(() => new RuleMapCheck(App.RA.Activation.getterManager.assignmentDefault)).render());
div.append(new RulePartProvider(() => new RuleMapCheck(App.RA.Activation.getterManager.numberDefault)).render());
div.append(new RulePartProvider(() => new RuleMapCheck(App.RA.Activation.getterManager.stringDefault)).render());
div.append(new RulePartProvider(() => new RuleConstant(0)).render());
@@ -770,11 +769,12 @@ App.RA.Activation.Editor = (function() {
constructor(key) {
super();
/**
- * @type {"boolean"|"number"|"string"}
+ * @type {"boolean"|"assignment"|"number"|"string"}
*/
this.mode = App.RA.Activation.getterManager.isBoolean(key) ? "boolean"
- : App.RA.Activation.getterManager.isNumber(key) ? "number"
- : "string";
+ : App.RA.Activation.getterManager.isAssignment(key) ? "assignment"
+ : App.RA.Activation.getterManager.isNumber(key) ? "number"
+ : "string";
this.key = key;
}
@@ -784,14 +784,24 @@ App.RA.Activation.Editor = (function() {
span.classList.add("rule-condition");
makeDraggable(span, this);
// fill container
- span.append("Slave");
+ if (this.mode === "assignment") {
+ span.append("Assignment");
+ } else {
+ span.append("Slave");
+ }
let matchFound = false;
let select = document.createElement("select");
for (const [key, value] of this._getterMap) {
+ if (value.visible && !value.visible()) {
+ continue;
+ }
let el = document.createElement("option");
el.value = key;
el.textContent = value.name;
+ if (value.enabled) {
+ el.disabled = value.enabled();
+ }
if (this.key === key) {
el.selected = true;
matchFound = true;
@@ -813,7 +823,7 @@ App.RA.Activation.Editor = (function() {
}
validate() {
- if (this.mode === "boolean") {
+ if (this.mode === "boolean" || this.mode === "assignment") {
return "number";
}
return this.mode;
@@ -824,9 +834,10 @@ App.RA.Activation.Editor = (function() {
* @private
*/
get _getterMap() {
- return this.mode === "boolean" ? App.RA.Activation.getterManager.booleanGetter
- : this.mode === "number" ? App.RA.Activation.getterManager.numberGetter
- : App.RA.Activation.getterManager.stringGetter;
+ return this.mode === "boolean" ? App.RA.Activation.getterManager.booleanGetters
+ : this.mode === "assignment" ? App.RA.Activation.getterManager.assignmentGetters
+ : this.mode === "number" ? App.RA.Activation.getterManager.numberGetters
+ : App.RA.Activation.getterManager.stringGetters;
}
}
diff --git a/src/js/rulesAssistantActivationEvaluation.js b/src/js/rulesAssistantActivationEvaluation.js
index 1264a682765c5c37f5ccfc4f1ce47fcc02b1d767..1a05cdecd1f73880054128542b43eabeb5f093fa 100644
--- a/src/js/rulesAssistantActivationEvaluation.js
+++ b/src/js/rulesAssistantActivationEvaluation.js
@@ -14,10 +14,13 @@ App.RA.Activation.Context = class {
};
/**
- * TODO: add availability checks
* @template {boolean|number|string} T
* @typedef {object} Getter
* @property {string} name
+ * @property {string} description Should include possible values if applicable.
+ * @property {string} [requirements] Plaintext description of requirements to use this getter.
+ * @property {()=>boolean} [enabled] Whether the getter can be used.
+ * @property {()=>boolean} [visible] Whether the getter should be shown. Mainly intended for disabled mods.
* @property {(s: App.RA.Activation.Context) =>T} val
*/
@@ -28,17 +31,22 @@ App.RA.Activation.getterManager = (function() {
* @private
* @type {Map<string, Getter<boolean>>}
*/
- this._booleanGetter = new Map();
+ this._booleanGetters = new Map();
+ /**
+ * @private
+ * @type {Map<string, Getter<boolean>>}
+ */
+ this._assignmentGetters = new Map();
/**
* @private
* @type {Map<string, Getter<number>>}
*/
- this._numberGetter = new Map();
+ this._numberGetters = new Map();
/**
* @private
* @type {Map<string, Getter<string>>}
*/
- this._stringGetter = new Map();
+ this._stringGetters = new Map();
/**
* Adding vanilla or custom getters?
@@ -61,7 +69,15 @@ App.RA.Activation.getterManager = (function() {
* @param {Getter<boolean>} getter
*/
addBoolean(key, getter) {
- this._booleanGetter.set(this._makePrefix() + key, getter);
+ this._booleanGetters.set(this._makePrefix() + key, getter);
+ }
+
+ /**
+ * @param {string} key
+ * @param {Getter<boolean>} getter
+ */
+ addAssignment(key, getter) {
+ this._assignmentGetters.set(this._makePrefix() + key, getter);
}
/**
@@ -69,7 +85,7 @@ App.RA.Activation.getterManager = (function() {
* @param {Getter<number>} getter
*/
addNumber(key, getter) {
- this._numberGetter.set(this._makePrefix() + key, getter);
+ this._numberGetters.set(this._makePrefix() + key, getter);
}
/**
@@ -77,7 +93,7 @@ App.RA.Activation.getterManager = (function() {
* @param {Getter<string>} getter
*/
addString(key, getter) {
- this._stringGetter.set(this._makePrefix() + key, getter);
+ this._stringGetters.set(this._makePrefix() + key, getter);
}
/**
@@ -85,7 +101,8 @@ App.RA.Activation.getterManager = (function() {
* @returns {boolean}
*/
has(key) {
- return this._booleanGetter.has(key) || this._numberGetter.has(key) || this._stringGetter.has(key);
+ return this._booleanGetters.has(key) || this._assignmentGetters.has(key) ||
+ this._numberGetters.has(key) || this._stringGetters.has(key);
}
/**
@@ -93,7 +110,15 @@ App.RA.Activation.getterManager = (function() {
* @returns {boolean}
*/
isBoolean(key) {
- return this._booleanGetter.has(key);
+ return this._booleanGetters.has(key);
+ }
+
+ /**
+ * @param {string} key
+ * @returns {boolean}
+ */
+ isAssignment(key) {
+ return this._assignmentGetters.has(key);
}
/**
@@ -101,7 +126,7 @@ App.RA.Activation.getterManager = (function() {
* @returns {boolean}
*/
isNumber(key) {
- return this._numberGetter.has(key);
+ return this._numberGetters.has(key);
}
/**
@@ -109,49 +134,63 @@ App.RA.Activation.getterManager = (function() {
* @returns {boolean}
*/
isString(key) {
- return this._stringGetter.has(key);
+ return this._stringGetters.has(key);
+ }
+
+ /**
+ * @returns {ReadonlyMap<string, Getter<boolean>>}
+ */
+ get booleanGetters() {
+ return this._booleanGetters;
}
/**
* @returns {ReadonlyMap<string, Getter<boolean>>}
*/
- get booleanGetter() {
- return this._booleanGetter;
+ get assignmentGetters() {
+ return this._assignmentGetters;
}
/**
* @returns {ReadonlyMap<string, Getter<number>>}
*/
- get numberGetter() {
- return this._numberGetter;
+ get numberGetters() {
+ return this._numberGetters;
}
/**
* @returns {ReadonlyMap<string, Getter<string>>}
*/
- get stringGetter() {
- return this._stringGetter;
+ get stringGetters() {
+ return this._stringGetters;
}
/**
* @returns {string}
*/
get booleanDefault() {
- return this._booleanGetter.keys().next().value;
+ return this._booleanGetters.keys().next().value;
+ }
+
+ /**
+ * @returns {string}
+ */
+ get assignmentDefault() {
+ return this._assignmentGetters.keys().next().value;
}
/**
* @returns {string}
*/
get numberDefault() {
- return this._numberGetter.keys().next().value;
+ return this._numberGetters.keys().next().value;
}
/**
* @returns {string}
*/
get stringDefault() {
- return this._stringGetter.keys().next().value;
+ return this._stringGetters.keys().next().value;
}
/**
@@ -161,17 +200,22 @@ App.RA.Activation.getterManager = (function() {
* @returns {boolean} True, if a getter exists for the given key
*/
read(stack, context, key) {
- const getterB = this._booleanGetter.get(key);
+ let getterB = this._booleanGetters.get(key);
if (getterB !== undefined) {
stack.pushNumber(getterB.val(context) ? 1 : 0);
return true;
}
- const getterN = this._numberGetter.get(key);
+ getterB = this._assignmentGetters.get(key);
+ if (getterB !== undefined) {
+ stack.pushNumber(getterB.val(context) ? 1 : 0);
+ return true;
+ }
+ const getterN = this._numberGetters.get(key);
if (getterN !== undefined) {
stack.pushNumber(getterN.val(context));
return true;
}
- const getterS = this._stringGetter.get(key);
+ const getterS = this._stringGetters.get(key);
if (getterS !== undefined) {
stack.pushString(getterS.val(context));
return true;
@@ -186,32 +230,306 @@ App.RA.Activation.getterManager = (function() {
App.RA.Activation.populateGetters = function() {
const gm = App.RA.Activation.getterManager;
// Note: The first value of each type being added is taken as the default.
- gm.addBoolean("isfertile", {name: "Is Fertile?", val: c => isFertile(c.slave)});
- gm.addBoolean("isamputee", {name: "Is Amputee?", val: c => isAmputee(c.slave)});
- gm.addBoolean("ispregnant", {name: "Is Pregnant?", val: c => c.slave.preg > 0});
- gm.addNumber("devotion", {name: "Devotion", val: c => c.slave.devotion});
- gm.addNumber("trust", {name: "Trust", val: c => c.slave.trust});
- gm.addNumber("health", {name: "Health", val: c => c.slave.health.condition});
- gm.addNumber("fatigue", {name: "Fatigue", val: c => c.slave.health.tired});
- gm.addNumber("energy", {name: "Sex drive", val: c => c.slave.energy});
- gm.addNumber("weight", {name: "Weight", val: c => c.slave.weight});
- gm.addNumber("height", {name: "Height", val: c => c.slave.height});
- gm.addNumber("age", {name: "Age", val: c => c.slave.actualAge});
- gm.addNumber("physicalAge", {name: "Body Age", val: c => c.slave.physicalAge});
- gm.addNumber("visualAge", {name: "Visible Age", val: c => c.slave.visualAge});
- gm.addNumber("muscles", {name: "Muscles", val: c => c.slave.muscles});
- gm.addNumber("lactation", {name: "Lactation", val: c => c.slave.lactation});
- gm.addNumber("pregType", {name: "Pregnancy Multiples", val: c => c.slave.pregType});
- gm.addNumber("bellyImplant", {name: "Belly Implant", val: c => c.slave.bellyImplant});
- gm.addNumber("belly", {name: "Belly Size", val: c => c.slave.belly});
- gm.addNumber("intelligenceImplant", {name: "Education", val: c => c.slave.intelligenceImplant});
- gm.addNumber("intelligence", {name: "Intelligence", val: c => c.slave.intelligence});
- gm.addNumber("accent", {name: "Accent", val: c => c.slave.accent});
- gm.addNumber("waist", {name: "Waist", val: c => c.slave.waist});
- gm.addNumber("chem", {name: "Carcinogen Buildup", val: c => c.slave.chem});
- gm.addString("label", {name: "Label", val: c => c.slave.custom.label});
- gm.addString("genes", {name: "Sex", val: c => c.slave.genes});
- gm.addString("fetish", {name: "Fetish", val: c => c.slave.fetish});
+
+ // Booleans
+ gm.addBoolean("isfertile", {
+ name: "Is Fertile?", description: "Whether or not the slave is fertile.",
+ val: c => isFertile(c.slave)
+ });
+ gm.addBoolean("isamputee", {
+ name: "Is Amputee?", description: "Whether or not the slave has no limbs.",
+ val: c => isAmputee(c.slave)
+ });
+ gm.addBoolean("ispregnant", {
+ name: "Is Pregnant?", description: "Whether or not the slave is pregnant.",
+ val: c => c.slave.preg > 0
+ });
+
+ // Assignments
+ // Penthouse Assignments
+ gm.addAssignment("rest", {
+ name: "Resting", description: "Resting in the penthouse.",
+ val: c => c.slave.assignment === Job.REST
+ });
+ gm.addAssignment("fucktoy", {
+ name: "Fucktoy", description: "Pleasing the master.",
+ val: c => c.slave.assignment === Job.FUCKTOY
+ });
+ gm.addAssignment("classes", {
+ name: "Taking classes", description: "Taking classes to better serve.",
+ val: c => c.slave.assignment === Job.CLASSES
+ });
+ gm.addAssignment("house", {
+ name: "Cleaning", description: "Cleaning the penthouse.",
+ val: c => c.slave.assignment === Job.HOUSE
+ });
+ gm.addAssignment("whore", {
+ name: "Whoring", description: "Whoring themself out.",
+ val: c => c.slave.assignment === Job.WHORE
+ });
+ gm.addAssignment("public", {
+ name: "Serving public", description: "Serving the public.",
+ val: c => c.slave.assignment === Job.PUBLIC
+ });
+ gm.addAssignment("subordinate", {
+ name: "Subordinate", description: "Subordinate to other slaves.",
+ val: c => c.slave.assignment === Job.SUBORDINATE
+ });
+ gm.addAssignment("milked", {
+ name: "Milked", description: "Getting milked.",
+ val: c => c.slave.assignment === Job.MILKED
+ });
+ gm.addAssignment("gloryhole", {
+ name: "Glory hole", description: "Working as a glory hole.",
+ val: c => c.slave.assignment === Job.GLORYHOLE
+ });
+ gm.addAssignment("confinement", {
+ name: "Confined", description: "Confined at the penthouse.",
+ val: c => c.slave.assignment === Job.CONFINEMENT
+ });
+ gm.addAssignment("choice", {
+ name: "Choose own", description: "Allowed to choose their own job.",
+ val: c => c.slave.assignment === Job.CHOICE
+ });
+ // Leadership Assignments
+ gm.addAssignment("bodyguard", {
+ name: "Bodyguard", description: "Serving as Bodyguard.",
+ requirements: "Armory is built.", enabled: ()=>App.Entity.facilities.armory.established,
+ val: c => c.slave.assignment === Job.BODYGUARD
+ });
+ gm.addAssignment("headgirl", {
+ name: "Head Girl", description: "Serving as Head Girl",
+ val: c => c.slave.assignment === Job.HEADGIRL
+ });
+ gm.addAssignment("recruiter", {
+ name: "Recruiter", description: "Recruiting new slaves.",
+ val: c => c.slave.assignment === Job.RECRUITER
+ });
+ gm.addAssignment("agent", {
+ name: "Agent", description: "Serving as an Agent in another arcology.",
+ val: c => c.slave.assignment === Job.AGENT
+ });
+ gm.addAssignment("agentpartner", {
+ name: "Agent partner", description: "Serving an agent living in another arcology.",
+ val: c => c.slave.assignment === Job.AGENTPARTNER
+ });
+ // Facility Assignments
+ gm.addAssignment("arcade", {
+ name: "Confined in arcade", description: "Confined in the arcade.",
+ requirements: "Arcade is built.", enabled: ()=>App.Entity.facilities.arcade.established,
+ val: c => c.slave.assignment === Job.ARCADE
+ });
+ gm.addAssignment("madam", {
+ name: "Madam", description: "Serving as Madam.",
+ requirements: "Brothel is built.", enabled: ()=>App.Entity.facilities.brothel.established,
+ val: c => c.slave.assignment === Job.MADAM
+ });
+ gm.addAssignment("brothel", {
+ name: "Brothel whoring?", description: "Working in the brothel.",
+ requirements: "Brothel is built.", enabled: ()=>App.Entity.facilities.brothel.established,
+ val: c => c.slave.assignment === Job.BROTHEL
+ });
+ gm.addAssignment("warden", {
+ name: "Wardeness", description: "Serving as Wardeness.",
+ requirements: "Cellblock is built.", enabled: ()=>App.Entity.facilities.cellblock.established,
+ val: c => c.slave.assignment === Job.WARDEN
+ });
+ gm.addAssignment("cellblock", {
+ name: "Confined in cellblock?", description: "Confined in the cellblock.",
+ requirements: "Cellblock is built.", enabled: ()=>App.Entity.facilities.cellblock.established,
+ val: c => c.slave.assignment === Job.CELLBLOCK
+ });
+ gm.addAssignment("dj", {
+ name: "DJ", description: "Serving as DJ.",
+ requirements: "Club is built.", enabled: ()=>App.Entity.facilities.club.established,
+ val: c => c.slave.assignment === Job.DJ
+ });
+ gm.addAssignment("club", {
+ name: "Serving club", description: "Serving in the club.",
+ requirements: "Club is built.", enabled: ()=>App.Entity.facilities.club.established,
+ val: c => c.slave.assignment === Job.CLUB
+ });
+ gm.addAssignment("nurse", {
+ name: "Nurse", description: "Serving as Nurse.",
+ requirements: "Clinic is built.", enabled: ()=>App.Entity.facilities.clinic.established,
+ val: c => c.slave.assignment === Job.NURSE
+ });
+ gm.addAssignment("clinic", {
+ name: "Getting treatment", description: "Getting treatment in the clinic.",
+ requirements: "Clinic is built.", enabled: ()=>App.Entity.facilities.clinic.established,
+ val: c => c.slave.assignment === Job.CLINIC
+ });
+ gm.addAssignment("milkmaid", {
+ name: "Milkmaid", description: "Serving as Milkmaid",
+ requirements: "Dairy is built.", enabled: ()=>App.Entity.facilities.dairy.established,
+ val: c => c.slave.assignment === Job.MILKMAID
+ });
+ gm.addAssignment("dairy", {
+ name: "Work dairy", description: "Working in the dairy",
+ requirements: "Dairy is built.", enabled: ()=>App.Entity.facilities.dairy.established,
+ val: c => c.slave.assignment === Job.DAIRY
+ });
+ gm.addAssignment("farmer", {
+ name: "Farmer", description: "Serving as Farmer",
+ requirements: "Farmyard is built.", enabled: ()=>App.Entity.facilities.farmyard.established,
+ val: c => c.slave.assignment === Job.FARMER
+ });
+ gm.addAssignment("farmyard", {
+ name: "Farmhand", description: "Working as a farmhand.",
+ requirements: "Farmyard is built.", enabled: ()=>App.Entity.facilities.farmyard.established,
+ val: c => c.slave.assignment === Job.FARMYARD
+ });
+ gm.addAssignment("headgirlsuite", {
+ name: "Head Girl Servant", description: "Living with the Head Girl.",
+ requirements: "Head Girl Suite is built.", enabled: ()=>App.Entity.facilities.headGirlSuite.established,
+ val: c => c.slave.assignment === Job.HEADGIRLSUITE
+ });
+ gm.addAssignment("concubine", {
+ name: "Concubine", description: "Serving as Concubine.",
+ requirements: "Master suite is built.", enabled: ()=>App.Entity.facilities.masterSuite.established,
+ val: c => c.slave.assignment === Job.CONCUBINE
+ });
+ gm.addAssignment("mastersuite", {
+ name: "Master suite servant", description: "Serving in the master suite.",
+ requirements: "Master suite is built.", enabled: ()=>App.Entity.facilities.masterSuite.established,
+ val: c => c.slave.assignment === Job.MASTERSUITE
+ });
+ gm.addAssignment("matron", {
+ name: "Matron", description: "Serving as Matron.",
+ requirements: "Nursery is built.", enabled: ()=>App.Entity.facilities.nursery.established,
+ visible: () => V.experimental.nursery > 0,
+ val: c => c.slave.assignment === Job.MATRON
+ });
+ gm.addAssignment("nursery", {
+ name: "Nanny", description: "Working as a nanny.",
+ requirements: "Nursery is built.", enabled: ()=>App.Entity.facilities.nursery.established,
+ visible: () => V.experimental.nursery > 0,
+ val: c => c.slave.assignment === Job.NURSERY
+ });
+ gm.addAssignment("teacher", {
+ name: "Schoolteacher", description: "Serving as Schoolteacher.",
+ requirements: "Schoolroom is built.", enabled: ()=>App.Entity.facilities.schoolroom.established,
+ val: c => c.slave.assignment === Job.TEACHER
+ });
+ gm.addAssignment("school", {
+ name: "Learning", description: "Learning in the schoolroom.",
+ requirements: "Schoolroom is built.", enabled: ()=>App.Entity.facilities.schoolroom.established,
+ val: c => c.slave.assignment === Job.SCHOOL
+ });
+ gm.addAssignment("steward", {
+ name: "Stewardess", description: "Serving as Stewardess.",
+ requirements: "Servants Quarters are built.",
+ enabled: ()=>App.Entity.facilities.servantsQuarters.established,
+ val: c => c.slave.assignment === Job.STEWARD
+ });
+ gm.addAssignment("quarter", {
+ name: "Servant", description: "Working as a servant in the Servants Quarters.",
+ requirements: "Servants Quarters are built.",
+ enabled: ()=>App.Entity.facilities.servantsQuarters.established,
+ val: c => c.slave.assignment === Job.QUARTER
+ });
+ gm.addAssignment("attendant", {
+ name: "Attendant", description: "Serving as Attendant.",
+ requirements: "Spa is built.", enabled: ()=>App.Entity.facilities.spa.established,
+ val: c => c.slave.assignment === Job.ATTENDANT
+ });
+ gm.addAssignment("spa", {
+ name: "Spa resting", description: "Resting in the spa.",
+ requirements: "Spa is built.", enabled: () => App.Entity.facilities.spa.established,
+ val: c => c.slave.assignment === Job.SPA
+ });
+
+ // Numbers
+ gm.addNumber("devotion", {
+ name: "Devotion",
+ description: "Very Hateful: (-∞, -95), Hateful: [-95, -50), Resistant: [-50, -20), Ambivalent: [-20, 20], Accepting: (20, 50], Devoted: (50, 95], Worshipful: (95, ∞)",
+ val: c => c.slave.devotion
+ });
+ gm.addNumber("trust", {
+ name: "Trust",
+ description: "Extremely terrified: (-∞, -95), Terrified: [-95, -50), Frightened: [-50, -20), Fearful: [-20, 20], Careful: (20, 50], Trusting: (50, 95], Total trust: (95, ∞)",
+ val: c => c.slave.trust
+ });
+ gm.addNumber("health", {
+ name: "Health",
+ description: "Death: (-∞, -100), Near Death: [-100, -90), Extremely Unhealthy: [-90, -50), Unhealthy: [-50, -20), Healthy: [-20, 20], Very Healthy: (20, 50], Extremely Healthy: (50, 90], Unnaturally Healthy: (90, ∞)",
+ val: c => c.slave.health.condition
+ });
+ gm.addNumber("fatigue", {
+ name: "Fatigue",
+ description: "Energetic: (-∞, 0], Rested: (0, 30], Tired: (30, 60], Fatigued: (60, 90], Exhausted: (90, ∞)",
+ val: c => c.slave.health.tired
+ });
+ gm.addNumber("energy", {
+ name: "Sex drive",
+ description: "Frigid: (-∞, 20], Poor: (20, 40], Average: (40, 60], Powerful: (60, 80], Sex Addict: (80, 100), Nympho: 100",
+ val: c => c.slave.energy
+ });
+ gm.addNumber("weight", {
+ name: "Weight",
+ description: "Emaciated: (-∞, -95), Skinny: [-95, -30), Thin: [-30, -10), Average: [-10, 10], Plush: (10, 30], Overweight: (30, 95], Fat: (95, 130], Obese: (130, 160], Super Obese: (160, 190], Dangerously Obese: (190, ∞)",
+ val: c => c.slave.weight
+ });
+ gm.addNumber("height", {name: "Height", description: "Slave height in cm.", val: c => c.slave.height});
+ gm.addNumber("age", {name: "Age", description: "Real slave age", val: c => c.slave.actualAge});
+ gm.addNumber("physicalAge", {
+ name: "Body Age", description: "Age of the slave's body.",
+ val: c => c.slave.physicalAge
+ });
+ gm.addNumber("visualAge", {
+ name: "Visible Age", description: "How old the slave looks.",
+ val: c => c.slave.visualAge
+ });
+ gm.addNumber("muscles", {
+ name: "Muscles",
+ description: "Frail: (-∞, -96), Very weak: [-96, -31], Weak: [-31, -6), Soft: [-6, 5), Toned: [5, 30), Fit: [30, 50), Muscular: [50, 95), Hugely muscular: [95, ∞)",
+ val: c => c.slave.muscles
+ });
+ gm.addNumber("lactation", {
+ name: "Lactation", description: "0: None, 1: Natural, 2: Lactation implant",
+ val: c => c.slave.lactation
+ });
+ gm.addNumber("pregType", {
+ name: "Pregnancy Multiples", description: "Fetus count, known only after the 10th week of pregnancy",
+ val: c => c.slave.pregType
+ });
+ gm.addNumber("bellyImplant", {
+ name: "Belly Implant", description: "Volume in CCs. None: -1",
+ val: c => c.slave.bellyImplant
+ });
+ gm.addNumber("belly", {name: "Belly Size", description: "Volume in CCs, any source", val: c => c.slave.belly});
+ gm.addNumber("intelligenceImplant", {
+ name: "Education",
+ description: "Education level. 0: uneducated, 15: educated, 30: advanced education, (0, 15): incomplete education.",
+ val: c => c.slave.intelligenceImplant
+ });
+ gm.addNumber("intelligence", {
+ name: "Intelligence", description: "From moronic to brilliant: [-100, 100]",
+ val: c => c.slave.intelligence
+ });
+ gm.addNumber("accent", {
+ name: "Accent", description: "No accent: 0, Nice accent: 1, Bad accent: 2, Can't speak language: 3 and above",
+ val: c => c.slave.accent
+ });
+ gm.addNumber("waist", {
+ name: "Waist",
+ description: "Masculine waist: (95, ∞), Ugly waist: (40, 95], Unattractive waist: (10, 40], Average waist: [-10, 10], Feminine waist: [-40, -10), Wasp waist: [-95, -40), Absurdly narrow: (-∞, -95)",
+ val: c => c.slave.waist
+ });
+ gm.addNumber("chem", {
+ name: "Carcinogen Buildup",
+ description: "Side effects from drug use. If greater than 10 triggers will have negative consequences.",
+ val: c => c.slave.chem
+ });
+
+ // Strings
+ gm.addString("label", {name: "Label", description: "Assigned Label", val: c => c.slave.custom.label});
+ gm.addString("genes", {name: "Sex", description: "Genetic sex: Male: XX, Female: XY", val: c => c.slave.genes});
+ gm.addString("fetish", {
+ name: "Fetish",
+ description: "One of buttslut, cumslut, masochist, sadist, dom, submissive, boobs, pregnancy, none (AKA vanilla)",
+ val: c => c.slave.fetish
+ });
// Do this last:
gm.vanillaDone();
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index e3d1039d85ae2392e3b2f0ee86c066c3db5f068d..c41aa7ff14e7f7d890e1d9730bf22cb3aa28b109 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1287,8 +1287,6 @@ App.RA.options = (function() {
constructor() {
super("Activation Condition");
this.appendChild(new ConditionBuilder());
- this.appendChild(new AssignmentInclusion());
- this.appendChild(new FacilityHeadAssignmentInclusion());
this.appendChild(new SpecificInclusionExclusion());
this.appendChild(new ApplyRuleOnce());
}
@@ -1300,71 +1298,6 @@ App.RA.options = (function() {
}
}
- class AssignmentInclusionBase extends ButtonList {
- /**
- * @param {string} label
- * @param {FC.Data.JobDesc[]} [jobs]
- * @param {App.Entity.Facilities.SingleJobFacility[]} [facilities]
- */
- constructor(label, jobs, facilities) {
- super(label);
- this._attributes = {};
- if (jobs !== undefined) {
- jobs.forEach(job => {
- this._attributes[capFirstChar(job.position)] = job.assignment;
- });
- }
- if (facilities !== undefined) {
- facilities.forEach(f => {
- if (f.established && f.desc.defaultJob != null) { /* eslint-disable-line eqeqeq */
- const displayName = f.name === "the " + f.genericName ? f.genericName : f.name;
- this._attributes[displayName] = f.desc.jobs[f.desc.defaultJob].assignment;
- }
- });
- }
- for (const i in this._attributes) {
- this.appendChild(new ButtonItem(i, this.getAttribute(i), current_rule.condition.assignment.includes(this.getAttribute(i))));
- }
- }
-
- onchange() {
- const allValues = this.getAllValues();
- current_rule.condition.assignment = this.getSelection().concat(current_rule.condition.assignment.filter(a => !allValues.includes(a)));
- }
-
- getAttribute(what) {
- return this._attributes[what];
- }
- }
-
-
- class AssignmentInclusion extends AssignmentInclusionBase {
- constructor() {
- let facilities = [];
- for (const f of Object.values(App.Entity.facilities)) {
- if (f === App.Entity.facilities.penthouse) {
- continue;
- }
- if (f.established) {
- facilities.push(f);
- }
- }
- super("Apply to assignments and facilities", Object.values(App.Data.Facilities.penthouse.jobs), facilities);
- }
- }
-
- class FacilityHeadAssignmentInclusion extends AssignmentInclusionBase {
- constructor() {
- const jobs = [];
- for (const f of Object.values(App.Entity.facilities)) {
- if (f.established && f.desc.manager !== null) {
- jobs.push(f.desc.manager);
- }
- }
- super("Apply to facility heads", jobs);
- }
- }
-
class SpecificInclusionExclusion extends Options {
constructor() {
super();