diff --git a/src/endWeek/saRules.js b/src/endWeek/saRules.js
index 613fe3323af9b2733781f0a966afdf1a96f8c0c6..53a9b7c64ae9239e2e12c52247b663051c2f1f0b 100644
--- a/src/endWeek/saRules.js
+++ b/src/endWeek/saRules.js
@@ -60,7 +60,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Madam":
slave.need -= (App.Entity.facilities.brothel.employeesIDs().size * 10);
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (App.Utils.hasNonassignmentSex(slave)) {
@@ -300,7 +300,7 @@ App.SlaveAssignment.rules = function(slave) {
break;
case "be the DJ":
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (App.Utils.hasNonassignmentSex(slave)) {
@@ -499,7 +499,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Nurse":
slave.need -= (V.flSex.size * 3);
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (App.Utils.hasNonassignmentSex(slave)) {
@@ -561,11 +561,11 @@ App.SlaveAssignment.rules = function(slave) {
break;
case "get treatment in the clinic":
if (slave.devotion < -50) {
- r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else {
let _partner = App.EndWeek.getClinicPartner(slave);
@@ -602,14 +602,12 @@ App.SlaveAssignment.rules = function(slave) {
seX(_partner.slave, "oral", slave, "penetrative", 14);
break;
case "family":
- r.push(`is well-loved by ${his} family; this week, ${his}`);
- relativeTerm(slave, _partner.slave);
- r.push(`<span class="lightgreen">_partner.${slave.slaveName}</span> pays special attention to ${him}, making sure ${his} sexual needs are met.`);
+ r.push(`is well-loved by ${his} family; this week, ${his} ${relativeTerm(slave, _partner.slave)} <span class="lightgreen">${_partner.slave.slaveName}</span> pays special attention to ${him}, making sure ${his} sexual needs are met.`);
slave.need = 0;
seX(_partner.slave, "oral", slave, "penetrative", 7);
break;
case "friend":
- r.push(`is friends with <span class="lightgreen">_partner.${slave.slaveName},</span> who comes to visit ${him} regularly. ${His} sexual frustration from being confined to the clinic shows, and${_partner.slave.slaveName} often winds up helping ${him} get relief.`);
+ r.push(`is friends with <span class="lightgreen">${_partner.slave.slaveName},</span> who comes to visit ${him} regularly. ${His} sexual frustration from being confined to the clinic shows, and${_partner.slave.slaveName} often winds up helping ${him} get relief.`);
if (_partner.slave.rules.relationship === "permissive" && slave.rules.relationship === "permissive") {
r.push(`They have <span class="lightgreen">become lovers.</span>`);
slave.relationship = 3;
@@ -649,10 +647,7 @@ App.SlaveAssignment.rules = function(slave) {
if (!hasAnyArms(slave)) {
r.push(`imagination`);
} else {
- r.push(`hand`);
- if (hasBothArms(slave)) {
- r.push(`s`);
- }
+ r.push(`${(hasBothArms(slave)) ? `hands` : `hand`}.`);
}
r.push(`and toys, but <span class="mediumaquamarine">understands you care about ${his} current health.</span>`);
slave.trust += 1;
@@ -845,7 +840,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Wardeness":
slave.need -= (V.flSex.size * 5);
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
r.push(`gets off at work, so ${he} doesn't feel the need for release that often.`);
@@ -1028,7 +1023,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Attendant":
slave.need -= (V.flSex.size * 3);
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (App.Utils.hasNonassignmentSex(slave)) {
@@ -1047,7 +1042,7 @@ App.SlaveAssignment.rules = function(slave) {
if (!hasAnyArms(slave)) {
r.push(`figurative`);
}
- r.push(`${(hasBothArms(slave))?`hands`:`hand`}.`);
+ r.push(`${(hasBothArms(slave)) ? `hands` : `hand`}.`);
slave.devotion += 1;
slave.trust += 1;
r.push(`${He} finds plenty of time to relax between ${his} duties, or during them, should ${his} company be requested.`);
@@ -1237,7 +1232,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Matron":
slave.need -= (V.flSex.size * 3);
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (_release.masturbation === 0) {
@@ -1254,7 +1249,7 @@ App.SlaveAssignment.rules = function(slave) {
if (!hasAnyArms(slave)) {
r.push(`figurative`);
}
- r.push(`${(hasBothArms(slave))?`hands`:`hand`}.`);
+ r.push(`${(hasBothArms(slave)) ? `hands` : `hand`}.`);
slave.devotion += 1;
slave.trust += 1;
@@ -1433,7 +1428,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Schoolteacher":
slave.need -= (V.flSex.size * 10);
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (_release.masturbation === 0) {
@@ -1450,7 +1445,7 @@ App.SlaveAssignment.rules = function(slave) {
if (!hasAnyArms(slave)) {
r.push(`figurative`);
}
- r.push(`${(hasBothArms(slave))?`hands`:`hand`}.`);
+ r.push(`${(hasBothArms(slave)) ? `hands` : `hand`}.`);
slave.devotion += 1;
slave.trust += 1;
r.push(`It also helps to offset the tiring nature of ${his} position.`);
@@ -1600,7 +1595,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Stewardess":
slave.need -= _L.servantsQuarters * 10;
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (_release.masturbation === 0) {
@@ -1864,7 +1859,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Milkmaid":
slave.need -= _L.dairy * 5;
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (_release.masturbation === 0) {
@@ -1934,10 +1929,10 @@ App.SlaveAssignment.rules = function(slave) {
}
} else {
if (slave.devotion < -50) {
- r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (slave.devotion <= 20) {
@@ -2166,7 +2161,7 @@ App.SlaveAssignment.rules = function(slave) {
case "be the Farmer":
slave.need -= _L.farmyard * 5;
if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (_release.masturbation === 0) {
@@ -2226,10 +2221,10 @@ App.SlaveAssignment.rules = function(slave) {
break;
case "work as a farmhand":
if (slave.devotion < -50) {
- r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (slave.devotion <= 20) {
@@ -2579,10 +2574,10 @@ App.SlaveAssignment.rules = function(slave) {
break;
default:
if (slave.devotion < -50) {
- r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is so unhappy that ${he} has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.energy <= 20) {
- r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave))?`, making the rule restricting ${his} sexual outlets superfluous`:``}.`);
+ r.push(`is frigid and has little interest in getting off${(App.Utils.releaseRestricted(slave)) ? `, making the rule restricting ${his} sexual outlets superfluous` : ``}.`);
slave.need = 0;
} else if (slave.need < slave.needCap * 0.5) {
if (slave.devotion <= 20) {