diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index cfa379af387ae86cdef1b5db43c70e51fd74e23c..6e59fee11d3a709ca5f2ee41d2ae9c81d0368abc 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -289,6 +289,8 @@
| <<link "Exempt $him" "Child Interact">><<set $activeChild.useRulesAssistant = 0>><</link>>
<</if>>
+<<if $showWardrobe == 1>>
+
<br><br>__Appearance:__
/* TODO: have only a small list of children's clothing */
<br>Clothes: ''<span id="clothes">$activeChild.clothes</span>.''
@@ -585,6 +587,8 @@
<</if>>
<</if>>
+<</if>> /* CLOSES WARDROBE CHECK */
+
<br><br>__Physical Regimen:__
<span id="drugs">
/* TODO: will children be able to be put on drugs? if so, which drugs? */
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index d0d4bc172409e54b4c0b1cf841e21de24817df14..78fb80a9dbd2c918483ce2b1b9456bec63c85827 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -266,6 +266,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $showBodyMods = 0>>
<<set $showImplantEffects = 1>>
<<set $showClothing = 1>>
+ <<set $showWardrobe = 1>>
<<set $showAgeDetail = 1>>
<<set $showBoobCCs = 1>>
<<set $showHeightCMs = 1>>
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index c2e7c0e9e0d51d1400c799a8c3e63d6ee4b688d0..bbfe369e411dae61084a5dd8c70f3723014a4cf7 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -170,23 +170,23 @@ App.UI.View.MainLinks = function() {
}
if (V.completedOrgans.length > 0 && V.limbsCompleted > 0) {
- r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and limbs that are ready.</span><br>`;
+ r += `<br>[[Implant and Attach|Multiple Organ Implant]] <span class=yellow>all organs and limbs that are ready.</span>`;
} else if (V.completedOrgans.length > 0) {
- r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span><br>`;
+ r += `<br>[[Implant|Multiple Organ Implant]] <span class=yellow>all organs that are ready for implantation.</span>`;
} else if (V.limbsCompleted > 0) {
- r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all sets of limbs that are ready to be attached.</span><br>`;
+ r += `<br>[[Attach|Multiple Organ Implant]] <span class=yellow>all sets of limbs that are ready to be attached.</span>`;
}
if (V.slaveCostFactor > 1.05) {
- r += `<span class=yellow>There is a bull market for slaves; the price of slaves is very high.</span>`;
+ r += `<br><span class=yellow>There is a bull market for slaves; the price of slaves is very high.</span>`;
} else if (V.slaveCostFactor > 1) {
- r += `<span class=yellow>The slave market is bullish; the price of slaves is high.</span>`;
+ r += `<br><span class=yellow>The slave market is bullish; the price of slaves is high.</span>`;
} else if (V.slaveCostFactor < 0.95) {
- r += `<span class=yellow>There is a bear market for slaves; the price of slaves is very low.</span>`;
+ r += `<br><span class=yellow>There is a bear market for slaves; the price of slaves is very low.</span>`;
} else if (V.slaveCostFactor < 1) {
- r += `<span class=yellow>The slave market is bearish; the price of slaves is low.</span>`;
+ r += `<br><span class=yellow>The slave market is bearish; the price of slaves is low.</span>`;
} else {
- r += `The slave market is stable; the price of slaves is average.`;
+ r += `<br>The slave market is stable; the price of slaves is average.`;
}
r += ` <span id="buySlaves"><strong><<link "Buy Slaves">><<goto "Buy Slaves">><</link>></strong></span> <span class=cyan>[S]</span>`;
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 759d3f863b0171eb200d42667f6468087f6d394e..810adf3ee28b080295cb22b1790a91b1d3033614 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -23,7 +23,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (HC) {
r += `, heterochromatic,`;
}
- r += ` and clearly nonfunctional`
+ r += ` and clearly nonfunctional`;
} else {
if (HC) {
r += `, heterochromatic,`;
@@ -32,10 +32,10 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
}
r += `, `;
} else {
- r += `${His} gaze is empty.`
+ r += `${His} gaze is empty.`;
}
if (slave.intelligence > 95) {
- r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning;`;
+ r += `but ${his} facial expressions reveal ${he} is incisive, quick, cunning; `;
if (slave.intelligence+slave.intelligenceImplant >= 130) {
r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`;
} else if (slave.intelligenceImplant >= 15) {
@@ -63,7 +63,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
}
r += `educated.`;
} else {
- r += `but ${his} face is alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his}`;
+ r += `but ${his} face is alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
r += `meager`;
} else {
@@ -87,7 +87,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (slave.intelligence+slave.intelligenceImplant > 15) {
r += `but ${his} facial expressions reveal ${his} cleverness; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`;
} else if (slave.intelligenceImplant >= 15) {
- r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence due to being`;
+ r += `but ${his} facial expressions reveal ${his} alertness; ${he} is of average intelligence due to being `;
if (slave.intelligenceImplant >= 30) {
r += `well `;
}
@@ -113,16 +113,16 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
} else if (slave.intelligenceImplant >= 15) {
r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> despite having `;
if (slave.intelligenceImplant >= 30) {
- r += `an advanced`;
+ r += `an advanced `;
} else {
- r += `some`;
+ r += `some `;
}
- r += ` education.`;
+ r += `education.`;
} else {
r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
}
} else {
- r += `though you doubt it would be much different if ${he} could see;`;
+ r += `though you doubt it would be much different if ${he} could see; `;
if (slave.intelligence+slave.intelligenceImplant >= -95) {
r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
} else if (slave.intelligenceImplant > 0) {
@@ -133,7 +133,7 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
}
} else {
if (slave.intelligence > 95) {
- r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning;`;
+ r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
if (slave.intelligence+slave.intelligenceImplant >= 130) {
r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`;
} else if (slave.intelligenceImplant >= 15) {
@@ -145,29 +145,29 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
} else {
r += `${he} is so <span class=deepskyblue>brilliant</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
- r += `meager`;
+ r += `meager `;
} else {
- r += `lack of`;
+ r += `lack of `;
}
r += `education is unimportant.`;
}
} else if (slave.intelligence > 50) {
- r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; with ${his} education, ${he} can be considered <span class=deepskyblue>brilliant.</span>`;
- if (slave.intelligence+slave.intelligenceImplant > 95) {
+ r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
+ if (slave.intelligence+slave.intelligenceImplant >= 95) {
r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
} else if (slave.intelligenceImplant >= 15) {
r += `well `;
if (slave.intelligenceImplant >= 30) {
r += `educated.`;
}
- r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
} else {
- r += `meager`;
+ r += `${His} ${App.Desc.EyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
- r += `lack of`;
+ r += `meager `;
} else {
- r += ` education is unimportant.`;
+ r += `lack of `;
}
+ r += `education is unimportant.`;
}
} else if (slave.intelligence > 15) {
r += `${His} ${App.Desc.EyeColor(slave)} eyes are `;
@@ -215,16 +215,16 @@ App.Desc.Eyes = /** @param {App.Entity.SlaveState} slave */ function(slave) {
if (slave.intelligence+slave.intelligenceImplant >= -50) {
r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `;
} else if (slave.intelligenceImplant >= 15) {
- r += `an advanced`;
+ r += `an advanced `;
if (slave.intelligenceImplant >= 30) {
- r += `some`;
+ r += `some `;
}
- r += ` education.`;
+ r += `education.`;
} else {
r += `dull; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
}
} else {
- r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze betrays near-total insensibility;`;
+ r += `${His} ${App.Desc.EyeColor(slave)}-eyed gaze betrays near-total insensibility; `;
if (slave.intelligence+slave.intelligenceImplant >= -95) {
r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
} else if (slave.intelligenceImplant > 0) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8463aa73159cbf9a78714bf7948c46cc66e83de7..79a169e9e896ee10cec839450a2e570d141b8ab0 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -244,7 +244,7 @@ window.SlaveSummaryUncached = (function(){
long_sex_quirk(slave);
}
if (slave.customLabel)
- r += `<strong><span class="yellow">${slave.customLabel}</span></strong>`;
+ r += `<strong><span class="yellow">${capFirstChar(slave.customLabel)}</span></strong>`;
if ((slave.relationship !== 0) || (slave.relation !== 0) || (V.abbreviateClothes === 2) || (V.abbreviateRulesets === 2)) {
r += `<br>`;
if (V.seeImages !== 1 || V.seeSummaryImages !== 1 || V.imageChoice === 1)
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c2c8ca1991d7d1757c49086cb9eebdab8abf9b2e..a3d18cc1e779f0301d514bd2dc67bd96882ce8ac 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1081,6 +1081,9 @@
<<if ndef $showNumbersMax>>
<<set $showNumbersMax = 20>>
<</if>>
+<<if ndef $showWardrobe>>
+ <<set $showWardrobe = 1>>
+<</if>>
<<if ndef $surnameOrder>>
<<set $surnameOrder = 0>>
<</if>>
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index 3a962e19135b8d5144bb3e36dd7b7ae50c347d00..119ea238f1cdff2d68e1a695ba9f31fa2fa6a768 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -38,6 +38,14 @@
<br>
+<<if $showWardrobe == 1>>
+ The Slave Interact wardrobe is @@.cyan;SHOWN.@@ //[[Hide|Description Options][$showWardrobe = 0]]//
+<<else>>
+ The Slave Interact wardrobe is @@.red;HIDDEN.@@ //[[Show|Description Options][$showWardrobe = 1]]//
+<</if>>
+
+<br>
+
Detailed slave age information is
<<if $showAgeDetail == 1>>
@@.cyan;SHOWN.@@ //[[Hide|Description Options][$showAgeDetail = 0]]//
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index cef0d6cf71040e37f16d1a3701af1c9f4da0d293..75e265ba3d97c5b25f633b5e04f8108a21b8a760 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -666,6 +666,8 @@
<</switch>> /* END CAN BE REASSIGNED */
+<<if $showWardrobe == 1>>
+
<br><br>__Appearance:__
<<if $activeSlave.fuckdoll == 0>>
@@ -1125,6 +1127,8 @@
<</if>> /* CLOSES FUCKDOLL CHECK */
+<</if>> /* CLOSES WARDROBE CHECK */
+
<br><br>__Physical Regimen:__
<span id="drugs">
<br>Drugs: <strong>$activeSlave.drugs</strong>.