diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js index ace71088316d4e3dba0128fb0bf89806d3e05299..13bfd77d7c0eb1f62e3e8d39b7b8e1f12ec6099f 100644 --- a/js/003-data/slaveWearData.js +++ b/js/003-data/slaveWearData.js @@ -1219,6 +1219,20 @@ App.Data.slaveWear = { } ] ]), + + armAccessory: new Map([ + // ["none", {name: "None"}], + ["hand gloves", {name: "Hand gloves"}], + ["elbow gloves", {name: "Elbow gloves"}] + + ]), + + legAccessory: new Map([ + // ["none", {name: "None"}], + ["short stockings", {name: "Short stockings"}], + ["long stockings", {name: "Long stockings"}] + + ]), }; /** * @typedef {object} slaveShoes diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js index 34a8c0bb79aa34619d45164287e90e27ba2060ed..594920cca4261feee7207884595ddc9bf67d327a 100644 --- a/src/interaction/siWardrobe.js +++ b/src/interaction/siWardrobe.js @@ -351,11 +351,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) { let links = document.createElement('div'); links.className = "choices"; - const sortedMap = new Map([ - ["hand gloves", { name: "Hand gloves" }], - ["elbow gloves", { name: "Elbow gloves" }] - ]); - links.appendChild(generateRows(sortedMap, "armAccessory", false)); + links.appendChild(generateRows(App.Data.slaveWear.armAccessory, "armAccessory", false)); el.appendChild(links); return el; @@ -415,11 +411,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) { label.append(noneLink("legAccessory")); } - const sortedMap = new Map([ - ["short stockings", { name: "Short stockings" }], - ["long stockings", { name: "Long stockings" }] - ]); - App.UI.DOM.appendNewElement("div", el, generateRows(sortedMap, "legAccessory", false), "choices"); + App.UI.DOM.appendNewElement("div", el, generateRows(App.Data.slaveWear.legAccessory, "legAccessory", false), "choices"); return el; } diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index b1305b981188630aca0a6f69576653d6970e0056..1404d02b08e6d834c27505be5df6c77e063d3e54 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -1890,12 +1890,7 @@ App.RA.options = (function() { class GlovesList extends ListSelector { constructor() { - const items = [ - ["none"], - ["hand gloves"], - ["elbow gloves"], - ]; - super("Arm accessory", items, true); + super("Arm accessory", [["None", "none"]].concat(isItemAccessible.array(App.Data.slaveWear.armAccessory)), true); this.setValue(current_rule.set.armAccessory); this.onchange = (value) => current_rule.set.armAccessory = value; } @@ -1903,12 +1898,7 @@ App.RA.options = (function() { class LeggingsList extends ListSelector { constructor() { - const items = [ - ["none"], - ["short stockings"], - ["long stockings"], - ]; - super("Leg accessory", items, true); + super("Leg accessory", [["None", "none"]].concat(isItemAccessible.array(App.Data.slaveWear.legAccessory)), true); this.setValue(current_rule.set.legAccessory); this.onchange = (value) => current_rule.set.legAccessory = value; }