From 7cf38ddacc5d799304ca8bb8ab29043b116e6b83 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 20 Jun 2019 19:35:45 -0500
Subject: [PATCH] FixAndOthers
---
src/js/generateMarketSlave.js | 8 +++++++-
src/pregmod/killSlave.tw | 2 +-
src/uncategorized/RESS.tw | 12 ++++++------
src/uncategorized/brothelReport.tw | 2 +-
src/uncategorized/dairyReport.tw | 2 +-
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index e1c8c8226f6..8c835955a95 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -845,7 +845,13 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
}
}
if (V.arcologies[market].FSRomanRevivalist > 20) {
- r += `They've often seen things that drive any squeamishness out of them. `;
+ r += `They've often `;
+ if (!canSee(V.activeSlave)) {
+ r += `been party to`;
+ } else {
+ r += `seen`;
+ }
+ r += ` things that drive any squeamishness out of them. `;
V.activeSlave.slaveName = setup.romanSlaveNames.random();
if (jsRandom(0, 1) === 0) {
V.activeSlave.sexualQuirk = "unflinching";
diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index 721aa6bf02a..d58098bd4c5 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -79,7 +79,7 @@
<<else>>
$He simply nods, not being able to see
<</if>>
-you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull out your trusty _weapon<<if $activeSlave.fuckdoll <= 0 || !canSee($activeSlave)>><<if $activeSlave.fetish != "mindbroken">>, at which point abject fear fills $his face. $He immediately <<if canWalk($activeSlave)>>drops to $his knees and <</if>>begins openly begging for you to have mercy.<<else>>, to which $he still doesn't respond.<</if>><<else>>.<</if>>
+you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull out your trusty _weapon<<if $activeSlave.fuckdoll <= 0 && canSee($activeSlave)>><<if $activeSlave.fetish != "mindbroken">>, at which point abject fear fills $his face. $He immediately <<if canWalk($activeSlave)>>drops to $his knees and <</if>>begins openly begging for you to have mercy.<<else>>, to which $he still doesn't respond.<</if>><<else>>.<</if>>
<<if $killChoice == -1>>
<br>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index b1a2ebeea8a..10a8d622070 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -7377,7 +7377,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
You squirm as $he slips into your tight pussy. While $his length may be disappointing, $he stands no chance of stretching you out.
<</if>>
<<else>>
- You have to check to see if $he's even in your tight rear, only to find $he is already fully hilted. You sigh as $he thrusts into you; no prostate stimulation today.
+ You have to check to see if $he's even in your tight rear, only to find $he is already fully hilted. You sigh as $he thrusts into you: no prostate stimulation today.
<</if>>
<<elseif $activeSlave.dick == 2>>
<<if $PC.vagina == 1>>
@@ -11969,7 +11969,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<setNonlocalPronouns $seeDicks>>
- You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes this is a sort of recitation of $his service for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.counter.anal times." You announce that $activeSlave.counter.anal isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored _girlU and tell $him to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen _girlU pulls $activeSlave.slaveName's hips up a little and
+ You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes <<if canHear($activeSlave)>>this is a sort of recitation of $his service<<else>>what $assistantName is detailing<</if>> for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.eyeColor($activeSlave)>> eyes glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.counter.anal times." You announce that $activeSlave.counter.anal isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored _girlU and tell _himU to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen _girlU pulls $activeSlave.slaveName's hips up a little and
<<if $activeSlave.butt > 18>>
struggles into $his immense butt.
<<elseif $activeSlave.butt > 10>>
@@ -17019,7 +17019,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Talk $him through it">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You put as much quiet authority into your voice as you can, and explain to $him that $he must eat $his breakfast this way. You do not explain any of the actual reasons why you require slaves to eat from cocks, but couch your quiet explanation in terms of $his life as a slave. You tell $him that eating breakfast out of a dick is something you've ordered $him to do. $He needs to do it. If $he does, $he'll be treated well; if $he does not, that will oblige you to punish $him. You tell $him that you would like $him to be a good slave, and that it would be disappointing if you had to punish $him. You put just a hint of steel into the last sentence, and $he stiffens a little at it. Hesitantly, $he scoots forward and bends down to take the tip of the big feeder dick in $his mouth. Sensing that it's being sucked, it gently presses into $his mouth, fucking $his <<if $activeSlave.lips > 95>>big-lipped facepussy<<else>>face<</if>>. Its strokes get longer and faster, until $he's gulping down $his breakfast as it's shot down $his throat like a huge load.
+ You put as much quiet authority into your <<if canHear($activeSlave)>>voice<<else>>words<</if>> as you can, and explain to $him that $he must eat $his breakfast this way. You do not explain any of the actual reasons why you require slaves to eat from cocks, but couch your quiet explanation in terms of $his life as a slave. You tell $him that eating breakfast out of a dick is something you've ordered $him to do. $He needs to do it. If $he does, $he'll be treated well; if $he does not, that will oblige you to punish $him. You tell $him that you would like $him to be a good slave, and that it would be disappointing if you had to punish $him. You put just a hint of steel into the last sentence, and $he stiffens a little at it. Hesitantly, $he scoots forward and bends down to take the tip of the big feeder dick in $his mouth. Sensing that it's being sucked, it gently presses into $his mouth, fucking $his <<if $activeSlave.lips > 95>>big-lipped facepussy<<else>>face<</if>>. Its strokes get longer and faster, until $he's gulping down $his breakfast as it's shot down $his throat like a huge load.
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>By this time, the kitchen is also dosing $him with drugs by fucking $his butt with a phallus that ejaculates them for absorption. $He's being spitroasted by the kitchen.<</if>>
Once $he's fully awake, $he's mostly @@.mediumaquamarine;relieved@@ that you let $him get away with hesitation about obedience and took the time to talk $him through it.
<<set $activeSlave.trust += 4>>
@@ -17028,7 +17028,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Punish $him with a bigger feeder">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You give the kitchen an order by voice command. It's technical, so $he doesn't understand it, but the meaning becomes clear soon enough. The phallus dangling in $his face is withdrawn, and $he's halfway through a shocked thank you when it's replaced by another, noticeably larger<<if !canSee($activeSlave)>>. $He doesn't notice its larger size until it bumps into $his cheek, causing $him to scoot back<</if>>. You tell $him in deceptively mild tones that you'll keep increasing the size of $his feeder until $he decides to suck it off like a good little $desc, or you run out of size options and are forced to strap $him down and push them down $his throat. At that point, $he might be able to breathe; then again, $he might not. $He begins to cry, $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face clouding with anguish, but is so @@.gold;frightened@@ by the threat that $he doesn't let $him tears distract $him from scooting forward to suck off a huge dildo for $his breakfast.
+ You give the kitchen an order by voice command. <<if canHear($activeSlave)>>It's technical<<else>>$He can't hear it<</if>>, so $he doesn't understand it, but the meaning becomes clear soon enough. The phallus dangling in $his face is withdrawn, and $he's halfway through a shocked "Thank you" when it's replaced by another, noticeably larger one<<if !canSee($activeSlave)>>. $He doesn't notice its larger size until it bumps into $his cheek, causing $him to scoot back<</if>>. You tell $him in deceptively mild <<if canHear($activeSlave)>>tones<<else>>words<</if>> that you'll keep increasing the size of $his feeder until $he decides to suck it off like a good little $desc, or you run out of size options and are forced to strap $him down and push them down $his throat. At that point, $he might be able to breathe; then again, $he might not. $He begins to cry, $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face clouding with anguish, but is so @@.gold;frightened@@ by the threat that $he doesn't let $him tears distract $him from scooting forward to suck off a huge dildo for $his breakfast.
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>Once it senses $he's complying, the kitchen starts dosing $him with drugs by fucking $his butt with a phallus that ejaculates them for absorption. Mercifully, $he doesn't try to refuse the anal fuckmachine, and avoids having $his asshole filled by a bigger phallus too.<</if>>
$He keeps the threat in mind, and has a slightly sore throat to @@.hotpink;help $him remember to obey without question.@@
<<set $activeSlave.trust -= 2, $activeSlave.devotion += 2>>
@@ -17037,7 +17037,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Double penetrate $his mouth for insolence">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a voice of brass. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.eyeColor($activeSlave)>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick == 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
+ You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a <<if canHear($activeSlave)>>voice of brass<<else>>commanding manner<</if>>. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.eyeColor($activeSlave)>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick == 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
<<set $activeSlave.trust -= 4, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
@@ -17046,7 +17046,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Force-feed $him with your own cock">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You step forward and pull $him away from the feeder, telling $him that, since $he doesn't like the cockfeeder, $he can suck yours like a good little $desc. You make no threat, but order $him in a steely voice to suck you off until $he's earned a meal of your cum. $He knows what you can do to $him, and hurries forward to obey. $He rushes to open your clothes and get to work, but pauses when <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor($activeSlave)>> eyes take in your massive testicles.<<else>>$his groping hand feels your massive testicles.<</if>> Realizing just how big $his meal will be, $he's obviously @@.gold;frightened.@@ You grab $his head, breaking $him out of $his shocked stillness, and explain that you can't let $him starve. If $he won't eat out of the feeder, you'll just have to feed $him some other way. With that, you ram your cock forward and start fucking $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face. After a few minutes of gagging oral, you start to approach your climax. Your thorough facefucking leaves $him unable to beg or even moan, but $his eyes widen in terror when $he realizes you're about to cum. You don't give $him any time to prepare, instead hilting yourself immediately, and letting $his throat's desperate attempts to swallow bring you over the edge. You begin your long release of pent-up jizz, spraying deciliter after deciliter of cum down $his throat and into $his stomach. By the time you've finished, you can tell $he's struggling for air and in pain from the massive quantity of thick fluid in $his stomach. You give $him a helpful hint before releasing $him: "If you take it all the way in your throat, you don't even have to <<if canTaste($activeSlave)>>taste<<else>>feel<</if>> what it's feeding you." You pull out of $his mouth and let $him go. $He gasps for air and almost immediately vomits some of your cum all over $himself, turning $him into a degraded, humiliated mess. $He lays on the floor and desperately concentrates on breathing, squeezing the tears out of $his eyes to run down $his $activeSlave.skin cheeks.
+ You step forward and pull $him away from the feeder, telling $him that, since $he doesn't like the cockfeeder, $he can suck yours like a good little $desc. You make no threat, but order $him <<if canHear($activeSlave)>>in a steely voice<<else>>authoritatively<</if>> to suck you off until $he's earned a meal of your cum. $He knows what you can do to $him, and hurries forward to obey. $He rushes to open your clothes and get to work, but pauses when <<if canSee($activeSlave)>>$his <<= App.Desc.eyeColor($activeSlave)>> eyes take in your massive testicles.<<else>>$his groping hand feels your massive testicles.<</if>> Realizing just how big $his meal will be, $he's obviously @@.gold;frightened.@@ You grab $his head, breaking $him out of $his shocked stillness, and explain that you can't let $him starve. If $he won't eat out of the feeder, you'll just have to feed $him some other way. With that, you ram your cock forward and start fucking $his <<if $activeSlave.face > 95>>heartbreakingly beautiful<<elseif $activeSlave.face > 10>>pretty<<else>>homely<</if>> face. After a few minutes of gagging oral, you start to approach your climax. Your thorough facefucking leaves $him unable to beg or even moan, but $his eyes widen in terror when $he realizes you're about to cum. You don't give $him any time to prepare, instead hilting yourself immediately, and letting $his throat's desperate attempts to swallow bring you over the edge. You begin your long release of pent-up jizz, spraying deciliter after deciliter of cum down $his throat and into $his stomach. By the time you've finished, you can tell $he's struggling for air and in pain from the massive quantity of thick fluid in $his stomach. You give $him a helpful hint before releasing $him: "If you take it all the way in your throat, you don't even have to <<if canTaste($activeSlave)>>taste<<else>>feel<</if>> what it's feeding you." You pull out of $his mouth and let $him go. $He gasps for air and almost immediately vomits some of your cum all over $himself, turning $him into a degraded, humiliated mess. $He lays on the floor and desperately concentrates on breathing, squeezing the tears out of $his eyes to run down $his $activeSlave.skin cheeks.
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
<<set $activeSlave.trust -= 2, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 887041cbec0..f0e61b69cef 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -165,7 +165,7 @@
$He shows off $slaves[$i].slaveName's copious loads by putting a condom over _his2 dick and teasing _him2 till _he2 bursts it. The show draws multiple clients that want to play with _his2 oversized junk and messy orgasms.
<<set $madamCashBonus += 0.15>>
<<else>>
- $He would love to show off $slaves[$i].slaveName's copious loads, but $slaves[$i].slaveName<<if $slaves[$i].dick == 0>> doesn't have a dick.<<elseif $slaves[$i].balls == 0>>'s not producing cum. <<else>>'s orgasms just aren't messy enough. <</if>>
+ $He would love to show off $slaves[$i].slaveName's copious loads, but $slaves[$i].slaveName<<if $slaves[$i].dick == 0>> doesn't have a dick<<elseif $slaves[$i].balls == 0>>'s not producing cum<<else>>'s orgasms just aren't messy enough<</if>>.
<</if>>
<</if>>
<<elseif $slaves[$i].prestigeDesc == "$He is remembered for winning best in show as a breeder.">>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 5e5f4c29aa9..dca55f0d7ce 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -255,7 +255,7 @@
$He spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. $He can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<<else>>
- $He is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>>
+ $He is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum<<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate<<else>>'s balls are considerably smaller than at their heyday<</if>>.
<</if>>
<</if>>
<<if $slaves[$i].prestigeDesc == "$He is remembered for winning best in show as a breeder." && $slaves[$i].bellyPreg >= 1500>>
--
GitLab