From 2e39bd986c4d2f50e4dc1c731ef37e18a63d32e1 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 17 Jun 2019 20:09:08 -0500
Subject: [PATCH] adjust

---
 src/js/eventSelectionJS.js |  3 +--
 src/uncategorized/RESS.tw  | 44 ++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index e94e0b16e3c..20e1361474d 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -94,8 +94,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 											State.variables.RESSevent.push("PA servant");
 										}
 									}
-								}
-								if (eventSlave.trust > 75) {
+								} else if (eventSlave.trust > 75) {
 									if (eventSlave.energy > 60) {
 										if ((canDoAnal(eventSlave) && eventSlave.anus > 0) || (canDoVaginal(eventSlave) && eventSlave.vagina > 0)) {
 											State.variables.RESSevent.push("PA flirting");
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 306894d7157..57e1cd6615f 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -238,7 +238,7 @@ Finishing your work, you lean back for a well-deserved break. Your peace is quic
 	in a desperate attempt at taking control.
 	<<if $HeadGirl != 0>>
 		<<setLocalPronouns $HeadGirl 2>>
-		<<setSpokenLocalPronouns $activeSlave $HeadGirl>>
+		<<setSpokenLocalPronouns $HeadGirl $activeSlave>>
 		<<run Enunciate($HeadGirl)>>
 		You jump in surprise as $HeadGirl.slaveName tackles $him off you and to the floor
 		<<if $HeadGirl.skill.combat > 0>>
@@ -287,7 +287,7 @@ The $desc is
 
 <<case "devoted lotion">>
 
-Your slaves are required to take very good care of themselves, and your best girls spend several hours a day maintaining every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of their bodies. You notice <<EventNameLink>> standing naked in front of a mirror outside the bathroom, carefully applying moisturizing lotion to every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his $activeSlave.skin skin. $He's clearly feeling well, and $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face <= 40>>attractive<<elseif $activeSlave.face <= 10>>pretty<<elseif $activeSlave.face < -10>>plain<<else>>homely<</if>> face bears a smile of simple enjoyment as $he basks in the warmth of the slave quarters, calibrated to make nudity comfortable. $He straightens $his <<if $activeSlave.height >= 185>>wonderfully long<<elseif $activeSlave.height >= 170>>long<<elseif $activeSlave.height >= 160>>nice<<elseif $activeSlave.height >= 150>>short<<else>>short little<</if>> legs and bends at the waist,
+Your slaves are required to take very good care of themselves, and your best ones spend several hours a day maintaining every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of their bodies. You notice <<EventNameLink>> standing naked in front of a mirror outside the bathroom, carefully applying moisturizing lotion to every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his $activeSlave.skin skin. $He's clearly feeling well, and $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face <= 40>>attractive<<elseif $activeSlave.face <= 10>>pretty<<elseif $activeSlave.face < -10>>plain<<else>>homely<</if>> face bears a smile of simple enjoyment as $he basks in the warmth of the slave quarters, calibrated to make nudity comfortable. $He straightens $his <<if $activeSlave.height >= 185>>wonderfully long<<elseif $activeSlave.height >= 170>>long<<elseif $activeSlave.height >= 160>>nice<<elseif $activeSlave.height >= 150>>short<<else>>short little<</if>> legs and bends at the waist,
 <<if $activeSlave.belly >= 600000>>
 	$his _belly belly coming to rest on the floor as $he spreads $his legs around it,
 <<elseif $activeSlave.belly >= 400000>>
@@ -758,7 +758,7 @@ One night, you see <<EventNameLink>> <<if ($activeSlave.amp == 1)>>scooting $him
 
 <<case "shift doorframe">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the girls from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 You're at your desk as $he arrives; $his predecessor passes $him on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. $He spreads $his legs until $his
 <<if $activeSlave.shoes == "heels">>
@@ -1243,7 +1243,7 @@ Your order $him to turn around and present $his anus for inspection. $He doesn't
 
 <<case "age implant">>
 
-In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of girls heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<EventNameLink>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
+In the morning the penthouse is a busy bustle of female energy. Slaves get up promptly, eat, shower, dress themselves, and head out to work. They chatter if able and allowed, and draw a good deal of strength from each other. As you pass by the kitchen, you are narrowly avoided by a rush of slaves heading to the showers. They're almost bouncing, feeding off each others' youthful energy. At the back of the pack is <<EventNameLink>>. $He looks as young as any of them, but after they're out, $he leans against the door frame for a moment and exhales slowly.
 <br><br>
 $His <<= App.Desc.eyeColor($activeSlave)>> eyed gaze catches yours for a moment, and you are reminded that $he isn't as young as they are, not at all. $His face might look youthful, but $his eyes don't. <<if canSee($activeSlave)>>$He sees your consideration, and<<else>>You make yourself known, and $he<</if>> murmurs, "<<S>>orry, <<Master>>. Ju<<s>>t a little <<s>>low thi<<s>> morning."
 $He hurries after $his sisters, $his
@@ -1294,7 +1294,7 @@ but after a moment $he clearly decides this isn't enough stimulation. $He <<if $
 
 <<case "shift sleep">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the girls from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 Though it's late, $he's surprised to find the lights in the master suite off. You had an unusually trying day, so you've retired for the night; you're on the point of sleep when $he comes in<<if $Concubine != 0>>, $Concubine.slaveName nestled under your arm<</if>>. After a moment's hesitation, $activeSlave.slaveName strips quietly and
 <<if $activeSlave.belly >= 100000>>
@@ -1488,7 +1488,7 @@ $He <<if canSee($activeSlave)>>stares at you doe-eyed<<else>>$he faces you with
 
 <<case "fearful balls">>
 
-<<EventNameLink>> is still having obedience problems, particularly with $his proper role as a <<if $girl == "girl">>female<</if>> receptacle for cock. Though they're an almost too-obvious explanation, it's hard to avoid $his retention of $his gonads as a possible explanation for $his behavioral issues. They certainly contribute to $his less than perfectly feminine hormonal balance.
+<<EventNameLink>> is still having obedience problems, particularly with $his proper role as a <<if $girl == "girl">>female <</if>>receptacle for cock. Though they're an almost too-obvious explanation, it's hard to avoid $his retention of $his gonads as a possible explanation for $his behavioral issues. They certainly contribute to $his less than perfectly feminine hormonal balance.
 <br><br>
 It's time for $his routine inspection, and $he's standing before you, nude. $He certainly doesn't find $his sexually vulnerable position arousing; $he's totally flaccid. The physical manifestations of $his disobedience are right in front of you, and quite defenseless.
 
@@ -2580,9 +2580,7 @@ personal assistant coming from your office. Looking in, you are treated to the s
 <<case "schoolgirl">>
 	_hisA perky tits
 <</switch>>
-down with screen cleaner, and is talking dirty to the furiously blushing servant. "Ohh, that feels good," _heA moans. "Rub me right there, you
-$desc
-slut! I love it!" The poor slave is doing $his best to hurry, embarrassed and unsure of how to react to $assistantName's behavior.
+down with screen cleaner, and is talking dirty to the furiously blushing servant. "Ohh, that feels good," _heA moans. "Rub me right there, you $desc slut! I love it!" The poor slave is doing $his best to hurry, embarrassed and unsure of how to react to $assistantName's behavior.
 
 <<case "like me">>
 
@@ -3496,7 +3494,7 @@ $His
 	<</if>>
 	tummy, and
 	<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
-		that can be a very appealing look given the predilection your arcology has for slim girls.
+		that can be a very appealing look given the predilection your arcology has for slim <<= $girl>>s.
 	<<else>>
 		to most clients, this makes $him a less appealing whore.
 	<</if>>
@@ -3673,11 +3671,11 @@ Passing by the kitchen in the morning, you take a moment to listen to the low hu
 <<elseif ($arcologies[0].FSTransformationFetishist != "unset") && ($activeSlave.boobsImplant/$activeSlave.boobs) >= .50>>
 	"It's your fake tits," the other slave explains. "They love how fake they look, here. If you look like a bimbo, they don't care if you're a little mature."
 <<elseif ($arcologies[0].FSHedonisticDecadence != "unset") && ($activeSlave.weight > 95)>>
-	"You're so fat," the other slave explains. "Everyone here loves thick girls. They don't care that you're a little mature; that just means you understand life's pleasures more."
+	"You're so fat," the other slave explains. "Everyone here loves thick <<= $girl>>s. They don't care that you're a little mature; that just means you understand life's pleasures more."
 <<elseif ($arcologies[0].FSPhysicalIdealist != "unset") && ($activeSlave.muscles > 50)>>
 	"It's how ripped you are," the other slave explains. "It promises you won't give out after one fuck, no matter how old you are."
 <<elseif ($arcologies[0].FSSlimnessEnthusiast != "unset") && ($activeSlave.boobs < 800) && ($activeSlave.butt < 3)>>
-	"You're so slim," the other slave explains. "Everyone here loves slender girls. They don't care that you're a little mature; they think you're hot."
+	"You're so slim," the other slave explains. "Everyone here loves slender <<= $girl>>s. They don't care that you're a little mature; they think you're hot."
 <<elseif ($arcologies[0].FSBodyPurist != "unset") && ($activeSlave.boobsImplant == 0) && ($activeSlave.health > 50)>>
 	"It's how healthy you are, and your natural boobs," the other slave explains. "You look good and natural, and everyone likes that here, especially if you're mature."
 <<elseif $activeSlave.face > 95>>
@@ -7796,15 +7794,15 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 5; } })>>
 	<</replace>>
 <</link>>
