diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 97f71c4c55ca0d3ad17024b1e45ce81897b0ae43..879f41ecd1064c4d5413c5a20fd2f78b27493f23 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,11 @@
12/21/17
+ 220
+ -saRules now applies to the servants quarters
+ -fixes
+ Fixed an issue with reMalefactor displaying the wrong text block.
+
219
-fixes
More cache clearing, fixes to reBoomerang preg setters and a typo in raWidgets causing trouble.
diff --git a/devNotes/twine JS b/devNotes/twine JS
index b486c4e3750b40824ac38358d229872c85c12dac..c30fffa475f0254cda20aaa4f3875f6812ea9fed 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2258,6 +2258,18 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.STEWARD) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SERVER) {
+ if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ if(State.variables.servantsQuartersDecoration === 'Degradationist') {
+ cost += rulesCost * .90;
+ } else {
+ cost += rulesCost;
+ }
+ }
} else if(s.assignment === Job.TEACHER) {
cost += rulesCost * 2;
} else if(s.assignment === Job.SCHOOL) {
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index ff0f6e145c15d6db6c1701e3d2302c2d4feb39ba..1e6ac1beec3d2dac13877b7285b878af522718e4 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -364,6 +364,18 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.STEWARD) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.SERVER) {
+ if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.5;
+ } else {
+ if(State.variables.servantsQuartersDecoration === 'Degradationist') {
+ cost += rulesCost * .90;
+ } else {
+ cost += rulesCost;
+ }
+ }
} else if(s.assignment === Job.TEACHER) {
cost += rulesCost * 2;
} else if(s.assignment === Job.SCHOOL) {
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 9da62276ea7f180d201ef0cb231a29efdc89dc84..42bc5eb38eb9b65e32a9bbd54008700f9bc2c36b 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -140,6 +140,18 @@
<<set $costs += ($rulesCost*2)>>
<<elseif ($slaves[$i].assignment == "learn in the schoolroom")>>
<<set $costs += ($rulesCost*1.5)>>
+<<elseif ($slaves[$i].assignment == "be the Stewardess")>>
+ <<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "be a servant")>>
+ <<if $slaves[$i].livingRules == "normal">>
+ <<set $costs += ($rulesCost*1.5)>>
+ <<else>>
+ <<if $servantsQuartersDecoration == "Degradationist">>
+ <<set $costs += ($rulesCost*.9)>>
+ <<else>>
+ <<set $costs += $rulesCost>>
+ <</if>>
+ <</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 b8bd08e7bb47b08e3585ec481f4a6def1e18f1e5..cde1646bc24529c5e1a247f4c5d1134fc8074c43 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -244,6 +244,9 @@
<<elseif ($slaves[$i].assignment == "be the Schoolteacher")>>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
<<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be the Stewardess")>>
+ <br> Living expenses: ¤<<print ($rulesCost*2)>>
+ <<set $individualCosts += ($rulesCost*2)>>
<<elseif ($slaves[$i].assignment == "serve in the club")>>
<br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
<<set $individualCosts += ($rulesCost*1.5)>>
@@ -288,6 +291,19 @@
<<elseif ($slaves[$i].assignment == "learn in the schoolroom")>>
<br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
<<set $individualCosts += ($rulesCost*1.5)>>
+ <<elseif ($slaves[$i].assignment == "be a servant")>>
+ <<if $slaves[$i].livingRules == "normal">>
+ <br> Living expenses: <<print cashFormat(($rulesCost*1.5))>>
+ <<set $individualCosts += ($rulesCost*1.5)>>
+ <<else>>
+ <<if $servantsQuartersDecoration == "Degradationist">>
+ <br> Living expenses: <<print cashFormat($rulesCost*.90)>>
+ <<set $individualCosts += ($rulesCost*.90)>>
+ <<else>>
+ <br> Living expenses: <<print cashFormat($rulesCost)>>
+ <<set $individualCosts += $rulesCost>>
+ <</if>>
+ <</if>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 22ebce10f267d1de673bb6cc28d84113e07f858e..b8ae2f19515fa3ac92e88146e2226b35e2ef4743 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -356,7 +356,7 @@
You complete the legalities and biometric scanning quickly. The condemned is too far gone to resist as she is installed in $dairyName. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the escapee's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction<<else>>breasts as they are roughly milked<</if>>.
<<elseif $malefactor == "orphanloli">>
You complete the legalities and biometric scanning quickly. The condemned is too weak to resist as she is installed in $dairyName but she weeps the entire time. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the escapee's <<if $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<elseif ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>agony as her once tight pussy adapts to industrial reproduction<<else>>budding breasts as they are roughly milked<</if>>.
- <<elseif $malefactor == "businesswoman">>
+ <<elseif $malefactor == "anchorBaby">>
You complete the legalities and biometric scanning quickly and cautiously before having her children taken away. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction, along with a prospectus detailing the scheduled sale of her next batch of slave product in eighteen years and nine months<<elseif $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
<<elseif $malefactor == "businesswoman">>
You complete the legalities and biometric scanning quickly and cautiously. The condemned resists installation in $dairyName with energy born of desperation. The public @@.green;accepts@@ this as an appropriate punishment, especially when you release footage of the criminal's <<if ($dairyPregSetting > 1) && ($activeSlave.vagina > 0)>>discomfort as her pussy adapts to industrial reproduction, along with a prospectus detailing the scheduled sale of her first slave product in eighteen years and nine months<<elseif $dairyStimulatorsSetting > 1>>agony as her anus adapts to accommodate rectal dildo hydration<<else>>breasts as they are roughly milked<</if>>.
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index ff86b8ca45e9bda05bc3ef496b43b046ef1002c9..356857c16a14e5675088295b594bb7f6ac8a1513 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -2801,31 +2801,65 @@
<</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 $servantsQuartersDecoration>>
+ <<case "Degradationist">>
+ The abysmal living conditions @@.hotpink;force her to get used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery and @@.gold;keep her aware of her meaningless she is.@@
+ <<set $slaves[$i].trust -= 3>>
+ <<else>>
+ slavery and @@.gold;reminds her that her is meaningless.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<case "Supremacist" "Subjugationist">>
+ 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>>
+ Every time she has to watch another slave get beaten @@.gold;solidifies her fears.@@
+ <<set $slaves[$i].trust -= 1>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist">>
+ The spare living conditions @@.hotpink;get her used@@ to the routine of slavery.
+ <<case "Arabian Revivalist" "Egyptian Revivalist">>
+ The spare living conditions @@.hotpink;get her used@@ to the routine of
+ <<if ($slaves[$i].trust > 20)>>
+ slavery, but the small luxuries @@.mediumaquamarine;afford her some dignity.@@
+ <<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.
+ The reasonable living conditions allow her to @@.mediumaquamarine;feel some dignity@@ after @@.hotpink;cleaning up sexual fluids and servicing slaves all day.@@
+ <<set $slaves[$i].trust += 1>>
<</switch>>
+ <<set $slaves[$i].devotion += 1>>
<<else>>
- <<switch $brothelDecoration>>
- <<case "Chattel Religionist" "Degradationist" "standard">>
+ <<switch $servantsQuartersDecoration>>
+ <<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 abysmal living conditions of $servantsQuartersName @@.gold;remind her that her life is absolutely meaningless to you.@@
+ <<set $slaves[$i].trust -= 3>>
+ <<elseif ($slaves[$i].trust > 10)>>
+ The abysmal living conditions of $servantsQuartersName @@.gold;remind her that she is worthless as a person to you.@@
+ <<set $slaves[$i].trust -= 2>>
+ <</if>>
+ <<case "Supremacist" "Subjugationist">>
+ <<if ($slaves[$i].trust > 40)>>
+ The spare living conditions of $servantsQuartersName @@.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 spare living conditions of $servantsQuartersName @@.gold;keep her aware of her place.@@
<<set $slaves[$i].trust -= 1>>
<</if>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist">>
+ The living conditions of $servantsQuartersName might be spare, but they are no means uncomfortable.
+ <<case "Arabian Revivalist" "Egyptian Revivalist">>
+ The living conditions of $servantsQuartersName might be spare, but she loves the little luxuries that come with them.
<<default>>
- She likes her little room in $brothelName, even if it smells of sex after fucking in it all day.
+ She likes her personal space in $servantsQuartersName's dormitory.
<</switch>>
<</if>>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 6b02f2339edf6cad9b88e9eec2ace25744f3e594..843e3148af57ad7a862fb433859d4ff8d73e34ec 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.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>>
<<set $Stewardess = $slaves[_FLs]>>
<<SlaveFullName $Stewardess>> is serving as your Stewardess.<<if $Stewardess.relationship == -3 && $Stewardess.devotion > 50>> She does her best to be your perfect lovely housewife.<</if>>
<<if ($stewardessImpregnates == 1) && (_DL > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>>
@@ -127,15 +130,18 @@
<<elseif $slaves[$i].ID == $Stewardess.father>>
She pays special attention to her father, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[$i].trust++>>
- <<elseif areSisters($slaves[$i], $Stewardess) == 1>>
- She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<elseif areSisters($slaves[$i], $Stewardess) == 2>>
- She pays special attention to her sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
- <<elseif areSisters($slaves[$i], $Stewardess) == 3>>
- She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[$i].trust++>>
+ <<else>>
+ <switch areSisters($slaves[$i], $Stewardess)>>
+ <<case 1>>
+ She pays special attention to her twin sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
+ <<case 2>>
+ She pays special attention to her sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
+ <<case 3>>
+ She pays special attention to her half-sister, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[$i].trust++>>
+ <</switch>>
<</if>>
<<elseif $Stewardess.relationTarget == $slaves[$i].ID && $familyTesting == 0>>
She pays special attention to her $slaves[$i].relation, $slaves[$i].slaveName, making sure she doesn't slack off just because they are related.
@@ -205,6 +211,7 @@
''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as your Stewardess.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -214,6 +221,7 @@
<<else>>
<<silently>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -250,6 +258,20 @@
<<elseif ($slaves[$i].health < 90)>>
<<set $slaves[$i].health += 3>>
<</if>>
+ <<switch $servantsQuartersDecoration>>
+ <<case "Roman Revivalist" "Aztec Revivalist" "Chinese Revivalist" "Chattel Religionist" "Edo Revivalist" "Supremacist" "Subjugationist" "Degradationist" "Arabian Revivalist" "Egyptian Revivalist">>
+ <<set $slaves[$i].livingRules = "spare">>
+ <<default>>
+ <<set $slaves[$i].livingRules = "normal">>
+ <</switch>>
+ <<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 $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -272,6 +294,7 @@
<</if>>
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -287,6 +310,7 @@
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>