diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index b40608cfbd113ef3bf9bbd38d44700f2b02b3b98..9df8e1e59cff5bded3eb10fd3ad710fca03b411f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.7.x
+9/06/2018
+
+ 19
+ -more vignettes for more assignments
+ -fixes
+
9/05/2018
18
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 8fd92a0abe58a32c72284cbc2fd3cc00ee5e8bc0..12524d14bbce300da894a7969b506a4230a4acc1 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1797,7 +1797,8 @@ window.Job = Object.freeze({
BABY_FACTORY: 'labor in the production line', BROTHEL: 'work in the brothel', MADAM: 'be the Madam', ARCADE: 'be confined in the arcade',
SERVANT: 'work as a servant', SERVER: 'be a servant', STEWARD: 'be the Stewardess', CLUB: 'serve in the club', DJ: 'be the DJ',
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
- HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant'});
+ HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant',
+ REST: 'rest'});
window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.getCost = function(array) {
@@ -10774,7 +10775,7 @@ window.saRest = function saRest(slave) {
}
}
- if (V.showVignettes == 1) {
+ if (V.showVignettes == 1 && slave.assignment === Job.REST) {
var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
@@ -10956,7 +10957,7 @@ window.saServant = function saServant(slave) {
t += `as a drink dispenser at mealtimes, and makes a meaningful contribution to ${his} fellow slaves' nutrition in concert with the feeding systems.`;
}
- if (V.showVignettes == 1) {
+ if (V.showVignettes == 1 && (slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER)) {
var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
diff --git a/src/endWeek/saRest.tw b/src/endWeek/saRest.tw
index adb3cc9a808ee4bc3d4aeaf8375478d8716da6a8..ffb8f0095c00ea397b607dd84aa244b251647731 100644
--- a/src/endWeek/saRest.tw
+++ b/src/endWeek/saRest.tw
@@ -53,7 +53,7 @@ window.saRest = function saRest(slave) {
}
}
- if (V.showVignettes == 1) {
+ if (V.showVignettes == 1 && slave.assignment === Job.REST) {
var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw
index e6972469171edcf9a94ef9e045926720f1e58fc4..36cf75b8f317f9882621d4730e397b32adc7ded4 100644
--- a/src/endWeek/saServant.tw
+++ b/src/endWeek/saServant.tw
@@ -98,7 +98,7 @@ window.saServant = function saServant(slave) {
t += `as a drink dispenser at mealtimes, and makes a meaningful contribution to ${his} fellow slaves' nutrition in concert with the feeding systems.`;
}
- if (V.showVignettes == 1) {
+ if (V.showVignettes == 1 && (slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER)) {
var _vignette = GetVignette(slave);
t += ` __This week__ ${_vignette.text} `
if (_vignette.type == "cash") {
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 80992df811bd848193fe821ea0706a1b4d7e5235..76722df46894ec65dc30aea22bf9f5ceb3211b04 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -6,7 +6,8 @@ window.Job = Object.freeze({
BABY_FACTORY: 'labor in the production line', BROTHEL: 'work in the brothel', MADAM: 'be the Madam', ARCADE: 'be confined in the arcade',
SERVANT: 'work as a servant', SERVER: 'be a servant', STEWARD: 'be the Stewardess', CLUB: 'serve in the club', DJ: 'be the DJ',
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
- HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant'});
+ HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant',
+ REST: 'rest'});
window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.getCost = function(array) {
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index 27d27ecad63b780fb08537f56fadffc4d279f39b..f918042ff276bf57e087867678168234e7ba553d 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -467,7 +467,7 @@ gets milked this week.
<<set $slaves[$i].devotion += 1>>
<</if>>
-<<if ($showVignettes == 1)>>
+<<if ($showVignettes == 1 && ($slaves[$i].assignment == "get milked" || $slaves[$i].assignment == "work in the dairy"))>>
<<set _vignette = GetVignette($slaves[$i])>>
__This week__ _vignette.text
<<if (_vignette.type == "cash")>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index ea808838d4d56df66fd34f61a0230aa0d25f3793..7802807567f03754b3dad472c8d7ff02cfcd5f3d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -897,7 +897,7 @@
<<if ($slaves[$i].buttplug != "none")>>
<<if ($slaves[$i].buttplug == "plug") || ($slaves[$i].buttplug == "long plug")>>
- <<if ($slaves[$i].buttplugAttachment == "tail")>>
+ <<if ["tail", "cat tail", "fox tail"].includes($slaves[$i].buttplugAttachment)>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
<<if $slaves[$i].anus < 1>>
Constantly wearing a tail plug in $his virgin butthole @@.lime;stretches it out@@ and @@.gold;is a constant degrading reminder of $his submission.@@
@@ -935,7 +935,7 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].buttplug == "large plug") || ($slaves[$i].buttplug == "long, large plug")>>
- <<if ($slaves[$i].buttplugAttachment == "tail")>>
+ <<if ["tail", "cat tail", "fox tail"].includes($slaves[$i].buttplugAttachment)>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].anus < 2)>>
The uncomfortable tailed plug in $his asshole
@@ -1002,7 +1002,7 @@
<</if>>
<<elseif ($slaves[$i].buttplug == "huge plug") || ($slaves[$i].buttplug == "long, huge plug")>>
<<if ($slaves[$i].buttplugAttachment == "tail")>>
- <<if ($slaves[$i].anus < 4)>>
+ <<if ["tail", "cat tail", "fox tail"].includes($slaves[$i].buttplugAttachment)>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].sexualQuirk == "size queen")>>
$He thinks of the horribly huge tailed plug $he has wear in $his butt as @@.lime;preparation for the biggest cocks,@@ and @@.hotpink;looks forward@@ to being able to safely take unlubricated anal from them. Even so, the tail hanging from $his rear is @@.gold;a constant degrading reminder of $his submission.@@
@@ -1056,7 +1056,7 @@
<</if>>
<</if>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if ($slaves[$i].buttplugAttachment == "tail")>>
+ <<if ["tail", "cat tail", "fox tail"].includes($slaves[$i].buttplugAttachment)>>
<<if ($slaves[$i].fetish == "humiliation") && ($slaves[$i].fetishKnown == 0)>>
$He shows a surprising lack of resistance to the routine of having a tail inserted in $his ass each morning; $he seems to @@.lightcoral;naturally enjoy the humiliation.@@
<<set $slaves[$i].fetishKnown = 1>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index bc770b4eb22f9a4088de38ea2b80b4a0c2206734..fbbf8f9842419e880a2c045aaa9ae0bbdf7afaa3 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -560,7 +560,7 @@ Dye or paint:
<<if $activeSlave.eyebrowHStyle != "bald">>
- <br><br>$His $activeSlave.eyebrowFullness, $activeSlave.eyebrowHStyle eyebrows
+ <br><br>$His <<if $activeSlave.eyebrowFullness != "natural" && $activeSlave.eyebrowHStyle != "natural">>$activeSlave.eyebrowFullness, $activeSlave.eyebrowHStyle<</if>> eyebrows
<<if $activeSlave.eyebrowHStyle == "shaved">>
would be $activeSlave.eyebrowHColor if present.
<<else>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 69928561b47d6ece90302344409d38e30f5a9745..e1d3804f0192a7fb22e9f89db12b506f287093e4 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -669,7 +669,7 @@ __Bids Received__
<br>''<<print cashFormat(_Price)>>'' from a citizen who is clearly aroused by $his slutty tattoos.
<<set _NewOwner = 1>>
<<elseif ($activeSlave.boobs > 800) && ($activeSlave.areolaeShape != "circle") && (random(1,100) > 80)>>
- <br>''<<print cashFormat(_NewOwner)>>'' from a citizen who can't take his eyes off $his unique areolae.
+ <br>''<<print cashFormat(_Price)>>'' from a citizen who can't take his eyes off $his unique areolae.
<<set _NewOwner = 1>>
<<elseif ($activeSlave.clit > 2) && (random(1,100) > 80)>>
<br>''<<print cashFormat(_Price)>>'' from a citizen who keeps running her tongue over her lips while staring at the slave's giant clit.