From c5b2b23ce8e27d412751f2c05d42d9eda0757ab4 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 30 May 2017 02:58:10 -0400
Subject: [PATCH] Vanilla.
---
src/gui/css/mainStyleSheet.tw | 26 ++++++++++++++++---
src/init/storyInit.tw | 3 ++-
src/uncategorized/BackwardsCompatibility.tw | 8 ++++++
src/uncategorized/PESS.tw | 9 ++++---
src/uncategorized/PETS.tw | 1 -
src/uncategorized/RECI.tw | 9 ++++---
src/uncategorized/REFI.tw | 7 -----
src/uncategorized/RESS.tw | 9 ++++---
src/uncategorized/RESSTR.tw | 9 ++++---
src/uncategorized/RETS.tw | 15 +++++------
src/uncategorized/jeSlaveDispute.tw | 11 ++++----
src/uncategorized/longSlaveDescription.tw | 9 ++++---
src/uncategorized/matchmaking.tw | 22 +++++++---------
src/uncategorized/pRivalryActions.tw | 9 ++++---
src/uncategorized/randomIndividualEvent.tw | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 2 +-
src/uncategorized/reDevotees.tw | 1 -
src/uncategorized/reNoEvent.tw | 9 ++++---
src/uncategorized/reRelativeRecruiter.tw | 18 +++++++------
src/uncategorized/reStandardPunishment.tw | 9 ++++---
src/uncategorized/saLongTermEffects.tw | 2 +-
21 files changed, 109 insertions(+), 81 deletions(-)
diff --git a/src/gui/css/mainStyleSheet.tw b/src/gui/css/mainStyleSheet.tw
index 6bce61236f2..b0c35fe4a69 100644
--- a/src/gui/css/mainStyleSheet.tw
+++ b/src/gui/css/mainStyleSheet.tw
@@ -49,7 +49,7 @@
height: auto;
}
-.lrgImg {
+.lrgRender {
height: 531px;
width: 531px;
margin-right: -50px;
@@ -58,14 +58,34 @@
z-index: -1;
}
-.lrgImg > div.mask {
+.lrgVector {
+ height: 600px;
+ width: 600px;
+ margin-right: -100px;
+ margin-left: -100px;
+ float: right;
+}
+
+.lrgRender > div.mask {
+ width: 150px;
+ height: 100%;
+ background: linear-gradient(90deg, rgba(17,17,17,1), rgba(17,17,17,0.8) 60%, rgba(17,17,17,0));
+ z-index: 1;
+}
+
+.lrgRender > img {
+ margin-left: -150px;
+ height: 600px;
+}
+
+.lrgVector > div.mask {
width: 150px;
height: 100%;
background: linear-gradient(90deg, rgba(17,17,17,1), rgba(17,17,17,0.8) 60%, rgba(17,17,17,0));
z-index: 1;
}
-.lrgImg > img {
+.lrgVector > img {
margin-left: -150px;
height: 600px;
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 096f5f411dc..bd30950241f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1252,10 +1252,11 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $ArcologyNamesRepopulationist = ["Hope", "The Womb", "Holders of the Future", "Future", "Haven of the Pregnant", "Sacred Womb", "Glorious Mother"]>>
<<set $badWords = ["fuck", "shit", "ass", "cock", "piss", "dick", "slut", "cum", "whore", "butt", "boob", "cunt", "cunny", "pussy", "junk", "trash", "slave"]>>
+
<<set $badNames = 0>> /* I have issues getting arrays to initialize otherwise */
<<set $badNames = ["Dipshit", "Asshole", "Cunt", "Whore", "Dick", "Pussy", "Slaver", "Assfucker", "Sodomite", "Rapist", "Despoiler", "Ruiner", "Ass", "Fucker", "Trash", "Traitor", "Cocksucker", "Dicksucker", "Ass Kisser", "Ass Licker", "Bitch", "Jerk", "Fuckface", "Prick", "Creep", "Retard", "Dumbass", "DumbFuck", "Douchebag"]>>
-<<set $modestClothes = ["conservative clothing", "a toga", "a huipil", "a slutty qipao", "restrictive latex", "cutoffs and a t-shirt", "battledress", "a penitent nuns habit", "a slave gown", "slutty business attire", "nice business attire", "a comfortable bodysuit", "a leotard", "a bunny outfit", "a nice nurse outfit", "a slutty nurse outfit", "a schoolgirl outfit", "a hijab and abaya", "a kimono", "a nice maid outfit", "a slutty maid outfit", "a ball gown", "a halter top dress", "a mini dress", "a latex catsuit", "a military uniform", "a maternity dress"]>>
+<<set setup.modestClothes = ["conservative clothing", "a toga", "a huipil", "a slutty qipao", "restrictive latex", "cutoffs and a t-shirt", "battledress", "a penitent nuns habit", "a slave gown", "slutty business attire", "nice business attire", "a comfortable bodysuit", "a leotard", "a bunny outfit", "a nice nurse outfit", "a slutty nurse outfit", "a schoolgirl outfit", "a hijab and abaya", "a kimono", "a nice maid outfit", "a slutty maid outfit", "a ball gown", "a halter top dress", "a mini dress", "a latex catsuit", "a military uniform", "a maternity dress"]>>
<<set $niceWeather = []>>
<<set $weatherToday = {name: "Sunny", severity: 1}>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 44e98075bb4..c4fb3f5f3c2 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -39,6 +39,14 @@
<<set $fixedRace = 0>>
<</if>>
+<<if ndef setup.modestClothes>>
+ <<set setup.modestClothes = ["conservative clothing", "a toga", "a huipil", "a slutty qipao", "restrictive latex", "cutoffs and a t-shirt", "battledress", "a penitent nuns habit", "a slave gown", "slutty business attire", "nice business attire", "a comfortable bodysuit", "a leotard", "a bunny outfit", "a nice nurse outfit", "a slutty nurse outfit", "a schoolgirl outfit", "a hijab and abaya", "a kimono", "a nice maid outfit", "a slutty maid outfit", "a ball gown", "a halter top dress", "a mini dress", "a latex catsuit", "a military uniform"]>>
+
+ <<if def $modestClothes>>
+ <<unset $modestClothes>>
+ <</if>>
+<</if>>
+
<<if ndef $arcologies[0].FSAztecRevivalist>>
<<for _bci = 0; _bci < $arcologies.length; _bci++>>
<<set $arcologies[_bci].FSAztecRevivalist = "unset", $arcologies[_bci].FSAztecRevivalistDecoration = 0>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 7fd4010bf29..7e9c05182e6 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -37,11 +37,12 @@
<</switch>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
-</div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index b765af541e6..230d2964167 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -35,7 +35,6 @@
<<SlaveTitle $activeSlave>>
/* 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>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index a081049e01d..8ff22be8468 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -20,11 +20,12 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 30b96238700..83c5d17dcd2 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -51,7 +51,6 @@
<</for>>
/* 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>>
@@ -78,7 +77,6 @@ You have $subSlave.slaveName bent over your desk, and are seeing to your own amu
<</for>>
/* 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>>
@@ -105,7 +103,6 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
<</for>>
/* 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>>
@@ -137,7 +134,6 @@ $subSlave.slaveName is on lunch duty today. That means that as you eat your work
<</for>>
/* 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>>
@@ -164,7 +160,6 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
<</for>>
/* 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>>
@@ -191,7 +186,6 @@ In the middle of the afternoon, you take a break from work to fuck $subSlave.sla
<</for>>
/* 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>>
@@ -223,7 +217,6 @@ $activeSlave.slaveName hesitates before explaining herself, and the $desc is obv
<</for>>
/* 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>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 374a4748eec..78644cbee6c 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -20,11 +20,12 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index f7aa82ba0be..7e9ce979b7d 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -20,11 +20,12 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index d03ebd9b81e..d4b83fb4eef 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -126,7 +126,6 @@
<<SlaveTitle $activeSlave>>
/* 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>>
@@ -1456,10 +1455,10 @@ $subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<
<<Enunciate $subSlave>>
"Ooh!" she squeals, @@color:hotpink;pleased she was wrong after all.@@ "Ye<<s>>, thank you, <<Master>>! Fuck me! Fuck me while I rape her!" Underneath her, $subSlave.slaveName cries harder, even though $activeSlave.slaveName has to stop her thrusting for a moment to let you inside. In fact, you reflect as you hammer $activeSlave.slaveName's <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>><<if $activeSlave.vagina > 2>>roomy<<elseif $activeSlave.vagina > 1>>delectable<<else>>tight little<</if>> cunt<<else>><<if $activeSlave.anus > 2>>gaping<<elseif $activeSlave.anus > 1>>relaxed<<else>>poor little<</if>> asspussy<</if>>, it's a little strange that $subSlave.slaveName @@color:gold;seems to think this is worse@@ than just being raped by $activeSlave.slaveName. After all, having your <<if $PC.dick>>turgid cock<<else>>formidable strap-on<</if>> sliding energetically in and out of her <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>womanhood<<else>>rectum<</if>> is cramping $activeSlave.slaveName's style a bit. Maybe it's that $subSlave.slaveName is a little squashed under there.
<<set $activeSlave.devotion += 4>>
- <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>><<set $activeSlave.vaginalCount++, $vaginalTotal++>><<else>><<set $activeSlave.analCount++, $analTotal++>><<if>>
+ <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>><<set $activeSlave.vaginalCount++, $vaginalTotal++>><<else>><<set $activeSlave.analCount++, $analTotal++>><</if>>
<<for $i to 0; $i < $slaves.length; $i++>><<if $slaves[$i].ID is $subSlave.ID>>
<<set $slaves[$i].trust -= 4>>
- <<if _vaginal>><<set $slaves[$i].vaginalCount++, $vaginalTotal++>><<else>><<set $slaves[$i].analCount++, $analTotal++>><<if>>
+ <<if _vaginal>><<set $slaves[$i].vaginalCount++, $vaginalTotal++>><<else>><<set $slaves[$i].analCount++, $analTotal++>><</if>>
<<break>>
<</if>><</for>>
<</replace>>
@@ -1482,13 +1481,13 @@ $subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<
<</if>>
<</if>>
$activeSlave.slaveName pulls out, sits her bare butt down on the floor, and hauls a struggling $subSlave.slaveName onto her lap, shoving her stiff prick back where it belongs. Then $activeSlave.slaveName hauls $subSlave.slaveName's legs back, offering you her already-occupied hole.
- <<if $subSlave.vagina != 0 && _vaginal == 0>>$subSlave.slaveName has another hole, and she tearfully begs you to use it, but in vain.<<if>>
+ <<if $subSlave.vagina != 0 && _vaginal == 0>>$subSlave.slaveName has another hole, and she tearfully begs you to use it, but in vain.<</if>>
You jam yourself inside, enjoying $subSlave.slaveName's wriggling<<if !_fit>> and the extreme tightness of her overfilled insides. She spasms with pain as you force your way inside her<</if>>. $activeSlave.slaveName can't thrust much from where she is, and serves mostly to tighten $subSlave.slaveName for you, but she stares into your eyes lovingly. Playing such an equal sexual role with you definitely @@.mediumaquamarine;builds her trust@@ in her role. For her part, $subSlave.slaveName is @@.gold;thoroughly degraded,@@ <<if _fit>>but physically unhurt.<<else>>and @@.orange;stretched out.@@<</if>>
<<set $activeSlave.trust += 4>>
<<for $i to 0; $i < $slaves.length; $i++>><<if $slaves[$i].ID is $subSlave.ID>>
<<set $slaves[$i].trust -= 4>>
- <<if _vaginal>><<set $slaves[$i].vaginalCount++, $vaginalTotal++>><<else>><<set $slaves[$i].analCount++, $analTotal++>><<if>>
- <<if !fit>><<if _vaginal>><<set $slaves[$i].vagina++>><<else>><<set $slaves[$i].anus++>><<if>><</if>>
+ <<if _vaginal>><<set $slaves[$i].vaginalCount++, $vaginalTotal++>><<else>><<set $slaves[$i].analCount++, $analTotal++>><</if>>
+ <<if !fit>><<if _vaginal>><<set $slaves[$i].vagina++>><<else>><<set $slaves[$i].anus++>><</if>><</if>>
<<break>>
<</if>><</for>>
<</replace>>
@@ -1505,14 +1504,14 @@ $subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<
<<set $activeSlave.trust -= 4>>
<<for $i to 0; $i < $slaves.length; $i++>><<if $slaves[$i].ID is $subSlave.ID>>
<<set $slaves[$i].trust += 4>>
- <<if _vaginal>><<set $slaves[$i].vaginalCount++, $vaginalTotal++>><<else>><<set $slaves[$i].analCount++, $analTotal++>><<if>>
+ <<if _vaginal>><<set $slaves[$i].vaginalCount++, $vaginalTotal++>><<else>><<set $slaves[$i].analCount++, $analTotal++>><</if>>
<<break>>
<</if>><</for>>
<</replace>>
<</link>>
<<default>>
- ERROR: RETS event $RETSevent
+ ERROR: bad RETS event $RETSevent
<</switch>>
<<if $cheatMode == 1>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index d6832b07069..ee0a50e71ed 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -133,7 +133,7 @@
<<set $activeSlave.vagina = 2>>
<<set $activeSlave.ovaries = 1>>
<<if isFertile($activeSlave)>>
- <<set $activeSlave.preg = 1>>
+ <<set $activeSlave.preg = 1>>
<</if>>
<</if>>
<</if>>
@@ -143,11 +143,12 @@
<<nobr>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
-</div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 75b8a70bf02..df29e337264 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -3,11 +3,12 @@
<<SlavePronouns $activeSlave>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 3 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg"><div class="mask"> </div>
- <<SlaveArt $activeSlave 3 0>>
-</div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 75587b6c76b..0dba1edb5ae 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -7,7 +7,6 @@
<<SlaveTitle $eventSlave>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
<<if $seeImages == 1>>
<div class="imageRef medImg">
<<SlaveArt $eventSlave 2 0>>
@@ -355,8 +354,17 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
<</if>>
*/
+<<if $seeImages == 1>><br style="clear:both" /><</if>>
+
+<br><br>__Put her with another worshipful <<if $eventSlave.relationship == -2>>emotionally bonded emotionally slave<<else>>emotional slut<</if>>:__
+<<set $Flag = 1>>
+<<include "Slave Summary">>
+
+</span>
+
+<<else>>
+
/* 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>>
@@ -367,16 +375,6 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
<</if>>
/* 000-250-006 */
-<br><br>__Put her with another worshipful <<if $eventSlave.relationship == -2>>emotionally bonded slave<<else>>emotional slut<</if>>:__
-<<set $Flag to 1>>
-<<include "Slave Summary">>
-
-</span>
-
-<<else>>
-
-<<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><<SlaveArt $subSlave 2 0>><</if>>
-
You decide to set $eventSlave.slaveName up with $subSlave.slaveName. Telling the former to wait, you have the latter hurry up to your office. When the <<if $eventSlave.relationship == -2>>slaves are waiting adoringly<<else>>sluts are waiting with barely concealed lust<</if>> in front of your desk together, you inform them of your decision.
<<if $eventSlave.relationship == -2>>
You commend their love for you, and let them know that it's all right for it to continue, but command them to love each other, too. They look doubtful, but at your orders they obediently take each other by the hand, and share a kiss. It will do for now. You assign them to live together as much as possible for a few days, and inform them that you'll be limiting your personal contact with them during this period. They give you identical looks of horror, and fail to notice how much of a perfect couple they already are.
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index c8f3ff0f3c1..d473c6b68b9 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -5,11 +5,12 @@
<<if $hostageAnnounced == 1>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $hostage 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $hostage 2 0>>
-</div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 8169230a002..99a6d32631d 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -815,7 +815,7 @@
<<if $eventSlave.devotion > 20>>
<<if $eventSlave.trust > 20>>
<<if $eventSlave.speechRules != "restrictive">>
-<<if $modestClothes.includes($slaves[$i].clothes)>>
+<<if setup.modestClothes.includes($slaves[$i].clothes)>>
<<set $RESSTRevent.push("modest clothes")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 58d272f44ab..40bd75a6974 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -1002,7 +1002,7 @@
<<set $events.push("RE AWOL")>>
<</if>>
-<<if $arcologies[0].prosperity >= 100>>
+<<if $arcologies[0].prosperity >= 100 && ($rep > random(1,30000))>>
<<set $milfSlave = $slaves.find(function(s) { return s.devotion > 20 && canTalk(s) && canWalk(s) && (s.assignment == "serve the public" || s.assignment == "serve in the club"); })>>
<<if def $milfSlave>>
<<set $events.push("RE milf tourist")>>
diff --git a/src/uncategorized/reDevotees.tw b/src/uncategorized/reDevotees.tw
index a61d698bfff..2e08121d708 100644
--- a/src/uncategorized/reDevotees.tw
+++ b/src/uncategorized/reDevotees.tw
@@ -4,7 +4,6 @@
<<set $nextLink = "RIE Eligibility Check">>
/* 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>>
diff --git a/src/uncategorized/reNoEvent.tw b/src/uncategorized/reNoEvent.tw
index 594210be45a..d064ea1e1f0 100644
--- a/src/uncategorized/reNoEvent.tw
+++ b/src/uncategorized/reNoEvent.tw
@@ -8,11 +8,12 @@
<<set $activeSlave.trust += 3>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 1a23b289fec..e47197acfa3 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -5,11 +5,12 @@
<<if $familyTesting == 1>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $eventSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
@@ -744,11 +745,12 @@ You look up the _relationType. She costs ¤$slaveCost, a bargain, but you won't
<<set $activeSlave = clone($genePool[$j])>>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $eventSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $eventSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index bd545503e8c..809c083b59d 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -5,11 +5,12 @@
<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Next Week">>
/* 000-250-006 */
-/* <<if $seeImages == 1>><<SlaveArt $activeSlave 2 0>><</if>> */
<<if $seeImages == 1>>
- <div class="imageRef lrgImg">
- <<SlaveArt $activeSlave 2 0>>
- </div>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index e9cf7be59b0..3809d4b5c1b 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -265,7 +265,7 @@
<<if ($slaves[$i].fetishKnown == 0)>>
<<if ($slaves[$i].fetish == "humiliation")>>
<<if random(1,100) > 90>>
-<<if not $modestClothes.includes($slaves[$i].clothes)>>
+<<if not setup.modestClothes.includes($slaves[$i].clothes)>>
Surprisingly, she takes to her extremely revealing clothing, and gets an obvious thrill from it. @@.green;She's a humiliation fetishist!@@
<<set $slaves[$i].fetishKnown = 1>>
<</if>>
--
GitLab