diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 024be731e6b0e6d0c5745306e65b77117194a0a9..9de6c41ff2019aafff8c3e99accf1c4ffeabcf74 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,12 @@
8/10/2018
+ 29
+ -added body hair controls to startingGirls more customization options
+ -fixed issues with the new slave markets
+ -slaves should no longer experience rivalry whiplash
+ -slaves that would have gained flaws from stress, but are receiving your careful attention, now gain minor devotion instead.
+
28
-bulk ordering from the prison sales now works
-fixed, hopefully, an issue where executed traitors were not properly being removed from the unit pool (secEx)
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index c868a29dd0830ab53339bf886d46bd5f0d81e0bb..8edf14a7ab00fb8f39798718bb512b3a9185168f 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -36,6 +36,25 @@
<br><br>
+''Pubic hair maintenance:'' $activeSlave.pubicHStyle.
+[[Waxed|More customization options][$activeSlave.pubicHStyle = "waxed"]]
+| [[Naturally hairless|More customization options][$activeSlave.pubicHStyle = "hairless"]]
+| [[Landing strip|More customization options][$activeSlave.pubicHStyle = "in a strip"]]
+| [[Neat|More customization options][$activeSlave.pubicHStyle = "neat"]]
+| [[Bushy in the front|More customization options][$activeSlave.pubicHStyle = "bushy in the front and neat in the rear"]]
+| [[Bushy|More customization options][$activeSlave.pubicHStyle = "bushy"]]
+| [[Very Bushy|More customization options][$activeSlave.pubicHStyle = "very bushy"]]
+
+<br><br>
+
+''Under arm hair maintenance:'' $activeSlave.underArmHStyle.
+[[Waxed|More customization options][$activeSlave.underArmHStyle = "waxed"]]
+| [[Naturally hairless|More customization options][$activeSlave.underArmHStyle = "hairless"]]
+| [[Shaved|More customization options][$activeSlave.underArmHStyle = "shaved"]]
+| [[Neat|More customization options][$activeSlave.underArmHStyle = "neat"]]
+| [[Bushy|More customization options][$activeSlave.underArmHStyle = "bushy"]]
+
+<br><br>
''Natural skin distinctiveness:'' $activeSlave.markings.
[[None|More customization options][$activeSlave.markings = "none"]]
| [[Freckles|More customization options][$activeSlave.markings = "freckles"]]
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 70e8b75c297f7a7c0600537861b8fd0cb63d5e64..ad3e4d01def93ffa2c0b6b678fe40cc84608e3e9 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -52,7 +52,7 @@ You board the transport to
It will cost <<print cashFormat($slaveCost)>> to enslave her.
<<if $cash >= $slaveCost>>
- <br>[[Enslave her and check out other available priosners|Criminal Market][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[[Enslave her and check out other available prisoners|Criminal Market][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[[Enslave her|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 7b1662a96aecbd0c0aa5991b5a1a22ff150c55ef..9814cc640da84f2fb3e0125523c1c680d49edb3e 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -101,6 +101,9 @@
<<set $expiree = 0>>
<<set $PC.sexualEnergy = 4>>
+<<if $PCSlutContacts == 2>>
+ <<set $PC.sexualEnergy -= 3>>
+<</if>>
<<if $personalAttention == "sex">>
<<set $PC.sexualEnergy += 2>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 0d6152ade467604638ff2a642378496698b3bc9f..dfe6ac651b7ecd7762405f0276d5cfd8a3c63676 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4856,55 +4856,60 @@
<</if>>
<<if $slaves[$i].fuckdoll == 0>>
<<if ($slaves[$i].behavioralFlaw == "none")>>
- <<if ($slaves[$i].trust < -20)>>
- <<if ($slaves[$i].devotion <= 50)>>
- <<if (random(1,100) > 100+$slaves[$i].trust)>>
- <<set _effect = random(1,4)>>
- Being so afraid so constantly drives $him to find solace in
- <<if _effect == 1>>
- self-denial. @@.red;$He has developed anorexia.@@
- <<set $slaves[$i].behavioralFlaw = "anorexic">>
- <<elseif _effect == 2>>
- stress eating. @@.red;$He's now a nervous glutton.@@
- <<set $slaves[$i].behavioralFlaw = "gluttonous">>
- <<elseif _effect == 3>>
- the scraps of prayer and superstition $he can remember from $his life before $he was a slave. @@.red;$He's now religious.@@
- <<set $slaves[$i].behavioralFlaw = "devout">>
- <<else>>
- the remnants of modern philosophy and education $he can remember from $his life before $he was a slave. @@.red;$He feels mentally liberated.@@
- <<set $slaves[$i].behavioralFlaw = "liberated">>
+ <<if ($slaves[$i].trust < -20) && ($slaves[$i].devotion <= 50)>>
+ <<if (random(1,100) > 100+$slaves[$i].trust)>>
+ <<set _effect = random(1,4)>>
+ Being so afraid so constantly drives $him to find solace in
+ <<set _givingAttention = $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
+ <<if _givingAttention != -1 && ["look after her", "soften her behavioral flaw", "soften her sexual flaw", "build her devotion", "Teach her"].includes($personalAttention[_givingAttention].trainingRegimen)>>
+ your attention. Relying on you for @@.hotpink;emotional support@@ strengthens $his @@.mediumaquamarine;bond@@ with <<= WrittenMaster($slaves[$i])>>.
+ <<set $slaves[$i].devotion++, $slaves[$i].trust++>>
+ <<elseif _effect == 1>>
+ self-denial. @@.red;$He has developed anorexia.@@
+ <<set $slaves[$i].behavioralFlaw = "anorexic">>
+ <<elseif _effect == 2>>
+ stress eating. @@.red;$He's now a nervous glutton.@@
+ <<set $slaves[$i].behavioralFlaw = "gluttonous">>
+ <<elseif _effect == 3>>
+ the scraps of prayer and superstition $he can remember from $his life before $he was a slave. @@.red;$He's now religious.@@
+ <<set $slaves[$i].behavioralFlaw = "devout">>
+ <<else>>
+ the remnants of modern philosophy and education $he can remember from $his life before $he was a slave. @@.red;$He feels mentally liberated.@@
+ <<set $slaves[$i].behavioralFlaw = "liberated">>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <</if>>
- <</if>>
<<if ($slaves[$i].sexualFlaw == "none")>>
- <<if ($slaves[$i].devotion < -20)>>
- <<if (random(1,500) > 500+$slaves[$i].devotion)>>
- <<set _effect = random(1,6)>>
- Being so angry at $his life as a sex slave has
- <<if _effect == 1>>
- driven $him into @@.red;sexual apathy.@@
- <<set $slaves[$i].sexualFlaw = "apathetic">>
- <<elseif _effect == 2>>
- convinced $him that the conservative parts of $his upbringing were right: sex is evil. @@.red;$He's now repressed.@@
- <<set $slaves[$i].sexualFlaw = "repressed">>
- <<elseif _effect == 3>>
- given $him a dread of being nude. @@.red;$He's now shamefast.@@
- <<set $slaves[$i].sexualFlaw = "shamefast">>
- <<elseif _effect == 4>>
- deprived $him of any motivation to keep sex appealing or even clean. @@.red;$He's now crude.@@
- <<set $slaves[$i].sexualFlaw = "crude">>
- <<elseif _effect == 5>>
- driven $him to find refuge in high standards. @@.red;$He's now judgemental.@@
- <<set $slaves[$i].sexualFlaw = "judgemental">>
- <<else>>
- convinced $him that sex is only this way here. Convinced that sexual slavery is wrong, @@.red;$He's become sexually idealistic.@@
- <<set $slaves[$i].sexualFlaw = "idealistic">>
+ <<if ($slaves[$i].devotion < -20)>>
+ <<if (random(1,500) > 500+$slaves[$i].devotion)>>
+ <<set _effect = random(1,6)>>
+ Being so angry at $his life as a sex slave has
+ <<set _givingAttention = $personalAttention.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
+ <<if _givingAttention != -1 && ["look after her", "soften her behavioral flaw", "soften her sexual flaw", "build her devotion", "Teach her"].includes($personalAttention[_givingAttention].trainingRegimen)>>
+ forced $him to face $his problems with you. Lending $him support makes it @@.hotpink;a little more tolerable.@@
+ <<elseif _effect == 1>>
+ driven $him into @@.red;sexual apathy.@@
+ <<set $slaves[$i].sexualFlaw = "apathetic">>
+ <<elseif _effect == 2>>
+ convinced $him that the conservative parts of $his upbringing were right: sex is evil. @@.red;$He's now repressed.@@
+ <<set $slaves[$i].sexualFlaw = "repressed">>
+ <<elseif _effect == 3>>
+ given $him a dread of being nude. @@.red;$He's now shamefast.@@
+ <<set $slaves[$i].sexualFlaw = "shamefast">>
+ <<elseif _effect == 4>>
+ deprived $him of any motivation to keep sex appealing or even clean. @@.red;$He's now crude.@@
+ <<set $slaves[$i].sexualFlaw = "crude">>
+ <<elseif _effect == 5>>
+ driven $him to find refuge in high standards. @@.red;$He's now judgemental.@@
+ <<set $slaves[$i].sexualFlaw = "judgemental">>
+ <<else>>
+ convinced $him that sex is only this way here. Convinced that sexual slavery is wrong, @@.red;$He's become sexually idealistic.@@
+ <<set $slaves[$i].sexualFlaw = "idealistic">>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 5aaecc3d0b6b70f5f9593c56ae302763575e4923..e2e5e2aa6ea305b076267864b0143f51b86a6715 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -4,10 +4,9 @@
<<if $slaves[$i].rivalry == 0>>
-<<if $slaves[$i].fuckdoll == 0>>
-<<if $slaves[$i].fetish != "mindbroken">>
+<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+<<if isSlaveAvailable($slaves[$i])>>
<<if $slaves[$i].assignment != "stay confined">>
-<<if $slaves[$i].assignment != "be confined in the arcade">>
<<if $slaves[$i].devotion < random(20,100)>>
<<if $slaves[$i].trust > random(-100,-20)>>
<<for _j = 0; _j < _SL; _j++>>
@@ -134,7 +133,6 @@
<</if>>
<</if>>
<</if>>
-<</if>>
<<else>>
@@ -176,42 +174,38 @@
<<if _worsenedRivalry != 1>>
<<if _roll > 50>>
<<if $slaves[_j].fetish == $slaves[$i].fetish>>
- <<if $slaves[_j].fetishKnown>>
- <<if $slaves[$i].fetishKnown>>
$slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> share sexual interests, and in the sexual atmosphere of the arcology, it's @@.lightgreen;difficult for them to keep up their dislike@@ of one another with the mutual attraction.
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
- <</if>>
- <</if>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lightenedRivalry = 1>>
<</if>>
<<if $slaves[_j].ID == $slaves[$i].relationshipTarget>>
- <<if $slaves[$i].relationship > 3>>
- <<set $slaves[_j].rivalry = 0, $slaves[_j].rivalryTarget = 0>>
- <<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
- <</if>>
+ <<if $slaves[$i].relationship > 3>>
+ <<set $slaves[_j].rivalry = 0, $slaves[_j].rivalryTarget = 0>>
+ <<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
+ <</if>>
<</if>>
<<if _roll > 80 && $slaves[$i].rivalry > 0>>
<<if $slaves[_j].trust < -20>>
- <<if $slaves[$i].trust < -20>>
- Since both $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> are terrified of you, they work together to @@.lightgreen;get over their feud,@@ since it brings punishment on both of them.
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
- <</if>>
+ <<if $slaves[$i].trust < -20>>
+ Since both $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> are terrified of you, they work together to @@.lightgreen;get over their feud,@@ since it brings punishment on both of them.
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lightenedRivalry = 1>>
+ <</if>>
<</if>>
<<if $slaves[_j].devotion > 50>>
- <<if $slaves[$i].devotion > 50>>
- Since both $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> are devoted to you, they work together to @@.lightgreen;get over their feud,@@ since it gets in the way of their duties.
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
- <</if>>
+ <<if $slaves[$i].devotion > 50>>
+ Since both $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> are devoted to you, they work together to @@.lightgreen;get over their feud,@@ since it gets in the way of their duties.
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lightenedRivalry = 1>>
+ <</if>>
<</if>>
<<if _roll > 90 && $slaves[$i].rivalry > 0>>
<<if $slaves[$i].energy > 95>>
$slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything she can to @@.lightgreen;patch up their differences.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1, _lightenedRivalry = 1>>
<</if>>
<<if _lustyFix != 1>>
<<if $slaves[$i].attrXX > 85>>
<<if ($slaves[_j].vagina > -1) || ($slaves[_j].faceShape != "masculine")>>
$slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything she can to @@.lightgreen;patch up their differences.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
<</if>>
@@ -219,7 +213,7 @@
<<if $slaves[$i].attrXY > 85>>
<<if ($slaves[_j].balls > 0) || ($slaves[_j].faceShape == "masculine")>>
$slaves[$i].slaveName lusts after <<= SlaveFullName($slaves[_j])>>, and does everything she can to @@.lightgreen;patch up their differences.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lustyFix = 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
<</if>>
@@ -228,7 +222,7 @@
<<if $slaves[$i].subTarget != $slaves[_j].ID>>
<<if $slaves[_j].subTarget != $slaves[$i].ID>>
With time apart $slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightgreen;dislike each other less.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
<</if>>
@@ -240,33 +234,31 @@
<</if>>
<<if $familyTesting>>
<<if $slaves[$i].mother == $slaves[_j].ID || $slaves[$i].father == $slaves[_j].ID || $slaves[_j].mother == $slaves[$i].ID || $slaves[_j].father == $slaves[$i].ID || areSisters($slaves[$i], $slaves[_j])>>
- <<if _roll > 70 && $slaves[$i].rivalry < 3>>
+ <<if _roll > 70 && $slaves[$i].rivalry < 3 && _lightenedRivalry != 1>>
$slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightsalmon;pursue their family rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<<elseif _roll > 40 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
$slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightgreen;patch up their family relationship.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
<<else>>
- <<if $slaves[$i].relation>>
- <<if $slaves[$i].relationTarget == $slaves[$i].rivalryTarget>>
- <<if _roll > 70 && $slaves[$i].rivalry < 3>>
+ <<if $slaves[$i].relation && $slaves[$i].relationTarget == $slaves[$i].rivalryTarget>>
+ <<if _roll > 70 && $slaves[$i].rivalry < 3 && _lightenedRivalry != 1>>
$slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightsalmon;pursue their family rivalry.@@
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<<elseif _roll > 40 && $slaves[$i].rivalry > 0 && _worsenedRivalry != 1>>
$slaves[$i].slaveName and <<= SlaveFullName($slaves[_j])>> @@.lightgreen;patch up their family relationship.@@
- <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1>>
+ <<set $slaves[_j].rivalry -= 1, $slaves[$i].rivalry -= 1, _lightenedRivalry = 1>>
<</if>>
<</if>>
- <</if>>
<</if>>
- <<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID>>
+ <<if $slaves[_j].origBodyOwnerID == $slaves[$i].ID && _lightenedRivalry != 1>>
<<if $slaves[$i].rivalry < 3>>
$slaves[$i].slaveName @@.lightsalmon;refuses to accept <<= SlaveFullName($slaves[_j])>>'s control of her former body,@@ worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
<</if>>
- <<elseif _roll > $slaves[$i].devotion-$slaves[$i].trust+10>>
+ <<elseif _roll > $slaves[$i].devotion-$slaves[$i].trust+10 && _lightenedRivalry != 1>>
<<if $slaves[$i].rivalry < 3>>
$slaves[$i].slaveName @@.lightsalmon;bickers with <<= SlaveFullName($slaves[_j])>>@@ whenever she can, worsening their rivalry.
<<set $slaves[_j].rivalry += 1, $slaves[$i].rivalry += 1>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 50aa918695fca08e4d698d22ac4efc456d5035f4..adb8369c10a6d375b8c48cdd70e8f5580b7d59a9 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -3676,7 +3676,11 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<else>>
<<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = $retirementAge-2>>
+ <<if $retirementAge > 56>>
+ <<set $activeSlaveOneTimeMaxAge = 55>>
+ <<else>>
+ <<set $activeSlaveOneTimeMaxAge = $retirementAge-2>>
+ <</if>>
<</if>>
<<include "Generate XY Slave">>
@@ -3889,16 +3893,22 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<else>>
<<set $activeSlaveOneTimeMinAge = 18>>
- <<set $activeSlaveOneTimeMaxAge = 55>>
+ <<if $retirementAge > 56>>
+ <<set $activeSlaveOneTimeMaxAge = 55>>
+ <<else>>
+ <<set $activeSlaveOneTimeMaxAge = $retirementAge-2>>
+ <</if>>
<</if>>
<<include "Generate New Slave">>
+ /*
<<if $activeSlave.dick > 0>>
<<set $activeSlave.dickAccessory = "chastity">>
<</if>>
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vaginalAccessory = "chastity belt">>
<</if>>
+ */
<<set _criminal = setup.militaryCriminalPool.random()>>
@@ -4061,7 +4071,11 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<else>>
<<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 65>>
+ <<if $retirementAge > 66>>
+ <<set $activeSlaveOneTimeMaxAge = 65>>
+ <<else>>
+ <<set $activeSlaveOneTimeMaxAge = $retirementAge-2>>
+ <</if>>
<</if>>
<<include "Generate New Slave">>
@@ -4154,16 +4168,22 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<else>>
<<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = $retirementAge-2>>
+ <<if $retirementAge > 56>>
+ <<set $activeSlaveOneTimeMaxAge = 55>>
+ <<else>>
+ <<set $activeSlaveOneTimeMaxAge = $retirementAge-2>>
+ <</if>>
<</if>>
<<include "Generate New Slave">>
+ /*
<<if $activeSlave.dick > 0>>
<<set $activeSlave.dickAccessory = "chastity">>
<</if>>
<<if $activeSlave.vagina > -1>>
<<set $activeSlave.vaginalAccessory = "chastity belt">>
<</if>>
+ */
<<set _criminal = setup.pettyCriminalPool.random()>>
@@ -4330,7 +4350,7 @@
<<set $activeSlave.origin = "You purchased her life at a prison sale. She was locked away for tax evasion.">>
<<set $prisonCrime = "is incarcerated for tax evasion.">>
<<set $activeSlave.devotion = random(-20,20)>>
- <<set $activeSlave.trust = random(,60)>>
+ <<set $activeSlave.trust = random(0,60)>>
<<set $activeSlave.hStyle = "buzzcut">>
<<set $activeSlave.hLength = 0>>
<<set $activeSlave.intelligence = either(0, 1, 1, 2, 2, 3)>>