From cdbf82c6627b6534771b8850f200020cfd9d5910 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 30 Jul 2018 20:31:47 -0400
Subject: [PATCH] fixed vignette JS

---
 devNotes/VersionChangeLog-Premod+LoliMod.txt | 1 +
 devNotes/twine JS.txt                        | 4 ++--
 src/js/vignettes.tw                          | 4 ++--
 src/uncategorized/clubReport.tw              | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index fc3bd036829..8d7057bf9d3 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -6,6 +6,7 @@
 
 	13
 	-sugarcube updated to 2.26.0
+	-fixed DJ/Madam vignette issues
 
 	12
 	-fixed bugs and typos
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 6646495df22..9b2720ed190 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -23372,7 +23372,7 @@ window.GetVignette = function GetVignette(slave) {
 	const boy = pronouns.noun;
 
 
-	if (slave.assignment === "whore" || slave.assignment === "work in the brothel") {
+	if (slave.assignment === "whore" || slave.assignment === "work in the brothel" || slave.assignment === "be the Madam") {
 		let seed = jsRandom(1, 10);
 		switch (seed) {
 			case 1:
@@ -24753,7 +24753,7 @@ window.GetVignette = function GetVignette(slave) {
 			type: "trust",
 			effect: -1,
 		});
-	} else if (slave.assignment === "serve the public" || slave.assignment === "serve in the club") {
+	} else if (slave.assignment === "serve the public" || slave.assignment === "serve in the club" || slave.assignment === "be the DJ") {
 		let seed = jsRandom(1, 10);
 		switch (seed) {
 			case 1:
diff --git a/src/js/vignettes.tw b/src/js/vignettes.tw
index 555472492f8..5dbbbc339ee 100644
--- a/src/js/vignettes.tw
+++ b/src/js/vignettes.tw
@@ -13,7 +13,7 @@ window.GetVignette = function GetVignette(slave) {
 	const boy = pronouns.noun;
 
 
-	if (slave.assignment === "whore" || slave.assignment === "work in the brothel") {
+	if (slave.assignment === "whore" || slave.assignment === "work in the brothel" || slave.assignment === "be the Madam") {
 		let seed = jsRandom(1, 10);
 		switch (seed) {
 			case 1:
@@ -1394,7 +1394,7 @@ window.GetVignette = function GetVignette(slave) {
 			type: "trust",
 			effect: -1,
 		});
-	} else if (slave.assignment === "serve the public" || slave.assignment === "serve in the club") {
+	} else if (slave.assignment === "serve the public" || slave.assignment === "serve in the club" || slave.assignment === "be the DJ") {
 		let seed = jsRandom(1, 10);
 		switch (seed) {
 			case 1:
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 8dbdffa6dd9..9b53b34a4ab 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -110,13 +110,13 @@
 			<<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].entertainSkill >= 100) && ($slaves[_FLs].devotion > 50)>>
 				<<set $legendaryEntertainerID = $slaves[_FLs].ID>>
 			<</if>>
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;Since she doesn't have enough sluts in $clubName to make it worthwhile for her to be on stage 24/7, she spends her extra time slutting it up herself. She has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
 			<<if $showEWD != 0>>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;She <<include "SA serve the public">>
 			<<else>>
 				<<silently>><<include "SA serve the public">><</silently>>
 			<</if>>
 			<<set $repGain += Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].entertainSkill))*0.1*0.5)>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;Since she doesn't have enough sluts in $clubName to make it worthwhile for her to be on stage 24/7, she spends her extra time slutting it up herself. She has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
 		<</if>>
 	<</if>>
 	<<if (_DL > 0)>><br><br><</if>>
-- 
GitLab