From 46c007b3f19bc028daf7afc78be1bc2201989727 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Thu, 1 Aug 2019 00:49:39 -0400
Subject: [PATCH] More de-duplification
---
src/facilities/nursery/longChildDescription.tw | 2 +-
src/js/descriptionWidgets.js | 2 +-
src/uncategorized/longSlaveDescription.tw | 9 +++------
src/uncategorized/walkPast.tw | 9 +++++++++
src/utility/descriptionWidgetsFlesh.tw | 11 +----------
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 4d92bc22200..c612609e9ea 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -1349,7 +1349,7 @@ $He is
<<else>>
<<BellyDescription>>
<</if>>
-
+<<= App.Desc.mods($activeChild, "belly")>>
<<ButtDescription>>
<br>
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 41657971bca..8ed0b7e26be 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -586,7 +586,7 @@ App.Desc.mods = function(slave, surface) {
return;
}
if (slave.fuckdoll !== 0 && !["vagina", "anus", "lips"].includes(surface)) { /* Fuckdoll vulva and anus alone are visibile, plus enormus lips */
- return;
+ return App.Desc.piercing(slave, surface); // Most piercings are part of the suit and have appropriate descriptions
}
return (
App.Desc.piercing(slave, surface) +
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 7a9282d7a17..8349004f283 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1156,12 +1156,6 @@ is
<</if>>
<</if>>
-<<if $activeSlave.fuckdoll == 0>>
- <<= App.Desc.mods($activeSlave, "cheek")>>
- <<= App.Desc.mods($activeSlave, "ear")>>
- <<= App.Desc.mods($activeSlave, "neck")>>
-<</if>>
-
<<if $familyTesting == 1>>
<<Family>>
@@ -2081,6 +2075,8 @@ $He is
<<= App.Desc.mods($activeSlave, "ear")>>
<<= App.Desc.mods($activeSlave, "nose")>>
<<= App.Desc.mods($activeSlave, "eyebrow")>>
+ <<= App.Desc.mods($activeSlave, "cheek")>>
+ <<= App.Desc.mods($activeSlave, "neck")>>
<<if ($activeSlave.custom.tattoo != "") && (def $activeSlave.custom.tattoo)>>
<<print $activeSlave.custom.tattoo>>
<</if>>
@@ -2151,6 +2147,7 @@ $He is
<<else>>
<<BellyDescription>>
<</if>>
+<<= App.Desc.mods($activeSlave, "belly")>>
/*<<= App.Desc.mods($activeSlave, "navel")>> Currently contained in <<bellyDescription>>*/
<<ButtDescription>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index f8a740bad3f..c9bdcee44f9 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -1350,6 +1350,7 @@
<<else>> /* implant descs */
<<if $activeSlave.bellyImplant >= 32000>>
<<BellyImplantDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a very tight corset">>
$His corset struggles to contain $his enormous belly.
@@ -1426,6 +1427,7 @@
<</switch>>
<<elseif $activeSlave.bellyImplant >= 16000>>
<<BellyImplantDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a very tight corset">>
$His corset struggles to contain $his giant belly.
@@ -1596,6 +1598,7 @@
<</switch>>
<<elseif $activeSlave.bellyImplant >= 8000>>
<<BellyImplantDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "conservative clothing">>
$His taut blouse shows off $his huge belly.
@@ -1950,6 +1953,7 @@
<</switch>>
<<elseif $activeSlave.bellyImplant >= 4000>>
<<BellyImplantDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "conservative clothing">>
$His taut blouse shows off $his big belly.
@@ -2066,6 +2070,7 @@
<</switch>>
<<elseif $activeSlave.weight >= 95>>
<<BellyImplantDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
$His suit is expressly designed to encourage use of $his holes.
@@ -2184,6 +2189,7 @@
<</switch>>
<<elseif $activeSlave.bellyImplant >= 2000>>
<<BellyImplantDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
$His suit is expressly designed to encourage use of $his holes.
@@ -2401,6 +2407,7 @@
<</switch>>
<<elseif $activeSlave.inflation == 3>>
<<BellyInflationDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
$His suit is expressly designed to encourage use of $his holes.
@@ -2755,6 +2762,7 @@
<</switch>>
<<elseif $activeSlave.inflation == 2>>
<<BellyInflationDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
$His suit is expressly designed to encourage use of $his holes.
@@ -2993,6 +3001,7 @@
<</switch>>
<<elseif $activeSlave.inflation == 1>>
<<BellyInflationDescription>>
+ <<= App.Desc.mods($activeSlave, "belly")>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
$His suit is expressly designed to encourage use of $his holes.
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index ec8c905f7d0..2d965e63d38 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -4064,11 +4064,7 @@ $He's got a
<</if>>
<</if>>
-<<if $activeSlave.fuckdoll == 0>>
- <<if $showBodyMods == 1>>
- <<= App.Desc.mods($activeSlave, "pubic mound")>>
- <</if>>
-<</if>>
+<<= App.Desc.mods($activeSlave, "pubic mound")>>
<<set _pubertyAge = Math.min($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
<<if ($activeSlave.physicalAge < _pubertyAge-2)>>
@@ -15386,7 +15382,6 @@ $He has
It has a short length of chain dangling from it.
<</if>>
<</if>>
- <<= App.Desc.mods($activeSlave, "belly")>>
<</if>>
<<else>>
<<if $showBodyMods == 1>>
@@ -15458,7 +15453,6 @@ $He has
<<elseif $activeSlave.abortionTat == 0 && $activeSlave.birthsTat == -1 && $activeSlave.pregKnown == 1>>
$He has a single baby-shaped temporary tattoo adorning $his stomach.
<</if>>
- <<= App.Desc.mods($activeSlave, "belly")>>
<</if>>
<<if $activeSlave.breedingMark == 1>>
<<if $propOutcome == 1>>
@@ -18437,7 +18431,6 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<<elseif $activeSlave.abortionTat == 0 && $activeSlave.birthsTat == -1 && $activeSlave.pregKnown == 1>>
$He has a single baby-shaped temporary tattoo adorning $his stomach.
<</if>>
- <<= App.Desc.mods($activeSlave, "belly")>>
<<if $activeSlave.breedingMark == 1>>
<<if $propOutcome == 1>>
@@ -19513,8 +19506,6 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<</if>>
<</if>>
-<<= App.Desc.mods($activeSlave, "belly")>>
-
<<if $activeSlave.breedingMark == 1>>
<<if $propOutcome == 1>>
The Societal Elites' mark designating $him as a breeder is prominently displayed across $his lower belly, beneath $his navel.
--
GitLab