From 19fc4e393c0d5344638f2a7f24d5511fb970b0d5 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Sun, 7 Jun 2020 23:32:14 +0200 Subject: [PATCH] fixes --- src/js/economyJS.js | 10 +++++----- src/js/slaveSummaryWidgets.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/economyJS.js b/src/js/economyJS.js index 1cb2d3d09e2..085777c0815 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -1582,7 +1582,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman if (slave.muscles > 60 && slave.weight < 30 && slave.lactation > 0 && slave.boobs - slave.boobsImplant > 6000) { V.madamCashBonus += 0.15; } - } else if (V.slaves[i].lactation > 0 && slave.boobs - slave.boobsImplant > 6000) { + } else if (slave.lactation > 0 && slave.boobs - slave.boobsImplant > 6000) { V.madamCashBonus += 0.10; } } else if (slave.prestigeDesc === "$He is remembered for winning best in show as a cockmilker.") { @@ -1603,7 +1603,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman } // The Madam adding to 'brothel' - SJVBrothel(V.slaves[V.slaveIndices[V.Madam.ID]]); + SJVBrothel(V.slaves[V.slaveIndices[V.Madam.ID]], lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef); } @@ -1642,7 +1642,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman // Street whores adding to 'brothel' App.Utils.jobForAssignment(Job.WHORE).employees().forEach(s => { - SJVBrothel(s); + SJVBrothel(s, lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef); }); // Brothel whores adding to 'brothel' @@ -1872,7 +1872,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman // The quality/value of each sexual act s.sexQuality = FResult(s); - if (!App.Utils.hasNonassignmentSex(s) && s.standardReward !== "orgasm" && s.energy >= 20) { + if (!App.Utils.hasNonassignmentSex(s) && s.rules.reward !== "orgasm" && s.energy >= 20) { s.sexQuality += 2; } if (canDoAnal(s) && s.anus === 0) { @@ -2015,7 +2015,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman } } - whoreScore(s, lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef, toTheBrothel); + whoreScore(s, lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef); if (s.assignment === Job.MADAM) { if ((BL + toTheBrothelTotal > 0) && (BL + toTheBrothelTotal < 10)) { diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 2ee39a5a880..89fd7328444 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -761,7 +761,7 @@ App.UI.SlaveSummaryRenderers = function() { /** * @param {App.Entity.SlaveState} slave - * @param {Node} c + * @param {HTMLElement} c * @returns {void} */ rulesets: function(slave, c) { -- GitLab