From df4bbf9dc47e9dfc25d668352bfcc070d55556e0 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 3 Oct 2020 17:56:32 -0700
Subject: [PATCH] Scope reduction for anaphrodisiac effects
---
src/endWeek/saLongTermEffects.js | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/endWeek/saLongTermEffects.js b/src/endWeek/saLongTermEffects.js
index 5420f3f57f9..49dcc472329 100644
--- a/src/endWeek/saLongTermEffects.js
+++ b/src/endWeek/saLongTermEffects.js
@@ -10,8 +10,6 @@ App.SlaveAssignment.longTermEffects = (function() {
let gigantomastiaMod;
let rearQuirk;
let uterineHypersensitivityMod;
- let oldEnergy;
- let maxEnergyGain;
let effect;
return saLongTermEffects;
@@ -27,9 +25,7 @@ App.SlaveAssignment.longTermEffects = (function() {
gigantomastiaMod = slave.geneticQuirks.gigantomastia === 2 ? (slave.geneticQuirks.macromastia === 2 ? 3 : 2) : 1;
rearQuirk = slave.geneticQuirks.rearLipedema === 2 ? 2 : 0;
uterineHypersensitivityMod = slave.geneticQuirks.uterineHypersensitivity === 2 ? 2 : 1;
- // anaphrodisiac stuff
- oldEnergy = slave.energy;
- maxEnergyGain = Math.round((75 - oldEnergy) / 9.3);
+ const oldEnergy = slave.energy;
({
// eslint-disable-next-line no-unused-vars
@@ -89,7 +85,7 @@ App.SlaveAssignment.longTermEffects = (function() {
}
}
r.push(App.SlaveAssignment.longTermPhysicalEffects(slave));
- anaphrodisiacEffects(slave); // must come after all .energy gains!
+ anaphrodisiacEffects(slave, oldEnergy); // must come after all .energy gains!
if (slave.accent > 0 && slave.fetish !== "mindbroken") {
languageLearning(slave);
}
@@ -2540,9 +2536,10 @@ App.SlaveAssignment.longTermEffects = (function() {
/**
* @param {App.Entity.SlaveState} slave
- *
+ * @param {number} oldEnergy
*/
- function anaphrodisiacEffects(slave) {
+ function anaphrodisiacEffects(slave, oldEnergy) {
+ const maxEnergyGain = Math.round((75 - oldEnergy) / 9.3);
if (slave.aphrodisiacs === -1 && slave.energy - oldEnergy > maxEnergyGain) {
r.push(`Anaphrodisiacs <span class="stat drop">limit ${his} sex drive.</span>`);
slave.energy = oldEnergy + maxEnergyGain;
--
GitLab