diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index de6a7491309fd534af094a4a9d8d1eb9d72a747b..d5791df155a753f5016b1b192b483335531ae773 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1000,6 +1000,7 @@ App.Data.resetOnNGPlus = {
HGCum: 0,
RecruiterID: 0,
recruiterTarget: "desperate whores",
+ oldRecruiterTarget: "desperate whores",
recruiterProgress: 0,
recruiterIdleRule: "number",
recruiterIdleNumber: 20,
diff --git a/src/endWeek/saRecruitGirls.js b/src/endWeek/saRecruitGirls.js
index f24e45ff494a8643fefaf5d7ad7ba20368d680c7..0abd80f15469fc501be31c27f15f4431b592edd4 100644
--- a/src/endWeek/saRecruitGirls.js
+++ b/src/endWeek/saRecruitGirls.js
@@ -4,12 +4,14 @@ App.SlaveAssignment.recruitGirls = (function() {
let r;
// eslint-disable-next-line no-unused-vars
- let he, him, his, hers, himself, girl, woman, loli, He, His;
+ let he, him, his, hers, himself, girl, woman, women, loli, He, His;
let idleTarget;
let arcology;
let targetArcology;
let slaveInt;
+ let recruiterRelation;
+ let clubSeed;
return recruitGirls;
@@ -22,15 +24,17 @@ App.SlaveAssignment.recruitGirls = (function() {
arcology = V.arcologies[0];
slaveInt = slave.intelligence + slave.intelligenceImplant;
+ recruiterRelation = arcology.FSEgyptianRevivalist !== "unset" ? randomRelatedAvailableSlave(slave) : null;
+ clubSeed = arcology.FSEdoRevivalist !== "unset" ? getClubSeed() : 0;
({
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, girl, woman, He, His, loli
+ he, him, his, hers, himself, girl, woman, women, He, His, loli
} = getPronouns(slave));
calcIdleTarget(slave);
physicalAdjustments(slave);
- if (slave.tired > 80) {
+ if (slave.health.tired > 80) {
tooTired(slave);
} else if (V.recruiterTarget === "other arcologies") {
influenceNeighbor(slave);
@@ -43,6 +47,22 @@ App.SlaveAssignment.recruitGirls = (function() {
return r.join(" ");
}
+ /** Get club seed for Edo Revivalist bonuses
+ * @returns {number}
+ */
+ function getClubSeed() {
+ let seed = 0;
+ if (V.clubDecoration !== "standard" && App.Entity.facilities.club.employeesIDs().size > 1) {
+ if (V.clubAdsSpending > 0) {
+ seed = (V.clubBonuses + Math.abs(V.clubAdsOld) + Math.abs(V.clubAdsStacked) + Math.abs(V.clubAdsImplanted) + Math.abs(V.clubAdsModded) + Math.abs(V.clubAdsXX));
+ } else {
+ seed = V.clubBonuses;
+ // protip: some FS reduce bonuses available, use ad spending to get counted in that category
+ }
+ }
+ return seed;
+ }
+
/**
* @param {App.Entity.SlaveState} slave
*
@@ -1002,8 +1022,8 @@ App.SlaveAssignment.recruitGirls = (function() {
seed += 1;
}
} else {
- if (slave.balls < 1 && (slave.bellPreg >= 1500 || setup.fakeBellies.includes(slave.bellyAccessory))) {
- if (slave.bellPreg >= 1500) {
+ if (slave.balls < 1 && (slave.bellyPreg >= 1500 || setup.fakeBellies.includes(slave.bellyAccessory))) {
+ if (slave.bellyPreg >= 1500) {
seed += 4;
} else {
seed += 1;
@@ -1257,7 +1277,6 @@ App.SlaveAssignment.recruitGirls = (function() {
}
}
} else if (arcology.FSEgyptianRevivalist !== "unset") {
- let recruiterRelation = randomRelatedAvailableSlave(slave);
if (recruiterRelation) {
// willingness; protip: relationship optional, and actual sex doesn't need to be allowed
if ((slave.energy > 60 || slave.sexualQuirk === "tease" || slave.sexualQuirk === "perverted") && (recruiterRelation.energy > 60 || recruiterRelation.sexualQuirk === "tease" || recruiterRelation.sexualQuirk === "perverted")) {
@@ -1267,19 +1286,10 @@ App.SlaveAssignment.recruitGirls = (function() {
}
}
} else if (arcology.FSEdoRevivalist !== "unset") {
- let clubSeed;
- if (V.clubDecoration !== "standard" && App.Entity.facilities.club.employeesIDs().size > 1) {
- if (V.clubAdsSpending > 0) {
- clubSeed = (V.clubBonuses + Math.abs(V.clubAdsOld) + Math.abs(V.clubAdsStacked) + Math.abs(V.clubAdsImplanted) + Math.abs(V.clubAdsModded) + Math.abs(V.clubAdsXX));
- } else {
- clubSeed = V.clubBonuses;
- // protip: some FS reduce bonuses available, use ad spending to get counted in that category
- }
- if (clubSeed >= 3) {
- seed += 6;
- FSmatch++;
- arcology.FSEdoRevivalist += 0.02 * V.FSSingleSlaveRep;
- }
+ if (clubSeed >= 3) {
+ seed += 6;
+ FSmatch++;
+ arcology.FSEdoRevivalist += 0.02 * V.FSSingleSlaveRep;
}
} else if (arcology.FSArabianRevivalist !== "unset") {
if (V.masterSuiteDecoration === "Arabian Revivalist" && V.masterSuiteUpgradeLuxury > 0 && V.masterSuiteAverageEnergy > 60 && App.Entity.facilities.masterSuite.employeesIDs().size >= 3) {
@@ -1440,7 +1450,7 @@ App.SlaveAssignment.recruitGirls = (function() {
if (arcology.FSRestart === "unset") {
if (slave.bellyPreg >= 1500) {
r.push(`${He} unashamedly live streams an obstetric health check in the nude, promising to broadcast similar footage right up until, and during, the birth.`);
- } else if (setup.fakeBellies.includes(_bellyAccessory)) {
+ } else if (setup.fakeBellies.includes(slave.bellyAccessory)) {
r.push(`With some discreet editing, ${he} uploads fake ultrasounds to match ${his} plastic pregnancy, bringing a little more attention to your fertility campaigns.`);
} else {
r.push(`${He} posts plenty of snapshots of gravid mothers-to-be. But with no belly bump of ${his} own to feature, the impact is no different from any preggo porn already floating around the net.`);
@@ -1567,7 +1577,7 @@ App.SlaveAssignment.recruitGirls = (function() {
}
} else if (arcology.FSMaturityPreferentialist !== "unset") {
if (slave.actualAge >= 30) {
- r.push(`${He} video blogs regularly about the financial, medical, and even emotional security of slave life for older ${V.women}.`);
+ r.push(`${He} video blogs regularly about the financial, medical, and even emotional security of slave life for older ${women}.`);
} else {
r.push(`${He} uses too much youthful slang and jumps from topic to topic in ${his} video blogs, making them difficult for ${his} audience to follow.`);
}
@@ -1604,7 +1614,7 @@ App.SlaveAssignment.recruitGirls = (function() {
}
if (arcology.FSPastoralist !== "unset") {
if (V.dairy) {
- if (DairyL && FSIntMod > ((V.dairyRestraintsSetting + 1) * 30) && V.dairyRestraintsSetting < 2) {
+ if (App.Entity.facilities.dairy.employeesIDs().size > 0 && FSIntMod > ((V.dairyRestraintsSetting + 1) * 30) && V.dairyRestraintsSetting < 2) {
if (slave.lactation > 0) {
r.push(`${He} schedules VR tours of ${V.dairyName} in order to popularize your free-range practices and quality products: the highlight each time is when ${he} hooks ${his} own teats into a milker and brings ${himself} to orgasm.`);
} else {
@@ -1712,7 +1722,7 @@ App.SlaveAssignment.recruitGirls = (function() {
} else if (arcology.FSEgyptianRevivalist !== "unset") {
if (totalRelatives(slave) > 0) {
if (recruiterRelation) {
- relationType = relativeTerm(slave, recruiterRelation);
+ const relationType = relativeTerm(slave, recruiterRelation);
if (slave.energy > 60 || slave.sexualQuirk === "tease" || slave.sexualQuirk === "perverted") {
if (recruiterRelation.energy > 60 || recruiterRelation.sexualQuirk === "tease" || recruiterRelation.sexualQuirk === "perverted") {
r.push(`${slave.slaveName} and ${his} ${relationType} ${recruiterRelation.slaveName} collaborate on a series of short commercials showing them `);