From 93fc693e8860e48ea1fd25f4d290fa28bade6c56 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 5 Sep 2018 22:13:51 -0500
Subject: [PATCH] Vignette9
---
devNotes/twine JS.txt | 28 ++++++++++++++++++++++------
src/endWeek/saRest.tw | 2 +-
src/endWeek/saServant.tw | 2 +-
src/js/vignettes.tw | 9 +++++++++
4 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index e28f1ec4e14..373b6828e38 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10775,7 +10775,7 @@ window.saRest = function saRest(slave) {
}
if (V.showVignettes == 1) {
- _vignette = GetVignette(slave);
+ var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
@@ -10957,7 +10957,7 @@ window.saServant = function saServant(slave) {
}
if (V.showVignettes == 1) {
- _vignette = GetVignette(slave);
+ var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
@@ -25357,6 +25357,8 @@ window.GetVignette = function GetVignette(slave) {
const hers = pronouns.possessivePronoun;
const himself = pronouns.objectReflexive;
const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
if (slave.assignment === "whore" || slave.assignment === "work in the brothel" || slave.assignment === "be the Madam") {
let seed = jsRandom(1, 10);
@@ -25576,7 +25578,7 @@ window.GetVignette = function GetVignette(slave) {
text: `${he} earned extra gratitude from a citizen who appreciated a nice rear, even if it is off limits,`,
type: "rep",
effect: 1,
- }); ;
+ });
vignettes.push({
text: `${he} disgusted a customer who didn't know how much butts turned them off until ${he} put ${his} hands on theirs,`,
type: "rep",
@@ -25588,7 +25590,7 @@ window.GetVignette = function GetVignette(slave) {
text: `${he} deeply impressed a customer by orgasming to nothing but the feeling of them sucking ${his} nipples,`,
type: "rep",
effect: 1,
- }); ;
+ });
vignettes.push({
text: `${he} disappointed a female customer who didn't know how uninterested she was in nipple play before trying it,`,
type: "rep",
@@ -27152,7 +27154,7 @@ window.GetVignette = function GetVignette(slave) {
text: `${he} earned extra gratitude from a citizen who appreciated a nice rear, even if it is off limits,`,
type: "rep",
effect: 1,
- }); ;
+ });
vignettes.push({
text: `${he} disgusted a citizen who didn't know how much butts turned them off until ${he} put ${his} hands on theirs,`,
type: "rep",
@@ -27164,7 +27166,7 @@ window.GetVignette = function GetVignette(slave) {
text: `${he} deeply impressed a citizen by orgasming to nothing but the feeling of them sucking ${his} nipples,`,
type: "rep",
effect: 1,
- }); ;
+ });
vignettes.push({
text: `${he} disappointed a female citizen who didn't know how uninterested she was in nipple play before trying it,`,
type: "rep",
@@ -28517,6 +28519,13 @@ window.GetVignette = function GetVignette(slave) {
type: "devotion",
effect: 0,
});
+ break;
+ case "humiliation":
+ vignettes.push({
+ text: `${he} loved getting absolutely filthy while cleaning everything else,`,
+ type: "devotion",
+ effect: 1,
+ });
}
}
switch (slave.behavioralFlaw) {
@@ -28621,6 +28630,13 @@ window.GetVignette = function GetVignette(slave) {
});
} else if (slave.assignment === "get milked" || slave.assignment === "work in the dairy" || slave.assignment === "be the Milkmaid") {
if (slave.lactation > 0) {
+ if (slave.race === "black") {
+ vignettes.push({
+ text: `an unknown prankster labeled ${his} milk 'Chocolate Milk', causing unknowing citizens to buy it in droves,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
vignettes.push({
text: `a restaurant critic declared ${his} milk delicious,`,
type: "rep",
diff --git a/src/endWeek/saRest.tw b/src/endWeek/saRest.tw
index c0fb8bebba2..adb3cc9a808 100644
--- a/src/endWeek/saRest.tw
+++ b/src/endWeek/saRest.tw
@@ -54,7 +54,7 @@ window.saRest = function saRest(slave) {
}
if (V.showVignettes == 1) {
- _vignette = GetVignette(slave);
+ var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw
index 78b93f7c587..e6972469171 100644
--- a/src/endWeek/saServant.tw
+++ b/src/endWeek/saServant.tw
@@ -99,7 +99,7 @@ window.saServant = function saServant(slave) {
}
if (V.showVignettes == 1) {
- _vignette = GetVignette(slave);
+ var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
diff --git a/src/js/vignettes.tw b/src/js/vignettes.tw
index 7b33756a7f4..c59e4a67365 100644
--- a/src/js/vignettes.tw
+++ b/src/js/vignettes.tw
@@ -11,6 +11,8 @@ window.GetVignette = function GetVignette(slave) {
const hers = pronouns.possessivePronoun;
const himself = pronouns.objectReflexive;
const boy = pronouns.noun;
+ const He = capFirstChar(he);
+ const His = capFirstChar(his);
if (slave.assignment === "whore" || slave.assignment === "work in the brothel" || slave.assignment === "be the Madam") {
let seed = jsRandom(1, 10);
@@ -3282,6 +3284,13 @@ window.GetVignette = function GetVignette(slave) {
});
} else if (slave.assignment === "get milked" || slave.assignment === "work in the dairy" || slave.assignment === "be the Milkmaid") {
if (slave.lactation > 0) {
+ if (slave.race === "black") {
+ vignettes.push({
+ text: `an unknown prankster labeled ${his} milk 'Chocolate Milk', causing unknowing citizens to buy it in droves,`,
+ type: "cash",
+ effect: 1,
+ });
+ }
vignettes.push({
text: `a restaurant critic declared ${his} milk delicious,`,
type: "rep",
--
GitLab