From 4ab90d5b7df3f710afb6df3d26c20e43d13c20d6 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 23 Aug 2021 00:02:23 -0700
Subject: [PATCH] Always reset career when generating related slaves.
Hopefully OK.
---
src/events/recETS/recetsAddictMotherDaughter.js | 3 ++-
src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js | 8 --------
src/npc/generate/generateRelatedSlave.js | 3 +++
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/events/recETS/recetsAddictMotherDaughter.js b/src/events/recETS/recetsAddictMotherDaughter.js
index c572bed90f9..7d3618ce5ac 100644
--- a/src/events/recETS/recetsAddictMotherDaughter.js
+++ b/src/events/recETS/recetsAddictMotherDaughter.js
@@ -44,7 +44,8 @@ App.Events.recetsAddictMotherDaughter = class recetsAddictMotherDaughter extends
const daughter = generateRelatedSlave(mother, "daughter");
daughter.origin = "You tricked $his mother into selling $him into slavery to clear addiction debts.";
- daughter.career = App.Data.Careers.General.uneducated.random();
+ daughter.intelligenceImplant = 0;
+ daughter.career = randomCareer(daughter);
daughter.slaveName = daughter.birthName;
daughter.devotion += 10;
daughter.trust += 10;
diff --git a/src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js b/src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js
index be23e9be32e..fe68dc3f41f 100644
--- a/src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js
+++ b/src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js
@@ -35,14 +35,6 @@ App.Events.recFSEgyptianRevivalistAcquisition = class recFSEgyptianRevivalistAcq
slave.relationship = 4;
slave.relationshipTarget = secondSlave.ID;
- if (secondSlave.actualAge <= 22) {
- secondSlave.career = App.Data.Careers.General.young.random();
- } else if (secondSlave.intelligenceImplant >= 15) {
- secondSlave.career = App.Data.Careers.General.educated.random();
- } else {
- secondSlave.career = App.Data.Careers.General.uneducated.random();
- }
-
/* they've been fucking, obviously, so no virginity */
if (secondSlave.dick > 0) {
if (slave.vagina === 0) {
diff --git a/src/npc/generate/generateRelatedSlave.js b/src/npc/generate/generateRelatedSlave.js
index 0b7273f2fbb..8cf3aa77cfe 100644
--- a/src/npc/generate/generateRelatedSlave.js
+++ b/src/npc/generate/generateRelatedSlave.js
@@ -359,6 +359,9 @@ globalThis.generateRelatedSlave = (function() {
// reset health (but keep condition, which disproportionately influences slave value)
setHealth(slave, slave.health.condition);
+
+ // reset career
+ slave.career = randomCareer(slave);
}
/**
--
GitLab