From 3c94349d6b7910d8eaa706c0ec93b76d050ce21e Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Sun, 9 Aug 2020 02:15:24 -0400 Subject: [PATCH] revert unneeded check --- src/interaction/wardrobeUse.js | 272 +++++++++++++++------------------ 1 file changed, 122 insertions(+), 150 deletions(-) diff --git a/src/interaction/wardrobeUse.js b/src/interaction/wardrobeUse.js index 7a3cea81777..2203e7df071 100644 --- a/src/interaction/wardrobeUse.js +++ b/src/interaction/wardrobeUse.js @@ -34,30 +34,26 @@ App.UI.Wardrobe.clothes = function(slave) { let clothingOption; // Nice clothes App.Data.misc.niceClothes.forEach(item => { - if (isItemAccessible.entry(item.value, "clothing", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {clothes: item.value, choosesOwnClothes: 0} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - niceOptionsArray.push(clothingOption); + clothingOption = { + text: item.name, + updateSlave: {clothes: item.value, choosesOwnClothes: 0} + }; + if (item.fs) { + clothingOption.FS = item.fs; } + niceOptionsArray.push(clothingOption); }); // Harsh clothes App.Data.misc.harshClothes.forEach(item => { - if (isItemAccessible.entry(item.value, "clothing", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {clothes: item.value, choosesOwnClothes: 0} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - if (item.value !== "choosing her own clothes") { - harshOptionsArray.push(clothingOption); - } + clothingOption = { + text: item.name, + updateSlave: {clothes: item.value, choosesOwnClothes: 0} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } + if (item.value !== "choosing her own clothes") { + harshOptionsArray.push(clothingOption); } }); @@ -123,29 +119,25 @@ App.UI.Wardrobe.collar = function(slave) { let clothingOption; // Nice collar App.Data.misc.niceCollars.forEach(item => { - if (isItemAccessible.entry(item.value, "collar", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {collar: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - niceOptionsArray.push(clothingOption); + clothingOption = { + text: item.name, + updateSlave: {collar: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; } + niceOptionsArray.push(clothingOption); }); // Harsh collar App.Data.misc.harshCollars.forEach(item => { - if (isItemAccessible.entry(item.value, "collar", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {collar: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - harshOptionsArray.push(clothingOption); + clothingOption = { + text: item.name, + updateSlave: {collar: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; } + harshOptionsArray.push(clothingOption); }); // Sort @@ -196,16 +188,14 @@ App.UI.Wardrobe.mask = function(slave) { let clothingOption; App.Data.misc.faceAccessory.forEach(item => { - if (isItemAccessible.entry(item.value, "faceAccessory", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {faceAccessory: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - array.push(clothingOption); + clothingOption = { + text: item.name, + updateSlave: {faceAccessory: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; } + array.push(clothingOption); }); // Sort @@ -260,16 +250,14 @@ App.UI.Wardrobe.mouth = function(slave) { let clothingOption; // mouthAccessory App.Data.misc.mouthAccessory.forEach(item => { - if (isItemAccessible.entry(item.value, "mouthAccessory", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {mouthAccessory: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - array.push(clothingOption); + clothingOption = { + text: item.name, + updateSlave: {mouthAccessory: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; } + array.push(clothingOption); }); // Sort @@ -356,16 +344,14 @@ App.UI.Wardrobe.shoes = function(slave) { let clothingOption; App.Data.misc.shoes.forEach(item => { - if (isItemAccessible.entry(item.value, "shoes", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {shoes: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - optionsArray.push(clothingOption); + clothingOption = { + text: item.name, + updateSlave: {shoes: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; } + optionsArray.push(clothingOption); }); // Sort @@ -449,18 +435,16 @@ App.UI.Wardrobe.bellyAccessory = function(slave) { let clothingOption; App.Data.misc.bellyAccessories.forEach(item => { - if (isItemAccessible.entry(item.value, "bellyAccessories", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {bellyAccessory: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + clothingOption = { + text: item.name, + updateSlave: {bellyAccessory: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); // Sort @@ -530,19 +514,17 @@ App.UI.Wardrobe.buttplug = function(slave) { let clothingOption; App.Data.misc.buttplugs.forEach(item => { - if (isItemAccessible.entry(item.value, "buttplugs", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {buttplug: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } + clothingOption = { + text: item.name, + updateSlave: {buttplug: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); @@ -591,19 +573,17 @@ App.UI.Wardrobe.buttplugAttachment = function(slave) { let clothingOption; App.Data.misc.buttplugAttachments.forEach(item => { - if (isItemAccessible.entry(item.value, "buttplugAttachments", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {buttplugAttachment: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } + clothingOption = { + text: item.name, + updateSlave: {buttplugAttachment: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); @@ -651,19 +631,17 @@ App.UI.Wardrobe.vaginalAccessory = function(slave) { let clothingOption; App.Data.misc.vaginalAccessories.forEach(item => { - if (isItemAccessible.entry(item.value, "vaginalAccessories", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {vaginalAccessory: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } + clothingOption = { + text: item.name, + updateSlave: {vaginalAccessory: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); @@ -713,19 +691,17 @@ App.UI.Wardrobe.vaginalAttachment = function(slave) { let clothingOption; App.Data.misc.vaginalAttachments.forEach(item => { - if (isItemAccessible.entry(item.value, "vaginalAttachments", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {vaginalAttachment: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } + clothingOption = { + text: item.name, + updateSlave: {vaginalAttachment: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); @@ -773,19 +749,17 @@ App.UI.Wardrobe.dickAccessory = function(slave) { let clothingOption; App.Data.misc.dickAccessories.forEach(item => { - if (isItemAccessible.entry(item.value, "dickAccessories", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {dickAccessory: item.value} - }; - if (item.fs) { - clothingOption.FS = item.fs; - } + clothingOption = { + text: item.name, + updateSlave: {dickAccessory: item.value} + }; + if (item.fs) { + clothingOption.FS = item.fs; + } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); @@ -860,19 +834,17 @@ App.UI.Wardrobe.chastity = function(slave) { let clothingOption; App.Data.misc.chastityDevices.forEach(item => { - if (isItemAccessible.entry(item.value, "chastityDevices", slave) === true) { - clothingOption = { - text: item.name, - updateSlave: {} - }; - Object.assign(clothingOption.updateSlave, item.updateSlave); - if (item.fs) { - clothingOption.FS = item.fs; - } - if (item.value !== "none") { - // skip none in set, we set the link elsewhere. - optionsArray.push(clothingOption); - } + clothingOption = { + text: item.name, + updateSlave: {} + }; + Object.assign(clothingOption.updateSlave, item.updateSlave); + if (item.fs) { + clothingOption.FS = item.fs; + } + if (item.value !== "none") { + // skip none in set, we set the link elsewhere. + optionsArray.push(clothingOption); } }); -- GitLab