From 7323f0e06fda00fdea04a3c44da0a4d6521c6fc6 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 28 Jan 2021 09:39:03 -0500
Subject: [PATCH] remove many instances of "choosing her own clothes"
---
js/003-data/slaveWearData.js | 8 --------
src/art/vector/VectorArtJS.js | 9 ---------
src/endWeek/saChoosesOwnClothes.js | 3 ---
src/interaction/siWardrobe.js | 23 +----------------------
src/js/SlaveState.js | 1 -
src/npc/databases/dSlavesDatabase.js | 4 ++--
src/npc/descriptions/style/clothing.js | 7 +------
src/uncategorized/reRecruit.tw | 8 ++++----
8 files changed, 8 insertions(+), 55 deletions(-)
diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js
index be2c424ccf4..76d321f1d93 100644
--- a/js/003-data/slaveWearData.js
+++ b/js/003-data/slaveWearData.js
@@ -875,14 +875,6 @@ App.Data.clothes = new Map([
},
}
],
-
- /*
- ["choosing her own clothes",
-{
- name: "Let them choose",
- }
-],
- */
["a halter top dress",
{
name: "Haltertop dress",
diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index d58a6ce3ed2..71b8573f961 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1315,7 +1315,6 @@ App.Art.vectorArtElement = (function() {
case "attractive lingerie":
case "body oil":
case "chains":
- case "choosing her own clothes":
case "clubslut netting":
case "no clothing":
case "overalls":
@@ -1367,7 +1366,6 @@ App.Art.vectorArtElement = (function() {
case "body oil":
case "boyshorts":
case "chains":
- case "choosing her own clothes":
case "cutoffs":
case "jeans":
case "kitty lingerie":
@@ -1474,7 +1472,6 @@ App.Art.vectorArtElement = (function() {
case "body oil":
case "boyshorts":
case "chains":
- case "choosing her own clothes":
case "clubslut netting":
case "cutoffs":
case "jeans":
@@ -1544,7 +1541,6 @@ App.Art.vectorArtElement = (function() {
case "a tight Imperial bodysuit":
case "body oil":
case "boyshorts":
- case "choosing her own clothes":
case "cutoffs":
case "jeans":
case "leather pants":
@@ -1598,7 +1594,6 @@ App.Art.vectorArtElement = (function() {
case "body oil":
case "boyshorts":
case "chains":
- case "choosing her own clothes":
case "clubslut netting":
case "cutoffs":
case "jeans":
@@ -1742,7 +1737,6 @@ App.Art.vectorArtElement = (function() {
case "attractive lingerie for a pregnant woman":
case "body oil":
case "chains":
- case "choosing her own clothes":
case "clubslut netting":
case "cutoffs":
case "harem gauze":
@@ -1927,7 +1921,6 @@ App.Art.vectorArtElement = (function() {
case "an oversized t-shirt":
case "attractive lingerie for a pregnant woman":
case "chains":
- case "choosing her own clothes":
case "kitty lingerie":
case "no clothing":
case "overalls":
@@ -2915,7 +2908,6 @@ App.Art.vectorArtElement = (function() {
case "attractive lingerie":
case "body oil":
case "chains":
- case "choosing her own clothes":
case "clubslut netting":
case "no clothing":
case "overalls":
@@ -2958,7 +2950,6 @@ App.Art.vectorArtElement = (function() {
/* TODO: latex catsuit should cover vagina and its piercings, too */
switch (slave.clothes) {
case "no clothing":
- case "choosing her own clothes":
break; /* no torso outfit */
case "a bimbo outfit":
case "a courtesan dress":
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 98b0d74422b..5579ccc7f89 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -14,9 +14,6 @@ App.SlaveAssignment.choosesOwnClothes = (function() {
function saChoosesOwnClothes(slave) {
player = V.PC;
r = "";
- if (slave.clothes === "choosing her own clothes") {
- slave.choosesOwnClothes = 1; // make sure the flag is set so we don't get locked into a bad state
- }
if (slave.choosesOwnClothes !== 1) { return r; }
({
he, him, his, himself,
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 594920cca42..b96bcd1f170 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -150,19 +150,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
}
- // Choose her own
- if (slave.clothes !== `choosing her own clothes`) {
- label.append(
- App.UI.DOM.link(
- ` Let ${him} choose`,
- () => {
- slave.clothes = "choosing her own clothes";
- slave.choosesOwnClothes = 1;
- refresh();
- }
- )
- );
- }
clothingDiv.appendChild(label);
links = App.UI.DOM.appendNewElement("div", clothingDiv, clothingSelection());
links.id = "clothing-selection";
@@ -189,9 +176,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
let array = [];
for (const [key, object] of App.Data.clothes) {
- if (key === "choosing her own clothes") {
- continue;
- }
if (filters.hasOwnProperty("exposure") && filters.exposure !== object.exposure) {
continue;
}
@@ -224,9 +208,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
let array = [];
for (const [key, object] of App.Data.slaveWear.collar) {
- if (key === "choosing her own clothes") {
- continue;
- }
// FIXME: Property 'harsh' does not exist on type 'slaveWear | slaveWearChastity'.
if (filters.hasOwnProperty("harsh") && ((filters.harsh === false && object.harsh) || (filters.harsh === true && !object.harsh))) {
continue;
@@ -875,9 +856,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
switch (category) {
case "clothes":
- if (["choosing her own clothes", "choosing his own clothes"].includes(itemName)) {
- desc.push("Increases or greatly reduces devotion based on whether the slave is obedient(devotion at accepting or higher).");
- } else if (itemName === "no clothing") {
+ if (itemName === "no clothing") {
desc.push("Increases devotion for resistant humiliations fetishists and nymphos.");
} else if (item) {
switch (item.exposure) {
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index a17231211b4..f3cc686a2ff 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1829,7 +1829,6 @@ App.Entity.SlaveState = class SlaveState {
* * "body oil"
* * "boyshorts"
* * "chains"
- * * "choosing her own clothes"
* * "clubslut netting"
* * "conservative clothing"
* * "cutoffs"
diff --git a/src/npc/databases/dSlavesDatabase.js b/src/npc/databases/dSlavesDatabase.js
index 88159dbfee6..185c3bd433a 100644
--- a/src/npc/databases/dSlavesDatabase.js
+++ b/src/npc/databases/dSlavesDatabase.js
@@ -3688,7 +3688,7 @@ App.Data.HeroSlaves.D = [
skill: {
combat: 1
},
- clothes: "choosing her own clothes",
+ choosesOwnClothes: 1,
collar: "pretty jewelry",
shoes: "heels",
intelligence: 30,
@@ -3897,7 +3897,7 @@ App.Data.HeroSlaves.D = [
rules: {
living: "luxurious",
},
- clothes: "choosing her own clothes",
+ choosesOwnClothes: 1,
collar: "heavy gold",
intelligenceImplant: 30,
energy: 100,
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index d31aeca2c45..2892de1f765 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -12,12 +12,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
} = getPronouns(slave);
if (V.showClothing === 1 && !market) {
- r.push(`${slave.slaveName} is`);
- if (slave.clothes === "choosing her own clothes") {
- r.push(`allowed to choose ${his} own clothes, but hasn't made a selection yet,`);
- } else {
- r.push(`wearing ${slave.clothes},`);
- }
+ r.push(`${slave.slaveName} is wearing ${slave.clothes},`);
switch (slave.clothes) {
case "a Fuckdoll suit":
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index a087d884693..95cf1fe7d0d 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2279,9 +2279,9 @@
<<case "rogue cyborg">>
With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it penthouse safe, the legalities and biometric scanning are complete and you are now the proud owner of a cyber<<= $loli>>.
<<case "female recruit">>
- You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at _S.HeadGirl.slaveName, but _S.HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, _slave.slaveName strips. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
+ You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have _S.HeadGirl.clothes like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at _S.HeadGirl.slaveName, but _S.HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, _slave.slaveName strips. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
<<case "male recruit">>
- You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at _S.HeadGirl.slaveName, but _S.HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, _slave.slaveName strips. $His cock is totally flaccid as $he looks at the floor, shivering. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
+ You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have _S.HeadGirl.clothes like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your sternly tell $him to call you <<= properMaster()>>, to ask questions only with permission, and to strip. $He looks at _S.HeadGirl.slaveName, but _S.HeadGirl.slaveName returns $his look with no compassion at all and tells $him to do what you say. Looking suddenly fearful, _slave.slaveName strips. $His cock is totally flaccid as $he looks at the floor, shivering. Once your inspection of $his body reaches $his anus, $he becomes suddenly nervous. "A-am I going to have t-to do butt <<s>>tuff, <<Master>>?"
<<case "whore recruit">>
You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName participates matter-of-factly, and there's a certain sense of relief about $him. $His fate is out of $his hands now, and you get the impression $he isn't sorry about that at all.
<<case "desperate birth">>
@@ -2454,9 +2454,9 @@
<<case "rogue cyborg">>
With your order received the target quickly seeks you out. After a huge sum of credits changes hands to render it safe, the legalities and biometric scanning are complete and it is sold off to a very eager robophile.
<<case "female recruit">>
- You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving $girl, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
+ You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have _S.HeadGirl.clothes like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving $girl, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
<<case "male recruit">>
- You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have <<if _S.HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>_S.HeadGirl.clothes<</if>> like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving bitch, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
+ You complete the legalities and biometric scanning quickly and without fuss. _slave.slaveName bounces nervously on $his heels. Finally $he works up $his courage and asks, <<if _S.HeadGirl.clothes != "no clothing">>"Can I have _S.HeadGirl.clothes like _S.HeadGirl.slaveName?"<<else>>"Can I work with _S.HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving bitch, you tell $him $he's been purchased by a brothel, so $he's going to be fucked about 70,000 times before $he gets to be too old and is retired, so $he can be sure $he won't be bored. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
<<case "whore recruit">>
When the purchasing agent appears to take $him away, $he looks rueful. "God fucking damn it," $he <<say>>s, less angrily than you expected. "I <<sh>>ould have known. _S.HeadGirl.slaveName played me good. Treat _him2 right, _he2'<<s>> got <<s>>kill<<s>>."
<<case "female debtor">>
--
GitLab