diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 94ab51c9f8b859f380be668d028a5630efe0e30a..d688f63d2a6881b1bee1da9d20dd2492b3b0899f 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2123,6 +2123,10 @@ window.getCost = function(array) {
costs += mercCosts;
}
+ if(State.variables.citizenRetirementMenials == 1) {
+ costs += State.variables.helots * 2;
+ }
+
costs += State.variables.FSSpending;
//slave expenses
@@ -2520,6 +2524,10 @@ window.getSlaveCost = function(s) {
}
// Retirement account
+ if(State.variables.citizenRetirementMenials === 1 && State.variables.CitizenRetirement === 0) {
+ cost += 2;
+ }
+
if(State.variables.CitizenRetirement === 1) {
cost += 250;
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 7c208636f75c448436f0406cbb351952d8a1acfe..cea018b552a71fb7c9d154237f82fb6e73c191b5 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -338,6 +338,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $retirementAge = 45>>
<<set $customRetirementAge = 45>>
+ <<set $customMenialRetirementAge = 65>>
<<set $FSCreditCount = 5>>
<<set $FSCreditCountString = "five">>
@@ -1192,7 +1193,8 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $BioreactorRetirement = 0>>
<<set $ArcadeRetirement = 0>>
<<set $CitizenRetirement = 0>>
-<<set $CitizenRetirementTrigger = 0>>
+<<set $citizenRetirementMenials = 0>>
+<<set $citizenRetirementTrigger = 0>>
<<set $FSSupLawTrigger = 0>>
<<set $FSSubLawTrigger = 0>>
<<set $SexMilestoneRetirement = 0>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 6ef2b127b9da8acf0e296ae72fda8a0c543fd247..1bf2e3c29056c546aa732f3c6cf84af1ef89b1f6 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -150,6 +150,10 @@ window.getCost = function(array) {
costs += mercCosts;
}
+ if(State.variables.citizenRetirementMenials == 1) {
+ costs += State.variables.helots * 2;
+ }
+
costs += State.variables.FSSpending;
//slave expenses
@@ -547,6 +551,10 @@ window.getSlaveCost = function(s) {
}
// Retirement account
+ if(State.variables.citizenRetirementMenials === 1 && State.variables.CitizenRetirement === 0) {
+ cost += 2;
+ }
+
if(State.variables.CitizenRetirement === 1) {
cost += 250;
}
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index c05eac6f5f480d73f15c3d1caa82d9c21f8521c7..c6991cbc3ec411e70ccef3d32937f94bae6a94a5 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -71,7 +71,7 @@ _percLowerClass = Math.trunc(($lowerClass / ($ACitizens + $ASlaves)) * 1000) / 1
_percMiddleClass = Math.trunc(($middleClass / ($ACitizens + $ASlaves)) * 1000) / 10,
_percUpperClass = Math.trunc(($upperClass / ($ACitizens + $ASlaves)) * 1000) / 10,
_percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
-<br>Lower Class Citizens | $lowerClass | <<print _percLowerClass>>% | Rent @@.yellowgreen;<<print cashFormat($LCRent)>>@@
+<br>Lower Class Citizens | $lowerClass | <<print _percLowerClass>>% | Rent @@.yellowgreen;<<print cashFormat($LCRent / 25)>>@@
<<if $LCRent > 30>>
//Very High// | [[Decrease|Manage Economy][$LCRent = 30, $rentEffectL = 0.94]]
<<elseif $LCRent > 20>>
@@ -83,7 +83,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<else>>
//Free// | [[Increase|Manage Economy][$LCRent = 10, $rentEffectL = 1.04]]
<</if>>
-<br>Middle Class Citizens | $middleClass | <<print _percMiddleClass>>% | Rent @@.yellowgreen;<<print cashFormat($MCRent)>>@@
+<br>Middle Class Citizens | $middleClass | <<print _percMiddleClass>>% | Rent @@.yellowgreen;<<print cashFormat($MCRent / 25)>>@@
<<if $MCRent > 75>>
//Very High// | [[Decrease|Manage Economy][$MCRent = 75, $rentEffectM = 0.94]]
<<elseif $MCRent > 50>>
@@ -95,7 +95,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<else>>
//Free// | [[Increase|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
<</if>>
-<br>Upper Class Citizens | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent)>>@@
+<br>Upper Class Citizens | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent / 25)>>@@
<<if $UCRent > 270>>
//Very High// | [[Decrease|Manage Economy][$UCRent = 270, $rentEffectU = 0.94]]
<<elseif $UCRent > 180>>
@@ -107,7 +107,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<else>>
//Free// | [[Increase|Manage Economy][$UCRent = 90, $rentEffectU = 1.04]]
<</if>>
-<br>Millionaires | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat($TCRent)>>@@
+<br>Millionaires | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat($TCRent / 25)>>@@
<<if $TCRent > 975>>
//Very High// | [[Decrease|Manage Economy][$TCRent = 975, $rentEffectT = 0.94]]
<<elseif $TCRent > 650>>
@@ -119,7 +119,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<else>>
//Free// | [[Increase|Manage Economy][$TCRent = 325, $rentEffectT = 1.04]]
<</if>>
-<br>Slaves | $ASlaves | <<print _percASlaves>>% /*should probably include player owned slaves of all types*/
+<br>Slaves | $ASlaves | <<print _percASlaves>>%
<<if $secExp == 0>>
<<if $weatherAwareness > 0>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index fbc141b5a20ab8b9190702da77cb9b096e2779ff..2978c7481269e4553e54bc921dbaaff7cd06e8e8 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2532,6 +2532,9 @@ Setting missing global variables:
<<if ndef $customRetirementAge>>
<<set $customRetirementAge = 45>>
<</if>>
+<<if ndef $customMenialRetirementAge>>
+ <<set $customMenialRetirementAge = 65>>
+<</if>>
<<if ndef $retirementCum>>
<<set $retirementCum = 500000>>
<</if>>
@@ -2553,8 +2556,12 @@ Setting missing global variables:
<<if ndef $CitizenRetirement>>
<<set $CitizenRetirement = 0>>
<</if>>
-<<if ndef $CitizenRetirementTrigger>>
-<<set $CitizenRetirementTrigger = 0>>
+<<if ndef $citizenRetirementMenials>>
+ <<set $citizenRetirementMenials = 0>>
+<</if>>
+<<if ndef $citizenRetirementTrigger>>
+ <<set $citizenRetirementTrigger = $CitizenRetirementTrigger || 0>>
+ <<unset $CitizenRetirementTrigger>>
<</if>>
<<if ndef $FSSupLawTrigger>>
<<set $FSSupLawTrigger = 0>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 79f5d2c9d1118e9dca9dc98075a88a7c9110a73b..5ad4908932bd3ed60baadb20710ddd214defa3e1 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -308,7 +308,7 @@ _topClassP = 1>>
<</if>>
/*policies*/
-<<if $CitizenRetirement == 1>>
+<<if $citizenRetirementMenials == 1>>
<<set _slaveDemandU *= 0.8,
_slaveDemandT *= 0.75,
_slaveProductivity += 0.05,
@@ -321,48 +321,6 @@ _topClassP = 1>>
_upperClassP *= 0.98,
_topClass += -5,
_topClassP *= 0.98>>
- <<if $MilkMilestoneRetirement == 1>> /*additional conditional retirement options are each half as strong as base retirement*/
- <<set _slaveDemandU *= 0.9,
- _slaveDemandT *= 0.875,
- _slaveProductivity += 0.025,
- _expirationFS *= 0.9,
- _lowerClass += 100,
- _lowerClassP *= 1.01,
- _middleClass += 40,
- _middleClassP *= 1.01,
- _upperClass += -13.5,
- _upperClassP *= 0.99,
- _topClass += -2.5,
- _topClassP *= 0.99>>
- <</if>>
- <<if $CumMilestoneRetirement == 1>>
- <<set _slaveDemandU *= 0.9,
- _slaveDemandT *= 0.875,
- _slaveProductivity += 0.025,
- _expirationFS *= 0.9,
- _lowerClass += 100,
- _lowerClassP *= 1.01,
- _middleClass += 40,
- _middleClassP *= 1.01,
- _upperClass += -13.5,
- _upperClassP *= 0.99,
- _topClass += -2.5,
- _topClassP *= 0.99>>
- <</if>>
- <<if $BirthsMilestoneRetirement == 1>>
- <<set _slaveDemandU *= 0.9,
- _slaveDemandT *= 0.875,
- _slaveProductivity += 0.025,
- _expirationFS *= 0.9,
- _lowerClass += 100,
- _lowerClassP *= 1.01,
- _middleClass += 40,
- _middleClassP *= 1.01,
- _upperClass += -13.5,
- _upperClassP *= 0.99,
- _topClass += -2.5,
- _topClassP *= 0.99>>
- <</if>>
<</if>>
<<if $ProRefugees == 1>>
<<set _slaveDemandU *= 1.1,
@@ -581,37 +539,27 @@ _topClassP = 1>>
_middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.subsidize + $TGA.subsidize + $TCR.subsidize + $TFS.subsidize + $HA.subsidize) * 0.01>>
/*Slave retirement trigger pulled (one time only)*/
-<<if $CitizenRetirementTrigger == 1>>
- <<if $arcologies[0].FSSupremacistLawME < 1 && $arcologies[0].FSSubjugationistLawME < 1>>
- <<set $lowerClass += Math.trunc(($NPCSlaves + $helots + $fuckdolls + $menialBioreactors) * 0.2)>>
- <<elseif $arcologies[0].FSSubjugationistLawME == 1>>
- <<set $lowerClass += Math.trunc(($NPCSlaves + $helots + $fuckdolls + $menialBioreactors) * 0.15)>>
- <</if>>
- <<set _helotsRetirement = Math.trunc($helots * 0.2),
- $helots = Math.trunc($helots * 0.8),
- _fuckdollsRetirement = Math.trunc($fuckdolls * 0.2),
- $fuckdolls = Math.trunc($fuckdolls * 0.8),
- _menialBioreactorsRetirement = Math.trunc($menialBioreactors * 0.2),
- $menialBioreactors = Math.trunc($menialBioreactors * 0.8),
- _ASlavesRetirement = Math.trunc($NPCSlaves * 0.2),
- $NPCSlaves = Math.trunc($NPCSlaves * 0.8),
- $CitizenRetirementTrigger = 2>>
+<<if $citizenRetirementTrigger == 1>>
+ <<if $customMenialRetirementAge >= 65>>
+ <<set _citizenRetirementImpact = 0.475 - Math.clamp($customMenialRetirementAge / 200, 0.325, 0.475)>>
+ <<else>>
+ <<set _citizenRetirementImpact = 0.9 - Math.clamp($customMenialRetirementAge / 100, 0.2, 0.65)>>
+ <</if>>
+ <<if $arcologies[0].FSSupremacistLawME + $arcologies[0].FSSubjugationistLawME > 0>>
+ <<set _citizenRetirementImpact *= 2 / 3>>
+ <</if>>
+ <<set $lowerClass += Math.trunc(($NPCSlaves + $helots) * (0.05 + _citizenRetirementImpact)),
+ _helotsRetirement = Math.trunc($helots * (0.05 + _citizenRetirementImpact)),
+ $helots = Math.trunc($helots * (0.95 - _citizenRetirementImpact)),
+ _ASlavesRetirement = Math.trunc($NPCSlaves * (0.05 + _citizenRetirementImpact)),
+ $NPCSlaves = Math.trunc($NPCSlaves * (0.95 - _citizenRetirementImpact)),
+ $citizenRetirementTrigger = 2>>
You have enacted citizen retirement, the slaves of eligible age are granted freedom.
<<if _helotsRetirement > 1>>
@@.red;<<print _helotsRetirement>> of your menial slaves@@ were retired.
<<elseif _helotsRetirements > 0>>
@@.red;One of your menial slaves@@ was retired.
<</if>>
- <<if _fuckdollsRetirement > 1>>
- @@.red;<<print _fuckdollsRetirement>> of your fuckdolls@@ were retired.
- <<elseif _fuckdollsRetirements > 0>>
- @@.red;One of your fuckdolls@@ was retired.
- <</if>>
- <<if _menialBioreactorsRetirement > 1>>
- @@.red;<<print _menialBioreactorsRetirement>> of your bioreactors@@ were retired.
- <<elseif _menialBioreactorsRetirements > 0>>
- @@.red;One of your bioreactors@@ was retired.
- <</if>>
<<if _ASlavesRetirement > 1>>
@@.red;<<print _ASlavesRetirement>> slaves@@ in your arcology were given a citizen retirement.
<</if>> /*I could bother with a single slave retirement message, but that's never going to get used*/
@@ -641,8 +589,23 @@ $menialBioreactors -= _expirationBR>>
<</if>>
/*Citizens turning into slaves*/
-<<set _enslaved = Math.trunc($lowerClass * ($welfare * _welfareFS)),
-$lowerClass -= _enslaved>>
+<<if $citizenRetirementMenials == 1>>
+ <<if $customMenialRetirementAge >= 65>>
+ <<set _banishedRatio = 0.475 - Math.clamp($customMenialRetirementAge / 200, 0.325, 0.475)>>
+ <<else>>
+ <<set _banishedRatio = 0.9 - Math.clamp($customMenialRetirementAge / 100, 0.2, 0.65)>>
+ <</if>>
+ <<if $arcologies[0].FSSupremacistLawME + $arcologies[0].FSSubjugationistLawME > 0>>
+ <<set _banishedRatio *= 2 / 3>>
+ <</if>>
+ <<set _banished = Math.trunc(($lowerClass * ($welfare * _welfareFS)) * (0.05 + _banishedRatio)),
+ _enslaved = Math.trunc($lowerClass * ($welfare * _welfareFS)) - _banished,
+ $lowerClass -= _banished>>
+ <br>@@.red;<<print _banished>> citizens were banished@@ from your arcology, they committed enslavable offenses but were too old to be enslaved.
+<<else>>
+ <<set _enslaved = Math.trunc($lowerClass * ($welfare * _welfareFS))>>
+<</if>>
+<<set $lowerClass -= _enslaved>>
/*Bad weather switch*/
<<if $weatherToday.severity > 3>>
@@ -730,9 +693,51 @@ $lowerClass -= _enslaved>>
<<set _honeymoon = 10 * $arcologies[0].honeymoon>>
<</if>>
<<set $visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * ($localEcon / 100))>>
-<br>@@.green;<<print $visitors>> Traders and tourists@@ visited your arcology this week.
+<br>@@.green;<<print $visitors>> traders and tourists@@ visited your arcology this week.
/*slaves*/
+/*Slaves getting retired*/
+<<if $citizenRetirementMenials == 1>>
+ <<set _weeklyRetiredHelots = $helots / (($customMenialRetirementAge - 15) * 52),
+ _weeklyRetiredNPCMenials = $NPCSlaves / (($customMenialRetirementAge - 15) * 52)>> /*This implies a minimum menial age of 15. Even if the player sets minimum ages lower, there's no point having a 3 year old menial slave. 15 seems alright while being nice and round. This also implies ages are distributed evenly, no easy way around that.*/
+ <<if _weeklyRetiredHelots > 1>>
+ <<set _weeklyRetiredHelots = Math.trunc(_weeklyRetiredHelots)>>
+ <<if _weeklyRetiredHelots > 1>>
+ <br>@@.red;<<print _weeklyRetiredHelots>> of your menial slaves@@ retired as free citizens this week.
+ <<else>>
+ <br>@@.red;One of your menial slaves@@ retired as a free citizen this week.
+ <</if>>
+ <<else>>
+ <<set _weeklyRetiredHelots *= 100,
+ _retirementChance = random(1,100)>>
+ <<if _weeklyRetiredHelots > _retirementChance>>
+ <<set _weeklyRetiredHelots = 1>>
+ <br>@@.red;One of your menial slaves@@ retired as a free citizen this week.
+ <<else>>
+ <<set _weeklyRetiredHelots = 0>>
+ <</if>>
+ <</if>>
+ <<if _weeklyRetiredNPCMenials > 1>>
+ <<set _weeklyRetiredNPCMenials = Math.trunc(_weeklyRetiredNPCMenials)>>
+ <<if _weeklyREtiredNPCMenials > 1>>
+ <br>@@.red;<<print _weeklyRetiredNPCMenials>> menial slaves@@ were retired as free citizens by other slave owners in your arcology this week.
+ <<else>>
+ <br>@@.red;One menial slave@@ was retired as a free citizen by another slave owner in your arcology this week.
+ <</if>>
+ <<else>>
+ <<set _weeklyRetiredNPCMenials *= 100,
+ _retirementChance2 = random(1,100)>>
+ <<if _weeklyRetiredNPCMenials > _retirementChance2>>
+ <<set _weeklyRetiredNPCMenials = 1>>
+ <br>@@.red;One menial slave@@ was retired as a free citizen by another slave owner in your arcology this week.
+ <<else>>
+ <<set _weeklyRetiredNPCMenials = 0>>
+ <</if>>
+ <</if>>
+ <<set $helots -= _weeklyRetiredHelots,
+ $NPCSlaves -= _weeklyRetiredNPCMenials,
+ $lowerClass += _weeklyRetiredHelots + _weeklyRetiredNPCMenials>>
+<</if>>
/*Demand for simple labor*/
<<set _LSCD = Math.trunc(($LSCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18)),
/*Demand for owning slaves*/
@@ -810,9 +815,13 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<br>@@.green;One lower class citizen@@ moved to your arcology.
<</if>>
<<elseif $lowerClass > _LCD>>
- <<set _LCEmigration = Math.trunc(($lowerClass - _LCD) * 0.6) + 1,
- _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance),
- $lowerClass -= _LCEmigration,
+ <<set _LCEmigration = Math.trunc(($lowerClass - _LCD) * 0.6) + 1>>
+ <<if $citizenRetirementMenials == 1>>
+ <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance * (0.05 + _banishedRatio))>>
+ <<else>>
+ <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance)>>
+ <</if>>
+ <<set $lowerClass -= _LCEmigration,
_enslaved += _enslavedEmigrants>>
<<if _LCEmigration > 1>>
<br>@@.red;<<print _LCEmigration>> lower class citizens@@ had no work and tried to leave your arcology.
@@ -933,8 +942,12 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass *
<</if>>
<</if>>
<</if>> /*ends _weatherFreeze*/
+<<if $secExp == 1>>
+ <<set $ASlaves = $NPCSlaves + $helots + $fuckdolls + $menialBioreactors + $secHelots + $slavesEmployedManpower>>
+<<else>>
+ <<set $ASlaves = $NPCSlaves + $helots + $fuckdolls + $menialBioreactors>>
+<</if>>
<<set $ACitizens = $lowerClass + $middleClass + $upperClass + $topClass,
-$ASlaves = $NPCSlaves + $helots + $fuckdolls + $menialBioreactors,
_percACitizens = Math.trunc(($ACitizens / ($ACitizens + $ASlaves)) * 1000) / 10,
_percASlaves = Math.trunc(($ASlaves / ($ACitizens + $ASlaves)) * 1000) / 10,
_percLowerClass = Math.trunc(($lowerClass / ($ACitizens + $ASlaves)) * 1000) / 10,
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 8a598e7e5f48d11f7b7f17698b3b7894a94c9a0b..6b455534295ca78ccb0ed0828f1eeadc8713615e 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -314,7 +314,7 @@ The parts of your arcology you own can house a total of $PopCap menial slaves.
<</if>>
The market price of menials is <<print cashFormat(_menialPrice)>>.
<<set _optionsBreak = 0>>
-<<if _bulkMax > 0>>
+<<if _bulkMax > 0 && $cash > _menialPrice>>
[[Buy|Buy Slaves][$helots+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]]
<<if $cash > (menialSlaveCost(10))*10>>
[[(x10)|Buy Slaves][$helots+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]]
@@ -324,7 +324,7 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
<</if>>
<<if $cash > (_menialPrice+1)*2>>
<<set _menialBulkPremium = Math.trunc(1 + Math.clamp($cash/_menialPrice,0,_bulkMax)/400)>>
- [[(max)|Buy Slaves][$helots+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]]
+ [[(max)|Buy Slaves][$helots+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax))*(_menialPrice+_menialBulkPremium)]]
<</if>>
//Bulk transactions may require offering a premium.//
<<set _optionsBreak = 1>>
@@ -380,7 +380,7 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
The market price of standard fuckdolls is <<print cashFormat(_menialPrice*2)>>.
<<set _optionsBreak = 0>>
<<if _bulkMax > 0>>
-<<if $arcologies[0].FSPaternalist == "unset">>
+<<if $arcologies[0].FSPaternalist == "unset" && $cash > _menialPrice*2>>
[[Buy|Buy Slaves][$fuckdolls+=1,$menialSupplyFactor-=1,$cash-=(_menialPrice*2)]]
<<if $cash > (menialSlaveCost(10)*2)*10>>
[[(x10)|Buy Slaves][$fuckdolls+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10)*2)*20]]
@@ -390,14 +390,13 @@ The market price of standard fuckdolls is <<print cashFormat(_menialPrice*2)>>.
<</if>>
<<if $cash > ((_menialPrice+1)*4)>>
<<set _fuckdollBulkPremium = Math.trunc(1 + Math.clamp($cash/(_menialPrice*2),0,_bulkMax)/400)>>
- [[(max)|Buy Slaves][$fuckdolls+=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)*(_menialPrice*2+_fuckdollBulkPremium))]]
+ [[(max)|Buy Slaves][$fuckdolls+=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax))*(_menialPrice*2+_fuckdollBulkPremium)]]
<</if>>
//Bulk transactions may require offering a premium.//
<<set _optionsBreak = 1>>
<</if>>
<</if>>
<<if $fuckdolls >= 1>>
- <br>
<<if _optionsBreak>>|<</if>>
[[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,$cash+=_menialPrice*2]]
<<if $fuckdolls >= 10>>
@@ -421,7 +420,7 @@ The market price of standard fuckdolls is <<print cashFormat(_menialPrice*2)>>.
The market price of standard bioreactors is <<print cashFormat((_menialPrice-100))>>.
<<set _optionsBreak = 0>>
<<if _bulkMax > 0>>
-<<if $arcologies[0].FSPaternalist == "unset">>
+<<if $arcologies[0].FSPaternalist == "unset" && $cash > _menialPrice+100>>
[[Buy|Buy Slaves][$menialBioreactors+=1,$menialSupplyFactor-=1,$cash-=(_menialPrice+100)]]
<<if $cash > (menialSlaveCost(10)-100)*10>>
[[(x10)|Buy Slaves][$menialBioreactors+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10)-100)*10]]
@@ -431,7 +430,7 @@ The market price of standard bioreactors is <<print cashFormat((_menialPrice-100
<</if>>
<<if $cash > (_menialPrice-99)*2>>
<<set _bioreactorBulkPremium = Math.trunc(1+ Math.clamp($cash/(_menialPrice-99),0,_bulkMax)/400)>>
- [[(max)|Buy Slaves][$menialBioreactors+=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)*(_menialPrice-99+_bioreactorBulkPremium))]]
+ [[(max)|Buy Slaves][$menialBioreactors+=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice-99+_bioreactorBulkPremium),0,_bulkMax))*(_menialPrice-99+_bioreactorBulkPremium)]]
<</if>>
//Bulk transactions may require offering a premium.//
<<set _optionsBreak = 1>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index db8b8fe239992d28a6cfd833af8b5f677b4c828e..43e3d91aca89ed16ccbb839f1ee14d856ef7f321 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -101,6 +101,17 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+
<<set _archologyCosts += _mercCosts>>
<</if>>
+<<if $citizenRetirementMenials == 1>>
+ <br>__Menial Slave Retirement Premiums__:
+ <<if $CitizenRetirement == 1>>
+ <<set _citizenRetirementMenialsCost = $helots * 2>>
+ <<else>>
+ <<set _citizenRetirementMenialsCost = ($helots + $slaves.length) * 2>>
+ <</if>>
+ <<set _archologyCosts += _citizenRetirementMenialsCost>>
+ <<print cashFormat(_citizenRetirementMenialsCost)>>
+<</if>>
+
<<if $brothel > 0 || $club > 0 || $arcade > 0 || $dairy > 0 || $farmyard > 0>>
<br>__Archology building maintenance__:
<<if $brothel > 0>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 980424031050eacde33988c265fef2c0156a716f..93033a55186fd6c4153ca1313098136dc69eabc4 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -97,6 +97,7 @@
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$MastSiIDs[_dI]]>>
+ <<setLocalPronouns $slaves[$i]>>
<br><br>
/* 000-250-006 */
<<if $seeImages && $seeReportImages>>
@@ -107,46 +108,46 @@
/* 000-250-006 */
<<if ($slaves[$i].assignment == "be your Concubine")>>
<<set $Concubine = $slaves[_FLs]>>
- ''Your concubine <<= SlaveFullName($Concubine)>> is serving you in $masterSuiteName.'' More than any other slave, her sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
+ ''Your concubine <<= SlaveFullName($Concubine)>> is serving you in $masterSuiteName.'' More than any other slave, $his sexual brilliance and physical appeal are @@.green;critical@@ to your reputation.
<<if ($Concubine.career == "an arcology owner")>>
- She was once your rival, and your relationship is widely thought to be @@.green;the perfect modern romance.@@
+ $He was once your rival, and your relationship is widely thought to be @@.green;the perfect modern romance.@@
<<set $repGain += 250>>
<<elseif ($Concubine.prestige > 0)>>
<<set $repGain += 25*$Concubine.prestige>>
<<if $verboseDescriptions == 1>>
Keeping such a prestigious slave as your concubine @@.green;adds to your fame.@@
<<if $Concubine.prestigeDesc == "She is a famed Free Cities whore, and commands top prices.">>
- When she has a free moment, she refines her flexibility so that she is prepared for any sexual position you can think of, and many more that she researched just for your pleasure.
+ When $he has a free moment, $he refines $his flexibility so that $he is prepared for any sexual position you can think of, and many more that $he researched just for your pleasure.
<</if>>
<<if $Concubine.prestigeDesc == "She is a famed Free Cities slut, and can please anyone.">>
- When she has a free moment, she pretties herself up so that she may be as beautiful as possible to make you look even better.
+ When $he has a free moment, $he pretties $himself up so that $he may be as beautiful as possible to make you look even better.
<</if>>
<<if $Concubine.prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
<<if $Concubine.balls > 10 || $Concubine.prostate > 1>>
- She does her best to prevent herself from making a mess when you don't want one. When she has free time, she researches new techniques to make use of her huge loads to entertain you.
+ $He does $his best to prevent $himself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of $his huge loads to entertain you.
<<elseif $Concubine.balls > 0>>
- When she has a free moment, she researches ways to increase the size of her loads for you; she dreams of the day she show you just what she was capable of.
+ When $he has a free moment, $he researches ways to increase the size of $his loads for you; $he dreams of the day $he show you just what $he was capable of.
<<else>>
- She wishes she could blow huge loads for you, but without balls, there is little she can do.
+ $He wishes $he could blow huge loads for you, but without balls, there is little $he can do.
<</if>>
<</if>>
<<if $Concubine.prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
<<if $Concubine.lactation > 1 || $Concubine.lactationAdaptation > 90>>
- She does her best to prevent herself from making a mess when you don't want one. When she has free time, she researches new techniques to make use of her excessive milk to entertain you.
+ $He does her best to prevent herself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of her excessive milk to entertain you.
<<elseif $Concubine.lactation > 0>>
- She does her best to prevent herself from making a mess when you don't want one. When she has free time, she researches new techniques to make use of her breast milk to entertain you.
+ $He does her best to prevent herself from making a mess when you don't want one. When $he has free time, $he researches new techniques to make use of her breast milk to entertain you.
<<else>>
- She wishes she could lactate for you, but she has dried up since her glory days.
+ $He wishes $he could lactate for you, but $he has dried up since her glory days.
<</if>>
<</if>>
<<if $Concubine.prestigeDesc == "She is remembered for winning best in show as a breeder.">>
<<if $Concubine.bellyPreg >= 5000>>
- When she has a free moment, she refines her flexibility so that she can perform any sexual position possible for her in her motherly state. She takes the time to look up new positions to work around her growing pregnancy.
+ When $he has a free moment, $he refines her flexibility so that $he can perform any sexual position possible for her in her motherly state. $He takes the time to look up new positions to work around her growing pregnancy.
<<elseif isFertile($Concubine) || $Concubine.preg > 0>>
- When she has a free moment, she refines her flexibility so that she is prepared for any sexual position you can think of, no matter how heavy she becomes with children.
+ When $he has a free moment, $he refines her flexibility so that $he is prepared for any sexual position you can think of, no matter how heavy $he becomes with children.
<<else>>
- When she has a free moment, she researches ways to restore her fertility; she dreams of the day she can carry <<if $PC.dick ==1>>your children<<else>>children for you<</if>>.
+ When $he has a free moment, $he researches ways to restore her fertility; $he dreams of the day $he can carry <<if $PC.dick ==1>>your children<<else>>children for you<</if>>.
<</if>>
<</if>>
<</if>>
@@ -236,72 +237,72 @@
<<set _fetishChangeChance = fetishChangeChance($slaves[$i])>>
<<if (_masterSuiteAverageMilk > 2000) && (_fetishChangeChance > random(0,50))>>
<<if $slaves[$i].fetish == "boobs">>
- <<if $verboseDescriptions == 1>>Her<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;boob fetish is strengthened@@ by the constant availability of milky nipples for her to play with.
+ <<if $verboseDescriptions == 1>>$His<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;boob fetish is strengthened@@ by the constant availability of milky nipples for $him to play with.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- She @@.lightcoral;acquires a boob fetish@@ after spending a lot of time in the fuckpit drinking from her fellow fucktoys' tits.
+ <<if $verboseDescriptions == 1>>$He<<else>>$slaves[$i].slaveName<</if>> @@.lightcoral;acquires a boob fetish@@ after spending a lot of time in the fuckpit drinking from $his fellow fucktoys' tits.
<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageDick > 3) && ($slaves[$i].anus > 0) && (_fetishChangeChance > random(0,50))>>
- She
+ $He
<<if $slaves[$i].fetish == "buttslut">>
- @@.lightcoral;sinks farther into anal pleasure,@@ since she spends her time in the fuckpit with at least one of the many available cocks up her butt.
+ @@.lightcoral;sinks farther into anal pleasure,@@ since $he spends $his time in the fuckpit with at least one of the many available cocks up $his butt.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;acquires an anal fetish@@ after helplessly orgasming at the mercy of your many fucktoys eager to shove their big stiff penises up her ass.
+ @@.lightcoral;acquires an anal fetish@@ after helplessly orgasming at the mercy of your many fucktoys eager to shove their big stiff penises up $his ass.
<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageCum > 3) && (_fetishChangeChance > random(0,50))>>
- She
+ $He
<<if $slaves[$i].fetish == "cumslut">>
- @@.lightcoral;sinks farther into cum addiction,@@ since she spends her time in the fuckpit eagerly sucking down ejaculate, straight from the many sources.
+ @@.lightcoral;sinks farther into cum addiction,@@ since $he spends $his time in the fuckpit eagerly sucking down ejaculate, straight from the many sources.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;acquires an oral fixation@@ after orally servicing your many fucktoys eager to blow their loads down her throat.
+ @@.lightcoral;acquires an oral fixation@@ after orally servicing your many fucktoys eager to blow their loads down $his throat.
<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAveragePreg > 10) && (_fetishChangeChance > random(0,50))>>
- She
+ $He
<<if $slaves[$i].fetish == "pregnancy">>
- @@.lightcoral;sinks farther into pregnancy obsession,@@ since she never wants for a pregnant girl to make love to.
+ @@.lightcoral;sinks farther into pregnancy obsession,@@ since $he never wants for a pregnant girl to make love to.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;acquires a pregnancy fetish,@@ since many of her sexual partners in the fuckpit are heavily pregnant.
+ @@.lightcoral;acquires a pregnancy fetish,@@ since many of $his sexual partners in the fuckpit are heavily pregnant.
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageDom < 50) && (_fetishChangeChance > random(0,50))>>
- She
+ $He
<<if $slaves[$i].fetish == "dom">>
- @@.lightcoral;becomes more dominant,@@ since there are so many subs in the fuckpit who beg her to fuck them hard.
+ @@.lightcoral;becomes more dominant,@@ since there are so many subs in the fuckpit who beg $him to fuck them hard.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;becomes sexually dominant@@ after having fun satisfying the many submissive fucktoys in the fuckpit who beg her to top them.
+ @@.lightcoral;becomes sexually dominant@@ after having fun satisfying the many submissive fucktoys in the fuckpit who beg $him to top them.
<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageDom > 50) && (_fetishChangeChance > random(0,50))>>
- She
+ $He
<<if $slaves[$i].fetish == "submissive">>
- @@.lightcoral;becomes even more submissive,@@ since there are so many doms in the fuckpit that she's often used by more than one at once.
+ @@.lightcoral;becomes even more submissive,@@ since there are so many doms in the fuckpit that $he's often used by more than one at once.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;becomes sexually submissive@@ after the many dominant slaves in the fuckpit hold her down and use her for their pleasure.
+ @@.lightcoral;becomes sexually submissive@@ after the many dominant slaves in the fuckpit hold $him down and use $him for their pleasure.
<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageSadism < 50) && (_fetishChangeChance > random(0,50))>>
- She
+ $He
<<if $slaves[$i].fetish == "sadist">>
- @@.lightcoral;becomes more sadistic,@@ since there are so many girls in the fuckpit who will do anything for her if she'll only spank them.
+ @@.lightcoral;becomes more sadistic,@@ since there are so many girls in the fuckpit who will do anything for $him if $he'll only spank them.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;becomes a bit of a sadist@@ after she notices that so many of her fellow fucktoys cum harder if she gives them a good slap.
+ @@.lightcoral;becomes a bit of a sadist@@ after $he notices that so many of $his fellow fucktoys cum harder if $he gives them a good slap.
<<set $slaves[$i].fetish = "sadist", $slaves[$i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageSadism > 50) && (_fetishChangeChance > random(0,50))>>
<<if $slaves[$i].fetish == "masochist">>
- <<if $verboseDescriptions == 1>>Her<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;pain addiction deepens,@@ since the fuckpit is full of ladies happy to fuck her while she screams.
+ <<if $verboseDescriptions == 1>>$His<<else>>$slaves[$i].slaveName's<</if>> @@.lightcoral;pain addiction deepens,@@ since the fuckpit is full of ladies happy to fuck $him while $he screams.
<<set $slaves[$i].fetishStrength += 4>>
<<else>>
- <<if $verboseDescriptions == 1>>She<<else>>$slaves[$i].slaveName<</if>> @@.lightcoral;learns masochism@@ after experiencing many orgasms under the exquisite sexual torture of the sadists in the fuckpit.
+ <<if $verboseDescriptions == 1>>$He<<else>>$slaves[$i].slaveName<</if>> @@.lightcoral;learns masochism@@ after experiencing many orgasms under the exquisite sexual torture of the sadists in the fuckpit.
<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishStrength = 65>>
<</if>>
<</if>>
@@ -311,7 +312,7 @@
<<set $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
<</if>>
<<if $slaves[$i].energy > 40 && $slaves[$i].energy < 95>>
- Being a constant part of the fuckpit orgy @@.green;greatly heightens her libido.@@
+ Being a constant part of the fuckpit orgy @@.green;greatly heightens $his libido.@@
<<set $slaves[$i].energy += 2>>
<</if>>
<<set $slaves[$i].need -= 50>>
@@ -362,7 +363,7 @@
<</if>>
<<if $verboseDescriptions == 1>>
- <br> She <<include "SA please you">>
+ <br> $He <<include "SA please you">>
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
diff --git a/src/uncategorized/minorInjuryResponse.tw b/src/uncategorized/minorInjuryResponse.tw
index 618534dc2123c4ed91a3e222c85542cdad97a872..468303ad918167833ca80fbf7b12b3ee91551f0b 100644
--- a/src/uncategorized/minorInjuryResponse.tw
+++ b/src/uncategorized/minorInjuryResponse.tw
@@ -2,7 +2,7 @@
<<if $arcologies[0].FSDegradationist > 20>>
-She carries on, knowing that in your degradationist arcology, this is accepted behavior.
+$He carries on, knowing that in your degradationist arcology, this is accepted behavior.
<<elseif $arcologies[0].FSPaternalist > 20>>
@@ -16,7 +16,7 @@ She carries on, knowing that in your degradationist arcology, this is accepted b
$slaves[$i].slaveName is used to this sort of thing, and convinces him to pay significant @@.yellowgreen;compensation,@@ since abusing slaves is discouraged here.
<<set $cash += 50>>
<<elseif ($slaves[$i].combatSkill > 0)>>
- $slaves[$i].slaveName can take care of herself, and she successfully forces him to pay significant @@.yellowgreen;compensation,@@ since abusing slaves is discouraged here.
+ $slaves[$i].slaveName can take care of $himself, and $he successfully forces him to pay significant @@.yellowgreen;compensation,@@ since abusing slaves is discouraged here.
<<set $cash += 50>>
<</if>>
@@ -32,7 +32,7 @@ She carries on, knowing that in your degradationist arcology, this is accepted b
$slaves[$i].slaveName is used to this sort of thing, and convinces him to pay minor @@.yellowgreen;compensation.@@
<<set $cash += 10>>
<<elseif ($slaves[$i].combatSkill > 0)>>
- $slaves[$i].slaveName can take care of herself, and she successfully forces him to pay minor @@.yellowgreen;compensation.@@
+ $slaves[$i].slaveName can take care of $himself, and $he successfully forces him to pay minor @@.yellowgreen;compensation.@@
<<set $cash += 10>>
<</if>>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index 7c1a0f34b738d28a5ac96f3d9d33cb647d9ec8db..c05cdc741050493d74d361db326397d63e367a36 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -5,6 +5,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
/* builds a list for each slave and adds the appropriate organs to it */
<<for _i = 0; _i < $slaves.length; _i++>>
<<set $activeSlave = $slaves[_i]>>
+ <<setLocalPronouns $activeSlave>>
<<set _slaveOrgans = {
penis: 0,
testicles: 0,
@@ -137,7 +138,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<else>>
<br><hr>
- @@.red;Could not implant eyes on $activeSlave.slaveName: she is not blind.@@
+ @@.red;Could not implant eyes on $activeSlave.slaveName: $he is not blind.@@
<<set $completedOrgans.push(_slaveOrgans.eyes)>>
<</if>>
<</if>>
@@ -165,7 +166,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<else>>
<br><hr>
- @@.red;Could not implant cochleae on $activeSlave.slaveName: she is not deaf.@@
+ @@.red;Could not implant cochleae on $activeSlave.slaveName: $he is not deaf.@@
<<set $completedOrgans.push(_slaveOrgans.cochleae)>>
<</if>>
<</if>>
@@ -190,7 +191,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<else>>
<br><hr>
- @@.red;Could not implant vocal cords on $activeSlave.slaveName: she is not mute.@@
+ @@.red;Could not implant vocal cords on $activeSlave.slaveName: $he is not mute.@@
<<set $completedOrgans.push(_slaveOrgans.voicebox)>>
<</if>>
<</if>>
@@ -212,7 +213,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<else>>
<br><hr>
- @@.red;Could not implant <<if $activeSlave.dick > 0>>foreskin<<else>>clitoral hood<</if>> on $activeSlave.slaveName: she already has one.@@
+ @@.red;Could not implant <<if $activeSlave.dick > 0>>foreskin<<else>>clitoral hood<</if>> on $activeSlave.slaveName: $he already has one.@@
<<set $completedOrgans.push(_slaveOrgans.foreskin)>>
<</if>>
<</if>>
@@ -230,7 +231,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<else>>
<br><hr>
- @@.red;Could not implant prostate on $activeSlave.slaveName: she already has a prostate.@@
+ @@.red;Could not implant prostate on $activeSlave.slaveName: $he already has a prostate.@@
<<set $completedOrgans.push(_slaveOrgans.prostate)>>
<</if>>
<</if>>
@@ -261,19 +262,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant ovaries on $activeSlave.slaveName: she already has ovaries.@@
+ @@.red;Could not implant ovaries on $activeSlave.slaveName: $he already has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.ovaries)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant ovaries on $activeSlave.slaveName: she lacks a vagina.@@
+ @@.red;Could not implant ovaries on $activeSlave.slaveName: $he lacks a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.ovaries)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant ovaries on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.ovaries)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant ovaries on $activeSlave.slaveName: she has an anal womb.@@
+ @@.red;Could not implant ovaries on $activeSlave.slaveName: $he has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.ovaries)>>
<</if>>
<</if>>
@@ -304,19 +305,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant pig ovaries on $activeSlave.slaveName: she already has ovaries.@@
+ @@.red;Could not implant pig ovaries on $activeSlave.slaveName: $he already has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.pigOvaries)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant pig ovaries on $activeSlave.slaveName: she lacks a vagina.@@
+ @@.red;Could not implant pig ovaries on $activeSlave.slaveName: $he lacks a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.pigOvaries)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant pig ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant pig ovaries on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.pigOvaries)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant pig ovaries on $activeSlave.slaveName: she has an anal womb.@@
+ @@.red;Could not implant pig ovaries on $activeSlave.slaveName: $he has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.pigOvaries)>>
<</if>>
<</if>>
@@ -347,19 +348,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant dog ovaries on $activeSlave.slaveName: she already has ovaries.@@
+ @@.red;Could not implant dog ovaries on $activeSlave.slaveName: $he already has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant dog ovaries on $activeSlave.slaveName: she lacks a vagina.@@
+ @@.red;Could not implant dog ovaries on $activeSlave.slaveName: $he lacks a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant dog ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant dog ovaries on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant dog ovaries on $activeSlave.slaveName: she has an anal womb.@@
+ @@.red;Could not implant dog ovaries on $activeSlave.slaveName: $he has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.canineOvaries)>>
<</if>>
<</if>>
@@ -390,19 +391,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant horse ovaries on $activeSlave.slaveName: she already has ovaries.@@
+ @@.red;Could not implant horse ovaries on $activeSlave.slaveName: $he already has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.horseOvaries)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant horse ovaries on $activeSlave.slaveName: she lacks a vagina.@@
+ @@.red;Could not implant horse ovaries on $activeSlave.slaveName: $he lacks a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.horseOvaries)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant horse ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant horse ovaries on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.horseOvaries)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant horse ovaries on $activeSlave.slaveName: she has an anal womb.@@
+ @@.red;Could not implant horse ovaries on $activeSlave.slaveName: $he has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.horseOvaries)>>
<</if>>
<</if>>
@@ -433,19 +434,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she already has ovaries.@@
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: $he already has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she lacks a vagina.@@
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: $he lacks a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she has an anal womb.@@
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: $he has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
<</if>>
<</if>>
@@ -476,19 +477,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant anal womb on $activeSlave.slaveName: she has ovaries.@@
+ @@.red;Could not implant anal womb on $activeSlave.slaveName: $he has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.mpreg)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant anal womb on $activeSlave.slaveName: she has a vagina.@@
+ @@.red;Could not implant anal womb on $activeSlave.slaveName: $he has a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.mpreg)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant anal womb on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.mpreg)>>
<<elseif $activeSlave.mpreg == 1>>
<br><hr>
- @@.red;Could not implant anal womb on $activeSlave.slaveName: she already has an anal womb.@@
+ @@.red;Could not implant anal womb on $activeSlave.slaveName: $he already has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.mpreg)>>
<</if>>
<</if>>
@@ -519,19 +520,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant pig anal womb on $activeSlave.slaveName: she has ovaries.@@
+ @@.red;Could not implant pig anal womb on $activeSlave.slaveName: $he has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.mpregPig)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant pig anal womb on $activeSlave.slaveName: she has a vagina.@@
+ @@.red;Could not implant pig anal womb on $activeSlave.slaveName: $he has a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.mpregPig)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant pig anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant pig anal womb on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.mpregPig)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant pig anal womb on $activeSlave.slaveName: she already has an anal womb.@@
+ @@.red;Could not implant pig anal womb on $activeSlave.slaveName: $he already has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.mpregPig)>>
<</if>>
<</if>>
@@ -562,19 +563,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant dog anal womb on $activeSlave.slaveName: she has ovaries.@@
+ @@.red;Could not implant dog anal womb on $activeSlave.slaveName: $he has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant dog anal womb on $activeSlave.slaveName: she has a vagina.@@
+ @@.red;Could not implant dog anal womb on $activeSlave.slaveName: $he has a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant dog anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant dog anal womb on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant dog anal womb on $activeSlave.slaveName: she already has an anal womb.@@
+ @@.red;Could not implant dog anal womb on $activeSlave.slaveName: $he already has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCanine)>>
<</if>>
<</if>>
@@ -605,19 +606,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant horse anal womb on $activeSlave.slaveName: she has ovaries.@@
+ @@.red;Could not implant horse anal womb on $activeSlave.slaveName: $he has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.mpregHorse)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant horse anal womb on $activeSlave.slaveName: she has a vagina.@@
+ @@.red;Could not implant horse anal womb on $activeSlave.slaveName: $he has a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.mpregHorse)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant horse anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant horse anal womb on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.mpregHorse)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant horse anal womb on $activeSlave.slaveName: she already has an anal womb.@@
+ @@.red;Could not implant horse anal womb on $activeSlave.slaveName: $he already has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.mpregHorse)>>
<</if>>
<</if>>
@@ -648,19 +649,19 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.ovaries == 1>>
<br><hr>
- @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she has ovaries.@@
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: $he has ovaries.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
<<elseif $activeSlave.vagina < 0>>
<br><hr>
- @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she has a vagina.@@
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: $he has a vagina.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
<<elseif $activeSlave.bellyImplant >= 0>>
<br><hr>
- @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: $he has a fillable abdominal implant.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
<<elseif $activeSlave.mpreg != 0>>
<br><hr>
- @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she already has an anal womb.@@
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: $he already has an anal womb.@@
<<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
<</if>>
<</if>>
@@ -718,7 +719,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<br><hr>
<<include "Surgery Degradation">>
<<else>>
- @@.red;Could not implant penis on $activeSlave.slaveName: she already has a penis.@@
+ @@.red;Could not implant penis on $activeSlave.slaveName: $he already has a penis.@@
<<set $completedOrgans.push(_slaveOrgans.penis)>>
<</if>>
<</if>>
@@ -752,11 +753,11 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
<br><hr>
- @@.red;Could not implant testicles on $activeSlave.slaveName: she lacks a penis.@@
+ @@.red;Could not implant testicles on $activeSlave.slaveName: $he lacks a penis.@@
<<set $completedOrgans.push(_slaveOrgans.testicles)>>
<<else>>
<br><hr>
- @@.red;Could not implant testicles on $activeSlave.slaveName: she already has testicles.@@
+ @@.red;Could not implant testicles on $activeSlave.slaveName: $he already has testicles.@@
<<set $completedOrgans.push(_slaveOrgans.testicles)>>
<</if>>
<</if>>
@@ -787,11 +788,11 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
<br><hr>
- @@.red;Could not implant pig testicles on $activeSlave.slaveName: she lacks a penis.@@
+ @@.red;Could not implant pig testicles on $activeSlave.slaveName: $he lacks a penis.@@
<<set $completedOrgans.push(_slaveOrgans.pigTesticles)>>
<<else>>
<br><hr>
- @@.red;Could not implant pig testicles on $activeSlave.slaveName: she already has testicles.@@
+ @@.red;Could not implant pig testicles on $activeSlave.slaveName: $he already has testicles.@@
<<set $completedOrgans.push(_slaveOrgans.pigTesticles)>>
<</if>>
<</if>>
@@ -823,11 +824,11 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
<br><hr>
- @@.red;Could not implant dog testicles on $activeSlave.slaveName: she lacks a penis.@@
+ @@.red;Could not implant dog testicles on $activeSlave.slaveName: $he lacks a penis.@@
<<set $completedOrgans.push(_slaveOrgans.canineTesticles)>>
<<else>>
<br><hr>
- @@.red;Could not implant dog testicles on $activeSlave.slaveName: she already has testicles.@@
+ @@.red;Could not implant dog testicles on $activeSlave.slaveName: $he already has testicles.@@
<<set $completedOrgans.push(_slaveOrgans.canineTesticles)>>
<</if>>
<</if>>
@@ -858,11 +859,11 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
<br><hr>
- @@.red;Could not implant horse testicles on $activeSlave.slaveName: she lacks a penis.@@
+ @@.red;Could not implant horse testicles on $activeSlave.slaveName: $he lacks a penis.@@
<<set $completedOrgans.push(_slaveOrgans.horseTesticles)>>
<<else>>
<br><hr>
- @@.red;Could not implant horse testicles on $activeSlave.slaveName: she already has testicles.@@
+ @@.red;Could not implant horse testicles on $activeSlave.slaveName: $he already has testicles.@@
<<set $completedOrgans.push(_slaveOrgans.horseTesticles)>>
<</if>>
<</if>>
@@ -893,11 +894,11 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.dick == 0>>
<br><hr>
- @@.red;Could not implant cow testicles on $activeSlave.slaveName: she lacks a penis.@@
+ @@.red;Could not implant cow testicles on $activeSlave.slaveName: $he lacks a penis.@@
<<set $completedOrgans.push(_slaveOrgans.cowTesticles)>>
<<else>>
<br><hr>
- @@.red;Could not implant cow testicles on $activeSlave.slaveName: she already has testicles.@@
+ @@.red;Could not implant cow testicles on $activeSlave.slaveName: $he already has testicles.@@
<<set $completedOrgans.push(_slaveOrgans.cowTesticles)>>
<</if>>
<</if>>
@@ -915,11 +916,11 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<include "Surgery Degradation">>
<<elseif $activeSlave.balls == 0>>
<br><hr>
- @@.red;Could not implant scrotum on $activeSlave.slaveName: she lacks testicles.@@
+ @@.red;Could not implant scrotum on $activeSlave.slaveName: $he lacks testicles.@@
<<set $completedOrgans.push(_slaveOrgans.scrotum)>>
<<else>>
<br><hr>
- @@.red;Could not implant scrotum on $activeSlave.slaveName: she already has a scrotum.@@
+ @@.red;Could not implant scrotum on $activeSlave.slaveName: $he already has a scrotum.@@
<<set $completedOrgans.push(_slaveOrgans.scrotum)>>
<</if>>
<</if>>
@@ -958,7 +959,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $activeSlave.armsTat = 0, $activeSlave.legsTat = 0>>
<<else>>
<br><hr>
- @@.red;Could not install prosthetic limbs on $activeSlave.slaveName: she lacks a prosthetic interface.@@ They have been moved into storage for later installation.
+ @@.red;Could not install prosthetic limbs on $activeSlave.slaveName: $he lacks a prosthetic interface.@@ They have been moved into storage for later installation.
<<set _oldLimbs = {type: 0, armsTat: 0, legsTat: 0}>>
<<switch $limbs[_l].type>>
<<case "simple">>
diff --git a/src/uncategorized/pCollaborationChoice.tw b/src/uncategorized/pCollaborationChoice.tw
index b6d82f684d994ac69024ef3393a512051c8eea14..e8fec3030bb22703b0e4af389d3a7820bacca886 100644
--- a/src/uncategorized/pCollaborationChoice.tw
+++ b/src/uncategorized/pCollaborationChoice.tw
@@ -3,11 +3,14 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "Random Nonindividual Event">>
-Your next communication from the Daughters of Liberty is a request for a live video call. You accept and are surprised to be confronted by $traitor.slaveName's face. She looks very different, without visible modifications of any kind and dressed in utilitarian clothes, but it's her.
+<<setLocalPronouns $traitor>>
+<<run Enunciate($traitor)>>
+
+Your next communication from the Daughters of Liberty is a request for a live video call. You accept and are surprised to be confronted by $traitor.slaveName's face. $He looks very different, without visible modifications of any kind and dressed in utilitarian clothes, but it's $him.
<br><br>
-"Hello, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," she says simply. "It's happening soon. The Daughters asked me to call you to ask you for your help. All they need is the access codes to your security systems. They'll let you live, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, they'll even let you take your money. But the arcology and the slaves, those will have to go free." She hesitates a little. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, I like being free. But I don't want to see you killed. Please, please agree."
+"Hello, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>," $he says simply. "It's happening soon. The Daughters a<<s>>ked me to call you to ask you for your help. All they need i<<s the a<<cc>>e<<ss>> code<<s>> to your <<s>>ecurity <<system<<s. They'll let you live, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, they'll even let you take your money. But the arcology and the slaves, those will have to go free." $He hesitates a little. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, I like being free. But I don't want to see you killed. Please, please agree."
<br><br>
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index 6dffe6e9ce1b84d96afb7b0b3b8a1ee6e8c83047..2db1cd4e90cce7c9fdb7c2392f7e6e641342e756 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -146,22 +146,22 @@ Finally, $his opponent enters as well.
<<set _randomOpponent = random(1,120)>>
<<setNonlocalPronouns $seeDicks>>
<<if _randomOpponent > 100>>
- _HeU is a hulking, musclebound girl with a wasp waist and immense rear. _HeU seems nothing short of excited.
+ _HeU is a hulking, musclebound _girlU with a wasp waist and immense rear. _HeU seems nothing short of excited.
<<set _opponent = 6>>
<<elseif _randomOpponent > 80>>
_HeU is a huge, muscular Amazon filled with confidence.
<<set _opponent = 5>>
<<elseif _randomOpponent > 60>>
- _HeU is a short but muscular shemale, trying to look confident.
+ _HeU is a short but muscular _girlU, trying _hisU best to look confident.
<<set _opponent = 4>>
<<elseif _randomOpponent > 40>>
- _HeU is a tall, thin woman covered in ropy muscle, trying to hide _hisU terror.
+ _HeU is a tall, thin _womanU covered in ropy muscle, trying to hide _hisU terror.
<<set _opponent = 3>>
<<elseif _randomOpponent > 20>>
_HeU is a decent-looking slave, physically fit but obviously scared.
<<set _opponent = 2>>
<<else>>
- _HeU is an average looking slave, so frightened there's urine running down _hisU leg. _HeU must have annoyed _hisU master to earn this.
+ _HeU is an average looking slave, so frightened there's urine running down _hisU leg. _HeU must have really annoyed _hisU master to earn this.
<<set _opponent = 1>>
<</if>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 64e7f41100b188d8dd807f4d4bbd58654ab6887f..5c5cf0cecf75421cea18e599b06c97a354468a63 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -10,7 +10,15 @@
<</if>>
<<set $showEncyclopedia = 1>><<set $encyclopedia = "Future Societies">>
<<if $rep < 0>><<set $rep = 0>><</if>>
-<<set $customRetirementAge = Math.clamp($customRetirementAge, 20, 120)>>
+<<set $customMenialRetirementAge = Math.clamp($customMenialRetirementAge, 20, 120)>>
+<<if $citizenRetirementMenials == 1>>
+ <<set $customRetirementAge = Math.clamp($customRetirementAge, 20, $customMenialRetirementAge)>>
+ <<if $customMenialRetirementAge < 45>>
+ <<set $retirementAge = $customMenialRetirementAge>>
+ <</if>>
+<<else>>
+ <<set $customRetirementAge = Math.clamp($customRetirementAge, 20, 120)>>
+<</if>>
<<if $CustomRetirementAgePolicy == 1>><<set $retirementAge = $customRetirementAge>><</if>>
<<if $PhysicalRetirementAgePolicy == 1>><<set $retirementAge = $customRetirementAge>><</if>>
<<set $retirementSex = Math.clamp($retirementSex, 1, 10000000)>>
@@ -109,6 +117,13 @@
<</if>>
<br><br>__Slave Retirement Planning__
+<<if $citizenRetirementMenials == 1>>
+ <br>''Mandatory Menial Retirement Age:'' you have set your arcology's retirement age for menial slaves at $customMenialRetirementAge.
+ [[Repeal|Policies][$citizenRetirementMenials = 0, $retirementAge = 45]]
+<<else>>
+ <br>''No Menial Retirement Plan:'' without defining a retirement age for menial slaves they will remain slaves until death or freed otherwise.
+<</if>>
+
<<if $CustomRetirementAgePolicy == 1 && $PhysicalRetirementAgePolicy != 1>>
<br>''Redefined Mandatory Retirement Age:'' you have set your arcology's standard retirement age for sex slaves at $retirementAge.
[[Repeal|Policies][$CustomRetirementAgePolicy = 0, $retirementAge = 45]]
@@ -840,6 +855,22 @@
<br><br>__Slave Retirement Planning__
+ <<if $citizenRetirementMenials == 0>>
+ <br>''Redefined Mandatory Menial Retirement Age:'' you will set your arcology's retirement age for menial slaves at age
+ <br> <<textbox "$customMenialRetirementAge" $customMenialRetirementAge "Policies">>
+ <<if $arcologies[0].FSDegradationist == "unset">>
+ <<if $citizenRetirementTrigger == 0>>
+ <br>''Menial Slave Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
+ [[Implement|Policies][$citizenRetirementMenials = 1, $cash -= 5000, $rep -= 1000, $citizenRetirementTrigger = 1]]
+ <br> //Will add upkeep to all menial slaves//
+ <<else>>
+ <br>''Menial Slave Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
+ [[Implement|Policies][$citizenRetirementMenials = 1, $cash -= 5000, $rep -= 1000]]
+ <br> //Will add upkeep to all menial slaves//
+ <</if>>
+ <</if>>
+ <</if>>
+
<<if $CustomRetirementAgePolicy == 0>>
<br>''Redefined Mandatory Retirement Age:'' you will set your arcology's standard retirement age for sex slaves at age
<br> <<textbox "$customRetirementAge" $customRetirementAge "Policies">>
@@ -856,15 +887,9 @@
<<if $ArcadeRetirement == 0>>
<<if $CitizenRetirement == 0>>
<<if $arcologies[0].FSDegradationist == "unset">>
- <<if $CitizenRetirementTrigger == 0>>
- <br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
- [[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000, $CitizenRetirementTrigger = 1]]
- <br> //Will add upkeep to all slaves//
- <<else>>
- <br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
- [[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000]]
- <br> //Will add upkeep to all slaves//
- <</if>>
+ <br>''Sex Slave Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement.
+ [[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000]]
+ <br> //Will add upkeep to all sex slaves//
<</if>>
<<if $arcologies[0].FSPaternalist == "unset">>
<br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves will be placed in cheap public arcades to be used until useless.
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index f6a4fbe9e0af6a4d5c4d3ebb49b4251fae98e9b3..fdd92324974d4dfbe73eb47c1cec7a15618ed1a1 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1185,13 +1185,13 @@ The call comes in from an unusually well-to-do area. It appears that an aristocr
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The call comes in from an unusually well-to-do area. It appears that the aristocratic-looking woman placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of $his creditors by offering $himself into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. $He's well-spoken and seems both educated and intelligent. Even better, despite being middle-aged, $he's extremely well-preserved, a tall, slim and graceful beauty with a face that must be the envy of girls half $his age. $He knows all this $himself, and says, "I hear you appreciate a slender woman; if I'm going down into slavery, <<= properTitle()>>, I'd be happy to avoid too many implants. I understand $arcologies[0].name is a fine place for someone in my situation."
+The call comes in from an unusually well-to-do area. It appears that the aristocratic-looking $woman placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of $his creditors by offering $himself into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. $He's well-spoken and seems both educated and intelligent. Even better, despite being middle-aged, $he's extremely well-preserved, a tall, slim and graceful beauty with a face that must be the envy of girls half $his age. $He knows all this $himself, and says, "I hear you appreciate a slender $woman; if I'm going down into slavery, <<= properTitle()>>, I'd be happy to avoid too many implants. I understand $arcologies[0].name is a fine place for someone in my situation."
<<case "Slimness Enthusiast Two">>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case; the young woman in the video call is reasonably well dressed, so $his newfound situation must be exceedingly recent. Without hesitation $he immediately asks to be enslaved. "My boyfriend wants to turn me into some sort of bimbo," $he says through tears. "I found all the surgery brochures that he hid, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. But", and $he brings $his slender chest, though covered by $his top, into view, "I don't want to be cut up and filled with plastic. One of my friends told me that you care about woman with a good figure, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I should have never sold myself to that bastard."
+This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case; the young $woman in the video call is reasonably well dressed, so $his newfound situation must be exceedingly recent. Without hesitation $he immediately asks to be enslaved. "My boyfriend wants to turn me into some sort of bimbo," $he says through tears. "I found all the surgery brochures that he hid, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. But", and $he brings $his slender chest, though covered by $his top, into view, "I don't want to be cut up and filled with plastic. One of my friends told me that you care about $woman with a good figure, <<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>. I should have never sold myself to that bastard."
<<case "Asset Expansionist">>
@@ -1203,7 +1203,7 @@ The person placing the call is physically quite unusual, to the point of looking
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; perhaps one of the lushest mothers in the curves department you've ever seen. $He explains $himself quickly. "<<= properTitle()>>, I'm not a young woman. Where I'm from, being this old and unmarried means I'm very likely to be enslaved one way or another. But I've always had big breasts. Well, big everything really. I hear life is better if you're a plush slave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your plush slave?"
+The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; perhaps one of the lushest mothers in the curves department you've ever seen. $He explains $himself quickly. "<<= properTitle()>>, I'm not a young $woman. Where I'm from, being this old and unmarried means I'm very likely to be enslaved one way or another. But I've always had big breasts. Well, big everything really. I hear life is better if you're a plush slave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your plush slave?"
<<case "Youth Preferentialist">>
@@ -1221,13 +1221,13 @@ This one, unusually, is voice-only. The caller explains why in a unusually upbea
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The beautiful older woman depicted has included a resume listing $his skills, and a clever selection of photographs: tasteful shots of $him in nice makeup and a fashionable business skirt, and fully nude mirror shots, flaws and all. Curious, you place a video call and get an immediate answer. It seems that 'personal circumstances' that $he saw coming are forcing $him to accept enslavement. $He had some weeks of warning, however, and seems to have made use of the time to find an arcology owner that treats women of $his age well, and then to make $himself as appealing as possible in the hope you'll keep $him.
+And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The beautiful older $woman depicted has included a resume listing $his skills, and a clever selection of photographs: tasteful shots of $him in nice makeup and a fashionable business skirt, and fully nude mirror shots, flaws and all. Curious, you place a video call and get an immediate answer. It seems that 'personal circumstances' that $he saw coming are forcing $him to accept enslavement. $He had some weeks of warning, however, and seems to have made use of the time to find an arcology owner that treats women of $his age well, and then to make $himself as appealing as possible in the hope you'll keep $him.
<<case "Maturity Preferentialist Two">>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The call comes in from a middle-class area. It appears that the youthful man placing the call has a failing business, and is leveraging his last remaining asset by selling his stately-looking mother into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. From the dossier $his son forwarded to you, $he's both educated and intelligent, both relics of $his impressive pedigree. Even better, $he's aged like a fine wine, a short, stacked and attractive beauty with a face and rack that must be the envy of girls half $his age. $He's aware of the situation at hand, and peeks in from the corner of the screen to say, "I hear you appreciate a mature woman; if I'm going down into slavery, <<= properTitle()>>, I hope for your sake that you know how to treat a woman of my caliber."
+The call comes in from a middle-class area. It appears that the youthful man placing the call has a failing business, and is leveraging his last remaining asset by selling his stately-looking mother into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. From the dossier $his son forwarded to you, $he's both educated and intelligent, both relics of $his impressive pedigree. Even better, $he's aged like a fine wine, a short, stacked and attractive beauty with a face and rack that must be the envy of girls half $his age. $He's aware of the situation at hand, and peeks in from the corner of the screen to say, "I hear you appreciate a mature $woman; if I'm going down into slavery, <<= properTitle()>>, I hope for your sake that you know how to treat a $woman of my caliber."
<<case "Physical Idealist">>
@@ -1239,7 +1239,7 @@ The subject line of the latest is badly misspelled, but the accompanying profile
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The muscular woman depicted has included a resume listing $his various physical achievements, and a clever selection of photographs: tantalizing shots of $him in skimpy workout clothes, and fully nude mirror shots of $him flexing and posing. Curious, you place a video call and get an immediate answer. It seems that $he's determined that life as a slave is the easiest means to access the drugs and steroids $he needs to continue making massive gains. $He had some weeks of planning, however, and seems to have made use of the time to find an arcology owner that values the pursuit of the physical ideal, and then to make $himself as appealing as possible in the hope you'll take $him.
+And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The muscular $woman depicted has included a resume listing $his various physical achievements, and a clever selection of photographs: tantalizing shots of $him in skimpy workout clothes, and fully nude mirror shots of $him flexing and posing. Curious, you place a video call and get an immediate answer. It seems that $he's determined that life as a slave is the easiest means to access the drugs and steroids $he needs to continue making massive gains. $He had some weeks of planning, however, and seems to have made use of the time to find an arcology owner that values the pursuit of the physical ideal, and then to make $himself as appealing as possible in the hope you'll take $him.
<<case "Hedonistic Decadence">>
@@ -1265,7 +1265,7 @@ This one is interesting, even by the standards of messages from people who want
You receive so many messages, as a noted titan of the new Free Cities world, that your personal assistant has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, are requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case, the young woman in the video call is reasonably well dressed, if rather upset over something. "I.. can't have children," $he says through building tears. "I've always dreamed of being a mother, but I was born sterile... I heard rumors that $arcologies[0].name had cures for infertility, and if you'd help me, I would love to <<if $PC.title == 1>>have your children<<else>>get pregnant for you<</if>>. Even if the rest of my life was devoted to motherhood... I'd like that..."
+This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case, the young $woman in the video call is reasonably well dressed, if rather upset over something. "I.. can't have children," $he says through building tears. "I've always dreamed of being a mother, but I was born sterile... I heard rumors that $arcologies[0].name had cures for infertility, and if you'd help me, I would love to <<if $PC.title == 1>>have your children<<else>>get pregnant for you<</if>>. Even if the rest of my life was devoted to motherhood... I'd like that..."
<<case "Eugenics">>
@@ -1295,25 +1295,25 @@ It seems that the Chattel Religionists have all but taken over their town and dr
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The call comes in from an old world university. The caller is a young woman who explains that $he's struggling with extreme student debt, and has recently graduated with a history degree that $he can't seem to turn into gainful employment. $He gushes at length about how much $he enjoyed ancient history, and how $he's heard all about your ideas about reviving ancient culture in the Free Cities. $He sees joining your household as a romantic way out of $his difficult situation. Apparently $he read all the idyllic parts of history and somehow missed out on learning about the salt mines and slave galleys. $He's not terribly pretty and seems socially awkward, but that's likely to have its side benefits. $He nervously sends you a complete dossier on $himself.
+The call comes in from an old world university. The caller is a young $woman who explains that $he's struggling with extreme student debt, and has recently graduated with a history degree that $he can't seem to turn into gainful employment. $He gushes at length about how much $he enjoyed ancient history, and how $he's heard all about your ideas about reviving ancient culture in the Free Cities. $He sees joining your household as a romantic way out of $his difficult situation. Apparently $he read all the idyllic parts of history and somehow missed out on learning about the salt mines and slave galleys. $He's not terribly pretty and seems socially awkward, but that's likely to have its side benefits. $He nervously sends you a complete dossier on $himself.
<<case "Aztec Revivalist">>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The call comes in from an old world trading colony. The caller is a woman who humbly explains how tired $he is from all the godless people and terrible conditions, and expresses interest to join the old empires. $He probably knows only of the incredible architecture and the military accomplishments that are advertised in vids. Though the sacrifice and collaring of slaves is no secret, most people never find out the real truth to what you do. Nevertheless $he's incredibly willing, so much so that $he almost signs $himself off to you by accident. $His file is displayed in front if you, pending your reaction.
+The call comes in from an old world trading colony. The caller is a $woman who humbly explains how tired $he is from all the godless people and terrible conditions, and expresses interest to join the old empires. $He probably knows only of the incredible architecture and the military accomplishments that are advertised in vids. Though the sacrifice and collaring of slaves is no secret, most people never find out the real truth to what you do. Nevertheless $he's incredibly willing, so much so that $he almost signs $himself off to you by accident. $His file is displayed in front if you, pending your reaction.
<<case "Edo Revivalist">>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The caller is a young woman who struggles to stop $himself from peppering $his socially awkward babble with poorly pronounced Japanese colloquialisms. Insofar as you can parse $his nonsense, $he seems to have gotten a hilariously romanticized version of feudal Japan from somewhere, and is willing to submit to enslavement in order to join your revivalist arcology. Whoever's out there spreading this rubbish, you owe them one; this serf is in for an extremely rude awakening.
+The caller is a young $woman who struggles to stop $himself from peppering $his socially awkward babble with poorly pronounced Japanese colloquialisms. Insofar as you can parse $his nonsense, $he seems to have gotten a hilariously romanticized version of feudal Japan from somewhere, and is willing to submit to enslavement in order to join your revivalist arcology. Whoever's out there spreading this rubbish, you owe them one; this serf is in for an extremely rude awakening.
<<case "Arabian Revivalist">>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-The call comes in from an old world university. The caller, surprisingly, is a beautiful woman in $his thirties who speaks with a richly lilting accent and a literary vocabulary. "I'm afraid," $he says sadly, "it's come to slavery, for me. I am no longer a girl, but I can make some claim to beauty. I know many stories and can tell them cleverly; I can sing and dance well. I know you are not looking for a Scheherazade, but I could play her part. Nor am I naïve; I know the Sultan enjoyed her body as well as her wit, and I am not unskilled in those respects, either." $He looks you straight in the eye. "May I come into your harem? I will do my best to brighten it."
+The call comes in from an old world university. The caller, surprisingly, is a beautiful $woman in $his thirties who speaks with a richly lilting accent and a literary vocabulary. "I'm afraid," $he says sadly, "it's come to slavery, for me. I am no longer a $girl, but I can make some claim to beauty. I know many stories and can tell them cleverly; I can sing and dance well. I know you are not looking for a Scheherazade, but I could play her part. Nor am I naïve; I know the Sultan enjoyed her body as well as her wit, and I am not unskilled in those respects, either." $He looks you straight in the eye. "May I come into your harem? I will do my best to brighten it."
<<case "Chinese Revivalist">>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 1803976f02728e88bc006dfa330509d423486454..68b78c27d7ff39455fd18cbaed74cf0f2fa2be6d 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -202,8 +202,8 @@ When you return to your desk you realize something.
<</if>>
<br><br>
-Your arcology has gained a citizen.
-<<set $ACitizens += 1>>
+Your arcology has gained a well-off citizen.
+<<set $upperClass += 1>>
<<elseif $BioreactorRetirement == 1>>
@@ -318,6 +318,23 @@ and, a disturbingly short time later, there is a new Fuckdoll, a humanoid figure
You have @@.yellowgreen;gained a fuckdoll.@@
<<set $fuckdolls += 1>>
+<<elseif $citizenRetirementMenials == 1>>
+ <<if $customMenialRetirementAge == $customRetirementAge || $customMenialRetirementAge == $retirementAge>>
+
+ in a way that fills your other slaves with @@.mediumaquamarine;trust@@ after seeing one of their own gain freedom.
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<set $slaves[$i].trust += 2>>
+ <</for>>
+ <<if $activeSlave.relationship > 3>>
+ $slaves[_sr].slaveName, for _his2 part, is @@.hotpink;happy,@@ though also a bit sad. _He2 looks forward to joining $activeSlave.slaveName one day.
+ <<set $slaves[_sr].devotion += 5>>
+ <</if>>
+
+ <br><br>
+ You have @@.yellowgreen;gained a citizen.@@
+ <<set $lowerClass += 1>>
+ <</if>>
+
<<else>>
into a life of menial drudgery. This has little impact on your other human property.