From 5f08f83af15dbbb9e34b34f996ae69914f032af8 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 9 Nov 2018 00:14:50 -0600
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 26 +++++++++++++++-----------
src/js/vignettes.tw | 26 +++++++++++++++-----------
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 9d20462a885..59929970873 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -30007,25 +30007,29 @@ window.GetVignette = function GetVignette(slave) {
}
if (slave.energy > 95) {
if (slave.behavioralFlaw === "odd") {
- vignettes.push({
- text: `you discovered ${him} sketching an image of ${his} genitalia, which you managed to sell,`,
- type: "cash",
- effect: 1,
- });
+ if (slave.amp !== 1) && (canSee(slave)) {
+ vignettes.push({
+ text: `you discovered ${him} sketching an image of ${his} genitalia, which you managed to sell,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
}
if (canWalk(slave)) {
- if (slave.amp !== 0) {
+ if (slave.amp === 0) {
vignettes.push({
text: `${he} was so horny that ${he} sleepwalked into your room and performed oral sex on you, and then woke up when ${he} bruised ${his} shin,`,
type: "health",
effect: -1,
});
}
- vignettes.push({
- text: `due to the obvious difficulties in ${his} mobility, ${he} spent a lot of time masturbating in bed,`,
- type: "health",
- effect: 0,
- });
+ if (slave.releaseRules === "permissive" || slave.releaseRules === "masturbation") {
+ vignettes.push({
+ text: `due to the obvious difficulties in ${his} mobility, ${he} spent a lot of time masturbating in bed,`,
+ type: "health",
+ effect: 0,
+ });
+ }
}
}
if (slave.health < -20) {
diff --git a/src/js/vignettes.tw b/src/js/vignettes.tw
index b58233b60df..17be850d779 100644
--- a/src/js/vignettes.tw
+++ b/src/js/vignettes.tw
@@ -3389,25 +3389,29 @@ window.GetVignette = function GetVignette(slave) {
}
if (slave.energy > 95) {
if (slave.behavioralFlaw === "odd") {
- vignettes.push({
- text: `you discovered ${him} sketching an image of ${his} genitalia, which you managed to sell,`,
- type: "cash",
- effect: 1,
- });
+ if (slave.amp !== 1) && (canSee(slave)) {
+ vignettes.push({
+ text: `you discovered ${him} sketching an image of ${his} genitalia, which you managed to sell,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
}
if (canWalk(slave)) {
- if (slave.amp !== 0) {
+ if (slave.amp === 0) {
vignettes.push({
text: `${he} was so horny that ${he} sleepwalked into your room and performed oral sex on you, and then woke up when ${he} bruised ${his} shin,`,
type: "health",
effect: -1,
});
}
- vignettes.push({
- text: `due to the obvious difficulties in ${his} mobility, ${he} spent a lot of time masturbating in bed,`,
- type: "health",
- effect: 0,
- });
+ if (slave.releaseRules === "permissive" || slave.releaseRules === "masturbation") {
+ vignettes.push({
+ text: `due to the obvious difficulties in ${his} mobility, ${he} spent a lot of time masturbating in bed,`,
+ type: "health",
+ effect: 0,
+ });
+ }
}
}
if (slave.health < -20) {
--
GitLab