diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c98f726232435e736906fc44bf5e69bacae8befb..7f157b1fc556f399d88003548c42c2dc927c2868 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4930,11 +4930,18 @@ Pregmod 0.10.3.0
-fixes
12/16/2017
+
212
-fixes
-new outcome for reRebels
12/17/2017
+
213
-lots of spelling corrections
- -fixes
\ No newline at end of file
+ -fixes
+
+ 12/18/2017
+
+ 214
+ -saRules now applies to the spa
\ No newline at end of file
diff --git a/devNotes/twine JS b/devNotes/twine JS
index f80ede0633d1dccf6b83b65869889cb6597c81b8..5e10b2799d12a6d71112c42a8c8986c14901065b 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2168,6 +2168,16 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost * .90;
}
+ } else if(s.assignment === Job.ATTEND) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SPA) {
+ if(s.livingRules === LivingRule.LUXURIOUS) {
+ cost += rulesCost * 1.75;
+ } else if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ cost += rulesCost;
+ }
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 79157322728db1390dbbdfb56994e3cad59af9d4..09c8a772313b58ac299d1e42120fe497417cfe86 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -354,6 +354,16 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost * .90;
}
+ } else if(s.assignment === Job.ATTEND) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SPA) {
+ if(s.livingRules === LivingRule.LUXURIOUS) {
+ cost += rulesCost * 1.75;
+ } else if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ cost += rulesCost;
+ }
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 8f1b20538afcd7ace1d9137990d1918aca67d8dc..8b636e43a4b0be226d4c2dfaa14236379752c214 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -126,6 +126,16 @@
<<else>>
<<set $costs += ($rulesCost*.9)>>
<</if>>
+<<elseif ($slaves[$i].assignment == "be the Attendant")>>
+ <<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "rest in the spa")>>
+ <<if $slaves[$i].livingRules == "luxurious">>
+ <<set $costs += ($rulesCost*1.75)>>
+ <<elseif $slaves[$i].livingRules == "normal">>
+ <<set $costs += ($rulesCost*1.5)>>
+ <<else>>
+ <<set $costs += $rulesCost>>
+ <</if>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index a20835cb4a449613d6b33cecef5d6218228fdd3f..264141c0cf079591b9f161d3fed3de6d7b8af93d 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -238,6 +238,9 @@
<<elseif ($slaves[$i].assignment == "be the Wardeness")>>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
<<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be the Attendant")>>
+ <br> Living expenses: ¤<<print ($rulesCost*2)>>
+ <<set $individualCosts += ($rulesCost*2)>>
<<elseif ($slaves[$i].assignment == "serve in the club")>>
<br> Living expenses: ¤<<print ($rulesCost*1.5)>>
<<set $individualCosts += ($rulesCost*2)>>
@@ -268,6 +271,17 @@
<br> Living expenses: ¤<<print ($rulesCost*.9)>>
<<set $individualCosts += ($rulesCost*.9)>>
<</if>>
+ <<elseif ($slaves[$i].assignment == "rest in the spa")>>
+ <<if $slaves[$i].livingRules == "luxurious">>
+ <br> Living expenses: ¤<<print ($rulesCost*1.75)>>
+ <<set $individualCosts += ($rulesCost*1.75)>>
+ <<elseif $slaves[$i].livingRules == "normal">>
+ <br> Living expenses: ¤<<print ($rulesCost*1.5)>>
+ <<set $individualCosts += ($rulesCost*1.5)>>
+ <<else>>
+ <br> Living expenses: ¤<<print $rulesCost>>
+ <<set $individualCosts += $rulesCost>>
+ <</if>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index cdfc5f6950b37a283cf37ba375ccbc5e5d870b0d..1eba1062ed400b0c72263b80ba220d6d2366d5fe 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1702,57 +1702,55 @@
<</if>>
<<case "rest in the spa">>
<<if $slaves[$i].devotion < -50>>
- is so unhappy that she has little interest in getting off, not that her clients care.
+ is so unhappy that she has little interest in getting off.
<<set $slaves[$i].need = 0>>
<<elseif $slaves[$i].energy <= 20>>
- is frigid and has little interest in getting off, not that her clients care.
+ is frigid and has little interest in getting off.
<<set $slaves[$i].need = 0>>
- <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
- <<if ($slaves[$i].devotion <= 20)>>
- gets off at work despite her reluctance, @@.hotpink;habituating her to sexual slavery.@@
- <<set $slaves[$i].devotion += 1>>
- <<if ($slaves[$i].trust > -20) && ($slaves[$i].devotion <= 20)>>
- She hates herself for climaxing, and knows the mild aphrodisiacs in the food are forcing her arousal, @@.gold;frightening her.@@
- <<set $slaves[$i].trust -= 1>>
- <</if>>
- <<set $slaves[$i].need -= 20>>
- <<elseif ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
- gets off at work, so being forbidden to masturbate doesn't affect her seriously.
- <<set $slaves[$i].need -= 20>>
+ <<elseif $Attendant != 0>>
+ is routinely relieved of any built up tension by $Attendant.slaveName and her
+ <<if canPenetrate($slaves[$i]) && $Attendant.boobs >= 500>>
+ luscious breasts.
+ <<set $slaves[_FLs].mammaryCount += 14, $mammaryTotal += 14>>
<<else>>
- gets off at work, so she doesn't feel the need to masturbate frequently.
- <<set $slaves[$i].need -= 20>>
+ <<if $slaves[_FLs].lips > 40>>
+ luscious lips.
+ <<elseif $slaves[_FLs].oralSkill > 30>>
+ skilled tongue.
+ <<else>>
+ willing mouth.
+ <</if>>
+ <<set $slaves[_FLs].oralCount += 14, $oralTotal += 14>>
+ /* possible cumflation code here */
<</if>>
+ <<set $slaves[$i].need -= 60>>
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
- refuses to come up to the penthouse for sexual release, and is @@.gold;severely punished@@ for illicit masturbation.
+ refuses to come up to the penthouse for sexual release, or to beg to share a bath with you, and is @@.gold;severely punished@@ for illicit masturbation.
<<set $slaves[$i].trust -= 2>>
<<elseif ($slaves[$i].devotion < 50)>>
<<if $slaves[$i].devotion <= 20>>
- occasionally comes to the penthouse to beg for sexual release.
+ occasionally comes to the penthouse to beg for sexual release or for you to join her in $spaName.
<<else>>
- doesn't mind having to come to the penthouse to beg for sexual release.
+ doesn't mind having to come to the penthouse to beg for sexual release or for you to join her in $spaName.
<</if>>
<<saRulesPlayerEnergy>>
<<else>> /* $slaves[$i].devotion >= 50 */
willingly comes up to the penthouse and begs you to
<<saRulesPlayerFetishPlay>>
- every break she gets.
+ whenever the urge strikes.
<<saRulesPlayerEnergy>>
<</if>> /* closes $slaves[$i].devotion >= 50 */
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<if $slaves[$i].sexualFlaw == "attention whore">>
- @@.hotpink;enjoys being allowed to masturbate,@@ especially since its often to the pleasure of an aroused client.
- <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
- <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
- takes solace in her permission to masturbate rather than being forced to beg for sex, though being forced to do it in front of an aroused client prevents her from getting complacent; you can never know when they'll want more.
- <<set $slaves[$i].need = 0>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ takes solace in her permission to masturbate rather than being forced to beg for sex, @@.mediumaquamarine;reducing her fear@@ of you.
+ <<set $slaves[$i].trust += 2, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
- enjoys being allowed to masturbate rather than trading sex with other slaves, though being forced to do it in front of an aroused client @@.gold;terrifies her;@@ you can never know when they'll want more.
- <<set $slaves[$i].trust -= 1, $slaves[$i].need = 0>>
+ enjoys being allowed to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you but @@.mediumorchid;allowing her to remain in control of her sexuality.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 1, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion < 50)>>
accepts having to relieve herself solely through masturbation.
<<set $slaves[$i].need = 0>>
@@ -1776,15 +1774,15 @@
masturbates whenever she can find a private moment to take care of the urges induced by the food, @@.mediumaquamarine;slightly reducing her fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
<<else>>
- refuses to use other slaves to get off, and is forced to take additional clients @@.gold;as punishment@@ for illicit masturbation.
+ refuses to ask other slaves for sex, and is @@.gold;severely punished@@ for illicit masturbation.
<<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>>
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
- prefers to masturbate rather than demanding sex from other slaves or giving free samples, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ prefers to masturbate rather than demanding sex from other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
<<else>>
- is forced by the urges induced by the food to either demand sex from other slaves or attempt to attract additional clients. She @@.hotpink;hates herself@@ for it.
+ is forced by the urges induced by the food to demand sex from other slaves, and @@.hotpink;hates herself@@ for it.
<<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
<</if>>
<<elseif ($slaves[$i].devotion < 50)>>
@@ -1809,10 +1807,10 @@
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
- prefers to masturbate rather than trading sex with other slaves or giving free samples, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ prefers to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
<<else>>
- is forced by the urges induced by the food to either swap sex with other slaves or attempt to attract additional clients. She @@.hotpink;hates herself@@ for it.
+ is forced by the urges induced by the food to swap sex with other slaves, and @@.hotpink;hates herself@@ for it.
<<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
<</if>>
<<elseif ($slaves[$i].devotion < 50)>>
@@ -1845,9 +1843,12 @@
<</if>>
<<if ($slaves[$i].devotion <= 20)>>
- <<switch $brothelDecoration>>
- <<case "Chattel Religionist" "Degradationist" "standard">>
- The spare living conditions of $brothelName @@.hotpink;get her used@@ to the routine of
+ <<switch $spaDecoration>>
+ <<case "Chinese Revivalist">>
+ The steam of the bathhouse lingers even in her personal room and @@.hotpink;dulls her will.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<case "Chattel Religionist">>
+ She gets a space of her own in the communal slave quarters, but the constant sexual presence of the other slaves @@.hotpink;get her used@@ to the routine of
<<if ($slaves[$i].trust > 20)>>
slavery and @@.gold;keep her aware of her lowly place.@@
<<set $slaves[$i].trust -= 1>>
@@ -1855,35 +1856,60 @@
slavery.
<</if>>
<<set $slaves[$i].devotion += 1>>
+ <<case "Degradationist">>
+ She gets a little room all to herself, allowing her to feel self-reliant; or it would, if it didn't have numerous cameras watching her every move. The conditions @@.hotpink;get her used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery and @@.gold;keep her aware of her lowly place.@@
+ <<set $slaves[$i].trust -= 1>>
+ <<else>>
+ slavery.
+ <</if>>
+ <<case "Asset Expansionist" "Transformation Fetishist" "Pastoralist">>
+ She gets a little room all to herself, allowing her to feel self-reliant; or it would, if it weren't filled with constant reminders of her changing body. The conditions @@.hotpink;get her used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery and @@.gold;keep her aware of her lowly place.@@
+ <<set $slaves[$i].trust -= 1>>
+ <<else>>
+ slavery.
+ <</if>>
<<default>>
- She gets a little room all to herself, allowing her to feel self-reliant; or it would, if it didn't reek of sex and shame after all the customers she serviced in it.
+ She gets a comfortable little room all to herself, allowing her to let down her guard and @@.mediumaquamarine;feel self-reliant.@@
+ <<set $slaves[$i].trust += 1>>
<</switch>>
<<else>>
- <<switch $brothelDecoration>>
- <<case "Chattel Religionist" "Degradationist" "standard">>
+ <<switch $spaDecoration>>
+ <<case "Chinese Revivalist">>
+ The steam of the bathhouse lingers even in her personal room and @@.hotpink;renders her even more submissive.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<case "Chattel Religionist">>
+ She likes her personal space in $spaName, even if it smells of sex and steam.
+ <<case "Degradationist">>
<<if ($slaves[$i].trust > 40)>>
- The spare living conditions of $brothelName @@.gold;remind her not to get too comfortable@@ with her life.
+ The invasive living conditions of $spaName @@.gold;remind her not to get too comfortable@@ with her life.
<<set $slaves[$i].trust -= 2>>
<<elseif ($slaves[$i].trust > 10)>>
- The spare living conditions of $brothelName @@.gold;keep her aware of her place.@@
+ The invasive living conditions of $spaName @@.gold;keep her aware of her place.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
+ <<case "Asset Expansionist" "Transformation Fetishist" "Pastoralist">>
+ She likes her little room in $spaName, <<if $slaves[$i].boobs < 10000>>even if her boobs are too small to make the most of it<<else>>even more so, since it accommodates her expansive bust<</if>>.
<<default>>
- She likes her little room in $brothelName, even if it smells of sex after fucking in it all day.
+ She loves her little room in $spaName. It's the perfect end to a day of relaxation.
+ <<set $slaves[$i].trust += 1>>
<</switch>>
<</if>>
<<if ($universalRulesConsent == 0)>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -10)>>
- <<if $BrothiIDs.length > 2 || $Madam != 0>>
+ <<if $SpaiIDs.length > 2>>
Under the rules, she finds herself constantly molested by other slaves, and lives her life constantly @@.gold;afraid.@@
<<else>>
- Under the rules, she is free game for other slaves to molest, and lives her life constantly @@.gold;afraid@@ of the day you assign more girls to $brothelName.
+ Under the rules, she is free game for other slaves to molest, and lives her life constantly @@.gold;afraid@@ of the day another slave grabs her from under the water.
<</if>>
<<set $slaves[$i].trust -= 2>>
<<else>>
- <<if $BrothiIDs.length > 2 || $Madam != 0>>
+ <<if $SpaiIDs.length > 2>>
Under the rules, she finds herself constantly molested by other slaves, but she's already in such constant terror it doesn't seriously affect her.
<<else>>
Under the rules, she will someday find herself constantly molested by other slaves, but she's already in such constant terror it that it doesn't cross her mind.
@@ -1891,25 +1917,25 @@
<</if>>
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
- <<if $BrothiIDs.length > 2>>
+ <<if $SpaiIDs.length > 2>>
Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for providing plentiful outlets for her nymphomania.
<<else>>
- Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName to get her off.
+ Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join her in the pool<<else>>you assign more girls to $spaName to help her relieve her <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
- <<if $BrothiIDs.length > 2>>
- Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole whorehouse of girls for her to rape.
+ <<if $SpaiIDs.length > 2>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole pool of girls for her to rape.
<<else>>
- Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName for her to rape.
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join her in the pool<<else>>you assign more girls to $spaName to help her unwind<</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
- <<if $BrothiIDs.length > 2>>
- Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for providing a whole whorehouse of girls for her to dominate.
+ <<if $SpaiIDs.length > 2>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for providing a whole pool of girls for her to dominate.
<<else>>
- Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName for her to dominate.
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join her in the pool<<else>>you assign more girls to $spaName to help her unwind<</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<</if>>
@@ -1917,10 +1943,10 @@
<</if>>
<<else>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
- <<if $BrothiIDs.length > 2 || $Madam != 0>>
+ <<if $SpaiIDs.length > 2>>
Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse.
<<else>>
- Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse. Well, that and the fact $brothelName is rather empty.
+ Since she's low in the slave hierarchy, @@.mediumaquamarine;she knows@@ that the rule that slaves must get consent before having sex with her are all that protect her from abuse. Well, that and the fact $spaName is <<if $Attendant != 0>>mostly frequented by other slaveowners' stock<<else>>her litle private sanctuary<</if>>.
<</if>>
<<set $slaves[$i].trust += 1>>
<</if>>
@@ -1929,7 +1955,7 @@
<<if ($slaves[$i].attrKnown == 0)>>
<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
<<set $slaves[$i].attrKnown = 1>>
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she services customers, analyzing her sexuality. It seems she is
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she mingles with other soaking slaves, analyzing her sexual tastes. It seems she is
<<saRulesAttractionDiscovery>>
<</if>>
<</if>>
@@ -1967,12 +1993,7 @@
<<if _rewards > 0>>
<<switch $slaves[$i].standardReward>>
<<case "relaxation">>
- She's given free time, which she
- <<if $spa != 0>>
- usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
- <<else>>
- usually spends relaxing in the penthouse slave quarters.
- <</if>>
+ She's given free time, which she usually spends in a private bath<<if $Attendant != 0>> enjoying $Attendant.slaveName's best care<</if>>.
<<if $slaves[$i].relationship > 0>>
She often asks to save these breaks so she can spend them with her <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
<</if>>
@@ -2006,11 +2027,11 @@
<<if _punishments > 0>>
<<switch $slaves[$i].standardPunishment>>
<<case "confinement">>
- When she disobeys, she
+ When she disobeys, she's
<<if $cellblock != 0>>
- @@.gold;spends her off hours in $cellblockName@@<<if $Wardeness != 0>>, where she can experience $Wardeness.slaveName's tender mercies<</if>>.
+ @@.gold;put in $cellblockName@@<<if $Wardeness != 0>>, where she can experience $Wardeness.slaveName's tender mercies<</if>>.
<<else>>
- spends her off hours @@.gold;shut up in a box@@ until she behaves.
+ @@.gold;shut up in a box@@ until she behaves.
<</if>>
<<set $slaves[$i].trust -= _punishments>>
<<case "whipping">>
@@ -2018,7 +2039,7 @@
<<set $slaves[$i].health -= _punishments>>
<<set $slaves[$i].trust -= 2*_punishments>>
<<case "chastity">>
- When she disobeys, she finds her next client is into @@.gold;orgasm denial,@@ @@.red;reducing her libido@@ but breaking her to @@.hotpink;sexual obedience.@@
+ When she disobeys, she's @@.gold;denied@@ her next orgasm, @@.red;reducing her libido@@ but breaking her to @@.hotpink;sexual obedience.@@
<<if $slaves[$i].energy > 2>><<set $slaves[$i].energy -= 2*_punishments>><</if>>
<<set $slaves[$i].devotion += _punishments>>
<<set $slaves[$i].trust -= _punishments>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 64f110739571ee2f55723bef10d725ec681e36d0..c570f5059e8457f577839672ba082ca1babd578f 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -21,6 +21,9 @@
<<if $slaves[_FLs].trust < 60>>
<<set $slaves[_FLs].trust++>>
<</if>>
+ <<if $slaves[_FLs].livingRules != "luxurious">>
+ <<set $slaves[_FLs].livingRules = "luxurious">>
+ <</if>>
<<set _FLsFetish = 0>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "submissive">>
@@ -236,6 +239,7 @@
''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Attendant in $spaName.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -245,6 +249,7 @@
<<else>>
<<silently>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -269,6 +274,14 @@
<<if ($spaUpgrade == 1) && ($slaves[$i].health < 20)>>
<<set $slaves[$i].health += 3>>
<</if>>
+ <<switch $spaDecoration>>
+ <<case "Chattel Religionist" "Chinese Revivalist">>
+ <<set $slaves[$i].livingRules = "normal">>
+ <<case "Degradationist">>
+ <<set $slaves[$i].livingRules = "spare">>
+ <<default>>
+ <<set $slaves[$i].livingRules = "luxurious">>
+ <</switch>>
<<if ($slaves[$i].health >= 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
<br><br>''__@@.pink;$slaves[$i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;her assignment has defaulted to rest@@.
<<removeJob $slaves[$i] "rest in the spa">>
@@ -293,6 +306,7 @@
<br> She <<include "SA rest">>
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -304,6 +318,7 @@
<<include "SA chooses own job">>
<<include "SA chooses own clothes">>
<<include "SA rest">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 0edfafbac9bf6aa729a731c951757fd59390dcc3..af0d519412fd65e153803395b17ee5b8a62fcf46 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -58,6 +58,14 @@
<<set $args[0].assignment = "work as a servant", $args[0].assignmentVisible = 0, $servantsQuartersSlaves++, $ServQiIDs.push(_wID)>>
<<case "rest in the spa" "spa">>
<<set $args[0].assignment = "rest in the spa", $args[0].assignmentVisible = 0, $spaSlaves++, $SpaiIDs.push(_wID)>>
+ <<switch $spaDecoration>>
+ <<case "Chattel Religionist" "Chinese Revivalist">>
+ <<set $args[0].livingRules = "normal">>
+ <<case "Degradationist">>
+ <<set $args[0].livingRules = "spare">>
+ <<default>>
+ <<set $args[0].livingRules = "luxurious">>
+ <</switch>>
<<case "be the attendant" "be your concubine" "be the dj" "be the madam" "be the milkmaid" "be the nurse" "be the schoolteacher" "be the stewardess" "be the wardeness">>
<<set $args[0].assignment = $args[1], $args[0].assignmentVisible = 0>> /* non-visible leadership roles */
<<case "be your agent" "live with your agent">>
@@ -176,6 +184,9 @@
<</switch>>
<<set $args[0].assignmentVisible = 1, $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
+ <<if $args[0].livingRules == "luxurious">>
+ <<set $args[0].livingRules = "normal">>
+ <</if>>
<<if _wi >= 0>>
<<set $slaves[_wi] = $args[0]>> /* save changes to slave array */