diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index b863bb924b2de5d014189caf139e7548afce6fd7..6bce61236f27453e6f9ec6e79d5e6643abd77c7d 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -50,10 +50,10 @@
}
.lrgImg {
- height: 600px;
- width: 600px;
- margin-right: -100px;
- margin-left: -100px;
+ height: 531px;
+ width: 531px;
+ margin-right: -50px;
+ margin-left: -50px;
float: right;
z-index: -1;
}
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index dd12633da62e7291a36a0e85d24acf9b2f5388d9..1567e49d99fb685fc6e25613acafbd0f5b8ee96f 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -234,21 +234,21 @@ Filter by assignment: |
| <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
<<else>>
all of her holes equally, but for now://
- <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ <br> <<print "[[Use her mouth|FLips][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">> | <<print "[[Play with her tits|FBoobs][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<<if canDoVaginal($slaves[$i])>>
- | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ | <<print "[[Fuck her|FVagina][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<<if canDoAnal($slaves[$i])>>
- | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ | <<print "[[Use her holes|FButt][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<</if>>
<</if>>
<<if canDoAnal($slaves[$i])>>
- | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ | <<print "[[Fuck her ass|FAnus][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<</if>>
/*check*/
<<if canAchieveErection($slaves[$i])>>
| <<print "[[Ride her|FDick][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
<</if>>
- | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"],$nextButton = _j,$nextLink = _k,$returnTo = _l]]">>
+ | <<print "[[Abuse her|FAbuse][$activeSlave = $slaves["+$i+"], $nextButton = _j, $nextLink = _k, $returnTo = _l]]">>
<</if>>
<<else>>
<<if $slaves[$i].toyHole != "all her holes">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index d4ed8feeed2c682b23333d66661cd7a545375537..eae99d4ba10f401371025a21a04a8c4428ba19ba 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -651,44 +651,44 @@ will
<</if>>
<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
-
+<<if $summaryStats == 1>>
<<if $abbreviateDevotion == 1>>
- <<if _Slave.fetish is "mindbroken">>@@.red;MB@@
- <<elseif _Slave.devotion < -95>>@@.darkviolet;VHate<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <<elseif _Slave.devotion < -50>>@@.darkviolet;Hate<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <<elseif _Slave.devotion < -20>>@@.mediumorchid;Res<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <<elseif _Slave.devotion <= 20>>@@.yellow;Ambiv<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <<elseif _Slave.devotion <= 50>>@@.hotpink;Accept<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <<elseif _Slave.devotion <= 95>>@@.deeppink;Devo<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <<else>>@@.magenta;Wor<<if $summaryStats == 1>>[_Slave.devotion]<</if>>@@
- <</if>>
- <<if _Slave.fetish is "mindbroken">>
- <<elseif _Slave.trust < -95>>@@.darkgoldenrod;ETerr<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <<elseif _Slave.trust < -50>>@@.goldenrod;Terr<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <<elseif _Slave.trust < -20>>@@.gold;Fright<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <<elseif _Slave.trust <= 20>>@@.yellow;Fear<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <<elseif _Slave.trust <= 50>>@@.mediumaquamarine;Caref<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <<elseif _Slave.trust < 95>>@@.mediumseagreen;Trust<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <<else>>@@.seagreen;VTrust<<if $summaryStats == 1>>[_Slave.trust]<</if>>@@
- <</if>>
-<<elseif $abbreviateDevotion is 2>>
- <<if _Slave.fetish is "mindbroken">>@@.red;Mindbroken.@@
- <<elseif _Slave.devotion < -95>>@@.darkviolet;Very hateful<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <<elseif _Slave.devotion < -50>>@@.darkviolet;Hateful<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <<elseif _Slave.devotion < -20>>@@.mediumorchid;Resistant<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <<elseif _Slave.devotion <= 20>>@@.yellow;Ambivalent<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <<elseif _Slave.devotion <= 50>>@@.hotpink;Accepting<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <<elseif _Slave.devotion <= 95>>@@.deeppink;Devoted<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <<else>>@@.magenta;Worshipful<<if $summaryStats == 1>> [_Slave.devotion]<</if>>.@@
- <</if>>
- <<if _Slave.fetish is "mindbroken">>
- <<elseif _Slave.trust < -95>>@@.darkgoldenrod;Extremely terrified<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
- <<elseif _Slave.trust < -50>>@@.goldenrod;Terrified<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
- <<elseif _Slave.trust < -20>>@@.gold;Frightened<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
- <<elseif _Slave.trust <= 20>>@@.yellow;Fearful<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
- <<elseif _Slave.trust <= 50>>@@.mediumaquamarine;Careful<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
- <<elseif _Slave.trust < 95>>@@.mediumseagreen;Trusting<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
- <<else>>@@.seagreen;Profoundly trusting<<if $summaryStats == 1>> [_Slave.trust]<</if>>.@@
+ <<if _Slave.fetish == "mindbroken">>@@.red;MB@@
+ <<elseif _Slave.devotion < -95>>@@.darkviolet;VHate[_Slave.devotion]@@
+ <<elseif _Slave.devotion < -50>>@@.darkviolet;Hate[_Slave.devotion]@@
+ <<elseif _Slave.devotion < -20>>@@.mediumorchid;Res[_Slave.devotion]@@
+ <<elseif _Slave.devotion <= 20>>@@.yellow;Ambiv[_Slave.devotion]@@
+ <<elseif _Slave.devotion <= 50>>@@.hotpink;Accept[_Slave.devotion]@@
+ <<elseif _Slave.devotion <= 95>>@@.deeppink;Devo[_Slave.devotion]@@
+ <<else>>@@.magenta;Wor[_Slave.devotion]@@
+ <</if>>
+ <<if _Slave.fetish == "mindbroken">>
+ <<elseif _Slave.trust < -95>>@@.darkgoldenrod;ETerr[_Slave.trust]@@
+ <<elseif _Slave.trust < -50>>@@.goldenrod;Terr[_Slave.trust]@@
+ <<elseif _Slave.trust < -20>>@@.gold;Fright[_Slave.trust]@@
+ <<elseif _Slave.trust <= 20>>@@.yellow;Fear[_Slave.trust]@@
+ <<elseif _Slave.trust <= 50>>@@.mediumaquamarine;Caref[_Slave.trust]@@
+ <<elseif _Slave.trust < 95>>@@.mediumseagreen;Trust[_Slave.trust]@@
+ <<else>>@@.seagreen;VTrust [_Slave.trust]@@
+ <</if>>
+<<elseif $abbreviateDevotion == 2>>
+ <<if _Slave.fetish == "mindbroken">>@@.red;Mindbroken.@@
+ <<elseif _Slave.devotion < -95>>@@.darkviolet;Very hateful [_Slave.devotion].@@
+ <<elseif _Slave.devotion < -50>>@@.darkviolet;Hateful [_Slave.devotion].@@
+ <<elseif _Slave.devotion < -20>>@@.mediumorchid;Resistant [_Slave.devotion].@@
+ <<elseif _Slave.devotion <= 20>>@@.yellow;Ambivalent [_Slave.devotion].@@
+ <<elseif _Slave.devotion <= 50>>@@.hotpink;Accepting [_Slave.devotion].@@
+ <<elseif _Slave.devotion <= 95>>@@.deeppink;Devoted [_Slave.devotion].@@
+ <<else>>@@.magenta;Worshipful [_Slave.devotion]@@
+ <</if>>
+ <<if _Slave.fetish == "mindbroken">>
+ <<elseif _Slave.trust < -95>>@@.darkgoldenrod;Extremely terrified [_Slave.trust].@@
+ <<elseif _Slave.trust < -50>>@@.goldenrod;Terrified [_Slave.trust].@@
+ <<elseif _Slave.trust < -20>>@@.gold;Frightened [_Slave.trust].@@
+ <<elseif _Slave.trust <= 20>>@@.yellow;Fearful [_Slave.trust].@@
+ <<elseif _Slave.trust <= 50>>@@.mediumaquamarine;Careful [_Slave.trust].@@
+ <<elseif _Slave.trust < 95>>@@.mediumseagreen;Trusting [_Slave.trust].@@
+ <<else>>@@.seagreen;Profoundly trusting [_Slave.trust]<</if>>@@
<</if>>
<</if>>
@@ -761,64 +761,65 @@ Release rules: _Slave.releaseRules.
<</if>>
<<if _Slave.tired != 0>>Tired.<</if>>
-
+<<if $summaryStats == 1>>
<<if $abbreviateDiet == 1>>
<<if _Slave.weight < -95>>
- ''@@.red;W---<<if $summaryStats == 1>>[_Slave.weight]<</if>>@@''
+ ''@@.red;W---[_Slave.weight]@@''
<<elseif _Slave.weight < -30>>
<<if _Slave.hips < -1>>
- ''W--<<if $summaryStats == 1>>[_Slave.weight]<</if>>''
+ ''W--[_Slave.weight]''
<<else>>
- ''@@.red;W--<<if $summaryStats == 1>>[_Slave.weight]<</if>>@@''
+ ''@@.red;W--[_Slave.weight]@@''
<</if>>
<<elseif _Slave.weight < -10>>
- ''W-<<if $summaryStats == 1>>[_Slave.weight]<</if>>''
+ ''W-[_Slave.weight]''
<<elseif _Slave.weight <= 10 >>
- ''W<<if $summaryStats == 1>>[_Slave.weight]<</if>>''
+ ''W[_Slave.weight]''
<<elseif _Slave.weight <= 30>>
- ''W+<<if $summaryStats == 1>>[_Slave.weight]<</if>>''
+ ''W+[_Slave.weight]''
<<elseif _Slave.weight <= 95>>
<<if _Slave.hips > 1>>
- ''W++<<if $summaryStats == 1>>[_Slave.weight]<</if>>''
+ ''W++[_Slave.weight]''
<<else>>
- ''@@.red;W++<<if $summaryStats == 1>>[_Slave.weight]<</if>>@@''
+ ''@@.red;W++[_Slave.weight]@@''
<</if>>
<<else>>
<<if _Slave.hips >= 2>>
- ''W+++<<if $summaryStats == 1>>[_Slave.weight]<</if>>''
+ ''W+++[_Slave.weight]''
<<else>>
- ''@@.red;W+++<<if $summaryStats == 1>>[_Slave.weight]<</if>>@@''
+ ''@@.red;W+++[_Slave.weight]@@''
<</if>>
<</if>>
-<<elseif $abbreviateDiet is 2>>
+<<elseif $abbreviateDiet == 2>>
<<if _Slave.weight < -95>>
- @@.red;Emaciated<<if $summaryStats == 1>> [_Slave.weight]<</if>>.@@
+ @@.red;Emaciated [_Slave.weight]@@
<<elseif _Slave.weight < -30>>
<<if _Slave.hips < -1>>
- Model-thin<<if $summaryStats == 1>> [_Slave.weight]<</if>>.
+ Model-thin [_Slave.weight].
<<else>>
- @@.red;Very thin<<if $summaryStats == 1>> [_Slave.weight]<</if>>.@@
+ @@.red;Very thin[_Slave.weight]@@
<</if>>
<<elseif _Slave.weight < -10>>
- Thin<<if $summaryStats == 1>> [_Slave.weight]<</if>>.
+ Thin [_Slave.weight].
<<elseif _Slave.weight <= 10 >>
- Trim<<if $summaryStats == 1>> [_Slave.weight]<</if>>.
+ Trim [_Slave.weight].
<<elseif _Slave.weight <= 30>>
- Plush<<if $summaryStats == 1>> [_Slave.weight]<</if>>.
+ Plush [_Slave.weight].
<<elseif _Slave.weight <= 95>>
<<if _Slave.hips > 1>>
- Nicely chubby<<if $summaryStats == 1>> [_Slave.weight]<</if>>.
+ Nicely chubby [_Slave.weight].
<<else>>
- @@.red;Overweight<<if $summaryStats == 1>> [_Slave.weight]<</if>>.@@
+ @@.red;Overweight [_Slave.weight]@@
<</if>>
<<else>>
<<if _Slave.hips >= 2>>
- Pleasantly soft and shapely<<if $summaryStats == 1>> [_Slave.weight]<</if>>.
+ Pleasantly soft and shapely [_Slave.weight].
<<else>>
- @@.red;Fat<<if $summaryStats == 1>> [_Slave.weight]<</if>>.@@
+ @@.red;Fat [_Slave.weight].@@
<</if>>
<</if>>
<</if>>
+<</if>>
<<if $abbreviateDiet == 1>>
<<switch _Slave.diet>>
@@ -850,7 +851,7 @@ Release rules: _Slave.releaseRules.
<<elseif (_Slave.dietMilk == 2)>>
''Milk++''
<</if>>
-<<elseif $abbreviateDiet is 2>>
+<<elseif $abbreviateDiet == 2>>
<<switch _Slave.diet>>
<<case "restricted">>
Dieting.
@@ -883,28 +884,30 @@ Release rules: _Slave.releaseRules.
<</if>>
<<if $abbreviateHealth == 1>>
+<<if $summaryStats == 1>>
<<if _Slave.health < -20>>
- ''@@.red;H<<if $summaryStats == 1>>[_Slave.health]<</if>>@@''
+ ''@@.red;H[_Slave.health]@@''
<<elseif _Slave.health <= 20>>
- ''@@.yellow;H<<if $summaryStats == 1>>[_Slave.health]<</if>>@@''
+ ''@@.yellow;H[_Slave.health]@@''
<<elseif _Slave.health > 20>>
- ''@@.green;H<<if $summaryStats == 1>>[_Slave.health]<</if>>@@''
+ ''@@.green;H[_Slave.health]@@<</if>>''
<</if>>
-<<elseif $abbreviateHealth is 2>>
+<<elseif $abbreviateHealth == 2>>
+<<if $summaryStats == 1>>
<<if _Slave.health < -90>>
- @@.red;On the edge of death<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.red;On the edge of death [_Slave.health]@@
<<elseif _Slave.health < -50>>
- @@.red;Extremely unhealthy<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.red;Extremely unhealthy [_Slave.health]@@
<<elseif _Slave.health < -20>>
- @@.red;Unhealthy<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.red;Unhealthy [_Slave.health]@@
<<elseif _Slave.health <= 20>>
- @@.yellow;Healthy<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.yellow;Healthy [_Slave.health]@@
<<elseif _Slave.health <= 50>>
- @@.green;Very healthy<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.green;Very healthy [_Slave.health]@@
<<elseif _Slave.health <= 90>>
- @@.green;Extremely healthy<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.green;Extremely healthy [_Slave.health]@@
<<else>>
- @@.green;Unnaturally healthy<<if $summaryStats == 1>> [_Slave.health]<</if>>.@@
+ @@.green;Unnaturally healthy [_Slave.health]<</if>>.@@
<</if>>
<</if>>
@@ -1557,20 +1560,21 @@ Release rules: _Slave.releaseRules.
<<if _Slave.visualAge != _Slave.physicalAge>>
Lks<<print _Slave.visualAge>>
<</if>>
+<<if $summaryStats == 1>>
<<if _Slave.face < -95>>
- @@.red;Face---<<if $summaryStats == 1>>[_Slave.face]<</if>>@@
+ @@.red;Face---[_Slave.face]@@
<<elseif _Slave.face < -40>>
- @@.red;Face--<<if $summaryStats == 1>>[_Slave.face]<</if>>@@
+ @@.red;Face--[_Slave.face]@@
<<elseif _Slave.face < -10>>
- @@.red;Face-<<if $summaryStats == 1>>[_Slave.face]<</if>>@@
+ @@.red;Face-[_Slave.face]@@
<<elseif _Slave.face <= 10>>
- Face<<if $summaryStats == 1>>[_Slave.face]<</if>>
+ Face[_Slave.face]
<<elseif _Slave.face <= 40>>
- @@.pink;Face+<<if $summaryStats == 1>>[_Slave.face]<</if>>@@
+ @@.pink;Face+[_Slave.face]@@
<<elseif _Slave.face <= 95>>
- @@.pink;Face++<<if $summaryStats == 1>>[_Slave.face]<</if>>@@
+ @@.pink;Face++[_Slave.face]@@
<<else>>
- @@.pink;Face+++<<if $summaryStats == 1>>[_Slave.face]<</if>>@@
+ @@.pink;Face+++[_Slave.face]<</if>>@@
<</if>>
<<if _Slave.eyes == -2>>
@@.red;Blind@@
@@ -1582,18 +1586,19 @@ Release rules: _Slave.releaseRules.
Markings
<</if>>
+<<if $summaryStats == 1>>
<<if _Slave.lips > 95>>
Facepussy
<<elseif _Slave.lips > 70>>
- Lips+++<<if $summaryStats == 1>>[_Slave.lips]<</if>>
+ Lips+++[_Slave.lips]
<<elseif _Slave.lips > 40>>
- Lips++<<if $summaryStats == 1>>[_Slave.lips]<</if>>
+ Lips++[_Slave.lips]
<<elseif _Slave.lips > 20>>
- Lips+<<if $summaryStats == 1>>[_Slave.lips]<</if>>
+ Lips+[_Slave.lips]
<<elseif _Slave.lips > 10>>
- Lips<<if $summaryStats == 1>>[_Slave.lips]<</if>>
+ Lips[_Slave.lips]
<<else>>
- @@.red;Lips-@@<<if $summaryStats == 1>>[_Slave.lips]<</if>>
+ @@.red;Lips-@@[_Slave.lips]<</if>>
<</if>>
<<if _Slave.teeth == "crooked">>
@@.yellow;Cr Teeth@@
@@ -1721,13 +1726,14 @@ Release rules: _Slave.releaseRules.
<</if>>
<</if>>
@@
-<<if _Slave.waist > 95>>@@.red;Wst---<<if $summaryStats == 1>>[_Slave.waist]<</if>>@@
-<<elseif _Slave.waist > 40>>@@.red;Wst--<<if $summaryStats == 1>>[_Slave.waist]<</if>>@@
-<<elseif _Slave.waist > 10>>@@.red;Wst-<<if $summaryStats == 1>>[_Slave.waist]<</if>>@@
-<<elseif _Slave.waist >= -10>>Wst<<if $summaryStats == 1>>[_Slave.waist]<</if>>
-<<elseif _Slave.waist >= -40>>@@.pink;Wst+<<if $summaryStats == 1>>[_Slave.waist]<</if>>@@
-<<elseif _Slave.waist >= -95>>@@.pink;Wst++<<if $summaryStats == 1>>[_Slave.waist]<</if>>@@
-<<else>>@@.pink;Wst+++<<if $summaryStats == 1>>[_Slave.waist]<</if>>@@
+<<if $summaryStats == 1>>
+<<if _Slave.waist > 95>>@@.red;Wst---[_Slave.waist]@@
+<<elseif _Slave.waist > 40>>@@.red;Wst--[_Slave.waist]@@
+<<elseif _Slave.waist > 10>>@@.red;Wst-[_Slave.waist]@@
+<<elseif _Slave.waist >= -10>>Wst[_Slave.waist]
+<<elseif _Slave.waist >= -40>>@@.pink;Wst+[_Slave.waist]@@
+<<elseif _Slave.waist >= -95>>@@.pink;Wst++[_Slave.waist]@@
+<<else>>@@.pink;Wst+++[_Slave.waist]<</if>>@@
<</if>>
@@.pink;
<<if (_Slave.boobsImplant == 0) && (_Slave.buttImplant == 0) && (_Slave.waist >= -95) && (_Slave.lipsImplant == 0) && (_Slave.faceImplant < 2) && (_Slave.bellyImplant == 0)>>
@@ -1780,20 +1786,21 @@ Release rules: _Slave.releaseRules.
<<if _Slave.visualAge != _Slave.physicalAge>>
Looks _Slave.visualAge.
<</if>>
+<<if $summaryStats == 1>>
<<if _Slave.face < -95>>
- @@.red;Very ugly<<if $summaryStats == 1>> [_Slave.face]<</if>>@@
+ @@.red;Very ugly [_Slave.face]@@
<<elseif _Slave.face < -40>>
- @@.red;Ugly<<if $summaryStats == 1>> [_Slave.face]<</if>>@@
+ @@.red;Ugly [_Slave.face]@@
<<elseif _Slave.face < -10>>
- @@.red;Unattractive<<if $summaryStats == 1>> [_Slave.face]<</if>>@@
+ @@.red;Unattractive [_Slave.face]@@
<<elseif _Slave.face <= 10>>
- Average<<if $summaryStats == 1>> [_Slave.face]<</if>>
+ Average [_Slave.face]
<<elseif _Slave.face <= 40>>
- @@.pink;Attractive<<if $summaryStats == 1>> [_Slave.face]<</if>>@@
+ @@.pink;Attractive [_Slave.face]@@
<<elseif _Slave.face <= 95>>
- @@.pink;Beautiful<<if $summaryStats == 1>> [_Slave.face]<</if>>@@
+ @@.pink;Beautiful [_Slave.face]@@
<<else>>
- @@.pink;Very beautiful<<if $summaryStats == 1>> [_Slave.face]<</if>>@@
+ @@.pink;Very beautiful [_Slave.face]<</if>>@@
<</if>>
_Slave.faceShape face.
<<if _Slave.eyes <= -2>>
@@ -1833,6 +1840,7 @@ _Slave.faceShape face.
<<elseif _Slave.muscles > 5>>
Toned.
<<elseif _Slave.muscles > -6>>
+ Soft.
<<elseif _Slave.muscles > -31>>
@@.red;Weak.@@
<<elseif _Slave.muscles > -96>>
@@ -1940,13 +1948,14 @@ _Slave.faceShape face.
<</if>>
<</if>>
@@
-<<if _Slave.waist > 95>>@@.red;Masculine waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.@@
-<<elseif _Slave.waist > 40>>@@.red;Ugly waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.@@
-<<elseif _Slave.waist > 10>>@@.red;Unattractive waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.@@
-<<elseif _Slave.waist >= -10>>Average waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.
-<<elseif _Slave.waist >= -40>>@@.pink;Feminine waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.@@
-<<elseif _Slave.waist >= -95>>@@.pink;Hourglass waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.@@
-<<else>>@@.pink;Absurdly narrow waist<<if $summaryStats == 1>> [_Slave.waist]<</if>>.@@
+<<if $summaryStats == 1>>
+<<if _Slave.waist > 95>>@@.red;Masculine waist [_Slave.waist]@@
+<<elseif _Slave.waist > 40>>@@.red;Ugly waist [_Slave.waist]@@
+<<elseif _Slave.waist > 10>>@@.red;Unattractive waist [_Slave.waist]@@
+<<elseif _Slave.waist >= -10>>Average waist [_Slave.waist]
+<<elseif _Slave.waist >= -40>>@@.pink;Feminine waist [_Slave.waist]@@
+<<elseif _Slave.waist >= -95>>@@.pink;Hourglass waist [_Slave.waist]@@
+<<else>>@@.pink;Absurdly narrow waist [_Slave.waist]<</if>>.@@
<</if>>
@@.pink;
<<if (_Slave.boobsImplant != 0) || (_Slave.buttImplant != 0) || (_Slave.lipsImplant != 0) || (_Slave.bellyImplant != 0)>>
@@ -2023,9 +2032,29 @@ _Slave.faceShape face.
<<else>>
<<set _SSkills += _Slave.vaginalSkill>>
<<set _SSkills = Math.trunc(_SSkills)>>
- <<if _SSkills > 180>>S++<<elseif (_SSkills > 120) && (_Slave.vagina < 0)>>Sh++<<elseif _SSkills > 90>>S+<<elseif _SSkills > 30>>S<<else>>S-<</if>><<if $summaryStats == 1>>[_SSkills]<</if>>
- <<if _Slave.whoreSkill >= 100>>W+++<<elseif _Slave.whoreSkill > 60>>W++<<elseif _Slave.whoreSkill > 30>>W+<<elseif _Slave.whoreSkill > 10>>W<</if>><<if _Slave.whoreSkill > 10>><<if $summaryStats == 1>>[_Slave.whoreSkill]<</if>><</if>>
- <<if _Slave.entertainSkill >= 100>>E+++<<elseif _Slave.entertainSkill > 60>>E++<<elseif _Slave.entertainSkill > 30>>E+<<elseif _Slave.entertainSkill > 10>>E<</if>><<if _Slave.entertainSkill > 10>><<if $summaryStats == 1>>[_Slave.entertainSkill]<</if>><</if>>
+ <<if _SSkills > 180>>S++
+ <<elseif (_SSkills > 120) && (_Slave.vagina < 0)>>Sh++
+ <<elseif _SSkills > 90>>S+
+ <<elseif _SSkills > 30>>S
+ <<else>>S-
+ <</if>>
+ <<if $summaryStats == 1>>[_SSkills]<</if>>
+ <<if _Slave.whoreSkill >= 100>>W+++
+ <<elseif _Slave.whoreSkill > 60>>W++
+ <<elseif _Slave.whoreSkill > 30>>W+
+ <<elseif _Slave.whoreSkill > 10>>W
+ <</if>>
+ <<if _Slave.whoreSkill > 10>>
+ <<if $summaryStats == 1>>[_Slave.whoreSkill]<</if>>
+ <</if>>
+ <<if _Slave.entertainSkill >= 100>>E+++
+ <<elseif _Slave.entertainSkill > 60>>E++
+ <<elseif _Slave.entertainSkill > 30>>E+
+ <<elseif _Slave.entertainSkill > 10>>E
+ <</if>>
+ <<if _Slave.entertainSkill > 10>>
+ <<if $summaryStats == 1>>[_Slave.entertainSkill]<</if>>
+ <</if>>
<</if>>
<<if _Slave.combatSkill > 0>>
C
@@ -2219,18 +2248,19 @@ _Slave.faceShape face.
@@
<</if>>
<<if _Slave.attrKnown == 1>>
+ <<if $summaryStats == 1>>
<<if _Slave.attrXY <= 5>>
- @@.red;XY---<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>@@
+ @@.red;XY---[_Slave.attrXY]@@
<<elseif _Slave.attrXY <= 15>>
- @@.red;XY--<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>@@
+ @@.red;XY--[_Slave.attrXY]@@
<<elseif _Slave.attrXY <= 35>>
- @@.red;XY-<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>@@
+ @@.red;XY-[_Slave.attrXY]@@
<<elseif _Slave.attrXY <= 65>>
- XY<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>
+ XY[_Slave.attrXY]
<<elseif _Slave.attrXY <= 85>>
- @@.green;XY+<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>@@
+ @@.green;XY+[_Slave.attrXY]@@
<<elseif _Slave.attrXY <= 95>>
- @@.green;XY++<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>@@
+ @@.green;XY++[_Slave.attrXY]@@
<<elseif _Slave.attrXX > 95>>
<<if _Slave.energy <= 95>>
@@.green;Omni!@@
@@ -2238,37 +2268,39 @@ _Slave.faceShape face.
@@.green;Omni+Nympho!!@@
<</if>>
<<else>>
- @@.green;XY+++<<if $summaryStats == 1>>[_Slave.attrXY]<</if>>@@
+ @@.green;XY+++[_Slave.attrXY]<</if>>@@
<</if>>
+ <<if $summaryStats == 1>>
<<if _Slave.attrXX <= 5>>
- @@.red;XX---<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>@@
+ @@.red;XX---[_Slave.attrXX]@@
<<elseif _Slave.attrXX <= 15>>
- @@.red;XX--<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>@@
+ @@.red;XX--[_Slave.attrXX]@@
<<elseif _Slave.attrXX <= 35>>
- @@.red;XX-<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>@@
+ @@.red;XX-[_Slave.attrXX]@@
<<elseif _Slave.attrXX <= 65>>
- XX<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>
+ XX[_Slave.attrXX]
<<elseif _Slave.attrXX <= 85>>
- @@.green;XX+<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>@@
+ @@.green;XX+[_Slave.attrXX]@@
<<elseif _Slave.attrXX <= 95>>
- @@.green;XX++<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>@@
+ @@.green;XX++[_Slave.attrXX]@@
<<elseif _Slave.attrXY <= 95>>
- @@.green;XX+++<<if $summaryStats == 1>>[_Slave.attrXX]<</if>>@@
+ @@.green;XX+++[_Slave.attrXX]<</if>>@@
<</if>>
+ <<if $summaryStats == 1>>
<<if _Slave.energy > 95>>
<<if (_Slave.attrXY <= 95) || (_Slave.attrXX <= 95)>>
@@.green;Nympho!@@
<</if>>
<<elseif _Slave.energy > 80>>
- @@.green;SD++<<if $summaryStats == 1>>[_Slave.energy]<</if>>@@
+ @@.green;SD++[_Slave.energy]@@
<<elseif _Slave.energy > 60>>
- @@.green;SD+<<if $summaryStats == 1>>[_Slave.energy]<</if>>@@
+ @@.green;SD+[_Slave.energy]@@
<<elseif _Slave.energy > 40>>
- @@.yellow;SD<<if $summaryStats == 1>>[_Slave.energy]<</if>>@@
+ @@.yellow;SD[_Slave.energy]@@
<<elseif _Slave.energy > 20>>
- @@.red;SD-<<if $summaryStats == 1>>[_Slave.energy]<</if>>@@
+ @@.red;SD-[_Slave.energy]@@
<<else>>
- @@.red;SD--<<if $summaryStats == 1>>[_Slave.energy]<</if>>@@
+ @@.red;SD--[_Slave.energy]<</if>>@@
<</if>>
<</if>>
<</if>>
@@ -2344,9 +2376,9 @@ _Slave.faceShape face.
<<if _Slave.attrXY > 0>>SP:anti-men<</if>>
<</if>>
<<else>>
- <<if _Slave.clitSetting is "women">>
+ <<if _Slave.clitSetting == "women">>
SP:women
- <<elseif _Slave.clitSetting is "men">>
+ <<elseif _Slave.clitSetting == "men">>
SP:men
<<elseif _Slave.clitSetting == "anti-women">>
SP:anti-women
@@ -2549,18 +2581,19 @@ _Slave.faceShape face.
@@
<</if>>
<<if _Slave.attrKnown == 1>>
+ <<if $summaryStats == 1>>
<<if _Slave.attrXY <= 5>>
- @@.red;Disgusted by men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,@@
+ @@.red;Disgusted by men [_Slave.attrXY],@@
<<elseif _Slave.attrXY <= 15>>
- @@.red;Turned off by men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,@@
+ @@.red;Turned off by men [_Slave.attrXY],@@
<<elseif _Slave.attrXY <= 35>>
- @@.red;Not attracted to men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,@@
+ @@.red;Not attracted to men [_Slave.attrXY],@@
<<elseif _Slave.attrXY <= 65>>
- Indifferent to men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,
+ Indifferent to men [_Slave.attrXY],
<<elseif _Slave.attrXY <= 85>>
- @@.green;Attracted to men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,@@
+ @@.green;Attracted to men [_Slave.attrXY],@@
<<elseif _Slave.attrXY <= 95>>
- @@.green;Aroused by men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,@@
+ @@.green;Aroused by men [_Slave.attrXY],@@
<<elseif _Slave.attrXX > 95>>
<<if _Slave.energy <= 95>>
@@.green;Omnisexual!@@
@@ -2568,37 +2601,39 @@ _Slave.faceShape face.
@@.green;Omnisexual nymphomaniac!@@
<</if>>
<<else>>
- @@.green;Passionate about men<<if $summaryStats == 1>> [_Slave.attrXY]<</if>>,@@
+ @@.green;Passionate about men [_Slave.attrXY]<</if>>,@@
<</if>>
+ <<if $summaryStats == 1>>
<<if _Slave.attrXX <= 5>>
- @@.red;disgusted by women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.@@
+ @@.red;disgusted by women [_Slave.attrXX].@@
<<elseif _Slave.attrXX <= 15>>
- @@.red;turned off by women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.@@
+ @@.red;turned off by women [_Slave.attrXX].@@
<<elseif _Slave.attrXX <= 35>>
- @@.red;not attracted to women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.@@
+ @@.red;not attracted to women [_Slave.attrXX].@@
<<elseif _Slave.attrXX <= 65>>
- indifferent to women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.
+ indifferent to women [_Slave.attrXX].
<<elseif _Slave.attrXX <= 85>>
- @@.green;attracted to women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.@@
+ @@.green;attracted to women [_Slave.attrXX].@@
<<elseif _Slave.attrXX <= 95>>
- @@.green;aroused by women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.@@
+ @@.green;aroused by women [_Slave.attrXX].@@
<<elseif _Slave.attrXY <= 95>>
- @@.green;passionate about women<<if $summaryStats == 1>> [_Slave.attrXX]<</if>>.@@
+ @@.green;passionate about women [_Slave.attrXX]<</if>>. @@
<</if>>
+ <<if $summaryStats == 1>>
<<if _Slave.energy > 95>>
<<if (_Slave.attrXY <= 95) || (_Slave.attrXX <= 95)>>
@@.green;Nymphomaniac!@@
<</if>>
<<elseif _Slave.energy > 80>>
- @@.green;Powerful sex drive<<if $summaryStats == 1>> [_Slave.energy]<</if>>.@@
+ @@.green;Powerful sex drive [_Slave.energy].@@
<<elseif _Slave.energy > 60>>
- @@.green;Good sex drive<<if $summaryStats == 1>> [_Slave.energy]<</if>>.@@
+ @@.green;Good sex drive [_Slave.energy].@@
<<elseif _Slave.energy > 40>>
- @@.yellow;Average sex drive<<if $summaryStats == 1>> [_Slave.energy]<</if>>.@@
+ @@.yellow;Average sex drive [_Slave.energy].@@
<<elseif _Slave.energy > 20>>
- @@.red;Poor sex drive<<if $summaryStats == 1>> [_Slave.energy]<</if>>.@@
+ @@.red;Poor sex drive [_Slave.energy].@@
<<else>>
- @@.red;No sex drive<<if $summaryStats == 1>> [_Slave.energy]<</if>>.@@
+ @@.red;No sex drive [_Slave.energy]<</if>>.@@
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/toychest.tw b/src/uncategorized/toychest.tw
index 8ccccf2f7ef0e23812285ec81d13101a7ab9b3dc..6615666d4399db4bea7abaa0a479e65de50c6d31 100644
--- a/src/uncategorized/toychest.tw
+++ b/src/uncategorized/toychest.tw
@@ -95,8 +95,6 @@
She's wearing a slutty schoolgirl outfit, and looks ready to do whatever it takes to improve her grades.
<<elseif ($slaves[$i].clothes == "a kimono")>>
She's wearing a kimono, lending your office an air of elegance, though she lacks some of the air of the true yamato nadeshiko.
-<<elseif ($slaves[$i].clothes == "a slutty qipao")>>
- She's wearing a qipao, lending your office the elegance of an imperial court.
<<elseif ($slaves[$i].clothes == "a hijab and abaya")>>
She's wearing a modest hijab and abaya, lending your office a certain air of conservatism.
<<elseif ($slaves[$i].clothes == "battledress")>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 3c2f0ce72e020d162fddf4958e0240b43b32387c..8890b57e800aca2a7820b8cd07fa35f39a615ec8 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -1195,7 +1195,7 @@ $possessiveCap
stiffly erect. They'd be inverted if $pronoun weren't so aroused, but $pronoun's so horny they stay popped out.
<<case "huge">>
<<if ($activeSlave.boobs-$activeSlave.boobsImplant > 7500)>>
- and in proportion with $possessive breasts: they're stiffly erect and
+ in proportion with $possessive breasts: they're stiffly erect and
<<if ($activeSlave.dick > 0) && ($activeSlave.dick < 3)>>
bigger than $possessive girlcock.
<<elseif ($activeSlave.height < 160) && ($activeSlave.amp != 1)>>