-<br><<link "Clip the would-be escapee's tendons">>
-	<<EventNameDelink $activeSlave>>
-	<<replace "#result">>
-		The simple thing to do would be to sedate $activeSlave.slaveName and haul $him to the remote surgery for $his punishment. That would deny $him the added weight of terror, however, and would stop your other slaves from learning by the sight of it. So, you restrain $him, pronounce judgment, and drag $his struggling, weeping form through the penthouse to the surgery. $activeSlave.slaveName is @@.mediumorchid;saddened@@ and @@.gold;frightened@@ by this punishment, and $his @@.red;health is damaged@@ by the surgery. Every single one of your other slaves with any resistance left in them is @@.gold;sensibly restrained@@ from trying such rash acts.
-		<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5, $activeSlave.health -= 10, $activeSlave.heels = 1>>
-		<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 5; } })>>
-	<</replace>>
-<</link>>
-<<if $activeSlave.indentureRestrictions < 1>>
+<<if $seeExtreme == 1>>
+	<br><<link "Clip the would-be escapee's tendons">>
+		<<EventNameDelink $activeSlave>>
+		<<replace "#result">>
+			The simple thing to do would be to sedate $activeSlave.slaveName and haul $him to the remote surgery for $his punishment. That would deny $him the added weight of terror, however, and would stop your other slaves from learning by the sight of it. So, you restrain $him, pronounce judgment, and drag $his struggling, weeping form through the penthouse to the surgery. $activeSlave.slaveName is @@.mediumorchid;saddened@@ and @@.gold;frightened@@ by this punishment, and $his @@.red;health is damaged@@ by the surgery. Every single one of your other slaves with any resistance left in them is @@.gold;sensibly restrained@@ from trying such rash acts.
+			<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5, $activeSlave.health -= 10, $activeSlave.heels = 1>>
+			<<set $slaves.forEach(function(s) { if (s.devotion <= 20) { s.trust -= 5; } })>>
+		<</replace>>
+	<</link>>
 	<br><<link "Amputate the would-be escapee's limbs">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
