diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 1c8095fc4e5714cf48aa349b386371a94d600929..e94e0b16e3cc0bda150a5b51edacc9eeaee9d623 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -89,7 +89,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.devotion >= -20) {
if (canSee(eventSlave)) {
if (eventSlave.devotion <= 50) {
- if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
+ if (eventSlave.assignment === "be a servant") {
if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
State.variables.RESSevent.push("PA servant");
}
@@ -375,7 +375,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.face >= -10) {
if (eventSlave.devotion >= 10) {
- if (eventSlave.assignment === "serve the public" || eventSlave.assignment === "whore") {
+ if (["serve the public", "whore"].includes(eventSlave.assignment)) {
if (State.variables.REUglyCheckinIDs.includes(eventSlave.ID)) {
State.variables.RECIevent.push("ugly");
}
@@ -413,7 +413,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
*/
- if (eventSlave.assignment === "be a servant" || eventSlave.assignment === "work as a servant") {
+ if (eventSlave.assignment === "be a servant") {
if (eventSlave.devotion <= 95) {
if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
State.variables.RESSevent.push("cooler lockin");
@@ -603,7 +603,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (State.variables.PC.dick === 1) {
if (State.variables.PC.belly < 5000) {
- if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
+ if (eventSlave.assignment === "be a servant") {
if (eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw === "hates men" || eventSlave.sexualFlaw === "repressed") {
if (eventSlave.devotion >= -20) {
if (eventSlave.trust > 20) {
@@ -709,7 +709,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.physicalAge > 35) {
if (eventSlave.speechRules !== "restrictive") {
- if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(eventSlave.assignment)) {
+ if (["serve the public", "whore"].includes(eventSlave.assignment)) {
if (eventSlave.devotion >= -20) {
if (eventSlave.devotion <= 95) {
State.variables.RESSevent.push("ara ara");
@@ -1232,7 +1232,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.skill.entertainment >= 100) {
if (eventSlave.trust > 50) {
- if (["serve in the club", "serve the public"].includes(eventSlave.assignment)) {
+ if (eventSlave.assignment === "serve the public") {
State.variables.RESSevent.push("masterful entertainer");
}
}
@@ -1240,7 +1240,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.skill.whoring >= 100) {
if (eventSlave.trust > 50) {
- if (["whore", "work in the brothel"].includes(eventSlave.assignment)) {
+ if (eventSlave.assignment === "whore") {
State.variables.RESSevent.push("masterful whore");
}
}
@@ -1300,7 +1300,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (["serve in the club", "serve the public", "whore", "work in the brothel"].includes(eventSlave.assignment)) {
+ if (["serve the public", "whore"].includes(eventSlave.assignment)) {
if (eventSlave.vagina !== 0) {
if (eventSlave.anus !== 0) {
if (canDoAnal(eventSlave)) {
@@ -1352,7 +1352,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (eventSlave.assignment === "please you") {
+ if (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment)) {
if (eventSlave.devotion > 20) {
if (eventSlave.trust >= -20) {
if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
@@ -1381,30 +1381,6 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
}
}
}
- } else if (["be your Concubine", "serve in the master suite"].includes(eventSlave.assignment)) {
- if (eventSlave.devotion > 20) {
- if (eventSlave.trust >= -20) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- if ((eventSlave.chastityPenis !== 1) || (eventSlave.dick === 0)) {
- if (State.variables.corpIncorporated !== 0) {
- State.variables.RESSevent.push("shift sleep");
- }
- if (eventSlave.skill.entertainment >= 60) {
- State.variables.RESSevent.push("shift doorframe");
- }
- }
- if (canDoVaginal(eventSlave)) {
- if (State.variables.PC.vagina === 1) {
- if (eventSlave.dick === 0) {
- if (State.variables.fuckSlaves > 2) {
- State.variables.RESSevent.push("fucktoy tribbing");
- }
- }
- }
- }
- }
- }
- }
}
if (eventSlave.speechRules !== "restrictive") {
@@ -1510,7 +1486,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.devotion > 50) {
if (eventSlave.trust > 50) {
- if (eventSlave.assignment === "please you" || eventSlave.assignment === "serve in the master suite" || eventSlave.assignment === "be your Concubine") {
+ if (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment)) {
State.variables.RESSevent.push("bed snuggle");
}
}
@@ -1731,7 +1707,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.fetishKnown === 1) {
if (eventSlave.fetish === "cumslut" || eventSlave.energy > 95) {
- if (["serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes(eventSlave.assignment)) {
+ if (["serve the public", "whore", "work a glory hole"].includes(eventSlave.assignment)) {
if (eventSlave.devotion > 20) {
if (State.variables.PC.dick !== 0) {
State.variables.RESSevent.push("cumslut whore");
@@ -1800,7 +1776,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.balls > 6) {
if (eventSlave.dick > 6) {
- if (eventSlave.assignment === "work in the dairy" || eventSlave.assignment === "get milked") {
+ if (eventSlave.assignment === "get milked") {
State.variables.events.push("RE legendary balls");
}
}
@@ -1921,10 +1897,8 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.devotion >= -20) {
if (canSee(eventSlave)) {
if (eventSlave.devotion <= 50) {
- if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
- if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
- State.variables.RESSevent.push("PA servant");
- }
+ if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
+ State.variables.RESSevent.push("PA servant");
}
}
}
@@ -2014,11 +1988,9 @@ window.generateRandomEventPoolServant = function(eventSlave) {
}
}
- if (eventSlave.assignment === "be a servant" || eventSlave.assignment === "work as a servant") {
- if (eventSlave.devotion <= 95) {
- if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
- State.variables.RESSevent.push("cooler lockin");
- }
+ if (eventSlave.devotion <= 95) {
+ if (eventSlave.intelligence + eventSlave.intelligenceImplant < -50) {
+ State.variables.RESSevent.push("cooler lockin");
}
}
@@ -2178,12 +2150,10 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (State.variables.PC.dick === 1) {
if (State.variables.PC.belly < 5000) {
- if (["be a servant", "work as a servant"].includes(eventSlave.assignment)) {
- if (eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw === "hates men" || eventSlave.sexualFlaw === "repressed") {
- if (eventSlave.devotion >= -20) {
- if (eventSlave.trust > 20) {
- State.variables.RESSevent.push("frightening dick");
- }
+ if (eventSlave.attrXY <= 35 || eventSlave.behavioralFlaw === "hates men" || eventSlave.sexualFlaw === "repressed") {
+ if (eventSlave.devotion >= -20) {
+ if (eventSlave.trust > 20) {
+ State.variables.RESSevent.push("frightening dick");
}
}
}
@@ -2530,10 +2500,8 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.devotion < -50) {
if (eventSlave.trust >= -50) {
- if (eventSlave.assignment !== "stay confined") {
- if (eventSlave.heels !== 1) {
- State.variables.RESSevent.push("escapee");
- }
+ if (eventSlave.heels !== 1) {
+ State.variables.RESSevent.push("escapee");
}
}
}
@@ -2664,7 +2632,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
}
if (["huge plug", "large plug", "long, huge plug", "long, large plug"].includes(eventSlave.buttplug)) {
- if (eventSlave.assignment !== "stay confined" && isSlaveAvailable(eventSlave)) {
+ if (isSlaveAvailable(eventSlave)) {
if (eventSlave.devotion <= 20) {
if (eventSlave.trust >= -50) {
if (eventSlave.anus < 3) {
@@ -2788,16 +2756,12 @@ window.generateRandomEventPoolServant = function(eventSlave) {
}
if (eventSlave.devotion <= 50) {
- if (eventSlave.assignment === "work as a servant" || eventSlave.assignment === "be a servant") {
- State.variables.RESSevent.push("scrubbing");
- }
+ State.variables.RESSevent.push("scrubbing");
}
if (eventSlave.devotion <= 20) {
- if (eventSlave.assignment === "work as a servant" || eventSlave.assignment === "be a servant") {
- if (eventSlave.clothes === "a slutty maid outfit" || eventSlave.clothes === "a nice maid outfit") {
- State.variables.RESSevent.push("servant maid");
- }
+ if (eventSlave.clothes === "a slutty maid outfit" || eventSlave.clothes === "a nice maid outfit") {
+ State.variables.RESSevent.push("servant maid");
}
}
@@ -2942,15 +2906,6 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (canWalk(eventSlave)) {
State.variables.RESSevent.push("mindbroken morning");
}
- if (eventSlave.kindness !== undefined && eventSlave.kindness >= 100) {
- if ((isSlaveAvailable(eventSlave) && canWalk(eventSlave)) || (["be your Concubine", "please you", "serve in the master suite"].includes(eventSlave.assignment))) {
- if (eventSlave.relationship === -3) {
- if (jsRandom(1, 200) < eventSlave.kindness) {
- State.variables.RESSevent.push("surprising wakeup");
- }
- }
- }
- }
}
};