From ae71919195790b4f77e643d6be67638bb7092297 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 4 Jun 2020 20:16:20 -0400
Subject: [PATCH] heels

---
 src/npc/descriptions/heels.js             | 30 +++++++++++++++++++++++
 src/uncategorized/longSlaveDescription.tw |  2 +-
 src/utility/descriptionWidgetsFlesh.tw    | 24 ------------------
 3 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 src/npc/descriptions/heels.js

diff --git a/src/npc/descriptions/heels.js b/src/npc/descriptions/heels.js
new file mode 100644
index 00000000000..72247b86f35
--- /dev/null
+++ b/src/npc/descriptions/heels.js
@@ -0,0 +1,30 @@
+App.Desc.heels = function(slave) {
+	const r = [];
+	const {
+		he, him, his, hers, himself, boy, He, His
+	} = getPronouns(slave);
+	if (slave.heels === 1) {
+		r.push(`${His}`);
+		if (hasBothLegs(slave)) {
+			r.push(`<span class="pink">legs have been altered</span>`);
+		} else if (hasAnyLegs(slave)) {
+			r.push(`<span class="pink">leg has been altered</span>`);
+		}
+		r.push(`so that ${he} must wear heels in order to walk.`);
+		if (V.showClothing === 1 && V.saleDescription === 0) {
+			if (hasAnyLegs(slave)) {
+				if (slave.shoes !== "none" && slave.shoes !== "flats") {
+					r.push(`${He} is, so ${he} can walk reasonably well.`);
+				} else {
+					r.push(`Since ${he} is without them, ${he}'s crawling on `);
+					if (!hasAllLimbs(slave)) {
+						r.push(`the ground.`);
+					} else {
+						r.push(`all fours.`);
+					}
+				}
+			}
+		}
+	}
+	return r.join(" ");
+};
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 33fd42f3acf..01f496901a5 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1776,7 +1776,7 @@ $He is
 <<= App.Desc.mods($activeSlave, "calf")>>
 <<= App.Desc.mods($activeSlave, "ankle")>>
 <<= App.Desc.mods($activeSlave, "foot")>>
-<<heelDescription>>
+<<= App.Desc.heels($activeSlave, "foot")>>
 <<skinDescription>>
 
 <<if $saleDescription == 1>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 7d7c4860ffe..cc3ac5177d4 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1,29 +1,5 @@
 :: flesh description widgets [widget nobr]
 
-<<widget "heelDescription">>
-
-<<if ($activeSlave.heels == 1)>>
-	$His
-	<<if hasBothLegs($activeSlave)>>
-		@@.pink;legs have been altered@@
-	<<elseif hasAnyLegs($activeSlave)>>
-		@@.pink;leg has been altered@@
-	<</if>>
-	so that $he must wear heels in order to walk.
-	<<if ($showClothing == 1) && ($saleDescription == 0)>>
-		<<if (hasAnyLegs($activeSlave))>>
-			<<if ($activeSlave.shoes != "none") && ($activeSlave.shoes != "flats")>>
-				$He is, so $he can walk reasonably well.
-			<<else>>
-				Since $he is without them, $he's crawling on <<if !hasAllLimbs($activeSlave)>>the ground<<else>>all fours<</if>>.
-			<</if>>
-		<</if>>
-	<</if>>
-<</if>>
-
-<</widget>>
-
-
 <<widget "skinDescription">>
 
 <<if $activeSlave.fuckdoll > 0>>
-- 
GitLab