From 8c7d3dad938eac8948fc0b348bce98e5b4459da1 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 11 Nov 2020 02:19:03 -0800
Subject: [PATCH] Scope reduction for saRelationships
---
src/endWeek/saRelationships.js | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/endWeek/saRelationships.js b/src/endWeek/saRelationships.js
index 38cf71f30ee..89e33dec6f0 100644
--- a/src/endWeek/saRelationships.js
+++ b/src/endWeek/saRelationships.js
@@ -5,8 +5,6 @@ App.SlaveAssignment.relationships = (function() {
// eslint-disable-next-line no-unused-vars
let he, him, his, himself, He, His, wife, woman;
- // eslint-disable-next-line no-unused-vars
- let he2, him2, his2, girl2, wife2, He2;
let playerPronouns;
let PC;
@@ -154,10 +152,8 @@ App.SlaveAssignment.relationships = (function() {
if (randomSeed > 75) {
let resentment = 0;
for (const potentialFriend of V.slaves) {
- ({
- he2, him2, his2, girl2, He2
- } = getPronouns(potentialFriend).appendSuffix("2"));
if (canStartFriendship(slave, potentialFriend) && potentialFriend.assignment !== Job.CONFINEMENT) {
+ const {him2, He2} = getPronouns(potentialFriend).appendSuffix("2");
if (potentialFriend.ID === V.MadamID && slave.assignment === Job.BROTHEL) {
if (potentialFriend.rules.relationship !== "restrictive" && silverTongue(potentialFriend, manipulationSkill)) {
r.push(`${slave.slaveName} manages to ingratiate ${himself} with the Madam, ${potentialFriend.slaveName}. The two slaves have <span class="relationship">struck up a friendship.</span>`);
@@ -350,10 +346,11 @@ App.SlaveAssignment.relationships = (function() {
*
*/
function existingRelationship(slave) {
+ let him2, his2, wife2;
if (slave.relationship > 0) {
friend = getSlave(slave.relationshipTarget);
({
- he2, him2, his2, girl2, He2
+ him2, his2
} = getPronouns(friend).appendSuffix("2"));
}
if (slave.fetish === "mindbroken" && slave.relationship !== -3) {
@@ -972,9 +969,9 @@ App.SlaveAssignment.relationships = (function() {
*/
function consummateRelationship(slave) {
let lover = getSlave(slave.relationshipTarget);
- ({
- he2, him2, his2, girl2, He2, wife2
- } = getPronouns(lover).appendSuffix("2"));
+ const {
+ he2, him2, his2, girl2, wife2
+ } = getPronouns(lover).appendSuffix("2");
incestReactions(slave, lover);
if (App.Utils.sexAllowed(slave, lover)) {
@@ -1183,9 +1180,7 @@ App.SlaveAssignment.relationships = (function() {
if (slave.trust <= 95) {
let relatives = V.slaves.filter((s) => areRelated(slave, s)); // Is it possible to move this into the loop?
for (const relative of relatives) {
- ({
- he2, him2
- } = getPronouns(relative).appendSuffix("2"));
+ const {he2, him2} = getPronouns(relative).appendSuffix("2");
if (slave.trust < -20) {
if (slave.rivalryTarget !== relative.ID) {
if (isParentP(relative, slave)) {
--
GitLab