From 91b59e7b14b23a628634e91437a57e87cd687bdc Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 6 Jan 2021 20:56:04 -0500
Subject: [PATCH] data for leg and arm acc
---
js/003-data/slaveWearData.js | 14 ++++++++++++++
src/interaction/siWardrobe.js | 12 ++----------
src/js/rulesAssistantOptions.js | 14 ++------------
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js
index ace71088316..13bfd77d7c0 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 34a8c0bb79a..594920cca42 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 b1305b98118..1404d02b08e 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;
}
--
GitLab