From d27b9aeb410a63f6c7376aaa999b2194b82955f8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 14 Dec 2020 22:30:42 -0500
Subject: [PATCH] fixes
---
src/events/RETS/reFucktoyPrefersRelative.js | 2 +-
src/events/RETS/reTopExhaustion.js | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/events/RETS/reFucktoyPrefersRelative.js b/src/events/RETS/reFucktoyPrefersRelative.js
index 8a2c620e2fc..787232d2eb0 100644
--- a/src/events/RETS/reFucktoyPrefersRelative.js
+++ b/src/events/RETS/reFucktoyPrefersRelative.js
@@ -22,7 +22,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
s => s.fetish !== "mindbroken",
s => s.genes === RETSFucktoyPrefersRelative.preferredSex(getSlave(this.actors[0])),
s => areRelated(s, getSlave(this.actors[0])),
- s => this.actors[0].rivalTarget !== s.ID,
+ s => s.rivalTarget !== this.actors[0],
s => (canWalk(s) || (canMove(s) && s.rules.mobility === "permissive")),
isSlaveAvailable
]
diff --git a/src/events/RETS/reTopExhaustion.js b/src/events/RETS/reTopExhaustion.js
index c1e1d8c3a85..ffdbb142994 100644
--- a/src/events/RETS/reTopExhaustion.js
+++ b/src/events/RETS/reTopExhaustion.js
@@ -22,7 +22,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
],
[ // and her dom
s => s.fetish !== "mindbroken",
- s => this.actors[0].relationshipTarget === s.ID,
+ s => s.relationshipTarget === this.actors[0],
isSlaveAvailable,
s => (s.assignment !== Job.MASTERSUITE && s.assignment !== Job.CONCUBINE && s.assignment !== Job.QUARTER),
s => s.rules.release.partner !== 0,
@@ -41,7 +41,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
/** @type {Array<App.Entity.SlaveState>} */
let [subSlave, domSlave] = this.actors.map(a => getSlave(a)); // Pay attention! The main slave is the sub here!
const {
- He, he, his, him, himself, wife, girl
+ He, he, his, His, him, himself, wife, girl
} = getPronouns(subSlave);
const {
He2, he2, His2, his2, him2, himself2, wife2, girl2
@@ -64,12 +64,12 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
t.push(`As you stroll past the best part of the slave living area one evening, you hear a lewd slap, slap, slap coming from the room`);
t.push(App.UI.DOM.combineNodes(App.UI.DOM.slaveDescriptionDialog(subSlave)));
t.push(`and`);
- t.push(contextualIntro(domSlave, subSlave, true));
+ t.push(contextualIntro(subSlave, domSlave, "DOM"));
t.push(`share. It's quite obvious what they're up to, but you look in anyway. ${subSlave.slaveName} has clearly had a long day, and is tired, but ${he}'s being a good ${subSlave.relationship > 4 ? `${wife}` : `lover`} and letting ${domSlave.slaveName} use ${his} body. ${subSlave.slaveName} is lying`);
if (subSlave.belly < 5000) {
- t.push(`face-down on their bed, ${arms} crossed under $his head, looking quite relaxed. ${He} has a couple of pillows tucked under ${his} hips to raise them so that ${his} ${subSlave.relationship > 4 ? `${wife2}` : `sweetheart`} can fuck ${him}`);
+ t.push(`face-down on their bed, ${arms} crossed under ${his} head, looking quite relaxed. ${He} has a couple of pillows tucked under ${his} hips to raise them so that ${his} ${subSlave.relationship > 4 ? `${wife2}` : `sweetheart`} can fuck ${him}`);
if (subSlave.belly >= 1500) {
- t.push(`comfortably and to give $his ${belly} ${subSlave.bellyPreg >= 3000 ? "pregnancy" : "belly"} room beneath ${him}.`);
+ t.push(`comfortably and to give ${his} ${belly} ${subSlave.bellyPreg >= 3000 ? "pregnancy" : "belly"} room beneath ${him}.`);
} else {
t.push(`comfortably.`);
}
@@ -215,7 +215,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
if (canPenetrate(domSlave)) {
t.push(`gasps at the sensation of the ejaculate shooting into ${his} body,`);
} else {
- t.push(`smiles a little wider as $he feels ${domSlave.slaveName}'s muscles tense with climax,`);
+ t.push(`smiles a little wider as ${he} feels ${domSlave.slaveName}'s muscles tense with climax,`);
}
t.push(`and then grunts a little as ${domSlave.slaveName}`);
if (subSlave.belly < 5000) {
@@ -241,7 +241,7 @@ App.Events.RETSTopExhaustion = class RETSTopExhaustion extends App.Events.BaseEv
t.push(`is transmitted through the phallus and its harness to ${domSlave.slaveName}'s overstimulated clit, and this`);
}
t.push(`makes the exhausted slave on top quiver, eliciting a giggle from the slave underneath ${him2}.`);
- t.push(Spoken(eventSlave, `"I love you, ${domSlave.slaveName},"`));
+ t.push(Spoken(subSlave, `"I love you, ${domSlave.slaveName},"`));
t.push(`${he} whispers, and receives a mumbled "I love you too" in breathy`);
if (subSlave.belly < 5000) {
t.push(`response, right next to ${his} ear.`);
--
GitLab