From bbabe25aeb87d7433f1efb7ee882060e148ac0e3 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 17 Aug 2018 19:23:50 -0400
Subject: [PATCH] more deafness work
---
devNotes/twine JS.txt | 18 +-
src/endWeek/saRest.tw | 2 +-
src/endWeek/saServant.tw | 2 +-
src/endWeek/saStayConfined.tw | 2 +-
src/js/eventSelectionJS.tw | 12 +-
src/uncategorized/RESS.tw | 232 ++++++++-------
src/uncategorized/arcologyDescription.tw | 14 +-
src/uncategorized/cellblockReport.tw | 6 +-
src/uncategorized/randomNonindividualEvent.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 265 ++++++++++++------
src/uncategorized/saServeThePublic.tw | 4 +-
src/uncategorized/saWhore.tw | 2 +-
src/uncategorized/slaveAssignmentsReport.tw | 3 +
13 files changed, 345 insertions(+), 219 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 008a587274c..69c07f0f635 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -5443,8 +5443,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if (eventSlave.bellyPreg >= 300000) {
- State.variables.RESSevent.push("hyperpreg stuck");
+ if(State.variables.PC.dick != 0) {
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
}
if(eventSlave.prestige == 0) {
@@ -6593,8 +6595,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if (eventSlave.bellyPreg >= 300000) {
- State.variables.RESSevent.push("hyperpreg stuck");
+ if(State.variables.PC.dick != 0) {
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
}
if(eventSlave.relationship == 4) {
@@ -10689,7 +10693,7 @@ window.saRest = function saRest(slave) {
if !(canHear(slave)) {
t += ` Since $he is deaf, the hustle and bustle of daily life in the penthouse <span class='green'>didn't bother $him at all.</span>`;
slave.health += 3;
- } else if (slave.hears == -1) {
+ } else if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs")) {
t += ` Since $he is hard of hearing, the hustle and bustle of daily life in the penthouse <span class='green'>didn't disturb $his rest as much.</span>`;
slave.health += 1;
}
@@ -10746,7 +10750,7 @@ window.saServant = function saServant(slave) {
if !(canHear(slave)) {
t += ` However, $his inability to hear often leaves him oblivious to ${V.Stewardess.slaveName}'s orders, limiting their meaningful interactions.`;
V.cash += (V.stewardessBonus/4);
- } else if (slave.hears == -1) {
+ } else if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs")) {
t += ` However, $he often doesn't catch what ${V.Stewardess.slaveName} says, leading to frustration, confusion and less work done.`;
V.cash += (V.stewardessBonus/2);
} else {
@@ -10863,7 +10867,7 @@ window.saStayConfined = function saStayConfined(slave) {
}
if (slave.assignment == "be confined in the cellblock") {
- if (slave.hears <= -1) {
+ if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs") || (slave.hears == -2)) {
t += ` $His hearing impairment spares $him the sounds of $his peers getting punished, lightening the impact of $his imprisonment.`
}
}
diff --git a/src/endWeek/saRest.tw b/src/endWeek/saRest.tw
index ab3efed807d..93354056529 100644
--- a/src/endWeek/saRest.tw
+++ b/src/endWeek/saRest.tw
@@ -27,7 +27,7 @@ window.saRest = function saRest(slave) {
if !(canHear(slave)) {
t += ` Since $he is deaf, the hustle and bustle of daily life in the penthouse <span class='green'>didn't bother $him at all.</span>`;
slave.health += 3;
- } else if (slave.hears == -1) {
+ } else if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs")) {
t += ` Since $he is hard of hearing, the hustle and bustle of daily life in the penthouse <span class='green'>didn't disturb $his rest as much.</span>`;
slave.health += 1;
}
diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw
index 24f668abf6d..ec0f95a8419 100644
--- a/src/endWeek/saServant.tw
+++ b/src/endWeek/saServant.tw
@@ -27,7 +27,7 @@ window.saServant = function saServant(slave) {
if !(canHear(slave)) {
t += ` However, $his inability to hear often leaves him oblivious to ${V.Stewardess.slaveName}'s orders, limiting their meaningful interactions.`;
V.cash += (V.stewardessBonus/4);
- } else if (slave.hears == -1) {
+ } else if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs")) {
t += ` However, $he often doesn't catch what ${V.Stewardess.slaveName} says, leading to frustration, confusion and less work done.`;
V.cash += (V.stewardessBonus/2);
} else {
diff --git a/src/endWeek/saStayConfined.tw b/src/endWeek/saStayConfined.tw
index 2d0b14d6774..43fc440c8ca 100644
--- a/src/endWeek/saStayConfined.tw
+++ b/src/endWeek/saStayConfined.tw
@@ -37,7 +37,7 @@ window.saStayConfined = function saStayConfined(slave) {
}
if (slave.assignment == "be confined in the cellblock") {
- if (slave.hears <= -1) {
+ if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs") || (slave.hears == -2)) {
t += ` $His hearing impairment spares $him the sounds of $his peers getting punished, lightening the impact of $his imprisonment.`
}
}
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index f1313d8b587..c2282fd3a72 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1753,8 +1753,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if (eventSlave.bellyPreg >= 300000) {
- State.variables.RESSevent.push("hyperpreg stuck");
+ if(State.variables.PC.dick != 0) {
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
}
if(eventSlave.prestige == 0) {
@@ -2903,8 +2905,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if (eventSlave.bellyPreg >= 300000) {
- State.variables.RESSevent.push("hyperpreg stuck");
+ if(State.variables.PC.dick != 0) {
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
}
if(eventSlave.relationship == 4) {
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 736362d314a..e2fc70a5b5b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -4146,73 +4146,72 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<case "hyperpreg stuck">>
-You are alerted to an issue regarding your
- <<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
- hyperbroodmother,
- <<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
- broodmother,
- <<else>>
- debilitatingly pregnant slave,
- <</if>>
-<<EventNameLink $activeSlave>>. It seems,
- <<if $pregAccessibility == 1>>
- despite updating your penthouse to accommodate bellies wider than a standard doorway,
- <<else>>
- since you have not yet updated your penthouse to accommodate bellies wider than standard doorways,
- <</if>>
-the poor slave has gotten lodged in the doorway exiting
- <<if ($activeSlave.livingRules == "luxurious")>>
- her room.
- <<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
- her suite.
- <<else>>
- the dormitory where she sleeps.
- <</if>>
+You are alerted to an issue regarding your
+<<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
+ hyperbroodmother,
+<<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
+ broodmother,
+<<else>>
+ debilitatingly pregnant slave,
+<</if>>
+<<EventNameLink $activeSlave>>. It seems
+<<if $pregAccessibility == 1 || $ballsAccessibility == 1 || $buttAccessibility == 1 || $boobAccessibility == 1>>
+ that, despite updating your penthouse to accommodate extra wide slaves,
+<<else>>
+ since you have not yet updated your penthouse to accommodate slaves of her girth,
+<</if>>
+the poor girl has gotten lodged in the doorway exiting
+<<if ($activeSlave.livingRules == "luxurious")>>
+ her room.
+<<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+ her suite.
+<<else>>
+ the dormitory where she sleeps.
+<</if>>
The menials assigned to care for her have been struggling for several weeks to fit her through this particular doorway, but refrained from informing you, as their ward
- <<if $activeSlave.devotion > 95>>
- did not wish to worry you.
- <<elseif $activeSlave.devotion > 50>>
- was concerned you would worry.
- <<elseif $activeSlave.devotion > 20>>
- was concerned how you would react.
- <<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
- feared how you would react.
- <<elseif ($activeSlave.trust < -50)>>
- was terrified of how you might respond.
- <<else>> argued you couldn't be trusted.
- <</if>>
+<<if $activeSlave.devotion > 95>>
+ did not wish to worry you.
+<<elseif $activeSlave.devotion > 50>>
+ was concerned you would worry.
+<<elseif $activeSlave.devotion > 20>>
+ was concerned how you would react.
+<<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
+ feared how you would react.
+<<elseif ($activeSlave.trust < -50)>>
+ was terrified of how you might respond.
+<<else>>
+ argued you couldn't be trusted.
+<</if>>
You make a mental note to punish her caretakers and then set out to see her predicament for yourself.
<br><br>
The sight that greets you when you arrive is equal parts incredible and amusing. En route to the baths, the slave attempted to exit
- <<if ($activeSlave.livingRules == "luxurious")>>
- her room
- <<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
- her suite
- <<else>>
- the dorm
- <</if>>
+<<if ($activeSlave.livingRules == "luxurious")>>
+ her room
+<<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+ her suite
+<<else>>
+ the dorm
+<</if>>
backwards and, as a result, you have a glorious view of her
- <<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
- mind boggling, room filling belly
- <<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
- massive, brood swollen belly
- <<else>>
- inhumanly pregnant belly
- <</if>>
+<<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
+ mind boggling, obscenely swollen belly
+<<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
+ massive, brood swollen belly
+<<else>>
+ inhumanly gravid belly
+<</if>>
squeezed painfully by the inadequate doorway and framing the attractive rear view of the rest of her body, including her
- <<if $activeSlave.butt > 5>>
- debilitatlingly huge ass cheeks.
- <<elseif $activeSlave.butt > 2>>
- plush ass.
- <<else>>
- cute little ass.
- <</if>>
+<<if $activeSlave.butt > 5>>
+ debilitatlingly huge ass cheeks.
+<<elseif $activeSlave.butt > 2>>
+ plush ass.
+<<else>>
+ cute little ass.
+<</if>>
<br><br>
She cranes her neck, glancing over her shoulder to give you a pleading look.
-
-
<<default>>
<br>ERROR: bad RESS event $RESSevent
<</switch>>
@@ -19959,49 +19958,63 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<link "Abuse her">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-You lean against a wall and take a moment to enjoy your slave's discomfort. Realizing that her <<Master>> is intent to do nothing, she blushes and begins pulling on her belly, attempting to free herself.
+ You lean against a wall and take a moment to enjoy your slave's discomfort. Realizing that her <<WrittenMaster>> is intending to do nothing, she blushes and begins pulling on her belly, attempting to free herself.
<<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
- Her innumerable brood are awakened by her exertions and begin to move, testing the thin walls of the womb constraining them and causing her belly to wobble ominously. You count the number of infant feet distinctly outlined against your poor hyperbroodmother's straining womb.
+ Her innumerable brood are awakened by her exertions and begin to move, testing the thin walls of the womb constraining them and causing her belly to throb ominously. You count the number of infants distinctly outlined against your poor hyperbroodmother's straining body.
<<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
- With a groan of effort, the broodmother manages to pull her belly slightly further out through the doorway, but, in the effort, only really manages to wedge it more firmly. It bulges ominously.
+ With a groan of effort, the broodmother manages to pull her belly slightly further out through the doorway, but, in the effort, only really manages to wedge it more firmly. It bulges ominously fromthe added pressure.
<<else>>
The massively pregnant slave's belly clutches in a false contraction and she pulls several inches further out through the doorframe before it expands again, leaving her even more hopelessly stuck
<</if>>
-<br><br>
+ <br><br>
<<if !canTalk($activeSlave)>>
She moans and rubs up and down what little she can reach of her belly while looking back at you with more urgency. It's clear she is in severe distress.
<<else>>
- "<<Master>>," she says through clenched teeth. "Please."
+ "<<Master>>," she says through clenched teeth. "Plea<<s>>e."
<</if>>
-<br><br>
-You judge that sufficient time has passed and move forward.
- <<if $activeSlave.butt > 5>>
+ <br><br>
+ You judge that you've seen enough and move forward.
+ <<if $activeSlave.butt > 10>>
Wading in between her huge ass cheeks
- <<elseif $activeSlave.butt > 2>>
+ <<elseif $activeSlave.butt > 4>>
Grabbing a handful of one generous ass cheek,
<<else>>
Slapping a pert ass cheek,
- <</if>>
-you hilt yourself in her pregnant pussy and begin pounding. Her belly distorts back and forth under your vigorous ministrations before, with a "pop," belly, slave, and owner go tumbling through the doorway. She yelps in @@.gold;shock@@ and @@.red;pain@@ as her belly smacks the ground and the sound of her voice, coupled with the feeling of jolting up and down on top of your slave's abused gut, sends you over the edge. You ejaculate into her fertile, wanting pussy and then slide off of her to instruct your servants to widen the door before they carry her to her duties for the day.
-<br>
-<<set $activeSlave.health -= 20, $activeSlave.trust -= 20>>
- <</replace>>
- <</link>>
-<br>
-
-<<link "Fuck her">>
+ <</if>>
+ <<if canDoVaginal($activeSlave)>>
+ you hilt yourself in her pregnant pussy and begin pounding.
+ <<= VaginalVCheck()>>
+ <<elseif canDoAnal($activeSlave)>>
+ you hilt yourself in her butthole and begin pounding.
+ <<= AnalVCheck()>>
+ <<else>>
+ you push them together around your cock and begin pounding.
+ <</if>>
+ Her stomach distorts back and forth under your vigorous ministrations before, with a "pop," belly, slave, and owner come tumbling through the threshold. She yelps in @@.gold;shock@@ and @@.red;pain@@ as her belly impacts the ground as the sound of her voice, coupled with the feeling of jolting up and down on top of your slave's abused gut, sends you over the edge. You ejaculate
+ <<if canDoVaginal($activeSlave)>>
+ into her fertile, wanting hole
+ <<elseif canDoAnal($activeSlave)>>
+ into her needy hole
+ <<else>>
+ across her back
+ <</if>>
+ and then slide off of her to instruct your servants to fix the doorframe before they carry her to her duties for the day.
+ <<set $activeSlave.health -= 20, $activeSlave.trust -= 20>>
+ <</replace>>
+<</link>>
+<br><<link "Fuck her">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-You can't help but be aroused by the sight of your swollen, helpless slave, and you take off your pants, revealing your erection. The slave's backward glance falls on your dick and she
+ You can't help but be aroused by the sight of your swollen, helpless slave, and you take off your pants, revealing your erection. The slave's <<if canSee($activeSlave)>>backward glance falls on your dick<<else>>ears perk up<</if>> and she
<<if $activeSlave.devotion > 95>>
licks her lips,
- <<if $activeSlave.amp == 1>>
- wiggling the stumps of her legs and swiveling her hips to give you a clear angle at her hungry pussy.
- <<else>>
- spreading her legs and revealing more of her massive underbelly while angling her wanting pussy at the perfect angle for fucking.
- <</if>>
+ <<if $activeSlave.amp == 1>>
+ wiggling the stumps of her legs and swiveling her hips to give you a clear angle at her hungry <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
+ <<else>>
+ spreading her legs and revealing more of her massive underbelly while angling her wanting <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>> at the perfect angle for fucking.
+ <</if>>
<<elseif $activeSlave.devotion > 50>>
- blushes, swiveling her hips to give you easy access to her pussy.
+ blushes, swiveling her hips to give you easy access to her <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
<<elseif $activeSlave.devotion > 20>>
blushes and leans into her belly, knowing what to expect.
<<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
@@ -20009,17 +20022,17 @@ You can't help but be aroused by the sight of your swollen, helpless slave, and
<<elseif ($activeSlave.trust < -50)>>
yelps, turning away from you and clenching her eyes shut as her
<<if $activeSlave.amp == 1>>
- stumps push toward each other, clearly trying (and failing) to conceal her pussy.
+ stumps push toward each other, clearly trying (and failing) to conceal her <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
<<else>>
- legs instinctively clench together to hide her pussy.
+ legs instinctively clench together to hide her <<if canDoVaginal($activeSlave)>>pussy<<else>>ass<</if>>.
<</if>>
<<else>>
- snorts dersively despite her helplessness.
+ snorts dersively despite her vulnerability.
<</if>>
-<br><br>
-You step forward and run an appreciative hand over the surface of her belly. Her womb is packed so full that the outline of her squirming children is obvious under her stretched-thin flesh. She groans at your touch, clearly in some distress, and you promise her that you'll free her once you've finished up.
+ <br><br>
+ You step forward and run an appreciative hand over the surface of her belly. Her womb is packed so full that the outline of her squirming children is obvious under her stretched-thin flesh. She groans at your touch, clearly in some distress, and you promise her that you'll free her once you've finished up.
<<if $activeSlave.devotion > 95>>
- The slave is clearly too aroused by your touch to hear what you're saying and leans back into you, stretching against her tortured belly to nibble at your ear.
+ The slave is clearly too aroused by your fondling to hear what you're saying and leans back into you, stretching against her tortured belly to nibble at your ear.
<<elseif $activeSlave.devotion > 50>>
The slave says nothing, but wiggles her ass against your hips, making it clear she's ready.
<<elseif $activeSlave.devotion > 20>>
@@ -20030,31 +20043,38 @@ You step forward and run an appreciative hand over the surface of her belly. Her
The shock of contact with your body causes the terrified slave's skin to contract, as if she's trying to pull away despite her current reality, and her only response to your promise is sobbing.
<<else>>
The slave
- <<if !canTalk($activeSlave)>>
- motions for you to
- <<else>>
- responds by telling you to
- <</if>>
+ <<if !canTalk($activeSlave)>>
+ motions for you to
+ <<else>>
+ responds by telling you to
+ <</if>>
just fuck her already and let her move on with her day.
<</if>>
-You let your hand wander downward and then push down on the base of her clit with finger and thumb, making her whimper, before removing your hand and burying your cock inside her. As you fuck her, her poor, tortured belly wobbles against the constraining door frame and the frame itself groans in protest.
-She grinds in rhythm to your pistoning until the back and forth movement of her sloshing tummy overpowers her efforts and sends her careening back and forth between its oceanic movements and your less than tender ministrations. The sensation of fucking a woman who is literally a slave to the motion of her own womb drives you over the edge and you pull out, ejaculating all over her
- <<if $activeSlave.butt > 5>>
+ You let your hand wander downward
+ <<if canDoVaginal($activeSlave)>>
+ and then push down on the base of her clit with finger and thumb, making her whimper, before removing your hand and burying your cock inside her.
+ <<= VaginalVCheck()>>
+ <<elseif canDoAnal($activeSlave)>>
+ and circle her anus with a finger, making her whimper, before removing your hand and burying your cock inside her.
+ <<= AnalVCheck()>>
+ <<else>>
+ and trace the edge of her chastity with a finger, making her whimper, before removing your hand and sqeezing her rear around your cock.
+ <</if>>
+ As you fuck her, her poor, tortured belly wobbles against the constraining door frame and the frame itself groans in protest. She grinds in rhythm to your pistoning until the back and forth movement of her sloshing tummy overpowers her efforts and sends her careening back and forth between its oceanic movements and your less than tender ministrations. The sensation of fucking a woman who is literally a slave to the motion of her own womb drives you over the edge and you pull out, ejaculating all over her
+ <<if $activeSlave.butt > 10>>
enveloping ass cleavage.
- <<elseif $activeSlave.butt > 2>>
+ <<elseif $activeSlave.butt > 4>>
fat, waiting ass cheeks.
<<else>>
pert ass.
<</if>>
-<br><br>
-You step back, taking one last appreciatively look at your trapped slave, then call a team of menials to remove the door from its foundation to free her, instructing them to also continually widen the door as necessary to attempt to prevent future incidents. Though your slave is extracated uninjured, your decision to use her before saving her leaves the slave @@.gold;trusting you less@@.
-<br>
-<<set $activeSlave.health -= 10, $activeSlave.trust -= 10>>
- <</replace>>
-
- <</link>>
-<br>
-<<link "Try the "Butter Strategy"">>
+ <br><br>
+ You step back, taking one last appreciatively look at your trapped slave, then call a team of menials to remove the door from its foundation to free her. Though your slave is extracated uninjured, your decision to use her before saving her leaves the girl @@.gold;trusting you less@@. You could pay to have the door widened, but then you wouldn't get this opportunity again, would you?
+ <br>
+ <<set $activeSlave.health -= 10, $activeSlave.trust -= 10>>
+ <</replace>>
+<</link>>
+<br><<link "Try the "Butter Strategy"">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You ponder her predicament for a moment before settling on a solution. You procure an industrial sized jar of curative laced moisturizing butter--specially formulated to ease the strain of hypermassive pregnancy--and explain to your slave that, to free her, you're going to need to completely cover her in it so that she can squeeze through.
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index 3fdf290edb5..98b593ec9a4 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -329,12 +329,14 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<else>>
some are augmented by implants.
<</if>>
- <<if $clubAdsPreg == 1>>
- Most of strippers have firm, rounded bellies.
- <<elseif $clubAdsPreg == -1>>
- Most of the strippers have firm, flat bellies.
- <<else>>
- Some of the strippers are pregnant.
+ <<if $seePreg == 1>>
+ <<if $clubAdsPreg == 1>>
+ Most of strippers have firm, rounded bellies.
+ <<elseif $clubAdsPreg == -1>>
+ Most of the strippers have firm, flat bellies.
+ <<else>>
+ Some of the strippers are pregnant.
+ <</if>>
<</if>>
<<if $clubAdsModded == 1>>
Everything is heavily pierced and tattooed.
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 1e6d20e6211..e2f44a10981 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -180,10 +180,10 @@
<<set $i = $slaveIndices[$CellBiIDs[_dI]]>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -20)>>
- <<if $slaves[$i].hears > -1>>
- <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
- <<else>>
+ <<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2))>>
<<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 2>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
<</if>>
<<else>>
<<set $slaves[$i].devotion++>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index cf600114b62..d891ba2decd 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -474,7 +474,7 @@
<<if canSee($Concubine)>>
<<set $PESSevent.push("loving concubine")>>
<</if>>
- <<if canTalk($Concubine)>>
+ <<if canTalk($Concubine) && canHear($Concubine)>>
<<set $events.push("PE concubine interview")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 0003380eebf..ee9d20306a0 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4860,7 +4860,11 @@
<<if (random(1,500) > 500+$slaves[$i].devotion)>>
<<set _effect = random(1,6)>>
Being so angry at $his life as a sex slave has
- <<set _givingAttention = $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
+ <<if Array.isArray($personalAttention)>>
+ <<set _givingAttention = $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
+ <<else>>
+ <<set _givingAttention = -1>>
+ <</if>>
<<if _givingAttention != -1 && ["look after her", "soften her behavioral flaw", "soften her sexual flaw", "build her devotion", "Teach her"].includes($personalAttention[_givingAttention].trainingRegimen)>>
forced $him to face $his problems with you. Lending $him support makes it @@.hotpink;a little more tolerable.@@
<<elseif _effect == 1>>
@@ -5773,101 +5777,190 @@
<</if>>
<</if>>
-<<if $slaves[$i].fuckdoll == 0>>
- <<if $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].eyes != 0>>
- <<if $slaves[$i].eyes == -2>>
+<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<set _visionFlag = 0>>
+ <<if $slaves[$i].eyes == -2>>
+ <<if $slaves[$i].hears == -2>>
+ <<if $slaves[$i].devotion > 50>>
+ Even though $he is blind and deaf, $he is devoted enough to you to allow $himself to lower $his guard. $He becomes @@.mediumaquamarine;trusting@@ of your ability to keep $him safe.
+ <<set $slaves[$i].trust += 5>>
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's blind, deaf and on the cusp of devotion, $he becomes @@.hotpink;more reliant@@ on you, but also begins to be @@.mediumaquamarine;less fearful@@ of the world around $him.
+ <<set $slaves[$i].devotion += 5, $slaves[$i].trust += 3>>
+ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
+ $He may be blind and deaf, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you.
+ <<set $slaves[$i].trust += 2>>
+ <<elseif $slaves[$i].devotion > -20>>
+ $His blindness and deafness forces $him to @@.hotpink;entirely rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he has only the smell of arousal to warn of an impending threat.
+ <<set $slaves[$i].devotion += 10, $slaves[$i].trust -= 30>>
+ <<else>>
+ Being blind and deaf forces $him to @@.hotpink;completely rely@@ on your mercy. It does nothing to stem @@.gold;the horror@@ $he faces being unable to sense the world around $him.
+ <<set $slaves[$i].devotion += 20, $slaves[$i].trust -= 50>>
+ <</if>>
+ <<elseif ($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs")>>
+ <<if $slaves[$i].devotion > 50>>
+ Even though $he is blind and unable to properly hear, $he is devoted enough to you to allow $himself to lower $his guard. $He becomes @@.mediumaquamarine;trusting@@ of your ability to keep $him safe.
+ <<set $slaves[$i].trust += 4>>
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's blind, hard of hearing and on the cusp of devotion, $he becomes @@.hotpink;more reliant@@ on you, but also begins to be @@.mediumaquamarine;less fearful@@ of the world around $him.
+ <<set $slaves[$i].devotion += 4, $slaves[$i].trust += 2>>
+ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
+ $He may be blind and hard of hearing, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you.
+ <<set $slaves[$i].trust += 2>>
+ <<elseif $slaves[$i].devotion > -20>>
+ $His blindness and trouble hearing forces $him to @@.hotpink;rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he strains to hear anything potential threats to $him.
+ <<set $slaves[$i].devotion += 7, $slaves[$i].trust -= 20>>
+ <<else>>
+ Being blind and hard of hearing forces $him to @@.hotpink;rely@@ on your mercy. It does nothing to stem @@.gold;the terrible sounds@@ $he struggles to hear.
+ <<set $slaves[$i].devotion += 10, $slaves[$i].trust -= 25>>
+ <</if>>
+ <<else>>
+ <<if $slaves[$i].devotion > 50>>
+ Even though $he is blind, $he is devoted enough to you to allow $himself to lower $his guard. $He becomes @@.mediumaquamarine;trusting@@ of your ability to keep $him safe.
+ <<set $slaves[$i].trust += 3>>
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's blind and on the cusp of devotion, $he becomes slightly @@.hotpink;more reliant@@, but also begins to be @@.mediumaquamarine;less fearful@@ of what $he can't see.
+ <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 1>>
+ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
+ $He may be blind, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you.
+ <<set $slaves[$i].trust += 2>>
+ <<elseif $slaves[$i].devotion > -20>>
+ $His blindness forces $him to @@.hotpink;rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he has severely limited capabilities to defend $himself.
+ <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 10>>
+ <<else>>
+ Being blind forces $him to @@.hotpink;completely rely@@ on your mercy. It does nothing to stem @@.gold;the terror@@ $he faces constantly being unable to tell what will happen to $him.
+ <<set $slaves[$i].devotion += 10, $slaves[$i].trust -= 25>>
+ <</if>>
+ <</if>>
+ <<set _visionFlag = -2>>
+ <<elseif $slaves[$i].eyes == -1>>
+ <<if ($slaves[$i].eyewear != "corrective glasses") && ($slaves[$i].eyewear != "corrective contacts")>>
+ <<if $slaves[$i].devotion > 50>>
+ $His vision may be clouded but it doesn't get in the way of $his devotion to you.
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's on the cusp of devotion, $his blurred vision makes $him @@.hotpink;slightly more submissive,@@ since $he can't always see what's happening to $him.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
+ $His blurred vision @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his fuzzy vision allows $him to ignore the details of everyone $he's expected to fuck.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $His blurred vision tends to make $him @@.gold;a little more fearful,@@ since $he can never tell what's about to happen to $him.
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<set _visionFlag = -1>>
+ <</if>>
+ <<elseif $slaves[$i].eyes == 1>>
+ <<if ($slaves[$i].eyewear == "blurring glasses") || ($slaves[$i].eyewear == "blurring contacts")>>
+ <<if $slaves[$i].devotion > 50>>
+ $He tolerates the annoyance of blurred vision induced by $his eyewear.
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's on the cusp of devotion, the blurred vision induced by $his eyewear actually makes $him @@.hotpink;slightly more submissive.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
+ The blurred vision induced by $his eyewear actually @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his fuzzy vision allows $him to ignore the details of everyone $he's expected to fuck.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ The blurred vision induced by $his eyewear actually @@.mediumorchid;infuriates $him.@@
+ <<set $slaves[$i].devotion -= 1>>
+ <</if>>
+ <<set _visionFlag = -1>>
+ <</if>>
+ <</if>>
+ <<if _visionFlag == -1>>
+ <<if $slaves[$i].hears == -2>>
+ <<if $slaves[$i].devotion > 50>>
+ Since $he is also deaf, $he begins to @@.mediumaquamarine;rely@@ on you to give $him the feedback $his body does can not.
+ <<set $slaves[$i].trust += 3>>
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he is also deaf, $he becomes @@.hotpink;very reliant@@ on you, but also begins to @@.mediumaquamarine;trust@@ you to convery what $his body does not.
+ <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
+ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
+ Since $he is also deaf, $he views you as $his @@.mediumaquamarine;blurry guardian.@@
+ <<set $slaves[$i].trust += 5>>
+ <<elseif $slaves[$i].devotion > -20>>
+ Since $he is also deaf, $he @@.gold;descends into paranoia@@ as every blurry shape could be out to get $him.
+ <<set $slaves[$i].trust -= 20>>
+ <<else>>
+ Since $he is also deaf, $he @@.gold;delves into the depths of paranoia@@ as every blurry shape could be out to get $him. $He becomes increasingly @@.mediumorchid;hateful@@ to those around $him in an effort to ward off threats.
+ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 10>>
+ <</if>>
+ <<elseif $slaves[$i].hears == -1>>
+ <<if ($slaves[$i].earwear != "hearing aids")>>
<<if $slaves[$i].devotion > 50>>
- Even though $he is blind, $he is devoted enough to you to allow $himself to lower $his guard. $He becomes @@.mediumaquamarine;trusting@@ of your ability to keep $him safe.
- <<set $slaves[$i].trust += 3>>
+ $His hearing may be muddled too, but $he doesn't let it bother $him.
<<elseif $slaves[$i].devotion > 20>>
- Since $he's blind and on the cusp of devotion, $he becomes slightly @@.hotpink;more reliant@@, but also begins to be @@.mediumaquamarine;less fearful@@ of what $he can't see.
- <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 1>>
- <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
- $He may be blind, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you.
- <<set $slaves[$i].trust += 2>>
- <<elseif $slaves[$i].devotion > -20>>
- $His blindness forces $him to @@.hotpink;rely@@ on your mercy. However, it only @@.gold;amplifies $his fear@@ as $he has severely limited capabilities to defend $himself.
- <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 10>>
+ Since $he is also hard of hearing, $he is forced into @@.hotpink;very submissive state,@@ though @@.gold;worrying thoughts@@ begin to plague his mind.
+ <<set $slaves[$i].devotion += 3, $slaves[$i].trust -= 3>>
+ <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
+ Since $he is also hard of hearing, $he has a hard time understanding what partners want from $him, often causing them to @@.gold;get forceful@@ with $him.
+ <<set $slaves[$i].trust -= 5>>
<<else>>
- Being blind forces $him to @@.hotpink;completely rely@@ on your mercy. It does nothing to stem @@.gold;the terror@@ $he faces constantly being unable to tell what will happen to $him.
- <<set $slaves[$i].devotion += 10, $slaves[$i].trust -= 25>>
- <</if>>
- <<elseif $slaves[$i].eyes == -1>>
- <<if ($slaves[$i].eyewear != "corrective glasses") && ($slaves[$i].eyewear != "corrective contacts")>>
- <<if $slaves[$i].devotion > 50>>
- <<elseif $slaves[$i].devotion > 20>>
- Since $he's on the cusp of devotion, $his blurred vision makes $him @@.hotpink;slightly more submissive,@@ since $he can't always see what's happening to $him.
- <<set $slaves[$i].devotion += 1>>
- <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
- $His blurred vision @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his fuzzy vision allows $him to ignore the details of everyone $he's expected to fuck.
- <<set $slaves[$i].devotion += 1>>
- <<else>>
- $His blurred vision tends to make $him @@.mediumorchid;a little more fearful,@@ since $he can never tell what's about to happen to $him.
- <<set $slaves[$i].trust -= 1>>
- <</if>>
- <</if>>
- <<elseif $slaves[$i].eyes == 1>>
- <<if ($slaves[$i].eyewear == "blurring glasses") || ($slaves[$i].eyewear == "blurring contacts")>>
- <<if $slaves[$i].devotion > 50>>
- $He tolerates the annoyance of blurred vision induced by $his eyewear.
- <<elseif $slaves[$i].devotion > 20>>
- Since $he's on the cusp of devotion, the blurred vision induced by $his eyewear actually makes $him @@.hotpink;slightly more submissive.@@
- <<set $slaves[$i].devotion += 1>>
- <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
- The blurred vision induced by $his eyewear actually @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his fuzzy vision allows $him to ignore the details of everyone $he's expected to fuck.
- <<set $slaves[$i].devotion += 1>>
- <<else>>
- The blurred vision induced by $his eyewear actually @@.mediumorchid;infuriates $him.@@
- <<set $slaves[$i].devotion -= 1>>
- <</if>>
+ Since $he is also hard of hearing, @@.gold;$he becomes incresingly paranoid@@ since $he can barely discern other's intent any more.
+ <<set $slaves[$i].trust -= 5>>
<</if>>
<</if>>
- <<if $slaves[$i].hears == -2>>
+ <<elseif $slaves[$i].hears == 0>>
+ <<if ($slaves[$i].earwear == "muffling ear plugs")>>
<<if $slaves[$i].devotion > 50>>
- Even though $he is deaf, $he is devoted enough to you to allow $himself to lower $his guard. $He becomes @@.mediumaquamarine;trusting@@ of your ability to keep $him safe.
- <<set $slaves[$i].trust += 3>>
+ $He tolerates the annoyance of muffled hearing induced by $his ear plugs.
<<elseif $slaves[$i].devotion > 20>>
- Since $he's deaf and on the cusp of devotion, $he becomes slightly @@.hotpink;more reliant@@, but also begins to be @@.mediumaquamarine;less fearful@@ of what $he can't hear.
- <<set $slaves[$i].devotion += 3, $slaves[$i].trust += 1>>
- <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
- $He may be deaf, but $he knows nobody would dare harm $him under your watch, @@.mediumaquamarine;building $his trust@@ in you.
- <<set $slaves[$i].trust += 2>>
- <<elseif $slaves[$i].devotion > -20>>
- $His deafness forces $him to @@.hotpink;rely@@ on your kindness. However, it only @@.gold;amplifies $his discomfort@@ as $he has notably limited capabilities to defend $himself.
- <<set $slaves[$i].devotion += 5, $slaves[$i].trust -= 10>>
+ Since $his hearing is also muffled, $he is forced into @@.hotpink;very submissive state,@@ though @@.gold;worrying thoughts@@ begin to plague his mind.
+ <<set $slaves[$i].devotion += 3, $slaves[$i].trust -= 3>>
+ <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
+ Since $his hearing is also muffled, $he has a hard time understanding what partners want from $him, often causing them to @@.gold;get forceful@@ with $him.
+ <<set $slaves[$i].trust -= 5>>
<<else>>
- Being deaf forces $him to @@.hotpink;completely rely@@ on your kindness. It does nothing to stem @@.gold;the fear@@ $he faces constantly being unable to tell what anyone is saying.
- <<set $slaves[$i].devotion += 10, $slaves[$i].trust -= 25>>
+ The muffled hearing induced by $his ear plugs @@.mediumorchid;infuriates him@@ with $his vision problems.
+ <<set $slaves[$i].devotion -= 5>>
<</if>>
- <<elseif $slaves[$i].hears == -1>>
- <<if ($slaves[$i].earwear != "hearing aids")>>
- <<if $slaves[$i].devotion > 50>>
- <<elseif $slaves[$i].devotion > 20>>
- Since $he's on the cusp of devotion, $his muffled hearing makes $him @@.hotpink;slightly more submissive,@@ since $he can't always hear what's going on around $him.
- <<set $slaves[$i].devotion += 1>>
- <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
- $His muffled hearing @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his impaired hearing allows $him to ignore the disgusting comments from everyone around $him.
- <<set $slaves[$i].devotion += 1>>
- <<else>>
- $His muffled hearing tends to make $him @@.mediumorchid;a little more fearful,@@ since $he can never tell what people are saying about $him.
- <<set $slaves[$i].trust -= 1>>
- <</if>>
+ <</if>>
+ <</if>>
+ <<elseif _visionFlag != -2>>
+ <<if $slaves[$i].hears == -2>>
+ <<if $slaves[$i].devotion > 50>>
+ Even though $he is deaf, $he is devoted enough to you to allow $himself to lower $his guard. $He becomes @@.mediumaquamarine;trusting@@ of your ability to watch $his back.
+ <<set $slaves[$i].trust += 1>>
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's deaf and on the cusp of devotion, $he becomes slightly @@.hotpink;more reliant@@, but also begins to be @@.mediumaquamarine;less fearful@@ of what is lurking out of sight.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+ <<elseif ["please you", "be your Concubine", "serve in the master suite"].includes($slaves[$i].assignment)>>
+ $He may be deaf, but no one can sneak up on $him while $he is with you, @@.mediumaquamarine;developing the trust@@ that you have $his back.
+ <<set $slaves[$i].trust += 2>>
+ <<elseif $slaves[$i].devotion > -20>>
+ $His deafness forces $him to @@.gold;distrust everyone@@ as everything out of sight is a potential threat to $him.
+ <<set $slaves[$i].trust -= 10>>
+ <<else>>
+ Being deaf forces $him to @@.gold;fear@@ everything he can't see. At any moment, something could jump on $his back and force $him into position.
+ <<set $slaves[$i].trust -= 25>>
+ <</if>>
+ <<elseif $slaves[$i].hears == -1>>
+ <<if ($slaves[$i].earwear != "hearing aids")>>
+ <<if $slaves[$i].devotion > 50>>
+ $His hearing may be muddled but it doesn't get in the way of $his devotion to you.
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's on the cusp of devotion, $his muffled hearing makes $him @@.hotpink;slightly more submissive,@@ since $he can't always hear what's going on around $him.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
+ $His muffled hearing @@.mediumorchid;reduces $his distaste for $his life slightly,@@ since $his impaired hearing allows $him to ignore the disgusting comments from everyone around $him.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $His muffled hearing tends to make $him @@.mediumorchid;a little more fearful,@@ since $he can never tell what people are saying about $him.
+ <<set $slaves[$i].trust -= 1>>
<</if>>
- <<elseif $slaves[$i].hears == 0>>
- <<if ($slaves[$i].earwear == "muffling ear plugs")>>
- <<if $slaves[$i].devotion > 50>>
- $He tolerates the annoyance of muffled hearing induced by $his ear plugs.
- <<elseif $slaves[$i].devotion > 20>>
- Since $he's on the cusp of devotion, the muffled hearing induced by $his ear plugs actually makes $him @@.hotpink;slightly more submissive.@@
- <<set $slaves[$i].devotion += 1>>
- <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
- The muffled hearing induced by $his ear plugs actually @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his impaired hearing allows $him to ignore the disgusting comments from everyone around $him.
- <<set $slaves[$i].devotion += 1>>
- <<else>>
- The muffled hearing induced by $his ear plugs @@.mediumorchid;irritates $him.@@
- <<set $slaves[$i].devotion -= 1>>
- <</if>>
+ <</if>>
+ <<elseif $slaves[$i].hears == 0>>
+ <<if ($slaves[$i].earwear == "muffling ear plugs")>>
+ <<if $slaves[$i].devotion > 50>>
+ $He tolerates the annoyance of muffled hearing induced by $his ear plugs.
+ <<elseif $slaves[$i].devotion > 20>>
+ Since $he's on the cusp of devotion, the muffled hearing induced by $his ear plugs actually makes $him @@.hotpink;slightly more submissive.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
+ The muffled hearing induced by $his ear plugs actually @@.hotpink;reduces $his distaste for $his life slightly,@@ since $his impaired hearing allows $him to ignore the disgusting comments from everyone around $him.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ The muffled hearing induced by $his ear plugs @@.mediumorchid;irritates $him.@@
+ <<set $slaves[$i].devotion -= 1>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 37e043b195d..f7d1776ca28 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -172,7 +172,7 @@ the public.
<</if>>
<</if>>
<</if>>
- <<if $slaves[$i].hears <= -1>>
+ <<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2))>>
$His inability to move to the rhythm of the music is very off putting to those looking to party.
<<set $beautyMultiplier -= 0.15>>
<</if>>
@@ -554,7 +554,7 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<<set $beauty -= 1>>
<</if>>
-<<if $slaves[$i].hears <= -1>>
+<<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2))>>
$His trouble hearing causes $him to miss potential partners.
<<if !canHear($slaves[$i])>>
<<set $beauty *= .5>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index c1e887b8949..f89ed810c09 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -472,7 +472,7 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<<set $beauty -= 1>>
<</if>>
-<<if $slaves[$i].hears <= -1 && $slaves[$i].assignment == "whore">>
+<<if (($slaves[$i].hears == -1 && $slaves[$i].earwear != "hearing aids") || ($slaves[$i].hears == 0 && $slaves[$i].earwear == "muffling ear plugs") ||($slaves[$i].hears == -2)) && $slaves[$i].assignment == "whore">>
$His trouble hearing causes $him to often not recognize $he's being picked up, missing out on partners.
<<if !canHear($slaves[$i])>>
<<set $beauty *= .75>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 54ff0778e5f..f4a37d17e04 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -301,6 +301,9 @@
<<if !canWalk($Lurcher)>>
''__@@.pink;$Lurcher.slaveName@@__'' is no longer able to run @@.yellow;and cannot course as a lurcher.@@<br>
<<set $Lurcher = 0>>
+ <<elseif !canHear($Lurcher) && !canSee($Lurcher)>>
+ ''__@@.pink;$Lurcher.slaveName@@__'' is no longer able to track the hares @@.yellow;and cannot course as a lurcher.@@<br>
+ <<set $Lurcher = 0>>
<<elseif $Lurcher.bellyPreg >= 60000>>
''__@@.pink;$Lurcher.slaveName@@__'' is too pregnant to run @@.yellow;and cannot course as a lurcher.@@
<<set $Lurcher = 0>>
--
GitLab