From ec4d8c465c60a674bba3f6cafd9618197b8a982f Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 30 Sep 2020 16:06:15 -0700
Subject: [PATCH] Provide saSharedVariables as a dedicated location to store
variables shared between Slave Assignment Reports, but not used elsewhere.
---
js/003-data/gameVariableData.js | 11 --
.../backwardsCompatibility.js | 10 --
src/endWeek/endWeek.js | 11 --
src/endWeek/healthFunctions.js | 2 +-
src/endWeek/saBeYourHeadGirl.js | 2 +-
src/endWeek/saDevotion.js | 24 ++--
src/endWeek/saLongTermMentalEffects.js | 108 +++++++++---------
src/endWeek/saPregnancy.js | 8 +-
src/endWeek/saRulesFunctions.js | 108 +++++++++---------
src/endWeek/saRules_old.js | 9 +-
src/endWeek/saServeYourOtherSlaves.js | 12 +-
src/endWeek/saSharedVariables.js | 44 +++++++
src/endWeek/saSocialEffects.js | 6 +-
src/endWeek/saWhore.js | 21 ++--
src/endWeek/sexualServices.js | 85 +++++++-------
src/endWeek/slaveAssignmentReport.js | 85 +++++++-------
src/js/economyJS.js | 50 ++++----
src/uncategorized/nextWeek.tw | 3 -
src/uncategorized/saLiveWithHG.tw | 6 +-
src/uncategorized/saLongTermEffects.tw | 1 -
20 files changed, 310 insertions(+), 296 deletions(-)
create mode 100644 src/endWeek/saSharedVariables.js
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 84449b4b5bb..94bf9f9b0b2 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -449,17 +449,9 @@ App.Data.resetOnNGPlus = {
DJignoresFlaws: 0,
DJnoSex: 0,
slaveFightingBG: 0,
- HGSlaveSuccess: 0,
- unMadam: 0,
- madamCashBonus: 0,
- whorePriceAdjustment: {},
- unDJ: 0,
DJRepBonus: 0,
fuckSlaves: 0,
- freeSexualEnergy: 0,
publicServants: 0,
- averageDick: 0,
- slaveJobValues: {},
fluid: 0,
cumSale: 0,
@@ -987,8 +979,6 @@ App.Data.resetOnNGPlus = {
personalAttention: "sex",
HeadGirlID: 0,
HGTimeInGrade: 0,
- HGEnergy: 0,
- HGCum: 0,
RecruiterID: 0,
recruiterTarget: "desperate whores",
oldRecruiterTarget: "desperate whores",
@@ -1210,7 +1200,6 @@ App.Data.resetOnNGPlus = {
LurcherID: 0,
coursed: 0,
StudID: 0,
- StudCum: 0,
raided: 0,
expiree: 0,
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 343f003536f..afb74659b9c 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -197,10 +197,6 @@ App.Update.globalVariables = function(node) {
V.traitorWeeks = V.taitorWeeks;
}
- if (typeof V.madamCashBonus !== "undefined") {
- V.madamCashBonus = V.MadamCashBonus;
- }
-
// Orphanages
if ((typeof V.DefaultBirthDestination === "undefined") || (V.DefaultBirthDestination === "") || (V.DefaultBirthDestination === "anywhere")) {
V.DefaultBirthDestination = "individually decided fates";
@@ -1179,12 +1175,6 @@ App.Update.globalVariables = function(node) {
}
}
- // Stud stuff
- {
- V.StudID = V.StudID || 0;
- V.StudCum = Math.max(+V.StudCum, 0) || 0;
- }
-
// Recalculate finished prosthetics
V.adjustProstheticsCompleted = 0;
for (const prosthetic of V.adjustProsthetics) {
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index 13401a676ee..170f00e95ac 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -283,21 +283,10 @@ globalThis.endWeek = (function() {
V.expiree = 0;
V.retiree = 0;
- V.HGEnergy = 0;
- V.HGCum = 0;
- V.HGSlaveSuccess = 0;
- V.unMadam = 0;
- V.madamCashBonus = 0;
- V.whorePriceAdjustment = {};
- V.unDJ = 0;
V.StudID = 0;
- V.StudCum = 0;
V.fuckSlaves = 0;
- V.freeSexualEnergy = 0;
V.publicServants = 0;
V.cumSlaves = 0;
- V.averageDick = 0;
- V.slaveJobValues = {};
}
function advance() {
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index e5f97db94e6..4d21a1d18e5 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -691,7 +691,7 @@ globalThis.tired = function(slave) {
// HG special cases
if (slave.assignment === Job.HEADGIRL) {
- if (V.HGSlaveSuccess === 1) {
+ if (App.EndWeek.saVars.HGSlaveSuccess) {
H.tired -= 5;
}
if (V.personalAttention === PersonalAttention.SUPPORTHG) {
diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js
index 7aba01c8027..4c53355fca5 100644
--- a/src/endWeek/saBeYourHeadGirl.js
+++ b/src/endWeek/saBeYourHeadGirl.js
@@ -134,7 +134,7 @@ App.SlaveAssignment.beYourHeadGirl = (function() {
}
}
}
- if (V.HGEnergy === 0) {
+ if (App.EndWeek.saVars.HGEnergy === 0) {
r.push(`${He} notices ${his} <span class="red">fatigue getting in the way</span> of training your slaves, so ${he} focuses ${his} attention on ${himself} this week to <span class="green">rectify this.</span>`);
}
}
diff --git a/src/endWeek/saDevotion.js b/src/endWeek/saDevotion.js
index 0d8eef76631..2ee9f12fc2c 100644
--- a/src/endWeek/saDevotion.js
+++ b/src/endWeek/saDevotion.js
@@ -628,15 +628,15 @@ App.SlaveAssignment.devotion = (function() {
*
*/
function sexualAttentionThoughts(slave) {
- if (V.freeSexualEnergy > 0) {
- if (V.freeSexualEnergy === 3) {
+ if (App.EndWeek.saVars.freeSexualEnergy > 0) {
+ if (App.EndWeek.saVars.freeSexualEnergy === 3) {
r.push(`${He} gets a lot of sexual attention from you, since you don't have nearly enough dedicated fucktoys to sate your libido, and this <span class="devotion inc">`);
if (slave.devotion > 50) {
r.push(`intensifies ${his} love for you.</span>`);
} else {
r.push(`forces ${him} to get used to sex slavery.</span>`);
}
- } else if (V.freeSexualEnergy === 2) {
+ } else if (App.EndWeek.saVars.freeSexualEnergy === 2) {
r.push(`${He} receives some sexual attention from you, since you don't have enough dedicated fucktoys to sate your libido, and this <span class="devotion inc">`);
if (slave.devotion > 50) {
r.push(`builds ${his} closeness to you.</span>`);
@@ -651,27 +651,27 @@ App.SlaveAssignment.devotion = (function() {
r.push(`keeping ${him} aware ${he}'s your sex slave.</span>`);
}
}
- slave.devotion += V.freeSexualEnergy;
- seX(slave, "oral", PC, "penetrative", V.freeSexualEnergy);
+ slave.devotion += App.EndWeek.saVars.freeSexualEnergy;
+ seX(slave, "oral", PC, "penetrative", App.EndWeek.saVars.freeSexualEnergy);
if (canDoVaginal(slave) && slave.vagina > 0) {
- seX(slave, "vaginal", PC, "penetrative", V.freeSexualEnergy);
+ seX(slave, "vaginal", PC, "penetrative", App.EndWeek.saVars.freeSexualEnergy);
}
if (canDoAnal(slave) && slave.anus > 0) {
- seX(slave, "anal", PC, "penetrative", V.freeSexualEnergy);
+ seX(slave, "anal", PC, "penetrative", App.EndWeek.saVars.freeSexualEnergy);
}
if (slave.boobs > 500 && PC.dick > 0) {
- seX(slave, "mammary", PC, "penetrative", V.freeSexualEnergy);
+ seX(slave, "mammary", PC, "penetrative", App.EndWeek.saVars.freeSexualEnergy);
}
if ((slave.toyHole === "dick" || V.policies.sexualOpenness === 1) && canPenetrate(slave)) {
if (PC.vagina > 0) {
- seX(slave, "penetrative", PC, "vaginal", V.freeSexualEnergy);
+ seX(slave, "penetrative", PC, "vaginal", App.EndWeek.saVars.freeSexualEnergy);
if (canImpreg(PC, slave)) {
- knockMeUp(PC, V.freeSexualEnergy, 0, slave.ID, true);
+ knockMeUp(PC, App.EndWeek.saVars.freeSexualEnergy, 0, slave.ID, true);
}
} else if (PC.anus > 0) {
- seX(slave, "penetrative", PC, "anal", V.freeSexualEnergy);
+ seX(slave, "penetrative", PC, "anal", App.EndWeek.saVars.freeSexualEnergy);
if (canImpreg(PC, slave)) {
- knockMeUp(PC, V.freeSexualEnergy, 1, slave.ID, true);
+ knockMeUp(PC, App.EndWeek.saVars.freeSexualEnergy, 1, slave.ID, true);
}
}
if (V.policies.sexualOpenness === 0) {
diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js
index 5fedf31c99b..be6e57df3ea 100644
--- a/src/endWeek/saLongTermMentalEffects.js
+++ b/src/endWeek/saLongTermMentalEffects.js
@@ -7,7 +7,6 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
let he, him, his, hers, himself, girl, loli, He, His, wife;
let boobSize;
- let para;
return saLongTermMentalEffects;
@@ -19,7 +18,7 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
r = [];
boobSize = slave.boobs - slave.boobsImplant - slave.boobsMilk;
- para = 0;
+ App.EndWeek.saVars.paraphiliaSatisfied = 0; // TODO: once this is resetting properly, remove it from here
({
// eslint-disable-next-line no-unused-vars
@@ -59,7 +58,6 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
paraphiliaAcquisition(slave);
}
}
- V.paraphiliaSatisfied = para; // used in saSocialEffects.js
return r.join(" ");
}
@@ -1294,28 +1292,28 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by how many dicks ${he} gets to suck at work.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (V.PC.dick !== 0 && slave.toyHole === "mouth" && ["be your Concubine", "please you", "serve in the master suite"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by constant oral sex with you.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.inflation !== 0 && slave.inflationType === "cum") {
r.push(`${His} paraphilia is satisfied by swelling ${his} body with cum.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.dietCum === 1) {
r.push(`${His} paraphilia is satisfied by what ${he} gets to eat.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.dietCum === 2) {
r.push(`Other slaves in your penthouse are disturbed by ${his} insatiable appetite for human ejaculate, which ${his} heavy cum-diet encourages.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (V.feeder !== 0) {
r.push(`${His} paraphilia is satisfied by the way ${he} gets to eat.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.assignment === "work in the dairy" && V.dairyFeedersSetting > 0) {
// something something something cum production
} else {
r.push(`${He} doesn't seem to feel ${he}'s getting enough cum, leaving the cum addict <span class="devotion dec">depressed and anxious.</span>`);
slave.devotion -= 2;
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
}
break;
case "anal addict":
@@ -1337,21 +1335,21 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by how many dicks get shoved up ${his} butt at work.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.toyHole === "ass" && ["be your Concubine", "please you", "serve in the master suite"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by constant anal sex with you.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (V.suppository !== 0) {
r.push(`${His} paraphilia is satisfied by the way ${he} gets to take medication.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.buttplug === "huge plug" || slave.buttplug === "long, huge plug") {
r.push(`${His} paraphilia is satisfied by the enormous plug ${he} wears in ${his} ass.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.assignment === "work in the dairy" && V.dairyStimulatorsSetting > 0) {
// major ass drilling
} else {
r.push(`${He} doesn't seem to feel ${he}'s getting buttfucked often enough, leaving the anal addict <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
if (slave.prostate === 0) {
@@ -1383,22 +1381,22 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (slave.porn.feed === 1 && slave.porn.viewerCount >= 10000) {
r.push(`${His} paraphilia is satisfied by the viewcounts on ${his} porn and the many viewers no doubt enjoying themselves to ${his} day to day life.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (["whore", "serve the public", "work in the brothel", "serve in the club", "be the DJ"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by how often ${he} gets publicly fucked at work.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.assignment === "recruit girls" && V.recruiterTarget === "other arcologies" && V.arcologies[0].influenceTarget !== -1) {
r.push(`${His} paraphilia is satisfied by the sheer amount of attention ${he} gets as a sexual Ambassador.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.assignment === "be the Schoolteacher" && V.schoolroom >= 20) {
r.push(`${His} paraphilia is satisfied by ${his} work as a sexual instructor; enough eyes are fixated on ${his} lessons.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.clothes === "no clothing") {
r.push(`${His} paraphilia is satisfied by ${his} total nudity.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} doesn't seem to feel ${he}'s getting fucked in public enough, leaving the attention whore <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
@@ -1428,7 +1426,7 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (["get milked", "work in the dairy"].includes(slave.assignment) && slave.lactation > 0) {
r.push(`${His} paraphilia is satisfied by ${his} work as a cow; ${he} can feel ${his} udders swelling with milk.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.geneticQuirks.gigantomastia === 2 && slave.geneticQuirks.macromastia === 2 && V.geneticMappingUpgrade >= 1) {
r.push(`${His} paraphilia is satisfied by the knowledge that ${his} genetic abnormality will keep ${his} breasts growing for the rest of ${his} life.`);
} else if (V.geneticMappingUpgrade >= 1 && (slave.geneticQuirks.gigantomastia === 2 || slave.geneticQuirks.macromastia === 2)) {
@@ -1440,17 +1438,17 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
} else if (slave.drugs === "intensive breast injections") {
r.push(`${His} paraphilia makes ${him} feel <span class="trust inc">fulfilled to be a sex slave</span> if it means breast expansion like this.`);
slave.trust += 2;
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.drugs === "breast injections") {
r.push(`${His} paraphilia makes breast injections very satisfying for ${him}.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.drugs === "hyper breast injections") {
r.push(`${His} paraphilia makes ${him} feel <span class="trust inc">fulfilled to be a sex slave</span> if it means breast expansion like this.`);
slave.trust += 2;
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} feels ${his} breasts are shrinking horribly, leaving the growth addict <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
@@ -1473,22 +1471,22 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (slave.assignment === "be your Head Girl") {
r.push(`${His} paraphilia is satisfied by ${his} work as your Head Girl.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if ((slave.assignment === "be the Wardeness")) {
r.push(`${His} paraphilia is satisfied by ${his} work as your Wardeness.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if ((slave.assignment === "be the Stewardess")) {
r.push(`${His} paraphilia is satisfied by ${his} work as the Stewardess.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if ((slave.assignment === "be the Schoolteacher")) {
r.push(`${His} paraphilia is satisfied by ${his} work as the Schoolteacher.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (canMove(slave) && (slave.rules.release.slaves === 1 || App.Utils.hasFamilySex(slave)) && V.universalRulesConsent === 0) {
r.push(`${His} paraphilia makes pinning down and raping other slaves very satisfying.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} gets few chances to indulge ${his} need to hold others down as ${he} fucks them, leaving ${him} <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
@@ -1511,16 +1509,16 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (slave.assignment === "be your Head Girl") {
r.push(`${His} paraphilia is satisfied by ${his} work as your Head Girl.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if ((slave.assignment === "be the Wardeness")) {
r.push(`${His} paraphilia is satisfied by ${his} work as your Wardeness.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (canMove(slave) && (slave.rules.release.slaves === 1 || App.Utils.hasFamilySex(slave)) && V.universalRulesConsent === 0) {
r.push(`${His} paraphilia makes pinning down and brutally raping other slaves very satisfying.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} gets few chances to indulge ${his} need to subject others to sexual anguish, leaving ${him} <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
@@ -1544,19 +1542,19 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
const dom = (slave.assignment === "be a subordinate slave" && slave.subTarget > 0) ? getSlave(slave.subTarget) : null;
if (slave.assignment === "work in the dairy" && V.dairyRestraintsSetting >= 2) {
r.push(`${His} paraphilia is satisfied by ${his} horrible life as a producer of useful fluids and a receptacle for machine rape.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (["be confined in the arcade", "work a glory hole"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by ${his} horrible life as a helpless hole for an infinite bag of dicks.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (dom && ["abusive", "malicious"].includes(dom.sexualFlaw)) {
r.push(`${His} paraphilia is satisfied by the constant mistreatment ${he} receives from ${his} dom, ${dom.slaveName}.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.trust < -50) {
r.push(`${His} paraphilia is satisfied by ${his} constant terror.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} doesn't seem to feel ${he}'s treated poorly enough, leaving the self hating slut <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
@@ -1580,16 +1578,16 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel", "work as a servant", "be the Attendant", "be the Milkmaid"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by how ${he}'s expected to serve others' sexual needs at work.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (["be your Concubine", "please you", "serve in the master suite"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by how ${he}'s expected to serve your sexual needs at work.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.assignment === "be a subordinate slave") {
r.push(`${His} paraphilia is satisfied by how ${he}'s expected to serve other slaves' sexual needs.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} doesn't seem to feel ${he}'s serving others' sexual needs enough, leaving ${him} <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
@@ -1625,38 +1623,38 @@ App.SlaveAssignment.longTermMentalEffects = (function() {
}
if (slave.broodmother > 0 && slave.pregKnown === 1) {
r.push(`${He} knows ${he} will be pregnant until ${his} body gives out, and <span class="devotion inc">${he} couldn't be happier.</span>`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
slave.devotion += 5;
} else if (slave.pregControl === "labor suppressors" && slave.preg >= slave.pregData.normalBirth) {
r.push(`Under the effects of labor suppression drugs, ${he} knows ${he} will be pregnant until you decided to allow ${his} birth. <span class="devotion inc">${He} couldn't be happier.</span>`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
slave.devotion += 5;
} else if (slave.pregType >= 10 && slave.pregKnown === 1) {
r.push(`${His} growing hyperpregnancy feeds ${his} paraphilia and <span class="devotion inc">fulfills ${his} deepest fantasies.</span>`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
slave.devotion += 3;
} else if (slave.pregKnown === 1) {
r.push(`${His} paraphilia is satisfied by ${his} pregnancy.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (canGetPregnant(slave) && V.PC.dick !== 0 && slave.toyHole === "pussy" && slave.mpreg !== 1 && ["be your Concubine", "please you", "serve in the master suite"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by constant unprotected vaginal sex with you.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (canGetPregnant(slave) && V.PC.dick !== 0 && slave.toyHole === "ass" && slave.mpreg === 1 && ["be your Concubine", "please you", "serve in the master suite"].includes(slave.assignment)) {
r.push(`${His} paraphilia is satisfied by constant unprotected anal sex with you.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (slave.bellyImplant >= 60000) {
r.push(`${His} paraphilia is satisfied by ${his} overfilled belly implant.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else if (setup.fakeBellies.includes(slave.bellyAccessory)) {
r.push(`${He} <span class="devotion dec">loathes</span> being forced to carry a fake pregnancy.`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 3;
} else if (slave.pregWeek < 0) {
r.push(`${His} paraphilia is temporarily sated by ${his} recent pregnancy, though ${he} anxiously counts the days until ${he} can get pregnant again.`);
- para = 1;
+ App.EndWeek.saVars.paraphiliaSatisfied = 1;
} else {
r.push(`${He} isn't pregnant, leaving the breeder slut <span class="devotion dec">depressed and anxious.</span>`);
- para = -1;
+ App.EndWeek.saVars.paraphiliaSatisfied = -1;
slave.devotion -= 2;
}
break;
diff --git a/src/endWeek/saPregnancy.js b/src/endWeek/saPregnancy.js
index 776823eeb92..0f215860f66 100644
--- a/src/endWeek/saPregnancy.js
+++ b/src/endWeek/saPregnancy.js
@@ -920,7 +920,7 @@ App.SlaveAssignment.pregnancy = (function() {
r.push(`It's ${S.HeadGirl.slaveName}'s responsibility to impregnate fertile slaves, but your Head Girl is forbidden from impregnating ${slave.slaveName}.`);
} else if (V.universalHGImpregnateMasterSuiteToggle === 1 && ["serve in the master suite", "be your Concubine"].includes(slave.assignment)) {
r.push(`It's ${S.HeadGirl.slaveName}'s responsibility to impregnate fertile slaves, but ${slave.slaveName} is off-limits.`);
- } else if (V.HGCum === 0) {
+ } else if (App.EndWeek.saVars.HGCum === 0) {
r.push(`It's ${S.HeadGirl.slaveName}'s responsibility to impregnate fertile slaves, but your Head Girl can only fuck a limited number of slaves enough to ensure impregnation each week.`);
} else if (!canBreed(slave, S.HeadGirl)) {
r.push(`It's ${S.HeadGirl.slaveName}'s responsibility to impregnate fertile slaves, but ${S.HeadGirl.slaveName}'s sperm is unable to fertilize ${slave.slaveName}'s ova, so ${he2} doesn't waste ${his2} seed trying.`);
@@ -1040,7 +1040,7 @@ App.SlaveAssignment.pregnancy = (function() {
slave.pregSource = V.HeadGirlID;
slave.pregWeek = 1;
slave.pregKnown = 1;
- V.HGCum -= 1;
+ App.EndWeek.saVars.HGCum -= 1;
slave.pregType = setPregType(slave);
WombImpregnate(slave, slave.pregType, V.HeadGirlID, 1);
if (slave.mpreg === 1) {
@@ -1058,7 +1058,7 @@ App.SlaveAssignment.pregnancy = (function() {
r.push(`It's ${Stud.slaveName}'s role to provide sperm for fertile slaves, but ${slave.slaveName} is not included on the list.`);
} else if (V.universalHGImpregnateMasterSuiteToggle === 1 && ["serve in the master suite", "be your Concubine"].includes(slave.assignment)) {
r.push(`It's ${Stud.slaveName}'s role to provide sperm for fertile slaves, but ${slave.slaveName} is off-limits.`);
- } else if (V.StudCum === 0) {
+ } else if (App.EndWeek.saVars.StudCum === 0) {
r.push(`It's ${Stud.slaveName}'s role to provide sperm for fertile slaves, but your Stud can only cum enough to ensure impregnation in a limited number of slaves each week.`);
} else if (!canBreed(slave, Stud)) {
r.push(`It's ${Stud.slaveName}'s role to provide sperm for fertile slaves, but ${his2} sperm is unable to fertilize ${slave.slaveName}'s ova, so there is no point in forcing the union.`);
@@ -1586,7 +1586,7 @@ App.SlaveAssignment.pregnancy = (function() {
slave.pregSource = V.StudID;
slave.pregWeek = 1;
slave.pregKnown = 1;
- V.StudCum -= 1;
+ App.EndWeek.saVars.StudCum -= 1;
slave.pregType = setPregType(slave);
WombImpregnate(slave, slave.pregType, V.StudID, 1);
if (StudPenetrative) {
diff --git a/src/endWeek/saRulesFunctions.js b/src/endWeek/saRulesFunctions.js
index 3f1c96955be..b7233040ae9 100644
--- a/src/endWeek/saRulesFunctions.js
+++ b/src/endWeek/saRulesFunctions.js
@@ -130,8 +130,8 @@ App.EndWeek.Rules.playerFetishPlay = function(slave) {
App.EndWeek.Rules.playerEnergy = function(slave) {
const el = new DocumentFragment();
const {he, him, his, himself, wife} = getPronouns(slave);
- if (V.freeSexualEnergy > 0) {
- if (V.freeSexualEnergy === 3) {
+ if (App.EndWeek.saVars.freeSexualEnergy > 0) {
+ if (App.EndWeek.saVars.freeSexualEnergy === 3) {
el.append(`You have surplus sexual energy to burn, even when ${he} doesn't ask, and ${he} `);
if (slave.devotion < -20) {
App.UI.DOM.appendNewElement("span", el, `hates ${himself} `, "hotpink");
@@ -146,7 +146,7 @@ App.EndWeek.Rules.playerEnergy = function(slave) {
slave.devotion += 2;
slave.need = 0;
el.append(SimpleSexAct.Player(slave, 10));
- } else if (V.freeSexualEnergy === 2) {
+ } else if (App.EndWeek.saVars.freeSexualEnergy === 2) {
el.append(`You have surplus sexual energy to fuck ${him} whenever `);
if (slave.relationship === -3) {
el.append(`you notice ${his} need, `);
@@ -191,8 +191,8 @@ App.EndWeek.Rules.playerDiscoversFetish = function(slave) {
const el = new DocumentFragment();
const {he, him, his} = getPronouns(slave);
if (slave.fetishKnown === 0) {
- if (V.freeSexualEnergy > 0) {
- if (V.freeSexualEnergy > random(0, 5)) {
+ if (App.EndWeek.saVars.freeSexualEnergy > 0) {
+ if (App.EndWeek.saVars.freeSexualEnergy > random(0, 5)) {
slave.fetishKnown = 1;
el.append(`You discover that ${he} really likes it when you `);
switch (slave.fetish) {
@@ -295,7 +295,7 @@ App.EndWeek.Rules.playerDrugEffects = function(slave) {
}
el.append(`This forces ${him} to come to you for release many times a day, and ${he} `);
App.UI.DOM.appendNewElement("span", el, `is desperately reliant `, "mediumaquamarine");
- if (slave.anus > 0 && canDoAnal(slave) && V.freeSexualEnergy > 0) {
+ if (slave.anus > 0 && canDoAnal(slave) && App.EndWeek.saVars.freeSexualEnergy > 0) {
el.append(`on your `);
if (V.PC.dick === 0) {
el.append(`strap-on `);
@@ -310,7 +310,7 @@ App.EndWeek.Rules.playerDrugEffects = function(slave) {
} else {
el.append(`${His} terribly swollen balls force ${him} to come to you for release several times a day, and ${he} `);
App.UI.DOM.appendNewElement("span", el, `learns to rely`, "mediumaquamarine");
- if (slave.anus > 0 && canDoAnal(slave) && V.freeSexualEnergy > 0) {
+ if (slave.anus > 0 && canDoAnal(slave) && App.EndWeek.saVars.freeSexualEnergy > 0) {
el.append(`on your `);
if (V.PC.dick === 0) {
el.append(`strap-on `);
@@ -339,7 +339,7 @@ App.EndWeek.Rules.playerDrugEffects = function(slave) {
}
el.append(`This forces ${him} to come to you for release many times a day, and ${he} `);
App.UI.DOM.appendNewElement("span", el, `is desperately reliant `, "mediumaquamarine");
- if (slave.anus > 0 && canDoAnal(slave) && V.freeSexualEnergy > 0) {
+ if (slave.anus > 0 && canDoAnal(slave) && App.EndWeek.saVars.freeSexualEnergy > 0) {
el.append(`on your `);
if (V.PC.dick === 0) {
el.append(`strap-on `);
@@ -354,7 +354,7 @@ App.EndWeek.Rules.playerDrugEffects = function(slave) {
} else {
el.append(`${His} grotesquely swollen balls force ${him} to come to you for release dozens of times a day, and ${he} `);
App.UI.DOM.appendNewElement("span", el, `is desperately reliant `, "mediumaquamarine");
- if (slave.anus > 0 && canDoAnal(slave) && V.freeSexualEnergy > 0) {
+ if (slave.anus > 0 && canDoAnal(slave) && App.EndWeek.saVars.freeSexualEnergy > 0) {
el.append(`on your `);
if (V.PC.dick === 0) {
el.append(`strap-on `);
@@ -623,18 +623,18 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
if (slave.fetish === "submissive") {
el.append(`plead that ${_who} fuck ${him}. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
App.UI.DOM.appendNewElement("span", el, `${His} asshole is loosened `, "lime");
el.append(`during sex with other slaves, since most of the cocks ${he} enticed a dominating buttfuck from are very large. `);
slave.anus++;
seX(slave, "anal", "slaves", "penetrative", 3);
}
}
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since most of the slaves ${he} enticed a pounding from are extremely hung, `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina++;
@@ -656,21 +656,21 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
} else if (slave.fetish === "humiliation") {
el.append(`demand that ${_who} let ${him} fuck them in public. `);
if (!slave.rivalry) {
- const _rival = randomRapeRivalryTarget(slave, (s) => { return (s.devotion <= 20 && s.trust < -20); });
- if (_rival) {
- el.append(`Craving a rush, ${he} repeatedly forces a reluctant ${SlaveFullName(_rival)} to have sex with ${him} in public. ${_rival.slaveName} resents this, and ${slave.slaveName}'s ongoing sexual abuse `);
+ const rival = randomRapeRivalryTarget(slave, (s) => (s.devotion <= 20 && s.trust < -20));
+ if (rival) {
+ el.append(`Craving a rush, ${he} repeatedly forces a reluctant ${SlaveFullName(rival)} to have sex with ${him} in public. ${rival.slaveName} resents this, and ${slave.slaveName}'s ongoing sexual abuse `);
App.UI.DOM.appendNewElement("span", el, `starts a rivalry`, "lightsalmon");
el.append(` between them. `);
slave.rivalry = 1;
- _rival.rivalry = 1;
- slave.rivalryTarget = _rival.ID;
- _rival.rivalryTarget = slave.ID;
- SimpleSexAct.Slave(_rival, 4);
- if (canPenetrate(_rival)) {
+ rival.rivalry = 1;
+ slave.rivalryTarget = rival.ID;
+ rival.rivalryTarget = slave.ID;
+ SimpleSexAct.Slave(rival, 4);
+ if (canPenetrate(rival)) {
seX(slave, "penetrative", "slaves", "penetrative", random(1, 3));
}
- if (!App.Utils.sexAllowed(slave, _rival)) {
- el.append(`As the rules do not permit ${slave.slaveName} and ${_rival.slaveName} to have sex, ${he} is `);
+ if (!App.Utils.sexAllowed(slave, rival)) {
+ el.append(`As the rules do not permit ${slave.slaveName} and ${rival.slaveName} to have sex, ${he} is `);
App.UI.DOM.appendNewElement("span", el, `severely punished.`, "yellow");
slave.trust -= 4;
}
@@ -682,9 +682,9 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
}
} else if (slave.fetish === "buttslut" && canDoAnal(slave)) {
el.append(`demand that ${_who} penetrate ${his} anus. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since most of the slaves ${he} demands anal sex from are extremely hung, `);
App.UI.DOM.appendNewElement("span", el, `${his} asshole gets stretched out.`, "lime");
slave.anus += 1;
@@ -779,18 +779,18 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
}
} else if (slave.fetish === "masochist") {
el.append(`demand that ${_who} hurt ${him}. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
App.UI.DOM.appendNewElement("span", el, `${His} asshole is loosened `, "lime");
el.append(`during sex with hung slaves, since ${he} often relies on painal to address ${his} needs. `);
seX(slave, "anal", "slaves", "penetrative", 3);
slave.anus += 1;
}
}
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since ${he} usually demands that hung slaves fuck ${him} hard enough to make ${his} pussy hurt, `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
@@ -833,10 +833,10 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
}
} else if (slave.fetish === "pregnancy") {
el.append(`demand that ${_who} indulge ${his} pregnancy fetish. `);
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.mpreg === 0) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since ${he} constantly demands to be fucked deeply to get ${his} womb filled with cum, `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
@@ -845,7 +845,7 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
}
} else {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since ${he} constantly demands to be fucked deeply to get ${his} womb filled with cum, `);
App.UI.DOM.appendNewElement("span", el, `${his} ass gets stretched out.`, "lime");
slave.anus += 1;
@@ -859,18 +859,18 @@ App.EndWeek.Rules.rapeFetish = function(slave) {
}
} else if (slave.energy > 95) {
el.append(`demand that ${_who} satisfy ${his} formidable appetites. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
App.UI.DOM.appendNewElement("span", el, `${His} asshole is loosened `, "lime");
el.append(` during sex with well endowed slaves, since ${he}'s so addicted to sex all ${his} holes see heavy traffic. `);
slave.anus += 1;
seX(slave, "anal", "slaves", "penetrative", 3);
}
}
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`${He} indulges in non-stop sex with your well endowed slaves, so much so that `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
@@ -915,18 +915,18 @@ App.EndWeek.Rules.consentFetish = function(slave) {
if (slave.fetishKnown === 1 && slave.fetishStrength > 60) {
if (slave.fetish === "submissive") {
el.append(`usually pairing off with a more dominant slave. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
App.UI.DOM.appendNewElement("span", el, `${His} asshole is loosened `, "lime");
el.append(` during sex with other slaves, since most of the cocks ${he} lets dominate ${his} backdoor are very large. `);
slave.anus += 1;
seX(slave, "anal", "slaves", "penetrative", 3);
}
}
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since most of the slaves ${he} takes a pounding from are extremely hung, `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
@@ -959,9 +959,9 @@ App.EndWeek.Rules.consentFetish = function(slave) {
el.append(`tease ${his} virgin anus `);
}
el.append(`in return. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since most of the slaves ${he} enjoys anal sex with are extremely hung, `);
App.UI.DOM.appendNewElement("span", el, `${his} asshole gets stretched out.`, "lime");
slave.anus += 1;
@@ -986,18 +986,18 @@ App.EndWeek.Rules.consentFetish = function(slave) {
}
} else if (slave.fetish === "masochist") {
el.append(`usually pairing off with an abusive slave. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
App.UI.DOM.appendNewElement("span", el, `${His} asshole is loosened,`, "lime");
el.append(`since ${he} begs hung slaves to fuck ${his} butt until ${he} cries. `);
slave.anus += 1;
seX(slave, "anal", "slaves", "penetrative", 3);
}
}
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`Since ${he} eagerly begs hung slaves to fuck ${him} until ${he} cries, `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
@@ -1016,9 +1016,9 @@ App.EndWeek.Rules.consentFetish = function(slave) {
} else if (slave.fetish === "pregnancy") {
el.append(`doing ${his} best to pair off with any pregnant slaves. `);
if (slave.mpreg === 0) {
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`${He} also takes cock whenever ${he} can, begging to be fucked deeply to get ${his} womb filled with cum, so `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
@@ -1027,9 +1027,9 @@ App.EndWeek.Rules.consentFetish = function(slave) {
}
}
} else {
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 40) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 40) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`${He} also takes cock whenever ${he} can, begging to be fucked deeply to get ${his} womb filled with cum, so `);
App.UI.DOM.appendNewElement("span", el, `${his} ass gets stretched out.`, "lime");
slave.anus += 1;
@@ -1044,18 +1044,18 @@ App.EndWeek.Rules.consentFetish = function(slave) {
}
} else if (slave.energy > 95) {
el.append(`and has to give out a lot of favors to get enough attention for ${himself}. `);
- if (V.averageDick > 4) {
+ if (App.EndWeek.saVars.averageDick > 4) {
if (slave.anus > 0 && slave.anus < 3 && canDoAnal(slave)) {
- if ((slave.anus * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.anus * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
App.UI.DOM.appendNewElement("span", el, `${His} asshole is loosened `, "lime");
el.append(`during sex with well endowed slaves, since ${he}'s so addicted to sex all ${his} holes see heavy traffic. `);
slave.anus += 1;
seX(slave, "anal", "slaves", "penetrative", 3);
}
}
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (slave.vagina > 0 && slave.vagina < 3 && canDoVaginal(slave)) {
- if ((slave.vagina * 30) - (V.averageDick * 5) < random(1, 100)) {
+ if ((slave.vagina * 30) - (App.EndWeek.saVars.averageDick * 5) < random(1, 100)) {
el.append(`${He} indulges in non-stop sex with your well endowed slaves, so much so that `);
App.UI.DOM.appendNewElement("span", el, `${his} cunt gets stretched out.`, "lime");
slave.vagina += 1;
diff --git a/src/endWeek/saRules_old.js b/src/endWeek/saRules_old.js
index 136aa3993a9..2eeb7084776 100644
--- a/src/endWeek/saRules_old.js
+++ b/src/endWeek/saRules_old.js
@@ -1,10 +1,10 @@
(function() {
"use strict";
- const
+ let
PC = V.PC,
- energy = V.freeSexualEnergy,
- averageDick = V.averageDick;
+ energy,
+ averageDick;
/**
* @param {App.Entity.SlaveState} slave
@@ -22,6 +22,9 @@
let r = ``;
+ energy = App.EndWeek.saVars.freeSexualEnergy;
+ averageDick = App.EndWeek.saVars.averageDick;
+
// TODO: may need updating to detail effect of chastity
if (!slave.fuckdoll) {
diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index 3f2eae566f1..41a95b7d299 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -270,21 +270,19 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
}
r.push(`servicing your stock, ${he} is used to the <span class="red">point of exhaustion.</span>`);
healthDamage(slave, 10);
- if (V.averageDick > 5) {
+ if (App.EndWeek.saVars.averageDick > 5) {
if (canDoVaginal(slave) && slave.vagina > 0 && slave.vagina < 4) {
- if ((slave.vagina * 40) - (V.averageDick * 5) < jsRandom(1, 100)) {
+ if ((slave.vagina * 40) - (App.EndWeek.saVars.averageDick * 5) < jsRandom(1, 100)) {
r.push(`So many huge dicks pistoning in and out of ${his} pussy <span class="lime">loosen ${him} up.</span>`);
slave.vagina++;
- slave.counter.vaginal += 3;
- V.vaginalTotal += 3;
+ actX(slave, "vaginal", 3);
}
}
if (canDoAnal(slave) && slave.anus > 0 && slave.anus < 4) {
- if ((slave.anus * 40) - (V.averageDick * 5) < jsRandom(1, 100)) {
+ if ((slave.anus * 40) - (App.EndWeek.saVars.averageDick * 5) < jsRandom(1, 100)) {
r.push(`<span class="lime">${His} asshole is loosened</span> after being pounded by so many giant cocks.`);
slave.anus++;
- slave.counter.anal += 3;
- V.analTotal += 3;
+ actX(slave, "anal", 3);
}
}
}
diff --git a/src/endWeek/saSharedVariables.js b/src/endWeek/saSharedVariables.js
new file mode 100644
index 00000000000..7eb93d636a3
--- /dev/null
+++ b/src/endWeek/saSharedVariables.js
@@ -0,0 +1,44 @@
+/** Container for temporary variables that must be shared between different elements of the slave assignment report
+ * It's still effectively global data (so use sparingly), but with some enforced scoping, and without getting SugarCube involved
+ * Should always be null unless App.EndWeek.slaveAssignmentReport is running
+ * @type {App.EndWeek.SASharedVariables}
+ */
+App.EndWeek.saVars = null;
+
+App.EndWeek.SASharedVariables = class {
+ /** Initialize - declare members that need to persist *between* slaves here */
+ constructor() {
+ /** How many slaves can the HG still impregnate? */
+ this.HGCum = 0;
+ /** How many slaves can the HG still train? */
+ this.HGEnergy = 0;
+ /** Was the HG's slave successful at helping her? */
+ this.HGSlaveSuccess = false;
+ /** How much cash bonus is the Madam contributing to her whores? */
+ this.madamBonus = 0;
+ /** Slave job values */
+ this.slaveJobValues = {};
+ /** Whore price adjustments (per class) */
+ this.whorePriceAdjustment = {};
+ /** How many slaves can the designated stud still impregnate? */
+ this.StudCum = 0;
+ /** How much energy does the player have left to fuck slaves who need it? */
+ this.freeSexualEnergy = 0;
+ /** How big is the average dick on a slave? */
+ this.averageDick = 0;
+ /** Why was the madam fired this week? */
+ this.unMadam = 0;
+ /** Why was the DJ fired this week? */
+ this.unDJ = 0;
+ }
+
+ /**
+ * Reset slave-specific report variables. Declare members that need to be reset between slaves here.
+ * @todo call this from all the facility reports (the slave loops are broken up by facility)
+ */
+ nextSlave() {
+ /** Is this slave's paraphilia satisfied? (1: satisfied, 0: no paraphilia; -1: unsatisified) */
+ this.paraphiliaSatisfied = 0;
+ /** TODO: move $slaveUsedRest here after saRules is converted, and find others */
+ }
+};
diff --git a/src/endWeek/saSocialEffects.js b/src/endWeek/saSocialEffects.js
index 697e55a3683..589f3882e29 100644
--- a/src/endWeek/saSocialEffects.js
+++ b/src/endWeek/saSocialEffects.js
@@ -801,11 +801,11 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
t.push(new SocialEffect("Hedonistic", 1, `Intense fetish`,
`Society <span class="green">approves</span> of ${his} intense fetish; the expectation that everyone's deepest desires should be fulfilled grows.`));
}
- // V.paraphiliaSatisfied is set in saLongTermMentalEffects.js
- if (V.paraphiliaSatisfied > 0) {
+ // paraphiliaSatisfied is set in saLongTermMentalEffects.js
+ if (App.EndWeek.saVars.paraphiliaSatisfied > 0) {
t.push(new SocialEffect("Hedonistic", 1, `Satisfied paraphilia`,
`Society <span class="green">is pleased</span> that ${he} is allowed to fully indulge ${his} paraphilia.`));
- } else if (V.paraphiliaSatisfied < 0) {
+ } else if (App.EndWeek.saVars.paraphiliaSatisfied < 0) {
t.push(new SocialEffect("Hedonistic", -2, `Unsatisfied paraphilia`,
`Society <span class="red">frowns</span> upon ${him} not being allowed to indulge in ${his} paraphilia.`));
}
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 9bd251beaa8..5dc25ef2530 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -86,16 +86,16 @@ App.SlaveAssignment.whore = (function() {
incomeStats.customers = beauty;
if (slave.effectiveWhoreClass === 4) {
customers = "extremely wealthy";
- FuckResult = Math.trunc(slave.sexQuality * V.whorePriceAdjustment.topClass);
+ FuckResult = Math.trunc(slave.sexQuality * App.EndWeek.saVars.whorePriceAdjustment.topClass);
} else if (slave.effectiveWhoreClass === 3) {
customers = "upper class";
- FuckResult = Math.trunc(slave.sexQuality * V.whorePriceAdjustment.upperClass);
+ FuckResult = Math.trunc(slave.sexQuality * App.EndWeek.saVars.whorePriceAdjustment.upperClass);
} else if (slave.effectiveWhoreClass === 2) {
customers = "middle class";
- FuckResult = Math.trunc(slave.sexQuality * V.whorePriceAdjustment.middleClass);
+ FuckResult = Math.trunc(slave.sexQuality * App.EndWeek.saVars.whorePriceAdjustment.middleClass);
} else if (slave.effectiveWhoreClass === 1) {
customers = "lower class";
- FuckResult = Math.trunc(slave.sexQuality * V.whorePriceAdjustment.lowerClass);
+ FuckResult = Math.trunc(slave.sexQuality * App.EndWeek.saVars.whorePriceAdjustment.lowerClass);
} else {
customers = "ERROR";
FuckResult = "ERROR";
@@ -130,8 +130,8 @@ App.SlaveAssignment.whore = (function() {
if (slave.assignment === Job.WHORE) {
r += ` Since there's extra space in ${V.brothelName}, ${he} sells ${himself} there.`;
const maxBrothelBoost = Math.max(Math.trunc(100 * Math.pow(1.26, V.brothelBoost.eligible - 1)) * 50 * V.brothelBoost.eligible, 1); // Correcting prices in case benefits outgrow the cap
- if (maxBrothelBoost < V.slaveJobValues.brothel.boost) {
- FuckResult = Math.trunc(FuckResult * (1 + V.brothelBoost.eligible / 20) * maxBrothelBoost / V.slaveJobValues.brothel.boost);
+ if (maxBrothelBoost < App.EndWeek.saVars.slaveJobValues.brothel.boost) {
+ FuckResult = Math.trunc(FuckResult * (1 + V.brothelBoost.eligible / 20) * maxBrothelBoost / App.EndWeek.saVars.slaveJobValues.brothel.boost);
} else {
FuckResult = Math.trunc(FuckResult * (1 + V.brothelBoost.eligible / 20));
}
@@ -177,18 +177,19 @@ App.SlaveAssignment.whore = (function() {
if (V.MadamID !== 0) {
const madam = S.Madam;
const madamPronouns = getPronouns(madam);
- if (V.madamCashBonus > 0) {
+ const madamBonus = App.EndWeek.saVars.madamBonus;
+ if (madamBonus > 0) {
if (slave.assignment === Job.WHORE) {
r += ` Working`;
} else {
r += ` Living and working`;
}
r += ` out of the brothel, ${he} comes under ${SlaveFullName(madam)}'s `;
- if (V.madamCashBonus < 0.1) {
+ if (madamBonus < 0.1) {
r += `completely inept`;
- } else if (V.madamCashBonus < 0.2) {
+ } else if (madamBonus < 0.2) {
r += `unskilled`;
- } else if (V.madamCashBonus < 0.3) {
+ } else if (madamBonus < 0.3) {
r += `skillful`;
} else {
r += `masterful`;
diff --git a/src/endWeek/sexualServices.js b/src/endWeek/sexualServices.js
index 057b9b5beb1..84edc494ec9 100644
--- a/src/endWeek/sexualServices.js
+++ b/src/endWeek/sexualServices.js
@@ -32,7 +32,7 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
arcadeSupply = {lowerClass: 0, middleClass: 0, upperClass: 0},
clubSupply = {lowerClass: 0, middleClass: 0};
- V.whorePriceAdjustment = {
+ App.EndWeek.saVars.whorePriceAdjustment = {
lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0
};
V.NPCMarketShare = {
@@ -41,7 +41,8 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
V.sexDemandResult = {
lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0
};
- V.slaveJobValues = slaveJobValues(lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef);
+ App.EndWeek.saVars.slaveJobValues = slaveJobValues(lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef);
+ const sjv = App.EndWeek.saVars.slaveJobValues;
let lowerClassArcadeSexDemand = 0;
let middleClassArcadeSexDemand = 0;
@@ -57,23 +58,23 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
if (arcology.FSDegradationistLaw === 1) {
arcadeDemandDeg += V.ASlaves * 3;
}
- if (V.slaveJobValues.arcade < arcadeDemandDeg) {
+ if (sjv.arcade < arcadeDemandDeg) {
if (arcadeDemandDeg > 20000 || arcology.FSDegradationist > 50) {
- const degradationistPenalty = ((arcadeDemandDeg - V.slaveJobValues.arcade) / arcadeDemandDeg);
+ const degradationistPenalty = ((arcadeDemandDeg - sjv.arcade) / arcadeDemandDeg);
arcology.FSDegradationist -= Math.trunc(5 * degradationistPenalty);
repX(forceNeg(100 * degradationistPenalty), "futureSocieties");
V.arcadeDemandDegResult = degradationistPenalty > 0.5 ? 1 : 2;
} else {
V.arcadeDemandDegResult = 3;
}
- arcadeSupply.lowerClass += Math.trunc(1.15 * V.slaveJobValues.arcade * (lowerClassArcadeSexDemand / arcadeDemandDeg));
+ arcadeSupply.lowerClass += Math.trunc(1.15 * sjv.arcade * (lowerClassArcadeSexDemand / arcadeDemandDeg));
lowerClassSexDemand -= arcadeSupply.lowerClass;
- arcadeSupply.middleClass += Math.trunc(1.15 * V.slaveJobValues.arcade * (middleClassArcadeSexDemand / arcadeDemandDeg));
+ arcadeSupply.middleClass += Math.trunc(1.15 * sjv.arcade * (middleClassArcadeSexDemand / arcadeDemandDeg));
middleClassSexDemand -= arcadeSupply.middleClass;
- arcadeSupply.upperClass += Math.trunc(1.15 * V.slaveJobValues.arcade * (upperClassArcadeSexDemand / arcadeDemandDeg));
+ arcadeSupply.upperClass += Math.trunc(1.15 * sjv.arcade * (upperClassArcadeSexDemand / arcadeDemandDeg));
upperClassSexDemand -= arcadeSupply.upperClass; // There's a 15% satisfaction bonus from getting release in a societally approved way
} else {
- if (V.slaveJobValues.arcade >= arcadeDemandDeg * 1.5) {
+ if (sjv.arcade >= arcadeDemandDeg * 1.5) {
arcology.FSDegradationist += 2;
V.arcadeDemandDegResult = 4;
repX(500, "futureSocieties");
@@ -96,45 +97,45 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
let lowerClassClubRatio = lowerClassSexDemand / clubDemand;
let middleClassClubRatio = middleClassSexDemand / clubDemand;
- if (V.slaveJobValues.club * V.slaveJobValues.clubSP < clubDemand) {
- lowerClassSexDemand -= Math.trunc(V.slaveJobValues.club * V.slaveJobValues.clubSP * lowerClassClubRatio);
- middleClassSexDemand -= Math.trunc(V.slaveJobValues.club * V.slaveJobValues.clubSP * middleClassClubRatio);
+ if (sjv.club * sjv.clubSP < clubDemand) {
+ lowerClassSexDemand -= Math.trunc(sjv.club * sjv.clubSP * lowerClassClubRatio);
+ middleClassSexDemand -= Math.trunc(sjv.club * sjv.clubSP * middleClassClubRatio);
} else {
lowerClassSexDemand = 0;
middleClassSexDemand = 0;
}
- clubSupply.lowerClass = Math.trunc(V.slaveJobValues.club * V.slaveJobValues.clubSP * lowerClassClubRatio);
- clubSupply.middleClass = Math.trunc(V.slaveJobValues.club * V.slaveJobValues.clubSP * middleClassClubRatio);
+ clubSupply.lowerClass = Math.trunc(sjv.club * sjv.clubSP * lowerClassClubRatio);
+ clubSupply.middleClass = Math.trunc(sjv.club * sjv.clubSP * middleClassClubRatio);
// Brothel or street whore sex supply
- if (lowerClassSexDemand < V.slaveJobValues.brothel.lowerClass) {
- V.whorePriceAdjustment.lowerClass = Math.max(Math.pow(lowerClassSexDemand / (V.slaveJobValues.brothel.lowerClass + V.NPCSexSupply.lowerClass), 1.513), 0.3);
+ if (lowerClassSexDemand < sjv.brothel.lowerClass) {
+ App.EndWeek.saVars.whorePriceAdjustment.lowerClass = Math.max(Math.pow(lowerClassSexDemand / (sjv.brothel.lowerClass + V.NPCSexSupply.lowerClass), 1.513), 0.3);
lowerClassSexDemand = 0; // This accounts for people having too much choice and getting more picky how they spend their money
} else {
- V.whorePriceAdjustment.lowerClass = Math.pow(lowerClassSexDemand / (V.slaveJobValues.brothel.lowerClass + V.NPCSexSupply.lowerClass), 0.5);
- lowerClassSexDemand -= V.slaveJobValues.brothel.lowerClass; // People are willing to pay more for a scarce good, but within reason
+ App.EndWeek.saVars.whorePriceAdjustment.lowerClass = Math.pow(lowerClassSexDemand / (sjv.brothel.lowerClass + V.NPCSexSupply.lowerClass), 0.5);
+ lowerClassSexDemand -= sjv.brothel.lowerClass; // People are willing to pay more for a scarce good, but within reason
}
- if (middleClassSexDemand < V.slaveJobValues.brothel.middleClass) {
- V.whorePriceAdjustment.middleClass = Math.max(Math.pow((middleClassSexDemand * 1.1) / (V.slaveJobValues.brothel.middleClass + V.NPCSexSupply.middleClass), 1.513), 0.33);
+ if (middleClassSexDemand < sjv.brothel.middleClass) {
+ App.EndWeek.saVars.whorePriceAdjustment.middleClass = Math.max(Math.pow((middleClassSexDemand * 1.1) / (sjv.brothel.middleClass + V.NPCSexSupply.middleClass), 1.513), 0.33);
middleClassSexDemand = 0;
} else {
- V.whorePriceAdjustment.middleClass = Math.pow((middleClassSexDemand * 1.1) / (V.slaveJobValues.brothel.middleClass + V.NPCSexSupply.middleClass), 0.5);
- middleClassSexDemand -= V.slaveJobValues.brothel.middleClass;
+ App.EndWeek.saVars.whorePriceAdjustment.middleClass = Math.pow((middleClassSexDemand * 1.1) / (sjv.brothel.middleClass + V.NPCSexSupply.middleClass), 0.5);
+ middleClassSexDemand -= sjv.brothel.middleClass;
}
- if (upperClassSexDemand < V.slaveJobValues.brothel.upperClass) {
- V.whorePriceAdjustment.upperClass = Math.max(Math.pow((upperClassSexDemand * 1.21) / (V.slaveJobValues.brothel.upperClass + V.NPCSexSupply.upperClass), 1.513), 0.363);
+ if (upperClassSexDemand < sjv.brothel.upperClass) {
+ App.EndWeek.saVars.whorePriceAdjustment.upperClass = Math.max(Math.pow((upperClassSexDemand * 1.21) / (sjv.brothel.upperClass + V.NPCSexSupply.upperClass), 1.513), 0.363);
upperClassSexDemand = 0;
} else {
- V.whorePriceAdjustment.upperClass = Math.pow((upperClassSexDemand * 1.21) / (V.slaveJobValues.brothel.upperClass + V.NPCSexSupply.upperClass), 0.5);
- upperClassSexDemand -= V.slaveJobValues.brothel.upperClass;
+ App.EndWeek.saVars.whorePriceAdjustment.upperClass = Math.pow((upperClassSexDemand * 1.21) / (sjv.brothel.upperClass + V.NPCSexSupply.upperClass), 0.5);
+ upperClassSexDemand -= sjv.brothel.upperClass;
}
- if (topClassSexDemand < V.slaveJobValues.brothel.topClass) {
- V.whorePriceAdjustment.topClass = Math.max(Math.pow((topClassSexDemand * 1.331) / (V.slaveJobValues.brothel.topClass + V.NPCSexSupply.topClass), 1.513), 0.3993);
+ if (topClassSexDemand < sjv.brothel.topClass) {
+ App.EndWeek.saVars.whorePriceAdjustment.topClass = Math.max(Math.pow((topClassSexDemand * 1.331) / (sjv.brothel.topClass + V.NPCSexSupply.topClass), 1.513), 0.3993);
topClassSexDemand = 0;
} else {
- V.whorePriceAdjustment.topClass = Math.pow((topClassSexDemand * 1.331) / (V.slaveJobValues.brothel.topClass + V.NPCSexSupply.topClass), 0.5);
- topClassSexDemand -= V.slaveJobValues.brothel.topClass;
+ App.EndWeek.saVars.whorePriceAdjustment.topClass = Math.pow((topClassSexDemand * 1.331) / (sjv.brothel.topClass + V.NPCSexSupply.topClass), 0.5);
+ topClassSexDemand -= sjv.brothel.topClass;
}
// Price for sex in the arcade or at a glory hole
@@ -143,24 +144,24 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
} else {
arcadeDemand = arcadeDemandDeg + lowerClassSexDemand;
}
- if (V.slaveJobValues.arcade + V.NPCSexSupply.lowerClass > 0) {
- V.arcadePrice = Math.clamp(Math.pow((arcadeDemand / (V.slaveJobValues.arcade + V.NPCSexSupply.lowerClass)), 0.5), 0.5, 3); // This calculates the price charged per fuck
+ if (sjv.arcade + V.NPCSexSupply.lowerClass > 0) {
+ V.arcadePrice = Math.clamp(Math.pow((arcadeDemand / (sjv.arcade + V.NPCSexSupply.lowerClass)), 0.5), 0.5, 3); // This calculates the price charged per fuck
} else {
V.arcadePrice = 0.5; // minimum price no matter what
}
// Arcade usage beyond degradationist demand
- if (V.slaveJobValues.arcade > arcadeDemandDeg) {
- V.slaveJobValues.arcade -= arcadeDemandDeg;
+ if (sjv.arcade > arcadeDemandDeg) {
+ sjv.arcade -= arcadeDemandDeg;
} else {
- V.slaveJobValues.arcade = 0;
+ sjv.arcade = 0;
}
- if (V.slaveJobValues.arcade > lowerClassSexDemand) {
+ if (sjv.arcade > lowerClassSexDemand) {
lowerClassSexDemand = 0;
} else {
- lowerClassSexDemand -= V.slaveJobValues.arcade;
+ lowerClassSexDemand -= sjv.arcade;
}
- arcadeSupply.lowerClass += V.slaveJobValues.arcade;
+ arcadeSupply.lowerClass += sjv.arcade;
// NPC sex supply
V.NPCSexSupply = NPCSexSupply(lowerClassSexDemand, lowerClassSexDemandRef, middleClassSexDemand, middleClassSexDemandRef, upperClassSexDemand, upperClassSexDemandRef, topClassSexDemand, topClassSexDemandRef);
@@ -197,10 +198,10 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
}
// Sexual satisfaction effects
- V.sexDemandResult.lowerClass = Math.trunc(((V.NPCSexSupply.lowerClass + V.slaveJobValues.brothel.lowerClass + clubSupply.lowerClass + arcadeSupply.lowerClass) * 1000) / lowerClassSexDemandRef);
- V.sexDemandResult.middleClass = Math.trunc(((V.NPCSexSupply.middleClass + V.slaveJobValues.brothel.middleClass + clubSupply.middleClass + arcadeSupply.middleClass) * 1000) / middleClassSexDemandRef);
- V.sexDemandResult.upperClass = Math.trunc(((V.NPCSexSupply.upperClass + V.slaveJobValues.brothel.upperClass + arcadeSupply.upperClass) * 1000) / upperClassSexDemandRef);
- V.sexDemandResult.topClass = Math.trunc(((V.NPCSexSupply.topClass + V.slaveJobValues.brothel.topClass) * 1000) / topClassSexDemandRef);
+ V.sexDemandResult.lowerClass = Math.trunc(((V.NPCSexSupply.lowerClass + sjv.brothel.lowerClass + clubSupply.lowerClass + arcadeSupply.lowerClass) * 1000) / lowerClassSexDemandRef);
+ V.sexDemandResult.middleClass = Math.trunc(((V.NPCSexSupply.middleClass + sjv.brothel.middleClass + clubSupply.middleClass + arcadeSupply.middleClass) * 1000) / middleClassSexDemandRef);
+ V.sexDemandResult.upperClass = Math.trunc(((V.NPCSexSupply.upperClass + sjv.brothel.upperClass + arcadeSupply.upperClass) * 1000) / upperClassSexDemandRef);
+ V.sexDemandResult.topClass = Math.trunc(((V.NPCSexSupply.topClass + sjv.brothel.topClass) * 1000) / topClassSexDemandRef);
if (V.sexDemandResult.lowerClass < 400) { // You are providing < 40% of their desired amount of sex
if (V.week <= 30) {
@@ -343,7 +344,7 @@ App.EndWeek.computeSexualServicesModel = function(renderContainer) {
}
numericRow("Demand", lowerClassSexDemandRef, middleClassSexDemandRef, upperClassSexDemandRef, topClassSexDemandRef);
- numericRow("Brothel Supply", V.slaveJobValues.brothel.lowerClass, V.slaveJobValues.brothel.middleClass, V.slaveJobValues.brothel.upperClass, V.slaveJobValues.brothel.topClass);
+ numericRow("Brothel Supply", sjv.brothel.lowerClass, sjv.brothel.middleClass, sjv.brothel.upperClass, sjv.brothel.topClass);
if (clubSupply.lowerClass || clubSupply.middleClass) {
numericRow("Club Supply", clubSupply.lowerClass, clubSupply.middleClass);
}
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 6e8ccc46121..11bd781f3ad 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -8,6 +8,9 @@ App.EndWeek.slaveAssignmentReport = function() {
const initialEmployeesCount = App.Utils.countFacilityWorkers(); // will be used to show differences after all the assignment changes
const initialPenthouseTotalEmployeesCount = _countPenthousePopulation();
+ /* Initialize global SA variables */
+ App.EndWeek.saVars = new App.EndWeek.SASharedVariables();
+
/* Spa room */
if (facilities.spa.established) {
V.spaSpots = (facilities.spa.capacity - App.Entity.facilities.spa.employeesIDs().size) * 20;
@@ -48,7 +51,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
if ((V.seeDicks > 0) && canPenetrate(slave) && App.Utils.hasNonassignmentSex(slave)) {
- V.averageDick += slave.dick;
+ App.EndWeek.saVars.averageDick += slave.dick;
slavesWithWorkingDicks++;
}
@@ -61,15 +64,11 @@ App.EndWeek.slaveAssignmentReport = function() {
switch (slave.assignment) {
case Job.HEADGIRLSUITE:
if (slave.devotion >= random(-30, 20)) {
- V.HGSlaveSuccess++;
- V.HGEnergy++;
- } else {
- V.HGSlaveSuccess--;
+ App.EndWeek.saVars.HGSlaveSuccess = true;
+ App.EndWeek.saVars.HGEnergy++;
}
break;
case Job.CONCUBINE:
- V.fuckSlaves++;
- break;
case Job.MASTERSUITE:
case Job.FUCKTOY:
V.fuckSlaves++;
@@ -163,38 +162,38 @@ App.EndWeek.slaveAssignmentReport = function() {
} // for (const slave of V.slaves)
if (V.HeadGirlID !== 0) {
- V.HGEnergy++;
+ App.EndWeek.saVars.HGEnergy++;
const slave = slaveStateById(V.HeadGirlID);
if (V.personalAttention === PersonalAttention.SUPPORTHG && V.PC.health.shortDamage < 30) {
- V.HGEnergy++;
+ App.EndWeek.saVars.HGEnergy++;
if (slave.trust > 95) {
- V.HGEnergy++;
+ App.EndWeek.saVars.HGEnergy++;
}
}
if (arcology.FSChineseRevivalistLaw === 1) {
- V.HGEnergy++;
+ App.EndWeek.saVars.HGEnergy++;
}
if (slaveResting(slave)) {
- V.HGEnergy = 0;
+ App.EndWeek.saVars.HGEnergy = 0;
}
if (canAchieveErection(slave)) {
- V.HGCum = 2 + Math.trunc((slave.balls / 5) + (slave.energy / 95) + (slave.health.condition / 95) + (slave.devotion / 95) + (V.reproductionFormula * 5));
+ App.EndWeek.saVars.HGCum = 2 + Math.trunc((slave.balls / 5) + (slave.energy / 95) + (slave.health.condition / 95) + (slave.devotion / 95) + (V.reproductionFormula * 5));
}
}
// Stud gets off based on impregnations, so we need to check and see if they actually do anyone
if (V.StudID) {
const stud = S.Stud;
- V.StudCum = 2 + Math.trunc(((stud.balls / 5) + (stud.energy / 95) + (stud.health.condition / 95) + (stud.devotion / 95) + (V.reproductionFormula * 5) - (stud.health.tired / 25)) * restEffects(stud, 5));
+ App.EndWeek.saVars.StudCum = 2 + Math.trunc(((stud.balls / 5) + (stud.energy / 95) + (stud.health.condition / 95) + (stud.devotion / 95) + (V.reproductionFormula * 5) - (stud.health.tired / 25)) * restEffects(stud, 5));
if (stud.drugs === "hyper testicle enhancement") {
- V.StudCum += 3;
+ App.EndWeek.saVars.StudCum += 3;
} else if (stud.drugs === "testicle enhancement") {
- V.StudCum += 1;
+ App.EndWeek.saVars.StudCum += 1;
}
if (stud.diet === "cum production") {
- V.StudCum += 1;
+ App.EndWeek.saVars.StudCum += 1;
}
- let studCumLimit = V.StudCum;
+ let studCumLimit = App.EndWeek.saVars.StudCum;
for (const slave of V.slaves) {
if (studCumLimit === 0 || stud.need <= 0) {
break;
@@ -208,18 +207,18 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
- if (V.averageDick > 0) {
- V.averageDick = V.averageDick / slavesWithWorkingDicks;
+ if (App.EndWeek.saVars.averageDick > 0) {
+ App.EndWeek.saVars.averageDick = App.EndWeek.saVars.averageDick / slavesWithWorkingDicks;
}
- V.freeSexualEnergy = V.PC.sexualEnergy - V.fuckSlaves;
+ App.EndWeek.saVars.freeSexualEnergy = V.PC.sexualEnergy - V.fuckSlaves;
const penthouseSlaves = App.Entity.facilities.penthouse.employees().length;
- if (V.freeSexualEnergy > 0) {
- if (V.freeSexualEnergy > penthouseSlaves / 2) {
- V.freeSexualEnergy = 3;
- } else if (V.freeSexualEnergy > penthouseSlaves / 4) {
- V.freeSexualEnergy = 2;
+ if (App.EndWeek.saVars.freeSexualEnergy > 0) {
+ if (App.EndWeek.saVars.freeSexualEnergy > penthouseSlaves / 2) {
+ App.EndWeek.saVars.freeSexualEnergy = 3;
+ } else if (App.EndWeek.saVars.freeSexualEnergy > penthouseSlaves / 4) {
+ App.EndWeek.saVars.freeSexualEnergy = 2;
} else {
- V.freeSexualEnergy = 1;
+ App.EndWeek.saVars.freeSexualEnergy = 1;
}
}
@@ -282,7 +281,7 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
}
- V.HGTrainSlavesIDs = HGPossibleSlaves.flatten().slice(0, V.HGEnergy);
+ V.HGTrainSlavesIDs = HGPossibleSlaves.flatten().slice(0, App.EndWeek.saVars.HGEnergy);
} else {
V.HGTrainSlavesIDs = [];
}
@@ -359,6 +358,9 @@ App.EndWeek.slaveAssignmentReport = function() {
}
for (const facSubArr of facListArr) {
+ // TODO: this call should be in the individual reports' slave loops so slaves don't leak data to their coworkers if someone fucks up
+ App.EndWeek.saVars.nextSlave();
+
const reportContent = document.createElement("div");
if (typeof facSubArr[0] === "function") {
reportContent.append(facSubArr[0]());
@@ -402,6 +404,9 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
+ /* Clean up global SA variables */
+ App.EndWeek.saVars = null;
+
return res;
function _countPenthousePopulation() {
@@ -477,19 +482,19 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.MADAM:
- if (V.unMadam === 1) {
+ if (App.EndWeek.saVars.unMadam === 1) {
_printSlaveUnassignedNote(slave, "can't give whores verbal orders");
- } else if (V.unMadam === 2) {
+ } else if (App.EndWeek.saVars.unMadam === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your Madam any longer`);
- } else if (V.unMadam === 3) {
+ } else if (App.EndWeek.saVars.unMadam === 3) {
_printSlaveUnassignedNote(slave, "is mindbroken");
- } else if (V.unMadam === 4) {
+ } else if (App.EndWeek.saVars.unMadam === 4) {
_printSlaveUnassignedNote(slave, "is no longer independently mobile");
- } else if (V.unMadam === 5) {
+ } else if (App.EndWeek.saVars.unMadam === 5) {
_printSlaveUnassignedNote(slave, "can no longer see");
- } else if (V.unMadam === 6) {
+ } else if (App.EndWeek.saVars.unMadam === 6) {
_printSlaveUnassignedNote(slave, "can no longer hear");
- } else if (V.unMadam === 7) {
+ } else if (App.EndWeek.saVars.unMadam === 7) {
_printSlaveUnassignedNote(slave, `can no longer handle ${getPronouns(slave).his} underlings`);
}
if (V.MadamID === 0) {
@@ -497,15 +502,15 @@ App.EndWeek.slaveAssignmentReport = function() {
}
break;
case Job.DJ:
- if (V.unDJ === 1) {
+ if (App.EndWeek.saVars.unDJ === 1) {
_printSlaveUnassignedNote(slave, "can't speak");
- } else if (V.unDJ === 2) {
+ } else if (App.EndWeek.saVars.unDJ === 2) {
_printSlaveUnassignedNote(slave, "spends so much time giving birth and laboring that", `${getPronouns(slave).he} cannot effectively serve as your DJ any longer`);
- } else if (V.unDJ === 3) {
+ } else if (App.EndWeek.saVars.unDJ === 3) {
_printSlaveUnassignedNote(slave, "is mindbroken");
- } else if (V.unDJ === 4) {
+ } else if (App.EndWeek.saVars.unDJ === 4) {
_printSlaveUnassignedNote(slave, "is no longer independently mobile");
- } else if (V.unDJ === 5) {
+ } else if (App.EndWeek.saVars.unDJ === 5) {
_printSlaveUnassignedNote(slave, "can no longer hear");
}
if (V.djID === 0) {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 426cf09f2b5..72f3ca17190 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1531,78 +1531,78 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
if (V.MadamID !== 0) {
const madam = S.Madam;
const madamIntel = madam.intelligence + madam.intelligenceImplant;
- V.madamCashBonus = 0;
+ App.EndWeek.saVars.madamBonus = 0;
if (madam.relationship === -3 && madam.devotion > 50) {
// As your loving $wife, $he does $his best to attract attention to your brothel.
- V.madamCashBonus += 0.25;
+ App.EndWeek.saVars.madamBonus += 0.25;
}
if (madam.skill.whoring > 10 && madam.skill.whoring <= 30) {
// S.Madam.slaveName's basic skills marginally yellowgreen;improve business at $brothelName.
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
} else if (madam.skill.whoring <= 60) {
// S.Madam.slaveName's skills yellowgreen;improve business at $brothelName.
- V.madamCashBonus += 0.1;
+ App.EndWeek.saVars.madamBonus += 0.1;
} else if (madam.skill.whoring < 100) {
// S.Madam.slaveName's skills greatly yellowgreen;improve business at $brothelName.
- V.madamCashBonus += 0.15;
+ App.EndWeek.saVars.madamBonus += 0.15;
} else {
// S.Madam.slaveName's mastery immensely yellowgreen;improves business at $brothelName.
- V.madamCashBonus += 0.20;
+ App.EndWeek.saVars.madamBonus += 0.20;
}
if (madam.actualAge > 35) {
// $His age and experience also contribute.
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
} else if (V.AgePenalty === 0) {
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
}
if (setup.madamCareers.includes(madam.career)) {
// $He has experience from $his life before $he was a slave that helps $him in the seedy business of selling other people's bodies for sex.
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
} else if (madam.skill.madam >= V.masteredXP) {
// $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
} else {
madam.skill.madam += jsRandom(1, Math.ceil((madamIntel) / 15) + 8);
}
if (madamIntel > 15) {
// $He is a clever manager.
- V.madamCashBonus += 0.05 * Math.floor((-0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5);
+ App.EndWeek.saVars.madamBonus += 0.05 * Math.floor((-0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5);
}
if (madam.dick > 2 && canPenetrate(madam)) {
// $His turgid dick helps $him manage the bitches.
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
}
for (const slave of App.Entity.facilities.brothel.employees()) {
if (madam.relationshipTarget === slave.ID) {
- V.madamCashBonus -= 0.05;
+ App.EndWeek.saVars.madamBonus -= 0.05;
} else if (areRelated(madam, slave)) {
- V.madamCashBonus += 0.05;
+ App.EndWeek.saVars.madamBonus += 0.05;
}
if (slave.prestigeDesc === "$He is a famed Free Cities whore, and commands top prices.") {
- V.madamCashBonus += 0.15;
+ App.EndWeek.saVars.madamBonus += 0.15;
} else if (slave.prestigeDesc === "$He is a famed Free Cities slut, and can please anyone.") {
- V.madamCashBonus += 0.15;
+ App.EndWeek.saVars.madamBonus += 0.15;
} else if (slave.prestigeDesc === "$He is remembered for winning best in show as a dairy cow.") {
if (V.arcologies[0].FSPhysicalIdealist !== "unset") {
if (slave.muscles > 60 && slave.weight < 30 && slave.lactation > 0 && slave.boobs - slave.boobsImplant > 6000) {
- V.madamCashBonus += 0.15;
+ App.EndWeek.saVars.madamBonus += 0.15;
}
} else if (slave.lactation > 0 && slave.boobs - slave.boobsImplant > 6000) {
- V.madamCashBonus += 0.10;
+ App.EndWeek.saVars.madamBonus += 0.10;
}
} else if (slave.prestigeDesc === "$He is remembered for winning best in show as a cockmilker.") {
if (V.arcologies[0].FSGenderFundamentalist !== "unset") {
if (slave.balls === 0 && slave.dick === 0 && slave.vagina > -1) { /* this needs review - doesn't fit right. An XY slave would be expected to be masculine. */
- V.madamCashBonus += 0.20;
+ App.EndWeek.saVars.madamBonus += 0.20;
}
} else if ((slave.balls > 5 && slave.dick !== 0) || (slave.balls > 4 && slave.dick !== 0 && slave.prostate > 1)) {
- V.madamCashBonus += 0.15;
+ App.EndWeek.saVars.madamBonus += 0.15;
}
} else if (slave.prestigeDesc === "$He is remembered for winning best in show as a breeder.") {
if (canGetPregnant(slave)) {
- V.madamCashBonus += 0.15;
+ App.EndWeek.saVars.madamBonus += 0.15;
} else if (isPreg(slave) && slave.bellyPreg >= 5000) {
- V.madamCashBonus += 0.1;
+ App.EndWeek.saVars.madamBonus += 0.1;
}
}
}
@@ -1817,11 +1817,11 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman
beautyMultiplier += 0.05 * App.Ads.getMatchedCategoryCount(s, "brothel");
}
if (V.MadamID !== 0) {
- if (V.madamCashBonus > 0) {
+ if (App.EndWeek.saVars.madamBonus > 0) {
if (!canHear(s)) {
- beautyMultiplier += V.madamCashBonus * 0.5;
+ beautyMultiplier += App.EndWeek.saVars.madamBonus * 0.5;
} else {
- beautyMultiplier += V.madamCashBonus;
+ beautyMultiplier += App.EndWeek.saVars.madamBonus;
}
}
}
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index b93737ab525..b779aae11fd 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -322,9 +322,6 @@
<<set $coursed = 0, $pitFought = 0, $prestigeAuctioned = 0, $eliteAuctioned = 0, $shelterSlave = 0, $shelterSlaveBought = 0, $slaveMarketLimit = 10 + ($rep / 1000), $slavesSeen = 0, $slavesSacrificedThisWeek = 0, $subSlaves = 0>>
-/* Not sure where to put this one, so here is where it goes for now. slaveJobValues() also adds .sexAmount and .sexQuality to slave objects, perhaps those too should get zeroed somewhere around here? */
-<<set $slaveJobValues = {}>>
-
/% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/
/% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/
<<set $i = 0, $j = 0, $averageProsperity = 0, $motherSlave = -1, $daughterSlave = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index e8f87035e2b..2fea1c094f1 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -103,19 +103,19 @@
<</if>>
<<if $slaves[$i].devotion > 20>>
- <<if $HGSlaveSuccess == 1>>
+ <<if App.EndWeek.saVars.HGSlaveSuccess>>
looks after your Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, freeing _him2 to devote more of _his2 time to looking after your other slaves.
<<else>>
does $his best to look after your Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, but doesn't free up much of _his2 time this week.
<</if>>
<<elseif $slaves[$i].trust < -20>>
- <<if $HGSlaveSuccess == 1>>
+ <<if App.EndWeek.saVars.HGSlaveSuccess>>
obeys Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, freeing _him2 to devote more of _his2 time to looking after your other slaves.
<<else>>
tries to look after your Head Girl <<= SlaveFullName(_S.HeadGirl)>> domestically and sexually, but doesn't free up much of _his2 time this week.
<</if>>
<<else>>
- <<if $HGSlaveSuccess == 1>>
+ <<if App.EndWeek.saVars.HGSlaveSuccess>>
resists Head Girl <<= SlaveFullName(_S.HeadGirl)>>'s domestic and sexual use, but still frees _him2 to devote more of _his2 time to looking after your other slaves.
<<else>>
resists Head Girl <<= SlaveFullName(_S.HeadGirl)>>'s domestic and sexual use, and doesn't free up much of _his2 time this week.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 172bbd2a1b0..f0c4a9e3aec 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1561,7 +1561,6 @@
<</if>>
<<includeDOM App.SlaveAssignment.saSocialEffects($slaves[$i])>>
-<<unset $paraphiliaSatisfied>> /* this should be moved into the above */
<<if $slaves[$i].fuckdoll == 0>>
<<if (!jQuery.isEmptyObject($slaves[$i].brand))>>
--
GitLab