@@ -20768,7 +20766,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<</replace>>
 	<<set $activeSlave.clothes = _clothesTemp>>
 	<<replace "#result">>
-		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thank<<s>>, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but girls everywhere love trying on new clothes. $He makes an entrance when $he comes back, spinning around to show off. $He's wearing the briefest possible string bikini. The top, rather than having patches of material to cover $his nipples, forms a string triangle around them, framing them but not covering them. The bottom is a single string in front, <<if $activeSlave.dick>>which looks rather sad and alone, pushed aside by $his dick as it is<<elseif $activeSlave.labia>>and it's embraced completely by $his generous pussylips<<else>>and it threatens to disappear inside $his pussylips<</if>>. "Thi<<s>> feel<<s>> <<s>>o hot, <<Master>>," $he <<say>>s, and
+		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thank<<s>>, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but <<= $girl>>s everywhere love trying on new clothes. $He makes an entrance when $he comes back, spinning around to show off. $He's wearing the briefest possible string bikini. The top, rather than having patches of material to cover $his nipples, forms a string triangle around them, framing them but not covering them. The bottom is a single string in front, <<if $activeSlave.dick>>which looks rather sad and alone, pushed aside by $his dick as it is<<elseif $activeSlave.labia>>and it's embraced completely by $his generous pussylips<<else>>and it threatens to disappear inside $his pussylips<</if>>. "Thi<<s>> feel<<s>> <<s>>o hot, <<Master>>," $he <<say>>s, and
 		<<if $activeSlave.fetishKnown && $activeSlave.fetish == "humiliation">>
 			blushes cutely. $He looks up at you, <<if canSee($activeSlave)>>sees<<else>>feels<</if>> the way you're staring at $him, and hangs $his head, blushing even harder.
 		<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "buttslut">>
@@ -20814,7 +20812,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<</replace>>
 	<<set $activeSlave.clothes = _clothesTemp>>
 	<<replace "#result">>
-		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thanks, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but girls everywhere love trying on new clothes. $He's wrong to be so enthusiastic. $He comes obediently back, wearing a set of cruelly uncomfortable leather straps in the general shape of a bikini, but much tighter and more restrictive. It isn't at all what $he was expecting, but $he did $his best to obey. $He's @@.gold;tightened $his own straps down@@ until they're just short of cutting off circulation, in an obvious effort to please you. You ask $him how $he likes $his outfit. "It'<<s>> ni<<c>>e, <<Master>>," $he <<say>>s, but $he sounds a little sad.
+		You tell $him that the wardrobe's sorting system will present $him with a new outfit, just for today. $He's to go try it on and come right back, to see how it fits. "Thanks, <<Master>>!" $he <<say>>s brightly, and hurries off to see what's in store for $him. $He might be a slave and a $desc but <<= $girl>>s everywhere love trying on new clothes. $He's wrong to be so enthusiastic. $He comes obediently back, wearing a set of cruelly uncomfortable leather straps in the general shape of a bikini, but much tighter and more restrictive. It isn't at all what $he was expecting, but $he did $his best to obey. $He's @@.gold;tightened $his own straps down@@ until they're just short of cutting off circulation, in an obvious effort to please you. You ask $him how $he likes $his outfit. "It'<<s>> ni<<c>>e, <<Master>>," $he <<say>>s, but $he sounds a little sad.
 		<<if $activeSlave.fetishKnown && $activeSlave.fetish == "humiliation">>
 			"I'm ju<<s>>t a worthle<<ss>> humiliation <<s>>lut. I love having <<s>>teel ring<<s>> around my hole<<s>> like thi<<s>>," $he adds.
 		<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "buttslut">>
-- 
GitLab