From 513d0fea588016ced8f070ac80a27421ac83ce79 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Tue, 28 Jul 2020 19:49:40 -0400
Subject: [PATCH] Fixes
---
src/endWeek/saServeYourOtherSlaves.js | 4 ++--
src/events/RESS/comfortableSeat.js | 34 +++++++++++++--------------
src/events/RESS/devotedAnalVirgin.js | 6 ++---
src/events/RESS/devotedWaist.js | 12 +++++-----
src/events/RESS/frighteningDick.js | 4 ++--
src/events/RESS/obedientAddict.js | 8 +++----
src/events/RESS/obedientGirlish.js | 8 +++----
src/events/RESS/obedientShemale.js | 8 +++----
8 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index ef38d9d3e78..46d73d5fa14 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -116,7 +116,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
r.push(`is left as a sperm dispenser for fertile slaves to ride or milk at their discretion.`);
}
} else if (slave.career === "a breeding bull") {
- r.push(`sees it as ${his} duty to impregnate everyone in ${his} path. A role ${he} <span class="hotpink">appreciates</span> you <span class="mediumaquamarine">untrusting ${him} with.</span>`);
+ r.push(`sees it as ${his} duty to impregnate everyone in ${his} path. A role ${he} <span class="hotpink">appreciates</span> you <span class="mediumaquamarine">entrusting ${him} with.</span>`);
slave.devotion += 1;
slave.trust += 1;
if (slave.fetishKnown === 1) {
@@ -864,7 +864,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
r.push(`${domName}, it turns out, <span class="lightcoral">really likes cum,</span> and ${subName} has balls, so`);
domSlave.fetishKnown = 1;
}
- r.push(`Since ${domName} loves cum, and ${subName} has balls, ${domName} has ${his2} own private semen dispenser. ${domName} sometimes gets tired of having to work hard for cum, so ${he2} spends the week`);
+ r.push(`${domName} has ${his2} own private semen dispenser. ${domName} sometimes gets tired of having to work hard for cum, so ${he2} spends the week`);
if (hasAnyArms(domSlave)) {
r.push(`stimulating poor ${subName}'s`);
} else {
diff --git a/src/events/RESS/comfortableSeat.js b/src/events/RESS/comfortableSeat.js
index 628ecfe0cb5..30b7b5be276 100644
--- a/src/events/RESS/comfortableSeat.js
+++ b/src/events/RESS/comfortableSeat.js
@@ -30,7 +30,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
const {s, say, title: Master} = getEnunciation(eventSlave);
const desc = SlaveTitle(eventSlave);
const belly = bellyAdjective(eventSlave);
- const dickSize = ["tiny", "", "big"][Math.ceil(Math.clamp(eventSlave.dick, 1, 5) / 2) - 1]; // ranges are "tiny" <= 2 < "" <= 4 < "big"
+ const dickSize = eventSlave.dick > 4 ? "big" : (eventSlave.dick > 2 ? "" : "tiny");
/** @type {App.Entity.PlayerState} */
let PC = V.PC;
@@ -151,10 +151,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`turns around and carefully perches ${himself} on ${PC.dick !== 0 ? "your cock" : "the phallus"},`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`letting ${his} weight slide it inside ${his} wet pussy.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`letting ${his} weight push it up ${his} asshole.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`putting it between ${his} thighs.`);
}
@@ -168,10 +168,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`turns around and sits on ${PC.dick !== 0 ? "your cock" : "the phallus"}, leaning back against you and making sure all the other slaves who pass by can see`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`where it penetrates ${his} cunt.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`where it's lodged up ${his} butt.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`where it's rubbing ${him} intimately between ${his} thighs.`);
}
@@ -180,7 +180,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
case "buttslut":
if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`turns around and shivers with pleasure as ${he} hilts ${his} anal sphincter around the base of ${PC.dick !== 0 ? "your cock" : "the phallus"}. ${He} bounces on it happily, reaming ${his} own ass,`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`turns around and shivers with pleasure as ${he} feels ${PC.dick !== 0 ? "your cock" : "the phallus"} slip between ${his} buttcheeks. ${He} rubs against it, happy to share ${his} butt with you,`);
}
@@ -216,7 +216,7 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
}
t.push(`${He} rides you hungrily,`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
if (canImpreg(eventSlave, PC)) {
knockMeUp(eventSlave, 40, 0, -1);
}
@@ -228,10 +228,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`turns around and sits right down on ${PC.dick !== 0 ? "your cock" : "the phallus"}, eagerly`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`taking it into ${his} cunt.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`getting it shoved up ${his} butt.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`squeezing it between ${his} thighs.`);
}
@@ -241,10 +241,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`turns around and hesitantly sits on ${PC.dick !== 0 ? "your cock" : "the phallus"}, letting`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`it slide into ${his} cunt.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`it slide up ${his} butt.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`it slide between ${his} thighs.`);
}
@@ -254,10 +254,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`turns around and carefully perches ${himself} on ${PC.dick !== 0 ? "your cock" : "the phallus"},`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`letting ${his} weight slide it inside ${his} wet pussy at an uncomfortable angle.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`letting ${his} weight push it up ${his} asshole at an uncomfortable angle.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`putting it between ${his} thighs at an uncomfortable angle.`);
}
@@ -269,10 +269,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
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);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`squatting to bounce ${his} butthole up and down on it.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`putting it between ${his} thighs for some intercrural sex, since ${his} ${eventSlave.vagina > -1 ? "holes aren't" : "hole isn't"} appropriate.`);
}
@@ -304,10 +304,10 @@ App.Events.RESSComfortableSeat = class RESSComfortableSeat extends App.Events.Ba
t.push(`Deciding that ${he} shouldn't use ${his} ${hasBothArms(eventSlave) ? "hands" : "hand"} to guide it, ${he} lowers ${himself} slowly,`);
if (canDoVaginal(eventSlave) && eventSlave.vagina > 0) {
t.push(`breathing a little harder as ${he} feels its head spread ${his} pussylips and then slide inside ${him}.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else if (canDoAnal(eventSlave) && eventSlave.anus > 0) {
t.push(`letting out a breath and relaxing as ${he} feels its head press past ${his} sphincter and then all the way up ${his} butt.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`getting it situated between ${his} thighs, since that's the best option ${he} has available.`);
}
diff --git a/src/events/RESS/devotedAnalVirgin.js b/src/events/RESS/devotedAnalVirgin.js
index f3e983c1212..f9a354087fe 100644
--- a/src/events/RESS/devotedAnalVirgin.js
+++ b/src/events/RESS/devotedAnalVirgin.js
@@ -93,11 +93,11 @@ App.Events.RESSDevotedAnalVirgin = class RESSDevotedAnalVirgin extends App.Event
t.push(`lavishing attention on ${his} nipples to ensure that ${he} has fun, too.`);
}
t.push(`${He} leaves your office feeling <span class="hotpink">very close to ${his} ${WrittenMaster(eventSlave)} indeed,</span> and seems to have forgotten ${his} unfucked butthole, for now.`);
-
- eventSlave.devotion += 4;
if (eventSlave.vagina > 0 && canDoVaginal(eventSlave)) {
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
}
+
+ eventSlave.devotion += 4;
return t;
}
diff --git a/src/events/RESS/devotedWaist.js b/src/events/RESS/devotedWaist.js
index 442acee4c65..0665172859d 100644
--- a/src/events/RESS/devotedWaist.js
+++ b/src/events/RESS/devotedWaist.js
@@ -102,18 +102,18 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
t.push(`This can be applied during sex many ways. First, ${he} sits on the bathroom counter and bends ${himself} almost double for`);
if (canDoAnal(eventSlave)) {
t.push(`anal. Your control over the pace is perfected by your grip around ${his} tiny middle.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
} else {
t.push(`vaginal. Your control over the pace is perfected by your grip around ${his} tiny middle.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
}
t.push(`Finally, ${he} goes down on ${hasAllLimbs(eventSlave) ? "all fours" : "the floor"} for a hard`);
if (canDoVaginal(eventSlave)) {
t.push(`pounding, doggy style, losing ${himself} in the intense penetration as you use your hold around ${him} to give it to ${him} even harder.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else {
t.push(`buttfuck, doggy style, losing ${himself} in the intense anal as you use your hold around ${him} to give it to ${him} even harder.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
}
t.push(`By the end ${he}'s tired but <span class="mediumaquamarine">confident in ${his} sexual uniqueness.</span>`);
}
@@ -145,9 +145,9 @@ App.Events.RESSDevotedWaist = class RESSDevotedWaist extends App.Events.BaseEven
if (canDoAnal(eventSlave) || canDoVaginal(eventSlave)) {
t.push(`${eventSlave.slaveName}'s gown allows you to take ${him} in a ${eventSlave.belly >= 5000 ? "tight" : "close"} lotus position on the cleared table, face to face.`);
if (canDoVaginal(eventSlave)) {
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else {
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
}
} else {
t.push(`you and ${eventSlave.slaveName} enjoy the ${canSee(eventSlave) ? "sights" : "atmosphere"} while fooling around. While you'd love to use ${him}, ${his} chastity keeps you at bay.`);
diff --git a/src/events/RESS/frighteningDick.js b/src/events/RESS/frighteningDick.js
index 08dbb8360bd..d8e44b8aa08 100644
--- a/src/events/RESS/frighteningDick.js
+++ b/src/events/RESS/frighteningDick.js
@@ -127,10 +127,10 @@ App.Events.RESSFrighteningDick = class RESSFrighteningDick extends App.Events.Ba
t.push(`You tell ${him} not to worry, because you're still pretty wet from the last slave you fucked, so this shouldn't hurt too much. Then you ram your cock`);
if (eventSlave.vagina > 0) {
t.push(`inside ${him}.`);
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else {
t.push(`up ${his} spasming ass.`);
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
}
t.push(`${He} whines and bucks, but ${he}'s entirely at your mercy. ${He} doesn't like dicks, and to go by ${his} facial expression as you piston in and out of ${him}, this experience isn't going to make ${him} reconsider. When you fill ${him} with cum, pull out, and let ${him} retreat to clean ${himself} up, ${he}'s relieved to go.`);
diff --git a/src/events/RESS/obedientAddict.js b/src/events/RESS/obedientAddict.js
index 2af19665645..a29fd53a586 100644
--- a/src/events/RESS/obedientAddict.js
+++ b/src/events/RESS/obedientAddict.js
@@ -100,13 +100,13 @@ App.Events.RESSObedientAddict = class RESSObedientAddict extends App.Events.Base
t.push(`${He} indicates through ${his} weeping that ${he} can't climax without the drugs.`);
}
t.push(`You pass ${him} the pill, and ${he} continues to weep inconsolably, apologizing all the while, until the drug takes away ${his} ability to care about anything but getting fucked. When you finish and extract ${PC.dick === 0 ? `yourself from between ${his} legs` : `your cock from ${his} well-used hole`}, though, you think you can detect a deep sadness in ${his} eyes that it cannot reach.`);
-
- eventSlave.devotion += 4;
if (canDoVaginal(eventSlave)) {
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else {
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
}
+
+ eventSlave.devotion += 4;
return t;
}
diff --git a/src/events/RESS/obedientGirlish.js b/src/events/RESS/obedientGirlish.js
index 67e148be597..5900257f123 100644
--- a/src/events/RESS/obedientGirlish.js
+++ b/src/events/RESS/obedientGirlish.js
@@ -106,12 +106,12 @@ App.Events.RESSObedientGirlish = class RESSObedientGirlish extends App.Events.Ba
} else {
t.push(`${he}'s wet and ready and moans happily as you enter ${him}.`);
}
- t.push(`There's no hesitation or fear at all on ${his} face when ${he} ${canSee(eventSlave) ? "sees" : "notices"} you're returning ${him} to your penthouse; <span class="mediumaquamarine">${his} trust in you has increased.</span>`);
if (canDoVaginal(eventSlave)) {
- VCheck.Vaginal(1, eventSlave);
+ t.push(VCheck.Vaginal(1, eventSlave));
} else {
- VCheck.Anal(1, eventSlave);
+ t.push(VCheck.Anal(1, eventSlave));
}
+ t.push(`There's no hesitation or fear at all on ${his} face when ${he} ${canSee(eventSlave) ? "sees" : "notices"} you're returning ${him} to your penthouse; <span class="mediumaquamarine">${his} trust in you has increased.</span>`);
eventSlave.trust += 4;
return t;
@@ -142,8 +142,8 @@ App.Events.RESSObedientGirlish = class RESSObedientGirlish extends App.Events.Ba
t.push(`lie face-down on the couch${PC.dick === 0 ? " while you don a strap-on" : ""}.`);
}
t.push(`${He} does doubtfully, only realizing what you intend when ${he} feels ${PC.dick === 0 ? "the strap-on" : "your dickhead"} forcing its way between ${his} narrow buttcheeks. ${He} whimpers and moans ${eventSlave.belly < 300000 ? "into the couch" : ""} as you roughly sodomize ${him}. It's true, ${he}'s pretty androgynous from this angle, especially while ${he} takes it up the butthole. <span class="hotpink">${He} has become more submissive to you,</span> but there's <span class="gold">some fear there, too.</span>`);
+ t.push(VCheck.Anal(1, eventSlave));
- VCheck.Anal(1, eventSlave);
eventSlave.trust -= 2;
eventSlave.devotion += 4;
return t;
diff --git a/src/events/RESS/obedientShemale.js b/src/events/RESS/obedientShemale.js
index 54dc9773fb9..eb7e880c5c4 100644
--- a/src/events/RESS/obedientShemale.js
+++ b/src/events/RESS/obedientShemale.js
@@ -28,7 +28,7 @@ App.Events.RESSObedientShemale = class RESSObedientShemale extends App.Events.Ba
He, he, His, his, him, himself, girl
} = getPronouns(eventSlave);
const {title: Master} = getEnunciation(eventSlave);
- const anusDesc = ["tight", "loose", "gaping"][Math.ceil(Math.clamp(eventSlave.anus, 1, 3)) - 1];
+ const anusDesc = eventSlave.anus > 2 ? "gaping" : (eventSlave.anus > 1 ? "loose" : "tight");
/** @type {App.Entity.PlayerState} */
let PC = V.PC;
@@ -76,9 +76,9 @@ App.Events.RESSObedientShemale = class RESSObedientShemale extends App.Events.Ba
t.push("shakes with release");
}
t.push(`after just a few strokes of your ${PC.dick === 0 ? "strap-on" : "cock"} up ${his} butt. ${His} ${anusDesc} ass spasms and tightens with ${his} climax${PC.dick !== 0 ? ", a wonderful sensation" : ""}. You aren't finished with ${him}, but ${he} rubs ${himself} languidly and enjoys the hard anal reaming more than ${he} ever has previously. ${His} devotion to you <span class="hotpink">has increased.</span>`);
+ t.push(VCheck.Anal(1, eventSlave));
eventSlave.devotion += 4;
- VCheck.Anal(1, eventSlave);
return t;
}
@@ -86,9 +86,9 @@ 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 buttfuck ${him} every chance you get, teaching ${him} the finer points of taking a ${PC.dick === 0 ? "strap-on" : "dick"} up the butt. You focus entirely on your pleasure, teaching ${him} how to use ${his} ${anusDesc} anal ring to extract orgasms from cocks. This experience was hard for ${him} but has increased ${his} anal skill.`);
+ t.push(VCheck.Anal(9, eventSlave));
SkillIncrease.Anal(eventSlave, 10);
- VCheck.Anal(9, eventSlave);
return t;
}
@@ -106,7 +106,7 @@ App.Events.RESSObedientShemale = class RESSObedientShemale extends App.Events.Ba
t.push(`Despite being used as an anal slut for a whole week, ${he} was not significantly affected.`);
}
- VCheck.Anal(9, eventSlave);
+ t.push(VCheck.Anal(9, eventSlave));
return t;
}
}
--
GitLab