diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js
index 1ed19b9469201145a2ca09a7fadca1b164a22df8..4d6d974973d9445e3c01d6f9912345bc7881c670 100644
--- a/src/endWeek/reports/cellblockReport.js
+++ b/src/endWeek/reports/cellblockReport.js
@@ -6,15 +6,15 @@ App.EndWeek.cellblockReport = function() {
let r;
const slaves = App.Utils.sortedEmployees(App.Entity.facilities.cellblock);
- const _DL = slaves.length;
- let _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalus = 0, _FLsFetish = 0, _devBonus;
+ const DL = slaves.length;
+ let brokenSlaves = 0, idleBonus = 0, softenedQuirks = 0, trustMalus = 0, FLsFetish = 0, devBonus;
if (V.cellblockDecoration !== "standard") {
- _devBonus = 1;
+ devBonus = 1;
} else {
- _devBonus = 0;
+ devBonus = 0;
}
- const _cellblockNameCaps = capFirstChar(V.cellblockName);
+ const cellblockNameCaps = capFirstChar(V.cellblockName);
V.flSex = App.EndWeek.getFLSex(App.Entity.facilities.cellblock);/* FIXME: should be local, passed as a parameter to saRules */
if (S.Wardeness) {
@@ -36,7 +36,7 @@ App.EndWeek.cellblockReport = function() {
if (S.Wardeness.devotion <= 60) {
S.Wardeness.devotion += 2;
}
- S.Wardeness.devotion += _devBonus;
+ S.Wardeness.devotion += devBonus;
if (S.Wardeness.trust < 60) {
S.Wardeness.trust += 3;
}
@@ -49,45 +49,45 @@ App.EndWeek.cellblockReport = function() {
if (S.Wardeness.fetishStrength <= 95) {
if (S.Wardeness.fetish !== "sadist") {
if (fetishChangeChance(S.Wardeness) > random(0, 100)) {
- _FLsFetish = 1;
+ FLsFetish = 1;
S.Wardeness.fetishKnown = 1;
S.Wardeness.fetish = "sadist";
}
} else if (S.Wardeness.fetishKnown === 0) {
- _FLsFetish = 1;
+ FLsFetish = 1;
S.Wardeness.fetishKnown = 1;
} else {
- _FLsFetish = 2;
+ FLsFetish = 2;
S.Wardeness.fetishStrength += 4;
}
}
if (S.Wardeness.energy > 95 || S.Wardeness.fetish === "sadist") {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
}
//
r.push(`${SlaveFullName(S.Wardeness)} is serving as the Wardeness.`);
if (S.Wardeness.relationship === -3 && S.Wardeness.devotion > 50) {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
r.push(`As your ${wife}, ${he} tries ${his} best to break the disobedient slaves to your will.`);
}
- if (_FLsFetish === 1) {
+ if (FLsFetish === 1) {
r.push(`One day ${he} demands obedience. The next day ${he} strikes a slave when it isn't given. The next, ${he} seems more excited than embarrassed when beating a prisoner. Soon, ${he}'s looking for an excuse to punish. ${He}'s <span class="pink">become more of a sadist.</span>`);
- } else if (_FLsFetish === 2) {
+ } else if (FLsFetish === 2) {
r.push(`Being not only allowed but encouraged to get off while punishing prisoners <span class="lightsalmon">deepens ${his} sadism.</span>`);
}
if (setup.wardenessCareers.includes(S.Wardeness.career)) {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
r.push(`${He} has experience with detecting security issues and grinding down potential miscreants from ${his} life before ${he} was a slave, making ${him} more effective.`);
} else if (S.Wardeness.skill.wardeness >= V.masteredXP) {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
r.push(`${He} has experience with detecting security issues and grinding down potential miscreants from working for you, making ${him} more effective.`);
} else {
S.Wardeness.skill.wardeness += random(1, Math.ceil((S.Wardeness.intelligence + S.Wardeness.intelligenceImplant) / 15) + 8);
@@ -98,32 +98,32 @@ App.EndWeek.cellblockReport = function() {
r.push(`${He} is so sexually depraved that ${he} constantly molests the prisoners, breaking them to a life of servitude.`);
}
if (S.Wardeness.sexualFlaw === "malicious" || S.Wardeness.sexualFlaw === "abusive") {
- _devBonus++;
- _trustMalus += 2;
- _idleBonus += 2;
+ devBonus++;
+ trustMalus += 2;
+ idleBonus += 2;
r.push(`Sexual abuse of prisoners has become an end for ${him}, not a means. ${He} inspires ${his} prisoners to do everything possible to qualify to get away from ${him}, even as ${he} slowly grinds away their interest in sex to do it.`);
} else if (S.Wardeness.sexualQuirk === "caring") {
- _devBonus--;
- _trustMalus--;
- _idleBonus--;
+ devBonus--;
+ trustMalus--;
+ idleBonus--;
r.push(`${His} kindness sometimes shows through ${his} tough facade, letting prisoners get off easier than they should.`);
}
if (S.Wardeness.dick > 2 && canPenetrate(S.Wardeness)) {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
r.push(`${His} molestation of the prisoners is more varied and effective because ${he} has a dick to fuck them with.`);
}
if (S.Wardeness.muscles > 35) {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
r.push(`${He} is strong enough to restrain anyone that tries anything with ${his} own hands.`);
}
if (S.Wardeness.devotion > 95) {
- _devBonus++;
- _trustMalus++;
- _idleBonus++;
+ devBonus++;
+ trustMalus++;
+ idleBonus++;
r.push(`${His} devotion to you is so absolute that ${he} sees breaking bitches for your service as a noble calling.`);
}
App.Events.addNode(el, r, "div", "indent");
@@ -156,18 +156,18 @@ App.EndWeek.cellblockReport = function() {
}
App.Events.addNode(el, r, "div", "indent");
}
- if (_DL < V.cellblock && !slaveResting(S.Wardeness)) {
- const _seed = random(1, 10) + ((V.cellblock - _DL) * (random(150, 170) + (_idleBonus * 10)));
- cashX(_seed, "cellblock", S.Wardeness);
- App.Events.addNode(el, [`Since ${he} doesn't have enough prisoners to manage to keep ${him} busy, ${he} works on citizens' slaves, earning <span class="yellowgreen"> ${cashFormat(_seed)}.</span>`], "div", "indent");
+ if (DL < V.cellblock && !slaveResting(S.Wardeness)) {
+ const seed = random(1, 10) + ((V.cellblock - DL) * (random(150, 170) + (idleBonus * 10)));
+ cashX(seed, "cellblock", S.Wardeness);
+ App.Events.addNode(el, [`Since ${he} doesn't have enough prisoners to manage to keep ${him} busy, ${he} works on citizens' slaves, earning <span class="yellowgreen"> ${cashFormat(seed)}.</span>`], "div", "indent");
}
}
- if (_DL > 0) {
- if (_DL === 1) {
+ if (DL > 0) {
+ if (DL === 1) {
App.UI.DOM.appendNewElement("div", el, `One slave is being confined in ${V.cellblockName} until they are willing to obey.`, "indent");
} else {
- App.UI.DOM.appendNewElement("div", el, `${_DL} slaves are being confined in ${V.cellblockName} until they are willing to obey.`, "indent");
+ App.UI.DOM.appendNewElement("div", el, `${DL} slaves are being confined in ${V.cellblockName} until they are willing to obey.`, "indent");
}
}
@@ -272,15 +272,15 @@ App.EndWeek.cellblockReport = function() {
if (slave.behavioralFlaw !== "none" && slave.behavioralQuirk === "none") {
SoftenBehavioralFlaw(slave);
slave.devotion -= 10;
- _softenedQuirks++;
+ softenedQuirks++;
} else if (slave.sexualFlaw !== "none" && slave.sexualQuirk === "none") {
SoftenSexualFlaw(slave);
slave.devotion -= 10;
- _softenedQuirks++;
+ softenedQuirks++;
}
}
- slave.devotion += _devBonus;
- slave.trust -= _trustMalus;
+ slave.devotion += devBonus;
+ slave.trust -= trustMalus;
if (S.Wardeness && S.Wardeness.sexualFlaw === "malicious" && slave.energy >= 2) {
slave.energy -= 2;
}
@@ -314,12 +314,6 @@ App.EndWeek.cellblockReport = function() {
r = [];
r.push(He);
r.push(App.SlaveAssignment.stayConfined(slave));
-
- if (slave.choosesOwnAssignment === 2) {
- r.push(App.SlaveAssignment.choosesOwnJob(slave));
- } else {
- r.push(`is confined in ${V.cellblockName}.`);
- }
r.push(App.SlaveAssignment.standardSlaveReport(slave, false));
App.Events.addNode(slaveEntry, r, "div", "indent");
} else {
@@ -329,26 +323,26 @@ App.EndWeek.cellblockReport = function() {
App.SlaveAssignment.standardSlaveReport(slave, true);
}
}
- if (_softenedQuirks || _brokenSlaves) {
- // <br><br>
- if (_softenedQuirks > 0) {
- r.push(`${_cellblockNameCaps}'s advanced compliance systems successfully softened`);
- if (_softenedQuirks === 1) {
+ if (softenedQuirks || brokenSlaves) {
+ r = [];
+ if (softenedQuirks > 0) {
+ r.push(`${cellblockNameCaps}'s advanced compliance systems successfully softened`);
+ if (softenedQuirks === 1) {
r.push(`one slave's mental flaw into an <span class="green">appealing quirk,</span> though the constant correction caused them <span class="mediumorchid">considerable anguish.</span>`);
} else {
- r.push(`${_softenedQuirks} slaves' mental flaws into <span class="green">appealing quirks,</span> though the constant correction caused them <span class="mediumorchid">considerable anguish.</span>`);
+ r.push(`${softenedQuirks} slaves' mental flaws into <span class="green">appealing quirks,</span> though the constant correction caused them <span class="mediumorchid">considerable anguish.</span>`);
}
}
- if (_brokenSlaves > 0) {
- if (_brokenSlaves === 1) {
+ if (brokenSlaves > 0) {
+ if (brokenSlaves === 1) {
r.push(`One slave is now willing to <span class="hotpink">do as they're told</span> and has been released.`);
} else {
- r.push(`${_brokenSlaves} slaves are now willing to <span class="hotpink">do as they're told</span> and have been released.`);
+ r.push(`${brokenSlaves} slaves are now willing to <span class="hotpink">do as they're told</span> and have been released.`);
}
if (V.cellblockDecoration !== "standard") {
App.Events.addNode(el, r, "p", "indent");
r = [];
- r.push(`${_cellblockNameCaps}'s ${V.cellblockDecoration} atmosphere <span class="hotpink">had an impact on them while they were</span> imprisoned.`);
+ r.push(`${cellblockNameCaps}'s ${V.cellblockDecoration} atmosphere <span class="hotpink">had an impact on them while they were</span> imprisoned.`);
}
}
App.Events.addNode(el, r, "p", "indent");