diff --git a/src/endWeek/saRelationships.js b/src/endWeek/saRelationships.js
index d75075061407c5ad0c3c6c6240224c58f845c942..04b5ed52796c27e2001e1f777f0377f37c41f743 100644
--- a/src/endWeek/saRelationships.js
+++ b/src/endWeek/saRelationships.js
@@ -921,9 +921,9 @@ App.SlaveAssignment.relationships = (function() {
r.push(`${His} feelings about carrying ${his} ${relationType}'s child${slave.pregType > 1 ? "ren" : ""} are <span class="devotion inc">secretly less mixed,</span> though.`);
slave.devotion += 1;
} else if (slave.devotion > 95) {
- if (slave.fetish === "pregnancy" && slave.fetishKnown && slave.fetishStrength > 65) {
- r.push(`${He} occasionally remembers that ${he}'s carrying ${his} ${relationType}'s ${slave.pregType > 1 ? `children` : `child`}, but ${his} fetish for all things pregnancy is so strong it makes ${him} all the more devoted to you.`);
- slave.devotion +=2;
+ if (slave.sexualQuirk === "breeder") {
+ r.push(`${He} occasionally remembers that ${he}'s carrying ${his} ${relationType}'s ${slave.pregType > 1 ? `children` : `child`}, but ${his} fetish for all things pregnancy is so strong it makes ${him} <span class="devotion inc">all the more devoted to you.</span>`);
+ slave.devotion += 2;
} else {
r.push(`${He} occasionally remembers that ${he}'s carrying ${his} ${relationType}'s ${slave.pregType > 1 ? `children` : `child`}, but does ${his} best to accept it by not thinking about it.`);
}
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 754bf6d7933d4315fb4b25aa81594f74ad9e5af1..c8ed0ec1c9457c73d445d1f0f46b0d0a4383c238 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -322,7 +322,7 @@ App.SlaveAssignment.serveThePublic = (function() {
} else {
r += ` It gets tiring `;
if (hasBothLegs(slave)) {
- r += `dancing and fucking all day, `; // TODO: or dancing all day and fucking all night?
+ r += `dancing and fucking all day, `;
} else {
r += `being a popular slut, `;
}
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index 719067f630a2e4c63a730ca0bfe2db6fd8c22e26..482b300508135547f3bfa7ccd95c36c2ff064308 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -411,71 +411,45 @@ App.Desc.ageAndHealth = function(slave) {
if (H.shortDamage > 5 || H.longDamage > 5 || H.condition < 0) {
r += ` Upon closer inspection you note that ${he}`;
- // TODO: find a better way to clean this mess up
array = [];
if (H.shortDamage >= 100) {
- array.push(`looks <span class="red">absolutely brutalized</span> and will never be quite the way ${he} was${
- H.longDamage < 70 &&
- (H.condition > -80 ||
- H.shortDamage === 0 ||
- H.longDamage === 0) ?
- `.` : ``}`);
+ array.push(`looks <span class="red">absolutely brutalized</span> and will never be quite the way ${he} was`);
} else if (H.shortDamage >= 70) {
- array.push(`is <span class="red">gravely injured</span> with assured lasting effects${
- H.longDamage < 70 &&
- (H.condition > -80 ||
- H.shortDamage === 0 ||
- H.longDamage === 0) ?
- `.` : ``}`);
+ array.push(`is <span class="red">gravely injured</span> with assured lasting effects`);
} else if (H.shortDamage >= 40) {
- array.push(`is <span class="red">seriously injured</span> with some lasting effects${
- H.longDamage < 70 &&
- (H.condition > -80 ||
- H.shortDamage === 0 ||
- H.longDamage === 0) ?
- `.` : ``}`);
+ array.push(`is <span class="red">seriously injured</span> with some lasting effects`);
} else if (H.shortDamage >= 20) {
- array.push(`is <span class="orange">injured${
- H.longDamage < 70 &&
- (H.condition > -80 ||
- H.shortDamage === 0 ||
- H.longDamage === 0) ?
- `.` : ``}</span>`);
+ array.push(`is <span class="orange">injured`);
} else if (H.shortDamage > 5) {
- array.push(`seems to have suffered a <span class="yellow">minor injury</span> recently${
- H.longDamage < 70 &&
- (H.condition > -80 ||
- H.shortDamage === 0 ||
- H.longDamage === 0) ?
- `.` : ``}`);
+ array.push(`seems to have suffered a <span class="yellow">minor injury</span> recently`);
}
if (H.longDamage >= 70) {
- array.push(`is suffering heavily under accumulated <span class="red">permanent health problems${H.condition > -80 || H.shortDamage === 0 || H.longDamage === 0 ? `.` : ``}</span>`);
+ array.push(`is suffering heavily under accumulated <span class="red">permanent health problems`);
} else if (H.longDamage >= 40) {
- array.push(`has some clear <span class="red">permanent health issues${H.condition > -80 || H.shortDamage === 0 || H.longDamage === 0 ? `.` : ``}</span>`);
+ array.push(`has some clear <span class="red">permanent health issues`);
} else if (H.longDamage >= 20) {
- array.push(`shows signs of <span class="orange">lasting health problems${H.condition > -80 || H.shortDamage === 0 || H.longDamage === 0 ? `.` : ``}</span>`);
+ array.push(`shows signs of <span class="orange">lasting health problems`);
} else if (H.longDamage > 5) {
- array.push(`carries some <span class="yellow">minor niggles${H.condition > -80 || H.shortDamage === 0 || H.longDamage === 0 ? `.` : ``}</span>`);
+ array.push(`carries some <span class="yellow">minor niggles`);
}
if (H.condition < -80 && H.shortDamage !== 0 && H.longDamage !== 0) {
- array.push(`has been treated so badly ${he} <span class="red">is close to the brink.</span>`);
+ array.push(`has been treated so badly ${he} <span class="red">is close to the brink`);
} else if (H.condition < -50) {
- array.push(`appears to be in <span class="red">terrible condition.</span>`);
+ array.push(`appears to be in <span class="red">terrible condition`);
} else if (H.condition < -20) {
- array.push(`appears to be in <span class="orange">poor condition.</span>`);
+ array.push(`appears to be in <span class="orange">poor condition`);
} else if (H.condition < 0) {
- array.push('could be in <span class="yellow">better condition.</span>');
+ array.push('could be in <span class="yellow">better condition');
}
if (array.length === 3) {
- r += (` ${array[0]}, ${array[1]} and ${array[2]}`);
+ r += (` ${array[0]}, ${array[1]} and ${array[2]}.</span>`);
} else if (array.length === 2) {
- r += (` ${array[0]} and ${array[1]}`);
+ r += (` ${array[0]} and ${array[1]}.</span>`);
} else if (array.length === 1) {
- r += (` ${array[0]}`);
+ r += (` ${array[0]}.</span>`);
}
}
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index a3d451cce276158b882128d44f2c2e536df7d34d..7d75b6a30e2ee9b5e1d17693bbf097e6c1dff7b0 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -325,7 +325,7 @@ App.Desc.longSlave = function(slave = V.activeSlave, {market = 0, eventDescripti
// Fresult
App.UI.DOM.appendNewElement("span", p, `sexual score `, ["lightcoral", "bold"]);
App.UI.DOM.appendNewElement("span", p, `of `, ["lightcoral"]);
- p.append(`${FResultTooltip(slave)}.`);
+ p.append(FResultTooltip(slave), App.UI.DOM.makeElement("span", `.`, ["lightcoral"]));
}
el.appendChild(p);
diff --git a/src/npc/interaction/fLickPussy.tw b/src/npc/interaction/fLickPussy.tw
index 7302f23ef101a078348174c5ccfe5bc564bdfcfe..6b7fb4df12ad755e88eb25035292e71da6ab7b71 100644
--- a/src/npc/interaction/fLickPussy.tw
+++ b/src/npc/interaction/fLickPussy.tw
@@ -20,7 +20,7 @@
You have <<= getSlave($AS).slaveName>> brought into your office and placed on your couch.
<</if>>
-After $he is situated, you go over to $him<<if getSlave($AS).clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to <<if canTalk(getSlave($AS))>>give a shriek of surprise<<else>>shudder in surprise<</if>>. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a <<if canTalk(getSlave($AS))>>soft<<else>>silent<</if>> moan from $him. The combination of the pleasure and the intense look from <<if $AS.father == $PC.ID || $AS.mother == $PC.ID || $PC.mother == $AS.ID || $PC.father == $AS.ID>>$his <<=relativeTerm($PC, $AS)>><<else>>the _womanP $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= getWrittenTitle(getSlave($AS))>><<else>> hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up.
+After $he is situated, you go over to $him<<if getSlave($AS).clothes != "no clothing">> and take off $his clothing, causing $him to <<if _devotion > 50>>give you a soft smile<<else>>give you an angry glare<</if>><</if>>. You suddenly grab $his hips and pull $his crotch to your face, causing $him to <<if canTalk(getSlave($AS))>>give a shriek of surprise<<else>>shudder in surprise<</if>>. Looking at $him directly in the eyes, you begin to run your tongue along $his labia, drawing a <<if canTalk(getSlave($AS))>>soft<<else>>silent<</if>> moan from $him. The combination of the pleasure and the intense look from <<if areRelated(getSlave($AS), $PC)>>$his <<=relativeTerm($PC, $AS)>><<else>>the _womanP $he<<if _devotion > 95>> loves <<elseif _devotion > 50>>'s accepted as $his <<= getWrittenTitle(getSlave($AS))>><<else>> hates/*not sure what to use for "reluctant"*/<</if>> makes $him blush, but you don't let up.
<<if getSlave($AS).dick == 0>>
You give $his clit a few experimental tweaks, causing $his <<if canTalk(getSlave($AS))>>moans<<else>>squirming<</if>> to intensify<<if hasBothLegs(getSlave($AS))>> and $his legs to tighten around your head<</if>>.
<</if>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 7a7a880a38c31f0dead72a267dba51f4c30ed2cc..d4c61a5b43368113f1ae198400d4d5398c060b60 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -367,7 +367,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<br>
<<link "It can wait until after some lovemaking with the Concubine">>
<<replace "#result">>
- When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he <<if hasAnyArms($activeSlave)>>spreads $his arm<<if hasBothArms($activeSlave)>>s<</if>><<else>>presents $himself<</if>> for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave) && hasAnyArms($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<elseif canTalk($activeSlave)>><<say>>ing, "<<=capFirstChar(<<Master>>)>>, I love you."<<else>>giving you a sultry look<</if>>
+ When you enter your suite, the dim light reveals $activeSlave.slaveName waiting with $his beautiful body laid across the bed. When $he <<if canSee($activeSlave)>>sees<<else>>figures out<</if>> the kind of lovemaking you're in the mood for, $he <<if hasAnyArms($activeSlave)>>spreads $his arm<<if hasBothArms($activeSlave)>>s<</if>><<else>>presents $himself<</if>> for you, smiling gently. $He kisses you lovingly, <<if !canTalk($activeSlave) && hasAnyArms($activeSlave)>>taking your hand in $hers and drawing a heart on your palm with one finger.<<elseif canTalk($activeSlave)>><<say>>ing, "<<= capFirstChar($enunciate.title)>>, I love you."<<else>>giving you a sultry look<</if>>
<<if ($PC.vagina != -1)>>
$He lies on $his side <<if hasBothLegs($activeSlave)>>and raises one leg for you so you can straddle the other<<elseif !hasAnyLegs($activeSlave)>>wiggles $his hips<<else>>motions for you to straddle $his leg<</if>>, sliding up to press your pussy against $his submissive groin. You grind against $him; the stimulation is so strong that $he writhes into the sheets, panting and whining.
<<if $PC.dick != 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 0b063804999303a489bc2c47ee33f22811131a46..0cf72b8a1e0945bf9f2af6b42aed5e62a1d97a97 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1521,7 +1521,7 @@ into your bedroom and stands before you submissively. Since $he's allowed to ask
<<else>>
$he says meekly,
<</if>>
- "<<=capFirstChar(<<Master>>)>>, would you plea<<s>>e fuck me?"
+ "<<=capFirstChar($enunciate.title)>>, would you plea<<s>>e fuck me?"
<</if>>
@@ -2879,7 +2879,7 @@ $he <<if canSee($activeSlave)>>looks up to find $himself gazing into your eyes<<
<br><br>
-Opportunities for gallantry didn't use to fall into your lap like this, but with a harem of busy sex slaves living and working in close proximity, they're common. For $his part, $activeSlave.slaveName doesn't seem to mind acting out a bad romantic comedy. $He shows no sign of getting back to $his own feet, and nuzzles $his $activeSlave.skin cheek against your
+Opportunities for gallantry didn't use to fall into your lap like this, but with a harem of busy sex slaves living and working in close proximity, they're common. For $his part, $activeSlave.slaveName doesn't seem to mind acting out bad romantic comedy. $He shows no sign of getting back to $his own feet, and nuzzles $his $activeSlave.skin cheek against your
<<if $PC.belly >= 10000>>
taut middle,
<<elseif $PC.boobs >= 300>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index af99baca7c42140404a2b556680c670bea0c330c..7ae79f08ef5722cbcad3dca74aa76b5cc3e8c684 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1915,7 +1915,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
$subSlave.slaveName is a seasoned sex slave but that doesn't stop _him2 from blushing a little at such a blunt suggestion. "Okay," _he2 says, biting _his2 <<if $activeSlave.lips > 40>>absurdly generous<<elseif $activeSlave.lips > 10>>full<<else>>thin<</if>> lower lip cutely. "I wa<<s>> actually going to <<s>>ay ye<<s>> anyway, but it'<<s>> really ni<<c>>e to have <<s>>omeone like you a<<s>>k me for it like that. I'm <<s>>orry I made you beg."
<br><br>
<<run Enunciate($activeSlave)>>
- "Don't care!" <<say>>s $activeSlave.slaveName exultantly, and grabs $his conquest, planting a lusty kiss on $subSlave.slaveName's giggling mouth and <<if _vaginal>>rubbing $his erection against $subSlave.slaveName's<<if $subSlave.labia > 0>> puffy<</if>> pussylips<<else>>reaching around $subSlave.slaveName to start teasing _his2 asshole<</if>>. "Don't care, a<<s>> long a<<s>> I get to fuck your <<if _vaginal>>hot cunt<<else>>beautiful a<<ss>><</if>>!" Your work here is done, and once $he's done blowing $his load inside $subSlave.slaveName<<if !_vaginal>>'s anus<<elseif $subSlave.fetish == "cumslut">>'s throat<</if>>, $activeSlave.slaveName should remember to be @@.mediumaquamarine;grateful@@ to you for the reminder on how to seduce
+ "Don't care!" <<say>>s $activeSlave.slaveName exultantly, and grabs $his conquest, planting a lusty kiss on $subSlave.slaveName's giggling mouth and <<if _vaginal>>rubbing $his erection against $subSlave.slaveName's<<if $subSlave.labia > 0>> puffy<</if>> pussylips<<else>>reaching around $subSlave.slaveName to start teasing _his2 asshole<</if>>. "Don't care, a<<s>> long a<<s>> I get to fuck your <<if _vaginal>>hot cunt<<else>>beautiful a<<ss>><</if>>!" Your work here is done, and once $he's done blowing $his load inside $subSlave.slaveName<<if !_vaginal>>'s anus<</if>>, $activeSlave.slaveName should remember to be @@.mediumaquamarine;grateful@@ to you for the reminder on how to seduce
<<switch $subSlave.fetish>>
<<case "submissive">>coquettish subs.
<<case "cumslut">>tired cumsluts.