diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 393f0435ad68314852c96283f1ab0517801a5cb4..09ca307f1daf05852e37fc332880facde4a13cd5 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -2106,7 +2106,7 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
]);
for (const acc of vaginalAccessories) {
- if (set[acc] && !(App.Data.vaginalAccessory.get(set[acc]) || V.customItem.dildos.get(set[acc]))) {
+ if (set[acc] && !(App.Data.vaginalAccessory.get(set[acc]) || V.customItem.vaginalAccessory.get(set[acc]))) {
set[acc] = null;
}
}
diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js
index 14ec49e179aa3c613d946dc00006708a0c5a1a15..9f4f4c782a46a7e0ca4018925c1ec2a9e9021737 100644
--- a/src/endWeek/saClothes.js
+++ b/src/endWeek/saClothes.js
@@ -920,7 +920,7 @@ App.SlaveAssignment.clothes = (function() {
*
*/
function vaginaAccessories(slave) {
- const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.vaginalAccessory.get(slave.vaginalAccessory);
if (slave.vaginalAccessory !== "none") {
if (dildo.width === 0) {
r.push(`Constantly wearing a ${slave.vaginalAccessory}`);
diff --git a/src/facilities/toyShop/toyShop.js b/src/facilities/toyShop/toyShop.js
index 84ac5b700889cf72295d9af2100f280f12df2f16..9cc2b7269adf5f03c626c3d1a49050cee88bfa83 100644
--- a/src/facilities/toyShop/toyShop.js
+++ b/src/facilities/toyShop/toyShop.js
@@ -43,7 +43,7 @@ App.UI.toyShop = function() {
init();
refresh();
}));
- if (V.customItem.buttPlugs.size > 0) {
+ if (V.customItem.buttplug.size > 0) {
select.append(selectDesign());
}
el.append(create());
@@ -51,7 +51,7 @@ App.UI.toyShop = function() {
function create() {
const el = new DocumentFragment();
- const existingDesign = V.customItem.buttPlugs.get(buttPlugName);
+ const existingDesign = V.customItem.buttplug.get(buttPlugName);
if (existingDesign) {
el.append(descLocked());
} else {
@@ -97,7 +97,7 @@ App.UI.toyShop = function() {
const choice = App.UI.DOM.appendNewElement("span", el, ` or choose an existing design to edit `);
const select = App.UI.DOM.appendNewElement("select", choice);
let matchFound = false;
- for (const [key, values] of V.customItem.buttPlugs) {
+ for (const [key, values] of V.customItem.buttplug) {
const option = App.UI.DOM.appendNewElement("option", select, values.name);
option.value = key;
if (option.value === buttPlugName) {
@@ -112,7 +112,7 @@ App.UI.toyShop = function() {
const O = select.options[select.selectedIndex];
selectedPlug = O.value;
buttPlugName = selectedPlug;
- buttPlugData = V.customItem.buttPlugs.get(selectedPlug);
+ buttPlugData = V.customItem.buttplug.get(selectedPlug);
refresh();
};
return el;
@@ -208,7 +208,7 @@ App.UI.toyShop = function() {
}
function buildPlug() {
- V.customItem.buttPlugs.set(buttPlugName, buttPlugData);
+ V.customItem.buttplug.set(buttPlugName, buttPlugData);
init();
refresh();
}
@@ -225,7 +225,7 @@ App.UI.toyShop = function() {
}
function deletePlug() {
- V.customItem.buttPlugs.delete(buttPlugName);
+ V.customItem.buttplug.delete(buttPlugName);
for (const slave of V.slaves) {
if (slave.buttplug === buttPlugName) {
slave.buttplug = "none";
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 574596fb0df796b287f77c2a61b7fb6f588c562f..6d72f7debae4cd83bfd2f0754b8018d06c59c557 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -520,9 +520,9 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
App.UI.DOM.appendNewElement("div", el, generateRows(normalArray, "buttplug", true), "choices");
App.UI.DOM.appendNewElement("div", el, generateRows(longArray, "buttplug", true), "choices");
- if (V.customItem.buttPlugs.size > 0) {
+ if (V.customItem.buttplug.size > 0) {
let customArray = [];
- for (const [key, object] of V.customItem.buttPlugs) {
+ for (const [key, object] of V.customItem.buttplug) {
const reshapedItem = {
text: object.name,
updateSlave: {buttplug: key},
diff --git a/src/js/utilsAssessSlave.js b/src/js/utilsAssessSlave.js
index 08afc9fc5d2bb9b5f5bcec58ebbe6a24181c19cc..eb84a673e9283ba12d04584d2a8fcef2d62b9e02 100644
--- a/src/js/utilsAssessSlave.js
+++ b/src/js/utilsAssessSlave.js
@@ -274,7 +274,7 @@ globalThis.shoeHeight = function(slave) {
* @returns {0|1|2|3}
*/
globalThis.plugWidth = function(slave) {
- const plug = App.Data.buttplug.get(slave.buttplug) || V.customItem.buttPlugs.get(slave.buttplug);
+ const plug = App.Data.buttplug.get(slave.buttplug) || V.customItem.buttplug.get(slave.buttplug);
return plug.width || 0;
};
@@ -283,7 +283,7 @@ globalThis.plugWidth = function(slave) {
* @returns {0|1|2|3}
*/
globalThis.plugLength = function(slave) {
- const plug = App.Data.buttplug.get(slave.buttplug) || V.customItem.buttPlugs.get(slave.buttplug);
+ const plug = App.Data.buttplug.get(slave.buttplug) || V.customItem.buttplug.get(slave.buttplug);
return plug.length || 0;
};
@@ -292,7 +292,7 @@ globalThis.plugLength = function(slave) {
* @returns {0|1|2|3}
*/
globalThis.dildoWidth = function(slave) {
- const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.vaginalAccessory.get(slave.vaginalAccessory);
if (dildo === undefined) {
console.log("missing dildo: ", slave.vaginalAccessory)
return 0
@@ -305,7 +305,7 @@ globalThis.dildoWidth = function(slave) {
* @returns {0|1|2}
*/
globalThis.dildoLength = function(slave) {
- const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.vaginalAccessory.get(slave.vaginalAccessory);
return dildo.length || 0;
};
@@ -314,6 +314,6 @@ globalThis.dildoLength = function(slave) {
* @returns {number}
*/
globalThis.dildoVibeLevel = function(slave) {
- const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.vaginalAccessory.get(slave.vaginalAccessory);
return dildo.vibrates || 0;
};
diff --git a/src/npc/descriptions/butt/buttplug.js b/src/npc/descriptions/butt/buttplug.js
index c1bd70d9b6389b08d6db457a43ae5a44deed93b5..d128de1c4eacff855293404a3dbf22cebe7459e0 100644
--- a/src/npc/descriptions/butt/buttplug.js
+++ b/src/npc/descriptions/butt/buttplug.js
@@ -612,7 +612,7 @@ App.Desc.buttplug = function(slave, { market, eventDescription } = {}) {
}
}
}
- const buttplug = App.Data.buttplug.get(slave.buttplug) || V.customItem.buttPlugs.get(slave.buttplug);
+ const buttplug = App.Data.buttplug.get(slave.buttplug) || V.customItem.buttplug.get(slave.buttplug);
if (buttplug.width === 1) {
if (buttplug.length === 1) {
r.push(`It's filled by a standard sized`);
diff --git a/src/npc/descriptions/crotch/vaginalAccessory.js b/src/npc/descriptions/crotch/vaginalAccessory.js
index dc53ab6f40344284c93944d38a431cc4013a5f38..74d9d8c5f6f4b8212a44afd23df921d9b746e532 100644
--- a/src/npc/descriptions/crotch/vaginalAccessory.js
+++ b/src/npc/descriptions/crotch/vaginalAccessory.js
@@ -18,7 +18,7 @@ App.Desc.vaginalAccessory = function(slave) {
} else {
held = `held in place by a strap, which ${he} can remove for vaginal intercourse`;
}
- const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.dildos.get(slave.vaginalAccessory);
+ const dildo = App.Data.vaginalAccessory.get(slave.vaginalAccessory) || V.customItem.vaginalAccessory.get(slave.vaginalAccessory);
switch (dildo.width) {
case 0:
r.push(`A ${slave.vaginalAccessory} is attached on ${his} clit, ${held}.`); // FIXME: not super happy with this