diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index aea280307a4b7a1cd20ef56557b1523332d8c36a..8d1ef8d5968ebf0c26a531a14b119908565692e5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4878,4 +4878,10 @@ Pregmod 0.10.3.0
198
-fixes
- -saRules now applies to the brothel
\ No newline at end of file
+ -saRules now applies to the brothel
+
+ 199
+ -fixes
+
+ 200
+ -saRules now applies to the club
\ No newline at end of file
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 3c72a4834ffd3e1530bbe3c3d9992deb62ad61c5..f509a5b0d1014899fa1fe39b33ebb7f7189efa43 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2146,6 +2146,10 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.DJ) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.CLUB) {
+ cost += rulesCost * 1.5;
} 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 4522f24025fe3867ec44a76bf439b51798e47454..769ff3c242f53c1bc80db869c5458ae1cebd8bb3 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -332,6 +332,10 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.DJ) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.CLUB) {
+ cost += rulesCost * 1.5;
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 2276e6420353f93958ad2c699f2cca1138079177..9d89bb6121032bd265042bb9ec5e098749875756 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -40,6 +40,9 @@
<<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
<</if>>
+ <<if $slaves[_FLs].livingRules != "luxurious">>
+ <<set $slaves[_FLs].livingRules = "luxurious">>
+ <</if>>
/% Make sure we have registered living expenses as for any other slave %/
<<run getSlaveStatisticData($DJ, $facility.club)>>
<<set $DJ = $slaves[_FLs]>>
@@ -138,6 +141,7 @@
''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is performing as the DJ in $clubName.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -147,6 +151,7 @@
<<else>>
<<silently>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -189,6 +194,10 @@
<<set $slaves[$i].health += 7>>
<</if>>
+ <<if $slaves[$i].livingRules != "normal">>
+ <<set $slaves[$i].livingRules = "normal">>
+ <</if>>
+
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -207,6 +216,7 @@
<br> She <<include "SA serve the public">>
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -218,6 +228,7 @@
<<include "SA chooses own job">>
<<include "SA serve the public">>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 30cdb5746c9a52931d72e9c0b42cb71a9664eaa6..1e52f72107c6275353aabc25cb83caf5d97703c3 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -96,7 +96,7 @@
<<if ($slaves[$i].assignment == "work in the dairy" && $dairyRestraintsSetting >= 2) || ($slaves[$i].assignment == "be confined in the arcade")>>
<<set $costs += ($rulesCost*.75)>>
-<<elseif ($slaves[$i].assignment == "be the madam")>>
+<<elseif ($slaves[$i].assignment == "be the Madam")>>
<<set $costs += ($rulesCost*2)>>
<<elseif ($slaves[$i].assignment == "work in the brothel")>>
<<if $slaves[$i].livingRules == "normal">>
@@ -104,6 +104,10 @@
<<else>>
<<set $costs += $rulesCost>>
<</if>>
+<<elseif ($slaves[$i].assignment == "be the DJ")>>
+ <<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "serve in the club")>>
+ <<set $costs += ($rulesCost*1.5)>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 1a83e6c6dccf0c4324b17e7c699e4994860ec114..510e84169ba9ff272d0d57189a4673c1bd699bb1 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -226,9 +226,15 @@
<<if ($slaves[$i].assignment == "work in the dairy" && $dairyRestraintsSetting >= 2) || ($slaves[$i].assignment == "be confined in the arcade")>>
<br> Living expenses: ¤<<print ($rulesCost*.75)>>
<<set $individualCosts += ($rulesCost*.75)>>
- <<elseif ($slaves[$i].assignment == "be the madam")>>
+ <<elseif ($slaves[$i].assignment == "be the Madam")>>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
<<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be the DJ")>>
+ <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)>>
<<elseif ($slaves[$i].assignment == "work in the brothel")>>
<<if $slaves[$i].livingRules == "normal">>
<br> Living expenses: ¤<<print ($rulesCost*1.5)>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 3cccc49e0a20c8c22ba71b00720dd6f7b6059197..0fa354e55088fea8121ac0ee02e507a5b46e0129 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -500,11 +500,144 @@
<</switch>>
<</if>>
<<case "be the DJ">>
+ <<if $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+ <<if ($slaves[$i].releaseRules != "permissive") && ($slaves[$i].releaseRules != "masturbation")>>
+ gets off at work, so being forbidden from masturbation doesn't really bother her.
+ <<set $slaves[$i].need -= 20>>
+ <<else>>
+ gets off at work, so she doesn't feel the need for release that often.
+ <<set $slaves[$i].need -= 20>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].releaseRules == "restrictive")>>
+ willingly begs you to
+ <<saRulesPlayerFetishPlay>>
+ whenever she crosses paths with you.
+ <<saRulesPlayerEnergy>>
+ <<saRulesPlayerDiscoversFetish>>
+ <<saRulesPlayerDrugEffects>>
+ <<elseif ($slaves[$i].releaseRules == "masturbation")>>
+ <<if ($slaves[$i].devotion < 80)>>
+ is a little disapointed that she's limited to her hands and toys, but @@.mediumaquamarine;trusts you know what's best for her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;trusts your judgement@@ that only she really knows how to pleasure herself, though she @@.mediumorchid;often wonders why you don't use her.@@
+ <<set $slaves[$i].trust += 1, $slaves[$i].devotion -= 2, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ When she does play with herself, she
+ <<saRulesMasturbationFetishPlay>>
+ <<saRulesMasturbationDiscoversFetish>>
+ <</if>>
+ <<saRulesMasturbationDrugEffects>>
+ <<else>> /* releaseRules not restrictive */
+ <<if ($universalRulesConsent == 0)>>
+ happily @@.mediumaquamarine;avails herself@@ of your permission to demand that other slaves have sex with her.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <<else>> /* universalRulesConsent is not zero */
+ @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction,
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesConsentFetish>>
+ <<saRulesConsentDiscoversFetish>>
+ <</if>> /* closes universalRulesConsent */
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ She is @@.hotpink;very happy@@ with her private room in the back of $clubName and @@.mediumaquamarine;trusts@@ you a bit more for placing your faith in her abilities.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].releaseRules != "restrictive")>>
+ <<if ($slaves[$i].energy > 95)>>
+ <<if $ClubiIDs.length > 2>>
+ Under the rules, she's allowed to demand that other slaves to get her off, and she @@.hotpink;adores@@ you for leaving plentiful, tantilizing, outlets for her nymphomania under her care.
+ <<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 $clubName.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ <<if ($slaves[$i].fetish == "sadist")>>
+ <<if $ClubiIDs.length > 2>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole club 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 $clubName for her to rape.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetish == "dom")>>
+ <<if $ClubiIDs.length > 2>>
+ Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for allowing her a club of sluts 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 her domain.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+
+ <<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 works the crowd, analyzing her sexual tastes. It seems she is
+ <<saRulesAttractionDiscovery>>
+ <</if>>
+ <</if>>
+
+ She does her best for you, so she frequently deserves a reward and never needs to be punished.
+ <<set _punishments = 0>>
+ <<set _rewards = 3>>
+
+ <<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 her private room listening to music.
+ <</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>>
+ These breaks are @@.green;good for her.@@
+ <<set $slaves[$i].health += _rewards>>
+ <<case "drugs">>
+ She's @@.hotpink;rewarded@@ with hits of mild recreational drugs, which @@.red;isn't healthy,@@ but helps bind her to you strongly.
+ <<set $slaves[$i].health -= _rewards>>
+ <<set $slaves[$i].devotion += _rewards*2>>
+ <<case "orgasm">>
+ She's @@.hotpink;rewarded@@ with
+ <<if $slaves[$i].clitPiercing >= 3>>
+ sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
+ <<elseif $activeSlave.releaseRules == "sapphic">>
+ immediate sex with any nearby slave,
+ <<else>>
+ a quick climax from a vibrator,
+ <</if>>
+ @@.green;boosting her libido.@@
+ <<if $slaves[$i].energy < 98>><<set $slaves[$i].energy += _rewards>><</if>>
+ <<set $slaves[$i].devotion += _rewards>>
+ <<default>>
+ She's @@.hotpink;rewarded@@
+ <<if (_punishments > 0) && ($slaves[$i].standardReward == "situational")>>
+ and @@.gold;punished@@
+ <</if>>
+ situationally, letting her develop normally.
+ <<set $slaves[$i].devotion += _rewards>>
+ <</switch>>
+ <</if>>
+ <<case "serve in the club">>
<<if $slaves[$i].devotion < -50>>
- is so unhappy that she has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
+ is so unhappy that she has little interest in getting off, not that her spectators care.
<<set $slaves[$i].need = 0>>
<<elseif $slaves[$i].energy <= 20>>
- is frigid and has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
+ is frigid and has little interest in getting off, not that her spectators care.
<<set $slaves[$i].need = 0>>
<<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
<<if ($slaves[$i].devotion <= 20)>>
@@ -525,30 +658,33 @@
<<else>>
<<if ($slaves[$i].releaseRules == "restrictive")>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
- refuses to come to you for sexual release, and is @@.gold;severely punished@@ for illicit masturbation.
+ refuses to come up to the penthouse for sexual release, 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 you to beg for sexual release.
+ occasionally comes to the penthouse to beg for sexual release.
<<else>>
- doesn't mind having to come to you to beg for sexual release.
+ doesn't mind having to come to the penthouse to beg for sexual release.
<</if>>
<<saRulesPlayerEnergy>>
<<else>> /* $slaves[$i].devotion >= 50 */
- willingly begs you to
+ willingly comes up to the penthouse and begs you to
<<saRulesPlayerFetishPlay>>
- every chance she gets.
+ every break she gets.
<<saRulesPlayerEnergy>>
<</if>> /* closes $slaves[$i].devotion >= 50 */
<<saRulesPlayerDiscoversFetish>>
<<saRulesPlayerDrugEffects>>
<<elseif ($slaves[$i].releaseRules == "masturbation")>>
- <<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>>
+ <<if $slaves[$i].sexualFlaw == "attention whore">>
+ @@.hotpink;enjoys being allowed to masturbate,@@ especially since its often on stage for $clubName's amusement.
+ <<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 on a table surrounded by citizens prevents her from getting complacent; you can never know when they'll want more.
+ <<set $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion <= 20)>>
- 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>>
+ enjoys being allowed to masturbate rather than trading sex with other slaves, though being forced to do it in on a table surrounded by citizens@@.gold;terrifies her;@@ you can never know when they'll want more.
+ <<set $slaves[$i].trust -= 1, $slaves[$i].need = 0>>
<<elseif ($slaves[$i].devotion < 50)>>
accepts having to relieve herself solely through masturbation.
<<set $slaves[$i].need = 0>>
@@ -572,15 +708,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 @@.gold;severely punished@@ for illicit masturbation.
+ refuses to use other slaves to get off, and is forced to spend time with the citizens and their wandering hands @@.gold;as punishment@@ 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, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ prefers to masturbate rather than demanding sex from other slaves or offering herself up, @@.mediumaquamarine;slightly reducing her fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
<<else>>
- is forced to demand sex from other slaves by the urges induced by the food, and @@.hotpink;hates herself@@ for it.
+ is forced by the urges induced by the food to either demand sex from other slaves or offering herself to patrons. She @@.hotpink;hates herself@@ for it.
<<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
<</if>>
<<elseif ($slaves[$i].devotion < 50)>>
@@ -597,7 +733,7 @@
<<else>> /* universalRulesConsent is not zero */
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
- prefers to masturbate rather than asking other slaves for sex, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ prefers to masturbate rather than asking other slaves for sex or offering herself to patrons, @@.mediumaquamarine;slightly reducing her fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
<<else>>
refuses to ask other slaves for sex, and is @@.gold;severely punished@@ for illicit masturbation.
@@ -605,10 +741,10 @@
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].releaseRules == "permissive")>>
- prefers to masturbate rather than trading sex with other slaves, @@.mediumaquamarine;slightly reducing her fear@@ of you.
+ prefers to masturbate rather than trading sex with other slaves or offering herself up, @@.mediumaquamarine;slightly reducing her fear@@ of you.
<<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
<<else>>
- is forced to swap sex with other slaves by the urges induced by the food, and @@.hotpink;hates herself@@ for it.
+ is forced by the urges induced by the food to either swap sex with other slaves or attempt to seduce amorous citizens. She @@.hotpink;hates herself@@ for it.
<<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
<</if>>
<<elseif ($slaves[$i].devotion < 50)>>
@@ -640,100 +776,23 @@
<</if>>
<</if>>
- <<if $roomsPopulation > $rooms>>
- <<if $slaves[$i].livingRules == "luxurious">>
- There are @@.yellow;too many slaves for the penthouse's individual rooms,@@ so she moves out into the dormitory.
- <<set $slaves[$i].livingRules = "normal">>
- <<set $dormitoryPopulation += 1>>
- <<if $slaves[$i].relationship >= 4>><<set $roomsPopulation -= 0.5>><<else>><<set $roomsPopulation -= 1>><</if>>
- <</if>>
- <</if>>
-
<<if ($slaves[$i].devotion <= 20)>>
- <<if ($slaves[$i].livingRules == "spare")>>
- The spare living 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>>
- <<set $slaves[$i].devotion += 1>>
- <<elseif ($slaves[$i].livingRules == "normal")>>
- The reasonable living conditions allow her to @@.mediumaquamarine;feel self-reliant.@@
- <<set $slaves[$i].trust += 1>>
- <<else>>
- The luxurious living conditions encourage her to @@.mediumaquamarine;feel respectable.@@
- <<set $slaves[$i].trust += 2>>
- <</if>>
+ She shares a room with <<if $ClubiIDs.length > 4>>some of <</if>>the other sluts, preventing her from becoming too complacent. It doesn't help that during business hours she has to take citizens in her own bed.
<<else>>
- <<if ($slaves[$i].ID == $HeadGirl.ID) && ($HGSuite == 1)>>
- She is @@.hotpink;very happy@@ with her suite and @@.mediumaquamarine;trusts@@ you a bit more for providing it.
- <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
- <<elseif ($slaves[$i].livingRules == "luxurious")>>
- She is @@.hotpink;very happy@@ with her little room and @@.mediumaquamarine;trusts@@ you a bit more for providing it.
- <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
- <<elseif ($slaves[$i].livingRules == "normal")>>
- She likes her personal space in the dormitory.
- <<elseif ($slaves[$i].trust > 40)>>
- The spare living conditions @@.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 @@.gold;keep her aware of her place.@@
- <<set $slaves[$i].trust -= 1>>
- <</if>>
- <</if>>
-
- <<if $slaves[$i].livingRules != "luxurious">>
- <<if $dormitoryPopulation > $dormitory>>
- <<set _dormPop = $dormitoryPopulation - $dormitory>>
- The slave dormitory is
- <<if _dormPop <= 5>>
- @@.yellow;somewhat overcrowded.@@ The mild inconvenience
- <<if $slaves[$i].trust > 20>>
- @@.gold;reduces her trust@@ in you a little.
- <<set $slaves[$i].trust -= 2>>
- <<else>>
- @@.mediumorchid;lowers you@@ a little in her opinion.
- <<set $slaves[$i].devotion -= 2>>
- <</if>>
- <<elseif _dormPop <= 10>>
- @@.yellow;badly overcrowded.@@ The constant difficulties
- <<if $slaves[$i].trust > 20>>
- @@.gold;reduces her trust@@ in you
- <<set $slaves[$i].trust -= 3>>
- <<else>>
- @@.mediumorchid;lowers you@@ in her opinion
- <<set $slaves[$i].devotion -= 3>>
- <</if>>
- and is @@.red;not good for her,@@ since it's difficult to rest there.
- <<set $slaves[$i].health -= 2>>
- <<else>>
- @@.yellow;extremely overcrowded.@@ The unpleasant situation
- <<if $slaves[$i].trust > 20>>
- seriously @@.gold;reduces her trust@@ in you
- <<set $slaves[$i].trust -= 5>>
- <<else>>
- seriously @@.mediumorchid;lowers you@@ in her opinion
- <<set $slaves[$i].devotion -= 5>>
- <</if>>
- and is @@.red;bad for her health.@@
- <<set $slaves[$i].health -= 4>>
- <</if>>
- <</if>>
+ She likes her personal space in $clubName, even if it smells of sex and citizens.
<</if>>
<<if ($universalRulesConsent == 0)>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -10)>>
- <<if $slaves.length > 2 || $helots > 0>>
+ <<if $ClubiIDs.length > 2 || $DJ != 0>>
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 bring home more girls.
+ 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 $clubName.
<</if>>
<<set $slaves[$i].trust -= 2>>
<<else>>
- <<if $slaves.length > 2 || $helots > 0>>
+ <<if $ClubiIDs.length > 2 || $DJ != 0>>
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.
@@ -741,25 +800,25 @@
<</if>>
<<elseif ($slaves[$i].releaseRules != "restrictive")>>
<<if ($slaves[$i].energy > 95)>>
- <<if $slaves.length > 2 || $helots > 0>>
+ <<if $ClubiIDs.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 bring home more girls 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 you assign more girls to $clubName to get her off.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
- <<if $slaves.length > 2 || $helots > 0>>
- Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole penthouse of girls for her to rape.
+ <<if $ClubiIDs.length > 2>>
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;adores@@ you for providing a whole club 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 bring home more girls for her to rape.
+ Under the rules, she's allowed to sexually abuse other slaves, and she @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName for her to rape.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
- <<if $slaves.length > 2 || $helots > 0>>
- Under the rules, she's allowed to force other slaves to have sex with her, and she @@.hotpink;adores@@ you for providing a whole penthouse of girls for her to dominate.
+ <<if $ClubiIDs.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 club 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 bring home more girls 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 you assign more girls to $clubName for her to dominate.
<</if>>
<<set $slaves[$i].devotion += 1>>
<</if>>
@@ -767,10 +826,10 @@
<</if>>
<<else>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
- <<if $slaves.length > 2 || $helots > 0>>
+ <<if $ClubiIDs.length > 2 || $DJ != 0>>
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 your penthouse 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 $clubName is rather empty.
<</if>>
<<set $slaves[$i].trust += 1>>
<</if>>
@@ -779,14 +838,40 @@
<<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 works the crowd, analyzing her sexual tastes. It seems she is
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring her as she services citizens, analyzing her sexuality. It seems she is
<<saRulesAttractionDiscovery>>
<</if>>
<</if>>
- She does her best for you, so she frequently deserves a reward and never needs to be punished.
- <<set _punishments = 0>>
- <<set _rewards = 3>>
+ <<if $slaves[$i].devotion > 50>>
+ She does her best for you, so she frequently deserves a reward and never needs to be punished.
+ <<set _punishments = 0>>
+ <<set _rewards = 3>>
+ <<elseif $slaves[$i].devotion > 20>>
+ She's obedient out of acceptance of her place, so she often deserves a reward and rarely needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 2>>
+ <<elseif $slaves[$i].devotion >= -20>>
+ <<if $slaves[$i].trust < -20>>
+ She's obedient out of fear, so she only rarely deserves a reward and sometimes needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 1>>
+ <<else>>
+ She's too trusting for obedience and often needs to be punished.
+ <<set _punishments = 2>>
+ <<set _rewards = 0>>
+ <</if>>
+ <<else>>
+ <<if $slaves[$i].trust < -50>>
+ She's only obedient out of terror, so she sometimes needs to be punished.
+ <<set _punishments = 1>>
+ <<set _rewards = 0>>
+ <<else>>
+ She hates you too much to obey, so she needs constant punishment.
+ <<set _punishments = 3>>
+ <<set _rewards = 0>>
+ <</if>>
+ <</if>>
<<if _rewards > 0>>
<<switch $slaves[$i].standardReward>>
@@ -795,7 +880,7 @@
<<if $spa != 0>>
usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
<<else>>
- usually spends relaxing in her private room listening to music.
+ usually spends relaxing in the penthouse slave quarters.
<</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>>.
@@ -803,13 +888,13 @@
These breaks are @@.green;good for her.@@
<<set $slaves[$i].health += _rewards>>
<<case "drugs">>
- She's @@.hotpink;rewarded@@ with hits of mild recreational drugs, which @@.red;isn't healthy,@@ but helps bind her to you strongly.
+ She's @@.hotpink;rewarded@@ with hits of mild recreational drugs during business hours, which @@.red;isn't healthy,@@ but helps bind her to you strongly. The patrons won't complain either.
<<set $slaves[$i].health -= _rewards>>
<<set $slaves[$i].devotion += _rewards*2>>
<<case "orgasm">>
She's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing >= 3>>
- sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
+ sustained orgasm from her <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing, often on stage during a dance,
<<elseif $activeSlave.releaseRules == "sapphic">>
immediate sex with any nearby slave,
<<else>>
@@ -827,6 +912,32 @@
<<set $slaves[$i].devotion += _rewards>>
<</switch>>
<</if>>
+ <<if _punishments > 0>>
+ <<switch $slaves[$i].standardPunishment>>
+ <<case "confinement">>
+ When she disobeys, she
+ <<if $cellblock != 0>>
+ @@.gold;spends her off hours 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.
+ <</if>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <<case "whipping">>
+ When she disobeys, she's @@.gold;whipped,@@ not hard enough to mark her, but hard enough to @@.red;hurt,@@ breaking her quickly.
+ <<set $slaves[$i].health -= _punishments>>
+ <<set $slaves[$i].trust -= 2*_punishments>>
+ <<case "chastity">>
+ When she disobeys, she finds her next dance to be both extremly sexual and @@.gold;completely unsatisfying,@@ @@.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>>
+ <<default>>
+ <<if (_rewards == 0) || ($slaves[$i].standardReward != "situational")>>
+ When she disobeys, she's @@.gold;punished@@ situationally, letting her develop normally.
+ <</if>>
+ <<set $slaves[$i].trust -= _punishments>>
+ <</switch>>
+ <</if>>
<<default>>
<<if $slaves[$i].devotion < -50>>
is so unhappy that she has little interest in getting off<<if ($slaves[$i].releaseRules != "permissive")>>, making the rule restricting her sexual outlets superfluous<</if>>.
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 93cb65f875049933afbabea295d3ccd9e9aa258c..c962c265a86f9d36eb37e52091dac5245450e90f 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -31,6 +31,7 @@
<<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push(_wID)>>
<<case "serve in the club" "club">>
<<set $args[0].assignment = "serve in the club", $args[0].assignmentVisible = 0, $clubSlaves++, $ClubiIDs.push(_wID)>>
+ <<set $args[0].livingRules = "normal">>
<<case "work in the dairy" "dairy">>
<<set $args[0].assignment = "work in the dairy", $args[0].assignmentVisible = 0, $dairySlaves++, $DairyiIDs.push(_wID)>>
<<case "live with your head girl" "live with your Head Girl" "head girl suite" "hgsuite">>