From 411b3def6d9ec76355d11cfa58ff9b4b2bc118f2 Mon Sep 17 00:00:00 2001 From: Vasileios Pasialiokis <whiterocket@outlook.com> Date: Tue, 26 Jun 2018 19:32:19 +0300 Subject: [PATCH] various RA additions --- src/js/DefaultRules.tw | 8 ++++++++ src/js/rulesAssistant.tw | 1 + src/js/rulesAssistantOptions.tw | 20 +++++++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index f932d459812..2f79ad354c2 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -23,6 +23,7 @@ window.DefaultRules = (function() { ProcessAnalAccessories(slave, rule); ProcessShoes(slave, rule); ProcessBellyAccessories(slave, rule); + ProcessLegAccessory(slave, rule); } ProcessBellyImplant(slave, rule); if (isFertile(slave)) @@ -671,6 +672,13 @@ window.DefaultRules = (function() { } } + function ProcessLegAccessory(slave, rule) { + if (rule.legAccessory !== undefined && rule.legAccessory !== "no default setting" && slave.amp !== 1 && slave.legAccessory !== rule.legAccessory) { + slave.legAccessory = rule.legAccessory; + r += `<br>${slave.slaveName}'s leg accessory was set to ${rule.legAccessory}.`; + } + } + function ProcessAnalAccessories(slave, rule) { // apply buttplugs to slave if ((slave.vaginalAccessory !== "anal chastity") && (slave.vaginalAccessory !== "combined chastity") && (slave.dickAccessory !== "anal chastity") && (slave.dickAccessory !== "combined chastity")) { diff --git a/src/js/rulesAssistant.tw b/src/js/rulesAssistant.tw index b0682e7bf23..5bec4212291 100644 --- a/src/js/rulesAssistant.tw +++ b/src/js/rulesAssistant.tw @@ -222,6 +222,7 @@ window.emptyDefaultRule = function emptyDefaultRule() { clothes: "no default setting", collar: "no default setting", shoes: "no default setting", + legAccessory: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw index 942c29a9281..a2a355f5a20 100644 --- a/src/js/rulesAssistantOptions.tw +++ b/src/js/rulesAssistantOptions.tw @@ -537,6 +537,7 @@ window.rulesAssistantOptions = (function() { ["Fetish", "fetish"], ["Accent", "accent"], ["Waist", "waist"], + ["Amputation", "amp"], ]; this.fnlist = new List("Activation function", items); this.fnlist.setValue(current_rule.condition.function === "between" ? current_rule.condition.data.attribute : current_rule.condition.function); @@ -586,6 +587,7 @@ window.rulesAssistantOptions = (function() { belongsP(attribute) { return [ "fetish", + "amp", ].includes(attribute); } @@ -634,7 +636,7 @@ window.rulesAssistantOptions = (function() { class CustomEditor extends Element { constructor(data) { - if (data.length === 0) data = "(function(slave) { return slave.slaveName === 'Fancy Name'; })"; + if (data.length === 0) data = "(slave) => slave.slaveName === 'Fancy Name'"; super(data); } @@ -745,6 +747,7 @@ window.rulesAssistantOptions = (function() { info(attribute) { return "Insert a valid JSON array. Known values: " + { "fetish": "buttslut, cumslut, masochist, sadist, dom, submissive, boobs, pregnancy, none (AKA vanilla)", + "amp": "Amputated: 1, Not amputated: 0", }[attribute]; } @@ -896,6 +899,7 @@ window.rulesAssistantOptions = (function() { this.appendChild(new CollarList()); this.appendChild(new ShoeList()); this.appendChild(new CorsetList()); + this.appendChild(new LeggingsList()); this.appendChild(new VagAccVirginsList()); this.appendChild(new VagAccAVirginsList()); this.appendChild(new VagAccOtherList()); @@ -1178,6 +1182,20 @@ window.rulesAssistantOptions = (function() { } } + class LeggingsList extends List { + constructor() { + const items = [ + "no default settings", + "none", + "short stockings", + "long stockings", + ]; + super("Leg accessory", items); + this.setValue(current_rule.set.legAccessory); + this.onchange = (value) => current_rule.set.legAccessory = value; + } + } + class VagAccVirginsList extends List { constructor() { const accs = []; -- GitLab