From 633a6af5706c36c403559b32b424ac6ba90af0b4 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 16 Mar 2017 01:17:58 -0400
Subject: [PATCH] Bugfixes and 0.9.10.1
---
src/events/intro/pcBodyIntro.tw | 2 +-
src/gui/css/mainStyleSheet.tw | 55 +-
src/js/accordianJS.tw | 14 +-
src/npc/fFeelings.tw | 2 +-
src/pregmod/extendedFamilyWidgets.tw | 16 +-
src/pregmod/newChildIntro.tw | 14 +-
src/uncategorized/PESS.tw | 9 +-
src/uncategorized/PETS.tw | 13 +-
src/uncategorized/RECI.tw | 9 +-
src/uncategorized/REFI.tw | 91 +++-
src/uncategorized/RESS.tw | 9 +-
src/uncategorized/RESSTR.tw | 11 +-
src/uncategorized/RETS.tw | 12 +-
src/uncategorized/arcadeReport.tw | 11 +-
src/uncategorized/brothelReport.tw | 11 +-
src/uncategorized/cellblockReport.tw | 11 +-
src/uncategorized/clinicReport.tw | 11 +-
src/uncategorized/clubReport.tw | 11 +-
src/uncategorized/dairyReport.tw | 11 +-
src/uncategorized/dispensary.tw | 2 +-
src/uncategorized/fullReport.tw | 9 +-
src/uncategorized/jeSlaveDispute.tw | 9 +-
src/uncategorized/longSlaveDescription.tw | 10 +-
src/uncategorized/manageArcology.tw | 2 +-
src/uncategorized/masterSuiteReport.tw | 11 +-
src/uncategorized/matchmaking.tw | 22 +-
src/uncategorized/newGamePlus.tw | 4 +-
src/uncategorized/pRivalryActions.tw | 13 +-
src/uncategorized/reDevotees.tw | 18 +-
...EgyptianRevivalistAcquisitionWorkaround.tw | 4 +-
src/uncategorized/reNoEvent.tw | 9 +-
src/uncategorized/reRelativeRecruiter.tw | 18 +-
src/uncategorized/reStandardPunishment.tw | 9 +-
src/uncategorized/remoteSurgery.tw | 32 +-
src/uncategorized/saRules.tw | 4 +-
src/uncategorized/saWorkAGloryHole.tw | 114 ++--
src/uncategorized/schoolroomReport.tw | 22 +-
src/uncategorized/servantsQuartersReport.tw | 12 +-
src/uncategorized/slaveSummary.tw | 86 +--
src/uncategorized/spaReport.tw | 488 +++++++++---------
src/utility/artWidgets.tw | 20 +-
41 files changed, 768 insertions(+), 473 deletions(-)
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
index b67ee890b96..b4b318f0f9b 100644
--- a/src/events/intro/pcBodyIntro.tw
+++ b/src/events/intro/pcBodyIntro.tw
@@ -2,7 +2,7 @@
Most slaveowners in the Free Cities are male. The preexisting power structures of the old world have mostly migrated to the new, and it can often be very hard to be a free woman in the Free Cities. Some manage to make their way, but in many arcologies, men are the owners, and women are the owned. You'll cut a striking figure as the owner and leader of your arcology, but @@color:orange;what's under your business attire?@@
-<<set $PC.actualAge to Math.clamp($PC.actualAge, 18, 80)>>
+<<set $PC.actualAge to Math.clamp($PC.actualAge, 14, 80)>>
<br>
Under my suit jacket,
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index c4e9eb70d6b..1cd11f08ffb 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -11,33 +11,40 @@
max-width: 76em;
}
-div.imageRef{
-margin-left: -75px;
-margin-right: -75px;
-overflow:hidden;
-width: 400px;
-height: 400px;
-position: relative;
-float:right;
+.imageRef {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ position: relative;
}
-div.lowPenis{
-width: 400px;
-height: 400px;
-position: absolute;
-left: 2px;
-top: 11px;
+.tinyImg {
+ height: 120px;
+ width: 120px;
+ float: left;
+}
+.smlImg {
+ height: 150px;
+ width: 150px;
+ float: left;
+}
+
+.medImg {
+ height: 300px;
+ width: 300px;
+ float: right;
}
-div.highPenis{
-width: 400px;
-height: 400px;
-position: absolute;
+.lrgImg {
+ height: 600px;
+ width: 600px;
+ margin-right: -100px;
+ margin-left: -100px;
+ float: right;
}
-object
- {
- width: 400px;
- height: 400px;
- position: absolute;
- }
+object {
+ object-fit: scale-down;
+ position: absolute;
+}
\ No newline at end of file
diff --git a/src/js/accordianJS.tw b/src/js/accordianJS.tw
index bf2c9930367..bcf2d13f772 100644
--- a/src/js/accordianJS.tw
+++ b/src/js/accordianJS.tw
@@ -1,4 +1,4 @@
-:: accordionJS [script]
+:: accordionJS.tw [script]
/* Accordion 000-250-006 */
/*
@@ -13,13 +13,13 @@
*
* 000-250-006 03092017
*/
-
+
postdisplay["doAccordionSet"] = function (content) {
- if (variables().useAccordion === 1) {
- Array.prototype.slice.call(document.querySelectorAll(".macro-display"))
- .forEach(function (element) {
- element.classList.add("accHidden");
- });
+ if (variables().useAccordion == 1) {
+ Array.prototype.slice.call(document.querySelectorAll('.macro-include'))
+ .forEach(function(element) {
+ element.classList.add('accHidden');
+ });
}
}
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 583d687c20d..085e2643f6d 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -701,7 +701,7 @@ My favorite part of my body i<<s>>
<</if>>
<</if>>
<<case "get milked" "work in the dairy">>
- <<if $activeSlave.balls = 0>>
+ <<if $activeSlave.balls == 0>>
<<if ($activeSlave.fetishKnown == 1)>>
<<if ($activeSlave.energy > 95)>>
It'<<s>> pretty ni<<c>>e, being milked.
diff --git a/src/pregmod/extendedFamilyWidgets.tw b/src/pregmod/extendedFamilyWidgets.tw
index 98b4994f6bc..89b63a5f023 100644
--- a/src/pregmod/extendedFamilyWidgets.tw
+++ b/src/pregmod/extendedFamilyWidgets.tw
@@ -85,11 +85,11 @@
<<if $slaves[$i].ID != $activeSlave.ID && $slaves[$i].ID == $activeSlave.mother>>
<<for $j to 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID != $activeSlave.ID && $slaves[$j].ID != $slaves[$i].ID && $slaves[$j].ID == $slaves[$i].mother>>
- $pronounCap maternal @@color:lightgreen;grandmother is $slaves[$j].slaveName.@@
+ $possessiveCap maternal @@color:lightgreen;grandmother is $slaves[$j].slaveName.@@
<</if>>
<</for>>
<<elseif $PC.ID == $activeSlave.mother && $slaves[$i].ID == $PC.mother>>
- $pronounCap maternal @@color:lightgreen;grandmother is $slaves[$i].slaveName.@@
+ $possessiveCap maternal @@color:lightgreen;grandmother is $slaves[$i].slaveName.@@
<</if>>
<</for>>
@@ -98,11 +98,11 @@
<<if $slaves[$i].ID != $activeSlave.ID && $slaves[$i].ID == $activeSlave.mother>>
<<for $j to 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID != $activeSlave.ID && $slaves[$j].ID != $slaves[$i].ID && $slaves[$j].ID == $slaves[$i].father>>
- $pronounCap maternal @@color:lightgreen;grandfather is $slaves[$j].slaveName.@@
+ $possessiveCap maternal @@color:lightgreen;grandfather is $slaves[$j].slaveName.@@
<</if>>
<</for>>
<<elseif $PC.ID == $activeSlave.mother && $slaves[$i].ID == $PC.father>>
- $pronounCap maternal @@color:lightgreen;grandfather is $slaves[$i].slaveName.@@
+ $possessiveCap maternal @@color:lightgreen;grandfather is $slaves[$i].slaveName.@@
<</if>>
<</for>>
@@ -111,11 +111,11 @@
<<if $slaves[$i].ID != $activeSlave.ID && $slaves[$i].ID == $activeSlave.father>>
<<for $j to 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID != $activeSlave.ID && $slaves[$j].ID != $slaves[$i].ID && $slaves[$j].ID == $slaves[$i].mother>>
- $pronounCap paternal @@color:lightgreen;grandmother is $slaves[$j].slaveName.@@
+ $possessiveCap paternal @@color:lightgreen;grandmother is $slaves[$j].slaveName.@@
<</if>>
<</for>>
<<elseif $PC.ID == $activeSlave.father && $slaves[$i].ID == $PC.mother>>
- $pronounCap paternal @@color:lightgreen;grandmother is $slaves[$i].slaveName.@@
+ $possessiveCap paternal @@color:lightgreen;grandmother is $slaves[$i].slaveName.@@
<</if>>
<</for>>
@@ -124,11 +124,11 @@
<<if $slaves[$i].ID != $activeSlave.ID && $slaves[$i].ID == $activeSlave.father>>
<<for $j to 0; $j < $slaves.length; $j++>>
<<if $slaves[$j].ID != $activeSlave.ID && $slaves[$j].ID != $slaves[$i].ID && $slaves[$j].ID == $slaves[$i].father>>
- $pronounCap paternal @@color:lightgreen;grandfather is $slaves[$j].slaveName.@@
+ $possessiveCap paternal @@color:lightgreen;grandfather is $slaves[$j].slaveName.@@
<</if>>
<</for>>
<<elseif $PC.ID == $activeSlave.father && $slaves[$i].ID == $PC.father>>
- $pronounCap paternal @@color:lightgreen;grandfather is $slaves[$i].slaveName.@@
+ $possessiveCap paternal @@color:lightgreen;grandfather is $slaves[$i].slaveName.@@
<</if>>
<</for>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index c6410ecda31..64d647148c7 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -169,7 +169,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</replace>>
<</link>>
<<break>>
- <<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>>
+ <<elseif $slaves[_j].devotion > 50 && $slaves[_j].trust > 50>>
<br><<click "Permit her devoted mother to name her daughter">>
<<replace "#naming">>
<<ParentNames $slaves[_j] $activeSlave>>
@@ -231,7 +231,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<</replace>>
<</link>>
<<break>>
- <<elseif $slaves[_j].devotion > 50 && slaves[_j].trust > 50>>
+ <<elseif $slaves[_j].devotion > 50 && $slaves[_j].trust > 50>>
<br><<click "Permit her devoted mother to name her daughter">>
<<replace "#naming">>
<<ParentNames $slaves[_j] $activeSlave>>
@@ -329,9 +329,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif _tempMom.dick > 0 && _tempMom.vagina > -1>>
Her eyes focus on _tempMom.slaveName's crotch, staring in wonder and confusion at the presence of both a penis and a vagina.
<<elseif _tempMom.amp == 1>>
- Her eyes dart from limb to missing limb on _tempMom.slaveName's body, trying desperatly to understand what happened to them.
+ Her eyes dart from limb to missing limb on _tempMom.slaveName's body, trying desperately to understand what happened to them.
<<elseif _tempMom.amp < 0>>
- Her eyes dart from limb to prosthetic limb on _tempMom.slaveName's body, trying desperatly to understand these wonderful things are and how she could get her own.
+ Her eyes dart from limb to prosthetic limb on _tempMom.slaveName's body, trying desperately to understand these wonderful things are and how she could get her own.
<</if>>
<</if>>
@@ -398,9 +398,9 @@ You completed the legalities before heading to $incubatorName, knowing the tank
<<elseif _tempDad.dick > 0 && _tempDad.vagina > -1>>
Her eyes focus on _tempDad.slaveName's crotch, staring in wonder and confusion at the presence of both a penis and a vagina.
<<elseif _tempDad.amp == 1>>
- Her eyes dart from limb to missing limb on _tempDad.slaveName's body, trying desperatly to understand what happened to them.
+ Her eyes dart from limb to missing limb on _tempDad.slaveName's body, trying desperately to understand what happened to them.
<<elseif _tempDad.amp < 0>>
- Her eyes dart from limb to prosthetic limb on _tempDad.slaveName's body, trying desperatly to understand these wonderful things are and how she could get her own.
+ Her eyes dart from limb to prosthetic limb on _tempDad.slaveName's body, trying desperately to understand these wonderful things are and how she could get her own.
<</if>>
<</if>>
@@ -754,7 +754,7 @@ As she begins to moan with lust, you grip down tightly and force her to the floo
<</link>>
<br><<click "Punish her nuts">>
<<replace "#result2">>
- Righting yourself, you land a kick firmly and directly into her dangling balls. She collapses to the ground @@color:mediumorchid;wailing with betrayal@@ and @@color:gold;desperatly trying to protect herself from you.@@
+ Righting yourself, you land a kick firmly and directly into her dangling balls. She collapses to the ground @@color:mediumorchid;wailing with betrayal@@ and @@color:gold;desperately trying to protect herself from you.@@
<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.trust -= 50>>
<</replace>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 654cf433284..cd0c55fdbfb 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -37,7 +37,14 @@
<<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "RIE Eligibility Check">>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+</div>
+<</if>>
+/* 000-250-006 */
<<SlaveTitle $activeSlave>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 3ad53ea7fd7..3e9cfa513ac 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -58,7 +58,18 @@
<<SlaveTitle $activeSlave>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
+
<<switch $PETSevent>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index d9bfec5afd1..4343bfb0f5a 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -17,7 +17,14 @@
<<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
<<SlaveTitle $activeSlave>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index a805a80cff3..f1025d5faa9 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -83,7 +83,18 @@
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
You have $subSlave.slaveName bent over your desk, and are seeing to your own amusement and her masochistic streak at once. She has her body flat on the desk, but is unrestrained, and has been told that she must not rise off it at all. You then tell her to count strokes and begin to flog her ass with a leathern instrument. Before long she is experiencing more pain than the human body can support without involuntary movement, and you tell her to go back one count whenever she does. At long last she completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until she stiffens again at the burning sensation of a cock stretching her anal sphincter. You are not gentle, and the rough sodomy combined with the burning of her outraged buttocks as you slap yourself against them maintains her pain high. After you finish and she leaves, wincing in agony but with a faraway look of release, you notice $activeSlave.slaveName at the door to your office. You call her in.
<br><br>
@@ -99,7 +110,18 @@ You have $subSlave.slaveName bent over your desk, and are seeing to your own amu
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
$subSlave.slaveName gets inspected more regularly than your other slaves, since she's quite pregnant. Her pregnancy is progressing acceptably, but having her belly inspected gets her extremely eager to feel more of <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>'s seed in her fertile cunt. $subSlave.slaveName has been a good girl, so you take her on the couch, spooning so that her heavy belly can rest comfortably as you languidly take her. You have your arms wrapped around her chest to cup both breasts, and she has her neck twisted back to kiss you. After you both finish and she leaves, smiling contentedly at you, you notice $activeSlave.slaveName at the door to your office. You call her in.
@@ -115,7 +137,18 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
$subSlave.slaveName is on lunch duty today. That means that as you eat your working lunch, she sits on the edge of your desk right next to you, so that her nipples are conveniently at mouth height. Whenever you feel thirsty, you lean over and take some of her creamy, slightly vanilla-toned milk straight from the source. Every time you do, she shudders convulsively, <<if $subSlave.voice != 0>>giving little mewling whimpers.<<else>>harsh gasping noises that are all she can manage, as a mute.<</if>> Though you never touch anything but her nipples, she climaxes twice. After you finish and she leaves, you notice $activeSlave.slaveName at the door to your office. You call her in.
<br><br>
@@ -136,7 +169,18 @@ $subSlave.slaveName is on lunch duty today. That means that as you eat your work
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
$subSlave.slaveName is lying on the edge of your desk with her body helpless beneath you, your dick in her, and your hands around her neck. It's just breath play, and you're practiced enough that she's in no danger. She's such a sexual submissive that she sometimes acts out if not managed. This happens when she feels the urge to misbehave in order to access punishment, so you personally ensure that she can indulge her submissiveness when she needs it. She does not orgasm with you, her complete servitude to your pleasure fulfilling a deeper need than that. She leaves your office with a serene look on her face, passing <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>, who is <<if ($activeSlave.heels == 1) && ($activeSlave.shoes != "heels") && ($activeSlave.shoes != "boots") && ($activeSlave.shoes != "extreme heels")>>kneeling in the doorway with a troubled look on her face.<<elseif $activeSlave.amp != 1>>standing in the doorway with a troubled look on her face.<<else>>propped limblessly nearby. She has a troubled look on her face.<</if>>
<br><br>
@@ -152,7 +196,18 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
In the middle of the afternoon, you take a break from work to fuck $subSlave.slaveName in your office. $subSlave.slaveName is such a complete buttslut that she's enjoying herself to an almost indecent degree: moaning, begging, or just smiling idiotically with her mouth open and her tongue lolling. After you finish and she leaves, you notice $activeSlave.slaveName at the door to your office. You call her in.
<br><br>
@@ -168,7 +223,18 @@ In the middle of the afternoon, you take a break from work to fuck $subSlave.sla
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. She's industriously pumping her mouth up and down on your member. In truth, $subSlave.slaveName doesn't give the perfect blowjob: she loves cum so much that she mostly enjoys oral sex in an anticipatory way, and usually works to make the recipient cum as soon as possible so as to get her favorite treat into her mouth quicker. Still, her enthusiasm is nice and she does have permission to wake you at your usual time in this way. As you get up after finishing, you notice <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> at the door to your bedroom. You call her in.
<br><br>
@@ -189,7 +255,18 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
<<break>>
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
You have $subSlave.slaveName pinned up against a railing on a balcony that overlooks a public atrium. Passersby below cannot see you, but they can certainly see $subSlave.slaveName's upper body as she takes your dick. She's blushing furiously with the sex and with her trademark mixed arousal and embarrassment at having an audience. She makes a show of trying to disguise the fact that she's getting railed, but it's obvious. When you finish, you pull her off the railing so she can clean up. <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> saw the denouement of this exhibitionist fun, and seems intrigued.
<br><br>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 29c377fc249..35cfe7b0006 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -17,7 +17,14 @@
<<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
<<SlaveTitle $activeSlave>>
<<Enunciate $activeSlave>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 499b46b7a19..2d42021f500 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -4,7 +4,16 @@
<<set $RESSTRevent to $RESSTRevent.random()>>
<<set $activeSlave to $eventSlave>>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
+
<<SlaveTitle $activeSlave>>
<<Enunciate $activeSlave>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 3e5542c20c7..08d23746bc3 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -110,7 +110,17 @@
<<SlaveTitle $activeSlave>>
-<<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $subSlave 2 0>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
<<switch $RETSevent>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index b09607fe630..085c25576a6 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -4,7 +4,16 @@
<<for _i to 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment != "be confined in the arcade")>><<continue>><</if>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_i] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<set $slaves[_i].trust -= 5, $arcadeSlaves++, $i = _i>>
<<silently>>
<<if ($arcadeUpgradeInjectors == 1)>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index a3b1f09cbcd..006b9c8dab7 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -13,7 +13,16 @@
<</if>>
<<if ($Madam != 0)>>
<<if ($slaves[_i].ID == $Madam.ID)>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[$i] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<set _MDM = _i>>
<</if>>
<</if>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 99ec56495c0..82242a87730 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -8,7 +8,16 @@
<<for $i to 0; $i < $slaves.length; $i++>>
<<if ($slaves[$i].assignment is "be confined in the cellblock")>>
- <<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[$i] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<set $cellblockSlaves += 1>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -20)>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 3082a6a326d..e44160c0b93 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -10,7 +10,16 @@
<</for>>
<</if>>
<<if _NR != -1>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_NR] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_NR] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_NR] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<silently>>
<<set $i = _NR>>
<<include "SA long term effects">>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 6c4ced8601d..08530e2a342 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -7,7 +7,16 @@
<<for _i = 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment is "serve in the club")>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_i] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<set $clubSlaves++>>
<</if>>
<<if $DJ != 0>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index b9261ca3d48..07db5479cb6 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -78,7 +78,16 @@
<<for _i to 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment != "work in the dairy")>><<continue>><</if>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[$_i] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<set $dairySlaves++>>
<<if ($legendaryCowID == 0) && ($slaves[_i].lactation > 0) && (($slaves[_i].boobs-$slaves[_i].boobsImplant) > 6000) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
<<set $legendaryCowID to $slaves[_i].ID>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 34da2ae67a2..2f1db65be91 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -61,7 +61,7 @@ It is currently working on the following organs:
<<if $organs[$i].weeksToCompletion <= 0>>
ready for implantation.
<<else>>
- <<if $organFarmUpgrade == 1>><<print $organs[$i].weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.trunc($organs[$i].weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.trunc($organs[$i].weeksToCompletion/4)>><</if>> weeks from completion.
+ <<if $organFarmUpgrade == 1>><<print $organs[$i].weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.ceil($organs[$i].weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.ceil($organs[$i].weeksToCompletion/4)>><</if>> weeks from completion.
<</if>>
<<break>>
<</if>>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index b72936b5c96..bbd24e0763b 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -1,6 +1,13 @@
:: Full Report [nobr]
-<<if $seeImages == 1>><<SlaveArt $slaves[$i] 2 0>><</if>>
+/* 000-250-006 */
+/* <<SlaveArt $slaves[$i] 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$i] 2 0>>
+</div>
+<</if>>
+/* 000-250-006 */
<<SlavePronouns $slaves[$i]>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 1907dae2321..0bba5956108 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -142,7 +142,14 @@
\
<<nobr>>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+</div>
+<</if>>
+/* 000-250-006 */
<<if $event is "slave deal">>
<<if $assistantName is "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> breaks in on your sleep with an urgent message. You push a slave off you and sit up to take it. As the owner of the arcology, you perform some functions that would traditionally be the province of a government. In this anarcho-liberal polity, it's still necessary for people making deals to have someone to appeal to when disputes arise. Part of your agreement with your tenants is that you will perform this duty on deals between two tenants. The message is about just such a disagreement; they always seem to happen in the middle of the night, and they're always urgent.
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index ed2820c4f0b..8899f14e6fa 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2,7 +2,15 @@
<<SlavePronouns $activeSlave>>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 3 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 3 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef lrgImg">
+ <<SlaveArt $activeSlave 3 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 5584bb48778..b0aa864075e 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -30,7 +30,7 @@ A 1% interest in $arcologies[0].name is worth ¤$price and will require a transa
<<if $rep >= 10000>>
<br>
<<set $repPrice = Math.clamp($price/2, 0, 10000)>>
- You have so much political capital that you can spend reputation to acquire ownership by spending reputation. [[Use reputation|Manage Arcology][$rep -= $repPrice, $arcologies[0].ownership += 1]]
+ You have so much political capital that you can spend reputation to acquire ownership by spending reputation. [[Use reputation|Manage Arcology][$rep -= $repPrice, $arcologies[0].ownership += 1, $arcologies[0].demandFactor += 5]]
<</if>>
<</if>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 6d4d4eb80d6..3b926238ac3 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -5,7 +5,16 @@
<<for _i = 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment is "serve in the master suite") || ($slaves[_i].assignment is "be your Concubine")>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_i] 0 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
<<set $masterSuiteSlaves += 1, $masterSuiteAverageEnergy += $slaves[_i].energy>>
<<if $masterSuiteUpgradeLuxury == 2>>
<<if canAchieveErection($slaves[_i])>>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index b4e41b8d937..3d1c0859d5f 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -5,7 +5,15 @@
<<if $subSlave == 0>>
<<SlaveTitle $eventSlave>>
-<<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $eventSlave 2 0>>
+</div>
+<</if>>
+/* 000-250-006 */
You order $eventSlave.slaveName to come to your office. The <<if $eventSlave.relationship == -2>>worshipful<<else>>slutty<</if>> $desc arrives promptly, greets you correctly, and waits <<if $eventSlave.relationship == -2>>adoringly for a command<<else>>eagerly for you to fuck her<</if>>. You consider the situation carefully.
<<if $eventSlave.relationship == -2>>
@@ -303,7 +311,17 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
<</if>>
<</if>>
-<<if $seeImages == 1>><br style="clear:both" /><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><<SlaveArt $subSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $eventSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
<br><br>__Put her with another worshipful <<if $eventSlave.relationship == -2>>emotionally bonded emotionally slave<<else>>emotional slut<</if>>:__
<<set $Flag to 1>>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 107fdb42c4f..9790c97096a 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -15,7 +15,7 @@
You have the funds to bring $slavesToImportMax slaves with you (or your equivalent) to a new arcology.
<<if $cash >= 50000+($slavesToImportMax*10000)>>
- It will cost <<print 50000+($slavesToImportMax*10000)>>¤ to insure another slave's safe transer.
+ It will cost <<print 50000+($slavesToImportMax*10000)>>¤ to insure another slave's safe transfer.
[[Increase minimum transfered slaves by 1.|New Game Plus][$cash -= (50000+($slavesToImportMax*10000)), $slavesToImportMax++]]
<<else>>
You lack the funds to bring more than $slavesToImportMax slaves with you (or your equivalent) to a new arcology. It would cost <<print 50000+($slavesToImportMax*10000)>>¤ to guarantee another's safe transfer.
@@ -26,7 +26,7 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale
<<if $week > 52>>
You have acquired a fair amount of knowledge regarding arcologies and their day-to-day management in your time spent as one's owner qualifying you as an @@color:orange;"arcology owner"!@@ Benefits include:
@@color:lime;20% reduced cost of construction.@@
- @@color:lime;Free additional starting rep.@@
+ @@color:lime;Free additional starting rep along with easy rep maintenance.@@
@@color:lime;Reduced mercenary costs.@@
@@color:lime;An eye for gingered slaves.@@
<<if $retainCareer == 1>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 1cd01b01b9b..fe6f8421f5d 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3,7 +3,18 @@
<<set $nextButton to "Continue">>
<<set $nextLink to "RIE Eligibility Check">>
-<<if $hostageAnnounced == 1>><<if $seeImages == 1>><<SlaveArt $hostage 2 0>><</if>><</if>>
+<<if $hostageAnnounced == 1>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $hostage 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $hostage 2 0>>
+</div>
+<</if>>
+/* 000-250-006 */
+
+</if>
<<set $rivalryDuration += 1>>
<<set _num to random(1,99)>>
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index 12cc8fb6850..1662c150ce7 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -3,7 +3,23 @@
<<set $nextButton to "Continue">>
<<set $nextLink to "RIE Eligibility Check">>
-<<if $seeImages == 1>><<SlaveArt $slaves[0] 2 0>><<SlaveArt $slaves[1] 2 0>><<SlaveArt $slaves[2] 2 0>><<SlaveArt $slaves[3] 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[0] 2 0>><<SlaveArt $slaves[1] 2 0>><<SlaveArt $slaves[2] 2 0>><<SlaveArt $slaves[3] 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[0] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[1] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[2] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[3] 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
You have a mature, well-trained household of slaves. $slaves[0].slaveName, $slaves[1].slaveName, $slaves[2].slaveName, and $slaves[3].slaveName are all devoted to you. There are all manner of ways you could display this coterie of loyal sex slaves to show off your wealth and power.
<br><br>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
index 5416684f203..53d4858e142 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisitionWorkaround.tw
@@ -19,10 +19,10 @@ They arrive hand-in-hand and don't let go of each other until the end of the ens
<<set _secondSlave.physicalAge = _secondSlave.actualAge>>
<<if $familyTesting == 0>>
<<set _secondSlave.relation to "sister">>
- <<set _secondSlave.relationTarget to $activeSlave.ID - 1000>>
+ <<set _secondSlave.relationTarget to $activeSlave.ID>>
<</if>>
<<set _secondSlave.relationship to 4>>
-<<set _secondSlave.relationshipTarget to $activeSlave.ID - 1000>>
+<<set _secondSlave.relationshipTarget to $activeSlave.ID>>
<<set _secondSlave.hStyle to either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
diff --git a/src/uncategorized/reNoEvent.tw b/src/uncategorized/reNoEvent.tw
index ef306a137b0..0c043f889c8 100644
--- a/src/uncategorized/reNoEvent.tw
+++ b/src/uncategorized/reNoEvent.tw
@@ -9,7 +9,14 @@
<<set $activeSlave.devotion += 3>>
<<set $activeSlave.trust += 3>>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
This is a placeholder event.
<br><br>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 356a039f3f7..b02e51c0a0f 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -4,7 +4,14 @@
<<if $familyTesting == 1>>
-<<if $seeImages == 1>><<SlaveImage $eventSlave 2 1>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $eventSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
<<if ndef $newRelativeRecruitID>>
<<set $newRelativeRecruitID = 1100000>>
@@ -744,7 +751,14 @@ You look up the $relationType. She costs ¤$slaveCost, a bargain, but you won't
<</if>>
<</for>>
-<<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $eventSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
$eventSlave.slaveName requests an interview with you. She's a devoted slave, and you grant it, and are happy you did when you see the troubled expression on her face. She explains<<if canTalk($eventSlave) == false>> with desperate gestures
<</if>> that
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index a802e6034b9..ad65e792b25 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -4,7 +4,14 @@
<<set $nextButton to "Continue", $nextLink to "AS Dump", $returnTo to "Next Week">>
-<<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>>
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
<<SlaveTitle $activeSlave>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index da385a5c945..4b0e47a098e 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -767,26 +767,26 @@ The fabricator is not currently growing an organ for $object. Extract tissue to
<<set $organs.push($activeOrgan)>>
<<goto "Remote Surgery">>
<</link>> //Costs ¤20000 and the slave must not have female repoductive organs for successful implantation//
- <<if $animalParts != 0;>
- <br><<link "Anal pig womb and ovaries">>
- <<set $cash -= 20000>>
- <<set $activeOrgan to {type: "mpregPig", weeksToCompletion: "10", ID: 0}>>
- <<set $activeOrgan.ID to $activeSlave.ID>>
- <<set $organs.push($activeOrgan)>>
- <<goto "Remote Surgery">>
- <</link>> //Costs ¤20000 and the slave must not have female repoductive organs for successful implantation//
- <br><<link "Anal dog womb and ovaries">>
- <<set $cash -= 20000>>
- <<set $activeOrgan to {type: "mpregDog", weeksToCompletion: "10", ID: 0}>>
- <<set $activeOrgan.ID to $activeSlave.ID>>
- <<set $organs.push($activeOrgan)>>
- <<goto "Remote Surgery">>
- <</link>> //Costs ¤20000 and the slave must not have female repoductive organs for successful implantation//
+ <<if $animalParts != 0>>
+ <br><<link "Anal pig womb and ovaries">>
+ <<set $cash -= 20000>>
+ <<set $activeOrgan to {type: "mpregPig", weeksToCompletion: "10", ID: 0}>>
+ <<set $activeOrgan.ID to $activeSlave.ID>>
+ <<set $organs.push($activeOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs ¤20000 and the slave must not have female repoductive organs for successful implantation//
+ <br><<link "Anal dog womb and ovaries">>
+ <<set $cash -= 20000>>
+ <<set $activeOrgan to {type: "mpregDog", weeksToCompletion: "10", ID: 0}>>
+ <<set $activeOrgan.ID to $activeSlave.ID>>
+ <<set $organs.push($activeOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs ¤20000 and the slave must not have female repoductive organs for successful implantation//
<</if>>
<</if>>
<<elseif $activeOrgan.weeksToCompletion > 0>>
-The fabricator is currently growing $possessive $activeOrgan.type, which is projected to be ready for implantation in <<if $organFarmUpgrade == 1>><<print $activeOrgan.weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.trunc($activeOrgan.weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.trunc($activeOrgan.weeksToCompletion/4)>><</if>> weeks.
+The fabricator is currently growing $possessive $activeOrgan.type, which is projected to be ready for implantation in <<if $organFarmUpgrade == 1>><<print $activeOrgan.weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.ceil($activeOrgan.weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.ceil($activeOrgan.weeksToCompletion/4)>><</if>> weeks.
<<else>>
The fabricator has completed $possessive $activeOrgan.type.
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index ef5588cc861..855b78e22dd 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -152,7 +152,7 @@ She
<<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
<<if ($slaves[$i].devotion > 20) || ($slaves[$i].trust < -20)>>
<<if $PC.dick == 1>>
- Her reproductive system is in overdrive leading her to come to you for insemination several times a day, and she @@color:mediumaquamarine;desperatly hopes@@ for the day your seed takes root in her womb.
+ Her reproductive system is in overdrive leading her to come to you for insemination several times a day; she @@color:mediumaquamarine;desperately hopes@@ for the day your seed takes root in her womb.
<<set $slaves[$i].trust += 1>>
<</if>>
<</if>>
@@ -537,7 +537,7 @@ She
<<if $slaves[$i].vagina > 0 || ($slaves[$i].anus > 0 && $slaves[$i].mpreg == 1)>>
<<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
<<if ($slaves[$i].devotion > 20) || ($slaves[$i].trust < -20)>>
- Her reproductive system is in overdrive leading her to seek out any dicked girl she can find several times a day. She @@color:mediumaquamarine;desperatly longs@@ for the day her efforts fill her womb with child.
+ Her reproductive system is in overdrive leading her to seek out any dicked girl she can find several times a day. She @@color:mediumaquamarine;desperately longs@@ for the day her efforts fill her womb with child.
<<set $slaves[$i].trust += 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index cc53de659be..1b54a9c251e 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -57,19 +57,15 @@ is <<if $slaves[$i].fuckdoll == 0>>restrained in a glory hole<<else>>set out for
<<if ($slaves[$i].vagina == 0) && canDoVaginal($slaves[$i])>>
A <<if $slaves[$i].fuckdoll == 0>>glory hole <</if>>user takes $possessive virginity. He does not notice or care. @@color:lime;$possessiveCap pussy has been broken in@@ in a @@color:gold;painful@@ and @@color:mediumorchid;degrading@@ way.
- <<set $slaves[$i].devotion -= 10>>
- <<set $slaves[$i].trust -= 10>>
- <<set $slaves[$i].vagina to 1>>
-<<elseif ($slaves[$i].vagina < 3) && ($slaves[$i].vagina != -1) && canDoVaginal($slaves[$i]) && (random(1,100) > ((170-$beauty)+($slaves[$i].vagina*10)))>>
+ <<set $slaves[$i].devotion -= 10, $slaves[$i].trust -= 10, $slaves[$i].vagina to 1>>
+<<elseif ($slaves[$i].vagina < 3) && (canDoVaginal($slaves[$i])) && (random(1,100) > ((170-$beauty)+($slaves[$i].vagina*10)))>>
@@color:lime;$possessiveCap pussy gets stretched out by the use.@@
<<set $slaves[$i].vagina += 1>>
<</if>>
<<if ($slaves[$i].anus == 0) && canDoAnal($slaves[$i])>>
$possessiveCap anal virginity goes to a <<if $slaves[$i].fuckdoll == 0>>glory hole <</if>>user, who doesn't understand why this particular run at <<if $slaves[$i].fuckdoll == 0>>the glory hole<<else>>a Fuckdoll<</if>> is so great. @@color:lime;$possessiveCap ass has been broken in@@ in a @@color:gold;painful@@ and @@color:mediumorchid;degrading@@ way.
- <<set $slaves[$i].devotion -= 5>>
- <<set $slaves[$i].trust -= 5>>
- <<set $slaves[$i].anus to 1>>
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5, $slaves[$i].anus to 1>>
<<elseif ($slaves[$i].anus < 3) && canDoAnal($slaves[$i]) && (random(1,100) > ((150-$beauty)+($slaves[$i].anus*10)))>>
@@color:lime;$possessiveCap asshole sees constant use and loosens.@@
<<set $slaves[$i].anus += 1>>
@@ -82,10 +78,10 @@ is <<if $slaves[$i].fuckdoll == 0>>restrained in a glory hole<<else>>set out for
<<if ($slaves[$i].oralSkill <= 10)>>
With $possessive throat being brutally used, $possessive gag reflex is suppressed and $possessive oral skills improve.
<<OralSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina != -1) && ($slaves[$i].vaginalAccessory != "chastity belt")>>
+ <<elseif ($slaves[$i].vaginalSkill <= 10) && (canDoVaginal($slaves[$i]))>>
With $possessive pussy being harshly used, $possessive vaginal skills improve.
<<VaginalSkillIncrease $slaves[$i]>>
- <<elseif ($slaves[$i].analSkill <= 10)>>
+ <<elseif ($slaves[$i].analSkill <= 10) && (canDoAnal($slaves[$i]))>>
With $possessive butt being mercilessly fucked, $possessive anal skills improve.
<<AnalSkillIncrease $slaves[$i]>>
<</if>>
@@ -96,8 +92,7 @@ is <<if $slaves[$i].fuckdoll == 0>>restrained in a glory hole<<else>>set out for
Constant confinement coupled with brutal use has left $object with involuntary nervous tics.
<<set $slaves[$i].behavioralFlaw to "odd">>
<</if>>
- <<set $slaves[$i].devotion -= 5>>
- <<set $slaves[$i].trust -= 5>>
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 5>>
<<if ($slaves[$i].devotion > 50)>>
$pronounCap does $possessive best to tolerate $possessive sentence to the glory hole, but @@color:mediumorchid;$possessive devotion is hurt@@ and $pronoun is @@color:gold;filled with fear@@ $pronoun won't be let out.
<<elseif ($slaves[$i].devotion > 20)>>
@@ -114,8 +109,7 @@ is <<if $slaves[$i].fuckdoll == 0>>restrained in a glory hole<<else>>set out for
Constant confinement coupled with brutal use has left $object with involuntary nervous tics.
<<set $slaves[$i].behavioralFlaw to "odd">>
<</if>>
- <<set $slaves[$i].devotion -= 10>>
- <<set $slaves[$i].trust -= 10>>
+ <<set $slaves[$i].devotion -= 10, $slaves[$i].trust -= 10>>
<<if ($slaves[$i].devotion > 50)>>
$pronounCap feels starved of personal contact. @@color:mediumorchid;$possessiveCap devotion is hurt@@ and $pronoun is @@color:gold;filled with fear@@ $pronoun won't be let out.
<<elseif ($slaves[$i].devotion > 20)>>
@@ -138,57 +132,55 @@ $possessiveCap feelings, skills, and appearance do not matter. $pronounCap is co
/* FACILITY DECORATION IMPACTS */
-<<if $slaves[$i].assignment is "be confined in the arcade">>
-<<if $arcadeDecoration != "standard">>
-<<set $seed to 0.0001*$FSSingleSlaveRep*$beauty>>
+<<if ($slaves[$i].assignment is "be confined in the arcade") && ($arcadeDecoration != "standard")>>
+<<set _seed to 0.0001*$FSSingleSlaveRep*$beauty>>
<<switch $arcadeDecoration>>
<<case "Roman Revivalist">>
- <<set $arcologies[0].FSRomanRevivalist += $seed>>
+ <<set $arcologies[0].FSRomanRevivalist += _seed>>
<<case "Egyptian Revivalist">>
- <<set $arcologies[0].FSEgyptianRevivalist += $seed>>
+ <<set $arcologies[0].FSEgyptianRevivalist += _seed>>
<<case "Edo Revivalist">>
- <<set $arcologies[0].FSEdoRevivalist += $seed>>
+ <<set $arcologies[0].FSEdoRevivalist += _seed>>
<<case "Arabian Revivalist">>
- <<set $arcologies[0].FSArabianRevivalist += $seed>>
+ <<set $arcologies[0].FSArabianRevivalist += _seed>>
<<case "Chinese Revivalist">>
- <<set $arcologies[0].FSChineseRevivalist += $seed>>
+ <<set $arcologies[0].FSChineseRevivalist += _seed>>
<<case "Repopulation Focus">>
- <<set $arcologies[0].FSRepopulationFocus += $seed>>
+ <<set $arcologies[0].FSRepopulationFocus += _seed>>
<<case "Eugenics">>
- <<set $arcologies[0].FSRestart += $seed>>
+ <<set $arcologies[0].FSRestart += _seed>>
<<case "Chattel Religionist">>
- <<set $arcologies[0].FSChattelReligionist += $seed>>
+ <<set $arcologies[0].FSChattelReligionist += _seed>>
<<case "Degradationist">>
- <<set $arcologies[0].FSDegradationist += $seed>>
+ <<set $arcologies[0].FSDegradationist += _seed>>
<<case "Asset Expansionist">>
- <<set $arcologies[0].FSAssetExpansionist += $seed>>
+ <<set $arcologies[0].FSAssetExpansionist += _seed>>
<<case "Transformation Fetishist">>
- <<set $arcologies[0].FSTransformationFetishist += $seed>>
+ <<set $arcologies[0].FSTransformationFetishist += _seed>>
<<case "Gender Radicalist">>
- <<set $arcologies[0].FSGenderRadicalist += $seed>>
+ <<set $arcologies[0].FSGenderRadicalist += _seed>>
<<case "Gender Fundamentalist">>
- <<set $arcologies[0].FSGenderFundamentalist += $seed>>
+ <<set $arcologies[0].FSGenderFundamentalist += _seed>>
<<case "Physical Idealist">>
- <<set $arcologies[0].FSPhysicalIdealist += $seed>>
+ <<set $arcologies[0].FSPhysicalIdealist += _seed>>
<<case "Supremacist">>
- <<set $arcologies[0].FSSupremacist += $seed>>
+ <<set $arcologies[0].FSSupremacist += _seed>>
<<case "Subjugationist">>
- <<set $arcologies[0].FSSubjugationist += $seed>>
+ <<set $arcologies[0].FSSubjugationist += _seed>>
<<case "Paternalist">>
- <<set $arcologies[0].FSPaternalist += $seed>>
+ <<set $arcologies[0].FSPaternalist += _seed>>
<<case "Pastoralist">>
- <<set $arcologies[0].FSPastoralist += $seed>>
+ <<set $arcologies[0].FSPastoralist += _seed>>
<<case "Maturity Preferentialist">>
- <<set $arcologies[0].FSMaturityPreferentialist += $seed>>
+ <<set $arcologies[0].FSMaturityPreferentialist += _seed>>
<<case "Youth Preferentialist">>
- <<set $arcologies[0].FSYouthPreferentialist += $seed>>
+ <<set $arcologies[0].FSYouthPreferentialist += _seed>>
<<case "Body Purist">>
- <<set $arcologies[0].FSBodyPurist += $seed>>
+ <<set $arcologies[0].FSBodyPurist += _seed>>
<<case "Slimness Enthusiast">>
- <<set $arcologies[0].FSSlimnessEnthusiast += $seed>>
+ <<set $arcologies[0].FSSlimnessEnthusiast += _seed>>
<</switch>>
<</if>>
-<</if>>
/* SEX ACT COUNTS */
@@ -197,35 +189,27 @@ $possessiveCap feelings, skills, and appearance do not matter. $pronounCap is co
<</if ndef>>
<<if canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>
- <<set $slaves[$i].oralCount += Math.trunc($beauty/3)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/3)>>
- <<set $oralTotal += Math.trunc($beauty/3)>>
- <<set $slaves[$i].vaginalCount += Math.trunc($beauty/3)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/3)>>
- <<set $vaginalTotal += Math.trunc($beauty/3)>>
- <<set $_cervixPump = Math.trunc($beauty/3)>>
- <<set $slaves[$i].analCount += Math.trunc($beauty/3)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/3)>>
- <<set $analTotal += Math.trunc($beauty/3)>>
+ <<set _seed = Math.trunc($beauty/3)>>
+ <<set $slaves[$i].oralCount += _seed, $oralTotal += _seed>>
+ <<set $slaves[$i].vaginalCount += _seed, $vaginalTotal += _seed>>
+ <<set $slaves[$i].analCount += _seed, $analTotal += _seed>>
+ <<set $slaves[$i].publicCount += (_seed * 3)>>
+ <<set $_cervixPump = _seed>>
<<elseif canDoVaginal($slaves[$i])>>
- <<set $slaves[$i].oralCount += Math.trunc($beauty/2)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/2)>>
- <<set $oralTotal += Math.trunc($beauty/2)>>
- <<set $slaves[$i].vaginalCount += Math.trunc($beauty/2)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/2)>>
- <<set $vaginalTotal += Math.trunc($beauty/2)>>
- <<set $_cervixPump = Math.trunc($beauty/2)>>
+ <<set _seed = Math.trunc($beauty/2)>>
+ <<set $slaves[$i].oralCount += _seed, $oralTotal += _seed>>
+ <<set $slaves[$i].vaginalCount += _seed, $vaginalTotal += _seed>>
+ <<set $slaves[$i].publicCount += (_seed + _seed)>>
+ <<set $_cervixPump = _seed>>
<<elseif canDoAnal($slaves[$i])>>
- <<set $slaves[$i].oralCount += Math.trunc($beauty/2)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/2)>>
- <<set $oralTotal += Math.trunc($beauty/2)>>
- <<set $slaves[$i].analCount += Math.trunc($beauty/2)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty/2)>>
- <<set $analTotal += Math.trunc($beauty/2)>>
+ <<set _seed = Math.trunc($beauty/2)>>
+ <<set $slaves[$i].oralCount += _seed, $oralTotal += _seed>>
+ <<set $slaves[$i].analCount += _seed, $analTotal += _seed>>
+ <<set $slaves[$i].publicCount += (_seed + _seed)>>
<<else>>
- <<set $slaves[$i].oralCount += Math.trunc($beauty)>>
- <<set $slaves[$i].publicCount += Math.trunc($beauty)>>
- <<set $oralTotal += Math.trunc($beauty)>>
+ <<set _seed = Math.trunc($beauty)>>
+ <<set $slaves[$i].oralCount += _seed, $oralTotal += _seed>>
+ <<set $slaves[$i].publicCount += _seed>>
<</if>>
<<set $cash += ($beauty*$FResult)>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index d1cf19e7f24..feaf517827f 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -10,7 +10,16 @@
<</for>>
<</if>>
<<if _ST != -1>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_ST] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_ST] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_ST] 0 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
+
<<set $i = _ST>>
<<silently>>
<<include "SA long term effects">>
@@ -52,7 +61,16 @@
<<for _i to 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment != "learn in the schoolroom")>><<continue>><</if>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_i] 0 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
+
<<set $schoolroomSlaves++>>
<<silently>>
<<set $i = _i>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 985ffa8e0bd..68c28ab9daa 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -1,6 +1,5 @@
:: Servants' Quarters Report [nobr]
-
<<set $servantsQuartersSlaves = 0, $stewardessBonus = 0, _SQMilk = 0, _SQMilkSale = 0, _stewardessFetish = 0, _stewardessImpregnated = 0, _SL = $slaves.length, _SWD = -1>>
<<if ($Stewardess != 0)>>
@@ -67,7 +66,16 @@
<<set $servantMilkersMultiplier = 0.5>>
<<for _i to 0; _i < _SL; _i++>>
<<if ($slaves[_i].assignment != "work as a servant")>><<continue>><</if>>
- <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>>
+
+/* 000-250-006 */
+/* <<if $seeImages == 1>><<SlaveArt $slaves[_i] 0 0>><</if>> */
+<<if $seeImages == 1>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[_i] 0 0>>
+ </div>
+<</if>>
+/* 000-250-006 */
+
<<set $servantsQuartersSlaves++, $i = _i>>
<<silently>>
<<include "SA servant">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 7bb3105dd9d..d7fd0405282 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -11,7 +11,7 @@
<<set _Slave to $slaves[_i]>>
<</if>>
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>>
<<if "be your Head Girl" is _Slave.assignment>>''HG''
<<elseif "recruit girls" is _Slave.assignment>>''RC''
<<elseif "guard you" is _Slave.assignment>>''BG''
@@ -21,7 +21,7 @@
<<case "Personal Attention Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if _Slave.assignmentVisible == 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>>
<<print "[[_Slave.slaveName|Personal Attention Select][$personalAttention to $slaves[" + _i + "].ID, $activeSlave to $slaves[" + _i + "], $personalAttentionChanged to 1]]">>
<<else>>
<<continue>>
@@ -29,28 +29,28 @@
<<case "Agent Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && (_Slave.devotion >= 20) && (_Slave.intelligence > 0) && (_Slave.intelligenceImplant > 0) && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave) && _Slave.pregType < 50 && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Agent Workaround][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Agent Workaround][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
<<case "BG Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") and canWalk(_Slave) and canSee(_Slave) && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$Bodyguard to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Bodyguard Workaround][$Bodyguard to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
<<case "Recruiter Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$Recruiter to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Recruiter Workaround][$Recruiter to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
<<case "HG Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.assignment != "guard you") && (_Slave.assignment != "recruit girls") && (_Slave.assignment != "be your Head Girl") && canWalk(_Slave) && canSee(_Slave) && canTalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|HG Workaround][$HeadGirl to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|HG Workaround][$HeadGirl to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -58,7 +58,7 @@
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if $Flag == 0>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.assignment != "be your Head Girl") && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -66,13 +66,13 @@
<<if _Slave.assignment != "live with your Head Girl">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<</if>>
<<case "Subordinate Targeting">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if ($activeSlave.ID != _Slave.ID) && (_Slave.devotion >= -20)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Subordinate Targeting][$activeSlave.subTarget to $slaves[" + _i + "].ID]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Subordinate Targeting][$activeSlave.subTarget to $slaves[" + _i + "].ID]]">>
<<else>>
<<continue>>
<</if>>
@@ -83,7 +83,7 @@
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish is "mindbroken")>>
<<if _Slave.devotion >= -20 || _Slave.fetish is "mindbroken">>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName cannot be trusted in the spa//
<<continue>>
@@ -96,7 +96,7 @@
<<if _Slave.assignment != "rest in the spa">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Attendant.ID>>
@@ -108,7 +108,7 @@
<<case "Attendant Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$Attendant to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Attendant Workaround][$Attendant to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -119,7 +119,7 @@
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) or (_Slave.trust < -50) || (_Slave.trust > 50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
@@ -132,7 +132,7 @@
<<if _Slave.assignment != "work in the brothel">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Madam.ID>>
@@ -144,7 +144,7 @@
<<case "Madam Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) and canWalk(_Slave) and canSee(_Slave) && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Madam Workaround][$Madam to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Madam Workaround][$Madam to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -155,7 +155,7 @@
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
@@ -168,7 +168,7 @@
<<if _Slave.assignment != "serve in the club">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $DJ.ID>>
@@ -180,7 +180,7 @@
<<case "DJ Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) and canWalk(_Slave) && _Slave.breedingMark != 1>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|DJ Workaround][$DJ to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|DJ Workaround][$DJ to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -190,7 +190,7 @@
<<if $clinic <= $clinicSlaves>><<continue>><</if>>
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if (_Slave.health < 20) || ((_Slave.chem > 15) && ($clinicUpgradeFilters == 1)) || ((_Slave.bellyImplant > 100) && ($bellyImplants == 1)) || _Slave.preg > 1 >>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName cannot benefit from the clinic//
<<continue>>
@@ -199,7 +199,7 @@
<<if _Slave.assignment != "get treatment in the clinic">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Nurse.ID>>
@@ -211,7 +211,7 @@
<<case "Nurse Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave) and canSee(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$Nurse to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Nurse Workaround][$Nurse to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -222,7 +222,7 @@
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
<<if (_Slave.intelligenceImplant < 1) || (_Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10) || (_Slave.whoreSkill <= 10) || (_Slave.entertainSkill <= 10) || (_Slave.analSkill < 1) || ((_Slave.vaginalSkill < 1) && (_Slave.vagina > 0))>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
/* <br>//_Slave.slaveName already has a basic education// */
<<continue>>
@@ -235,7 +235,7 @@
<<if _Slave.assignment != "learn in the schoolroom">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Schoolteacher.ID>>
@@ -247,7 +247,7 @@
<<case "Schoolteacher Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && canTalk(_Slave) and canWalk(_Slave) and canSee(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$Schoolteacher to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Schoolteacher Workaround][$Schoolteacher to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -273,7 +273,7 @@
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) or (_Slave.trust < -50) || (_Slave.amp == 1) || ($dairyRestraintsUpgrade == 1)>>
<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
<<continue>>
@@ -298,7 +298,7 @@
<<if _Slave.assignment != "work in the dairy">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Milkmaid.ID>>
@@ -310,7 +310,7 @@
<<case "Milkmaid Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 20) and canWalk(_Slave) and canWalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$Milkmaid to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Milkmaid Workaround][$Milkmaid to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -320,7 +320,7 @@
<<if $servantsQuarters <= $servantsQuartersSlaves>><<continue>><</if>>
<<if $slaves[_i].assignmentVisible != 1>><<continue>><</if>>
<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) or (_Slave.trust < -20)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
<<continue>>
@@ -329,7 +329,7 @@
<<if _Slave.assignment != "work as a servant">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Stewardess.ID>>
@@ -341,7 +341,7 @@
<<case "Stewardess Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) && (_Slave.intelligence > -2) and canWalk(_Slave) and canWalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$Stewardess to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Stewardess Workaround][$Stewardess to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -350,7 +350,7 @@
<<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) or (_Slave.trust < -50)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName is not sufficiently broken for the master suite//
<<continue>>
@@ -359,7 +359,7 @@
<<if _Slave.assignment != "serve in the master suite">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>>
<<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
@@ -372,7 +372,7 @@
<<case "Concubine Select">>
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave) and canWalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$Concubine to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Concubine Workaround][$Concubine to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -381,7 +381,7 @@
<<if $cellblock <= $cellblockSlaves>><<continue>><</if>>
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if ((_Slave.devotion < -20) && (_Slave.trust >= -20)) || ((_Slave.devotion < -50) && (_Slave.trust >= -50))>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -389,7 +389,7 @@
<<if _Slave.assignment != "be confined in the cellblock">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<if _Slave.ID != $Wardeness.ID>>
@@ -400,7 +400,7 @@
<</if>>
<<case "Wardeness Select">>
<<if (_Slave.assignmentVisible == 1) && (_Slave.devotion > 50) and canWalk(_Slave) and canWalk(_Slave)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>>
<<print "[[_Slave.slaveName|Wardeness Workaround][$Wardeness to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
@@ -411,7 +411,7 @@
<<if (_Slave.assignmentVisible != 1)>><<continue>><</if>>
<<if _Slave.breedingMark != 1>>
<<if (_Slave.indentureRestrictions <= 0)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<br>//_Slave.slaveName's indenture forbids arcade service.//
<<continue>>
@@ -424,7 +424,7 @@
<<if _Slave.assignment != "be confined in the arcade">>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<</if>>
<<case "Pit">>
@@ -444,7 +444,7 @@
<<if ($fighterIDs.contains(_Slave.ID))>>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<<else>>
<<continue>>
@@ -454,7 +454,7 @@
<</if>>
<<else>>
<<if $fighterIDs.contains(_Slave.ID)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -463,7 +463,7 @@
<<if _Slave.fuckdoll > 0>><<continue>><</if>>
<<if $Flag == 0>>
<<if canWalk(_Slave) && ($Lurcher.ID != _Slave.ID)>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Assign][$activeSlave to $slaves[" + _i + "]]]">>
<<else>>
<<continue>>
<</if>>
@@ -471,7 +471,7 @@
<<if $Lurcher.ID != _Slave.ID>>
<<continue>>
<<else>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Retrieve][$activeSlave to $slaves[" + _i + "]]]">>
<</if>>
<</if>>
<<case "New Game Plus">>
@@ -525,7 +525,7 @@
<<if $slaves[_i].devotion < 100>><<continue>><</if>>
<<if $slaves[_i].relationship != $activeSlave.relationship>><<continue>><</if>>
<<if $slaves[_i].ID == $activeSlave.ID>><<continue>><</if>>
- <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><<SlaveArt $slaves[_i] 1>><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
+ <br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if $seeImages == 1>><div class="imageRef smlImg"><<SlaveArt $slaves[_i] 1>></div><</if>><<print "[[_Slave.slaveName|Slave Interact][$activeSlave to $slaves[" + _i + "]]]">>
<</switch>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 9779c1ec611..1a831837f51 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -1,160 +1,154 @@
:: Spa Report [nobr]
+<<set $spaSlaves = 0, _attendantFetish = 0, _attendantUsedCure = 0, _flawSoftened = 0, _idleBonus = 0, _restedSlaves = 0, _SL = $slaves.length, _ATD = -1>>
-<<set $attendantUsedCure to 0>>
-<<set $restedSlaves to 0>>
-<<set $spaSlaves to 0>>
-<<set $attendantFetish to 0>>
-<<set $flawSoftened to 0>>
-<<set $idleBonus to 0>>
+<<if $Attendant != 0>>
+<<for _ATD = 0; _ATD < _SL; _ATD++>>
+<<if $slaves[_ATD].ID == $Attendant.ID>>
+ <<break>>
+<</if>>
+<</for>>
+<</if>>
+<<if _ATD >= 0>>
+ /* 000-250-006 */
+ /* <<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>> */
+ <<if $seeImages == 1>>
+ <div class="imageRef smlImg">
+ <<SlaveArt $slaves[_ATD] 0 0>>
+ </div>
+ <</if>>
+ /* 000-250-006 */
+ <<if ($slaves[_ATD].health < 100)>>
+ <<set $slaves[_ATD].health += 20>>
+ <</if>>
+ <<if ($slaves[_ATD].devotion <= 60)>>
+ <<set $slaves[_ATD].devotion += 1>>
+ <</if>>
+ <<if $spaDecoration != "standard">>
+ <<set $slaves[_ATD].devotion += 1>>
+ <</if>>
+ <<if $slaves[_ATD].trust < 60>>
+ <<set $slaves[_ATD].trust += 1>>
+ <</if>>
+ <<if $slaves[_ATD].fetishStrength <= 95>>
+ <<if $slaves[_ATD].fetish != "submissive">>
+ <<fetishChangeChance $slaves[_ATD]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _attendantFetish to 1, $slaves[_ATD].fetishKnown to 1, $slaves[_ATD].fetish to "submissive">>
+ <</if>>
+ <<elseif $slaves[_ATD].fetishKnown == 0>>
+ <<set _attendantFetish to 1, $slaves[_ATD].fetishKnown to 1>>
+ <<else>>
+ <<set _attendantFetish to 2, $slaves[_ATD].fetishStrength += 4>>
+ <</if>>
+ <</if>>
+ <<set $Attendant = $slaves[_ATD]>>
+<</if>>
-<<for $i to 0; $i < $slaves.length; $i++>>
-<<if ($slaves[$i].assignment is "rest in the spa")>>
- <<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>>
- <<set $spaSlaves += 1>>
- <<if ($slaves[$i].devotion <= 60) && ($slaves[$i].trust < 60)>>
- <<set $slaves[$i].devotion += 1>>
- <<set $slaves[$i].trust += 1>>
- <<elseif ($slaves[$i].devotion < 40)>>
- <<set $slaves[$i].devotion += 10>>
- <<elseif ($slaves[$i].trust < 40)>>
- <<set $slaves[$i].trust += 10>>
+<<for _i = 0; _i < _SL; _i++>>
+ <<if ($slaves[_i].assignment != "rest in the spa")>><<continue>><</if>>
+ /* 000-250-006 */
+ /* <<if $seeImages == 1>><<SlaveArt $slaves[$i] 0 0>><</if>> */
+ <<if $seeImages == 1>>
+ <div class="imageRef smlImg">
+ <<SlaveArt $slaves[_i] 0 0>>
+ </div>
+ <</if>>
+ /* 000-250-006 */
+ <<set $spaSlaves++>>
+ <<if ($slaves[_i].devotion <= 60) && ($slaves[_i].trust < 60)>>
+ <<set $slaves[_i].devotion += 1, $slaves[_i].trust += 1>>
+ <<elseif ($slaves[_i].devotion < 40)>>
+ <<set $slaves[_i].devotion += 10>>
+ <<elseif ($slaves[_i].trust < 40)>>
+ <<set $slaves[_i].trust += 10>>
<</if>>
<<if $spaDecoration != "standard">>
- <<set $slaves[$i].devotion += 1>>
+ <<set $slaves[_i].devotion += 1>>
<</if>>
<<if $Attendant != 0>>
- <<if ($slaves[$i].fetish is "mindbroken") && ($slaves[$i].health > 20) && ($attendantUsedCure == 0) && ($spaFix != 2)>>
- <<set $attendantUsedCure to 1>>
+ <<if ($slaves[_i].fetish is "mindbroken") && ($slaves[_i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
+ <<set _attendantUsedCure to 1>>
<<if (random(1,100) > 90-$Attendant.devotion)>>
- @@color:green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has spent weeks lavishing patient tenderness on her in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from her mental torpor.
- <<set $slaves[$i].devotion to -3>>
- <<set $slaves[$i].sexualFlaw to "apathetic">>
- <<set $slaves[$i].behavioralFlaw to either("hates men", "odd")>>
- <<set $slaves[$i].fetish to "none">>
- <<set $slaves[$i].fetishKnown to 1>>
+ @@color:green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[_i].slaveName could not be reached, and has spent weeks lavishing patient tenderness on her in $spaName. $slaves[_i].slaveName has begun to respond, and is stirring from her mental torpor.
+ <<set $slaves[_i].devotion to -3, $slaves[_i].sexualFlaw to "apathetic", $slaves[_i].behavioralFlaw to either("hates men", "odd"), $slaves[_i].fetish to "none", $slaves[_i].fetishKnown to 1>>
<<if ($arcologies[0].FSPaternalist > 0)>>
- Society @@color:green;strongly approves@@ of $slaves[$i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
- <<set $repGain += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel)>>
- <<set $arcologies[0].FSPaternalist += 0.01*$FSSingleSlaveRep>>
+ Society @@color:green;strongly approves@@ of $slaves[_i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
+ <<set $repGain += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel), $arcologies[0].FSPaternalist += 0.01*$FSSingleSlaveRep>>
<</if>>
<</if>>
<</if>>
<<if ($Attendant.fetish is "none") || ($Attendant.fetish is "submissive")>>
- <<set $slaves[$i].devotion += 1>>
+ <<set $slaves[_i].devotion += 1>>
<</if>>
<<if ($Attendant.visualAge > 35)>>
- <<set $slaves[$i].trust += 1>>
+ <<set $slaves[_i].trust += 1>>
<</if>>
- <<if isFertile($Attendant) || ($Attendant.preg > 0) || ($Attendant.bellyImplant >= 2000)>>
- <<set $slaves[$i].health += 1>>
+ <<if isFertile($Attendant) || ($Attendant.preg > 0) || ($Attendant.bellyImplant >= 2000)>>
+ <<set $slaves[_i].health += 1>>
<</if>>
- <<set $seed to 0>>
- <<if $attendantCareers.contains($Attendant.career)>>
- <<if $slaves[$i].trust < 60>>
- <<set $slaves[$i].trust += 1>>
- <<set $seed to 10>>
- <</if>>
+ <<set _seed to 0>>
+ <<if $attendantCareers.contains($Attendant.career) && $slaves[_i].trust < 60>>
+ <<set $slaves[_i].trust += 1, _seed to 10>>
<</if>>
<<if ($Attendant.intelligence > 0) && ($spaFix == 0)>>
- <<if $slaves[$i].behavioralFlaw != "none">>
- <<if random(1,100) > (100-($Attendant.intelligence*10)-$seed)>>
- <<set $flawSoftened to $slaves[$i].slaveName>>
- <<if ($slaves[$i].behavioralFlaw is "arrogant")>>
- <<set $slaves[$i].behavioralQuirk to "confident">>
- <<elseif ($slaves[$i].behavioralFlaw is "bitchy")>>
- <<set $slaves[$i].behavioralQuirk to "cutting">>
- <<elseif ($slaves[$i].behavioralFlaw is "odd")>>
- <<set $slaves[$i].behavioralQuirk to "funny">>
- <<elseif ($slaves[$i].behavioralFlaw is "hates men")>>
- <<set $slaves[$i].behavioralQuirk to "adores women">>
- <<elseif ($slaves[$i].behavioralFlaw is "hates women")>>
- <<set $slaves[$i].behavioralQuirk to "adores men">>
- <<elseif ($slaves[$i].behavioralFlaw is "gluttonous")>>
- <<set $slaves[$i].behavioralQuirk to "fitness">>
- <<elseif ($slaves[$i].behavioralFlaw is "anorexic")>>
- <<set $slaves[$i].behavioralQuirk to "insecure">>
- <<elseif ($slaves[$i].behavioralFlaw is "devout")>>
- <<set $slaves[$i].behavioralQuirk to "sinful">>
- <<elseif ($slaves[$i].behavioralFlaw is "liberated")>>
- <<set $slaves[$i].behavioralQuirk to "advocate">>
+ <<if $slaves[_i].behavioralFlaw != "none">>
+ <<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
+ <<set _flawSoftened to $slaves[_i].slaveName>>
+ <<if ($slaves[_i].behavioralFlaw is "arrogant")>>
+ <<set $slaves[_i].behavioralQuirk to "confident">>
+ <<elseif ($slaves[_i].behavioralFlaw is "bitchy")>>
+ <<set $slaves[_i].behavioralQuirk to "cutting">>
+ <<elseif ($slaves[_i].behavioralFlaw is "odd")>>
+ <<set $slaves[_i].behavioralQuirk to "funny">>
+ <<elseif ($slaves[_i].behavioralFlaw is "hates men")>>
+ <<set $slaves[_i].behavioralQuirk to "adores women">>
+ <<elseif ($slaves[_i].behavioralFlaw is "hates women")>>
+ <<set $slaves[_i].behavioralQuirk to "adores men">>
+ <<elseif ($slaves[_i].behavioralFlaw is "gluttonous")>>
+ <<set $slaves[_i].behavioralQuirk to "fitness">>
+ <<elseif ($slaves[_i].behavioralFlaw is "anorexic")>>
+ <<set $slaves[_i].behavioralQuirk to "insecure">>
+ <<elseif ($slaves[_i].behavioralFlaw is "devout")>>
+ <<set $slaves[_i].behavioralQuirk to "sinful">>
+ <<elseif ($slaves[_i].behavioralFlaw is "liberated")>>
+ <<set $slaves[_i].behavioralQuirk to "advocate">>
<</if>>
- <<set $slaves[$i].behavioralFlaw to "none">>
+ <<set $slaves[_i].behavioralFlaw to "none">>
<</if>>
- <<elseif $slaves[$i].sexualFlaw != "none">>
- <<if random(1,100) > (100-($Attendant.intelligence*10)-$seed)>>
- <<set $flawSoftened to $slaves[$i].slaveName>>
- <<if ($slaves[$i].sexualFlaw is "hates oral")>>
- <<set $slaves[$i].sexualQuirk to "gagfuck queen">>
- <<elseif ($slaves[$i].sexualFlaw is "hates anal")>>
- <<set $slaves[$i].sexualQuirk to "painal queen">>
- <<elseif ($slaves[$i].sexualFlaw is "hates penetration")>>
- <<set $slaves[$i].sexualQuirk to "strugglefuck queen">>
- <<elseif ($slaves[$i].sexualFlaw is "shamefast")>>
- <<set $slaves[$i].sexualQuirk to "tease">>
- <<elseif ($slaves[$i].sexualFlaw is "idealistic")>>
- <<set $slaves[$i].sexualQuirk to "romantic">>
- <<elseif ($slaves[$i].sexualFlaw is "repressed")>>
- <<set $slaves[$i].sexualQuirk to "perverted">>
- <<elseif ($slaves[$i].sexualFlaw is "apathetic")>>
- <<set $slaves[$i].sexualQuirk to "caring">>
- <<elseif ($slaves[$i].sexualFlaw is "crude")>>
- <<set $slaves[$i].sexualQuirk to "unflinching">>
- <<elseif ($slaves[$i].sexualFlaw is "judgemental")>>
- <<set $slaves[$i].sexualQuirk to "size queen">>
+ <<elseif $slaves[_i].sexualFlaw != "none">>
+ <<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
+ <<set _flawSoftened to $slaves[_i].slaveName>>
+ <<if ($slaves[_i].sexualFlaw is "hates oral")>>
+ <<set $slaves[_i].sexualQuirk to "gagfuck queen">>
+ <<elseif ($slaves[_i].sexualFlaw is "hates anal")>>
+ <<set $slaves[_i].sexualQuirk to "painal queen">>
+ <<elseif ($slaves[_i].sexualFlaw is "hates penetration")>>
+ <<set $slaves[_i].sexualQuirk to "strugglefuck queen">>
+ <<elseif ($slaves[_i].sexualFlaw is "shamefast")>>
+ <<set $slaves[_i].sexualQuirk to "tease">>
+ <<elseif ($slaves[_i].sexualFlaw is "idealistic")>>
+ <<set $slaves[_i].sexualQuirk to "romantic">>
+ <<elseif ($slaves[_i].sexualFlaw is "repressed")>>
+ <<set $slaves[_i].sexualQuirk to "perverted">>
+ <<elseif ($slaves[_i].sexualFlaw is "apathetic")>>
+ <<set $slaves[_i].sexualQuirk to "caring">>
+ <<elseif ($slaves[_i].sexualFlaw is "crude")>>
+ <<set $slaves[_i].sexualQuirk to "unflinching">>
+ <<elseif ($slaves[_i].sexualFlaw is "judgemental")>>
+ <<set $slaves[_i].sexualQuirk to "size queen">>
<</if>>
- <<set $slaves[$i].sexualFlaw to "none">>
+ <<set $slaves[_i].sexualFlaw to "none">>
<</if>>
<</if>>
<</if>>
<</if>>
- <<if ($slaves[$i].health < 100)>>
- <<if ($spaUpgrade == 1)>>
- <<set $slaves[$i].health += 3>>
- <</if>>
- <</if>>
- <<if ($slaves[$i].health >= 20)>>
- <<if ($slaves[$i].trust > 60)>>
- <<if ($slaves[$i].devotion > 60)>>
- <<if $slaves[$i].fetish != "mindbroken">>
- <<set $slaves[$i].assignment to "rest">>
- <<set $slaves[$i].assignmentVisible to 1>>
- <<set $restedSlaves += 1>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-
-<<elseif ($Attendant != 0) && ($slaves[$i].ID is $Attendant.ID)>>
- <<if ($slaves[$i].health < 100)>>
- <<set $slaves[$i].health += 20>>
- <</if>>
- <<if ($slaves[$i].devotion <= 60)>>
- <<set $slaves[$i].devotion += 1>>
- <</if>>
- <<if $spaDecoration != "standard">>
- <<set $slaves[$i].devotion += 1>>
- <</if>>
- <<if $slaves[$i].trust < 60>>
- <<set $slaves[$i].trust += 1>>
- <</if>>
- <<if $slaves[$i].fetishStrength <= 95>>
- <<if $slaves[$i].fetish != "submissive">>
- <<fetishChangeChance $slaves[$i]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set $attendantFetish to 1>>
- <<set $slaves[$i].fetishKnown to 1>>
- <<set $slaves[$i].fetish to "submissive">>
- <</if>>
- <<elseif $slaves[$i].fetishKnown == 0>>
- <<set $attendantFetish to 1>>
- <<set $slaves[$i].fetishKnown to 1>>
- <<else>>
- <<set $attendantFetish to 2>>
- <<set $slaves[$i].fetishStrength += 4>>
+ <<if ($slaves[_i].health < 100) && ($spaUpgrade == 1)>>
+ <<set $slaves[_i].health += 3>>
<</if>>
+ <<if ($slaves[_i].health >= 20) && ($slaves[_i].trust > 60) && ($slaves[_i].devotion > 60) && $slaves[_i].fetish != "mindbroken">>
+ <<set $slaves[_i].assignment to "rest", $slaves[_i].assignmentVisible to 1, _restedSlaves++>>
<</if>>
-<</if>>
<</for>>
<<if ($spaSlaves > 0)>>
@@ -162,187 +156,170 @@
<<if ($spaSlaves == 1)>>''There is one slave resting and recuperating in the spa.''<<else>>''There are $spaSlaves slaves resting and recuperating in the spa.''<</if>>
<<if ($Attendant != 0)>>
- $Attendant.slaveName is serving as the spa attendant.<<if $Attendant.relationship is -3>> She tries her best to be your perfect attentive and caring wife.<</if>>
- <<if ($attendantFetish == 1)>>
+ $Attendant.slaveName is serving as the spa attendant.<<if $Attendant.relationship is -3>> She tries her best to be your perfect attentive and caring wife.<</if>>
+ <<if (_attendantFetish == 1)>>
When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@color:lightsalmon;becomes a submissive.@@
- <<elseif ($attendantFetish == 2)>>
+ <<elseif (_attendantFetish == 2)>>
Every new slave in the spa is a new girl she gets to connect with and serve. Sexually. @@color:lightsalmon;She becomes more submissive.@@
<</if>>
<<if $attendantCareers.contains($Attendant.career)>>
She has experience with counseling from her life before she was a slave, making her better at building a rapport with troubled slaves, and giving her a better chance of softening flaws into beneficial quirks.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<</if>>
<<if ($Attendant.eyes is -2)>>
Her blindness allows her to deeply connect with her girls.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<</if>>
<<if ($Attendant.fetish is "none")>>
$Attendant.slaveName respects the slaves lounging in the spa, allowing them to relax completely.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<<elseif ($Attendant.fetish is "submissive")>>
$Attendant.slaveName lets the slaves resting in the spa take the lead sexually, doing her best to please them.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<<elseif ($Attendant.fetishKnown == 1)>>
$Attendant.slaveName can't keep her hands to herself, preventing the slaves in the spa from relaxing completely.
<</if>>
<<if ($Attendant.visualAge > 35)>>
Her age encourages the slaves in the spa to relax and pour out their troubles to her.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<</if>>
<<if ($Attendant.intelligence > 0)>>
She's so intelligent she can suss out the cause of slaves' emotional issues and counsel them effectively.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<</if>>
<<if isFertile($Attendant) || ($Attendant.preg > 0) || ($Attendant.bellyImplant >= 2000)>>
She has a natural mothering instinct and really makes her girls feel at home.
- <<set $idleBonus += 1>>
+ <<set _idleBonus += 1>>
<</if>>
- <<for $i to 0; $i < $slaves.length; $i++>>
+ <<for _i to 0; _i < _SL; _i++>>
+ <<if $slaves[_i].assignment != "rest in the spa">><<continue>><</if>>
<<if $familyTesting == 1>>
- <<if $slaves[$i].assignment == "rest in the spa">>
- <<if $slaves[$i].mother == $Attendant.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
- <</if>>
- <<if $slaves[$i].father == $Attendant.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
+ <<if $slaves[_i].mother == $Attendant.ID>>
+ She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
- <<if $slaves[$i].ID == $Attendant.father>>
- She makes sure to spend extra time caring for her father, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
+ <<if $slaves[_i].father == $Attendant.ID>>
+ She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
- <<if $slaves[$i].ID == $Attendant.mother>>
- She makes sure to spend extra time caring for her mother, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
+ <<if $slaves[_i].ID == $Attendant.father>>
+ She makes sure to spend extra time caring for her father, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
- <<if areSisters($slaves[$i], $Attendant) == 1>>
- She makes sure to spend extra time caring for her twin sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
- <<elseif areSisters($slaves[$i], $Attendant) == 2>>
- She makes sure to spend extra time caring for her sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
- <<elseif areSisters($slaves[$i], $Attendant) == 3>>
- She makes sure to spend extra time caring for her half-sister, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
+ <<if $slaves[_i].ID == $Attendant.mother>>
+ She makes sure to spend extra time caring for her mother, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
+ <<if areSisters($slaves[_i], $Attendant) == 1>>
+ She makes sure to spend extra time caring for her twin sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <<elseif areSisters($slaves[_i], $Attendant) == 2>>
+ She makes sure to spend extra time caring for her sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <<elseif areSisters($slaves[_i], $Attendant) == 3>>
+ She makes sure to spend extra time caring for her half-sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
<<else>>
- <<if $Attendant.relationTarget is $slaves[$i].ID and $slaves[$i].assignment is "rest in the spa">>
- She makes sure to spend extra time caring for her $slaves[$i].relation, $slaves[$i].slaveName.
- <<set $slaves[$i].trust += 1>>
+ <<if $Attendant.relationTarget is $slaves[_i].ID>>
+ She makes sure to spend extra time caring for her $slaves[_i].relation, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
<</if>>
- <<if $Attendant.relationshipTarget is $slaves[$i].ID and $slaves[$i].assignment is "rest in the spa">>
- She dedicates most of her attention to her <<if $Attendant.relationship == 1>>friend<<elseif $Attendant.relationship is 2>>best friend<<elseif $Attendant.relationship is 3>>friend with benefits<<elseif $Attendant.relationship is 4>>lover<<elseif $Attendant.relationship is 5>>slave wife<</if>>, $slaves[$i].slaveName, making her stress, both physical and mental, wash away.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
+ <<if $Attendant.relationshipTarget is $slaves[_i].ID>>
+ She dedicates most of her attention to her <<if $Attendant.relationship == 1>>friend<<elseif $Attendant.relationship is 2>>best friend<<elseif $Attendant.relationship is 3>>friend with benefits<<elseif $Attendant.relationship is 4>>lover<<elseif $Attendant.relationship is 5>>slave wife<</if>>, $slaves[_i].slaveName, making her stress, both physical and mental, wash away.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
- <<if $Attendant.rivalryTarget is $slaves[$i].ID and $slaves[$i].assignment is "rest in the spa">>
- She constantly harasses her <<if $Attendant.rivalry == 1>>growing rival<<elseif $Attendant.rivalry is 2>>rival<<elseif $Attendant.rivalry is 3>>bitter rival<</if>>, $slaves[$i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
- <<set $slaves[$i].devotion -= 4>>
- <<set $slaves[$i].trust -= 4>>
+ <<if $Attendant.rivalryTarget is $slaves[_i].ID>>
+ She constantly harasses her <<if $Attendant.rivalry == 1>>growing rival<<elseif $Attendant.rivalry is 2>>rival<<elseif $Attendant.rivalry is 3>>bitter rival<</if>>, $slaves[_i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
+ <<set $slaves[_i].devotion -= 4, $slaves[_i].trust -= 4>>
<<if random(1,100) > 35>>
- <<set $Attendant.rivalry += 1>>
- <<set $slaves[$i].rivalry += 1>>
+ <<set $Attendant.rivalry += 1, $slaves[_ATD].rivalry += 1, $slaves[_i].rivalry += 1>>
<</if>>
<</if>>
- <<if $slaves[$i].prestigeDesc is "She is a famed Free Cities whore, and commands top prices." and $slaves[$i].assignment is "rest in the spa">>
- She does her best to relax the famous whore, $slaves[$i].slaveName, making sure to pay special attention to her worn holes.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
+ <<if $slaves[_i].prestigeDesc is "She is a famed Free Cities whore, and commands top prices.">>
+ She does her best to relax the famous whore, $slaves[_i].slaveName, making sure to pay special attention to her worn holes.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
- <<if $slaves[$i].prestigeDesc is "She is a famed Free Cities slut, and can please anyone." and $slaves[$i].assignment is "rest in the spa">>
- She does her best to soothe the famous entertainer, $slaves[$i].slaveName, letting her relax in blissful peace.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
+ <<if $slaves[_i].prestigeDesc is "She is a famed Free Cities slut, and can please anyone.">>
+ She does her best to soothe the famous entertainer, $slaves[_i].slaveName, letting her relax in blissful peace.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
- <<if $slaves[$i].prestigeDesc is "She is remembered for winning best in show as a cockmilker." and $slaves[$i].assignment is "rest in the spa">>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a cockmilker.">>
<<if $Attendant.fetish is "cumslut">>
- She can't keep her hands off $slaves[$i].slaveName's cock and balls, but she doesn't mind being milked constantly. Before long strands of cum can be found floating all throughout the bath.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
- <<set $Attendant.fetishStrength += 4>>
+ She can't keep her hands off $slaves[_i].slaveName's cock and balls, but she doesn't mind being milked constantly. Before long strands of cum can be found floating all throughout the bath.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3, $Attendant.fetishStrength += 4, $slaves[_ATD].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's massive genitals and tends to her when ever she feels a need for release.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
- <<if random(1,100) > 65 and $Attendant.fetish is "none">>
+ She does her best to accommodate $slaves[_i].slaveName's massive genitals and tends to her when ever she feels a need for release.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <<if random(1,100) > 65 && $Attendant.fetish is "none">>
After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
- <<set $Attendant.fetish to "cumslut">>
+ <<set $Attendant.fetish to "cumslut", $slaves[_ATD].fetish to "cumslut">>
<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].prestigeDesc is "She is remembered for winning best in show as a dairy cow." and $slaves[$i].assignment is "rest in the spa">>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a dairy cow.">>
<<if $Attendant.fetish is "boobs">>
- She can't keep her hands off $slaves[$i].slaveName's huge breasts, but she doesn't mind being milked constantly. Before long the bath gains a white tint.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
- <<set $Attendant.fetishStrength += 4>>
+ She can't keep her hands off $slaves[_i].slaveName's huge breasts, but she doesn't mind being milked constantly. Before long the bath gains a white tint.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3, $Attendant.fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's massive breasts and tends to her when ever she feels a need for release.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
- <<if random(1,100) > 65 and $Attendant.fetish is "none">>
+ She does her best to accommodate $slaves[_i].slaveName's massive breasts and tends to her when ever she feels a need for release.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <<if random(1,100) > 65 && $Attendant.fetish is "none">>
After multiple milking sessions, $Attendant.slaveName begins to find herself fantasizing about having giant milky breasts too.
- <<set $Attendant.fetish to "boobs">>
+ <<set $Attendant.fetish to "boobs", $slaves[_ATD].fetish to "boobs">>
<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].prestigeDesc is "She is remembered for winning best in show as a breeder." and $slaves[$i].assignment is "rest in the spa" and $slaves[$i].preg > 10>>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a breeder." && $slaves[_i].preg > 10>>
<<if $Attendant.fetish is "pregnancy">>
- She can't keep her hands off $slaves[$i].slaveName's pregnancy, but she doesn't mind her full belly being fondled.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
- <<set $Attendant.fetishStrength += 4>>
+ She can't keep her hands off $slaves[_i].slaveName's pregnancy, but she doesn't mind her full belly being fondled.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3, $Attendant.fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
+ She does her best to accommodate $slaves[_i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<<if random(1,100) > 65 and $Attendant.fetish is "none">>
- After massaging $slaves[$i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find herself fantasizing about being swollen with life too.
- <<set $Attendant.fetish to "pregnancy">>
+ After massaging $slaves[_i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find herself fantasizing about being swollen with life too.
+ <<set $Attendant.fetish to "pregnancy", $slaves[_ATD].fetish to "pregnancy">>
<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].prestigeDesc is "She is remembered for winning best in show as a breeder." and $slaves[$i].assignment is "rest in the spa">>
+ <<if $slaves[_i].prestigeDesc is "She is remembered for winning best in show as a breeder.">>
<<if $Attendant.fetish is "pregnancy">>
- She can't help but pester $slaves[$i].slaveName with questions about her pregnancy, limiting her ability to truly relax.
- <<set $slaves[$i].devotion += 1>>
- <<set $slaves[$i].trust += 1>>
+ She can't help but pester $slaves[_i].slaveName with questions about her pregnancy, limiting her ability to truly relax.
+ <<set $slaves[_i].devotion += 1, $slaves[_i].trust += 1>>
<<else>>
- She does her best to encourage $slaves[$i].slaveName's fertilization by performing any fertility boosting actions she can.
- <<set $slaves[$i].devotion += 3>>
- <<set $slaves[$i].trust += 3>>
+ She does her best to encourage $slaves[_i].slaveName's fertilization by performing any fertility boosting actions she can.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
<</if>>
<</for>>
<<if ($spaSlaves < $spa)>>
- <<set $seed to random(1,10)+(($spa-$spaSlaves)*(random(150,170)+($idleBonus*10)))>>
- <<set $cash += $seed>>
- Since she doesn't have enough girls to occupy all her time, the spa takes in citizens' slaves on a contract basis and she helps them too, earning @@color:yellowgreen;¤$seed.@@
+ <<set _seed to random(1,10)+(($spa-$spaSlaves)*(random(150,170)+(_idleBonus*10)))>>
+ <<set $cash += _seed>>
+ Since she doesn't have enough girls to occupy all her time, the spa takes in citizens' slaves on a contract basis and she helps them too, earning @@color:yellowgreen;¤_seed.@@
<</if>>
<</if>>
- <<if ($restedSlaves > 0)>>
- <<if ($restedSlaves == 1)>>
+ <<if (_restedSlaves > 0)>>
+ <<if (_restedSlaves == 1)>>
One slave has rested until she reached a state of @@color:hotpink;devotion@@ and @@color:mediumaquamarine;trust@@ and will leave the spa before the end of the week.
<<else>>
- $restedSlaves slaves have rested until they reached a state of @@color:hotpink;devotion@@ and @@color:mediumaquamarine;trust@@ and will leave the spa before the end of the week.
+ _restedSlaves slaves have rested until they reached a state of @@color:hotpink;devotion@@ and @@color:mediumaquamarine;trust@@ and will leave the spa before the end of the week.
<</if>>
<<if $spaDecoration != "standard">>
- $spaNameCaps's $spaDecoration atmosphere @@color:hotpink;had an impact on <<if $restedSlaves == 1>>her while she<<else>>them while they<</if>>@@ were resting.
+ $spaNameCaps's $spaDecoration atmosphere @@color:hotpink;had an impact on <<if _restedSlaves == 1>>her while she<<else>>them while they<</if>>@@ were resting.
<</if>>
- <<set $spaSlaves -= $restedSlaves>>
+ <<set $spaSlaves -= _restedSlaves>>
<</if>>
- <<if ($flawSoftened != 0)>>
- $Attendant.slaveName works carefully with $flawSoftened, and successfully @@color:green;softens her behavioral flaw@@ into an appealing quirk.
+ <<if (_flawSoftened != 0)>>
+ $Attendant.slaveName works carefully with _flawSoftened, and successfully @@color:green;softens her behavioral flaw@@ into an appealing quirk.
<</if>>
- <<for $i to 0; $i < $slaves.length; $i++>>
- <<if ($slaves[$i].ID is $Attendant.ID)>>
+ <<if $Attendant != 0>>
<br><br>
+ <<set $i = _ATD>>
<<if $showEWD == 0>>
''__@@color:pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in the spa.<br>
<<silently>>
@@ -376,16 +353,18 @@
<<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
- <br>
- <<include "SA devotion">>
- <br>
+ <br><<include "SA devotion">>
+ <br><br>
<</if>>
- <<elseif ($slaves[$i].assignment is "rest in the spa")>>
- <br>
+ <<set $Attendant = $slaves[_ATD]>>
+ <</if>>
+
+ <<if ($spaSlaves > 0)>>
<<if $showEWD == 0>>
- ''__@@color:pink;$slaves[$i].slaveName@@__'' is resting in the spa.
+ <<for $i to 0; $i < _SL; $i++>>
+ <<if ($slaves[$i].assignment != "rest in the spa")>><<continue>><</if>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is resting in the spa.<br>
<<silently>>
- <<include [[SA rest]]>>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -394,6 +373,7 @@
<<set $slaves[$i].devotion += 1>>
<</if>>
<</if>>
+ <<include "SA rest">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -401,10 +381,12 @@
<<include "SA rivalries">>
<<include "SA devotion">>
<</silently>>
+ <</for>>
<<else>>
- ''__@@color:pink;$slaves[$i].slaveName@@__''
- <<include [[SA rest]]>>
- <br>
+ <<for $i to 0; $i < _SL; $i++>>
+ <<if ($slaves[$i].assignment != "rest in the spa")>><<continue>><</if>>
+ ''__@@color:pink;$slaves[$i].slaveName@@__'' is resting in the spa.<br>
+
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -413,25 +395,23 @@
<<set $slaves[$i].devotion += 1>>
<</if>>
<</if>>
+ She<<include "SA rest">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
<<include "SA relationships">>
<<include "SA rivalries">>
- <br>
- <<include "SA devotion">>
- <br>
+ <br><<include "SA devotion">>
+ <br><br>
+ <</for>>
<</if>>
<</if>>
- <</for>>
-
-<<elseif ($Attendant != 0)>>
- ''$spaNameCaps is empty'' except for $Attendant.slaveName, the attendant.
- <<set $seed to random(1,10)+(($spa-$spaSlaves)*(random(150,170)+($idleBonus*10)))>>
- <<set $cash += $seed>>
- Since she doesn't have anyone to help, citizens are allowed to buy their slaves vacations in the spa, earning @@color:yellowgreen;¤$seed.@@
<<else>>
- ''$spaNameCaps is empty.''
+ <br>''$spaNameCaps is empty.''
+ <<if ($Attendant != 0)>>
+ <<set _seed to random(1,10)+(($spa-$spaSlaves)*(random(150,170)+(_idleBonus*10)))>>
+ <<set $cash += _seed>>
+ except for $Attendant.slaveName, the attendant. Since she doesn't have anyone to help, citizens are allowed to buy their slaves vacations in the spa, earning @@color:yellowgreen;¤_seed.@@
+ <</if>>
<</if>>
-<br><br>
diff --git a/src/utility/artWidgets.tw b/src/utility/artWidgets.tw
index b1222338bef..59ee907060b 100644
--- a/src/utility/artWidgets.tw
+++ b/src/utility/artWidgets.tw
@@ -70,7 +70,9 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<if $args[1] != 0>> /* IMAGE DOES NOT HAVE TO BE TINY */
<<if ($args[1] != 1) || ($seeSummaryImages != 0)>> /* IMAGE IS NOT PART OF A LIST, OR IMAGES ARE TO BE DISPLAYED IN LISTS */
-<div class="imageRef">
+/* 000-250-006 */
+/* <div class="imageRef"> */
+/* 000-250-006 */
<<set _folderLoc = "'resources/vector">>
@@ -378,7 +380,11 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
<</if>>
<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
- </div>
+
+/* 000-250-006 */
+/* </div> */
+/* 000-250-006 */
+
<</if>>
<<else>>
<<if $args[0].dick > 0>>
@@ -387,7 +393,11 @@ $args[2]: icon UI Display for vector art, 1 for on.
<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/ball " + _ballSize + ".svg'" + "/></object>">>
<</if>>
<<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/penis " + _penisSize + ".svg'" + "/></object>">>
- </div>
+
+/* 000-250-006 */
+/* </div> */
+/* 000-250-006 */
+
<</if>>
<</if>>
<</if>>
@@ -402,7 +412,9 @@ $args[2]: icon UI Display for vector art, 1 for on.
<</if>>
<</if>>
-</div>
+/* 000-250-006 */
+/* </div> */
+/* 000-250-006 */
<</if>>
<</if>> /* CLOSES EXEMPTIONS FOR IMAGE SIZES NOT CURRENTLY SUPPORTED BY VECTOR ART */
--
GitLab