From 2910579260e520e03606fedf91d393125306f271 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 19 Jul 2021 04:48:36 -0400
Subject: [PATCH] event cleaning
---
src/events/RESS/PAFlirting.js | 4 +++-
src/events/RESS/ampResting.js | 22 +++++++++++++++-------
src/events/RESS/solitaryDesperation.js | 13 ++++++++-----
3 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/events/RESS/PAFlirting.js b/src/events/RESS/PAFlirting.js
index f5454108e73..572da0fad6a 100644
--- a/src/events/RESS/PAFlirting.js
+++ b/src/events/RESS/PAFlirting.js
@@ -11,9 +11,9 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
[ // single event slave
s => s.fetish !== "mindbroken",
hasAnyArms,
- hasAnyLegs,
canTalk,
canSee,
+ canHear,
s => s.devotion > 50,
s => s.trust > 75,
s => s.assignment !== Job.QUARTER,
@@ -80,6 +80,8 @@ App.Events.RESSPAFlirting = class RESSPAFlirting extends App.Events.BaseEvent {
}
if (canAchieveErection(eventSlave)) {
r.push(Spoken(eventSlave, `"I'd love to be that big."`));
+ } else if (eventSlave.dick > 6) {
+ r.push(Spoken(eventSlave, `"I wish mine could get that hard."`));
} else {
r.push(Spoken(eventSlave, `"I can't look away."`));
}
diff --git a/src/events/RESS/ampResting.js b/src/events/RESS/ampResting.js
index 77222b5e5c9..5f0537c42f9 100644
--- a/src/events/RESS/ampResting.js
+++ b/src/events/RESS/ampResting.js
@@ -7,7 +7,7 @@ App.Events.RESSAmpResting = class RESSAmpResting extends App.Events.BaseEvent {
return [
[ // single event slave
s => s.fetish !== "mindbroken",
- s => s.assignment === Job.REST,
+ s => (s.assignment === Job.REST || s.rules.rest === "mandatory"),
isAmputee,
]
];
@@ -39,7 +39,7 @@ App.Events.RESSAmpResting = class RESSAmpResting extends App.Events.BaseEvent {
r.push(`barely dripping`);
}
r.push(`out of the chastity.`);
- } else if ((eventSlave.dick > 0) && !canAchieveErection(eventSlave)) {
+ } else if (eventSlave.dick > 0 && !canAchieveErection(eventSlave)) {
r.push(`${he} can't maintain an erection but ${his} limp dick`);
if (eventSlave.prostate > 1) {
r.push(`is soaking ${his} sheets with precum.`);
@@ -59,7 +59,7 @@ App.Events.RESSAmpResting = class RESSAmpResting extends App.Events.BaseEvent {
} else if (eventSlave.vagina === -1) {
r.push(`${he}'s humping the sheet as though ${he} still had genitals`);
if (eventSlave.prostate > 1) {
- r.push(`genitals, leaving a large splotch from ${his} excessive precum`);
+ r.push(`genitals, leaving a large splotch from ${his} excessive precum.`);
} else {
r.push(`genitals.`);
}
@@ -83,7 +83,7 @@ App.Events.RESSAmpResting = class RESSAmpResting extends App.Events.BaseEvent {
r.push(r.pop() + ",");
r.push(`${his} gigantic ass`);
}
- r.push(`and ${his} limblessness finally leave ${him} lying naked on ${his} pad. After a few moments, ${he} begins to shiver convulsively.`);
+ r.push(`and ${his} limblessness finally leave ${him} lying naked on ${his} ${eventSlave.rules.living === "spare" ? "pad" : "bed"}. After a few moments, ${he} begins to shiver convulsively.`);
App.Events.addParagraph(node, r);
App.Events.addResponses(node, [
@@ -94,11 +94,19 @@ App.Events.RESSAmpResting = class RESSAmpResting extends App.Events.BaseEvent {
function check() {
r = [];
+ r.push(`Since ${he}'s limbless`);
+ if (eventSlave.health.illness > 0) {
+ if (eventSlave.pregKnown === 1) {
+ r.push(r.pop() + ",");
+ } else {
+ r.push(`and`);
+ }
+ r.push(`ill`);
+ }
if (eventSlave.pregKnown === 1) {
- r.push(`Since ${he}'s limbless and pregnant,`);
- } else {
- r.push(`Since ${he}'s limbless,`);
+ r.push(`and pregnant`);
}
+ r.push(r.pop() + ",");
r.push(`${his} health is more fragile than most slaves'. You look in on ${him}, and when ${he} continues to shiver, you pull the sheets back around ${him}, tucking ${him} in in such a way that ${he} can lie comfortably. In the morning ${he} doesn't understand why ${he}'s so snug and well-rested, but <span class="health inc">${his} health improves with decent sleep.</span>`);
improveCondition(eventSlave, 10);
return r;
diff --git a/src/events/RESS/solitaryDesperation.js b/src/events/RESS/solitaryDesperation.js
index 8f72ee40aab..e3d1839b01f 100644
--- a/src/events/RESS/solitaryDesperation.js
+++ b/src/events/RESS/solitaryDesperation.js
@@ -8,8 +8,11 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
[ // single event slave
s => s.fetish !== "mindbroken",
canTalk,
+ canHear,
+ hasAnyLegs,
s => s.assignment === Job.CONFINEMENT,
s => s.devotion <= 50,
+ s => s.trust <= 20,
]
];
}
@@ -55,7 +58,7 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
choices.push(new App.Events.Result(`Exploit ${his} need for personal contact by giving ${him} a pussy to lick`, lick));
}
}
- if (V.PC.preg > 30 && V.PC.pregMood === 1 && V.PC.boobs >= 800 && V.PC.boobsImplant === 0) {
+ if (V.PC.preg > 30 && V.PC.pregMood === 1 && V.PC.boobs >= 800 && V.PC.lactation > 0 && V.PC.boobsImplant === 0) {
choices.push(new App.Events.Result(`${He} just needs a mother's touch`, mother));
}
App.Events.addResponses(node, choices);
@@ -74,7 +77,7 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
function impersonate() {
r = [];
r.push(`Kneeling next to the port in the cell door, you`);
- if (V.PC.title === 1) {
+ if (V.PC.title === 1 || V.PC.voice === 1) {
r.push(`set up a voice filter through the arcology systems to make your voice sound feminine.`);
} else {
r.push(`abandon your usual commanding woman's tone of voice and adopt the inflections of a slave.`);
@@ -86,7 +89,7 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
r.push(`brothel.`);
}
r.push(`In your`);
- if (V.PC.title === 1) {
+ if (V.PC.title === 1 || V.PC.voice === 1) {
r.push(`fake female`);
} else {
r.push(`slave's`);
@@ -98,7 +101,7 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
r.push(`and let`);
}
r.push(`your voice return to`);
- if (V.PC.title === 1) {
+ if (V.PC.title === 1 || V.PC.voice === 1) {
r.push(`its masculine harshness.`);
} else {
r.push(`that of a confident and powerful woman.`);
@@ -172,7 +175,7 @@ App.Events.RESSSolitaryDesperation = class RESSSolitaryDesperation extends App.E
function mother() {
eventSlave.devotion += 15;
eventSlave.trust += 5;
- return `You reassure the frightened ${SlaveTitle(eventSlave)} and beckon ${him} to return to the hole before settling your gravid body before the door and pushing a fat, milk-laden breast through the gap. You coax the nervous ${girl} to drink ${his} fill; ${he} must be starving in there, after all. After some hesitation, you finally feel a pair of lips wrap themselves around your erect nipple and begin to drink deep. You talk to the suckling slave, explaining to ${him} just what ${he} needs to do to thrive in ${his} new life, shushing ${him} whenever ${he} tries to object and asking ${him} to just listen. Before long, your teat is drained of all its mother's milk, and as you move to shift to the other closer to the door, the desperate slave begs you not to go. You slip a hand through the slat, caressing ${his} face as you let ${him} know you're just turning around. As ${he} suckles your remaining milk, you feel ${him} <span class="mediumaquamarine">relax and lower ${his} guard.</span> ${He} needed to connect to someone and ${he} didn't expect it to be you, especially like not this. <span class="devotion inc">${His} willingness to listen to you has increased.</span>`;
+ return `You reassure the frightened ${SlaveTitle(eventSlave)} and beckon ${him} to return to the hole before settling your gravid body before the door and pushing a fat, milk-laden breast through the gap. You coax the nervous ${girl} to drink ${his} fill; ${he} must be starving in there, after all. After some hesitation, you finally feel a pair of lips wrap themselves around your erect nipple and begin to drink deep. You talk to the suckling slave, explaining to ${him} just what ${he} needs to do to thrive in ${his} new life, shushing ${him} whenever ${he} tries to object and asking ${him} to just listen. Before long, your teat is drained of all its mother's milk, and as you move to shift to the other closer to the door, the desperate slave begs you not to go. You slip a hand through the slat, caressing ${his} face as you let ${him} know you're just turning around. As ${he} suckles your remaining milk, you feel ${him} <span class="trust inc">relax and lower ${his} guard.</span> ${He} needed to connect to someone and ${he} didn't expect it to be you, especially like not this. <span class="devotion inc">${His} willingness to listen to you has increased.</span>`;
}
}
};
--
GitLab