From d8cd06e7885da2ee5accd59ee6309e1c5d04d456 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 6 Jul 2020 21:38:47 -0700
Subject: [PATCH] remove the slavesWithWorkingDicks global
---
js/003-data/gameVariableData.js | 1 -
src/endWeek/endWeek.js | 1 -
src/endWeek/slaveAssignmentReport.js | 5 +++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index e5d470751a2..898114cde29 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -573,7 +573,6 @@ App.Data.resetOnNGPlus = {
freeSexualEnergy: 0,
publicServants: 0,
averageDick: 0,
- slavesWithWorkingDicks: 0,
slaveJobValues: {},
fluid: 0,
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index 6fdeb9f6070..acc627aa47c 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -310,7 +310,6 @@ globalThis.endWeek = (function() {
V.publicServants = 0;
V.cumSlaves = 0;
V.averageDick = 0;
- V.slavesWithWorkingDicks = 0;
V.slaveJobValues = {};
}
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index d32528aa920..b52d665be47 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -42,6 +42,7 @@ App.EndWeek.slaveAssignmentReport = function() {
oral: "oral"
};
+ let slavesWithWorkingDicks = 0;
for (const slave of V.slaves) {
for (const sk in skillsToTest) {
if (_.isNil(slave.skill[sk])) {
@@ -52,7 +53,7 @@ App.EndWeek.slaveAssignmentReport = function() {
if ((V.seeDicks > 0) && canPenetrate(slave) && App.Utils.hasNonassignmentSex(slave)) {
V.averageDick += slave.dick;
- V.slavesWithWorkingDicks++;
+ slavesWithWorkingDicks++;
}
if (slave.lactation === 1) {
@@ -213,7 +214,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
if (V.averageDick > 0) {
- V.averageDick = V.averageDick / V.slavesWithWorkingDicks;
+ V.averageDick = V.averageDick / slavesWithWorkingDicks;
}
V.freeSexualEnergy = V.PC.sexualEnergy - V.fuckSlaves;
const penthouseSlaves = App.Entity.facilities.penthouse.employees().length;
--
GitLab