diff --git a/src/events/recETS/recetsAddictMotherDaughter.js b/src/events/recETS/recetsAddictMotherDaughter.js index c572bed90f91e58021c613818f896bec5a8679c8..7d3618ce5ac6d72e670c90fab9a9b38db5e87cc7 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/recETS/recetsIncestTwinBrother.js b/src/events/recETS/recetsIncestTwinBrother.js index 5b187938e006287e8a4d430832800ed208917f98..181131c5a58931ae1c0d29c258d69a1c1a18c285 100644 --- a/src/events/recETS/recetsIncestTwinBrother.js +++ b/src/events/recETS/recetsIncestTwinBrother.js @@ -38,15 +38,11 @@ App.Events.recetsIncestTwinBrother = class recetsIncestTwinBrother extends App.E brother1.relationship = 3; const brother2 = generateRelatedSlave(brother1, "twin"); - brother2.slaveName = brother2.birthName; brother2.height += random(-5, 5); brother2.relationship = 3; brother2.relationshipTarget = brother1.ID; brother1.relationshipTarget = brother2.ID; - WombChangeGene(brother1, "fatherName", brother2.slaveName); - WombChangeGene(brother1, "motherName", brother1.slaveName); - const { sister } = getPronouns(brother1); diff --git a/src/events/recETS/recetsIncestTwinsMixed.js b/src/events/recETS/recetsIncestTwinsMixed.js index 41a173380eaf8ac05d615ea2af2cdbf192dde6d3..591ad9cb539e93ad186ff0704a109d83fda8fcb4 100644 --- a/src/events/recETS/recetsIncestTwinsMixed.js +++ b/src/events/recETS/recetsIncestTwinsMixed.js @@ -64,6 +64,9 @@ App.Events.recetsIncestTwinsMixed = class recetsIncestTwinsMixed extends App.Eve sis2.relationshipTarget = sis1.ID; sis1.relationshipTarget = sis2.ID; + WombChangeGene(sis1, "fatherName", sis2.slaveName); + WombChangeGene(sis1, "motherName", sis1.slaveName); + const {HeA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); App.Events.addParagraph(node, [`You receive so many messages, as a noted titan of the new Free Cities world, that ${V.assistant.name} has to be quite draconian in culling them. ${HeA} lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.`]); diff --git a/src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js b/src/events/recFS/recfsFSEgyptianRevivalistAcquisition.js index be23e9be32e16a412d38c0bcc820e136efa62ffa..fe68dc3f41f681c34e9f297983c24a3d8f2eaf8a 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 0b7273f2fbbad6756f6d43aa0d13e8c58dcf6d5c..8cf3aa77cfe1faef9b932075f7d7e27cee1dfec3 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); } /** diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js index 23b0fdf4223504d4bcfda118858fae19a7339c30..aad7bf50564b86a2fdc5ecc045ba964852a5d4c5 100644 --- a/src/npc/generate/newSlaveIntro.js +++ b/src/npc/generate/newSlaveIntro.js @@ -490,10 +490,10 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest = slave.devotion -= 3; slave.trust += 10; } else if (PC.career === "gang") { - r.push(`${He} recognizes you from various crime reports, <span class="fear inc">filling ${him} with fear</span> over what life under you will be like.`); + r.push(`${He} recognizes you from various crime reports, <span class="trust dec">filling ${him} with fear</span> over what life under you will be like.`); slave.trust -= 10; } else if ((PC.career === "hoodlum" || PC.career === "street urchin") && canSee(slave)) { // switch to tat? - r.push(`${He} scoffs at first at being owned by such a colorful character, <span class="fear inc">but ${he} soon pales</span> once ${he} sees the gang signs adorning your neck.`); + r.push(`${He} scoffs at first at being owned by such a colorful character, <span class="trust dec">but ${he} soon pales</span> once ${he} sees the gang signs adorning your neck.`); slave.trust -= 10; }