From aa5baffe6ee32c31d67b9e7350a745765e5be0b0 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Thu, 23 Jul 2020 17:54:23 -0700
Subject: [PATCH] Fixes
---
src/endWeek/clinicReport.js | 2 +-
src/events/RESS/comfortableSeat.js | 2 +-
src/events/RESS/devotedAnalVirgin.js | 11 ++++++-----
src/events/RESS/devotedVirgin.js | 4 ++--
src/events/RESS/devotedWaist.js | 8 ++++----
src/events/RESS/obedientIdiot.js | 2 +-
src/events/RESS/obedientShemale.js | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/endWeek/clinicReport.js b/src/endWeek/clinicReport.js
index ca3c6dfdb76..85476812c7c 100644
--- a/src/endWeek/clinicReport.js
+++ b/src/endWeek/clinicReport.js
@@ -244,7 +244,7 @@ App.EndWeek.clinicReport = function() {
if (V.seeImages && V.seeReportImages) {
App.UI.DOM.appendNewElement("div", nurseEntry, App.Art.SlaveArtElement(slave, 0, 0), ["imageRef", "tinyImg"]);
}
- $(nurseEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as as the clinical nurse.`);
+ $(nurseEntry).append(`<span class='slave-name'>${SlaveFullName(slave)}</span> is serving as the clinical nurse.`);
$(nurseEntry).append(App.SlaveAssignment.standardSlaveReport(slave, false));
} else {
App.SlaveAssignment.standardSlaveReport(slave, true);
diff --git a/src/events/RESS/comfortableSeat.js b/src/events/RESS/comfortableSeat.js
index 30c0302d1dd..909087c0a9c 100644
--- a/src/events/RESS/comfortableSeat.js
+++ b/src/events/RESS/comfortableSeat.js
@@ -266,7 +266,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
}
t.push(`and after you've ${PC.dick !== 0 ? "cum" : "climaxed"}, ${he} <span class="mediumaquamarine">thanks you trustingly,</span> happy ${he}'s still allowed a sexy choice with you now and then.`);
} else {
- t.push(`${eventSlave.fetishKnown === 1 ? `${He} can't really think of how to accommodate the situation to ${his} own preferred approach to sex` : `${He} isn't well versed in how ${his} own sexual needs might fit into the situation`}, so ${he} just services you like a good $girl. ${He} turns around and sits on ${PC.dick !== 0 ? "your cock" : "the phallus"},`);
+ t.push(`${eventSlave.fetishKnown === 1 ? `${He} can't really think of how to accommodate the situation to ${his} own preferred approach to sex` : `${He} isn't well versed in how ${his} own sexual needs might fit into the situation`}, so ${he} just services you like a good ${girl}. ${He} turns around and sits on ${PC.dick !== 0 ? "your cock" : "the phallus"},`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`squatting to bounce ${his} cunt up and down on it.`);
VCheck.Vaginal(1, eventSlave);
diff --git a/src/events/RESS/devotedAnalVirgin.js b/src/events/RESS/devotedAnalVirgin.js
index 64c9569e149..35137858dff 100644
--- a/src/events/RESS/devotedAnalVirgin.js
+++ b/src/events/RESS/devotedAnalVirgin.js
@@ -21,7 +21,7 @@ App.Events.RESSDevotedAnalVirgin = class RESSDevotedAnalVirgin extends App.Event
/** @type {Array<App.Entity.SlaveState>} */
let [eventSlave] = this.actors.map(a => getSlave(a));
const {
- He, he, his, him, himself
+ He, His, he, his, him, himself
} = getPronouns(eventSlave);
const {say, title: Master} = getEnunciation(eventSlave);
const belly = bellyAdjective(eventSlave);
@@ -83,7 +83,7 @@ App.Events.RESSDevotedAnalVirgin = class RESSDevotedAnalVirgin extends App.Event
}
t.push(`body against you and shivering with delight.`);
if (eventSlave.vagina > 0 && canDoVaginal(eventSlave)) {
- t.push(`$His shivers reach a crescendo when you ${PC.dick === 0 ? "scissor yourself against" : "enter"} ${his} warm, wet pussy, which convulsively flexes against your ${PC.dick === 0 ? "clit" : "rock hard dick"}.`);
+ t.push(`${His} shivers reach a crescendo when you ${PC.dick === 0 ? "scissor yourself against" : "enter"} ${his} warm, wet pussy, which convulsively flexes against your ${PC.dick === 0 ? "clit" : "rock hard dick"}.`);
} else {
if (PC.dick === 0) {
t.push(`You ride ${his} face,`);
@@ -112,13 +112,14 @@ App.Events.RESSDevotedAnalVirgin = class RESSDevotedAnalVirgin extends App.Event
}
t.push(`body for a long time. Every so often you move your hands over ${his} unfucked butthole, making ${him} shiver and press ${himself} against you, but you only make it the center of attention once the poor over-aroused slave`);
if (canTalk(eventSlave)) {
- t.push(`begs, "I can't take it any more, ${Master}! Plea${s}e fuck my a${ss}!"`);
+ t.push(`begs,`);
+ t.push(Spoken(eventSlave, `"I can't take it any more, ${Master}! Please fuck my ass!"`));
} else {
t.push("begins to use piteous gestures to beg you abjectly for anal.");
}
t.push(`In reward, you sink a lightly lubricated finger up to the first knuckle in ${his} delightfully tight asshole. ${He}'s already on the edge of orgasm, and it takes a long, long time for you to work first a finger, then two, and then your ${PC.dick === 0 ? "strap-on" : "cock"} up ${his} ass without sending ${him} over. When you finally let ${him} orgasm, ${PC.dick === 0 ? `${his} unabashed enjoyment` : `the strength of ${his} spasming sphincter`} send you over as well. ${He}'s left in a haze of <span class="hotpink">sexual satisfaction</span> that radiates outward from ${his} <span class="lime">newly stretched asshole,</span> and ${he} <span class="mediumaquamarine">trusts you</span> a lot more, now.`);
- if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "buttslut") && fetishChangeChance(eventSlave) > jsRandom(1,100)) {
+ if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "buttslut") && fetishChangeChance(eventSlave) > jsRandom(1, 100)) {
t.push(`Before the end of the week ${he}'s back, begging for <span class="lightcoral">another dick up the ass.</span>`);
eventSlave.fetishKnown = 1;
@@ -140,7 +141,7 @@ App.Events.RESSDevotedAnalVirgin = class RESSDevotedAnalVirgin extends App.Event
t = [];
t.push(`You throw ${him} onto the couch face-down, ${eventSlave.belly >= 5000 ? `${his} rear pushed into the air by ${his} rounded belly` : ""} catching a glimpse of ${his} doubtful face as ${he} goes; ${he}'s already started to wonder whether this was a mistake. In a few moments ${he} knows it for sure as ${he} feels ${!canDoAnal(eventSlave) ? `${his} anal chastity ripped off and` : ""} the burning sensation of a lubricated ${PC.dick === 0 ? "strap-on" : "dickhead"} forcing ${his} virgin sphincter wide. Whatever noises ${he} might be making are pretty inaudible, since you have ${his} sobbing face shoved deep between the leather cushions. ${He} tries not to struggle and relax for ${his} beloved master, but ${his} body rebels against the pain and ${he} starts to wriggle spastically, trying to burrow into the couch to get away from the pounding. When you finish, the poor slave is left lying on the couch with a ${PC.dick !== 0 ? `thin dribble of ejaculate escaping from ${his}` : ""} <span class="lime">newly fucked butthole,</span> a stream of drying tears running down each side of ${his} face, ${eventSlave.dick > 0 ? `a single drop of precum at the tip of ${his} totally flaccid dick,` : ""} and a new understanding of <span class="gold">${his} place in life.</span>`);
- if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "submissive") && fetishChangeChance(eventSlave) > jsRandom(1,100)) {
+ if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "submissive") && fetishChangeChance(eventSlave) > jsRandom(1, 100)) {
t.push(`Before the end of the week it's clear that ${he}'s taken the anal rape to heart, and now sees ${his} body as something <span class="lightcoral">for others to use and abuse.</span>`);
eventSlave.fetishKnown = 1;
diff --git a/src/events/RESS/devotedVirgin.js b/src/events/RESS/devotedVirgin.js
index 0cbbaa40943..e14272fec31 100644
--- a/src/events/RESS/devotedVirgin.js
+++ b/src/events/RESS/devotedVirgin.js
@@ -94,7 +94,7 @@ App.Events.RESSDevotedVirgin = class RESSDevotedVirgin extends App.Events.BaseEv
t.push(`begins to reach for your ${PC.dick === 0 ? "strap-on" : "cock"} to pull it towards ${himself}.`);
}
t.push(`Finally, you lubricate your hand. Then you slowly and gently push a finger into ${his} invitingly tight virgin pussy. ${He}'s already on the edge of orgasm, and you patiently inch your ${PC.dick === 0 ? "strap-on" : "cock"} into ${his} pussy without making ${him} climax. You then start pumping and ${he} starts to moan and breathing more and more heavily. You continue pumping until ${he} finally starts to orgasm, ${PC.dick === 0 ? `${his} climactic shudders` : `the walls of ${his} tightening vagina`} send you over as well. ${He}'s left in a haze of <span class="hotpink">sexual satisfaction</span> that radiates outward from ${his} <span class="lime">newly initiated pussy,</span> and ${he} <span class="mediumaquamarine">trusts you</span> a lot more, now.`);
- if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "pregnancy") && fetishChangeChance(eventSlave) > jsRandom(1,100)) {
+ if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "pregnancy") && fetishChangeChance(eventSlave) > jsRandom(1, 100)) {
t.push(`${He}'s back again before the week is over, eager for <span class="lightcoral">another dick in ${his} fuckhole.</span>`);
eventSlave.fetishKnown = 1;
@@ -116,7 +116,7 @@ App.Events.RESSDevotedVirgin = class RESSDevotedVirgin extends App.Events.BaseEv
t = [];
t.push(`You throw ${him} onto the couch beside your desk; ${he} fails to stop ${himself} from losing balance with ${his} flailing ${isAmputee(eventSlave) ? "stumps" : "limbs"}. ${He} looks around doubtfully; ${he}'s already started to wonder whether this was a mistake. In a few moments ${he} knows it for sure as ${he} feels ${!canDoVaginal(eventSlave) ? `${his} vaginal chastity ripped off and` : ""} the burning sensation of a lubricated ${PC.dick === 0 ? "strap-on" : "dickhead"} forcing ${his} virgin pussy wide. You have ${his} face shoved deep between the leather cushions and you ignore the muffled sounds coming from ${him}. ${He} limply tries to relax for ${his} beloved master, but the painful sensation coming from ${his} crotch causes ${him} to start to writhe uncontrollably. ${He} pushes against the couch, trying to endure the pounding. When you finish, the poor slave is left lying on the couch with a ${PC.dick !== 0 ? `thin dribble of ejaculate escaping from ${his}` : ""} <span class="lime">newly fucked vagina,</span> a stream of drying tears running down each side of ${his} face, ${eventSlave.dick > 0 ? `a single drop of precum at the tip of ${his} totally flaccid dick,` : ""} and a new understanding of <span class="gold">${his} place in life.</span>`);
- if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "submissive") && fetishChangeChance(eventSlave) > jsRandom(1,100)) {
+ if ((eventSlave.fetishKnown !== 1 || eventSlave.fetish !== "submissive") && fetishChangeChance(eventSlave) > jsRandom(1, 100)) {
t.push(`Before the end of the week it's clear that ${he}'s taken the rape to heart, and now sees ${his} body as something <span class="lightcoral">for others to use and abuse.</span>`);
eventSlave.fetishKnown = 1;
diff --git a/src/events/RESS/devotedWaist.js b/src/events/RESS/devotedWaist.js
index 4e96b24b540..478d21c2575 100644
--- a/src/events/RESS/devotedWaist.js
+++ b/src/events/RESS/devotedWaist.js
@@ -9,7 +9,7 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
s => s.fetish !== "mindbroken",
hasAnyArms,
hasAnyLegs,
- s => s.waist < - 95,
+ s => s.waist < -95,
s => s.weight <= 95,
s => s.trust >= -20,
s => s.devotion > 20,
@@ -22,7 +22,7 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
/** @type {Array<App.Entity.SlaveState>} */
let [eventSlave] = this.actors.map(a => getSlave(a));
const {
- He, he, His, his, him, himself
+ He, he, His, his, him, himself, woman
} = getPronouns(eventSlave);
const belly = bellyAdjective(eventSlave);
@@ -46,7 +46,7 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
if (eventSlave.dick > 0) {
t.push(`Though ${he}'s not sexually aroused, ${his} cock is visible as ${he} bathes ${himself}; ${his} member and ${his} narrow waist work together to create a real mélange of gender traits.`);
} else if (eventSlave.boobs > 800 && eventSlave.butt > 4) {
- t.push(`${His} massive bust and hips work together to create a spectacular hourglass effect; ${he}'s a fantasy $woman made flesh.`);
+ t.push(`${His} massive bust and hips work together to create a spectacular hourglass effect; ${he}'s a fantasy ${woman} made flesh.`);
} else {
t.push(`The narrowness of ${his} waist accentuates ${his} feminine features.`);
}
@@ -83,7 +83,7 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
t.push("gaping asshole.");
} else if (eventSlave.anus > 1) {
t.push("slutty asshole.");
- } else if (eventSlave.anus > 1) {
+ } else if (eventSlave.anus > 0) {
t.push("tight asshole.");
} else {
t.push("virgin asshole.");
diff --git a/src/events/RESS/obedientIdiot.js b/src/events/RESS/obedientIdiot.js
index a6a24c1c93b..b3834b62be3 100644
--- a/src/events/RESS/obedientIdiot.js
+++ b/src/events/RESS/obedientIdiot.js
@@ -95,7 +95,7 @@ App.Events.RESSObedientIdiot = class RESSObedientIdiot extends App.Events.BaseEv
t.push(`with your arms and ${canHear(eventSlave) ? `murmur reassuringly in ${his} ear` : `give ${him} a reassuring squeeze`}.`);
if (canTalk(eventSlave)) {
t.push(`${He} ${say}s sadly,`);
- t.push(Spoken(eventSlave, `"$Sorry ${eventSlave.rudeTitle === 1 ? PoliteRudeTitle(eventSlave) : Master}. I'm trying to be a good slave but it's hard."`));
+ t.push(Spoken(eventSlave, `"Sorry ${eventSlave.rudeTitle === 1 ? PoliteRudeTitle(eventSlave) : Master}. I'm trying to be a good slave but it's hard."`));
} else {
t.push(`${He} sadly gestures at the spigot and then flicks ${his} own head.`);
}
diff --git a/src/events/RESS/obedientShemale.js b/src/events/RESS/obedientShemale.js
index 1b9c0c38554..54dc9773fb9 100644
--- a/src/events/RESS/obedientShemale.js
+++ b/src/events/RESS/obedientShemale.js
@@ -96,7 +96,7 @@ App.Events.RESSObedientShemale = class RESSObedientShemale extends App.Events.Ba
t = [];
t.push(`${He} obeys your orders to keep ${his} ${hasBothArms(eventSlave) ? "hands" : "hand"} off ${his} dick, but can't hide ${his} disappointment and frustration. You keep a close watch on ${him}, and fuck ${his} ${anusDesc} anus every chance you get, keeping ${him} desperately aroused and desperately sodomized. After some days of this, ${he} finally reaches a point of desperate arousal that permits ${him} to orgasm to prostate stimulation alone.`);
- if (fetishChangeChance(eventSlave) > jsRandom(1,100)) {
+ if (fetishChangeChance(eventSlave) > jsRandom(1, 100)) {
t.push(`Before ${he} realizes what's happening, <span class="lightcoral">${he}'s getting aroused at the thought of anal sex.</span>`);
eventSlave.fetishStrength = 10;
--
GitLab