From ce3282c3773f3f55604ec3af60ccf9b5aebdfe88 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 28 Oct 2020 23:17:56 -0700
Subject: [PATCH] 1. Remove unnecessary SA global setting (V.i and
App.Utils.SetLocalPronouns) since they're not needed anymore by any of the
subreports 2. Fix a pronoun issue in the brothel report 3. Remove the last
few traces of the $bedSlaves global 4. Fix a capitalization issue in
reFullBed
---
devTools/types/FC/gameState.d.ts | 2 --
src/endWeek/brothelReport.js | 10 ++++------
src/endWeek/clinicReport.js | 3 ---
src/endWeek/masterSuiteReport.js | 2 --
src/endWeek/reports/nurseryReport.js | 7 -------
src/endWeek/schoolroomReport.js | 4 ----
src/endWeek/servantsQuartersReport.js | 4 ----
src/events/reFullBed.js | 2 +-
src/facilities/farmyard/reports/farmyardReport.js | 7 -------
src/facilities/nursery/utils/nurseryUtils.js | 2 --
src/uncategorized/nextWeek.tw | 2 +-
11 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/devTools/types/FC/gameState.d.ts b/devTools/types/FC/gameState.d.ts
index 616d6ba916c..91f7907885a 100644
--- a/devTools/types/FC/gameState.d.ts
+++ b/devTools/types/FC/gameState.d.ts
@@ -89,8 +89,6 @@ declare namespace FC {
/** @deprecated */
REInterslaveBeggingIDs: number[];
/** @deprecated */
- bedSlaves: SlaveState[];
- /** @deprecated */
eligibleSlaves: SlaveState[];
/** @deprecated */
RERepressedAnalVirginSubIDs: number[];
diff --git a/src/endWeek/brothelReport.js b/src/endWeek/brothelReport.js
index 084c0ccdeca..284c94426d2 100644
--- a/src/endWeek/brothelReport.js
+++ b/src/endWeek/brothelReport.js
@@ -1,7 +1,6 @@
globalThis.brothelReport = function() {
const el = document.createElement("p");
let His, He, he, him, his, himself, wife;
- let he2, him2, his2;
let r;
const brothelStats = document.createElement("span");
@@ -104,11 +103,10 @@ globalThis.brothelReport = function() {
App.Events.addParagraph(el, r);
for (const slave of slaves) {
- ({
- he, him, his, himself, He, His, wife
- } = getPronouns(slave).appendSuffix('2'));
+ const {
+ he2, him2, his2
+ } = getPronouns(slave).appendSuffix('2');
r = [];
- /* for the included passages */
if (S.Madam.rivalryTarget === slave.ID) {
r.push(`${He} forces ${his} ${rivalryTerm(S.Madam)}, to service all the men in the brothel.`);
@@ -152,7 +150,7 @@ globalThis.brothelReport = function() {
r.push(`'prestigious'`);
if (slave.lactation > 0) {
r.push(`cow`);
- } else if (((slave.boobs - slave.boobsImplant) > 6000)) {
+ } else if ((slave.boobs - slave.boobsImplant) > 6000) {
r.push(`mass of titflesh`);
} else {
r.push(`slave`);
diff --git a/src/endWeek/clinicReport.js b/src/endWeek/clinicReport.js
index 10f77a51d58..b741896901b 100644
--- a/src/endWeek/clinicReport.js
+++ b/src/endWeek/clinicReport.js
@@ -240,8 +240,6 @@ App.EndWeek.clinicReport = function() {
if (S.Nurse) {
const slave = S.Nurse;
- V.i = V.slaveIndices[slave.ID];
- App.Utils.setLocalPronouns(slave); // need this for the includes
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const nurseEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
@@ -258,7 +256,6 @@ App.EndWeek.clinicReport = function() {
let restedSlaves = 0;
for (const slave of slaves) {
- V.i = V.slaveIndices[slave.ID];
if (slave.devotion < 45) {
slave.devotion += 4;
}
diff --git a/src/endWeek/masterSuiteReport.js b/src/endWeek/masterSuiteReport.js
index 874a3b72c2b..e038db401dc 100644
--- a/src/endWeek/masterSuiteReport.js
+++ b/src/endWeek/masterSuiteReport.js
@@ -332,8 +332,6 @@ App.EndWeek.masterSuiteReport = function() {
$(smallFrag).append(r.join(' '));
- V.i = V.slaveIndices[slave.ID];
- App.Utils.setLocalPronouns(slave); // need this for the includes
if (V.verboseDescriptions === 1) {
const msContent = App.UI.DOM.appendNewElement("div", smallFrag, '', "indent");
$(msContent).append(`${He} ${App.SlaveAssignment.pleaseYou(slave)}`);
diff --git a/src/endWeek/reports/nurseryReport.js b/src/endWeek/reports/nurseryReport.js
index bb5ea5e6134..13d315fe65c 100644
--- a/src/endWeek/reports/nurseryReport.js
+++ b/src/endWeek/reports/nurseryReport.js
@@ -138,9 +138,6 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
/** @type {App.Entity.SlaveState} */
const slave = S.Matron;
- V.i = V.slaveIndices[slave.ID];
- App.Utils.setLocalPronouns(slave); // needed for "include"s
-
if (V.showEWD !== 0) {
const matronEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
@@ -158,8 +155,6 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
// FIXME: check these numbers over to make sure they make sense
for (const slave of slaves) {
- V.i = V.slaveIndices[slave.ID];
-
slave.devotion += devBonus;
if (slave.devotion <= 20 && slave.trust >= -20) {
@@ -202,8 +197,6 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
break;
}
- App.Utils.setLocalPronouns(slave); // needed for "include"s
-
if (V.showEWD) {
const {He} = getPronouns(slave);
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/endWeek/schoolroomReport.js b/src/endWeek/schoolroomReport.js
index 1695ad78953..9e675864fcd 100644
--- a/src/endWeek/schoolroomReport.js
+++ b/src/endWeek/schoolroomReport.js
@@ -146,8 +146,6 @@ App.EndWeek.schoolroomReport = function() {
if (S.Schoolteacher) {
const slave = S.Schoolteacher;
- V.i = V.slaveIndices[slave.ID];
- App.Utils.setLocalPronouns(slave); // need this for the includes
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const schoolteacherEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
@@ -164,7 +162,6 @@ App.EndWeek.schoolroomReport = function() {
let restedSlaves = 0;
for (const slave of slaves) {
- V.i = V.slaveIndices[slave.ID];
slave.devotion += devBonus;
if (slave.health.condition < -80) {
improveCondition(slave, 20);
@@ -224,7 +221,6 @@ App.EndWeek.schoolroomReport = function() {
continue;
}
- App.Utils.setLocalPronouns(slave); // need this for the includes
if (V.showEWD !== 0) {
const {He} = getPronouns(slave);
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/endWeek/servantsQuartersReport.js b/src/endWeek/servantsQuartersReport.js
index 9a4e71070c7..75a67b0b63e 100644
--- a/src/endWeek/servantsQuartersReport.js
+++ b/src/endWeek/servantsQuartersReport.js
@@ -206,8 +206,6 @@ App.EndWeek.servantsQuartersReport = function() {
if (S.Stewardess) {
/** @type {App.Entity.SlaveState} */
const slave = S.Stewardess;
- V.i = V.slaveIndices[slave.ID];
- App.Utils.setLocalPronouns(slave); // need this for the includes
/* apply following SA passages to facility leader */
if (V.showEWD !== 0) {
const stewardessEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
@@ -226,7 +224,6 @@ App.EndWeek.servantsQuartersReport = function() {
let SQMilkSale = 0;
for (const slave of slaves) {
- V.i = V.slaveIndices[slave.ID];
slave.devotion += devBonus;
if (slave.devotion <= 20 && slave.trust >= -20) {
slave.devotion -= 5;
@@ -284,7 +281,6 @@ App.EndWeek.servantsQuartersReport = function() {
slave.rules.living = "normal";
}
- App.Utils.setLocalPronouns(slave); // need this for the includes
if (V.showEWD !== 0) {
const {He} = getPronouns(slave);
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/events/reFullBed.js b/src/events/reFullBed.js
index 39f68175e54..26ae1114191 100644
--- a/src/events/reFullBed.js
+++ b/src/events/reFullBed.js
@@ -184,7 +184,7 @@ App.Events.REFullBed = class REFullBed extends App.Events.BaseEvent {
t.push(`${He2} pauses, mouth agape with lust,`);
}
t.push(`as the bulge of your penis pistons beneath ${his} lower belly. You make sure to give ${him2} a show before you cum, thrusting as hard and deep as you can. ${He2} gasps at the`);
- if (cansee(bedSlaves[1])) {
+ if (canSee(bedSlaves[1])) {
t.push(`sight`);
} else {
t.push(`sensation`);
diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js
index 7720f7bf7ea..b00dbe93e67 100644
--- a/src/facilities/farmyard/reports/farmyardReport.js
+++ b/src/facilities/farmyard/reports/farmyardReport.js
@@ -252,9 +252,6 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
if (Farmer) {
const farmerEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent");
- V.i = V.slaveIndices[Farmer.ID];
- App.Utils.setLocalPronouns(Farmer); // needed for "include"s
-
if (V.showEWD) {
const farmerEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
@@ -352,12 +349,8 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
$(intro).append(farmhandCount(slaves.length));
for (const slave of slaves) {
- V.i = V.slaveIndices[slave.ID]; // FIXME: V.i is deprecated
-
slave.devotion += devBonus;
- App.Utils.setLocalPronouns(slave); // needed for "include"s
-
if (V.showEWD) {
const slaveEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
diff --git a/src/facilities/nursery/utils/nurseryUtils.js b/src/facilities/nursery/utils/nurseryUtils.js
index 704a719f8f2..72068bf7260 100644
--- a/src/facilities/nursery/utils/nurseryUtils.js
+++ b/src/facilities/nursery/utils/nurseryUtils.js
@@ -702,8 +702,6 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
const slave = V.slaves[i];
const {His, his} = getPronouns(slave);
- App.Utils.setLocalPronouns(slave);
-
if (slave.preg > 0 && !slave.broodmother && slave.pregKnown && slave.eggType === "human") {
if (slave.assignment !== Job.DAIRY && V.dairyPregSetting <= 0) {
const slaveID = "slave-" + slave.ID;
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 427fac1b047..4ce25632e4e 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -299,7 +299,7 @@
<<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestTargetID = -1, $subID = -1, $submissiveInterestTargetID = -1, $shelterGirlID = -1>>
/% Other arrays %/
-<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $eligibleSlaves = []>>
+<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $eligibleSlaves = []>>
/% Slave Objects using 0 instead of null. Second most memory eaten up. %/
<<set $activeSlave = 0, $eventSlave = 0, $subSlave = 0, $milkTap = 0, $relation = 0, $relative = 0, $relative2 = 0>>
--
GitLab