From 53035f70d62051ba30b5be1673255447686ac67a Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sun, 7 Jun 2020 22:38:01 +0200
Subject: [PATCH] deduplicate branch
---
src/npc/descriptions/style/clothing.js | 44 +------
src/npc/descriptions/style/clothingCorset.js | 8 --
src/npc/descriptions/style/footwear.js | 118 +------------------
3 files changed, 3 insertions(+), 167 deletions(-)
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index a909cb30896..7808bdca3d8 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -72,14 +72,6 @@ App.Desc.clothing = function(slave) {
}
break;
case "a huipil":
- r.push(`made of beautiful`);
- if (hasAnyLegs(slave)) {
- r.push(`silk, and`);
- r.push(App.Desc.footwear(slave));
- } else {
- r.push(`silk.`);
- }
- break;
case "a slutty qipao":
r.push(`made of beautiful`);
if (hasAnyLegs(slave)) {
@@ -312,7 +304,7 @@ App.Desc.clothing = function(slave) {
case "clubslut netting":
if (
(slave.nails === 2 || slave.nails === 7 || slave.nails === 9) &&
- (slave.makeup === 3 || slave.makeup === 6 || slave.nails === 8)
+ (slave.makeup === 3 || slave.makeup === 6 || slave.makeup === 8)
) {
r.push(`${slave.hColor} to match ${his} monochrome style,`);
} else if ((skinToneLevel(slave.skin) > 22)) {
@@ -573,33 +565,10 @@ App.Desc.clothing = function(slave) {
}
break;
case "a dirndl":
- r.push(`of a traditional`);
- if (hasAnyLegs(slave)) {
- r.push(`pattern, and`);
- r.push(App.Desc.footwear(slave));
- } else {
- r.push(`pattern.`);
- }
- break;
case "a long qipao":
- r.push(`of a traditional`);
- if (hasAnyLegs(slave)) {
- r.push(`pattern, and`);
- r.push(App.Desc.footwear(slave));
- } else {
- r.push(`pattern.`);
- }
- break;
case "lederhosen":
- r.push(`of a traditional`);
- if (hasAnyLegs(slave)) {
- r.push(`pattern, and`);
- r.push(App.Desc.footwear(slave));
- } else {
- r.push(`pattern.`);
- }
- break;
case "a biyelgee costume":
+ case "a hanbok":
r.push(`of a traditional`);
if (hasAnyLegs(slave)) {
r.push(`pattern, and`);
@@ -669,15 +638,6 @@ App.Desc.clothing = function(slave) {
r.push(`styling.`);
}
break;
- case "a hanbok":
- r.push(`of a traditional`);
- if (hasAnyLegs(slave)) {
- r.push(`pattern, and`);
- r.push(App.Desc.footwear(slave));
- } else {
- r.push(`pattern.`);
- }
- break;
case "a gothic lolita dress":
r.push(`of a Victorian`);
if (hasAnyLegs(slave)) {
diff --git a/src/npc/descriptions/style/clothingCorset.js b/src/npc/descriptions/style/clothingCorset.js
index 97f941f6bad..421c149eac3 100644
--- a/src/npc/descriptions/style/clothingCorset.js
+++ b/src/npc/descriptions/style/clothingCorset.js
@@ -246,14 +246,6 @@ App.Desc.clothingCorset = function(slave) {
}
break;
case "slutty business attire":
- if (slave.bellyAccessory === "a corset") {
- r.push(`${His} jacket totally conceals ${his} corset.`);
- } else if (slave.bellyAccessory === "an extreme corset") {
- r.push(`${His} jacket totally conceals ${his} absurd corsetage.`);
- } else if (slave.bellyAccessory === "a support band") {
- r.push(`${His} support band is hidden by ${his} jacket.`);
- }
- break;
case "nice business attire":
if (slave.bellyAccessory === "a corset") {
r.push(`${His} jacket totally conceals ${his} corset.`);
diff --git a/src/npc/descriptions/style/footwear.js b/src/npc/descriptions/style/footwear.js
index 9e61f591c2e..c5a17284320 100644
--- a/src/npc/descriptions/style/footwear.js
+++ b/src/npc/descriptions/style/footwear.js
@@ -1701,96 +1701,10 @@ App.Desc.footwear = function(slave) {
break;
case "a military uniform":
case "a police uniform":
- switch (slave.shoes) {
- case "flats":
- r.push(`polished Oxford shoes.`);
- break;
- case "boots":
- r.push(`tall black leather boots.`);
- break;
- case "heels":
- r.push(`modest black service heels.`);
- break;
- case "pumps":
- r.push(`modest black service pumps.`);
- break;
- case "extreme heels":
- r.push(`extremely high heeled ceremonial dress boots that force ${him} to constantly stand at attention.`);
- break;
- case "platform shoes":
- r.push(`leather service boots with a built-in platform.`);
- break;
- case "platform heels":
- r.push(`modest black service platform heels.`);
- break;
- case "extreme platform heels":
- r.push(`extremely high heeled ceremonial platform dress boots that force ${him} to constantly stand at attention.`);
- break;
- default:
- r.push(`a complete lack of regulation footwear.`);
- }
- break;
case "a schutzstaffel uniform":
- switch (slave.shoes) {
- case "flats":
- r.push(`polished Oxford shoes.`);
- break;
- case "boots":
- r.push(`tall black leather boots.`);
- break;
- case "heels":
- r.push(`modest black service heels.`);
- break;
- case "pumps":
- r.push(`modest black service pumps.`);
- break;
- case "extreme heels":
- r.push(`extremely high heeled ceremonial dress boots that force ${him} to constantly stand at attention.`);
- break;
- case "platform shoes":
- r.push(`leather service boots with a built-in platform.`);
- break;
- case "platform heels":
- r.push(`modest black service platform heels.`);
- break;
- case "extreme platform heels":
- r.push(`extremely high heeled ceremonial platform dress boots that force ${him} to constantly stand at attention.`);
- break;
- default:
- r.push(`a complete lack of regulation footwear.`);
- }
- break;
case "a slutty schutzstaffel uniform":
- switch (slave.shoes) {
- case "flats":
- r.push(`polished Oxford shoes.`);
- break;
- case "boots":
- r.push(`tall black leather boots.`);
- break;
- case "heels":
- r.push(`modest black service heels.`);
- break;
- case "pumps":
- r.push(`modest black service pumps.`);
- break;
- case "extreme heels":
- r.push(`extremely high heeled ceremonial dress boots that force ${him} to constantly stand at attention.`);
- break;
- case "platform shoes":
- r.push(`leather service boots with a built-in platform.`);
- break;
- case "platform heels":
- r.push(`modest black service platform heels.`);
- break;
- case "extreme platform heels":
- r.push(`extremely high heeled ceremonial platform dress boots that force ${him} to constantly stand at attention.`);
- break;
- default:
- r.push(`a complete lack of regulation footwear.`);
- }
- break;
case "a red army uniform":
+ case "a mounty outfit":
switch (slave.shoes) {
case "flats":
r.push(`polished Oxford shoes.`);
@@ -1910,36 +1824,6 @@ App.Desc.footwear = function(slave) {
r.push(`nothing on ${his} bare feet.`);
}
break;
- case "a mounty outfit":
- switch (slave.shoes) {
- case "flats":
- r.push(`polished Oxford shoes.`);
- break;
- case "boots":
- r.push(`tall black leather boots.`);
- break;
- case "heels":
- r.push(`modest black service heels.`);
- break;
- case "pumps":
- r.push(`modest black service pumps.`);
- break;
- case "extreme heels":
- r.push(`extremely high heeled ceremonial dress boots that force ${him} to constantly stand at attention.`);
- break;
- case "platform shoes":
- r.push(`leather service boots with a built-in platform.`);
- break;
- case "platform heels":
- r.push(`modest black service platform heels.`);
- break;
- case "extreme platform heels":
- r.push(`extremely high heeled ceremonial platform dress boots that force ${him} to constantly stand at attention.`);
- break;
- default:
- r.push(`a complete lack of regulation footwear.`);
- }
- break;
case "a dirndl":
switch (slave.shoes) {
case "flats":
--
GitLab