diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 1e8634c3eec5140a4cdd7d4d779e2854865765f6..3cb3282c27ffbb8652599482f00ddd195aab7319 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -2,7 +2,7 @@
* STANDARD EVENTS
* @param {App.Entity.SlaveState} eventSlave
*/
-globalThis.generateRandomEventPoolStandard = function(eventSlave) {
+globalThis.generateRandomEventPool = function(eventSlave) {
if (eventSlave.fetish !== "mindbroken") {
if (hasAnyArms(eventSlave) && hasAnyLegs(eventSlave)) {
if (canTalk(eventSlave)) {
@@ -1508,833 +1508,6 @@ if(eventSlave.drugs === "breast injections") {
}
};
-/**
- * servants spend a lot of time in the penthouse, so should be eligible for a number (but not all) random events
- * @param {App.Entity.SlaveState} eventSlave
- */
-globalThis.generateRandomEventPoolServant = function(eventSlave) {
- /* STANDARD EVENTS */
-
- if (eventSlave.fetish !== "mindbroken") {
- if (hasAnyArms(eventSlave) && hasAnyLegs(eventSlave)) {
- if (canTalk(eventSlave)) {
- if (V.RECockmilkInterceptionIDs.length > 1 || (V.RECockmilkInterceptionIDs.length === 1 && eventSlave.ID !== V.RECockmilkInterceptionIDs[0])) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.dietCum > 0 || (eventSlave.fetishKnown && eventSlave.fetish === "cumslut")) {
- V.RETSevent.push("cockmilk interception");
- }
- }
- }
-
- if (V.REInterslaveBeggingIDs.length > 1 || (V.REInterslaveBeggingIDs.length === 1 && eventSlave.ID !== V.REInterslaveBeggingIDs[0])) {
- if (V.universalRulesConsent === 1) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.energy > 40) {
- if (canPenetrate(eventSlave)) {
- if (canSee(eventSlave)) {
- if (eventSlave.rules.release.slaves === 1) {
- V.RETSevent.push("interslave begging");
- }
- }
- }
- }
- }
- }
- }
-
- if (V.seeIncest === 1) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.sexualQuirk === "perverted" || eventSlave.energy > 80) {
- if (eventSlave.belly < 100000) {
- if (eventSlave.lactation > 0) {
- if (eventSlave.nipples !== "fuckable") {
- if (eventSlave.rules.release.family === 1) {
- if (eventSlave.daughters > 0) {
- V.RETSevent.push("incestuous nursing");
- }
- }
- }
- }
- }
- }
- }
- }
-
- if (V.assistant.personality === 1) {
- if (V.assistant.appearance !== "normal") {
- if (eventSlave.devotion >= -20) {
- if (canSee(eventSlave)) {
- if (eventSlave.devotion <= 50) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- V.RESSevent.push("PA servant");
- }
- }
- }
- }
- }
- }
-
- if (V.HeadGirlID !== 0) {
- if (eventSlave.devotion <= 50) {
- if (eventSlave.anus !== 0 && canDoAnal(eventSlave)) {
- if (V.HGSeverity >= 0) {
- V.events.push("RE anal punishment");
- }
- V.events.push("RE shower punishment");
- }
- }
- }
-
- if (V.RETasteTestSubIDs.length > 1) {
- if (eventSlave.rules.living === "luxurious") {
- if (eventSlave.devotion > 20) {
- if (eventSlave.energy > 80) {
- if (canTaste(eventSlave)) {
- V.RETSevent.push("taste test");
- }
- }
- }
- }
- }
-
- if (V.weatherToday.severity <= 1) {
- if (eventSlave.trust > 50) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.anus !== 0 && canDoAnal(eventSlave)) {
- if (eventSlave.vagina !== 0) {
- V.RESSevent.push("confident tanning");
- }
- }
- }
- }
- }
-
- if (eventSlave.devotion > 50) {
- if (eventSlave.trust > 50) {
- let giver = 0;
- if (V.HeadGirlID === 0) {
- giver = 1;
- } else if (V.HeadGirlID !== eventSlave.ID) {
- giver = 1;
- }
- if (giver === 1) {
- V.RESSevent.push("a gift");
- }
- }
- }
-
- if (eventSlave.devotion > 50) {
- if (eventSlave.anus > 0) {
- if (eventSlave.vagina !== 0) {
- if (eventSlave.trust > 20) {
- V.RESSevent.push("devoted lotion");
- }
- }
- }
- }
-
- if (eventSlave.devotion <= 95) {
- if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
- V.RESSevent.push("cooler lockin");
- }
- }
-
- if (V.universalRulesConsent === 0) {
- if (eventSlave.devotion > 50) {
- if (eventSlave.fetish === "sadist" || eventSlave.fetish === "dom" || eventSlave.energy > 95) {
- if (V.REShowerForceSubIDs.length > 0) {
- if (eventSlave.trust <= 75) {
- V.RETSevent.push("shower force");
- }
- }
- if (eventSlave.anus > 0) {
- if (V.RESadisticDescriptionSubIDs.length > 0) {
- V.RETSevent.push("sadistic description");
- }
- }
- }
- if (V.REIfYouEnjoyItSubIDs.length > 0) {
- V.RETSevent.push("if you enjoy it");
- }
- }
- }
-
- if (V.boobAccessibility !== 1 && V.ballsAccessibility !== 1 && V.pregAccessibility !== 1) {
- if (eventSlave.boobs > 10000) {
- if (eventSlave.devotion >= -20) {
- if (V.slaves.length > 2) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- V.RESSevent.push("huge tits");
- }
- }
- }
- }
- }
-
- if (V.seeAge !== 0) {
- if (eventSlave.devotion > 50) {
- if (eventSlave.rules.speech !== "restrictive") {
- if (eventSlave.birthWeek >= 51) {
- /* let's give this a much higher chance of appearing */
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- V.RESSevent.push("birthday");
- }
- }
- }
- }
-
- if (eventSlave.slaveName !== eventSlave.birthName && eventSlave.birthName !== "") {
- if (eventSlave.devotion <= 20) {
- if (eventSlave.trust >= -20) {
- if (eventSlave.anus > 0 && canDoAnal(eventSlave)) {
- V.RESSevent.push("not my name");
- }
- }
- }
- }
-
- if (V.slaves.length > 2) {
- if (eventSlave.devotion >= -20) {
- if (eventSlave.heels === 1) {
- if (shoeHeelCategory(eventSlave) > 0) {
- V.RESSevent.push("tendon fall");
- }
- }
- }
- }
-
- if (eventSlave.devotion > 50) {
- if (eventSlave.trust > 20) {
- if (eventSlave.physicalAge > 37) {
- if (eventSlave.anus > 0) {
- if (eventSlave.vagina > 0) {
- V.RESSevent.push("devoted old");
- }
- }
- }
- }
- }
-
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > 20) {
- if (eventSlave.actualAge > 35) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- if (V.PC.actualAge < 25) {
- V.RESSevent.push("young PC age difference");
- }
- }
- }
- }
- }
-
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > 20) {
- if (eventSlave.actualAge < 22) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- if (V.PC.actualAge >= 50) {
- V.RESSevent.push("old PC age difference");
- }
- }
- }
- }
- }
-
- if (eventSlave.fetish === "humiliation" || eventSlave.energy > 95) {
- if (eventSlave.devotion <= 50) {
- if (eventSlave.devotion >= -20) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- if (eventSlave.vagina !== 0) {
- if (eventSlave.anus !== 0) {
- if (eventSlave.fetishKnown === 1) {
- V.RESSevent.push("fearful humiliation");
- }
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.rules.living === "luxurious") {
- if (eventSlave.devotion <= 75) {
- if (eventSlave.devotion > 50) {
- V.RESSevent.push("newly devoted sunrise");
- }
- }
- }
-
- if (V.spa > 0) {
- if (eventSlave.boobs > 2000) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > 20) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- V.RESSevent.push("spa boobs");
- }
- }
- }
- }
- }
-
- if (eventSlave.lactation > 0) {
- if (eventSlave.boobs > 800) {
- if (eventSlave.nipples !== "fuckable") {
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > 20) {
- V.RESSevent.push("cow milking");
- }
- }
- }
- }
- }
-
- if (V.arcologies[0].FSSubjugationist !== "unset") {
- if (eventSlave.race !== V.arcologies[0].FSSubjugationistRace) {
- if (V.week - eventSlave.weekAcquired > 1) {
- if (V.week - eventSlave.weekAcquired < 10) {
- if (eventSlave.devotion < -20) {
- if (eventSlave.trust >= -20) {
- if (eventSlave.health.condition > -20) {
- if (eventSlave.race === eventSlave.origRace) {
- if (eventSlave.indentureRestrictions < 1) {
- V.RESSevent.push("subjugation blues");
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.fetish === "sadist") {
- if (eventSlave.fetishStrength > 20) {
- if (App.Entity.facilities.arcade.established) {
- if (eventSlave.trust >= -20) {
- if (eventSlave.devotion > 50) {
- if (eventSlave.belly < 300000) {
- V.RESSevent.push("arcade sadist");
- }
- }
- }
- }
- }
- }
-
- if (V.PC.vagina > -1) {
- if (eventSlave.devotion <= 20) {
- if ((eventSlave.trust >= -20 && eventSlave.behavioralFlaw === "arrogant") || (eventSlave.trust > 20)) {
- if (eventSlave.muscles > 30) {
- if (eventSlave.health.condition > 20) {
- if (eventSlave.energy > 50) {
- if (canPenetrate(eventSlave)) {
- if (V.BodyguardID === 0) {
- V.RESSevent.push("mutinery attempt");
- }
- }
- }
- }
- }
- }
- }
- }
- } /* closes mute exempt */
-
- if (eventSlave.devotion > 20) {
- if (eventSlave.mouthAccessory !== "none") {
- V.RESSevent.push("gagged slave");
- }
- }
-
- if (V.seeAge === 1) {
- if (eventSlave.actualAge < 18) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.ovaries === 1) {
- if (eventSlave.pubertyXX === 0) {
- if (eventSlave.preg === 0) {
- if (eventSlave.physicalAge + eventSlave.birthWeek / 52 >= eventSlave.pubertyAgeXX - 0.5) {
- V.RESSevent.push(...Array.from({length: 10}, () => "first period"));
- }
- }
- }
- }
- if (canPenetrate(eventSlave)) {
- if (eventSlave.balls > 0) {
- if (eventSlave.pubertyXY === 0) {
- if (eventSlave.physicalAge + eventSlave.birthWeek / 52 >= eventSlave.pubertyAgeXY - 0.5) {
- V.RESSevent.push(...Array.from({length: 10}, () => "wet dreams"));
- }
- }
- }
- }
- }
- }
- } /* closes aging exemption */
-
-
- if (eventSlave.devotion >= -150) {
- if (eventSlave.devotion <= 50) {
- V.events.push("RE standard punishment");
- }
- }
-
- if (eventSlave.trust > 20) {
- if (eventSlave.devotion > 50) {
- if (V.PC.belly < 5000) {
- V.RESSevent.push("shower slip");
- }
- if (getLimbCount(eventSlave, 102) === 4) {
- V.RESSevent.push("plimb help");
- }
- }
- }
-
- if (eventSlave.relationship <= -2) {
- if (eventSlave.trust > 50) {
- if (eventSlave.devotion > 50) {
- V.RESSevent.push("bonded love");
- }
- }
- }
-
- if (eventSlave.trust > 20) {
- if (eventSlave.devotion > 50) {
- V.RESSevent.push("objectifying visit");
- }
- }
-
- if (canWalk(eventSlave)) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > -10) {
- if (eventSlave.ID !== V.HeadGirlID) {
- if (eventSlave.ID !== V.ConcubineID) {
- V.RESSevent.push("refreshment delivery");
- }
- }
- }
- }
- }
-
- if (eventSlave.dick > 8) {
- if (eventSlave.balls > 0) {
- if (eventSlave.energy > 60) {
- if (eventSlave.devotion > 50) {
- if (eventSlave.trust > 50) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- if (eventSlave.belly < 100000) {
- V.RESSevent.push("dick wringing");
- }
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.balls > 0) {
- if (eventSlave.scrotum > 0) {
- if (eventSlave.chastityPenis === 1) {
- if (eventSlave.devotion <= 95) {
- if (eventSlave.energy > 50) {
- if (eventSlave.energy < 95) {
- if (eventSlave.devotion >= -20 || eventSlave.trust < -20) {
- V.RESSevent.push("cage relief");
- }
- }
- }
- }
- }
- }
- }
-
- if (V.PC.dick > 0) {
- if (V.PC.boobs >= 300) {
- if (canSee(eventSlave)) {
- if (eventSlave.devotion <= 50) {
- if (eventSlave.devotion >= -20) {
- if (((eventSlave.attrXY <= 35) && (eventSlave.attrXX > 65)) || ((eventSlave.attrXX <= 35) && (eventSlave.attrXY > 65))) {
- V.RESSevent.push("dickgirl PC");
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.trust <= 20) {
- if (eventSlave.trust >= -75) {
- if (eventSlave.devotion <= 30) {
- if (eventSlave.devotion >= -20) {
- V.RESSevent.push("like me");
- }
- }
- }
- }
-
- if (eventSlave.devotion < -20) {
- if (eventSlave.trust >= -20) {
- if (eventSlave.clothes === "uncomfortable straps") {
- V.RESSevent.push("bondage gear");
- }
- }
- }
-
- if (eventSlave.labia > 1 && eventSlave.vagina >= 0) {
- if (eventSlave.muscles > 5 || eventSlave.diet === "muscle building") {
- if (eventSlave.belly < 10000) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > 20) {
- V.RESSevent.push("inconvenient labia");
- }
- }
- }
- }
- }
-
- if (eventSlave.devotion <= 50) {
- if (eventSlave.trust >= -50) {
- if (eventSlave.behavioralFlaw === "gluttonous") {
- if (eventSlave.diet === "restricted") {
- V.RESSevent.push("diet");
- }
- }
- }
- }
-
- if (eventSlave.devotion <= 20) {
- if (eventSlave.devotion >= -50) {
- V.RESSevent.push("resistant shower");
- }
- }
-
- if (eventSlave.rules.speech !== "restrictive") {
- if (eventSlave.devotion >= -20) {
- if (eventSlave.trust >= -20) {
- if (eventSlave.energy > 75) {
- if (eventSlave.fetish !== "buttslut") {
- if (eventSlave.vagina !== 0 || eventSlave.anus !== 0) {
- V.RESSevent.push("night visit");
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.rules.release.masturbation === 0) {
- if (eventSlave.need) {
- if (eventSlave.devotion <= 95) {
- if (eventSlave.trust >= -20) {
- if ((eventSlave.chastityPenis !== 1) || (eventSlave.dick === 0)) {
- V.RESSevent.push("forbidden masturbation");
- }
- }
- }
- if (eventSlave.devotion >= -20) {
- if (eventSlave.trust >= -50) {
- V.RESSevent.push("desperately horny");
- }
- }
- }
- }
-
- if (eventSlave.devotion >= -20) {
- if (eventSlave.lactation > 1) {
- if (canDoVaginal(eventSlave) || canDoAnal(eventSlave)) {
- V.RESSevent.push("milkgasm");
- }
- }
- }
-
- if (eventSlave.dick > 0) {
- if (eventSlave.balls === 0) {
- if (eventSlave.genes === "XY") {
- if (eventSlave.devotion <= 50) {
- if (eventSlave.trust < -50) {
- if (eventSlave.anus > 0) {
- if (canDoAnal(eventSlave)) {
- V.RESSevent.push("resistant gelding");
- }
- }
- }
- }
- }
- }
- }
-
- if (V.seePreg !== 0) {
- if (isFertile(eventSlave)) {
- if (eventSlave.devotion > 50) {
- if (V.PC.dick !== 0) {
- if (eventSlave.fetish === "pregnancy" || eventSlave.energy > 95) {
- if (eventSlave.eggType === "human") {
- if (eventSlave.fetishKnown === 1) {
- if (eventSlave.vagina !== 0) {
- if (eventSlave.anus > 0) {
- if (eventSlave.geneticQuirks.superfetation === 2 && (eventSlave.intelligence + eventSlave.intelligenceImplant > 15) && eventSlave.womb.length > 0) {
- if (eventSlave.belly < (eventSlave.pregAdaptation * 1750)) {
- V.RESSevent.push("impregnation please");
- }
- } else {
- V.RESSevent.push("impregnation please");
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
- if (plugWidth(eventSlave) > 1) {
- if (isSlaveAvailable(eventSlave)) {
- if (eventSlave.devotion <= 20) {
- if (eventSlave.trust >= -50) {
- if (eventSlave.anus < 3) {
- V.RESSevent.push("plug disobedience");
- }
- }
- }
- }
- }
- } /* closes amp/crawling exempt */
-
- if (canTalk(eventSlave)) {
- if (eventSlave.rules.speech !== "restrictive") {
- if (eventSlave.boobsImplant > 400) {
- if (eventSlave.lipsImplant >= 30) {
- if (eventSlave.buttImplant > 3) {
- if (eventSlave.boobs < 9000 || eventSlave.butt < 8) {
- V.RESSevent.push("surgery addict");
- }
- }
- }
- }
- }
-
- if (eventSlave.rules.speech !== "restrictive") {
- if (eventSlave.counter.oral + eventSlave.counter.vaginal + eventSlave.counter.anal > 900) {
- if (eventSlave.counter.oral + eventSlave.counter.vaginal + eventSlave.counter.anal < 1100) {
- if (eventSlave.vagina !== 0) {
- if (eventSlave.anus > 0) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- V.RESSevent.push("millenary");
- }
- }
- }
- }
- }
- }
-
- if (V.expansionRequestsAllowed > 0) {
- if (eventSlave.drugs === "no drugs") {
- if (eventSlave.rules.speech === "permissive") {
- if (eventSlave.health.condition > 20) {
- if (eventSlave.devotion >= -20) {
- if (eventSlave.trust > 20) {
- if (V.arcologies[0].FSSlimnessEnthusiast === "unset") {
- V.RESSevent.push("injections please");
- }
- }
- }
- }
- }
- }
- }
- } /* closes mute exempt */
-
- if (V.assistant.personality === 1) {
- if (eventSlave.fetishKnown === 1) {
- if (eventSlave.energy > 95) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.rules.release.masturbation === 1) {
- V.RESSevent.push("nympho with assistant");
- }
- }
- }
- }
- }
-
-
- if (eventSlave.minorInjury === "sore ass") {
- if (eventSlave.devotion <= 50) {
- V.RESSevent.push("sore ass");
- }
- }
-
- if (eventSlave.sexualFlaw === "hates oral") {
- if (V.PC.dick !== 0) {
- if (eventSlave.devotion <= 50) {
- V.RESSevent.push("hates oral");
- }
- }
- }
-
- if (eventSlave.devotion <= 50) {
- V.RESSevent.push("scrubbing");
- }
-
- if (eventSlave.devotion <= 20) {
- if (eventSlave.clothes === "a slutty maid outfit" || eventSlave.clothes === "a nice maid outfit") {
- V.RESSevent.push("servant maid");
- }
- }
-
- if (eventSlave.aphrodisiacs > 1 || eventSlave.inflationType === "aphrodisiac") {
- if (eventSlave.rules.speech === "restrictive" && eventSlave.rules.release.master === 1 && App.Utils.releaseRestricted(eventSlave)) {
- V.RESSevent.push("extreme aphrodisiacs");
- }
- }
-
- if (eventSlave.rules.release.masturbation === 1) {
- if (eventSlave.dick > 4) {
- if (hasAnyArms(eventSlave)) {
- if (canAchieveErection(eventSlave)) {
- if (eventSlave.belly < 10000) {
- if (eventSlave.chastityPenis !== 1) {
- V.RESSevent.push("slave dick huge");
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.heels === 1) {
- if (eventSlave.shoes === "heels" || eventSlave.shoes === "extreme heels") {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- V.RESSevent.push("heels");
- }
- }
- }
-
- if (eventSlave.rules.release.masturbation === 1) {
- if (eventSlave.belly < 300000) {
- if (eventSlave.anus > 2) {
- if (eventSlave.fetish === "buttslut" || eventSlave.energy > 95) {
- if (eventSlave.fetish !== "none") {
- if (canHold(eventSlave)) {
- if (canDoAnal(eventSlave)) {
- V.RESSevent.push("loose buttslut");
- }
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.boobs > 1200) {
- if (eventSlave.areolaeShape !== "circle") {
- if (eventSlave.devotion > 50) {
- V.RESSevent.push("shaped areolae");
- }
- }
- }
-
- if (V.seePreg !== 0) {
- if (eventSlave.bellyPreg >= 10000) {
- V.RESSevent.push("hugely pregnant");
- }
- }
-
- if (eventSlave.hormoneBalance >= 50) {
- if (eventSlave.vagina === -1) {
- if (eventSlave.balls >= 0) {
- if (eventSlave.devotion > 20 || eventSlave.trust < -20) {
- if (eventSlave.devotion <= 50) {
- if (eventSlave.fetish !== "buttslut") {
- if (eventSlave.rules.speech === "permissive") {
- V.RESSevent.push("hormone dysfunction");
- }
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.vaginaPiercing > 1) {
- if (eventSlave.nipplesPiercing > 1) {
- if (eventSlave.clitPiercing > 1) {
- if (eventSlave.devotion > 20 || eventSlave.trust < -20) {
- if (eventSlave.devotion <= 50) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- V.RESSevent.push("heavy piercing");
- }
- }
- }
- }
- }
- }
-
- if (eventSlave.anus === 0) {
- if (eventSlave.devotion < -20) {
- if (eventSlave.trust >= -20) {
- V.RESSevent.push("resistant anal virgin");
- }
- }
- }
-
- if (V.PC.dick !== 0) {
- if (eventSlave.bellyPreg >= 300000) {
- V.RESSevent.push("hyperpreg stuck");
- }
- }
-
- if (eventSlave.devotion >= 50) {
- if (eventSlave.trust <= 20) {
- if (canWalk(eventSlave)) {
- V.RESSevent.push("devoted fearful slave");
- }
- }
- }
-
- if (eventSlave.relationship === 4) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust > 20) {
- V.events.push("RE slave marriage");
- }
- }
- }
-
- if (V.eventResults.snatch === 0 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
- if (V.geneticMappingUpgrade === 2 && eventSlave.health.condition > 25 && eventSlave.devotion > 50 && V.cash > V.surgeryCost * 4) {
- /* only one slave ever qualifies, so give it a bit more weight */
- V.events.push("RE snatch and grab followup");
- V.events.push("RE snatch and grab followup");
- V.events.push("RE snatch and grab followup");
- }
- }
-
- /* NICKNAME EVENTS */
-
- if (V.nicknamesAllowed === 1) {
- let toSearch = eventSlave.slaveName.toLowerCase();
- if (!toSearch.includes("'")) {
- if (V.week - eventSlave.weekAcquired >= 4) {
- V.events.push("RE nickname");
- V.seed = 0;
- }
- } /* closes nickname check */
- } /* closes no nicknames option */
- } /* closes mindbreak exempt */
-
- if (eventSlave.fetish === "mindbroken") {
- if (canWalk(eventSlave)) {
- V.RESSevent.push("mindbroken morning");
- }
- }
-};
-
globalThis.populateEventArray = function(RESS = V.RESSevent.length, RESSTR = V.RESSTRevent.length, RETS = V.RETSevent.length, RECI = V.RECIevent.length) {
/* EVENT RANDOMIZATION */
let events = V.events;
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index cbe9fa27a51bbc5e5ea7209c4810e70c99532a75..b6f313cdabc9f3c9b93561c05fb68912c5ed6200 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -100,11 +100,7 @@
<</if>>
<</for>>
- <<if $eventSlave.assignment == "work as a servant">>
- <<run generateRandomEventPoolServant($eventSlave)>>
- <<else>>
- <<run generateRandomEventPoolStandard($eventSlave)>>
- <</if>>
+ <<run generateRandomEventPool($eventSlave)>>
/* EVENT RANDOMIZATION */
<<set $events = populateEventArray().concat(App.Events.getIndividualEventsPassageList($eventSlave))>>