From 07c61f97efb0f63c63f631a478abdbfb96275117 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 1 Mar 2021 07:14:25 -0500
Subject: [PATCH] reDatePlease.js cleanup
---
src/events/RETS/reDatePlease.js | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/events/RETS/reDatePlease.js b/src/events/RETS/reDatePlease.js
index 33ba47bd4ba..063783d3b10 100644
--- a/src/events/RETS/reDatePlease.js
+++ b/src/events/RETS/reDatePlease.js
@@ -8,8 +8,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
[ // event slave /domslave
s => s.fetish !== "mindbroken",
canTalk,
- hasAnyArms,
- hasAnyLegs,
+ canWalk,
canHear,
s => s.assignment !== Job.QUARTER,
s => s.relationship > 3,
@@ -20,7 +19,8 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
[ // and subslave
s => s.ID === getSlave(this.actors[0]).relationshipTarget, // relationshipTarget of event slave
s => s.fetish !== "mindbroken",
- canWalk,
+ isSlaveAvailable,
+ canMove,
canTalk,
s => s.devotion > 20,
]
@@ -42,7 +42,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
const master = Spoken(eventSlave, getWrittenTitle(eventSlave));
const partner = (eventSlave.relationship >= 5) ? "wife2" : `${girl2}friend`;
- const pitch = (eventSlave.voice > 2) ? "high" : (eventSlave.voice > 1 ? "feminine" : "bimbo");
+ const pitch = (eventSlave.voice > 2) ? "high" : (eventSlave.voice > 1 ? "feminine" : "bimbo"); // consider male slaves in the future!
let t = [];
@@ -73,8 +73,15 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
t.push(`Rather than answering ${him} directly, you tell ${V.assistant.name} to clear ${eventSlave.slaveName}'s and ${subSlave.slaveName}'s schedules for the evening. ${He} ${canSee(eventSlave) ? `looks` : `smiles`} at you with happy anticipation, but is puzzled when you don't give ${him} any further orders. "Um, thank you, ${master}" ${he} asks hesitantly.`);
t.push(Spoken(eventSlave, `"But, I don't understand. What are we going to do?"`));
- t.push(`Whatever you want, you tell ${him}. ${He} furrows ${his} brow, looking troubled, as though the concept is somehow alien to ${him}. After some thought, ${he} brightens and asks if ${he} can go tell ${his} ${partner}. ${He} can, you respond, and the slave bounces over to give you a kiss before running out. It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it. Their busy lives mean that their shifts rarely align exactly, and this is more time than they've had together in a long time. It isn't particularly exciting, but they enjoy themselves. They eat a meal in the kitchen together, watch the sunset from one of the penthouse balconies, make love out there, share a long shower, and then go to bed, spending the rest of the night cuddling and chatting quietly. The next morning, they come to see you hand in hand, and <span class="hotpink">thank you in unison.</span> As they leave, ${eventSlave.slaveName} looks back over ${his} shoulder at you, and mouths 'That was perfect, ${getWrittenTitle(eventSlave)}!'`);
+ t.push(`Whatever you want, you tell ${him}. ${He} furrows ${his} brow, looking troubled, as though the concept is somehow alien to ${him}. After some thought, ${he} brightens and asks if ${he} can go tell ${his} ${partner}. ${He} can, you respond, and the slave bounces over to give you a kiss before running out. It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it. Their busy lives mean that their shifts rarely align exactly, and this is more time than they've had together in a long time. It isn't particularly exciting, but they enjoy themselves. They eat a meal in the kitchen together, watch the sunset from one of the penthouse balconies, make love out there, share a long shower, and then go to bed, spending the rest of the night cuddling and chatting quietly. The next morning, they come to see you hand in hand, and <span class="devotion inc">thank you in unison.</span> As they leave, ${eventSlave.slaveName} looks back over ${his} shoulder at you, and mouths 'That was perfect, ${getWrittenTitle(eventSlave)}!'`);
cashX(-500, "event", eventSlave);
+ if (canPenetrate(eventSlave)) {
+ SimpleSexAct.Slaves(subSlave, eventSlave);
+ } else if (canPenetrate(subSlave)) {
+ SimpleSexAct.Slaves(eventSlave, subSlave);
+ } else {
+ SimpleSexAct.Slaves(subSlave, eventSlave);
+ }
subSlave.devotion += 2;
eventSlave.devotion += 2;
return t;
@@ -90,7 +97,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
t.push(`Rather than answering ${him} directly, you tell ${V.assistant.name} to clear ${eventSlave.slaveName}'s and ${subSlave.slaveName}'s schedules for the evening, and then contact ${S.Attendant.slaveName}, the Attendant of your Spa, to instruct ${him3} to expect the two slaves for some quality time together. ${S.Attendant.slaveName}, of course, is all for it (${Spoken(S.Attendant, `"Leave it to me, ${getWrittenTitle(S.Attendant)}!"`)}). ${He3} greets the couple at the steamy entrance to the Spa an hour later, and takes charge of them with a matronly air, telling them to undress and relax.`);
App.Events.addParagraph(frag, t);
t = [];
- t.push(`It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it, and your Attendant does not disappoint. After the slaves have soaked in the main pool for a while, ${he3} gives them a series of mud packs, hot rock massages, and skin treatments, always setting them up right next to each other. They chat a bit at first, but soon relax into companionable silence, holding hands and enjoying the pampering.`);
+ t.push(`It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it, and your Attendant does not disappoint. After the slaves have soaked in the main pool for a while, ${he3} gives them a series of mud packs, hot rock massages, and skin treatments, always setting them up right next to each other. They chat a bit at first, but soon relax into companionable silence, ${hasAnyHands(eventSlave) && hasAnyHands(subSlave) ? "holding hands and enjoying" : "side by side to enjoy"} the pampering.`);
if (S.Attendant.lactation > 0) {
t.push(`${S.Attendant.slaveName} has their evening meal sent down, and supplements it with milk drunk fresh from ${his3} own nipples.`);
}
@@ -100,7 +107,11 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
} else if (S.Attendant.belly >= 10000 && eventSlave.belly >= 10000 && subSlave.belly >= 10000) {
t.push(`how big everyone's bellies are,`);
}
- t.push(`as they share ${S.Attendant.slaveName}'s body. Much later, the Attendant sends you a brief message relaying their <span class="hotpink">heartfelt thanks,</span> which${he3}'s passing to you because they're asleep together.`);
+ t.push(`as they share ${S.Attendant.slaveName}'s body. Much later, the Attendant sends you a brief message relaying their <span class="devotion inc">heartfelt thanks,</span> which ${he3}'s passing to you because they're asleep together.`);
+ SimpleSexAct.Slaves(S.Attendant, eventSlave);
+ SimpleSexAct.Slaves(S.Attendant, subSlave);
+ SimpleSexAct.Slaves(subSlave, eventSlave);
+ SimpleSexAct.Slaves(eventSlave, subSlave);
cashX(-500, "event", eventSlave);
subSlave.devotion += 3;
eventSlave.devotion += 3;
@@ -117,7 +128,7 @@ App.Events.RETSDatePlease = class RETSDatePlease extends App.Events.BaseEvent {
App.Events.addParagraph(frag, t);
t = [];
- t.push(`Since ${he} trusts you, they dress very daringly for slaves. That is, they dress about as conservatively as slaves can dress, in comfortable pants and soft sweaters whose high collars they roll down to keep their collars visible. Any hesitations citizens who see them might have are banished by their obvious love for each other, and their total lack of shame about having it seen. Indeed, as the night wears on they attract more than a few <span class="green">admiring glances</span> from citizens who envy you the favors of the pair of ${girl === girl2 ? `${girl}s` : `slaves`} occupying one side of the corner booth. After all, they'd rather lean against each other than look at each other from across a table. The next day, they both come to you individually and <span class="mediumaquamarine">thank you almost gravely,</span> quite aware of the trust you've placed in them.`);
+ t.push(`Since ${he} trusts you, they dress very daringly for slaves. That is, they dress about as conservatively as slaves can dress, in comfortable pants and soft sweaters whose high collars they roll down to keep their collars visible. Any hesitations citizens who see them might have are banished by their obvious love for each other, and their total lack of shame about having it seen. Indeed, as the night wears on they attract more than a few <span class="reputation inc">admiring glances</span> from citizens who envy you the favors of the pair of ${girl === girl2 ? `${girl}s` : `slaves`} occupying one side of the corner booth. After all, they'd rather lean against each other than look at each other from across a table. The next day, they both come to you individually and <span class="trust inc">thank you almost gravely,</span> quite aware of the trust you've placed in them.`);
cashX(-1000, "event", eventSlave);
repX(500, "event", eventSlave);
subSlave.trust += 2;
--
GitLab