diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 6ac09367631d2ebb36b0cd371ba3c2086f7a5a27..e168efe79102c15813156e6e6ce67e4386e64d5b 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@ Pregmod
0.10.7.1-2.2.x
+03/11/2019
+
+ 2
+ -fixes
+ -code cleaning
+
03/10/2019
1
diff --git a/devNotes/twine CSS b/devNotes/twine CSS
index 2e3bf0334933c7400fff449a562245cff474fe57..4a03614a0780a2eb824b0b6b109cabc8ff3b8bee 100644
--- a/devNotes/twine CSS
+++ b/devNotes/twine CSS
@@ -31,6 +31,15 @@ img {
text-indent: -10000px;
}
+.imageColumn {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ position: relative;
+ float: right;
+}
+
.imageRef {
display: flex;
flex-direction: column;
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index f29e5295ba7cf2ed38177977228de71131f0426b..a0eea88e491538482a93e6ddbea69cb7490314b1 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -11,11 +11,13 @@
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index ada4f930d6ac92d32933c8d878d92416be7dec5f..468eb5e3f82cea4d466a2daa49b745c03d9a0dd2 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -31,6 +31,15 @@ img {
text-indent: -10000px;
}
+.imageColumn { /* TODO: this is mostly a copy of imageRef to get its flex features working properly. They can probably be removed from imageRef at some point */
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-items: flex-start;
+ position: relative;
+ float: right;
+}
+
.imageRef {
display: flex;
flex-direction: column;
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 137f7b1cad81d1ff75f290733dec869877913d66..311155c74e46521ef93fea701218a3568625ce9b 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1287,9 +1287,9 @@ window.rulesAssistantOptions = (function() {
constructor() {
const items = [
["No default setting"],
- ["None"],
- ["Short stockings"],
- ["Long stockings"],
+ ["None", "none"],
+ ["Short stockings", "short stockings"],
+ ["Long stockings", "long stockings"],
];
super("Leg accessory", items);
this.setValue(current_rule.set.legAccessory);
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index f9fed6d059dddd5d5c1df23860de313bfa209334..fc54335e12287d92d7c0933624bcdceaf0e59112 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1240,36 +1240,37 @@ window.relatedSlave = function(activeSlave) {
const he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
const He = capFirstChar(he), His = capFirstChar(his);
let t = "";
- let _target = "";
+ let partnerSlave;
+
+ let fuckseed = jsRandom(1,100);
if (V.partner === "relation") {
if (V.familyTesting === 1) {
- _partnerSlave = V.relation;
+ partnerSlave = V.relation;
} else {
- _partnerSlave = getSlave(activeSlave.relationTarget);
+ partnerSlave = getSlave(activeSlave.relationTarget);
}
} else {
var activeSlaveRel = relationshipTerm(activeSlave);
- _partnerSlave = getSlave(activeSlave.relationshipTarget);
+ partnerSlave = getSlave(activeSlave.relationshipTarget);
}
- if (_partnerSlave !== undefined) { /* potential problem point */
- // let race2 = (V.seeRace ? _partnerSlave.race : "");
+ if (partnerSlave !== undefined) { /* potential problem point */
- t += " His ";
+ t += ` ${His} `;
if (V.partner === "relation") {
if (V.familyTesting === 1) {
t += `${V.relationType} `;
} else {
- t += `${_partnerSlave.relation} `;
+ t += `${partnerSlave.relation} `;
}
} else {
t += `${activeSlaveRel} `;
}
- t += `${_partnerSlave.slaveName} `;
-
+ t += `${partnerSlave.slaveName} `;
+ t += walkPasts(partnerSlave, fuckseed);
- V.target = "FRival"; /*potentially removed later*/
+ V.target = "FRelation"; /*potentially removed later*/
} else {
t += ` Expected partner not found!`;
}
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index c5efa54a29ed033b660ada6c47fac8dc5a839e6e..c6aadbc121e66ef3ef91097461c485cd084bb5ed 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -599,7 +599,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<if _readySlaves == 1>>
<<if $incubatorBulkRelease == 1>>
<<set $newSlavePool = []>>
- <<for _inc = 0; _inc < $incubatorSlaves; _inc++>>
+ <<for _inc = 0; _inc < $tanks.length; _inc++>>
<<if $tanks[_inc].growTime <= 0>>
<<set $incubatorOldID = $tanks[_inc].ID>> /* single slave case */
<<set _tempObject = {object: $tanks[_inc], ID: $tanks[_inc].ID}>>
@@ -609,7 +609,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
<</for>>
<<if $newSlavePool.length == 1>>
- <<set $readySlave = $newSlavePool[0]>>
+ <<set $readySlave = $newSlavePool[0].object>>
<<set $newSlavePool = 0>>
<</if>>
<<else>>
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index f9fefea70ad59a73e75a112697b480cdda9bb3d2..032fad3539c850414b0d95c5b00fe1a5e0d7738f 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -154,10 +154,14 @@
taken to $incubatorName.
<<elseif _cToIncub < _curBabies && _cToIncub > 0>>
split between $incubatorName and
- <<if _cToNursery == _curBabies-_cToIncub && _incubated > 0>>
- $nurseryName.
- <<elseif _cToNursery < _curBabies-_cToIncub && _cToNursery > 0>>
- $nurseryName, and the medical suite.
+ <<if _cToNursery > 0>>
+ <<if _cToNursery == _curBabies-_cToIncub && _incubated > 0>>
+ $nurseryName.
+ <<elseif _cToNursery < _curBabies-_cToIncub && _cToNursery > 0>>
+ $nurseryName, and the medical suite.
+ <</if>>
+ <<else>>
+ the medical suite.
<</if>>
<<elseif _cToNursery == _curBabies>>
taken to $nurseryName.
@@ -170,12 +174,12 @@
<<if _cToIncub > 0 || _cToNursery > 0>>
<<for _cb = 0; _cb < _curBabies; _cb++>> /* if there is no reserved children, code in loop will not trigger */
<<if $slaves[_b].curBabies[_cb].reserve == "incubator">>
- <<set $slaves[_b] = generateChild($slaves[_b], $slaves[_b].curBabies[_cb], 1)>>
+ <<set $activeSlave = generateChild($slaves[_b], $slaves[_b].curBabies[_cb], 1)>>
<<include "Incubator Workaround">>
<<run $slaves[_b].curBabies.splice($slaves[_b].curBabies[_cb], 1)>>
<<set _cb--, _curBabies-->>
<<elseif $slaves[_b].curBabies[_cb].reserve == "nursery">>
- <<set $slaves[_b] = generateChild($slaves[_b], $slaves[_b].curBabies[_cb])>>
+ <<set $activeSlave = generateChild($slaves[_b], $slaves[_b].curBabies[_cb])>>
<<include "Nursery Workaround">>
<<run $slaves[_b].curBabies.splice($slaves[_b].curBabies[_cb], 1)>>
<<set _cb--, _curBabies-->>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 6290da67f5177c21baf5c40c68ed0859a5bd6104..9f179866f897251d45518f847dead1e7db5fac7b 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -68,11 +68,13 @@
<<if $RESSevent == "headgirl dickgirl">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -545,11 +547,13 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 0e688988a6d672d128285e43bb99c283477c30ac..eb083f0c76a9e7bc111ce0024edf7e395efa8fc8 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -70,11 +70,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index f91b51f70a89864891898ca8ef58a0305c3e5e4f..c5aff37ed708c8d405a48cf0e2ce4d2b1c29505b 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -299,11 +299,13 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $HeadGirl 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -345,11 +347,13 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $Concubine 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $Concubine 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 35b9df56a1e5b9346e94e834543c4cf3ab2d6025..5ff429580440b76c56d5232cf181b8d5079055d7 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -121,22 +121,28 @@
<<setLocalPronouns $activeSlave>>
<<setLocalPronouns $subSlave 2>>
+<<set _clothesTemp = $subSlave.clothes>>
<<switch $REFIevent>>
-
-<<case "masochist">>
-
-<<set _clothesTemp = $subSlave.clothes, $subSlave.clothes = "no clothing">>
+<<case "masochist" "pregnancy" "boobs" "cumslut">> /* Prep clothing for images */
+ <<set $subSlave.clothes = "no clothing">>
+<</switch>>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
-<<set $subSlave.clothes = _clothesTemp>>
+<<set $subSlave.clothes = _clothesTemp>> /*restore clothing to original values */
+
+<<switch $REFIevent>>
+
+<<case "masochist">>
<<if $subSlave.belly >= 1500>>
You have $subSlave.slaveName lying down on your desk, and are seeing to your own amusement and _his2 masochistic streak at once. _He2 has _his2 body flat on the surface, but is unrestrained, and has been told that _he2 must not rise off it at all, nor tilt _his2 bulk to either side. You then tell _his2 to count strokes and begin to flog _his2 _subBelly belly with a leathern instrument<<if $subSlave.pregKnown == 1>>, taking care not to cause _his2 pregnancy any lasting harm<</if>>. Before long _he2 is experiencing more pain than the human body can support without involuntary movement, and you tell _him2 to go back one count whenever _he2 does. At long last _he2 completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until _he2 stiffens again at the
@@ -214,19 +220,6 @@ It seems $he passed by while you were beating $subSlave.slaveName and found the
<<case "pregnancy">>
-<<set _clothesTemp = $subSlave.clothes, $subSlave.clothes = "no clothing">>
-/* 000-250-006 */
-<<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 */
-<<set $subSlave.clothes = _clothesTemp>>
-
$subSlave.slaveName gets inspected more regularly than your other slaves, since _he2's quite pregnant. _His2 pregnancy is progressing acceptably, but having _his2 belly inspected gets _him2
<<if $subSlave.pregSource == -1>>
extremely eager to feel more of _his2 <<= WrittenMaster($subSlave)>>'s seed in _his2 fertile <<if $subSlave.mpreg == 1>>rear<<else>>cunt<</if>>. $subSlave.slaveName has been a good _girl2,
@@ -367,19 +360,6 @@ It seems $he passed by while you were enjoying the heavily pregnant $subSlave.sl
<<case "boobs">>
-<<set _clothesTemp = $subSlave.clothes, $subSlave.clothes = "no clothing">>
-/* 000-250-006 */
-<<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 */
-<<set $subSlave.clothes = _clothesTemp>>
-
$subSlave.slaveName is on lunch duty today. That means that as you eat your working lunch, _he2 sits on the edge of your desk right next to you, so that <<if $subSlave.belly >= 100000>>a nipple is<<else>>_his2 nipples are<</if>> conveniently at mouth height. Whenever you feel thirsty, you lean over<<if $subSlave.nipples == "partially inverted" || $subSlave.nipples == "inverted">>, pop one out,<<elseif $subSlave.nipples == "fuckable">>, slip your tongue deep inside,<</if>> and take some of _his2 creamy, slightly vanilla-toned milk straight from the source. Every time you do, _he2 shudders convulsively,
<<if canTalk($subSlave)>>
giving little mewling whimpers.
@@ -428,17 +408,6 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
<<case "submissive">>
-/* 000-250-006 */
-<<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 _his2<<if $subSlave.belly >= 1500>> bloated<</if>> body helpless beneath you, your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> in _him2, and your hands around _his2 neck. It's just breath play, and you're practiced enough that _he2's in no danger. _He2's such a sexual submissive that _he2 sometimes acts out if not managed. This happens when _he2 feels the urge to misbehave in order to access punishment, so you personally ensure that _he2 can indulge _his2 submissiveness when _he2 needs it. _He2 does not orgasm with you, _his2 complete servitude to your pleasure fulfilling a deeper need than that. _He2 leaves your office with a serene look on _his2 face, passing <<EventNameLink>>, who is
<<if $activeSlave.amp == 1>>
propped limblessly nearby. $He has
@@ -483,17 +452,6 @@ It seems $he passed by while you were dominating $subSlave.slaveName. <<if $acti
<<case "buttslut">>
-/* 000-250-006 */
-<<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 _he2's enjoying _himself2 to an almost indecent degree: moaning, begging, or just smiling idiotically with _his2 mouth open and _his2 tongue lolling. After you finish and _he2 leaves, you notice $activeSlave.slaveName at the door to your office. You call $his in.
<br><br>
<<EventNameLink>> hesitates before explaining $himself, and the $desc is obviously aroused:
@@ -530,19 +488,6 @@ It seems $he passed by while you were buttfucking $subSlave.slaveName and found
<<case "cumslut">>
-<<set _clothesTemp = $subSlave.clothes, $subSlave.clothes = "no clothing">>
-/* 000-250-006 */
-<<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 */
-<<set $subSlave.clothes = _clothesTemp>>
-
You wake up to the sensation of $subSlave.slaveName eagerly sucking your dick. _He2's industriously pumping _his2 mouth up and down on your member. In truth, $subSlave.slaveName doesn't give the perfect blowjob: _he2 loves cum so much that _he2 mostly enjoys oral sex in an anticipatory way, and usually works to make the recipient cum as soon as possible so as to get _his2 favorite treat into _his2 mouth quicker. Still, _his2 enthusiasm is nice and _he2 does have permission to wake you at your usual time in this way. As you get up after finishing, you notice <<EventNameLink>> at the door to your bedroom. You call $him in.
<br><br>
<<EventNameLink>> hesitates before explaining $himself, and the $desc is obviously aroused:
@@ -579,17 +524,6 @@ It seems $he passed by while $subSlave.slaveName was blowing you. $He swallows p
<<case "humiliation">>
-/* 000-250-006 */
-<<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 _he2 takes your dick. _He2's blushing furiously with the sex and with _his2 trademark mixed arousal and embarrassment at having an audience. _He2 makes a show of trying to disguise the fact that _he2's getting railed, but it's obvious. When you finish, you pull _him2 off the railing so _he2 can clean up. <<EventNameLink>> <<if canSee($activeSlave)>>saw<<elseif canHear($activeSlave)>>heard<<else>>felt the heat from<</if>> the denouement of this exhibitionist fun, and seems intrigued.
<br><br>
<<EventNameLink>> hesitates before explaining $himself, and the $desc is obviously aroused:
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index df4aea1cd0773340183d93f297feefeb7c27bf5b..40c313b72694a50904f2f50fb66a54938c0fa806 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -105,18 +105,20 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
+ <div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[2] 2 0>>
+ <<SlaveArt $activeSlave 2 0>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[1] 2 0>>
+ <<SlaveArt _newSlaves[0] 2 0>>
</div>
<div class="imageRef medImg">
- <<SlaveArt _newSlaves[0] 2 0>>
+ <<SlaveArt _newSlaves[1] 2 0>>
</div>
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<SlaveArt _newSlaves[2] 2 0>>
</div>
+ </div>
<</if>>
/* 000-250-006 */
</span>
@@ -17398,17 +17400,19 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _newSlaves[2] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _newSlaves[1] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _newSlaves[0] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _newSlaves[0] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _newSlaves[1] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _newSlaves[2] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index cb3acdd5794c531f5808e7f7d86fffe41eba0ceb..a85dd814cf3bbb67ee3bc23f1320363db493888f 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -178,11 +178,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -1119,11 +1121,13 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -1146,11 +1150,13 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -1178,11 +1184,13 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -1554,11 +1562,13 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/REresistantmotherdaughter.tw b/src/uncategorized/REresistantmotherdaughter.tw
index 59665a7feff6db7850f9605dadef27b450cfc5f7..46e2c4ac1fb71c84e784675e017c980cc91d1580 100644
--- a/src/uncategorized/REresistantmotherdaughter.tw
+++ b/src/uncategorized/REresistantmotherdaughter.tw
@@ -12,11 +12,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$i] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/bodyModificationReaction.tw b/src/uncategorized/bodyModificationReaction.tw
index c346dbb3fb476b76b4559278ce8801fe56d249eb..59c445d20d558dc1eed196eade96718c96353434 100644
--- a/src/uncategorized/bodyModificationReaction.tw
+++ b/src/uncategorized/bodyModificationReaction.tw
@@ -10,34 +10,55 @@ As you cast off $his bindings<<if canSee($activeSlave)>> and <<if ($activeSlave.
<<set $activeSlave.health -= 10>>
<</if>>
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
-<<if ($degradation > 10) && ($activeSlave.devotion <= 50) && ($activeSlave.trust < -50)>>
- $He is appalled by the whorish spectacle you have made of $him. $He @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect $his submission.
- <<set $activeSlave.trust -= 10>>
-<<elseif ($degradation > 10) && ($activeSlave.devotion <= 50)>>
- $He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;hates@@ and @@.gold;fears@@ you for this.
- <<set $activeSlave.devotion -= 10>>
- <<set $activeSlave.trust -= 10>>
-<<elseif ($degradation > 10)>>
- $He is shocked by the whorish spectacle you have made of $him. However, $he is so submissive to your will that $he @@.hotpink;accepts@@ that the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is who $he is now.
- <<set $activeSlave.devotion += 4>>
-<<elseif ($degradation > 4) && ($activeSlave.devotion <= 20) && ($activeSlave.trust < -20)>>
- $He is so afraid of you that $he suppresses any reaction to the slutty modifications you have made to $his body and @@.gold;fears@@ your power to do whatever you like to $him.
- <<set $activeSlave.trust -= 5>>
-<<elseif ($degradation > 4)>>
- $He is surprised with the slutty modifications you have made to $his body. However, $he is so obedient that $he @@.hotpink;accepts@@ your changes.
- <<set $activeSlave.devotion += 4>>
-<<elseif ($degradation > 1) && ($activeSlave.devotion < -20) && ($activeSlave.trust < 20)>>
- $He is @@.gold;afraid@@ that $he has been permanently altered against $his will, but is also scared of your reaction to any objection and suppresses $his disgust.
- <<set $activeSlave.trust -= 5>>
-<<elseif ($degradation > 1) && ($activeSlave.devotion < -20)>>
- $He is @@.mediumorchid;angry@@ and @@.gold;afraid@@ that $he has been permanently altered against $his will.
- <<set $activeSlave.devotion -= 5>>
- <<set $activeSlave.trust -= 5>>
-<<elseif ($degradation > 1)>>
- $He is saddened to have been altered against $his will. However, $he realizes that $he is a slave, so $he @@.hotpink;accepts@@ your work.
- <<set $activeSlave.devotion += 4>>
-<<else>>
- $He shows no real reaction to your modifications.
-<</if>>
+ <<if $degradation > 10>>
+ <<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ $He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;lothes@@ you all the more for this, but $his resolve is @@.gold;whittled down@@ by your power over $him.
+ <<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
+ <<elseif $activeSlave.devotion <= 50 && $activeSlave.trust < -50>>
+ $He is appalled by the whorish spectacle you have made of $him. $He @@.gold;fears@@ you all the more for this but is so terrified of you it does not affect $his submission.
+ <<set $activeSlave.trust -= 10>>
+ <<elseif $activeSlave.devotion <= 50>>
+ $He is appalled by the whorish spectacle you have made of $him. $He @@.mediumorchid;hates@@ and @@.gold;fears@@ you for this.
+ <<set $activeSlave.devotion -= 10, $activeSlave.trust -= 10>>
+ <<elseif $activeSlave.devotion <= 90>>
+ $He is shocked by the whorish spectacle you have made of $him. However, $he is @@.hotpink;so submissive to your will@@ that $he accepts that the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is who $he is now.
+ <<set $activeSlave.devotion += 3>>
+ <<else>>
+ $He fully understands that $his body belongs to you and that it is yours to modify as you see fit, the slave <<if canSee($activeSlave)>>in the mirror<<else>>$he pictures<</if>> is still somewhat shocking to $him. Like a good slave<<= $girl>> though, $he can't wait to show off your changes.
+ <</if>>
+ <<elseif $degradation > 4>>
+ <<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ $He is disgusted by the slutty modifications you have made to $his body. $He @@.mediumorchid;hates@@ for it, but begins to @@.gold;fear@@ the power you hold over $him.
+ <<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
+ <<elseif $activeSlave.devotion <= 20 && $activeSlave.trust < -20>>
+ $He is so afraid of you that $he suppresses any reaction to the slutty modifications you have made to $his body and @@.gold;fears@@ your power to do whatever you like to $him.
+ <<set $activeSlave.trust -= 5>>
+ <<elseif $activeSlave.devotion < 50>>
+ $He is surprised with the slutty modifications you have made to $his body. However, $he is so obedient that $he @@.hotpink;accepts your changes.@@
+ <<set $activeSlave.devotion += 2>>
+ <<else>>
+ $He is surprised with the slutty modifications you have made to $his body but thrilled that you'd put so much into a slave like $him.
+ <</if>>
+ <<elseif $degradation > 1>>
+ <<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ While $he hates being permanently altered by you, $he @@.orangered;refuses to give you any reaction.@@
+ <<set $activeSlave.trust += 1>>
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust < 20>>
+ $He is @@.gold;afraid@@ that $he has been permanently altered against $his will, but is also scared of your reaction to any objection and suppresses $his disgust.
+ <<set $activeSlave.trust -= 5>>
+ <<elseif $activeSlave.devotion < -20>>
+ $He is @@.mediumorchid;angry@@ and @@.gold;afraid@@ that $he has been permanently altered against $his will.
+ <<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
+ <<elseif $activeSlave.devotion < 0>>
+ $He is saddened to have been altered against $his will, but @@.hotpink;begins to understand@@ that it is not $his decision.
+ <<set $activeSlave.devotion += 1>>
+ <<elseif $activeSlave.devotion < 20>>
+ $He is saddened to have been altered against $his will. However, $he realizes that $he is a slave, so $he accepts your work.
+ <<else>>
+ $He fully understands that $his body belongs to you and that it is yours to modify as you see fit.
+ <</if>>
+ <<else>>
+ $He shows no real <<if $activeSlave.devotion < -20 && $activeSlave.trust > 20>>interest in<<else>>reaction to<</if>> your modifications.
+ <</if>>
<</if>>
<<set $degradation = 0>>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index a36372da4c246bfd4fa4427047fca67d6aabd750..6e111eb0edeec02858a2f51dcb54447230f0739b 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -3,7 +3,7 @@
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
<div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <<SlaveArt $slaves[$i] 2 0>>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 12a503ef0a9d0d0d50263822deebc7d5a0ff0433..b10c5694b3e965c9f6986216ff474d51b5121702 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -13,7 +13,7 @@
/* 000-250-006 */
<<if $seeImages == 1>>
<div class="imageRef medImg">
- <<SlaveArt $eventSlave 2 0>>
+ <<SlaveArt $eventSlave 2 0>>
</div>
<</if>>
/* 000-250-006 */
@@ -390,11 +390,13 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $eventSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $eventSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index bc3bb32de5ddb0df144f98e13bc71503f367a161..46e5ec1dea31acd0deea5e4267fb86506930d1c2 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -626,7 +626,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.pregType = 0>>
<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.pregKnown = 0>>
- <<set $activeSlave.pregWeek = 0>>
+ <<set $activeSlave.pregWeek = -4>>
<<run SetBellySize($activeSlave)>>
<</link>>
<br>
@@ -1104,7 +1104,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</replace>>
<<set $activeSlave.preg = -3>>
<<set $activeSlave.pregType = 0>>
- <<set $activeSlave.pregWeek = 0>>
+ <<set $activeSlave.pregWeek = -4>>
<<set $activeSlave.pregKnown = 0>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.ovaries = 0>>
@@ -1154,7 +1154,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<= FSChange("Eugenics", 3)>>
<</if>>
<</replace>>
- <<set $activeSlave.chastityVagina = 0,$activeSlave.dick = 0,$activeSlave.foreskin = 0,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregKnown = 0,$activeSlave.pregSource = 0,$activeSlave.pregType = 0,$activeSlave.pregWeek = 0,$activeSlave.vagina = -1,$activeSlave.vaginalSkill = 0>>
+ <<set $activeSlave.chastityVagina = 0,$activeSlave.dick = 0,$activeSlave.foreskin = 0,$activeSlave.ovaries = 0,$activeSlave.preg = -2,$activeSlave.pregKnown = 0,$activeSlave.pregSource = 0,$activeSlave.pregType = 0,$activeSlave.pregWeek = -4,$activeSlave.vagina = -1,$activeSlave.vaginalSkill = 0>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.health -= 10, $activeSlave.trust = Math.clamp($activeSlave.trust-100, -100, 100)>>
<</link>>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index 34c29d5cd6c728654218d127e3480435e4c4f9a4..e9f9e146a1499319c6fb7b371ed218c86d4cf05f 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -5,6 +5,17 @@
<<if $Bodyguard != 0>>
<<setLocalPronouns $Bodyguard>>
+ <span id="artFrame">
+ /* 000-250-006 */
+ <<if $seeImages == 1>>
+ <<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div>
+ <<else>>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $Bodyguard 2 0>></div>
+ <</if>>
+ <</if>>
+ /* 000-250-006 */
+ </span>
<</if>>
One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population. <<if $Bodyguard != 0>>$Bodyguard.slaveName is walking with you, of course; $his presence protection, intimidation, and ostentation, all in one.<</if>>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 454fc563461ec7a709ac16433323ccb48c8710f3..925581ba12d3115e0bd813b53b87a8116c53c33b 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -9,6 +9,18 @@
<<run Enunciate($activeSlave)>>
<<setLocalPronouns $activeSlave>>
+<span id="artFrame">
+ /* 000-250-006 */
+ <<if $seeImages == 1>>
+ <<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <<else>>
+ <div class="imageRef lrgRender"><div class="mask"> </div><<SlaveArt $activeSlave 2 0>></div>
+ <</if>>
+ <</if>>
+ /* 000-250-006 */
+</span>
+
<<= SlaveFullName($activeSlave)>>, once
<<switch $PC.career>>
<<case "wealth">>
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index b9f1a84c83f14323fe3c80f850b61f716ed857dd..de7ccb1e92791514183583220e9a59a4ac584cf7 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -13,11 +13,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $Concubine 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $HeadGirl 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $Concubine 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/peLonelyBodyguard.tw b/src/uncategorized/peLonelyBodyguard.tw
index 28f11ac7b8fd4682838f3a46d13f1339ca4f1dda..817390f78a50fee29957e689a26c8980940f732f 100644
--- a/src/uncategorized/peLonelyBodyguard.tw
+++ b/src/uncategorized/peLonelyBodyguard.tw
@@ -16,11 +16,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index 200cfc8a5e0f67f3fad859900cfb9d8876bbc336..858a59e34c2d5ea98dc780695068410e775805ab 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -13,11 +13,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $HeadGirl 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reDevotedMotherDaughter.tw b/src/uncategorized/reDevotedMotherDaughter.tw
index fc9f65f5dc316071b4aa99c76f1bdc1a28f8b22c..06203541b3023c0bd6479325236395aca9b9d508 100644
--- a/src/uncategorized/reDevotedMotherDaughter.tw
+++ b/src/uncategorized/reDevotedMotherDaughter.tw
@@ -10,11 +10,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$i] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reDevotedTwins.tw b/src/uncategorized/reDevotedTwins.tw
index cfea87fabb593d5bda0f01f1b25732dfd6c44ea0..0a44295821e20e740114c869f42c0044f3da9adb 100644
--- a/src/uncategorized/reDevotedTwins.tw
+++ b/src/uncategorized/reDevotedTwins.tw
@@ -8,11 +8,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$i] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index b4d20ccc3ba1dbd4c1865e4eec0d9ac9938cb591..c9c85f4d105c4ab11835948e3eb71bb3fccddf92 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -9,17 +9,19 @@
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_red1] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_red2] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_red3] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_red4] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_red1] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_red2] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_red3] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_red4] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index 61a00501d9fcd874f683a5097ddd03eefbee3606..ef5c885bc8c263810a9be93d2baa1a10a9eaf9c0 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -7,11 +7,13 @@
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_bedSlaveOne] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_bedSlaveTwo] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_bedSlaveOne] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_bedSlaveTwo] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index bac7696c083af71b595313baa7323c63e6a14a1f..0d49859533e73b2e2fc08efc898cb3725e07da9e 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -11,11 +11,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $HeadGirl 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reRebels.tw b/src/uncategorized/reRebels.tw
index e9bf72ae79bcae953ab2de73fefcb41fcd0b593e..2d1bc299ec545f6e10a4022421afed55c5a971f3 100644
--- a/src/uncategorized/reRebels.tw
+++ b/src/uncategorized/reRebels.tw
@@ -13,11 +13,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_i] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_i] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw
index 839f48a1dffb4050149422c323c81a85f2a46a73..a917d79e3f32b73df09ab9f272500bb1c62d3a2e 100644
--- a/src/uncategorized/reRelationshipAdvice.tw
+++ b/src/uncategorized/reRelationshipAdvice.tw
@@ -12,11 +12,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $subSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $subSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index f864a7f8cf3e1648dc4e8715915c72db615f779d..b22e906feff35b1d5b6547577a757aeb1152a6f2 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -825,11 +825,13 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $eventSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $eventSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 54dc48e2bc813bcac848bc8019e71a8c9a6691ce..b062a258e9e2f9abf6895f7863e60eaa7fe5169c 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -61,11 +61,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _Inspectee 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _Inspectee 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index 91732022a3fec29046a556761c2933e930f5e2f6..2753fa517ef23bb2575cda79fae1bf7a9aa6d797 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -13,11 +13,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $HeadGirl 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $HeadGirl 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reSiblingRevenge.tw b/src/uncategorized/reSiblingRevenge.tw
index bf4922c21cf35194ce4ccee232945c64f1ae8ab7..4ab39122274293b39c236073448fe12ff148988f 100644
--- a/src/uncategorized/reSiblingRevenge.tw
+++ b/src/uncategorized/reSiblingRevenge.tw
@@ -12,11 +12,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$j] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[$i] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$i] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[$j] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reSlaveMarriage.tw b/src/uncategorized/reSlaveMarriage.tw
index 555312cfdfa565e53dd3dcea5908fbcc0e4b7589..99413870dd011a758940f80dafab37a9ae1ff838 100644
--- a/src/uncategorized/reSlaveMarriage.tw
+++ b/src/uncategorized/reSlaveMarriage.tw
@@ -17,11 +17,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $groomSlave 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $brideSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $groomSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $brideSlave 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reStaffedMorning.tw b/src/uncategorized/reStaffedMorning.tw
index 92514ba423f4f44cff26399b47e7a98b5581e2c5..a4f8d3119f89cd4c5cea280dadbd31d510c7214a 100644
--- a/src/uncategorized/reStaffedMorning.tw
+++ b/src/uncategorized/reStaffedMorning.tw
@@ -15,11 +15,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _bedSlaves[1] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _bedSlaves[0] 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt _bedSlaves[0] 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _bedSlaves[1] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 4c8b2beeba32417837a5633da45988f65e5a175a..a0c2fc1bd9542b73bde1ee9394572ea24a14a71f 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -239,11 +239,13 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set _clothesTemp = $Lurcher.clothes, $Lurcher.clothes = "no clothing">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $hare1 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $Lurcher 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $Lurcher 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $hare1 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -260,11 +262,13 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set _clothesTemp = $Lurcher.clothes, $Lurcher.clothes = "no clothing">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $hare2 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $Lurcher 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $Lurcher 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $hare2 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
@@ -282,11 +286,13 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set _clothesTemp = $Lurcher.clothes, $Lurcher.clothes = "no clothing">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $hare3 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $Lurcher 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $Lurcher 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $hare3 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 43662f2f5f85633c4adaee4c5e9e5df450236a2d..b3a2bc3ca7c669c9d39af21ca4a639e38fdc6ca6 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -26,11 +26,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _fighterTwo 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _fighterOne 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt _fighterOne 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _fighterTwo 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 36b0715f8cbfed4cf189ec45a887641598180967..7ae6176f16599216d4e483f46c6449d35965523b 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -19,11 +19,13 @@
<span id="artFrame">
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _fighterTwo 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _fighterOne 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt _fighterOne 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _fighterTwo 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index bb2a1d919d3cf97e18447ac2729621f9d31ce9a2..1e7675c756ae94c3146d47e68ec00a4433543e28 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -216,11 +216,13 @@ Your arcology has gained a well-off citizen.
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt $slaves[_sr] 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt $activeSlave 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt $slaves[_sr] 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index 925a2609e4471d04c08b2e926048e05b9409ba8b..1d7421074727d9b646e938d97aba763a394f73a4 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -10,11 +10,13 @@
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _slave2 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _slave1 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt _slave1 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _slave2 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index 67474090048403bbd63cf9e214efe7650ed923fe..f82e55b3b6f0b4c153ac9a110999e4f91daec105 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -14,14 +14,16 @@
/* 000-250-006 */
<<if $seeImages == 1>>
- <div class="imageRef medImg">
- <<SlaveArt _slave3 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _slave2 2 0>>
- </div>
- <div class="imageRef medImg">
- <<SlaveArt _slave1 2 0>>
+ <div class="imageColumn">
+ <div class="imageRef medImg">
+ <<SlaveArt _slave1 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _slave2 2 0>>
+ </div>
+ <div class="imageRef medImg">
+ <<SlaveArt _slave3 2 0>>
+ </div>
</div>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 0312fa83bccdf030d3cb425b3427fea72b93b930..9b6cbb36f662cdaa0f2872b384ac7b6a3f746d47 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -52,196 +52,9 @@
<<= loverSlave($activeSlave)>>
<<elseif ($partner == "relationship") || ($partner == "relation")>>
- <<set _partnerSlave = null>>
- <<if ($partner == "relation")>>
- <<if $familyTesting == 1>>
- <<set _partnerSlave = $relation>>
- <<setLocalPronouns _partnerSlave 2>>
- <<else>>
- <<set _partnerSlave = getSlave($activeSlave.relationTarget)>>
- <<setLocalPronouns _partnerSlave 2>>
- <</if>>
- <<else>>
- <<set _partnerSlave = getSlave($activeSlave.relationshipTarget)>>
- <<setLocalPronouns _partnerSlave 2>>
- <<if $activeSlave.relationship <= 1>>
- <<set _activeSlaveRel = "friend", _partnerRel = "friend">>
- <<elseif $activeSlave.relationship <= 2>>
- <<set _activeSlaveRel = "best friend", _partnerRel = "best friend">>
- <<elseif $activeSlave.relationship <= 3>>
- <<set _activeSlaveRel = "friend with benefits", _partnerRel = "friend with benefits">>
- <<elseif $activeSlave.relationship <= 4>>
- <<set _activeSlaveRel = "lover", _partnerRel = "lover">>
- <<elseif $activeSlave.relationship > 4>>
- <<set _activeSlaveRel = "slave wife", _partnerRel = "slave wife">>
- <</if>>
- <</if>>
- <<if ndef _partnerSlave || _partnerSlave == null>>
- <<goto "Main">>
- <</if>>
-
- $His
- <<if ($partner == "relation")>>
- <<if $familyTesting == 1>>
- $relationType
- <<else>>
- _partnerSlave.relation
- <</if>>
- <<else>>
- _activeSlaveRel
- <</if>>
- _partnerSlave.slaveName
- <<switch _partnerSlave.assignment>>
- <<case "be your agent">>
- is off managing an arcology in your stead, but you can call _him2 back for a visit if you were inclined.
- <<case "be confined in the arcade">>
- is nothing more than holes in $arcadeName, but you have a fine view of _his2 <<if $seeRace == 1>>_partnerSlave.race rear <</if>>on the feed from the facility.
- <<case "stay confined">>
- is confined, but you have a fine view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feed from _his2 cell.
- <<case "work in the brothel">>
- is working in the brothel, and is
- <<if (_seed > 80)>>
- riding a customer's dick.
- <<elseif (_seed > 60)>>
- sucking a customer's cock.
- <<elseif (_seed > 40)>>
- pleasuring a customer's cunt.
- <<elseif (_seed > 20)>>
- getting pounded by a woman wearing a strap-on.
- <<else>>
- being held down and buttfucked by a customer. You have a voyeuristic view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds.
- <</if>>
- You have a voyeuristic view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds.
- <<case "serve the public">>
- is serving the public, and is
- <<if (_seed > 80)>>
- riding a citizen's dick.
- <<elseif (_seed > 60)>>
- sucking a citizen's cock.
- <<elseif (_seed > 40)>>
- pleasuring a citizen's cunt.
- <<elseif (_seed > 20)>>
- getting pounded by a citizen wearing a strap-on.
- <<else>>
- being held down and buttfucked by a citizen.
- <</if>>
- You have a voyeuristic view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds.
- <<case "work in the dairy">>
- <<if ($dairyRestraintsSetting > 1)>>
- is strapped to a milking machine in $dairyName.
- <<elseif (_partnerSlave.lactation == 0) && (_partnerSlave.balls > 0)>>
- is working in $dairyName, and is having _his2 cock milked. As you watch, _his2 balls tighten as the phallus up _his2 butt brings _him2 closer to a copious ejaculation.
- <<elseif _seed > 50>>
- is working in $dairyName, having _his2 tits milked.
- <<else>>
- is working in $dairyName, massaging _his2 sore tits.
- <</if>>
- You have a good view of _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body on the feeds.
- <<case "serve in the club">>
- is working on the club,
- <<if _seed > 50>>
- displaying _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body, keeping citizens company, and flirting with anyone who shows interest.
- <<else>>
- or rather just off it, having taken a prominent citizen back to a discreet room so he can use _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body.
- <</if>>
- <<case "work as a servant">>
- <<if _seed > 50>>
- was scrubbing the penthouse floor, until another slave requested oral service.
- <<else>>
- is scrubbing the penthouse floor.
- <</if>>
- <<case "guard you">>
- is standing discreetly behind your left shoulder, watching for threats. _He2 has a straight ceramic sword strapped to _his2 back and a machine pistol at _his2 hip.
- <<case "be the Madam">>
- is managing the brothel: _he2 is making sure all the customers are satisfied and all the whores are working hard.
- <<case "be the Attendant">>
- is seeing to slaves in the spa: _he2 is gently soaping an exhausted slave.
- <<case "be the Stewardess">>
- is managing the house servants: _he2 overseeing the laboring house slaves and punishing any that step out of line.
- <<case "be the DJ">>
- is taking the lead on the club: _he2 greets new arrivals, flirts with them prettily, and subtly guides them towards choice sluts.
- <<case "be the Schoolteacher">>
- is teaching classes: _he2 is leading the slave students in rote recitation.
- <<case "be the Milkmaid">>
- is working in the dairy, looking after your stock.
- <<default>>
-
- <<if (_partnerSlave.heels == 1) && !["flats", "none"].includes(_partnerSlave.shoes)>>
- walks past your desk with the tiny swaying steps $he must take in order to walk on _his2 surgically altered legs. _He2 is on _his2 way to
- <<elseif ["heels", "pumps"].includes(_partnerSlave.shoes)>>
- walks past your desk with the swaying steps _he2 must take in _his2 high heels. _He2 is on _his2 way to
- <<elseif (_partnerSlave.shoes == "boots")>>
- walks past your desk with the confident gait encouraged by _his2 high heeled boots. _He2 is on _his2 way to
- <<elseif (_partnerSlave.shoes == "extreme heels")>>
- walks past your desk with the tiny swaying steps _he2 must take in _his2 ridiculous heels. _He2 is on _his2 way to
- <<elseif (_partnerSlave.heels == 1)>>
- crawls past your desk on all fours, since _he2 has not been allowed the heels _he2 needs to walk upright. _He2 is on _his2 way to
- <<elseif (_partnerSlave.amp == 1)>>
- is carried past your desk by one of your other slaves. _He2 is on _his2 way to
- <<else>>
- walks past your desk on _his2 way to
- <</if>>
- <<switch _partnerSlave.assignment>>
- <<case "whore">>
- <<if _seed > 50>>
- whore;
- <<else>>
- sell _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body;
- <</if>>
- <<case "serve the public">>
- <<if _seed > 50>>
- serve the public;
- <<else>>
- be a public slut;
- <</if>>
- <<case "rest">>
- <<if _seed > 50>>
- eat;
- <<else>>
- bed;
- <</if>>
- <<case "get milked">>
- <<if _seed > 50>>
- milk _his2 overfull <<if $seeRace == 1>>_partnerSlave.race <</if>>tits;
- <<else>>
- drain _his2 milky <<if $seeRace == 1>>_partnerSlave.race <</if>>udders;
- <</if>>
- <<case "please you">>
- sit next to you and wait for
- <<if _seed > 50>>
- you to fuck _him2;
- <<else>>
- _his2 Master to use _his2 <<if $seeRace == 1>>_partnerSlave.race <</if>>body;
- <</if>>
- <<case "be a subordinate slave">>
- service your other slaves;
- <<case "be a servant">>
- clean up after your other slaves;
- <<case "be your Head Girl">>
- oversee your other slaves;
- <<case "recruit girls">>
- use _his2 connections to recruit slaves;
- <</switch>>
-
- <<if (_partnerSlave.amp == 1)>>
- _he2 is carried by on _his2 way to _his2 next task.
- <<elseif _partnerSlave.fetish == "mindbroken">>
- _he2 does not even glance at you as _he2 goes mindlessly to _his2 next task.
- <<elseif _partnerSlave.devotion < -50>>
- _he2 directs a look of pure hatred at where you sit as _he2 passes.
- <<elseif _partnerSlave.devotion < -20>>
- _he2 cannot keep the loathing from _his2 face as _he2 passes.
- <<elseif _partnerSlave.devotion <= 20>>
- _he2 passes quickly, obviously hoping to avoid you.
- <<elseif _partnerSlave.devotion <= 50>>
- _he2 rushes by, hurrying to _his2 next task.
- <<else>>
- as _he2 passes _he2 gives you a look of adoration.
- <</if>>
-
- <</switch>>
- <<set $target = "FRelation", _partnerSlave = null>>
+ <<= relatedSlave($activeSlave)>>
+
<<elseif (_flag > 80) && ($activeSlave.fuckdoll == 0)>>
<<BoobsDescription>>
<<switch $activeSlave.clothes>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index f457343300a1b43d794e7ef29ae64919b716b851..991415189219ef9869568627226c8fa92b1aa39f 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -4950,7 +4950,7 @@
<<if $newSlaves.length == 0>>
<br>[["Buy " + $his + " slave contract"|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), _schoolToBuyFrom.schoolSale = 0, _schoolToBuyFrom.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[["Buy " + $him + " and finish your order of " + $args[3]|Bulk Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), _schoolToBuyFrom.schoolSale = 0, _schoolToBuyFrom.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and finish your order of " + $args[2]|Bulk Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), _schoolToBuyFrom.schoolSale = 0, _schoolToBuyFrom.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
<br>//You lack the necessary funds to buy this $args[1].//