From d4fde70b89a955778cde1ec0aa98cfd5cd589e43 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 5 Jul 2021 17:43:36 -0400
Subject: [PATCH] event cleaning
---
src/events/RE/REBusyArcade.js | 19 +++++++++++++------
src/events/RE/REBusyBrothel.js | 15 ++++++++-------
src/events/RE/REBusyDairy.js | 15 +++++++++------
3 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/events/RE/REBusyArcade.js b/src/events/RE/REBusyArcade.js
index 18c43bfccae..f382c5c52ff 100644
--- a/src/events/RE/REBusyArcade.js
+++ b/src/events/RE/REBusyArcade.js
@@ -9,8 +9,8 @@ App.Events.REBusyArcade = class REBusyArcade extends App.Events.BaseEvent {
return [
[
s => s.assignment === Job.ARCADE,
- s => hasAnyArms(s),
s => s.fetish !== "mindbroken",
+ s => canMove(s) || hasAnyLegs(s)
s => s.devotion < 45
]
];
@@ -30,14 +30,21 @@ App.Events.REBusyArcade = class REBusyArcade extends App.Events.BaseEvent {
let r = [];
r.push(`Facing the ground, ${he}`);
if (!canTalk(slave)) {
- r.push(`gestures with ${hasBothArms(slave) ? "shaking hands" : "a shaking hand"}`);
+ r.push(`gestures`);
+ if (hasAnyArms(slave) {
+ r.push(`with ${hasBothArms(slave) ? "shaking hands" : "a shaking hand"}`);
+ } else {
+ r.push(`in the limited capacity ${he} is cpapable of`);
+ }
r.push(`that ${he} cannot take any more. ${He} begs you abjectly to let ${him} out of the arcade and promises to be a perfect sex slave if you do.`);
- } else if (SlaveStatsChecker.checkForLisp(slave)) {
- r.push(`lisps through tears`);
} else {
- r.push(`sobs,`);
+ if (SlaveStatsChecker.checkForLisp(slave)) {
+ r.push(`lisps through tears`);
+ } else {
+ r.push(`sobs,`);
+ }
+ r.push(`"${Master}, ${Spoken(slave, "please. I can't take any more of this. Please let me out. I'll do anything")}, ${Master}. I'll love you forever, ${Master} — ${Spoken(slave, "just don't make me go back inside")} that wall."`);
}
- r.push(`"${Master}, ${Spoken(slave, "please. I can't take any more of this. Please let me out. I'll do anything")}, ${Master}. I'll love you forever, ${Master} — ${Spoken(slave, "just don't make me go back inside")} that wall."`);
App.Events.addParagraph(node, r);
App.Events.addResponses(node, [
diff --git a/src/events/RE/REBusyBrothel.js b/src/events/RE/REBusyBrothel.js
index 44fe60df55f..ed77ffe2498 100644
--- a/src/events/RE/REBusyBrothel.js
+++ b/src/events/RE/REBusyBrothel.js
@@ -9,7 +9,7 @@ App.Events.REBusyBrothel = class REBusyBrothel extends App.Events.BaseEvent {
V.nextButton = "Continue";
V.nextLink = "RIE Eligibility Check";
App.Events.addParagraph(node, [`${capFirstChar(V.brothelName)} is well staffed, and does a busy trade in flesh 24 hours a day. With so many sex slaves in the Free Cities, brothels occupy a functional, nearly mechanical part of the sexual landscape. Free citizens and sometimes even favored slaves visit the brothel, select from the available merchandise, relieve their sexual needs, and leave. Affection, companionship, and emotional needs are available elsewhere.`]);
- App.Events.addParagraph(node, [`Of course, ${V.brothelName} is the best establishment of its kind in the arcology. Citizens who patronize it can expect themselves to be very well looked after by skilled slaves. The quality of the merchandise, the efficiency with which it is delivered, and the cleanliness and reputation of the premises <span class="green">reflect well on you,</span> so much so that you could leverage this bustling sexual commerce in many ways.`]);
+ App.Events.addParagraph(node, [`Of course, ${V.brothelName} is the best establishment of its kind in the arcology. Citizens who patronize it can expect themselves to be very well looked after by skilled slaves. The quality of the merchandise, the efficiency with which it is delivered, and the cleanliness and reputation of the premises <span class="reputation inc">reflect well on you,</span> so much so that you could leverage this bustling sexual commerce in many ways.`]);
repX(500, "event");
@@ -23,8 +23,7 @@ App.Events.REBusyBrothel = class REBusyBrothel extends App.Events.BaseEvent {
cashX(-1000, "event");
for (const slave of V.slaves.filter(s => s.assignment === Job.Brothel)) {
slave.devotion += 4;
- slave.lastWeeksCashIncome += 250;
- slave.lifetimeCashIncome += 250;
+ slave.health.tired = 0;
}
return `The problem with assembly-line sex is that it has a tendency to destroy any sense of intimacy or fun. So, you make some simple preparations and close the brothel for a day, hiring some freelancers to cover. All your slave whores are allowed to sleep late, and then spend the day with you playing games and enjoying light amusements. The slaves are surprised by your generosity, but they have fun. Many of the games are sexually themed. One day of giggling and squealing can't completely reverse the transactionalization of sex for them, but they <span class="devotion inc">appreciate the effort.</span>`;
}
@@ -47,14 +46,16 @@ App.Events.REBusyBrothel = class REBusyBrothel extends App.Events.BaseEvent {
for (const slave of V.slaves.filter(s => s.assignment === Job.Brothel)) {
healthDamage(slave, 10);
if (canDoVaginal(slave)) {
- actX(slave, "vaginal", 5);
+ seX(slave, "vaginal", "public", "penetrative", 5);
if (canDoAnal(slave)) {
- actX(slave, "anal", 5);
+ seX(slave, "anal", "public", "penetrative", 5);
+ } else {
+ seX(slave, "vaginal", "public", "penetrative", 5);
}
} else if (canDoAnal(slave)) {
- actX(slave, "anal", 10);
+ seX(slave, "anal", "public", "penetrative", 10);
}
- actX(slave, "oral", 10);
+ seX(slave, "oral", "public", "penetrative", 10);
}
return `The news that sex will be free at the brothel travels like wildfire. Security measures are necessary to control the throng that spends the entire day entering and leaving the brothel, though as the day goes on the crowds thin. By midmorning, all the holes on offer are so fucked out that only those who fetishize that sort of thing stick around. The brothel is a real seminal sewer by noon, and it smells like it. Nevertheless, free sex is a short route to <span class="reputation inc">public approval,</span> though you do miss a morning's fees. The poor slave whores are <span class="health dec">fairly battered</span> by so much wear and tear in so little time.`;
}
diff --git a/src/events/RE/REBusyDairy.js b/src/events/RE/REBusyDairy.js
index 15e943f7a2d..ec26ed51445 100644
--- a/src/events/RE/REBusyDairy.js
+++ b/src/events/RE/REBusyDairy.js
@@ -25,15 +25,18 @@ App.Events.REBusyDairy = class REBusyDairy extends App.Events.BaseEvent {
App.Events.addResponses(node, choices);
function share() {
+ const dairySlaves = V.slaves.filter(s => s.assignment === Job.DAIRY);
cashX(-1000, "event");
- for (const slave of V.slaves.filter(s => s.assignment === Job.DAIRY)) {
+ for (const slave of dairySlaves) {
slave.devotion += 4;
- if (canDoVaginal(slave)) {
- actX(slave, "vaginal");
- } else if (canDoAnal(slave)) {
- actX(slave, "anal");
+ SimpleSexAct.Slaves(slave, dairySlaves.filter(s => s.ID !== slave.ID).shuffle());
+ if (slave.actualAge < 24) {
+ SimpleSexAct.Player(slave);
}
- actX(slave, "oral");
+ if (slave.boobs > 300) {
+ actX(slave, "mammary", 2);
+ }
+ slave.health.tired = 0;
}
return `Milk is a fashionable skin treatment in the Free Cities, and many of the cows fetishize their breasts and their milk. Many of them giggle with delight when you bring them all into a large spa room with a huge tub full of their fresh milk. A pittance will be lost from sales, but it's hard to think of such things when swimming and splashing in warm, nutty mother's milk with so many huge-breasted slaves, many of whom are milking themselves into the bath. Some of the older ones relax and luxuriate, gently milking themselves and masturbating or each other, according to taste. The younger cows prefer to rub themselves against you, taking turns being fucked. Regardless, they all <span class="devotion inc">appreciate such a special experience.</span>`;
}
--
GitLab