From c2f322d8fb8d05fa85980718ee39d361478d5643 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 20 Dec 2020 02:49:40 -0500
Subject: [PATCH] add humiliating
---
src/interaction/siUtilities.js | 8 ++++++--
src/interaction/siWardrobe.js | 6 ++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/interaction/siUtilities.js b/src/interaction/siUtilities.js
index 4592d2fa6f1..a9c6731dddc 100644
--- a/src/interaction/siUtilities.js
+++ b/src/interaction/siUtilities.js
@@ -33,6 +33,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
* @property {string} [disabled] - text indicating why the option is unavailable
* @property {string} [note]
* @property {string} [slutty]
+ * @property {string} [humiliating]
*/
/** Generate a row of choices
@@ -65,7 +66,10 @@ App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck
if (item.hasOwnProperty("slutty")) {
toolTips.push(item.slutty ? 'Slutty' : 'Modest');
}
- console.log(item);
+ if (item.hasOwnProperty("humiliating") && item.humiliating) {
+ toolTips.push('Humiliating');
+ }
+
// Set up the link
link.appendChild(
@@ -74,7 +78,7 @@ App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck
() => { click(item); },
[],
"",
- toolTips.join(" ")
+ (toolTips.length > 1) ? arrayToSentence(toolTips) : toolTips.join(" ")
)
);
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 4e8eca0558c..69a6efaa78d 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -58,7 +58,8 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
text: item.name,
updateSlave: {clothes: item.value, choosesOwnClothes: 0},
FS: item.fs,
- slutty: item.slutty
+ slutty: item.slutty,
+ humiliating: item.humiliating
};
niceOptionsArray.push(clothingOption);
});
@@ -68,7 +69,8 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
text: item.name,
updateSlave: {clothes: item.value, choosesOwnClothes: 0},
FS: item.fs,
- slutty: item.slutty
+ slutty: item.slutty,
+ humiliating: item.humiliating
};
if (item.value !== "choosing her own clothes") {
harshOptionsArray.push(clothingOption);
--
GitLab