From 44397efb10dca8e15d21002fca8c7d86dbcaee73 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 14 Dec 2017 13:15:36 -0500
Subject: [PATCH] saRules to the cellblock
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 9 +-
devNotes/twine JS | 8 +
src/init/storyInit.tw | 1 +
src/js/economyJS.tw | 8 +
src/uncategorized/BackwardsCompatibility.tw | 5 +-
src/uncategorized/cellblock.tw | 13 +-
src/uncategorized/cellblockReport.tw | 43 +++-
src/uncategorized/costs.tw | 8 +
src/uncategorized/costsReport.tw | 13 +-
src/uncategorized/policies.tw | 2 +-
src/uncategorized/saRules.tw | 231 +++++++++++++++++++
src/uncategorized/slaveInteract.tw | 6 +-
src/utility/assignWidgets.tw | 10 +
src/utility/miscWidgets.tw | 4 +-
14 files changed, 347 insertions(+), 14 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index ea8f905cf6a..6324ac965d5 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4909,4 +4909,11 @@ Pregmod 0.10.3.0
-git contributed fixes
207
- -git contributed code simplification and fixes
\ No newline at end of file
+ -git contributed code simplification and fixes
+
+ 12/14/17
+
+ 208
+ -saRules now applies to the cellblock
+ -new cellblock setting to forbid your wardeness from cumming inside your prisoners
+ -git contributed fixes
\ No newline at end of file
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 6f3b6a3c3a6..f80ede0633d 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -2160,6 +2160,14 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.WARDEN) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.JAIL) {
+ if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.25;
+ } else {
+ cost += rulesCost * .90;
+ }
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index aa5e39bc394..df379230151 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -507,6 +507,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $cellblock = 0>>
<<set $cellblockName = "the Cellblock">>
<<set $cellblockNameCaps = "The Cellblock">>
+<<set $cellblockWardenCumsInside = 1>>
<<set $masterSuiteSlaves = 0>>
<<set $masterSuiteDecoration = "standard">>
<<set $masterSuiteUpgradeLuxury = 0>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index a4bd7797424..79157322728 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -346,6 +346,14 @@ window.getSlaveCost = function(s) {
} else {
cost += rulesCost;
}
+ } else if(s.assignment === Job.WARDEN) {
+ cost += rulesCost * 2;
+ } else if(s.assignment === Job.JAIL) {
+ if(s.livingRules == LivingRule.NORMAL) {
+ cost += rulesCost * 1.25;
+ } else {
+ cost += rulesCost * .90;
+ }
} else {
if(s.livingRules === LivingRule.LUXURIOUS) {
cost += rulesCost * (s.relationship >= 4 ? 3 : 4);
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index a58b079e181..e4e18df2887 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1451,7 +1451,7 @@ Setting missing global variables:
<</if>>
<<if ndef $facilityCost>>
-<<set $facilityCost = 500>>
+<<set $facilityCost = 100>>
<</if>>
<<if ndef $policyCost>>
<<set $policyCost = 5000>>
@@ -1680,6 +1680,9 @@ Setting missing global variables:
<<if ndef $cellblockDecoration>>
<<set $cellblockDecoration = "standard">>
<</if>>
+<<if ndef $cellblockWardenCumsInside>>
+ <<set $cellblockWardenCumsInside = 0>>
+<</if>>
<<if ndef $MastSiIDs>>
<<set $MastSiIDs = []>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 701718b3c4f..d6698ffe17e 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -61,9 +61,9 @@ $cellblockNameCaps
<</switch>>
<<if $cellblockSlaves > 2>>
- $cellblockNameCaps is full of slaves, though it's difficult to tell at first. The row of cell doors is closed as always, and the soundproofed little rooms let no noise escape. Through each little window, though, a scene of loneliness and misery may be witnessed.
+ $cellblockNameCaps is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
<<elseif $cellblockSlaves > 0>>
- $cellblockNameCaps holds a few slaves, though it's difficult to tell at first. The row of cell doors is closed as always, and the soundproofed little rooms let no noise escape. Through several of the little windows, though, a scene of loneliness and misery may be witnessed.
+ $cellblockNameCaps holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
<<elseif $Wardeness != 0>>
$Wardeness.slaveName is alone in the cellblock, and seems rather lonely without anyone to oppress.
<<else>>
@@ -82,6 +82,15 @@ $cellblockNameCaps
Its compliance systems are standard. [[Upgrade them to soften slave flaws|Cellblock][$cash -= _Tmult1, $cellblockUpgrade = 1]] //Costs ¤_Tmult1//
<</if>>
+<br><br>
+<<if $Wardeness != 0 && canPenetate($Warden)>>
+ <<if $cellblockWardenCumsInside == 1>>
+ $Warden.slaveName is permitted to cum inside her inmates when she disciplines them. [[Forbid her from cumming inside|Cellblock][$cellblockWardenCumsInside = 0]]
+ <<else>>
+ $Warden.slaveName is not permitted to cum inside her inmates. [[Let her cum inside|Cellblock][$cellblockWardenCumsInside = 1]] //May result in pregnancies//
+ <</if>>
+<</if>>
+
<br><br>
<<if $Wardeness != 0>>
<<set $Flag = 2>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 87e0d10f692..b690745472b 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -28,6 +28,9 @@
<<if $slaves[_FLs].trust < 60>>
<<set $slaves[_FLs].trust += 3>>
<</if>>
+ <<if ($slaves[_FLs].livingRules != "luxurious")>>
+ <<set $slaves[_FLs].livingRules = "luxurious">>
+ <</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
<<if $slaves[_FLs].fetish != "sadist">>
<<fetishChangeChance $slaves[_FLs]>>
@@ -149,6 +152,7 @@
''__@@.pink;<<SlaveFullName $slaves[$i]>>@@__'' is serving as the Wardeness in $cellblockName.
<br>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -158,6 +162,7 @@
<<else>>
<<silently>>
<<include "SA chooses own clothes">>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -178,14 +183,46 @@
<<set $slaves[$i].devotion++>>
<</if>>
<</if>>
- <<if $cellblockDecoration == "Hedonistic">>
+ <<switch $cellblockDecoration>>
+ <<case "Paternalist">>
+ <<set $slaves[$i].livingRules = "normal">>
+ <<if ($slaves[$i].inflation > 0)>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
+ <<SetBellySize $slaves[$i]>>
+ <</if>>
+ <<case "Pastoralist">>
+ <<set $slaves[$i].livingRules = "spare">>
+ <<if $slaves[$i].inflation == 0>>
+ <<if $slaves[$i].pregKnown == 0 && $slaves[$i].bellyImplant < 1500>>
+ <<set $slaves[$i].inflation = 2, $slaves[$i].inflationType = "milk", $slaves[$i].inflationMethod = 1>>
+ <<else>>
+ <<set $slaves[$i].inflation = 1, $slaves[$i].inflationType = "milk", $slaves[$i].inflationMethod = 1>>
+ <</if>>
+ <<SetBellySize $slaves[$i]>>
+ <</if>>
+ <<case "Hedonistic">>
+ <<set $slaves[$i].livingRules = "spare">>
<<if $slaves[$i].weight < 200>>
<<set $slaves[$i].weight += 3>>
<</if>>
<<if $slaves[$i].muscles > -100>>
<<set $slaves[$i].muscles -= 2>>
<</if>>
- <</if>>
+ <<if $slaves[$i].inflation == 0>>
+ <<if $slaves[$i].pregKnown == 0 && $slaves[$i].bellyImplant < 1500>>
+ <<set $slaves[$i].inflation = 3, $slaves[$i].inflationType = "food", $slaves[$i].inflationMethod = 1>>
+ <<else>>
+ <<set $slaves[$i].inflation = 1, $slaves[$i].inflationType = "food", $slaves[$i].inflationMethod = 1>>
+ <</if>>
+ <<SetBellySize $slaves[$i]>>
+ <</if>>
+ <<default>>
+ <<set $slaves[$i].livingRules = "spare">>
+ <<if ($slaves[$i].inflation > 0)>>
+ <<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0>>
+ <<SetBellySize $slaves[$i]>>
+ <</if>>
+ <</switch>>
<<if $cellblockUpgrade == 1>>
<<if ($slaves[$i].behavioralFlaw != "none") && ($slaves[$i].behavioralQuirk == "none")>>
<<SoftenBehavioralFlaw $slaves[$i]>>
@@ -227,6 +264,7 @@
<</if>>
<br> She <<include "SA stay confined">>
<br>
+ <<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -237,6 +275,7 @@
<<silently>>
<<include "SA chooses own job">>
<<include "SA stay confined">>
+ <<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 bffe8af52bc..8f1b20538af 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -118,6 +118,14 @@
<<else>>
<<set $costs += $rulesCost>>
<</if>>
+<<elseif ($slaves[$i].assignment == "be the Wardeness")>>
+ <<set $costs += ($rulesCost*2)>>
+<<elseif ($slaves[$i].assignment == "be confined in the cellblock")>>
+ <<if $slaves[$i].livingRules == "normal">>
+ <<set $costs += ($rulesCost*1.25)>>
+ <<else>>
+ <<set $costs += ($rulesCost*.9)>>
+ <</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 5744d6212e1..a20835cb4a4 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -235,6 +235,9 @@
<<elseif ($slaves[$i].assignment == "be the Nurse")>>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
<<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be the Wardeness")>>
+ <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)>>
@@ -246,7 +249,6 @@
<br> Living expenses: ¤<<print $rulesCost>>
<<set $individualCosts += $rulesCost>>
<</if>>
- <<set $individualCosts += ($rulesCost*2)>>
<<elseif ($slaves[$i].assignment == "get treatment in the clinic")>>
<<if $slaves[$i].livingRules == "luxurious">>
<br> Living expenses: ¤<<print ($rulesCost*2)>>
@@ -258,7 +260,14 @@
<br> Living expenses: ¤<<print $rulesCost>>
<<set $individualCosts += $rulesCost>>
<</if>>
- <<set $individualCosts += ($rulesCost*2)>>
+ <<elseif ($slaves[$i].assignment == "be confined in the cellblock")>>
+ <<if $slaves[$i].livingRules == "normal">>
+ <br> Living expenses: ¤<<print ($rulesCost*1.25)>>
+ <<set $individualCosts += ($rulesCost*1.25)>>
+ <<else>>
+ <br> Living expenses: ¤<<print ($rulesCost*.9)>>
+ <<set $individualCosts += ($rulesCost*.9)>>
+ <</if>>
<<else>>
<<if $slaves[$i].livingRules == "luxurious">>
<<if $slaves[$i].relationship >= 4>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 82230f9ff31..44e2e766bf0 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -722,7 +722,7 @@
<<if $BasicWeightSMR == 0>>
<<if $arcologies[0].FSHedonisticDecadenceSMR == 0>>
- <br>''Basic Weight Standards:'' slaves must not exceed a weight treshold to be sold in the slave markets.
+ <br>''Basic Weight Standards:'' slaves must not exceed a weight threshold to be sold in the slave markets.
[[Implement|Policies][$BasicWeightSMR = 1, $cash -=5000, $rep -= 1000, $minimumSlaveCost += 3000]]
<br> //This will raise the price of slaves.
<</if>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 42450021194..51d7eab2584 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1340,6 +1340,237 @@
<<set $slaves[$i].trust -= _punishments>>
<</switch>>
<</if>>
+ <<case "be the Wardeness">>
+ <<set $slaves[$i].need -= ($cellblock*5)>>
+ <<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>>
+ gets off at work, so she doesn't feel the need for release that often.
+ <<set $slaves[$i].need -= 20>>
+ <<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")>>
+ opts to @@.mediumaquamarine;take advantage of perks of her position@@ and use the prisoners for relief.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <<saRulesPermissiveDrugEffects>>
+ <<else>>
+ happily @@.mediumaquamarine;avails herself@@ to the prisoners whenever she needs release.
+ <<set $slaves[$i].trust += 1, $slaves[$i].need = 0>>
+ <<saRulesRapeFetish>>
+ <<saRulesRapeDiscoversFetish>>
+ <<saRulesPermissiveDrugEffects>>
+ <</if>> /* closes releaseRules not restrictive */
+ <</if>>
+
+ She is @@.hotpink;very happy@@ with her private room in $cellblockName and @@.mediumaquamarine;trusts@@ you a bit more for placing her in charge of it.
+ <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
+
+ <<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 oversees the prisoners, analyzing her preferences. 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 room<<if $CellBiIDs.length > 1>> teaching a disobiediant how to properly use her mouth<</if>>.
+ <</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 "be confined in the cellblock">>
+ <<if $Wardeness != 0 && canPenetrate($Wardeness)>>
+ <<set _wardenFunTimes = random(0,5)>>
+ <<set $slaves[$i].need -= (10*_wardenFunTimes)>>
+ <</if>>
+ <<if $slaves[$i].devotion < -50>>
+ is so unhappy that she has little interest in getting off, making the rule restricting her sexual outlets superfluous.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].energy <= 20>>
+ is frigid and has little interest in getting off, making the rule restricting her sexual outlets superfluous.
+ <<set $slaves[$i].need = 0>>
+ <<elseif $slaves[$i].relationship == -3>>
+ You make sure your troublesome wife's sexual needs are handled, openly, in the middle of $cellblockName, where everyone can see, hear, and smell your dominance.
+ <<set $slaves[$i].need = 0>>
+ <<if $PC.dick == 1 && $slaves[$i].eggType == "human" && canGetPregnant($slaves[$i]) && (($slaves[$i].vagina > 0 && $slaves[$i].ovaries == 1)||($slaves[$i].anus != 0 && $slaves[$i].mpreg == 1))>>
+ <<KnockMeUp $slaves[$i] 10 0 -1 1>>
+ <<if ($slaves[$i].vagina > 0 && $slaves[$i].ovaries == 1)>>
+ <<set $slaves[$i].vaginalCount += 7, $vaginalTotal += 7>>
+ <<else>>
+ <<set $slaves[$i].analCount += 7, $analTotal += 7>>
+ <</if>>
+ <<if $slaves[$i].preg > 0>>
+ As an added show, you @@.lime;proudly display her positive pregnancy@@ test for all to see.
+ <</if>>
+ <<elseif canDoVaginal($slaves[$i]) && $slaves[$i].vagina > 0>>
+ <<set $slaves[$i].vaginalCount += 7, $vaginalTotal += 7>>
+ <<elseif canDoAnal($slaves[$i]) && $slaves[$i].anus > 0>>
+ <<set $slaves[$i].analCount += 7, $analTotal += 7>>
+ <</if>>
+ <<elseif $slaves[$i].need < $slaves[$i].energy*0.5>>
+ <<if $Wardeness != 0 && canPenetrate($Wardeness)>>
+ <<SimpleSlaveFucking $slaves[$i] _wardenFunTimes>>
+ <<set $slaves[_FLs].penetrativeCount += _wardenFunTimes, $penetrativeTotal += _wardenFunTimes>>
+ <<if _wardenFunTimes > 0 && canImpreg($slaves[$i], $Wardeness) && ($cellblockWardenCumsInside == 1 || $Wardeness.fetish == "mindbroken")>>
+ <<KnockMeUp $slaves[$i] 10 2 $Wardeness.ID 1>>
+ <<if ($slaves[$i].vagina > 0 && $slaves[$i].ovaries == 1)>>
+ <<set $slaves[$i].vaginalCount++, $vaginalTotal++>>
+ <<else>>
+ <<set $slaves[$i].analCount++, $analTotal++>>
+ <</if>>
+ <<set $slaves[_FLs].penetrativeCount += 1, $penetrativeTotal += 1>>
+ <</if>>
+ <</if>>
+ <<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>>
+ <</if>>
+ <<else>>
+ <<if $Wardeness != 0 && canPenetrate($Wardeness)>>
+ <<SimpleSlaveFucking $slaves[$i] _wardenFunTimes>>
+ <<set $slaves[_FLs].penetrativeCount += _wardenFunTimes, $penetrativeTotal += _wardenFunTimes>>
+ <<if _wardenFunTimes > 0 && canImpreg($slaves[$i], $Wardeness) && ($cellblockWardenCumsInside == 1 || $Wardeness.fetish == "mindbroken")>>
+ <<KnockMeUp $slaves[$i] 10 2 $Wardeness.ID 1>>
+ <<if ($slaves[$i].vagina > 0 && $slaves[$i].ovaries == 1)>>
+ <<set $slaves[$i].vaginalCount++, $vaginalTotal++>>
+ <<else>>
+ <<set $slaves[$i].analCount++, $analTotal++>>
+ <</if>>
+ <<set $slaves[_FLs].penetrativeCount += 1, $penetrativeTotal += 1>>
+ <</if>>
+ <</if>>
+ <<if random(-100,0) > $slaves[$i].devotion>>
+ refuses to not touch herself and is @@.gold;severely punished@@ for illicit masturbation.
+ <<set $slaves[$i].trust -= 2, $slaves[$i].need -= 10>>
+ <<else>>
+ @@.gold;fears@@ trying to
+ <<if ["chastity", "combined chastity"].includes($slaves[$i].dickAccessory)>>
+ touch herself
+ <<elseif canAchieveErection($slaves[$i])>>
+ jack off
+ <<else>>
+ touch herself
+ <</if>>
+ to get relief when she knows what the consequences are.
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ <</if>>
+
+ <<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>>
+
+ <<switch $cellblockDecoration>>
+ <<case "Degradationist">>
+ She expected spare living conditions. In reality, they are far worse. @@.gold;Not one moment goes by that she isn't filled with terror.@@
+ <<set $slaves[$i].trust -= 3>>
+ <<case "Paternalist">>
+ She expected far worse living conditions, and while still resistant, @@.hotpink;finds herself more willing to obey.@@
+ <<set $slaves[$i].devotion += 1>>
+ <<case "Pastoralist">>
+ She expected the spare living conditions, but not the dietary supplements. She never anticipated @@.gold;you'd go this far@@ to force her into shape and is constantly reminded of her changes by just how small her cell feels with a belly full of milk.
+ <<set $slaves[$i].trust -= 2>>
+ <<case "Body Purist">>
+ She expected the spare living conditions, but not the excessive hydration. She never anticipated @@.gold;you'd go this far@@ to force her into shape and is constantly reminded of her changes by the fullness of her bladder.
+ <<set $slaves[$i].trust -= 2>>
+ <<case "Hedonistic">>
+ She expected the spare living conditions, but not the dietary supplements. She never anticipated @@.gold;you'd go this far@@ to force her into shape and is constantly reminded of her changes by just how small her cell feels with a belly full of food.
+ <<set $slaves[$i].trust -= 2>>
+ <<default>>
+ She expected the spare living conditions, but no matter how hard she tries to shut out her surroundings, @@.gold;they still wear down her will.@@
+ <<set $slaves[$i].trust -= 1>>
+ <</switch>>
+
+ <<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 _punishments > 0>>
+ <<switch $slaves[$i].standardPunishment>>
+ <<case "confinement">>
+ When she disobeys, she @@.gold;spends her day in solitary.@@
+ <<set $slaves[$i].trust -= 2*_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's given a hit of mild aphrodisiacs and @@.gold;left to squirm without release,@@ @@.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/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 8155e917f4c..7f0df0e0780 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -124,7 +124,7 @@
<</if>>
| [[Use another slave to impregnate her|FSlaveImpreg]]
<</if>>
- <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade">>
+ <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">>
<<if $enema == 1>>
<<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>>
<<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">>
@@ -167,7 +167,7 @@
<</if>>
<</if>>
<<if $activeSlave.inflation == 0 && $activeSlave.bellyImplant < 1500>>
- <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">>
+ <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">>
| [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
<<if $buckets == 1>>
| <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
@@ -333,7 +333,7 @@
| <<link "Fuck its rear hole">><<replace "#miniscene">><<FFuckdollAnal>><br><</replace>><</link>>
<</if>>
<</if>>
-<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist != "unset" && $activeSlave.breedingMark == 0>>
+<<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && $activeSlave.breedingMark == 0>>
<<set _activeSlaveRepSacrifice = repGainSacrifice()>>
| [[Sacrifice her on the altar|Aztec Slave Sacrifice][$sacrificeType = "life"]] //This will kill her and gain you _activeSlaveRepSacrifice reputation//
<</if>>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 9584f089654..7744aff956f 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -27,6 +27,12 @@
<</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)>>
+ <<switch $cellblockDecoration>>
+ <<case "Paternalist">>
+ <<set $args[0].livingRules = "normal">>
+ <<default>>
+ <<set $args[0].livingRules = "spare">>
+ <</switch>>
<<case "get treatment in the clinic" "clinic">>
<<set $args[0].assignment = "get treatment in the clinic", $args[0].assignmentVisible = 0, $clinicSlaves++, $CliniciIDs.push(_wID)>>
<<switch $clinicDecoration>>
@@ -124,6 +130,10 @@
<<set $BrothiIDs.delete(_wID), $brothelSlaves-->>
<<case "be confined in the cellblock" "cellblock">>
<<set $args[0].assignment = "rest">>
+ <<if ($slaves[$i].inflation > 0)>>
+ <<set $args[0].inflation = 0, $args[0].inflationType = "none", $args[0].inflationMethod = 0>>
+ <<SetBellySize $slaves[$i]>>
+ <</if>>
<<set $CellBiIDs.delete(_wID), $cellblockSlaves-->>
<<case "get treatment in the clinic" "clinic">>
<<set $args[0].assignment = "rest">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 445048f40e9..e0e96f1a5e9 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -489,7 +489,7 @@
<</if>>
| [[Use another slave to impregnate her|FSlaveImpreg]]
<</if>>
- <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade">>
+ <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">>
<<if $enema == 1>>
<<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>>
<<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">>
@@ -532,7 +532,7 @@
<</if>> /* dairyPiping == 1 */
<</if>> /* assigned to dairy or arcade */
<<if $activeSlave.inflation == 0 && $activeSlave.bellyImplant < 1500>>
- <<if $activeSlave.assignment != "work in the dairy" || $activeSlave.assignment != "be confined in the arcade">>
+ <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">>
| [[Use another slave to forcefeed her|SlaveOnSlaveFeedingWorkAround]]
<<if $buckets == 1>>
| <<link "Make her consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
--
GitLab