From 05d9b237fc5fb9627e71baceb7cb7ab27794d362 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 16 Feb 2023 14:10:17 -0500
Subject: [PATCH] fixes
---
src/endWeek/player/prDiet.js | 2 +-
src/endWeek/reports/personalAttention.js | 2 +-
src/endWeek/reports/spaReport.js | 4 ++--
src/endWeek/slaveAssignmentReport.js | 2 +-
src/facilities/spa/spa.js | 8 +-------
src/js/personalAttentionFunctions.js | 2 +-
6 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/endWeek/player/prDiet.js b/src/endWeek/player/prDiet.js
index 0c7b718f4ef..094cf8a9f4d 100644
--- a/src/endWeek/player/prDiet.js
+++ b/src/endWeek/player/prDiet.js
@@ -906,7 +906,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
}
}
if (PC.geneMods.livestock === 1) {
- if [("fattening", "restricted", "slimming", "corrective", "XX", "XXY"].includes(PC.diet)) {
+ if (["fattening", "restricted", "slimming", "corrective", "XX", "XXY"].includes(PC.diet)) {
r.push(`The gene therapy to boost your productivity has a side effect of weight gain, but it really feels like it's just trying to <class="lime">fatten you up for wholesale.</span>`);
} else if (["restricted", "slimming"].includes(PC.diet)) {
r.push(`The gene therapy to boost your productivity has a side effect of weight gain, but it really feels like it's just trying to <class="orange">keep you fat for wholesale.</span>`);
diff --git a/src/endWeek/reports/personalAttention.js b/src/endWeek/reports/personalAttention.js
index 250182d354a..872108b692a 100644
--- a/src/endWeek/reports/personalAttention.js
+++ b/src/endWeek/reports/personalAttention.js
@@ -76,7 +76,7 @@ App.PersonalAttention.slaveReport = function(slave) {
let milkTotal = 0;
let oldSkill;
const hindranceMod = isHinderedDegree(V.PC);
- const nymphoMod = isPlayerHorny(V.PC) ? .75 : 1;
+ const nymphoMod = isHorny(V.PC) ? .75 : 1;
if (pa.objective === "health") {
r.push(App.UI.DOM.makeElement("span", `You care for`, ["bold"]));
} else if (pa.objective === "spar") {
diff --git a/src/endWeek/reports/spaReport.js b/src/endWeek/reports/spaReport.js
index 2053769e0cd..804768e12af 100644
--- a/src/endWeek/reports/spaReport.js
+++ b/src/endWeek/reports/spaReport.js
@@ -305,7 +305,7 @@ App.EndWeek.spaReport = function() {
if (S.Attendant) {
const slave = App.SlaveAssignment.reportSlave(S.Attendant);
tired(slave);
- if (isFertile(slave) && slave.preg !== -1 && App.EndWeek.saVars.poolJizz > (canSee(S.Attendant) ? 5000 : 1000)) {) { // Free swimming sperm do not respect chastity and the Attendant can not avoid going in the pool.
+ if (isFertile(slave) && slave.preg !== -1 && App.EndWeek.saVars.poolJizz > (canSee(S.Attendant) ? 5000 : 1000)) { // Free swimming sperm do not respect chastity and the Attendant can not avoid going in the pool.
const spermAtt = weightedRandom(App.EndWeek.saVars.poolJizzers);
if (canBreed(slave, getSlave(spermAtt.ID))) {
knockMeUp(slave, 25, 2, spermAtt.ID);
@@ -324,7 +324,7 @@ App.EndWeek.spaReport = function() {
}
for (const slave of App.SlaveAssignment.reportSlaves(slaves)) {
- const {He, he, his} = getPronouns(slave);
+ const {He, he, his, him} = getPronouns(slave);
slave.devotion += devBonus;
improveCondition(slave, 5 + healthBonus);
if (slave.health.condition < -80) {
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 4d600af77eb..54a996fc5d4 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -3,7 +3,7 @@ App.EndWeek.slaveAssignmentReport = function() {
const arcology = V.arcologies[0];
const initialEmployeesCount = App.Utils.countFacilityWorkers(); // will be used to show differences after all the assignment changes
- const initialPenthouseTotalEmployeesCount = _countPenthousePopulation();
+ const initialPenthouseTotalEmployeesCount = _countPenthousePopulation();
/* Initialize global SA variables */
App.EndWeek.saVars = new App.EndWeek.SASharedVariables();
diff --git a/src/facilities/spa/spa.js b/src/facilities/spa/spa.js
index 3c40411229f..4aa53f535c1 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -159,13 +159,11 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
property: "spaAggroSpermBan",
prereqs: [
!!S.Attendant,
- optimizedSpermFormula,
+ V.optimizedSpermFormula > 0,
],
options: [
{
get text() {
- const {he} = getPronouns(S.Attendant);
-
return `${S.Attendant.slaveName} is to allow all slaves into the main pool, regardless of genetic modifications.`;
},
link: `Free reign`,
@@ -173,8 +171,6 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
},
{
get text() {
- const {his} = getPronouns(S.Attendant);
-
return `${S.Attendant.slaveName} has banned any slaves with the enhanced sperm treatment from entering the main pool ${V.seePreg ? "and causing random pregnancies" : "and clogging up the filters"}.`;
},
link: `No optimized sperm`,
@@ -182,8 +178,6 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
},
{
get text() {
- const {his} = getPronouns(S.Attendant);
-
return `${S.Attendant.slaveName} will make sure that no enhanced sperm will ever reach your breeding harem.`;
},
link: `Protect your harem`,
diff --git a/src/js/personalAttentionFunctions.js b/src/js/personalAttentionFunctions.js
index 765d5a95176..3eef3ea99d7 100644
--- a/src/js/personalAttentionFunctions.js
+++ b/src/js/personalAttentionFunctions.js
@@ -1,7 +1,7 @@
App.PersonalAttention.reset = function() {
if (V.PC.health.condition < -20 || V.PC.health.illness > 1 || onBedRest(V.PC, true)) {
V.personalAttention = {task: PersonalAttention.RELAX};
- } else if (isPlayerHorny(V.PC)) {
+ } else if (isHorny(V.PC)) {
V.personalAttention = {task: PersonalAttention.SEX};
} else if (isPCCareerInCategory("escort")) {
V.personalAttention = {task: PersonalAttention.WHORING};
--
GitLab