From 9d4a38c2852f8f0bcc5dcd87b02032227489d7bb Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Thu, 14 May 2020 22:57:05 +0200
Subject: [PATCH] fixes
---
src/events/RESS/assFitting.js | 26 +++++++++++++++-----------
src/events/randomEvent.js | 1 +
src/js/storyJS.js | 1 -
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/events/RESS/assFitting.js b/src/events/RESS/assFitting.js
index fba43242ba6..d6cde165bf5 100644
--- a/src/events/RESS/assFitting.js
+++ b/src/events/RESS/assFitting.js
@@ -32,7 +32,9 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
App.Events.drawEventArt(node, eventSlave, "no clothing");
let t = [];
- t.push(`Your slaves get dressed in a large wardrobe area adjacent to the dormitory, rooms, and showers. There are always slaves working, so groups of slaves can be seen putting on their clothing here several times a day. Your naked sex slaves hurrying into the outfits you've selected for them is an undeniably erotic sight. Sometimes it's comical, especially when your transformations of your slaves' bodies produce amusing inconveniences. Today, it's ${App.UI.slaveDescriptionDialog(eventSlave)} who is having trouble. ${His}`);
+ t.push(`Your slaves get dressed in a large wardrobe area adjacent to the dormitory, rooms, and showers. There are always slaves working, so groups of slaves can be seen putting on their clothing here several times a day. Your naked sex slaves hurrying into the outfits you've selected for them is an undeniably erotic sight. Sometimes it's comical, especially when your transformations of your slaves' bodies produce amusing inconveniences. Today, it's`);
+ t.push(App.UI.slaveDescriptionDialog(eventSlave));
+ t.push(`who is having trouble. ${His}`);
if (eventSlave.buttImplant / eventSlave.butt >= 0.5) {
t.push(`fake`);
} else if (eventSlave.butt > 12) {
@@ -222,11 +224,15 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
}
App.Events.addParagraph(node, t);
App.Events.addResponses(node, [
- new App.Events.Result(`Help ${him}`, help, fuckNote()),
- new App.Events.Result(`Fuck ${him}`, fuck, fuckNote()),
+ new App.Events.Result(`Help ${him}`, help),
+ (canDoAnal(eventSlave) || canDoVaginal(eventSlave))
+ ? new App.Events.Result(`Fuck ${him}`, fuck, fuckNote())
+ : new App.Events.Result(),
]);
function help() {
+ App.Events.drawEventArt(node, eventSlave);
+
t = [];
t.push(`Deciding to help ${him}, you head over and grab a handful of each of ${his} asscheeks, hefting ${him}`);
t.push(eventSlave.buttImplant / eventSlave.butt >= 0.5 ? "unnaturally taut" : "soft");
@@ -243,16 +249,14 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
t.push(`${He} feels the familiar grip of your`);
t.push(V.PC.title === 1 ? "strong" : "feminine");
t.push(`hands without surprise or resentment, and relaxes trustingly as you manipulate ${his} bottom. Realizing that you're helping ${him}, ${he} quickly slides the offending item down ${his}`);
- t.push(hasBothLegs(eventSlave) ? "tighs" : "tigh");
+ t.push(hasBothLegs(eventSlave) ? "thighs" : "thigh");
t.push(`and off ${him}self, and then thanks you properly. ${He} smiles at you as ${he} puts on the next size up, clearly pleased that you'd <span class="mediumaquamarine">assist ${him} with a trivial thing</span> outside of ${his} direct duties as a sex slave.`);
} else {
t.push(`${He} stiffens at the feeling of your hands on ${his} bottom, not sure whether you're about to ram`);
t.push(V.PC.dick !== 0 ? "your dick" : "something");
- t.push(`up ${his} defenseless asshole. You feel the muscles down there tense a little through the softness of the lower part of ${his} buttocks. That's not what you're planning, though, and eventually ${he} realizes that you mean to help. ${He} thanks you hesitantly before bending to slide the offending clothing down ${his} thigh`);
- if (hasBothLegs(eventSlave)) {
- t.push(`s`);
- }
- t.push(`. Nervously, ${he} thanks you again after ${he}'s free, unsure of ${him}self but <span class="mediumaquamarine">impressed that you'd help ${him} with a little thing like that.</span>`);
+ t.push(`up ${his} defenseless asshole. You feel the muscles down there tense a little through the softness of the lower part of ${his} buttocks. That's not what you're planning, though, and eventually ${he} realizes that you mean to help. ${He} thanks you hesitantly before bending to slide the offending clothing down ${his}`);
+ t.push(hasBothLegs(eventSlave) ? "thighs." : "thigh.");
+ t.push(`Nervously, ${he} thanks you again after ${he}'s free, unsure of ${him}self but <span class="mediumaquamarine">impressed that you'd help ${him} with a little thing like that.</span>`);
}
eventSlave.trust += 5;
return t;
@@ -324,8 +328,8 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
t.push(`${He} stiffens fearfully when ${he} feels you take hold of ${his} huge ass, but ${he} knows not to resist. ${He} stays still as you slide your`);
t.push(V.PC.dick !== 0 ? "dick" : "strap-on");
t.push(`between ${his} asscheeks and then inside ${his}`);
- t.push(canDoVaginal(eventSlave) ? "pussy." : "anus.");
- t.push(`, trying to angle ${his} hips to make the standing penetration less uncomfortable. The clothing binds ${his} legs together, reducing ${him} to simply sticking ${his} butt out as best ${he} can to ease the stroking of your`);
+ t.push(canDoVaginal(eventSlave) ? "pussy," : "anus");
+ t.push(`trying to angle ${his} hips to make the standing penetration less uncomfortable. The clothing binds ${his} legs together, reducing ${him} to simply sticking ${his} butt out as best ${he} can to ease the stroking of your`);
t.push(V.PC.dick !== 0 ? "cock," : "phallus,");
t.push(`invading ${his} helpless`);
if (canDoVaginal(eventSlave)) {
diff --git a/src/events/randomEvent.js b/src/events/randomEvent.js
index a951210eb57..a7173ab1cfc 100644
--- a/src/events/randomEvent.js
+++ b/src/events/randomEvent.js
@@ -16,6 +16,7 @@ App.Events.getIndividualEvents = function(slave) {
new App.Events.RESSHotPC(),
new App.Events.RESSMoistPussy(),
new App.Events.RESSWaistlineWoes(),
+ new App.Events.RESSAssFitting(),
]
.filter(e => (e.eventPrerequisites().every(p => p()) && e.castActors(slave)))
.reduce((res, cur) => res.concat(Array(cur.weight).fill(cur)), []);
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index de601b2896f..3e5cd815e8d 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -363,7 +363,6 @@ globalThis.toJson = function(obj) {
return jsontext;
};
-slave.pregData = App.Data.misc.pregData.human;
/**
* @param {App.Entity.SlaveState} slave
* @param {App.Entity.SlaveState.pregData} slave.pregData
--
GitLab