diff --git a/src/npc/descriptions/style/armwear.js b/src/npc/descriptions/style/armwear.js
index fa1fbc29ce7230b220b391dcda84c58bfe12d521..5ca142ed4fb38959a753c8d9affef0b5aeacfc2b 100644
--- a/src/npc/descriptions/style/armwear.js
+++ b/src/npc/descriptions/style/armwear.js
@@ -11,32 +11,39 @@ App.Desc.armwear = function(slave) {
if (hasAnyArms(slave)) {
switch (slave.armAccessory) {
case "hand gloves":
- r.push(`${He} is wearing a pair of simple gloves that covers ${his}`);
- if (hasBothArms(slave)) {
- r.push(`hands`);
- } else {
- r.push(`hand`);
- }
- r.push(`up to ${his}`);
- if (hasBothArms(slave)) {
- r.push(`wrists.`);
- } else {
- r.push(`wrist.`);
+ switch (slave.clothes) {
+ default:
+ if (hasBothArms(slave)) {
+ r.push(`${He} is wearing a pair of simple gloves that cover ${his} hands up to ${his} wrists.`);
+ } else {
+ r.push(`${He} is wearing a simple glove that covers ${his} hand up to its wrist.`);
+ }
}
break;
case "elbow gloves":
- r.push(`${He} is wearing a pair of long gloves that covers ${his}`);
- if (hasBothArms(slave)) {
- r.push(`arms`);
- } else {
- r.push(`arm`);
- }
- r.push(`until just past ${his}`);
- if (hasBothArms(slave)) {
- r.push(`elbows.`);
- } else {
- r.push(`elbow.`);
+ switch (slave.clothes) {
+ case "no clothing":
+ case "an apron":
+ case "a thong":
+ case "a skimpy loincloth":
+ case "body oil":
+ case "boyshorts":
+ case "panties":
+ case "panties and pasties":
+ if (hasBothArms(slave)) {
+ r.push(`${He} is wearing a pair of long${slave.collar === "leather with cowbell" ? " cow print" : ""} gloves that cover ${his} arms until just past ${his} elbows.`);
+ } else {
+ r.push(`${He} is wearing a long${slave.collar === "leather with cowbell" ? " cow print" : ""} glove that covers ${his} arm until just past its elbow.`);
+ }
+ break;
+ default:
+ if (hasBothArms(slave)) {
+ r.push(`${He} is wearing a pair of long gloves that cover ${his} arms until just past ${his} elbows.`);
+ } else {
+ r.push(`${He} is wearing a long glove that covers ${his} arm until just past its elbow.`);
+ }
}
+ break;
}
}
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index 7ba30c337f6a4b3955db28211b41735b232abc33..11b8d336d4f5dc310c57eec05fc34ae016c85777 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -229,7 +229,7 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
r.push(`consisting of a short red leather corset, an even shorter skirt of the same material, and`);
r.push(App.Desc.footwear(slave));
} else {
- r.push(`including a lovely bra with holes to ${his} nipples poke through, a pretty g-string, and a garter belt.`);
+ r.push(`consisting of a short red leather corset and an even shorter skirt of the same material.`);
}
break;
case "a fallen nuns habit":
@@ -726,9 +726,17 @@ App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
case "a thong":
case "a skimpy loincloth":
case "boyshorts":
+ r.push(`which only covers ${his}`);
+ if (hasAnyLegs(slave)) {
+ r.push(`crotch, and`);
+ r.push(App.Desc.footwear(slave));
+ } else {
+ r.push(`crotch.`);
+ }
+ break;
case "panties":
case "panties and pasties":
- r.push(`which only covers ${his}`);
+ r.push(`which only cover ${his}`);
if (hasAnyLegs(slave)) {
r.push(`crotch, and`);
r.push(App.Desc.footwear(slave));
diff --git a/src/npc/descriptions/style/footwear.js b/src/npc/descriptions/style/footwear.js
index 2899f2ebf18a04629af176ffe29b6e3c68cdd8d6..377730870d20966f955424b8125f12645eb63d8e 100644
--- a/src/npc/descriptions/style/footwear.js
+++ b/src/npc/descriptions/style/footwear.js
@@ -2102,20 +2102,53 @@ App.Desc.footwear = function(slave) {
switch (slave.legAccessory) {
// split stocking descriptions from above into here
case "short stockings":
- r.push(`${He} is wearing a pair of short stockings that ends just below ${his}`);
- if (hasBothLegs(slave)) {
- r.push(`knees.`);
- } else {
- r.push(`knee.`);
+ switch (slave.clothes) {
+ case "no clothing":
+ case "an apron":
+ case "a thong":
+ case "a skimpy loincloth":
+ case "body oil":
+ case "boyshorts":
+ case "panties":
+ case "panties and pasties":
+ if (hasBothLegs(slave)) {
+ r.push(`${He} is wearing a pair of short${slave.collar === "leather with cowbell" ? " cow print" : ""} stockings that end just below ${his} knees.`);
+ } else {
+ r.push(`${He} is wearing a short${slave.collar === "leather with cowbell" ? " cow print" : ""} stocking that ends just below ${his} knee.`);
+ }
+ break;
+ default:
+ if (hasBothLegs(slave)) {
+ r.push(`${He} is wearing a pair of short stockings that end just below ${his} knees.`);
+ } else {
+ r.push(`${He} is wearing a short stocking that ends just below ${his} knee.`);
+ }
}
break;
case "long stockings":
- r.push(`${He} is wearing a pair of long stockings that ends in the middle of ${his}`);
- if (hasBothLegs(slave)) {
- r.push(`thighs.`);
- } else {
- r.push(`thigh.`);
+ switch (slave.clothes) {
+ case "no clothing":
+ case "an apron":
+ case "a thong":
+ case "a skimpy loincloth":
+ case "boyshorts":
+ case "body oil":
+ case "panties":
+ case "panties and pasties":
+ if (hasBothLegs(slave)) {
+ r.push(`${He} is wearing a pair of long${slave.collar === "leather with cowbell" ? " cow print" : ""} stockings that come up to the middle of ${his} thighs.`);
+ } else {
+ r.push(`${He} is wearing a long${slave.collar === "leather with cowbell" ? " cow print" : ""} stocking that come up to the middle of ${his} thigh.`);
+ }
+ break;
+ default:
+ if (hasBothLegs(slave)) {
+ r.push(`${He} is wearing a pair of long stockings that come up to the middle of ${his} thighs.`);
+ } else {
+ r.push(`${He} is wearing a long stocking that come up to the middle of ${his} thigh.`);
+ }
}
+ break;
}
}
// end amp check