diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index dae99d7f952b8cef40f484798b830e01914754a4..aea280307a4b7a1cd20ef56557b1523332d8c36a 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4865,6 +4865,17 @@ Pregmod 0.10.3.0
-fixes
-saRules tinkering
+ 12/10/17
+
196
-fixes
- -saRules tinkering
\ No newline at end of file
+ -saRules tinkering
+
+ 197
+ -corncobman's tweaks
+
+ 12/11/17
+
+ 198
+ -fixes
+ -saRules now applies to the brothel
\ No newline at end of file
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 9e3cd5a4496767b7c8dd686ebb9cc033ad0ffb86..3c72a4834ffd3e1530bbe3c3d9992deb62ad61c5 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2140,6 +2140,12 @@ window.getSlaveCost = function(s) {
cost += rulesCost * .75;
} else if(s.assignment === Job.MADAM) {
cost += rulesCost * 2;
+ } else if(s.assignment === Job.BROTHEL) {
+ 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 754163b8f88027953d6903b97c34520a17eb8e69..4522f24025fe3867ec44a76bf439b51798e47454 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -326,6 +326,12 @@ window.getSlaveCost = function(s) {
cost += rulesCost * .75;
} else if(s.assignment === Job.MADAM) {
cost += rulesCost * 2;
+ } else if(s.assignment === Job.BROTHEL) {
+ 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/npc/exportSlave.tw b/src/npc/exportSlave.tw
index 501fdd440158c73c03c6916feb6a7bfcc52a923f..207f0e6eb2c9baf7f180afc4e438e14d123c7435 100644
--- a/src/npc/exportSlave.tw
+++ b/src/npc/exportSlave.tw
@@ -8,7 +8,7 @@
<<if (ndef $activeSlave.currentRules) || ($activeSlave.currentRules.length < 1)>><<set _currentRules = "[]">><<else>><<set _currentRules = "$activeSlave.currentRules">><</if>>
-slaveName: "$activeSlave.slaveName", slaveSurname: "$activeSlave.slaveName", birthName: "$activeSlave.birthName", birthSurname: "$activeSlave.birthSurname", genes: "$activeSlave.genes", weekAcquired: 1, origin: "$activeSlave.origin", career: "$activeSlave.career", ID: $activeSlave.ID, pornFame: $activeSlave.pornFame, pornFameSpending: $activeSlave.pornFameSpending, prestige: $activeSlave.prestige, prestigeDesc: "$activeSlave.prestigeDesc", recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: $activeSlave.birthWeek, age: $activeSlave.age, ageImplant: $activeSlave.ageImplant, health: $activeSlave.health, minorInjury: 0, trust: $activeSlave.trust, oldTrust: $activeSlave.trust, devotion: $activeSlave.devotion, oldDevotion: $activeSlave.devotion, weight: $activeSlave.weight, muscles: $activeSlave.muscles, height: $activeSlave.height, heightImplant: $activeSlave.heightImplant, nationality: "$activeSlave.nationality", race: "$activeSlave.race", markings: "none", eyes: 1, eyeColor: "$activeSlave.eyeColor", eyewear: "none", hColor: "$activeSlave.hColor", pubicHColor: "$activeSlave.pubicHColor", skin: "$activeSlave.skin", hLength: $activeSlave.hLength, hStyle: "$activeSlave.hStyle", pubicHStyle: "$activeSlave.pubicHStyle", waist: $activeSlave.waist, corsetPiercing: 0, amp: $activeSlave.amp, heels: $activeSlave.heels, voice: $activeSlave.voice, voiceImplant: $activeSlave.voiceImplant, accent: $activeSlave.accent, shoulders: $activeSlave.shoulders, shouldersImplant: $activeSlave.shouldersImplant, boobs: $activeSlave.boobs, boobsImplant: $activeSlave.boobsImplant, boobsImplantType: $activeSlave.boobsImplantType, boobShape: "normal", nipples: "$activeSlave.nipples", nipplesPiercing: $activeSlave.nipplesPiercing, areolae: $activeSlave.areolae, areolaePiercing: $activeSlave.areolaePiercing, boobsTat: "$activeSlave.boobsTat", lactation: $activeSlave.lactation, lactationAdaptation: 0, milk: 0, cum: 0, hips: $activeSlave.hips, hipsImplant: $activeSlave.hipsImplant, butt: $activeSlave.butt, buttImplant: $activeSlave.buttImplant, buttImplantType: $activeSlave.buttImplantType, buttTat: "$activeSlave.buttTat", face: $activeSlave.face, faceImplant: $activeSlave.faceImplant, faceShape: "normal", lips: $activeSlave.lips, lipsImplant: $activeSlave.lipsImplant, lipsPiercing: $activeSlave.lipsPiercing, lipsTat: "$activeSlave.lipsTat", teeth: "$activeSlave.teeth", tonguePiercing: $activeSlave.tonguePiercing, vagina: $activeSlave.vagina, vaginaLube: $activeSlave.vaginaLube, vaginaPiercing: $activeSlave.vaginaPiercing, vaginaTat: "$activeSlave.vaginaTat", preg: $activeSlave.preg, pregSource: 0, pregType: 0, labor: 0, births: $activeSlave.births, cSec: 0, bellyAccessory: "none", labia: $activeSlave.labia, clit: $activeSlave.clit, clitPiercing: $activeSlave.clitPiercing, clitSetting: "$activeSlave.clitSetting", foreskin: 0, anus: $activeSlave.anus, dick: $activeSlave.dick, analArea: 1, dickPiercing: $activeSlave.dickPiercing, dickTat: "$activeSlave.dickTat", balls: $activeSlave.balls, scrotum: 0, ovaries: $activeSlave.ovaries, anusPiercing: $activeSlave.anusPiercing, anusTat: "$activeSlave.anusTat", makeup: $activeSlave.makeup, nails: $activeSlave.nails, brand: "$activeSlave.brand", brandLocation: "$activeSlave.brandLocation", earPiercing: $activeSlave.earPiercing, nosePiercing: $activeSlave.nosePiercing, eyebrowPiercing: $activeSlave.eyebrowPiercing, navelPiercing: $activeSlave.navelPiercing, shouldersTat: "$activeSlave.shouldersTat", armsTat: "$activeSlave.armsTat", legsTat: "$activeSlave.legsTat", backTat: "$activeSlave.backTat", stampTat: "$activeSlave.stampTat", vaginalSkill: $activeSlave.vaginalSkill, oralSkill: $activeSlave.oralSkill, analSkill: $activeSlave.analSkill, whoreSkill: $activeSlave.whoreSkill, entertainSkill: $activeSlave.entertainSkill, combatSkill: $activeSlave.combatSkill, livingRules: "$activeSlave.livingRules", speechRules: "$activeSlave.speechRules", releaseRules: "$activeSlave.releaseRules", relationshipRules: "$activeSlave.relationshipRules", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "$activeSlave.diet", dietCum: $activeSlave.dietCum, dietMilk: $activeSlave.dietMilk, tired: 0, hormones: 0, drugs: "$activeSlave.drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: $activeSlave.addict, fuckdoll: $activeSlave.fuckdoll, choosesOwnClothes: 0, clothes: "$activeSlave.clothes", collar: "$activeSlave.collar", shoes: "$activeSlave.shoes", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: $activeSlave.intelligence, intelligenceImplant: $activeSlave.intelligenceImplant, energy: $activeSlave.energy, need: 0, attrXX: $activeSlave.attrXX, attrXY: $activeSlave.attrXY, attrKnown: $activeSlave.attrKnown, fetish: "$activeSlave.fetish", fetishStrength: $activeSlave.fetishStrength, fetishKnown: $activeSlave.fetishKnown, behavioralFlaw: "$activeSlave.behavioralFlaw", behavioralQuirk: "none", sexualFlaw: "$activeSlave.sexualFlaw", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "$activeSlave.customTat", customLabel: "", customDesc: "$activeSlave.customDesc", customImage: 0, currentRules: _currentRules, actualAge: $activeSlave.actualAge, visualAge: $activeSlave.visualAge, physicalAge: $activeSlave.physicalAge, bellyTat: "$activeSlave.bellyTat", induce: 0, mpreg: $activeSlave.mpreg, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: $activeSlave.pregKnown, belly: $activeSlave.belly, bellyPreg: $activeSlave.bellyPreg, bellyFluid: $activeSlave.bellyFluid, bellyImplant: $activeSlave.bellyImplant, bellySag: $activeSlave.bellySag, bellySagPreg: $activeSlave.bellySagPreg, bellyPain: 0, cervixImplant: $activeSlave.cervixImplant, birthsTotal: $activeSlave.birthsTotal, pubertyXX: $activeSlave.pubertyXX, pubertyAgeXX: $activeSlave.pubertyAgeXX, pubertyXY: $activeSlave.pubertyXY, pubertyAgeXY: $activeSlave.pubertyAgeXY, scars: $activeSlave.scars, breedingMark: 0, underArmHStyle: "waxed", underArmHColor: "$activeSlave.underArmHColor", bodySwap: $activeSlave.bodySwap, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "$activeSlave.ballType", eggType: "$activeSlave.eggType", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: $activeSlave.ageAdjust, bald: $activeSlave.bald, origBodyOwner: "", death: "", hormoneBalance: $activeSlave.hormoneBalance, vasectomy: $activeSlave.vasectomy, ovaryAge: $activeSlave.ovaryAge, haircuts: $activeSlave.haircuts
+slaveName: "$activeSlave.slaveName", slaveSurname: "$activeSlave.slaveName", birthName: "$activeSlave.birthName", birthSurname: "$activeSlave.birthSurname", genes: "$activeSlave.genes", weekAcquired: 1, origin: "$activeSlave.origin", career: "$activeSlave.career", ID: $activeSlave.ID, pornFame: $activeSlave.pornFame, pornFameSpending: $activeSlave.pornFameSpending, prestige: $activeSlave.prestige, prestigeDesc: "$activeSlave.prestigeDesc", recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: $activeSlave.birthWeek, age: $activeSlave.age, ageImplant: $activeSlave.ageImplant, health: $activeSlave.health, minorInjury: 0, trust: $activeSlave.trust, oldTrust: $activeSlave.trust, devotion: $activeSlave.devotion, oldDevotion: $activeSlave.devotion, weight: $activeSlave.weight, muscles: $activeSlave.muscles, height: $activeSlave.height, heightImplant: $activeSlave.heightImplant, nationality: "$activeSlave.nationality", race: "$activeSlave.race", markings: "none", eyes: 1, eyeColor: "$activeSlave.eyeColor", eyewear: "none", hColor: "$activeSlave.hColor", pubicHColor: "$activeSlave.pubicHColor", skin: "$activeSlave.skin", hLength: $activeSlave.hLength, hStyle: "$activeSlave.hStyle", pubicHStyle: "$activeSlave.pubicHStyle", waist: $activeSlave.waist, corsetPiercing: 0, amp: $activeSlave.amp, heels: $activeSlave.heels, voice: $activeSlave.voice, voiceImplant: $activeSlave.voiceImplant, accent: $activeSlave.accent, shoulders: $activeSlave.shoulders, shouldersImplant: $activeSlave.shouldersImplant, boobs: $activeSlave.boobs, boobsImplant: $activeSlave.boobsImplant, boobsImplantType: $activeSlave.boobsImplantType, boobShape: "normal", nipples: "$activeSlave.nipples", nipplesPiercing: $activeSlave.nipplesPiercing, areolae: $activeSlave.areolae, areolaePiercing: $activeSlave.areolaePiercing, boobsTat: "$activeSlave.boobsTat", lactation: $activeSlave.lactation, lactationAdaptation: 0, milk: 0, cum: 0, hips: $activeSlave.hips, hipsImplant: $activeSlave.hipsImplant, butt: $activeSlave.butt, buttImplant: $activeSlave.buttImplant, buttImplantType: $activeSlave.buttImplantType, buttTat: "$activeSlave.buttTat", face: $activeSlave.face, faceImplant: $activeSlave.faceImplant, faceShape: "normal", lips: $activeSlave.lips, lipsImplant: $activeSlave.lipsImplant, lipsPiercing: $activeSlave.lipsPiercing, lipsTat: "$activeSlave.lipsTat", teeth: "$activeSlave.teeth", tonguePiercing: $activeSlave.tonguePiercing, vagina: $activeSlave.vagina, vaginaLube: $activeSlave.vaginaLube, vaginaPiercing: $activeSlave.vaginaPiercing, vaginaTat: "$activeSlave.vaginaTat", preg: $activeSlave.preg, pregSource: 0, pregType: 0, labor: 0, births: $activeSlave.births, cSec: 0, bellyAccessory: "none", labia: $activeSlave.labia, clit: $activeSlave.clit, clitPiercing: $activeSlave.clitPiercing, clitSetting: "$activeSlave.clitSetting", foreskin: 0, anus: $activeSlave.anus, dick: $activeSlave.dick, analArea: 1, dickPiercing: $activeSlave.dickPiercing, dickTat: "$activeSlave.dickTat", balls: $activeSlave.balls, scrotum: 0, ovaries: $activeSlave.ovaries, anusPiercing: $activeSlave.anusPiercing, anusTat: "$activeSlave.anusTat", makeup: $activeSlave.makeup, nails: $activeSlave.nails, brand: "$activeSlave.brand", brandLocation: "$activeSlave.brandLocation", earPiercing: $activeSlave.earPiercing, nosePiercing: $activeSlave.nosePiercing, eyebrowPiercing: $activeSlave.eyebrowPiercing, navelPiercing: $activeSlave.navelPiercing, shouldersTat: "$activeSlave.shouldersTat", armsTat: "$activeSlave.armsTat", legsTat: "$activeSlave.legsTat", backTat: "$activeSlave.backTat", stampTat: "$activeSlave.stampTat", vaginalSkill: $activeSlave.vaginalSkill, oralSkill: $activeSlave.oralSkill, analSkill: $activeSlave.analSkill, whoreSkill: $activeSlave.whoreSkill, entertainSkill: $activeSlave.entertainSkill, combatSkill: $activeSlave.combatSkill, livingRules: "$activeSlave.livingRules", speechRules: "$activeSlave.speechRules", releaseRules: "$activeSlave.releaseRules", relationshipRules: "$activeSlave.relationshipRules", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "$activeSlave.diet", dietCum: $activeSlave.dietCum, dietMilk: $activeSlave.dietMilk, tired: 0, hormones: 0, drugs: "$activeSlave.drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: $activeSlave.addict, fuckdoll: $activeSlave.fuckdoll, choosesOwnClothes: 0, clothes: "$activeSlave.clothes", collar: "$activeSlave.collar", shoes: "$activeSlave.shoes", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: $activeSlave.intelligence, intelligenceImplant: $activeSlave.intelligenceImplant, energy: $activeSlave.energy, need: 0, attrXX: $activeSlave.attrXX, attrXY: $activeSlave.attrXY, attrKnown: $activeSlave.attrKnown, fetish: "$activeSlave.fetish", fetishStrength: $activeSlave.fetishStrength, fetishKnown: $activeSlave.fetishKnown, behavioralFlaw: "$activeSlave.behavioralFlaw", behavioralQuirk: "none", sexualFlaw: "$activeSlave.sexualFlaw", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, customTat: "$activeSlave.customTat", customLabel: "", customDesc: "$activeSlave.customDesc", customImage: 0, currentRules: _currentRules, actualAge: $activeSlave.actualAge, visualAge: $activeSlave.visualAge, physicalAge: $activeSlave.physicalAge, bellyTat: "$activeSlave.bellyTat", induce: 0, mpreg: $activeSlave.mpreg, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: $activeSlave.pregKnown, belly: $activeSlave.belly, bellyPreg: $activeSlave.bellyPreg, bellyFluid: $activeSlave.bellyFluid, bellyImplant: $activeSlave.bellyImplant, bellySag: $activeSlave.bellySag, bellySagPreg: $activeSlave.bellySagPreg, bellyPain: 0, cervixImplant: $activeSlave.cervixImplant, birthsTotal: $activeSlave.birthsTotal, pubertyXX: $activeSlave.pubertyXX, pubertyAgeXX: $activeSlave.pubertyAgeXX, pubertyXY: $activeSlave.pubertyXY, pubertyAgeXY: $activeSlave.pubertyAgeXY, scars: $activeSlave.scars, breedingMark: 0, underArmHStyle: "waxed", underArmHColor: "$activeSlave.underArmHColor", bodySwap: $activeSlave.bodySwap, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "$activeSlave.ballType", eggType: "$activeSlave.eggType", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: $activeSlave.ageAdjust, bald: $activeSlave.bald, origBodyOwner: "", death: "", hormoneBalance: $activeSlave.hormoneBalance, vasectomy: $activeSlave.vasectomy, ovaryAge: $activeSlave.ovaryAge, haircuts: $activeSlave.haircuts, newGamePlus: 1, skillHG: $activeSlave.skillHG, skillRC: $activeSlave.skillRC, skillBG: $activeSlave.skillBG, skillMD: $activeSlave.skillMD, skillDJ: $activeSlave.skillDJ, skillNU: $activeSlave.skillNU, skillTE: $activeSlave.skillTE, skillAT: $activeSlave.skillAT, skillST: $activeSlave.skillST, skillMM: $activeSlave.skillMM, skillWA: $activeSlave.skillWA
<br><br><br> __Direct JSON export method__: <br><br>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 0f7797ca89d3e5fa4374ad164c455dccfffb2071..d1dc9552da61b4fa2432a0fbb623419b5386993b 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -29,6 +29,9 @@
<<if $slaves[_FLs].trust < 45>>
<<set $slaves[_FLs].trust += 5>>
<</if>>
+ <<if $slaves[_FLs].livingConditions != "luxurious">>
+ <<set $slaves[_FLs].livingConditions = "luxurious">>
+ <</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "dom">>
<<fetishChangeChance $slaves[_FLs]>>
@@ -230,6 +233,7 @@
''__@@.pink;<<SlaveFullName $slaves[_FLs]>>@@__'' is serving as the Madam.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -239,6 +243,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,12 @@
/* Perform facility based rule changes */
<<set $slaves[$i].health += _healthBonus, $slaves[$i].aphrodisiacs = _aphrod>>
+ <<switch $brothelDecoration>>
+ <<case "Chattel Religionist" "Degradationist" "standard">>
+ <<set $slaves[$i].livingConditions = "spare">>
+ <<default>>
+ <<set $slaves[$i].livingConditions = "normal">>
+ <</if>>
<<if $showEWD != 0>>
<br><br>
@@ -288,6 +299,7 @@
<br> She <<include "SA whore">>
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -299,6 +311,7 @@
<<include "SA chooses own job">>
<<include "SA whore">>
<<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 49f846f19fb5269b34dc39b5c030f036f4a0b13b..30cdb5746c9a52931d72e9c0b42cb71a9664eaa6 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -98,6 +98,12 @@
<<set $costs += ($rulesCost*.75)>>
<<elseif ($slaves[$i].assignment == "be the madam")>>
<<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "work in the brothel")>>
+ <<if $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 a4f82aae59ae405c25da49c53880d7704e1de399..1a83e6c6dccf0c4324b17e7c699e4994860ec114 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -228,6 +228,16 @@
<<set $individualCosts += ($rulesCost*.75)>>
<<elseif ($slaves[$i].assignment == "be the madam")>>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
+ <<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "work in the brothel")>>
+ <<if $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>>
+
<<set $individualCosts += ($rulesCost*2)>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 425e56b77fc5f04837083e08d72c8d7312e4c2aa..5955dcff821e520d68dff3231265c741e7b2d93e 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -133,6 +133,335 @@
<<set _rewards = 3>>
<</if>>
<<case "work in the brothel">>
+ <<if $slaves[$i].devotion < -50>>
+ is so unhappy that she has little interest in getting off, not that her clients care.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off, not that her clients care.
+ <<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>>
+ <<else>>
+ gets off at work, so she doesn't feel the need to masturbate frequently.
+ <<set $slaves[$i].need -= 20>>
+ <</if>>
+ <<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.
+ <<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.
+ <<else>>
+ doesn't mind having to come to the penthouse to beg for sexual release.
+ <</if>>
+ <<saRulesPlayerEnergy>>
+ <<else>> /* $slaves[$i].devotion >= 50 */
+ willingly comes up to the penthouse and begs you to
+ <<saRulesPlayerFetishPlay>>
+ every break she gets.
+ <<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>>
+ <<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>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ accepts having to relieve herself solely through masturbation.
+ <<set $slaves[$i].need = 0>>
+ <<elseif ($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)>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
+ <<if ($slaves[$i].releaseRules == "permissive")>>
+ 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.
+ <<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.
+ <<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.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ @@.hotpink;accepts the need@@ to
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
+ <<else>>
+ happily @@.mediumaquamarine;avails herself@@ of your permission to
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <</if>>
+ <<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 or giving free samples, @@.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.
+ <<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 trading sex with other slaves or giving free samples, @@.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.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need *= 0.5>>
+ <</if>>
+ <<elseif ($slaves[$i].devotion < 50)>>
+ @@.hotpink;accepts having to ask@@ other slaves for sex,
+ <<set $slaves[$i].devotion += 1, $slaves[$i].need = 0>>
+ <<else>>
+ @@.mediumaquamarine;relies@@ on your other slaves for mutual satisfaction,
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <</if>>
+ <<if $slaves[$i].devotion > 20>>
+ <<saRulesConsentFetish>>
+ <<saRulesConsentDiscoversFetish>>
+ <</if>>
+ <</if>> /* closes universalRulesConsent */
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<if $slaves[$i].voice == 0>>
+ Living as a mute @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].lips > 95>>
+ Being unable to speak through her facepussy @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].speechRules == "restrictive">>
+ Living under enforced silence @@.hotpink;molds her@@ to your will.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</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
+ <<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>>
+ <<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.
+ <</switch>>
+ <<else>>
+ <<switch $brothelDecoration>>
+ <<case "Chattel Religionist" "Degradationist" "standard">>
+ The spare living conditions of $brothelName
+ <<if ($slaves[$i].trust > 40)>>
+ @@.gold;remind her not to get too comfortable@@ with her life.
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif ($slaves[$i].trust > 10)>>
+ @@.gold;keep her aware of her place.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <<default>>
+ She likes her little room in $brothelName, even if it smells of sex after fucking in it all day.
+ <</switch>>
+ <</if>>
+
+ <<if ($universalRulesConsent == 0)>>
+ <<if ($slaves[$i].devotion <= 20)>>
+ <<if ($slaves[$i].trust > -10)>>
+ <<if $brothel.length > 2 || $Madam != 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 assign more girls to $brothelName.
+ <</if>>
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ <<if $brothel.length > 2 || $Madam != 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.
+ <</if>>
+ <</if>>
+ <<elseif ($slaves[$i].releaseRules != "restrictive")>>
+ <<if ($slaves[$i].energy > 95)>>
+ <<if $brothel.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.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
+ <<if ($slaves[$i].fetish == "sadist")>>
+ <<if $brothel.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.
+ <<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.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif ($slaves[$i].fetish == "dom")>>
+ <<if $brothel.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.
+ <<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.
+ <</if>>
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>>
+ <<if $brothel.length > 2 || $Madam != 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 $brothelName is rather empty.
+ <</if>>
+ <<set $slaves[$i].trust += 1>>
+ <</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 services customers, analyzing her sexuality. It seems she is
+ <<saRulesAttractionDiscovery>>
+ <</if>>
+ <</if>>
+
+ <<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>>
+ <<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>>
+ <<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>>
+ <<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 client is into @@.gold;orgasm denial,@@ @@.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 2ffcf3971b6b6615c19b0c670c357783bc3bf605..93cb65f875049933afbabea295d3ccd9e9aa258c 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -19,6 +19,12 @@
<<set $args[0].clothing = "none", $args[0].shoes = "none", $args[0].collar = "none", $args[0].livingRules = "spare">>
<<case "work in the brothel" "brothel">>
<<set $args[0].assignment = "work in the brothel", $args[0].assignmentVisible = 0, $brothelSlaves++, $BrothiIDs.push(_wID)>>
+ <<switch $brothelDecoration>>
+ <<case "Chattel Religionist" "Degradationist" "standard">>
+ <<set $args[0].livingRules = "spare">>
+ <<default>>
+ <<set $args[0].livingRules = "normal">>
+ <</switch>>
<<case "be confined in the cellblock" "cellblock">>
<<set $args[0].assignment = "be confined in the cellblock", $args[0].assignmentVisible = 0, $cellblockSlaves++, $CellBiIDs.push(_wID)>>
<<case "get treatment in the clinic" "clinic">>