From b9d73adb74659c1437db2a26c103a2fde67a2bf7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 13 May 2017 02:17:57 -0400
Subject: [PATCH] Vanilla stuff.
---
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/init/storyInit.tw | 5 +-
src/interaction/researchLab.tw | 98 ++--
src/pregmod/widgets/pregmodWidgets.tw | 6 -
src/uncategorized/BackwardsCompatibility.tw | 13 +-
src/uncategorized/RESSTR.tw | 2 +-
src/uncategorized/addCustomDescriptors.tw | 66 +--
src/uncategorized/brothel.tw | 7 +
src/uncategorized/brothelReport.tw | 7 +-
src/uncategorized/cellblockReport.tw | 8 +-
src/uncategorized/clinicReport.tw | 2 +-
src/uncategorized/club.tw | 7 +
src/uncategorized/clubReport.tw | 30 +-
src/uncategorized/costsReport.tw | 2 +-
src/uncategorized/dairyReport.tw | 4 +-
src/uncategorized/economics.tw | 3 -
src/uncategorized/exportRule.tw | 2 +-
src/uncategorized/fullReport.tw | 7 -
src/uncategorized/importRule.tw | 74 +--
src/uncategorized/labReport.tw | 23 +-
src/uncategorized/longSlaveDescription.tw | 1 -
src/uncategorized/options.tw | 4 +-
src/uncategorized/pCitizensAndCivilians.tw | 44 +-
src/uncategorized/penthouseReport.tw | 44 ++
src/uncategorized/private.tw | 2 +
src/uncategorized/rulesAssistant.tw | 340 +++++++-------
src/uncategorized/rulesAssistantReport.tw | 11 +
src/uncategorized/saChoosesOwnJob.tw | 157 ++++---
src/uncategorized/saDevotion.tw | 5 +
src/uncategorized/saLongTermEffects.tw | 10 +-
src/uncategorized/saRelationships.tw | 2 +-
src/uncategorized/salon.tw | 12 +
src/uncategorized/servantsQuartersReport.tw | 2 +-
src/uncategorized/slaveAssignmentsReport.tw | 58 +--
src/uncategorized/slaveInteract.tw | 489 ++++++++++----------
src/uncategorized/spaReport.tw | 316 +++++++------
src/utility/descriptionWidgets.tw | 6 +-
src/utility/raWidgets.tw | 44 +-
src/utility/slaveCreationWidgets.tw | 2 +-
39 files changed, 1011 insertions(+), 906 deletions(-)
create mode 100644 src/uncategorized/penthouseReport.tw
create mode 100644 src/uncategorized/rulesAssistantReport.tw
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 21046995ac0..6aa943e91c0 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -913,7 +913,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''CornCobMan'' contributed several major modpacks, which include clothing, hair and eye colors, a facility name and arcology name expansions, UI improvements, nicknames, names, balance, a huge rework of the Rules Assistant, and more. CornCobMan has indefatigably supported the RA updates.
''Klementine'' wrote the fertility goddess skin for the personal assistant.
''Wahn'' wrote numerous generic recruitment events.
-''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, and an expansion to the hostage corruption event chain.
+''Pregmodder'' has modded extensively, including descriptive embellishments for pregnant slaves, various asset descriptions, Master Suite reporting, the Wardrobe, a pack of facility leader interactions, options for Personal Assistant appearances, birthing scenes, fake pregnancy accessories, many other preg mechanics, blind content, expanded chubby belly descriptions, several new surgeries, neon and metallic makeup, better descriptive support for different refreshments, work on choosesOwnJob, many bugfixes, an expansion to the hostage corruption event chain, slave specific player titles, and other, likely forgotten, things.
''Lolimodder'' your loli expertise will be missed.
''pregmodfan'' for tremendous amounts of work with compilers, decompilers, etc. Single-handedly kicked this mod into its new git home. Contributed lots of bugfixes as well as fixed the RA considerably. Also for ppmod, ramod, implmod, cfpmod and psmod (preg speed).
''family mod anon'' for extending extended family mode.
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 771e41e223d..ac352a25972 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1,7 +1,8 @@
:: init [nobr]
-<<set $ver = "0.10.2", $releaseID = 1007>>
-<<if ndef $releaseID>><<set $releaseID = 1007>><</if>>
+<<unset $releaseID>>
+<<set $ver = "0.10.2", $releaseID = 1009>>
+<<if ndef $releaseID>><<set $releaseID = 1009>><</if>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw
index 88706444d7f..9761a555eb2 100644
--- a/src/interaction/researchLab.tw
+++ b/src/interaction/researchLab.tw
@@ -4,19 +4,19 @@
<<case 0>>
- <<set $nextButton to "Back", $nextLink to "Manage Arcology">>
+ <<set $nextButton = "Back", $nextLink = "Manage Arcology">>
//You switch one of the screens in your office to the feed from research facility.//<br><br>
- <br>[[Decommission facility|Manage Arcology][$researchLab.built to "false",$researchLab.hired to 0,$helots += $researchLab.menials,$researchLab.menials to 0,$researchLab.research to "none",$researchLab.manufacture to "none",$researchLab.productionTime to 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.//
+ <br>[[Decommission facility|Manage Arcology][$researchLab.built = "false",$researchLab.hired = 0,$helots += $researchLab.menials,$researchLab.menials = 0,$researchLab.research = "none",$researchLab.manufacture = "none",$researchLab.productionTime = 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.//
- <br><br>[[Purchase cybernetics|Research Lab][$temp to 1]]
+ <br><br>[[Purchase cybernetics|Research Lab][$temp = 1]]
<br><br>
__Personnel__<br><br>
<br>
<<if $researchLab.aiModule == 1>>
- [[Buy and install research module|Research Lab][$cash -= 35000, $researchLab.aiModule to 2]] //This module enables your assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs ¤35000//<br>
+ [[Buy and install research module|Research Lab][$cash -= 35000, $researchLab.aiModule = 2]] //This module enables your assistant to assist staff and direct menials assigned to your research facility, increasing efficiency. It costs ¤35000//<br>
<</if>>
<<if ($researchLab.hired + $researchLab.menials) == 0>>
//Facility is currently unstaffed.//
@@ -41,19 +41,19 @@
Currently, this facility can employ $researchLab.maxSpace people.
<<if $researchLab.maxSpace == 5>>
- [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 10]]
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace = 10]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
<<elseif $researchLab.maxSpace == 10>>
- [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 20]]
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace = 20]]
//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>//
<<elseif $researchLab.maxSpace == 20>>
- [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 30]]
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace = 30]]
//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>//
<<elseif $researchLab.maxSpace == 30>>
- [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 40]]
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace = 40]]
//Costs ¤<<print Math.trunc(20000*$upgradeMultiplierArcology)>>//
<<elseif $researchLab.maxSpace == 40>>
- [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace to 50]]
+ [[Expand facility|Research Lab][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $researchLab.maxSpace = 50]]
//Costs ¤<<print Math.trunc(25000*$upgradeMultiplierArcology)>>//
<<elseif $researchLab.maxSpace == 50>>
//Facility is fully expanded.//
@@ -97,7 +97,7 @@
<<if $researchLab.hired >= 10>>
| [[x10|Research Lab][$researchLab.hired -= 10]]
<</if>>
- | [[All|Research Lab][$researchLab.hired to 0]]
+ | [[All|Research Lab][$researchLab.hired = 0]]
scientists.
<</if>>
<<if $researchLab.menials > 0>><br>
@@ -108,7 +108,7 @@
<<if $researchLab.menials >= 10>>
| [[x10|Research Lab][$researchLab.menials -= 10,$helots += 10]]
<</if>>
- | [[All|Research Lab][$helots += $researchLab.menials,$researchLab.menials to 0]]
+ | [[All|Research Lab][$helots += $researchLab.menials,$researchLab.menials = 0]]
menial slaves.
<</if>>
@@ -117,37 +117,37 @@
<br><br>
<<if $researchLab.research != "none">>
//Your lab staff is currently researching @@.yellow;$researchLab.research@@.//<br>
- [[Cancel Research|Research Lab][$researchLab.productionTime to 0,$researchLab.research to "none"]]
+ [[Cancel Research|Research Lab][$researchLab.productionTime = 0,$researchLab.research = "none"]]
<<elseif $researchLab.manufacture != "none">>
//Your lab staff is currently busy with other projects.//
<<else>>
//No research active.//<br>
<<if $researchLab.basicPLimbInterface == 0 && $stockpile.basicPLimbInterface > 0>><br>
- [[Reverse engineer basic prosthetics interface|Research Lab][$researchLab.productionTime to 80,$researchLab.research to "Basic prosthetics interface"]]
+ [[Reverse engineer basic prosthetics interface|Research Lab][$researchLab.productionTime = 80,$researchLab.research = "Basic prosthetics interface"]]
<</if>>
<<if $researchLab.basicPLimbInterface != 0 && $researchLab.advPLimbInterface == 0 && $stockpile.advPLimbInterface > 0>><br>
- [[Reverse engineer advanced prosthetics interface|Research Lab][$researchLab.productionTime to 120,$researchLab.research to "Advanced prosthetics interface"]]
+ [[Reverse engineer advanced prosthetics interface|Research Lab][$researchLab.productionTime = 120,$researchLab.research = "Advanced prosthetics interface"]]
<</if>>
<<if $researchLab.basicPLimb == 0 && $stockpile.basicPLimb > 0>><br>
- [[Reverse engineer basic prosthetic limbs|Research Lab][$researchLab.productionTime to 80,$researchLab.research to "Basic prosthetic limbs"]]
+ [[Reverse engineer basic prosthetic limbs|Research Lab][$researchLab.productionTime = 80,$researchLab.research = "Basic prosthetic limbs"]]
<</if>>
<<if $researchLab.advSexPLimb == 0 && $stockpile.advSexPLimb > 0>><br>
- [[Reverse engineer advanced sex limbs|Research Lab][$stockpile.advSexPLimb -= 1,$researchLab.productionTime to 100,$researchLab.research to "Advanced sex limbs"]]
+ [[Reverse engineer advanced sex limbs|Research Lab][$stockpile.advSexPLimb -= 1,$researchLab.productionTime = 100,$researchLab.research = "Advanced sex limbs"]]
<</if>>
<<if $researchLab.advGracePLimb == 0 && $stockpile.advGracePLimb > 0>><br>
- [[Reverse engineer advanced beauty limbs|Research Lab][$stockpile.advGracePLimb -= 1,$researchLab.productionTime to 100,$researchLab.research to "Advanced beauty limbs"]]
+ [[Reverse engineer advanced beauty limbs|Research Lab][$stockpile.advGracePLimb -= 1,$researchLab.productionTime = 100,$researchLab.research = "Advanced beauty limbs"]]
<</if>>
<<if $researchLab.advCombatPLimb == 0 && $stockpile.advCombatPLimb > 0>><br>
- [[Reverse engineer advanced combat limbs|Research Lab][$stockpile.advCombatPLimb -= 1,$researchLab.productionTime to 100,$researchLab.research to "Advanced combat limbs"]]
+ [[Reverse engineer advanced combat limbs|Research Lab][$stockpile.advCombatPLimb -= 1,$researchLab.productionTime = 100,$researchLab.research = "Advanced combat limbs"]]
<</if>>
<<if $researchLab.cyberneticPLimb == 0 && $researchLab.advPLimbInterface == 1 && ($researchLab.advGracePLimb + $researchLab.advGracePLimb + $researchLab.advCombatPLimb) >= 1>><br>
- [[Develop cybernetic limbs|Research Lab][$researchLab.productionTime to 300,$researchLab.research to "Cybernetic limbs"]]
+ [[Develop cybernetic limbs|Research Lab][$researchLab.productionTime = 300,$researchLab.research = "Cybernetic limbs"]]
<</if>>
<<if $researchLab.ocularImplant == 0 && $stockpile.ocularImplant > 0>><br>
- [[Reverse engineer ocular implants|Research Lab][$stockpile.ocularImplant -= 1,$researchLab.productionTime to 100,$researchLab.research to "Ocular implants"]]
+ [[Reverse engineer ocular implants|Research Lab][$stockpile.ocularImplant -= 1,$researchLab.productionTime = 100,$researchLab.research = "Ocular implants"]]
<</if>>
<<if $researchLab.erectileImplant == 0 && $stockpile.erectileImplant > 0>><br>
- [[Reverse engineer erectile implant|Research Lab][$stockpile.erectileImplant -= 1,$researchLab.productionTime to 100,$researchLab.research to "Erectile implant"]]
+ [[Reverse engineer erectile implant|Research Lab][$stockpile.erectileImplant -= 1,$researchLab.productionTime = 100,$researchLab.research = "Erectile implant"]]
<</if>>
<</if>>
@@ -158,78 +158,78 @@
//Your lab staff is currently busy with research.//
<<elseif $researchLab.manufacture != "none">>
//Your lab staff is currently building @@.yellow;$researchLab.manufacture@@.//
- [[Cancel Project|Research Lab][$researchLab.productionTime to 0,$researchLab.manufacture to "none"]]
+ [[Cancel Project|Research Lab][$researchLab.productionTime = 0,$researchLab.manufacture = "none"]]
<<else>>
//No projects currently active.//<br>
<<if $researchLab.basicPLimbInterface == 1>><br>
- [[Build basic prosthetics interface|Research Lab][$researchLab.productionTime to 50,$researchLab.manufacture to "Basic prosthetics interface"]] // Currently have: $stockpile.basicPLimbInterface//
+ [[Build basic prosthetics interface|Research Lab][$researchLab.productionTime = 50,$researchLab.manufacture = "Basic prosthetics interface"]] // Currently have: $stockpile.basicPLimbInterface//
<</if>>
<<if $researchLab.advPLimbInterface == 1>><br>
- [[Build advanced prosthetics interface|Research Lab][$researchLab.productionTime to 80,$researchLab.manufacture to "Advanced prosthetics interface"]] // Currently have: $stockpile.advPLimbInterface//
+ [[Build advanced prosthetics interface|Research Lab][$researchLab.productionTime = 80,$researchLab.manufacture = "Advanced prosthetics interface"]] // Currently have: $stockpile.advPLimbInterface//
<</if>>
<<if $researchLab.basicPLimb == 1>><br>
- [[Build basic prosthetic limbs|Research Lab][$researchLab.productionTime to 20,$researchLab.manufacture to "Basic prosthetic limbs"]] // Currently have: $stockpile.basicPLimb//
+ [[Build basic prosthetic limbs|Research Lab][$researchLab.productionTime = 20,$researchLab.manufacture = "Basic prosthetic limbs"]] // Currently have: $stockpile.basicPLimb//
<</if>>
<<if $researchLab.advSexPLimb == 1>><br>
- [[Build advanced sex limbs|Research Lab][$researchLab.productionTime to 100,$researchLab.manufacture to "Advanced sex limbs"]] // Currently have: $stockpile.advSexPLimb//
+ [[Build advanced sex limbs|Research Lab][$researchLab.productionTime = 100,$researchLab.manufacture = "Advanced sex limbs"]] // Currently have: $stockpile.advSexPLimb//
<</if>>
<<if $researchLab.advGracePLimb == 1>><br>
- [[Build advanced beauty limbs|Research Lab][$researchLab.productionTime to 100,$researchLab.manufacture to "Advanced beauty limbs"]] // Currently have: $stockpile.advGracePLimb//
+ [[Build advanced beauty limbs|Research Lab][$researchLab.productionTime = 100,$researchLab.manufacture = "Advanced beauty limbs"]] // Currently have: $stockpile.advGracePLimb//
<</if>>
<<if $researchLab.advCombatPLimb == 1>><br>
- [[Build advanced combat limbs|Research Lab][$researchLab.productionTime to 100,$researchLab.manufacture to "Advanced combat limbs"]] // Currently have: $stockpile.advCombatPLimb//
+ [[Build advanced combat limbs|Research Lab][$researchLab.productionTime = 100,$researchLab.manufacture = "Advanced combat limbs"]] // Currently have: $stockpile.advCombatPLimb//
<</if>>
<<if $researchLab.cyberneticPLimb == 1>><br>
- [[Build cybernetic limbs|Research Lab][$researchLab.productionTime to 150,$researchLab.manufacture to "Cybernetic limbs"]] // Currently have: $stockpile.cyberneticPLimb//
+ [[Build cybernetic limbs|Research Lab][$researchLab.productionTime = 150,$researchLab.manufacture = "Cybernetic limbs"]] // Currently have: $stockpile.cyberneticPLimb//
<</if>>
<<if $researchLab.ocularImplant == 1>><br>
- [[Build ocular implants|Research Lab][$researchLab.productionTime to 80,$researchLab.manufacture to "Ocular implants"]] // Currently have: $stockpile.ocularImplant//
+ [[Build ocular implants|Research Lab][$researchLab.productionTime = 80,$researchLab.manufacture = "Ocular implants"]] // Currently have: $stockpile.ocularImplant//
<</if>>
<<if $researchLab.erectileImplant == 1>><br>
- [[Build Erectile implant|Research Lab][$researchLab.productionTime to 50,$researchLab.manufacture to "Erectile implant"]] // Costs ¤25000. Currently have: $stockpile.erectileImplant//
+ [[Build Erectile implant|Research Lab][$researchLab.productionTime = 50,$researchLab.manufacture = "Erectile implant"]] // Costs ¤25000. Currently have: $stockpile.erectileImplant//
<</if>>
<</if>>
<<case 1>>
- <<set $temp to 0>>
- <<set $nextLink to "Research Lab">>
+ <<set $temp = 0>>
+ <<set $nextLink = "Research Lab">>
//You contact representative of one of the larger cybernetics companies and inquired about their products.<br> This is what they have to offer://<br><br>
__Hardware__<br>
- [[Basic prosthetics interface|Research Lab][$temp to 1, $cash -= 25000, $stockpile.basicPLimbInterface += 1]] //Costs ¤25000. Currently have: $stockpile.basicPLimbInterface//<br>
- [[Advanced prosthetics interface|Research Lab][$temp to 1, $cash -= 60000, $stockpile.advPLimbInterface += 1]] //Costs ¤60000. Currently have: $stockpile.advPLimbInterface//<br>
- [[Basic prosthetic limbs|Research Lab][$temp to 1, $cash -= 15000, $stockpile.basicPLimb += 1]] //Costs ¤15000. Currently have: $stockpile.basicPLimb//<br>
- [[Advanced sex limbs|Research Lab][$temp to 1, $cash -= 30000, $stockpile.advSexPLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advSexPLimb//<br>
- [[Advanced beauty limbs|Research Lab][$temp to 1, $cash -= 30000, $stockpile.advGracePLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advGracePLimb//<br>
- [[Advanced combat limbs|Research Lab][$temp to 1, $cash -= 30000, $stockpile.advCombatPLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advCombatPLimb//<br>
- [[Ocular implants|Research Lab][$temp to 1, $cash -= 35000, $stockpile.ocularImplant += 1]] //Costs ¤35000. Currently have: $stockpile.ocularImplant//<br>
- /*[[Erectile implant|Research Lab][$temp to 1, $cash -= 25000, $stockpile.erectileImplant += 1]] //Costs ¤25000. Currently have: $stockpile.erectileImplant//*/
+ [[Basic prosthetics interface|Research Lab][$temp = 1, $cash -= 25000, $stockpile.basicPLimbInterface += 1]] //Costs ¤25000. Currently have: $stockpile.basicPLimbInterface//<br>
+ [[Advanced prosthetics interface|Research Lab][$temp = 1, $cash -= 60000, $stockpile.advPLimbInterface += 1]] //Costs ¤60000. Currently have: $stockpile.advPLimbInterface//<br>
+ [[Basic prosthetic limbs|Research Lab][$temp = 1, $cash -= 15000, $stockpile.basicPLimb += 1]] //Costs ¤15000. Currently have: $stockpile.basicPLimb//<br>
+ [[Advanced sex limbs|Research Lab][$temp = 1, $cash -= 30000, $stockpile.advSexPLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advSexPLimb//<br>
+ [[Advanced beauty limbs|Research Lab][$temp = 1, $cash -= 30000, $stockpile.advGracePLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advGracePLimb//<br>
+ [[Advanced combat limbs|Research Lab][$temp = 1, $cash -= 30000, $stockpile.advCombatPLimb += 1]] //Costs ¤30000. Currently have: $stockpile.advCombatPLimb//<br>
+ [[Ocular implants|Research Lab][$temp = 1, $cash -= 35000, $stockpile.ocularImplant += 1]] //Costs ¤35000. Currently have: $stockpile.ocularImplant//<br>
+ /*[[Erectile implant|Research Lab][$temp = 1, $cash -= 25000, $stockpile.erectileImplant += 1]] //Costs ¤25000. Currently have: $stockpile.erectileImplant//*/
<br><br>__Schematics__<br>
<<if $researchLab.basicPLimbInterface != 1 && $researchLab.research != "Basic prosthetics interface">>
- [[Basic prosthetics interface|Research Lab][$temp to 1, $cash -= 85000, $researchLab.basicPLimbInterface to 1]] //Costs ¤85000.//<br>
+ [[Basic prosthetics interface|Research Lab][$temp = 1, $cash -= 85000, $researchLab.basicPLimbInterface = 1]] //Costs ¤85000.//<br>
<</if>>
<<if $researchLab.advPLimbInterface != 1 && $researchLab.research != "Advanced prosthetics interface">>
- [[Advanced prosthetics interface|Research Lab][$temp to 1, $cash -= 260000, $researchLab.advPLimbInterface to 1]] //Costs ¤260000.//<br>
+ [[Advanced prosthetics interface|Research Lab][$temp = 1, $cash -= 260000, $researchLab.advPLimbInterface = 1]] //Costs ¤260000.//<br>
<</if>>
<<if $researchLab.basicPLimb != 1 && $researchLab.research != "Basic prosthetic limbs">>
- [[Basic prosthetic limbs|Research Lab][$temp to 1, $cash -= 60000, $researchLab.basicPLimb to 1]] //Costs ¤60000.//<br>
+ [[Basic prosthetic limbs|Research Lab][$temp = 1, $cash -= 60000, $researchLab.basicPLimb = 1]] //Costs ¤60000.//<br>
<</if>>
<<if $researchLab.advSexPLimb != 1 && $researchLab.research != "Advanced sex limbs">>
- [[Advanced sex limbs|Research Lab][$temp to 1, $cash -= 120000, $researchLab.advSexPLimb to 1]] //Costs ¤30000.//<br>
+ [[Advanced sex limbs|Research Lab][$temp = 1, $cash -= 120000, $researchLab.advSexPLimb = 1]] //Costs ¤30000.//<br>
<</if>>
<<if $researchLab.advGracePLimb != 1 && $researchLab.research != "Advanced beauty limbs">>
- [[Advanced beauty limbs|Research Lab][$temp to 1, $cash -= 120000, $researchLab.advGracePLimb to 1]] //Costs ¤30000.//<br>
+ [[Advanced beauty limbs|Research Lab][$temp = 1, $cash -= 120000, $researchLab.advGracePLimb = 1]] //Costs ¤30000.//<br>
<</if>>
<<if $researchLab.advCombatPLimb != 1 && $researchLab.research != "Advanced combat limbs">>
- [[Advanced combat limbs|Research Lab][$temp to 1, $cash -= 120000, $researchLab.advCombatPLimb to 1]] //Costs ¤30000.//<br>
+ [[Advanced combat limbs|Research Lab][$temp = 1, $cash -= 120000, $researchLab.advCombatPLimb = 1]] //Costs ¤30000.//<br>
<</if>>
<<if $researchLab.ocularImplant != 1 && $researchLab.research != "Ocular implants">>
- [[Ocular implants|Research Lab][$temp to 1, $cash -= 160000, $researchLab.ocularImplant to 1]] //Costs ¤35000.//<br>
+ [[Ocular implants|Research Lab][$temp = 1, $cash -= 160000, $researchLab.ocularImplant = 1]] //Costs ¤35000.//<br>
<</if>>
/*<<if $researchLab.erectileImplant != 1 && $researchLab.research != "Erectile implant">>
- [[Erectile implant|Research Lab][$temp to 1, $cash -= 95000, $researchLab.erectileImplant to 1]] //Costs ¤95000.//
+ [[Erectile implant|Research Lab][$temp = 1, $cash -= 95000, $researchLab.erectileImplant = 1]] //Costs ¤95000.//
<</if>>*/
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index ac8e27f4b77..a33a03d7c36 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -130,12 +130,6 @@
<<if ndef $args[0].death>>
<<set $args[0].death = "">>
<</if>>
-<<if ndef $args[0].customTitle>>
- <<set $args[0].customTitle = "">>
-<</if>>
-<<if ndef $args[0].customTitleLisp>>
- <<set $args[0].customTitleLisp = "">>
-<</if>>
<<if ndef $args[0].pubertyXX>>
<<if $args[0].physicalAge >= $args[0].pubertyAgeXX>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 37bfc992cb0..affcba2a9f6 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1297,8 +1297,17 @@ Setting missing slave variables:
<<set _Slave.faceShape to "normal">>
<</if>>
-<<if $releaseID >= 1000>>
-<<else>>
+<<if ndef _Slave.customTitle>>
+ <<set _Slave.customTitle = "">>
+<</if>>
+<<if ndef _Slave.customTitleLisp>>
+ <<set _Slave.customTitleLisp = "">>
+<</if>>
+<<if ndef _Slave.rudeTitle>>
+ <<set _Slave.rudeTitle = 0>>
+<</if>>
+
+<<if $releaseID < 1000>>
<<if _Slave.face == -3>>
<<set _Slave.face = -100>>
<<elseif _Slave.face == -2>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 397bebcd035..75a7457a8c9 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -104,7 +104,7 @@ She saunters over and kneels obediently in front of you, awaiting further direct
<<case "devoted shortstack">>
-<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> comes before you for a routine inspection. The <<if ($activeSlave.height > 130) and ($activeSlave.boobs > 800)>>shortstack<<(elseif $activeSlave.height > 130) and ($activeSlave.boobs < 600)>>petite<<else>>short<</if>><<if $activeSlave.preg > 30>> and heavily pregnant<<elseif $activeSlave.preg > 20>> pregnant<</if>> $desc is looking good despite her diminutive height. When she raises her arms above her head to submit to an inspection under your gaze, the top of her $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and hers, you notice an unmistakable flush of embaressment tinging her cheeks. <<if canSee($activeSlave)>>Her $activeSlave.eyeColor eyes flick up to gaze at you, but she must crane her head upwards as well to meet your gaze.<<else>>Her ears perk up to hear at the sound of some minute noise you made, before she cranes her head upwards so that her sightless eyes may meet your gaze.<</if>>.
+<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> comes before you for a routine inspection. The <<if ($activeSlave.height > 130) and ($activeSlave.boobs > 800)>>shortstack <<(elseif $activeSlave.height > 130) and ($activeSlave.boobs < 600)>>petite <<else>>short <</if>> <<if $activeSlave.preg > 30>>and heavily pregnant <<elseif $activeSlave.preg > 20>>pregnant <</if>>$desc is looking good despite her diminutive height. When she raises her arms above her head to submit to an inspection under your gaze, the top of her $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and hers, you notice an unmistakable flush of embaressment tinging her cheeks. <<if canSee($activeSlave)>>Her $activeSlave.eyeColor eyes flick up to gaze at you, but she must crane her head upwards as well to meet your gaze<<else>>Her ears perk up to hear at the sound of some minute noise you made, before she cranes her head upwards so that her sightless eyes may meet your gaze<</if>>.
<<if canTalk($activeSlave) == false>>
She uses gestures to beg your pardon, even as she continues to blush rosily, and explains that she doesn't understand why you keep her in your penthouse, when there are such tall, beautiful slaves in abundance in your arcology. She pauses, shuffling about a little shamefacedly before signing that she thinks their bodies could be more fit to pleasure you.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index 70280266719..7920c18c531 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -6,39 +6,43 @@
You may enter custom descriptors for your slave's hair color, hair style, tattoos, or anything else here. After typing, press enter to commit your change. These custom descriptors will appear in descriptions of your slave, but will have no gameplay effect. Changing them is free.
<br><br>
-<<if $activeSlave.customTitle != "">>You have instructed her to always refer to you as $activeSlave.customTitle, which, should she lisp, comes out as $activeSlave.customTitleLisp<<else>>You expect her to refer to you as all your other slaves do<</if>>.
-<br>
-<span id="result">
-<<if $activeSlave.customTitle == "">>
- <<link "Set a custom title for her to address you as">>
- <<replace "#result">>
- Custom title: <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
- <<link "Apply">>
- <<replace "#result">>
- She'll try her best to call you $activeSlave.customTitle.
- <<set $activeSlave.customTitleLisp = $activeSlave.customTitle, $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("ss", "th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("S", "Th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("s", "th")>>
- <</replace>>
- <</link>>
- <</replace>>
- <</link>>
-<<else>>
- She's trying her best to call you <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
+<<if $activeSlave.devotion >= -50>>
+ <<if $activeSlave.customTitle != "">>You have instructed her to always refer to you as $activeSlave.customTitle, which, should she lisp, comes out as $activeSlave.customTitleLisp<<else>>You expect her to refer to you as all your other slaves do<</if>>.
<br>
- <<link "Apply">>
- <<replace "#result">>
- She'll try her best to call you $activeSlave.customTitle.
- <<set $activeSlave.customTitleLisp = $activeSlave.customTitle, $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("ss", "th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("S", "Th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("s", "th")>>
- <</replace>>
- <</link>> |
- <<link "Stop using a custom title">>
- <<replace "#result">>
- She won't refer to you as anything special.
- <<set $activeSlave.customTitle = "">>
- <<set $activeSlave.customTitleLisp = "">>
- <</replace>>
- <</link>>
+ <span id="result">
+ <<if $activeSlave.customTitle == "">>
+ <<link "Set a custom title for her to address you as">>
+ <<replace "#result">>
+ Custom title: <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
+ <<link "Apply">>
+ <<replace "#result">>
+ She'll try her best to call you $activeSlave.customTitle.
+ <<set $activeSlave.customTitleLisp = $activeSlave.customTitle, $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("ss", "th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("S", "Th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("s", "th")>>
+ <</replace>>
+ <</link>>
+ <</replace>>
+ <</link>>
+ <<else>>
+ She's trying her best to call you <<textbox "$activeSlave.customTitle" $activeSlave.customTitle>>
+ <br>
+ <<link "Apply">>
+ <<replace "#result">>
+ She'll try her best to call you $activeSlave.customTitle.
+ <<set $activeSlave.customTitleLisp = $activeSlave.customTitle, $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("ss", "th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("S", "Th"), $activeSlave.customTitleLisp = $activeSlave.customTitleLisp.replace("s", "th")>>
+ <</replace>>
+ <</link>> |
+ <<link "Stop using a custom title">>
+ <<replace "#result">>
+ She will no longer refer to you with a special title.
+ <<set $activeSlave.customTitle = "">>
+ <<set $activeSlave.customTitleLisp = "">>
+ <</replace>>
+ <</link>>
+ <</if>>
+ </span>
+<<else>>
+ //You must break her will further before she will refer to you by a new title.<<if SlaveStatsChecker.checkForLisp($activeSlave)>><<if def $activeSlave.customTitleLisp && $activeSlave.customTitleLisp != "">> For now, she intends to keep calling you "<<print $activeSlave.customTitleLisp>>".<</if>><<else>><<if def $activeSlave.customTitle && $activeSlave.customTitle != "">> For now, she intends to keep calling you "<<print $activeSlave.customTitle>>".<</if>><</if>>//
<</if>>
-</span>
<br><br>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 796b004aacc..ac031d01bee 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -155,6 +155,13 @@ $brothelNameCaps
It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
+<br>
+<<if (def $brothelUpgradePreventatives) && $brothelUpgradePreventatives == 1>>
+ The whores are supplied with drugs that protect them from most of the physical dangers of their work. [[Don't give them preventatives|Brothel][$brothelUpgradePreventatives = 0]] //Will reduce upkeep costs//
+<<else>>
+ The whores could be supplied with drugs to protect them from most of the physical dangers of their work. [[Give them preventatives|Brothel][$brothelUpgradePreventatives = 1]] //Will increase upkeep costs//
+<</if>>
+
<br>$brothelNameCaps is
<<if $brothelAdsSpending > 0>>
the subject of an active ad campaign.
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 4367a2044b4..5826ca16ec9 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -207,7 +207,7 @@
<br> Since she doesn't have enough whores to manage to keep her busy, she sees $beauty customers herself (<<print Math.trunc($beauty/7)>> a day), earning you @@.yellowgreen;¤_seed@@. She can charge more for her time, since many citizens find it erotic to fuck the Madam.
<</if>>
<</if>>
- <<if ($brothelSlaves > 0)>><br><</if>>
+ <<if ($brothelSlaves > 0)>><br><br><</if>>
<</if>>
<<if ($brothelSlaves > 0)>>
@@ -275,7 +275,10 @@
<<if ($legendaryWhoreID == 0) && ($slaves[_i].whoreSkill >= 100) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
<<set $legendaryWhoreID = $slaves[_i].ID>>
<</if>>
- <<set $slaves[_i].health += _healthBonus, $slaves[_i].aphrodisiacs = _aphrod>>
+
+ /* Perform facility based rule changes */
+ <<set $slaves[_i].health += _healthBonus, $slaves[_i].aphrodisiacs = _aphrod, $slaves[_i].curatives = ($slaves[_i].curatives == 2) ? 2 : Number($brothelUpgradePreventatives)>>
+
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index ab9e2877eaf..37318f56976 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -157,7 +157,7 @@
<<set _seed = random(1,10)+(($cellblock-$cellblockSlaves)*(random(150,170)+(_idleBonus*10))), $cash += _seed>>
<br> Since she doesn't have enough prisoners to manage to keep her busy, she works on citizens' slaves, earning @@.yellowgreen;¤_seed.@@
<</if>>
- <<if ($cellblockSlaves)>><br><</if>>
+ <<if ($cellblockSlaves)>><br><br><</if>>
<</if>>
<<if ($cellblockSlaves > 0)>>
@@ -175,7 +175,7 @@
<</if>>
/* 000-250-006 */
''__@@.pink;$slaves[$i].slaveName@@__'' is serving as the Wardeness in $cellblockName.
- <br>
+ <br>
<<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
<<if ($slaves[$i].devotion <= 20)>>
@@ -299,7 +299,7 @@
/* 000-250-006 */
''__@@.pink;$slaves[$i].slaveName@@__'' is confined in $cellblockName.
<br> She <<include "SA stay confined">>
- <br>
+ <br>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -319,7 +319,7 @@
<</if>>
<</for>>
<<if (_softenedQuirks) || (_brokenSlaves)>>
- <br><br>
+ <br><br>
<</if>>
<<if (_softenedQuirks > 0)>>
$cellblockNameCaps's advanced compliance systems successfully softened
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index f17cd647c90..7f7516b7ca7 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -211,7 +211,7 @@
<<set _seed = random(1,10)+(($clinic-$clinicSlaves)*(random(150,170)+(_idleBonus*10))), $cash += _seed>>
<br> Since she doesn't have enough girls to occupy all her time, the clinic takes in citizens' slaves on a contract basis and she helps them too, earning @@.yellowgreen;¤_seed.@@
<</if>>
- <<if ($clinicSlaves > 0)>><br><</if>>
+ <<if ($clinicSlaves > 0)>><br><br><</if>>
<</if>>
<<if ($clinicSlaves > 0)>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 694e248050e..6ecd6a65772 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -204,6 +204,13 @@ $clubNameCaps
The rooms are standard. [[Upgrade them with PDAs to help your recruiter|Club][$cash -= _Tmult1, $clubUpgradePDAs = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
+<br>
+<<if (def $clubUpgradePreventatives) && $clubUpgradePreventatives == 1>>
+ The club sluts are supplied with drugs that protect them from most of the physical dangers of their work. [[Don't give them preventatives|Club][$clubUpgradePreventatives = 0]] //Will reduce upkeep costs//
+<<else>>
+ The club sluts could be supplied with drugs to protect them from most of the physical dangers of their work. [[Give them preventatives|Club][$clubUpgradePreventatives = 1]] //Will increase upkeep costs//
+<</if>>
+
<br>
<<if $clubAdsSpending > 0>>
$clubNameCaps is the subject of an active ad campaign.
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 158c06cd55f..11339676d51 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -106,7 +106,7 @@
<br> Since she doesn't have enough sluts in $clubName to make it worthwhile for her to be on stage 24/7, she spends her extra time slutting it up herself. She has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
<</if>>
<</if>>
- <<if ($clubSlaves > 0)>><br><</if>>
+ <<if ($clubSlaves > 0)>><br><br><</if>>
<</if>>
<<if ($clubSlaves > 0)>>
@@ -179,32 +179,40 @@
<<set $ClubiIDs.deleteAt(_dI), _dI--, _DL-->>
<<continue>>
<</if>>
- <<set $i = _i>>
+
<<if ($legendaryEntertainerID == 0) && ($slaves[_i].prestige == 0) && ($slaves[_i].entertainSkill >= 100) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
<<set $legendaryEntertainerID = $slaves[_i].ID>>
<</if>>
<<if ($legendaryWombID == 0) && ($slaves[_i].amp != 1) && ($slaves[_i].preg > 30) && ($slaves[_i].pregType < 50) && ($slaves[_i].eggType == "human") && ($slaves[_i].births > 10) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
- <<set $legendaryWombID = $slaves[_i].ID>>
+ <<set $legendaryWombID = $slaves[_i].ID>>
<</if>>
<<if ($slaves[_i].devotion <= 20) && ($slaves[_i].trust > -20)>>
- <<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
+ <<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
<<elseif ($slaves[_i].devotion < 45)>>
- <<set $slaves[_i].devotion += 4>>
+ <<set $slaves[_i].devotion += 4>>
<<elseif ($slaves[_i].devotion >= 50)>>
- <<set $slaves[_i].devotion -= 4>>
+ <<set $slaves[_i].devotion -= 4>>
<</if>>
+
<<if ($slaves[_i].trust < 30)>>
- <<set $slaves[_i].trust += 5>>
+ <<set $slaves[_i].trust += 5>>
<</if>>
+
<<if ($slaves[_i].health < -80)>>
- <<set $slaves[_i].health += 20>>
+ <<set $slaves[_i].health += 20>>
<<elseif ($slaves[_i].health < -40)>>
- <<set $slaves[_i].health += 15>>
+ <<set $slaves[_i].health += 15>>
<<elseif ($slaves[_i].health < 0)>>
- <<set $slaves[_i].health += 10>>
+ <<set $slaves[_i].health += 10>>
<<elseif ($slaves[_i].health < 90)>>
- <<set $slaves[_i].health += 7>>
+ <<set $slaves[_i].health += 7>>
<</if>>
+
+ /* Perform facility based rule changes */
+ <<set $slaves[_i].curatives = ($slaves[_i].curatives == 2) ? 2 : Number($clubUpgradePreventatives)>>
+
+ <<set $i = _i>>
+
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index bc473bec4cb..e5f24f4b74b 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -72,7 +72,7 @@
<<if ($researchLab.built == "true")>>
<br>__Research Lab__ maintenance: ¤<<print (100*$researchLab.maxSpace)>>
<<if $researchLab.hired != 0>> __Scientists__: ¤<<print (300*$researchLab.hired)>><</if>>
- <<if $researchLab.menials != 0>> __Menial slaves__: ¤<<print (100*$researchLab.hired)>><</if>>
+ <<if $researchLab.menials != 0>> __Menial slaves__: ¤<<print (100*$researchLab.menials)>><</if>>
<</if>>
<</if>>
<<if $FSSpending != 0>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 822ce38b7ac..32eb2e204b3 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -225,13 +225,13 @@
<<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
<</for>>
- <br>
+ <br><br>
<</if>>
<</if>>
<<set _Tadd = ($bioreactorsXY + $bioreactorsXX + $bioreactorsHerm + $bioreactorsBarren)>>
<<if ($dairySlaves + _Tadd > 0)>>
- <<if ($dairySlaves != 1)>>''There are $dairySlaves cows in $dairyName.''<<else>>''There is 1 cow in $dairyName.''<</if>>
+ <<if ($dairySlaves != 1)>>''There are $dairySlaves cows in $dairyName.''<<else>>''There is one cow in $dairyName.''<</if>>
<<if ($dairyRestraintsSetting > 1)>>
It functions as an industrial slave products factory.
<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index af0d4b0c83e..8ad768d1aa2 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -22,8 +22,6 @@
<<include "Personal Business">>
-<br><br>
-
<<if $corpAnnounced == 1>>
<br>
<<if $corpIncorporated == 0>>
@@ -46,7 +44,6 @@
<<include "Personal Notes">>
<</if>>
-<br><br>
<<if $FSAnnounced > 0>>
<br><br>
<<include "FS Developments">>
diff --git a/src/uncategorized/exportRule.tw b/src/uncategorized/exportRule.tw
index 49c5435f918..026d303d82d 100644
--- a/src/uncategorized/exportRule.tw
+++ b/src/uncategorized/exportRule.tw
@@ -11,7 +11,7 @@
name: "$currentRule.name",
condition: "<<print unparseExpr($currentRule.condition)>>",
-releaseRules: "$currentRule.releaseRules", clitSetting: "$currentRule.clitSetting", clitSettingXY: $currentRule.clitSettingXY, clitSettingXX: $currentRule.clitSettingXX, clitSettingEnergy: $currentRule.clitSettingEnergy, speechRules: "$currentRule.speechRules", clothes: "$currentRule.clothes", collar: "$currentRule.collar", shoes: "$currentRule.shoes", virginAccessory: "$currentRule.virginAccessory", aVirginAccessory: "$currentRule.aVirginAccessory", vaginalAccessory: "$currentRule.vaginalAccessory", dickAccessory: "$currentRule.dickAccessory", aVirginDickAccessory: "$currentRule.aVirginDickAccessory", bellyAccessory: "$currentRule.bellyAccessory", aVirginButtplug: "$currentRule.aVirginButtplug", buttplug: "$currentRule.buttplug", eyeColor: "$currentRule.eyeColor", makeup: "$currentRule.makeup", nails: "$currentRule.nails", hColor: "$currentRule.hColor", hLength: "$currentRule.hLength", hStyle: "$currentRule.hStyle", pubicHColor: "$currentRule.pubicHColor", pubicHStyle: "$currentRule.pubicHStyle", nipplesPiercing: "$currentRule.nipplesPiercing", areolaePiercing: "$currentRule.areolaePiercing", clitPiercing: "$currentRule.clitPiercing", vaginaLube: "$currentRule.vaginaLube", vaginaPiercing: "$currentRule.vaginaPiercing", dickPiercing: "$currentRule.dickPiercing", anusPiercing: "$currentRule.anusPiercing", lipsPiercing: "$currentRule.lipsPiercing", tonguePiercing: "$currentRule.tonguePiercing", earPiercing: "$currentRule.earPiercing", nosePiercing: "$currentRule.nosePiercing", eyebrowPiercing: "$currentRule.eyebrowPiercing", navelPiercing: "$currentRule.navelPiercing", corsetPiercing: "$currentRule.corsetPiercing", boobsTat: "$currentRule.boobsTat", buttTat: "$currentRule.buttTat", vaginaTat: "$currentRule.vaginaTat", dickTat: "$currentRule.dickTat", lipsTat: "$currentRule.lipsTat", anusTat: "$currentRule.anusTat", shouldersTat: "$currentRule.shouldersTat", armsTat: "$currentRule.armsTat", legsTat: "$currentRule.legsTat", backTat: "backTat", stampTat: "$currentRule.stampTat", curatives: $currentRule.curatives, livingRules: "$currentRule.livingRules", relationshipRules: "$currentRule.relationshipRules", standardPunishment: "situational", standardReward: "situational", diet: "$currentRule.diet", dietCum: "$currentRule.dietCum", dietMilk: "$currentRule.dietMilk", muscles: "$currentRule.muscles", XY: "$currentRule.XY", XX: "$currentRule.XX", gelding: "$currentRule.gelding", preg: "$currentRule.preg", growth: "$currentRule.growth", aphrodisiacs: $currentRule.aphrodisiacs, autoSurgery: $currentRule.autoSurgery, autoBrand: $currentRule.autoBrand, pornFameSpending: "$currentRule.pornFameSpending", dietGrowthSupport: $currentRule.dietGrowthSupport, eyewear: "$currentRule.eyewear",
+releaseRules: "$currentRule.releaseRules", clitSetting: "$currentRule.clitSetting", clitSettingXY: "$currentRule.clitSettingXY", clitSettingXX: "$currentRule.clitSettingXX", clitSettingEnergy: "$currentRule.clitSettingEnergy", speechRules: "$currentRule.speechRules", clothes: "$currentRule.clothes", collar: "$currentRule.collar", shoes: "$currentRule.shoes", virginAccessory: "$currentRule.virginAccessory", aVirginAccessory: "$currentRule.aVirginAccessory", vaginalAccessory: "$currentRule.vaginalAccessory", dickAccessory: "$currentRule.dickAccessory", aVirginDickAccessory: "$currentRule.aVirginDickAccessory", bellyAccessory: "$currentRule.bellyAccessory", aVirginButtplug: "$currentRule.aVirginButtplug", buttplug: "$currentRule.buttplug", eyeColor: "$currentRule.eyeColor", makeup: "$currentRule.makeup", nails: "$currentRule.nails", hColor: "$currentRule.hColor", hLength: "$currentRule.hLength", hStyle: "$currentRule.hStyle", pubicHColor: "$currentRule.pubicHColor", pubicHStyle: "$currentRule.pubicHStyle", nipplesPiercing: "$currentRule.nipplesPiercing", areolaePiercing: "$currentRule.areolaePiercing", clitPiercing: "$currentRule.clitPiercing", vaginaLube: "$currentRule.vaginaLube", vaginaPiercing: "$currentRule.vaginaPiercing", dickPiercing: "$currentRule.dickPiercing", anusPiercing: "$currentRule.anusPiercing", lipsPiercing: "$currentRule.lipsPiercing", tonguePiercing: "$currentRule.tonguePiercing", earPiercing: "$currentRule.earPiercing", nosePiercing: "$currentRule.nosePiercing", eyebrowPiercing: "$currentRule.eyebrowPiercing", navelPiercing: "$currentRule.navelPiercing", corsetPiercing: "$currentRule.corsetPiercing", boobsTat: "$currentRule.boobsTat", buttTat: "$currentRule.buttTat", vaginaTat: "$currentRule.vaginaTat", dickTat: "$currentRule.dickTat", lipsTat: "$currentRule.lipsTat", anusTat: "$currentRule.anusTat", shouldersTat: "$currentRule.shouldersTat", armsTat: "$currentRule.armsTat", legsTat: "$currentRule.legsTat", backTat: "backTat", stampTat: "$currentRule.stampTat", curatives: "$currentRule.curatives", livingRules: "$currentRule.livingRules", relationshipRules: "$currentRule.relationshipRules", standardPunishment: "situational", standardReward: "situational", diet: "$currentRule.diet", dietCum: "$currentRule.dietCum", dietMilk: "$currentRule.dietMilk", muscles: "$currentRule.muscles", XY: "$currentRule.XY", XX: "$currentRule.XX", gelding: "$currentRule.gelding", preg: "$currentRule.preg", growth: "$currentRule.growth", aphrodisiacs: "$currentRule.aphrodisiacs", autoSurgery: $currentRule.autoSurgery, autoBrand: $currentRule.autoBrand, pornFameSpending: "$currentRule.pornFameSpending", dietGrowthSupport: $currentRule.dietGrowthSupport, eyewear: "$currentRule.eyewear",
/* pregmod exclusive variables */
underarmHColor: "$currentRule.underArmHColor", underArmHStyle: "$currentRule.underarmHStyle",
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index a8310b7d27d..10ceeebb7a6 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -10,13 +10,6 @@
<<SlavePronouns $slaves[$i]>>
-''__@@.pink;$slaves[$i].slaveName@@__''
-
-<<if $slaves[$i].choosesOwnAssignment == 1>>
- <<include "SA chooses own job">>
- She
-<</if>>
-
<<switch $slaves[$i].assignment>>
<<case "rest">>
<<include "SA rest">>
diff --git a/src/uncategorized/importRule.tw b/src/uncategorized/importRule.tw
index 6ed96f8249e..eb34a980f4a 100644
--- a/src/uncategorized/importRule.tw
+++ b/src/uncategorized/importRule.tw
@@ -3,45 +3,63 @@
<<set $nextButton = "Continue", $nextLink = "Rules Assistant">>
//Paste the code into the text box and click Apply//
+
<br><br>
-<span id = "import">
+<span id = "importmsg">
+ ''Enter a rule to import.''
+</span>
+
+<br><br>
+<span id = "textbox">
+ <<set _tempRule = "">>
+ <<textbox "_tempRule" _tempRule>>
</span>
-<<set $tempRule = "">>
-<<textbox "$tempRule" $tempRule>>
<<link "Apply">>
- <<if (def $tempRule) && ($tempRule !== "")>>
- <<set $tempRule = eval('({' + $tempRule + '})')>>
- <<set $tempRule.condition = optimizeExpr(parseCondition($tempRule.condition).expr)>>
-
- <<set $defaultRules.push($tempRule)>>
-
- /* renumber rule IDs and update slaves' assigned rule IDs if needed */
- <<for $r = 0; $r < $defaultRules.length; $r++>>
- <<set $defaultRules[$r].ID = $r + 1>>
- <</for>>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<silently>>
- <<CheckAutoRulesActivate $slaves[_i]>>
- <</silently>>
- <</for>>
-
- <<replace #import>>
- ''Rule imported successfully!''
- <br><br>
- <</replace>>
+ <<if (def _tempRule) && (_tempRule !== "")>>
+ <<set _tempRule = eval('({' + _tempRule + '})')>>
+ <<if (def _tempRule.condition) && (ndef _tempRule.condition.id) && (ndef _tempRule.condition.first) && (ndef _tempRule.condition.second)>>
+ <<set _tempRule.condition = parseCondition(_tempRule.condition)>>
+ <<if _tempRule.condition != null && _tempRule.condition.expr != null>>
+ <<set _tempRule.condition = optimizeExpr(_tempRule.condition.expr)>>
+ <<else>>
+ <<unset _tempRule.condition>>
+ <</if>>
+ <</if>>
+
+ <<if (def _tempRule.condition)>>
+ /* pick an ID higher than the highest ID of any existing rule */
+ <<for _tempRule.ID = 0, _r = 0; _r < $defaultRules.length; _r++>>
+ <<set _tempRule.ID = Math.max(_tempRule.ID, $defaultRules[_r].ID + 1)>>
+ <</for>>
+
+ <<set $defaultRules.push(_tempRule)>> /* add the new rule to the end of the list (lowest priority) */
+
+ <<set $currentRule = _tempRule>> /* view new rule when returning to RA; clear input box */
+
+ <<replace #importmsg>>
+ ''Rule imported successfully!''
+ <</replace>>
+ <<replace #textbox>>
+ <<set _tempRule = "">>
+ <<textbox "_tempRule" _tempRule>>
+ <</replace>>
+ <<else>>
+ <<replace #importmsg>>
+ ''Parsing failed. Rule not imported!''
+ <</replace>>
+ <</if>>
<<else>>
- <<replace #import>>
- ''Rule not imported!''
- <br><br>
+ <<replace #importmsg>>
+ ''Enter a rule to import.''
<</replace>>
<</if>>
- <<unset $tempRule>>
+ <<unset _tempRule>>
<</link>>
<br><br>
-<<link "Continue">>
+<<link "Back to Rules Assistant">>
<<goto "Rules Assistant">>
<</link>>
diff --git a/src/uncategorized/labReport.tw b/src/uncategorized/labReport.tw
index 41470d95063..009a3ecb798 100644
--- a/src/uncategorized/labReport.tw
+++ b/src/uncategorized/labReport.tw
@@ -4,30 +4,28 @@
<br>
<<if ($researchLab.hired + $researchLab.menials) != 0>>
<<if $researchLab.research == "none" && $researchLab.manufacture == "none">>
- Since lab is currently not working on any projects they take contract work and earn you @@.yellowgreen;¤<<print (($researchLab.hired * 3 + $researchLab.menials) * $researchLab.aiModule * 20)>>.@@
+ Since the lab is currently not working on any projects it takes contract work and earns you @@.yellowgreen;¤<<print (($researchLab.hired * 3 + $researchLab.menials) * $researchLab.aiModule * 20)>>.@@
<<set $cash += (($researchLab.hired * 3 + $researchLab.menials) * $researchLab.aiModule * 20)>>
<<elseif $researchLab.research != "none">>
<<set $researchLab.productionTime -= (($researchLab.hired * 3) + ($researchLab.menials) * ($researchLab.aiModule))>>
<<if $researchLab.productionTime <= 0>>
Your lab staff have @@.green;completed@@ their project.
<<if $researchLab.research == "Basic prosthetics interface">>
- <<set $researchLab.basicPLimbInterface to 1>>
+ <<set $researchLab.basicPLimbInterface = 1>>
<<elseif $researchLab.research == "Advanced prosthetics interface">>
- <<set $researchLab.advPLimbInterface to 1>>
+ <<set $researchLab.advPLimbInterface = 1>>
<<elseif $researchLab.research == "Basic prosthetic limbs">>
- <<set $researchLab.basicPLimb to 1>>
+ <<set $researchLab.basicPLimb = 1>>
<<elseif $researchLab.research == "Advanced sex limbs">>
- <<set $researchLab.advSexPLimb to 1>>
+ <<set $researchLab.advSexPLimb = 1>>
<<elseif $researchLab.research == "Advanced beauty limbs">>
- <<set $researchLab.advGracePLimb to 1>>
+ <<set $researchLab.advGracePLimb = 1>>
<<elseif $researchLab.research == "Advanced combat limbs">>
- <<set $researchLab.advCombatPLimb to 1>>
+ <<set $researchLab.advCombatPLimb = 1>>
<<elseif $researchLab.research == "Cybernetic limbs">>
- <<set $researchLab.cyberneticPLimb to 1>>
+ <<set $researchLab.cyberneticPLimb = 1>>
<<elseif $researchLab.research == "Ocular implants">>
- <<set $researchLab.ocularImplant to 1>>
- /*<<elseif $researchLab.research == "Erectile implant">>
- <<set $researchLab.erectileImplant to 1>>*/
+ <<set $researchLab.ocularImplant = 1>>
<</if>>
<<set $researchLab.productionTime to 0, $researchLab.research to "none">>
<<else>>
@@ -54,8 +52,7 @@
<<elseif $researchLab.manufacture == "Ocular implants">>
<<set $stockpile.ocularImplant += 1>>
<</if>>
- <<set $researchLab.productionTime to 0>>
- <<set $researchLab.manufacture = "none">>
+ <<set $researchLab.productionTime to 0, $researchLab.manufacture = "none">>
<<else>>
Your lab staff are currently working on @@.yellow;$researchLab.manufacture@@.
<</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index f9d98118479..2aa1015af79 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -14,7 +14,6 @@
-<<PMODinit $activeSlave>>
<<if $activeSlave.pregSource > 0>>
<<set _daddy = "partner">>
<<for _i = 0; _i < $slaves.length; _i++>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 71df631f743..cb095b211d5 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -183,9 +183,9 @@ Assignment performance vignettes on the end week report are
Economic Tabs on weekly reports are
<<if $useTabs == 0>>
-@@.red;DISABLED@@. [[Enable|Intro Summary][$useTabs = 1]]
+@@.red;DISABLED@@. [[Enable|Options][$useTabs = 1]]
<<else>>
-@@.cyan;ENABLED@@. [[Disable|Intro Summary][$useTabs = 0]]
+@@.cyan;ENABLED@@. [[Disable|Options][$useTabs = 0]]
<</if>>
<br>
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index d6f420a0a8e..607c9ac11bf 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -1,8 +1,6 @@
-:: P citizens and civilians
+:: P citizens and civilians [nobr]
-<<set $nextButton = " ", $nextLink = "Random Nonindividual Event">>
-
-<<nobr>>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
<<if $assistant > 0>>
While working at your desk, you are accompanied by the luscious sound of $assistantName humming to herself, which she does to indicate she's working on a difficult task. After this goes on for a while,
@@ -43,21 +41,21 @@
and says, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I have a suggestion. At your request I have been reviewing historical slave societies for parallels with our current situation. I calculate it would be very advantageous to bind your mercenaries more closely to the arcology. It would be expensive, but if they were all given slaves, better weapons, and some sort of title, they would defend this place to the death."<<else>><<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> catches your attention as you work at your desk. It says, "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, a suggestion. Review of historical slave societies for parallels with your current situation is complete. Analysis indicates it would be advantageous to increase the loyalty of your mercenaries. It would be expensive, but if they were given slaves, better weapons, and an honorary title, they would defend the arcology with increased effectiveness."
<</if>>
-<</nobr>>
+<br><br>
''This is a unique and very important opportunity'' and must not be taken lightly. //All of these choices have the same gameplay effect, and only differ in theme.//
+<br><br>
+
<span id="result">
<<link "Decline">>
<<replace "#result">>
The suggestion is absurd; no historical lessons are necessary for a world where drones and supercomputers rule the day. Your mercenaries will doubtless perform well enough as mercenaries.
- <<set $nextButton = "Continue">>
<</replace>>
<</link>>
-<<link "They shall be my Knights">>
+<br><<link "They shall be my Knights">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knight-Captain reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -65,10 +63,9 @@
<</replace>>
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<<if $arcologies[0].FSRomanRevivalist >= 10>>
-<<link "They shall be my Evocati">>
+<br><<link "They shall be my Evocati">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Centurion reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Evocati - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a Roman standard. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -77,10 +74,9 @@
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSEgyptianRevivalist >= 10>>
-<<link "They shall be my Medjay">>
+<br><<link "They shall be my Medjay">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "First Medjay reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Medjay - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a faux cheetah cloak. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -89,10 +85,9 @@
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSEdoRevivalist >= 10>>
-<<link "Naturally, they shall be the Samurai">>
+<br><<link "Naturally, they shall be the Samurai">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Your Samurai-Lord reports for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Samurai - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons, exterior plates styled after lacquered Samurai armor, and an enraged mask covering the face. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -101,10 +96,9 @@
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSArabianRevivalist >= 10>>
-<<link "They shall be my Janissaries">>
+<br><<link "They shall be my Janissaries">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Corbaci reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Janissaries - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and cloaked in an outer garment of fine oriental silks. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -113,10 +107,9 @@
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionist >= 10>>
-<<link "They shall be the Knights Templar">>
+<br><<link "They shall be the Knights Templar">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Inquisitor-General reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights Templar - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and bearing a cloak emblazoned with the symbol of God. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -125,10 +118,9 @@
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSDegradationist >= 10>>
-<<link "They shall be my Immortals">>
+<br><<link "They shall be my Immortals">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Satrap reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Immortals - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and more than one wicked, curved blade. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -149,10 +141,9 @@
<<if $arcologies[0].FSRestart >= 10>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist >= 10>>
-<<link "They shall be the Asgardians">>
+<br><<link "They shall be the Asgardians">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Foehammer reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Asgardians - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, a private gym, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -161,10 +152,9 @@
<</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
<</if>>
<<if $arcologies[0].FSSupremacist >= 10>>
-<<link "They shall be the Knights of the Blood">>
+<br><<link "They shall be the Knights of the Blood">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Knights of the Blood reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Knights of the Blood - are well looked after. They are each assigned a nice apartment, three freshly enslaved servants of inferior races, and a suit of prototype armor equipped with the latest weapons. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -175,10 +165,9 @@
<<if $arcologies[0].FSSubjugationist >= 10>>
<</if>>
<<if $arcologies[0].FSPaternalist >= 10>>
-<<link "They shall be the Wardens">>
+<br><<link "They shall be the Wardens">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a redesigned contract between you. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if $PC.title isnot 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "First Warden reporting for duty, <<if $PC.title isnot 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Wardens - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons and a collapsible riot shield. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
@@ -191,10 +180,9 @@
<<if $arcologies[0].FSSlimnessEnthusiast >= 10>>
<</if>>
<<if $arcologies[0].FSPastoralist >= 10>>
-<<link "They shall be the Rangers">>
+<br><<link "They shall be the Rangers">>
<<replace "#result">>
You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>," he says, "you have no idea how fun this is going to be." He rises and gives you a short bow. "Lead Ranger reporting for duty, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>." The mercenaries - no, the Rangers - are well looked after. They are each assigned a nice apartment, a freshly enslaved servant, and a suit of prototype armor equipped with the latest weapons - and an improbably massive revolver on the hip. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@
- <<set $nextButton = "Continue">>
<<set $rep += 1000>>
<<set $cash -= 20000>>
<<set $mercenaries = 5>>
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
new file mode 100644
index 00000000000..c35d34b8784
--- /dev/null
+++ b/src/uncategorized/penthouseReport.tw
@@ -0,0 +1,44 @@
+:: Penthouse Report [nobr]
+
+<<set _SL = $slaves.length>>
+
+<<for $i = 0; $i < _SL; $i++>>
+ <<if $slaves[$i].choosesOwnAssignment == 1>>
+ ''__@@.pink;$slaves[$i].slaveName@@__''
+ <<include "SA chooses own job">> /* this calls <<SlavePronouns $slaves[$i]>> so we can use $pronounCap below */
+ <<if $slaves[$i].assignmentVisible == 0>><br><br><</if>>
+ <</if>>
+ <<if $slaves[$i].assignmentVisible == 1>>
+ <<if $slaves[$i].choosesOwnAssignment == 1>>
+ $pronounCap
+ <<else>>
+ ''__@@.pink;$slaves[$i].slaveName@@__''
+ <</if>>
+ <<include "Full Report">>
+ <br><br>
+ <<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteSlaves > 0)>>
+ <<set _iTemp = $i, $i = $HGSuiteiIDs[0].Index, _ID = $HGSuiteiIDs[0].ID>>
+ <<if $i >= _SL || _ID != $slaves[$i].ID>>
+ /% Slaves.ID and $HGSuiteiIDs.ID's don't match-up so let's find her %/
+ <<for $i = 0; $i < _SL; $i++>>
+ <<if _ID == $slaves[$i].ID>>
+ /% Correct the Index %/
+ <<set $HGSuiteiIDs[0].Index = $i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if $i < _SL && $slaves[$i].assignment != "live with your Head Girl">>
+ <br>@@.red;$slaves[$i].slaveName had been assigned to live with your Head Girl, but this week she was assigned to $slaves[$i].assignment. She has been released to your penthouse for reassignment.@@
+ <<removeJob $slaves[$i] "live with your head girl">>
+ <<else>>
+ <<set $HGRelease = 1>>
+ <<include "SA live with HG">>
+ <br><br>
+ <</if>>
+ /% Onward bound as normal %/
+ <<set $i = _iTemp>>
+ <</if>>
+ <</if>> /* closes assignmentVisible == 1 */
+<</for>>
+
diff --git a/src/uncategorized/private.tw b/src/uncategorized/private.tw
index 0990d3cff41..ebe061613b7 100644
--- a/src/uncategorized/private.tw
+++ b/src/uncategorized/private.tw
@@ -2,6 +2,8 @@
<<set $nextButton = "Back", $nextLink = "Main">>
+<<UpdateOwnership>>
+
This is a privately-owned
<<switch $sectors[$AS].type>>
<<case "Shops">>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index d92772cd01c..c682cb273b4 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -370,8 +370,17 @@ Clothes:
<<else>>
''$currentRule.clothes.''
<</if>>
+|
</span>
-<br>(Good clothes)<br>
+
+<<link "Select her own outfit">>
+ <<set $currentRule.clothes = "choosing her own clothes">>
+ <<RAChangeClothes>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>>
+
+<br> //Nice://
<<link "No default clothes setting">>
<<set $currentRule.clothes = "no default setting">>
<<RAChangeClothes>>
@@ -379,29 +388,29 @@ Clothes:
<<RAChangeApply>>
<</link>>
|
-<<link "Nice lingerie">>
- <<set $currentRule.clothes = "attractive lingerie">>
+<<link "Bangles">>
+ <<set $currentRule.clothes = "slutty jewelry">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "String bikini">>
- <<set $currentRule.clothes = "a string bikini">>
+<<link "Bodysuit">>
+ <<set $currentRule.clothes = "a comfortable bodysuit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Clubslut netting">>
- <<set $currentRule.clothes = "clubslut netting">>
+<<link "Cheerleader outfit">>
+ <<set $currentRule.clothes = "a cheerleader outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Cheerleader outfit">>
- <<set $currentRule.clothes = "a cheerleader outfit">>
+<<link "Clubslut netting">>
+ <<set $currentRule.clothes = "clubslut netting">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -414,159 +423,159 @@ Clothes:
<<RAChangeApply>>
<</link>>
|
-<<link "Slave gown">>
- <<set $currentRule.clothes = "a slave gown">>
+<<link "Fallen nun">>
+ <<set $currentRule.clothes = "a fallen nuns habit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Ball gown">>
- <<set $currentRule.clothes = "a ball gown">>
+<<link "Halter top">>
+ <<set $currentRule.clothes = "a halter top dress">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Halter top">>
- <<set $currentRule.clothes = "a halter top dress">>
+<<link "Hijab and abaya">>
+ <<set $currentRule.clothes = "a hijab and abaya">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Mini dress">>
- <<set $currentRule.clothes = "a mini dress">>
+<<link "Latex catsuit">>
+ <<set $currentRule.clothes = "a latex catsuit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Slutty suit">>
- <<set $currentRule.clothes = "slutty business attire">>
+<<link "Leotard">>
+ <<set $currentRule.clothes = "a leotard">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Nice suit">>
- <<set $currentRule.clothes = "nice business attire">>
+<<link "Maid (nice)">>
+ <<set $currentRule.clothes = "a nice maid outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Slutty nurse">>
- <<set $currentRule.clothes = "a slutty nurse outfit">>
+<<link "Maid (slutty)">>
+ <<set $currentRule.clothes = "a slutty maid outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Nice nurse">>
- <<set $currentRule.clothes = "a nice nurse outfit">>
+<<link "Military uniform">>
+ <<set $currentRule.clothes = "a military uniform">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Schoolgirl">>
- <<set $currentRule.clothes = "a schoolgirl outfit">>
+<<link "Mini dress">>
+ <<set $currentRule.clothes = "a mini dress">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Bodysuit">>
- <<set $currentRule.clothes = "a comfortable bodysuit">>
+<<link "Nice lingerie">>
+ <<set $currentRule.clothes = "attractive lingerie">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Latex catsuit">>
- <<set $currentRule.clothes = "a latex catsuit">>
+<<link "Nurse (nice)">>
+ <<set $currentRule.clothes = "a nice nurse outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Leotard">>
- <<set $currentRule.clothes = "a leotard">>
+<<link "Nurse (slutty)">>
+ <<set $currentRule.clothes = "a slutty nurse outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Military uniform">>
- <<set $currentRule.clothes = "a military uniform">>
+<<link "Schoolgirl">>
+ <<set $currentRule.clothes = "a schoolgirl outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Skimpy battledress">>
- <<set $currentRule.clothes = "battledress">>
+<<link "Silken ballgown">>
+ <<set $currentRule.clothes = "a ball gown">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Slutty maid">>
- <<set $currentRule.clothes = "a slutty maid outfit">>
+<<link "Skimpy battledress">>
+ <<set $currentRule.clothes = "battledress">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Nice maid">>
- <<set $currentRule.clothes = "a nice maid outfit">>
+<<link "Slave gown">>
+ <<set $currentRule.clothes = "a slave gown">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Fallen nun">>
- <<set $currentRule.clothes = "a fallen nuns habit">>
+<<link "String bikini">>
+ <<set $currentRule.clothes = "a string bikini">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Hijab and abaya">>
- <<set $currentRule.clothes = "a hijab and abaya">>
+<<link "Succubus costume">>
+ <<set $currentRule.clothes = "a succubus outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Bangles">>
- <<set $currentRule.clothes = "slutty jewelry">>
+<<link "Suit (nice)">>
+ <<set $currentRule.clothes = "nice business attire">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Succubus costume">>
- <<set $currentRule.clothes = "a succubus outfit">>
+<<link "Suit (slutty)">>
+ <<set $currentRule.clothes = "slutty business attire">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
+<<if ($arcologies[0].FSPhysicalIdealist != "unset") || ($cheatMode == 1) || ($clothesBoughtOil == 1)>>
//FS//
-<<link "Bunny outfit">>
- <<set $currentRule.clothes = "a bunny outfit">>
+<<link "Body oil">>
+ <<set $currentRule.clothes = "body oil">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>> |
<</if>>
-<<if ($arcologies[0].FSPaternalist != "unset") || ($cheatMode == 1) || ($clothesBoughtConservative == 1)>>
+<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
//FS//
-<<link "Conservative clothing">>
- <<set $currentRule.clothes = "conservative clothing">>
+<<link "Bunny outfit">>
+ <<set $currentRule.clothes = "a bunny outfit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -581,24 +590,6 @@ Clothes:
<<RAChangeApply>>
<</link>> |
<</if>>
-<<if ($arcologies[0].FSPastoralist != "unset") || ($cheatMode == 1) || ($clothesBoughtWestern == 1)>>
- //FS//
-<<link "Western clothing">>
- <<set $currentRule.clothes = "Western clothing">>
- <<RAChangeClothes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>> |
-<</if>>
-<<if ($arcologies[0].FSPhysicalIdealist != "unset") || ($cheatMode == 1) || ($clothesBoughtOil == 1)>>
- //FS//
-<<link "Body oil">>
- <<set $currentRule.clothes = "body oil">>
- <<RAChangeClothes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>> |
-<</if>>
<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>>
//FS//
<<link "Chattel habit">>
@@ -608,24 +599,16 @@ Clothes:
<<RAChangeApply>>
<</link>> |
<</if>>
-<<if ($arcologies[0].FSRomanRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtToga == 1)>>
+<<if ($arcologies[0].FSPaternalist != "unset") || ($cheatMode == 1) || ($clothesBoughtConservative == 1)>>
//FS//
-<<link "Toga">>
- <<set $currentRule.clothes = "a toga">>
+<<link "Conservative clothing">>
+ <<set $currentRule.clothes = "conservative clothing">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>> |
<</if>>
-<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
- //FS//
-<<link "Kimono">>
- <<set $currentRule.clothes = "a kimono">>
- <<RAChangeClothes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>> |
-<<elseif ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>>
+<<if ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>>
//FS//
<<link "Harem gauze">>
<<set $currentRule.clothes = "harem gauze">>
@@ -634,10 +617,10 @@ Clothes:
<<RAChangeApply>>
<</link>> |
<</if>>
-<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>>
+<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
//FS//
-<<link "Qipao">>
- <<set $currentRule.clothes = "a slutty qipao">>
+<<link "Kimono">>
+ <<set $currentRule.clothes = "a kimono">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -650,7 +633,7 @@ Clothes:
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
-<</link>> |
+<</link>> |
<</if>>
<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityLingerie == 1)>>
//FS//
@@ -661,13 +644,35 @@ Clothes:
<<RAChangeApply>>
<</link>> |
<</if>>
-<<link "Select her own outfit">>
- <<set $currentRule.clothes = "choosing her own clothes">>
+<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>>
+ //FS//
+<<link "Slutty qipao">>
+ <<set $currentRule.clothes = "a slutty qipao">>
+ <<RAChangeClothes>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>> |
+<</if>>
+<<if ($arcologies[0].FSRomanRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtToga == 1)>>
+ //FS//
+<<link "Toga">>
+ <<set $currentRule.clothes = "a toga">>
+ <<RAChangeClothes>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
+<</link>> |
+<</if>>
+<<if ($arcologies[0].FSPastoralist != "unset") || ($cheatMode == 1) || ($clothesBoughtWestern == 1)>>
+ //FS//
+<<link "Western clothing">>
+ <<set $currentRule.clothes = "Western clothing">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-<br>(Bad clothes)<br>
+<</if>>
+
+<br> //Harsh://
<<link "Nude">>
<<set $currentRule.clothes = "no clothing">>
<<RAChangeClothes>>
@@ -675,34 +680,35 @@ Clothes:
<<RAChangeApply>>
<</link>>
|
-<<link "Uncomfortable straps">>
- <<set $currentRule.clothes = "uncomfortable straps">>
+<<link "Penitent nun">>
+ <<set $currentRule.clothes = "a penitent nuns habit">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Shibari ropes">>
- <<set $currentRule.clothes = "shibari ropes">>
+<<link "Restrictive latex">>
+ <<set $currentRule.clothes = "restrictive latex">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Restrictive latex">>
- <<set $currentRule.clothes = "restrictive latex">>
+<<link "Shibari ropes">>
+ <<set $currentRule.clothes = "shibari ropes">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Penitent nun">>
- <<set $currentRule.clothes = "a penitent nuns habit">>
+<<link "Uncomfortable straps">>
+ <<set $currentRule.clothes = "uncomfortable straps">>
<<RAChangeClothes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
+
<br>
<span id = "collar">
Collar: ''$currentRule.collar.''
@@ -720,119 +726,122 @@ Collar: ''$currentRule.collar.''
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-|
-<<link "Steel">>
- <<set $currentRule.collar = "tight steel">>
+
+<br> //Nice://
+<<link "Stylish leather">>
+ <<set $currentRule.collar = "stylish leather">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<if $seeAge != 0>>
-<<link "Cruel retirement">>
- <<set $currentRule.collar = "cruel retirement counter">>
+<<link "Satin choker">>
+ <<set $currentRule.collar = "satin choker">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<</if>>
-<<link "Harsh leather">>
- <<set $currentRule.collar = "uncomfortable leather">>
+<<link "Heavy Gold">>
+ <<set $currentRule.collar = "heavy gold">>
<<RAChangeCollar>>
- <<RAChangeSave>>
- <<RAChangeApply>>
<</link>>
|
-<<if $activeSlave.preg > -1>>
-<<link "Pregnancy biometrics">>
- <<set $currentRule.collar = "preg biometrics">>
+<<link "Pretty jewelry">>
+ <<set $currentRule.collar = "pretty jewelry">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-<</if>>
|
-<<link "Shock">>
- <<set $currentRule.collar = "shock punishment">>
+<<if $seeAge != 0>>
+<<link "Nice retirement counter">>
+ <<set $currentRule.collar = "nice retirement counter">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Dildo gag">>
- <<set $currentRule.collar = "dildo gag">>
+<</if>>
+<<link "Cowbell">>
+ <<set $currentRule.collar = "leather with cowbell">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-|
-<<link "Neck corset">>
- <<set $currentRule.collar = "neck corset">>
+<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
+ | //FS//
+<<link "Bowtie collar">>
+ <<set $currentRule.collar = "bowtie">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-|
-<<link "Nice leather">>
- <<set $currentRule.collar = "stylish leather">>
+<</if>>
+<<if ($arcologies[0].FSEgyptianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtEgypt == 1)>>
+ | //FS//
+<<link "Ancient Egyptian">>
+ <<set $currentRule.collar = "ancient Egyptian">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-|
-<<link "Satin choker">>
- <<set $currentRule.collar = "satin choker">>
+<</if>>
+
+<br> //Harsh://
+<<link "Tight steel">>
+ <<set $currentRule.collar = "tight steel">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Gold">>
- <<set $currentRule.collar = "heavy gold">>
+<<if $seeAge != 0>>
+<<link "Cruel retirement counter">>
+ <<set $currentRule.collar = "cruel retirement counter">>
<<RAChangeCollar>>
+ <<RAChangeSave>>
+ <<RAChangeApply>>
<</link>>
|
-<<link "Pretty">>
- <<set $currentRule.collar = "pretty jewelry">>
+<</if>>
+<<link "Uncomfortable leather">>
+ <<set $currentRule.collar = "uncomfortable leather">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<if $seeAge != 0>>
-<<link "Nice retirement">>
- <<set $currentRule.collar = "nice retirement counter">>
+<<if $activeSlave.preg > -1>>
+<<link "Pregnancy biometrics">>
+ <<set $currentRule.collar = "preg biometrics">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-|
<</if>>
-<<link "Cowbell">>
- <<set $currentRule.collar = "leather with cowbell">>
+|
+<<link "Shock punishment">>
+ <<set $currentRule.collar = "shock punishment">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
- | //FS//
-<<link "Bowtie collar">>
- <<set $currentRule.collar = "bowtie">>
+|
+<<link "Dildo gag">>
+ <<set $currentRule.collar = "dildo gag">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-<</if>>
-<<if ($arcologies[0].FSEgyptianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtEgypt == 1)>>
- | //FS//
-<<link "Ancient Egyptian">>
- <<set $currentRule.collar = "ancient Egyptian">>
+|
+<<link "Neck corset">>
+ <<set $currentRule.collar = "neck corset">>
<<RAChangeCollar>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
-<</if>>
+
<br>
<span id = "shoes">
@@ -866,14 +875,14 @@ Shoes: ''$currentRule.shoes.''
<<RAChangeApply>>
<</link>>
|
-<<link "Boots">>
+<<link "Thigh boots">>
<<set $currentRule.shoes = "boots">>
<<RAChangeShoes>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Extreme heels">>
+<<link "Painfully extreme heels">>
<<set $currentRule.shoes = "extreme heels">>
<<RAChangeShoes>>
<<RAChangeSave>>
@@ -882,7 +891,7 @@ Shoes: ''$currentRule.shoes.''
<br>
<span id = "baccessory">
-Torso Accessory: ''$currentRule.bellyAccessory.''
+Torso accessory: ''$currentRule.bellyAccessory.''
</span>
<<link "No default setting">>
<<set $currentRule.bellyAccessory = "no default setting">>
@@ -1297,7 +1306,7 @@ Buttplugs for other slaves: ''$currentRule.buttplug.''
//Will permanently gape assholes//
<br><br>
-[[Cosmetic Rules Assistant Settings]] | [[Body Mod Rules Assistant Settings]] | [[Autosurgery Settings]]
+Body modification: [[Cosmetic Rules Assistant Settings]] | [[Body Mod Rules Assistant Settings]] | [[Autosurgery Settings]]
<br><br>
@@ -1562,7 +1571,7 @@ Hormones for female slaves:
<<RAChangeApply>>
<</link>>
|
-<<link "No hormones">>
+<<link "None">>
<<set $currentRule.XX = 0>>
<<RAChangeXXHormones>>
<<RAChangeSave>>
@@ -1624,7 +1633,7 @@ Hormones for shemales:
<<RAChangeApply>>
<</link>>
|
-<<link "No hormones">>
+<<link "None">>
<<set $currentRule.XY = 0>>
<<RAChangeXYHormones>>
<<RAChangeSave>>
@@ -1686,7 +1695,7 @@ Hormones for geldings:
<<RAChangeApply>>
<</link>>
|
-<<link "No hormones">>
+<<link "None">>
<<set $currentRule.gelding = 0>>
<<RAChangeGeldHormones>>
<<RAChangeSave>>
@@ -1820,7 +1829,7 @@ Slave diets:
<br>
<span id = "dietBase">
-Diet Base:
+Diet base:
<<if ($currentRule.dietCum == 2)>>
''slaves' diets are heavily based on cum.''
@@ -2813,21 +2822,16 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<link "Add a new rule">>
- <<set _activeRule = {aphrodisiacs: "no default setting", condition: {id: "false"}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", aVirginDickAccessory: "no default setting", dickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "no default setting", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", preg: "no default setting", growth: "no default setting", autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "none", facility: [], excludeFacility: [], assignFacility: "none", excludeSpecialSlaves: true, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {lactation: "no default setting", cosmetic: 0, accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: 0}, underArmHColor: "no default setting", underArmHStyle: "no default setting" }>>
-
- <<set _activeRule.name = "Rule " + (_length+1)>>
- <<set $defaultRules.push(_activeRule)>>
+ <<set _tempRule = {aphrodisiacs: "no default setting", condition: {id: "false"}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", aVirginDickAccessory: "no default setting", dickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "no default setting", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", preg: "no default setting", growth: "no default setting", autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "none", facility: [], excludeFacility: [], assignFacility: "none", excludeSpecialSlaves: true, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {lactation: "no default setting", cosmetic: 0, accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: 0}, underArmHColor: "no default setting", underArmHStyle: "no default setting" }>>
- /* renumber rule IDs and update slaves' assigned rule IDs if needed */
- <<for $r = 0; $r < $defaultRules.length; $r++>>
- <<set $defaultRules[$r].ID = $r + 1>>
- <</for>>
- <<for _i = 0; _i < $slaves.length; _i++>>
- <<silently>>
- <<CheckAutoRulesActivate $slaves[_i]>>
- <</silently>>
+ /* pick an ID higher than the highest ID of any existing rule */
+ <<for _tempRule.ID = 0, _r = 0; _r < _length; _r++>>
+ <<set _tempRule.ID = Math.max(_tempRule.ID, $defaultRules[_r].ID + 1)>>
<</for>>
+ <<set _tempRule.name = "Rule " + (_length+1)>>
+ <<set $defaultRules.push(_tempRule)>> /* add the new rule to the end of the list (lowest priority) */
+
<<set $currentRule = $defaultRules[_length]>>
<<goto "Rules Assistant">>
diff --git a/src/uncategorized/rulesAssistantReport.tw b/src/uncategorized/rulesAssistantReport.tw
new file mode 100644
index 00000000000..f37a5e42700
--- /dev/null
+++ b/src/uncategorized/rulesAssistantReport.tw
@@ -0,0 +1,11 @@
+:: Rules Assistant Report [nobr]
+
+<<set _SL = $slaves.length>>
+
+<<for $i = 0; $i < _SL; $i++>>
+ <<if ($slaves[$i].useRulesAssistant == 1)>>
+ <<CheckAutoRulesActivate $slaves[$i]>>
+ <<DefaultRules $slaves[$i]>>
+ <</if>>
+<</for>>
+
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 9b4d9703805..e57f38bb42a 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -1,50 +1,54 @@
:: SA chooses own job [nobr]
-<<if ($slaves[$i].choosesOwnAssignment == 1)>>
- is allowed to select her own job this week. She watches your other slaves to decide what to do, @@.hotpink;happy@@ to be permitted a choice and a little more @@.mediumaquamarine;confident@@ than if you had just given her orders. She
- <<set $slaves[$i].devotion++, $slaves[$i].trust++>>
+<<SlavePronouns $slaves[$i]>>
+<<SlaveTitle $slaves[$i]>>
+
+<<if $slaves[$i].assignmentVisible == 0>>
+ was assigned to $slaves[$i].assignment and
<</if>>
+ is allowed to select $possessive own job this week. $pronounCap watches your other slaves to decide what to do, @@.hotpink;happy@@ to be permitted a choice and a little more @@.mediumaquamarine;confident@@ than if you had just given $possessive orders. $pronoun
+ <<set $slaves[$i].devotion++, $slaves[$i].trust++>>
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
- chooses to rest, taking advantage of your permission to choose her own assignment to @@.mediumorchid;remain indolent.@@
+ decides to rest, taking advantage of your permission to @@.mediumorchid;remain indolent.@@
<<removeJob $slaves[$i] $slaves[$i].assignment>>
<<set $slaves[$i].devotion -= 5>>
<<elseif ($slaves[$i].health < 20)>>
<<if $clinic > $clinicSlaves && $universalRulesAssignsSelfFacility == 1>>
- is unhealthy, so she goes to get treatment at $clinicName.
+ is unhealthy, so $pronoun decides to get treatment at $clinicName.
<<assignJob $slaves[$i] "get treatment in the clinic">>
<<else>>
- is unhealthy, so she chooses to rest.
+ is unhealthy, so $pronoun decides to rest.
<<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
<<elseif (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45)) && (($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none")) && ($Attendant != 0) && $universalRulesAssignsSelfFacility == 1>>
- could use some counseling, so she chooses to visit $spaName.
+ could use some counseling, so $pronoun decides to visit $spaName.
<<assignJob $slaves[$i] "rest in the spa">>
<<elseif ($slaves[$i].intelligenceImplant != 1)>>
<<if $schoolroom > $schoolroomSlaves && $universalRulesAssignsSelfFacility == 1>>
- is uneducated, so she sits herself down in $schoolroomName.
+ is uneducated, so $pronoun sits <<print $object>>self down in $schoolroomName.
<<assignJob $slaves[$i] "learn in the schoolroom">>
<<else>>
- is uneducated, so she sits herself down to learn.
+ is uneducated, so $pronoun sits <<print $object>>self down to learn.
<<assignJob $slaves[$i] "take classes">>
<</if>>
<<elseif ($slaves[$i].devotion <= 50) && canWalk($slaves[$i]) && canSee($slaves[$i])>>
<<if $servantsQuarters > $servantsQuartersSlaves && $universalRulesAssignsSelfFacility == 1>>
- is obedient but not devoted, so she chooses to work from $servantsQuartersName since it's the least sexually demanding job available.
+ is obedient but not devoted, so $pronoun decides to work from $servantsQuartersName since it's the least sexually demanding job available.
<<assignJob $slaves[$i] "work as a servant">>
<<else>>
- is obedient but not devoted, so she chooses to work as a servant since it's the least sexually demanding job available.
+ is obedient but not devoted, so $pronoun decides to work as a servant since it's the least sexually demanding job available.
<<assignJob $slaves[$i] "be a servant">>
<</if>>
<<elseif ($slaves[$i].relationship == -1)>>
- relies on promiscuity to fulfill her emotional needs,
+ relies on promiscuity to fulfill $possessive emotional needs,
<<if ($cash > 10000)>>
- and doesn't mind being a whore, so she prostitutes herself
+ and doesn't mind being a whore, so $pronoun prostitutes <<print $object>>self
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
in $brothelName.
<<assignJob $slaves[$i] "work in the brothel">>
@@ -53,7 +57,7 @@
<<assignJob $slaves[$i] "whore">>
<</if>>
<<else>>
- so she eagerly decides to slut around
+ so $pronoun eagerly decides to slut around
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
in $clubName.
<<assignJob $slaves[$i] "serve in the club">>
@@ -66,7 +70,7 @@
<<elseif ($slaves[$i].relationship == -2)>>
is emotionally bonded to you,
<<if ($slaves[$i].behavioralQuirk == "insecure")>>
- but insecure, so she chooses to make you money by prostituting herself
+ but insecure, so $pronoun decides to make you money by prostituting <<print $object>>self
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
in $brothelName.
<<assignJob $slaves[$i] "work in the brothel">>
@@ -75,7 +79,7 @@
<<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].behavioralQuirk == "advocate")>>
- and an advocate for slavery, so she chooses to burnish your reputation by slutting it up
+ and an advocate for slavery, so $pronoun decides to burnish your reputation by slutting it up
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
in $clubName.
<<assignJob $slaves[$i] "serve in the club">>
@@ -84,16 +88,16 @@
<<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].energy > 60)>>
- and she thinks of little but sex with you,
+ and $pronoun thinks of little but sex with you,
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- so she heads straight to $masterSuiteName.
+ so $pronoun heads straight to $masterSuiteName.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- so she cheerfully designates herself one of your fucktoys.
+ so $pronoun cheerfully designates <<print $object>>self one of your fucktoys.
<<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
- so she chooses to work
+ so $pronoun decides to work
<<if $servantsQuarters > $servantsQuartersSlaves && $universalRulesAssignsSelfFacility == 1>>
from $servantsQuartersName
<<assignJob $slaves[$i] "work as a servant">>
@@ -103,12 +107,12 @@
<</if>>
to make your penthouse as clean and homelike as possible.
<<else>>
- but unable to do much on her own,
+ but unable to do much on $possessive own,
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- so she heads straight to $masterSuiteName to await your caress.
+ so $pronoun heads straight to $masterSuiteName to await your caress.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- so she cheerfully designates herself one of your fucktoys to be close to you.
+ so $pronoun cheerfully designates <<print $object>>self one of your fucktoys to be close to you.
<<assignJob $slaves[$i] "please you">>
<</if>>
<</if>>
@@ -116,16 +120,16 @@
<<elseif ($slaves[$i].relationship == -3)>>
is married to you,
<<if ($slaves[$i].energy > 60)>>
- and she thinks of little but sex with you,
+ and $pronoun thinks of little but sex with you,
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- so she heads straight to $masterSuiteName.
+ so $pronoun heads straight to $masterSuiteName.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- so she cheerfully designates herself one of your fucktoys.
+ so $pronoun cheerfully designates <<print $object>>self one of your fucktoys.
<<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
- so she chooses to work
+ so $pronoun decides to work
<<if $servantsQuarters > $servantsQuartersSlaves && $universalRulesAssignsSelfFacility == 1>>
from $servantsQuartersName
<<assignJob $slaves[$i] "work as a servant">>
@@ -135,12 +139,12 @@
<</if>>
to make your penthouse as clean and homelike as possible.
<<else>>
- but unable to do much on her own
+ but unable to do much on $possessive own
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- so she heads straight to $masterSuiteName to await your caress.
+ so $pronoun heads straight to $masterSuiteName to await your caress.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- so she cheerfully designates herself one of your fucktoys to be close to you.
+ so $pronoun cheerfully designates <<print $object>>self one of your fucktoys to be close to you.
<<assignJob $slaves[$i] "please you">>
<</if>>
<</if>>
@@ -148,26 +152,26 @@
<<elseif ($slaves[$i].fetishKnown == 1)>>
<<if ($slaves[$i].fetish == "submissive") && canWalk($slaves[$i]) && canSee($slaves[$i])>>
<<if $servantsQuarters > $servantsQuartersSlaves && $universalRulesAssignsSelfFacility == 1>>
- thinks she belongs at the bottom of the penthouse hierarchy, so she goes to live in $servantsQuartersName.
+ thinks $pronoun belongs at the bottom of the penthouse hierarchy, so $pronoun goes to live in $servantsQuartersName.
<<assignJob $slaves[$i] "work as a servant">>
<<else>>
- thinks she belongs at the bottom of the penthouse hierarchy, so she decides she should be a servant.
+ thinks $pronoun belongs at the bottom of the penthouse hierarchy, so $pronoun decides $pronoun should be a servant.
<<assignJob $slaves[$i] "be a servant">>
<</if>>
<<elseif ($slaves[$i].fetish == "dom") || ($slaves[$i].fetish == "sadist")>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
- is self-confident, so she decides to work in $clubName.
+ is self-confident, so $pronoun decides to work in $clubName.
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
- is self-confident, so she decides to work as a public servant.
+ is self-confident, so $pronoun decides to work as a public servant.
<<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].fetish == "masochist")>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- enjoys abuse, so she hurries down to $brothelName.
+ enjoys abuse, so $pronoun hurries down to $brothelName.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- enjoys abuse, so she decides to become a whore.
+ enjoys abuse, so $pronoun decides to become a whore.
<<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
@@ -180,27 +184,27 @@
<</if>>
<<elseif ($slaves[$i].fetish == "humiliation")>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- chooses $brothelName, since it's even more embarrassing to be a whore than a club slut.
+ decides to work in $brothelName, since it's even more embarrassing to be a whore than a club slut.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- chooses to whore, since it's even more embarrassing to be a whore than to be a public servant.
+ decides to whore, since it's even more embarrassing to be a whore than to be a public servant.
<<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].fetish == "buttslut")>>
<<if ($slaves[$i].balls > 0)>>
<<if ($dairy > $dairySlaves) && ($dairyRestraintsSetting < 2) && $universalRulesAssignsSelfFacility == 1>>
- chooses confinement in $dairyName, since all she'll be expected to do is make cum by orgasming to buttsex.
+ chooses confinement in $dairyName, since all $pronoun will be expected to do is produce cum by orgasming to buttsex.
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
- chooses to get milked, since all she'll be expected to do is make cum by orgasming to buttsex.
+ decides to get milked, since all $pronoun will be expected to do is produce cum by orgasming to buttsex.
<<assignJob $slaves[$i] "get milked">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- chooses $brothelName, since whores get buttfucked more than anyone else.
+ decides to work in $brothelName, since whores get buttfucked more than anyone else.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- chooses to whore, since whores get buttfucked more than anyone else.
+ decides to whore, since whores get buttfucked more than anyone else.
<<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
@@ -210,30 +214,30 @@
heads down to $dairyName to be around other lactating girls.
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
- decides to get milked, since she's already lactating.
+ decides to get milked, since $pronoun is already lactating.
<<assignJob $slaves[$i] "get milked" >>
<</if>>
<<elseif isFertile($slaves[$i]) && ($PC.dick == 1)>>
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- heads straight to $masterSuiteName, in the hope you'll get her pregnant.
+ decides to serve you in $masterSuiteName, hoping that you'll get $possessive pregnant.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- chooses to be your fucktoy, in the hope you'll get her pregnant.
+ decides to be your fucktoy, hoping that you'll get $possessive pregnant.
<<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif isFertile($slaves[$i]) && $dairy > $dairySlaves && $dairyPregSetting > 0 && $universalRulesAssignsSelfFacility == 1>>
<<if $dairyPregSetting > 1>>
- eagerly rushes to $dairyName in the hopes that her womb will be packed full of children.
+ eagerly rushes to $dairyName in the hopes that $possessive fertile womb will be packed full of children.
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
- rushes to $dairyName in the hopes that her womb will be rented out.
+ rushes to $dairyName in the hopes that $possessive fertile womb will be rented out.
<<assignJob $slaves[$i] "work in the dairy">>
<</if>>
<<elseif ($slaves[$i].preg > 0)>>
<<if $arcologies[0].FSRepopulationFocus > 20>>
<<if ($cash < 10000)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- heads to $brothelName since she wants to set an example for any unimpregnated girls.
+ heads to $brothelName since $pronoun wants to set an example for any unimpregnated girls.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
heads to the streets to lavish in the attention given to pregnant prostitutes.
@@ -241,7 +245,7 @@
<</if>>
<<else>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
- heads to $clubName to show off her growing middle and lavish in the public's attention.
+ heads to $clubName to show off $possessive growing middle and lavish in the public's attention.
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
heads to the streets to contribute to the number of visiblt pregnant woman around.
@@ -249,53 +253,53 @@
<</if>>
<</if>>
<<elseif $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- heads straight to $masterSuiteName to share the intimacy of her pregnant body with you.
+ heads straight to $masterSuiteName to share the intimacy of $possessive pregnant body with you.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- chooses to be your fucktoy to share the intimacy of her pregnant body with you.
+ decides to be your fucktoy to share the intimacy of $possessive pregnant body with you.
<<assignJob $slaves[$i] "serve in the master suite">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- can't indulge her fetish by getting pregnant herself, so she just heads down to $brothelName.
+ can't indulge $possessive fetish by getting pregnant <<print $object>>self, so $pronoun just heads down to $brothelName.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- can't indulge her fetish by getting pregnant herself, so she glumly decides to be a whore.
+ can't indulge $possessive fetish by getting pregnant <<print $object>>self, so $pronoun glumly decides to be a whore.
<<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
<<elseif ($slaves[$i].fetish == "boobs")>>
<<if ($slaves[$i].lactation > 0)>>
<<if $dairy > $dairySlaves && $dairyRestraintsSetting < 2 && $universalRulesAssignsSelfFacility == 1>>
- heads down to $dairyName for all the attention that'll be lavished on her nipples.
+ heads down to $dairyName for all the attention that'll be lavished on $possessive nipples.
<<assignJob $slaves[$i] "work in the dairy">>
<<else>>
- decides to get milked, since she loves getting off to it.
+ decides to get milked, since $pronoun loves getting off to it.
<<assignJob $slaves[$i] "get milked">>
<</if>>
<<else>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
- decides to work in $clubName so she can show off her bare breasts.
+ decides to work in $clubName so $pronoun can show off $possessive bare breasts.
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
- decides to work as a public servant so she can show off her bare breasts.
+ decides to work as a public servant so $pronoun can show off $possessive bare breasts.
<<assignJob $slaves[$i] "serve the public">>
<</if>>
<</if>>
<<elseif ($slaves[$i].attrXX > 85)>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
- decides to work in $clubName so she can hit on hot girls.
+ decides to work in $clubName so $pronoun can hit on hot girls.
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
- decides to work as a public servant so she can hit on hot girls.
+ decides to work as a public servant so $pronoun can hit on hot girls.
<<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].attrXY > 85)>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
- decides to work in $clubName so she can hit on cute boys.
+ decides to work in $clubName so $pronoun can hit on cute boys.
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
- decides to work as a public servant so she can hit on cute boys.
+ decides to work as a public servant so $pronoun can hit on cute boys.
<<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($slaves[$i].energy > 95)>>
@@ -309,26 +313,26 @@
<<elseif ($arcologies[0].FSChattelReligionist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- is a pure and faithful slave, so she sells her body in the holy brothel.
+ is a pure and faithful slave, so $pronoun sells $possessive body in the holy brothel.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- is a pure and faithful slave, so she sells her body as a holy prostitute.
+ is a pure and faithful slave, so $pronoun sells $possessive body as a holy prostitute.
<<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($arcologies[0].FSEgyptianRevivalist > 0)>>
<<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
- is a devoted slave, so she immediately joins your harem.
+ is a devoted slave, so $pronoun immediately joins your harem.
<<assignJob $slaves[$i] "serve in the master suite">>
<<else>>
- is a devoted slave, so she immediately joins your harem.
+ is a devoted slave, so $pronoun immediately joins your harem.
<<assignJob $slaves[$i] "please you">>
<</if>>
<<elseif ($arcologies[0].FSRomanRevivalist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- is a devoted slave, so she decides she can best serve the state by raising money for the treasury, by selling her body in $brothelName.
+ is a devoted slave, so $pronoun decides $pronoun can best serve the state by raising money for the treasury, by selling $possessive body in $brothelName.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- is a devoted slave, so she decides she can best serve the state by raising money for the treasury, by selling her body as a prostitute.
+ is a devoted slave, so $pronoun decides $pronoun can best serve the state by raising money for the treasury, by selling $possessive body as a prostitute.
<<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>>
@@ -353,33 +357,33 @@
decides to work in $brothelName to help raise money to get more girls lactating properly.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- decides to prostitute herself to help raise money to get more girls lactating properly.
+ decides to prostitute <<print $object>>self to help raise money to get more girls lactating properly.
<<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
<<else>>
<<if ($slaves[$i].whoreSkill > $slaves[$i].entertainSkill)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- decides to work in $brothelName, since she thinks herself a better whore than a public slut.
+ decides to work in $brothelName, since $pronoun thinks <<print $object>>self a better whore than a public slut.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- decides to whore, since she thinks herself a better whore than a public slut.
+ decides to whore, since $pronoun thinks <<print $object>>self a better whore than a public slut.
<<assignJob $slaves[$i] "whore">>
<</if>>
<<elseif ($slaves[$i].entertainSkill >= $slaves[$i].whoreSkill)>>
<<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
- decides to be a club girl, since she thinks herself a better public slut than a whore.
+ decides to be a club girl, since $pronoun thinks <<print $object>>self a better public slut than a whore.
<<assignJob $slaves[$i] "serve in the club">>
<<else>>
- decides to serve the public, since she thinks herself a better public slut than a whore.
+ decides to serve the public, since $pronoun thinks <<print $object>>self a better public slut than a whore.
<<assignJob $slaves[$i] "serve the public">>
<</if>>
<<else>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- decides to join her sisters and work in $brothelName.
+ decides to join $possessive sisters and work in $brothelName.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- decides to prostitute herself to help you upgrade $arcologies[0].name and improve everyone's life.
+ decides to prostitute <<print $object>>self to help you upgrade $arcologies[0].name and improve everyone's life.
<<assignJob $slaves[$i] "whore">>
<</if>>
<</if>>
@@ -389,10 +393,13 @@
decides to be a club girl, since partying is better than sitting around and failing to think of a job to do.
<<assignJob $slaves[$i] "serve in the club">>
<<elseif canWalk($slaves[$i]) && canSee($slaves[$i])>>
- decides to tidy up the penthouse a little while she thinks.
+ decides to tidy up the penthouse a little while $pronoun thinks.
<<assignJob $slaves[$i] "be a servant">>
<<else>>
stays in bed, unable to come up with anything.
<<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
<</if>>
+
+<<set $slaves[$i].choosesOwnAssignment = 1>>
+
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index d3f31aaece8..3d5ac594474 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -808,6 +808,11 @@
<</if>>
<</if>>
+/* done stealthily to make the slave's progression seem natural */
+<<if ($slaves[$i].rudeTitle == 1) && ($slaves[$i].devotion >= -50)>>
+ <<set $slaves[$i].customTitle = "", $slaves[$i].customTitleLisp = "", $slaves[$i].rudeTitle = 0>>
+<</if>>
+
<<else>> /* IS FUCKDOLL */
It is confined in a suit that limits its perception of the outside world to tonal commands from the suit itself and things that are inserted into its mouth<<if $activeSlave.vagina > -1>>, vagina,<</if>> and anus.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 3e955ec8f10..5521972c17d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2083,7 +2083,7 @@
@@.hotpink;Her acceptance of her life as a sex slave is driven faster@@ by how satisfied she is by the availability of her favorite activity.
<<set $slaves[$i].devotion += 2>>
<<else>>
- She loves being a nympho slut. @@.hotpink;She loves being your nympho slut.@@
+ @@.hotpink;She loves being your nympho slut.@@
<<set $slaves[$i].devotion += 2>>
<</if>>
<</if>>
@@ -3623,7 +3623,7 @@
<</if>> /* closes not fuckdoll not mindbroken */
<<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $HeadGirl.ID, $HGCum -= 1, $HeadGirl.penetrativeCount += 10, $penetrativeTotal += 10>>
- <<set $activeSlave to $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] to $activeSlave>>
+ <<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] to $activeSlave>>
<<for $j = 0; $j < $slaves.length; $j++>>
<<if $HeadGirl.ID == $slaves[$j].ID>>
<<set $slaves[$j] = $HeadGirl>>
@@ -4547,7 +4547,7 @@
<<if $slaves[$i].fuckdoll == 0>>
<<if ($slaves[$i].brand != 0)>>
<<if ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel") || ($slaves[$i].assignment == "serve in the club")>>
- Since she is in public, your brand against the $slaves[$i].skin skin of her $slaves[$i].brandLocation @@.green;slightly increases your reputation@@ as a slaveowner.
+ Since $pronoun is in public, your brand against the $slaves[$i].skin skin of $possessive $slaves[$i].brandLocation @@.green;slightly increases your reputation@@ as a slaveowner.
<<set $repGain += 5>>
<<switch $slaves[$i].assignment>>
<<case "work in the brothel">><<run getSlaveStatisticData($slaves[$i], $facility.brothel).rep += 5>>
@@ -4906,7 +4906,6 @@
<</if>>
<<if $slaves[$i].health > 90>>
-
<<if $slaves[$i].energy <= 70>>
$possessiveCap outstanding health produces a @@.green;slow improvement in libido.@@
<<set $slaves[$i].energy += 1>>
@@ -4938,7 +4937,6 @@
$possessiveCap good health produces a @@.green;slow improvement in libido.@@
<<set $slaves[$i].energy += 1>>
<</if>>
-
<</if>>
<<if $slaves[$i].physicalAge >= 30>>
@@ -5858,7 +5856,7 @@
<<if $slaves[$i].voice == 0 || $slaves[$i].lips > 95>>
$pronounCap has managed to pick up enough $language that @@.green;$pronoun's now able to understand most of what $pronoun hears.@@
<<else>>
- $pronounCap has managed to pick up enough $language that @@.green;$pronoun's now reasonably fluent in the language.@@ $possessiveCap accent is quite heavy, but $pronoun can make <<print $possessive>>self understood.
+ $pronounCap has managed to pick up enough $language that @@.green;$pronoun's now reasonably fluent in the language.@@ $possessiveCap accent is quite heavy, but $pronoun can make <<print $object>>self understood.
<</if>>
<</if>>
<<elseif canTalk($slaves[$i])>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index e1e763070ee..184ed10a58a 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -76,7 +76,7 @@
<<set _SlaveI.trust -= 4>>
<</if>>
<</if>>
- <<elseif (_SlaveJ.ID is $DJ.ID) && (_SlaveI.assignment == "serve in the club")>>
+ <<elseif (_SlaveJ.ID == $DJ.ID) && (_SlaveI.assignment == "serve in the club")>>
<<if _SlaveJ.relationshipRules != "restrictive">>
_SlaveI.slaveName manages to ingratiate herself with the DJ, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index eaa19956335..b9bf859e755 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -252,6 +252,10 @@ $possessiveCap skin is $activeSlave.skin.
| [[Grey|Salon][$activeSlave.hColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.hColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.hColor = "white",$cash -= $modCost]]
+ | [[Blazing red|Salon][$activeSlave.hColor = "blazing red",$cash -= $modCost]]
+ | [[Neon green|Salon][$activeSlave.hColor = "neon green",$cash -= $modCost]]
+ | [[Neon blue|Salon][$activeSlave.hColor = "neon blue",$cash -= $modCost]]
+ | [[Neon pink|Salon][$activeSlave.hColor = "neon pink",$cash -= $modCost]]
<br><br>
$possessiveCap hair is $activeSlave.hStyle.
@@ -412,6 +416,10 @@ $possessiveCap skin is $activeSlave.skin.
| [[Grey|Salon][$activeSlave.pubicHColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.pubicHColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.pubicHColor = "white",$cash -= $modCost]]
+ | [[Blazing red|Salon][$activeSlave.pubicHColor = "blazing red",$cash -= $modCost]]
+ | [[Neon green|Salon][$activeSlave.pubicHColor = "neon green",$cash -= $modCost]]
+ | [[Neon blue|Salon][$activeSlave.pubicHColor = "neon blue",$cash -= $modCost]]
+ | [[Neon pink|Salon][$activeSlave.pubicHColor = "neon pink",$cash -= $modCost]]
<br>
$possessiveCap pubic hair is $activeSlave.pubicHStyle.
@@ -454,6 +462,10 @@ $possessiveCap skin is $activeSlave.skin.
| [[Grey|Salon][$activeSlave.underArmHColor = "grey",$cash -= $modCost]]
| [[Silver|Salon][$activeSlave.underArmHColor = "silver",$cash -= $modCost]]
| [[White|Salon][$activeSlave.underArmHColor = "white",$cash -= $modCost]]
+ | [[Blazing red|Salon][$activeSlave.underArmHColor = "blazing red",$cash -= $modCost]]
+ | [[Neon green|Salon][$activeSlave.underArmHColor = "neon green",$cash -= $modCost]]
+ | [[Neon blue|Salon][$activeSlave.underArmHColor = "neon blue",$cash -= $modCost]]
+ | [[Neon pink|Salon][$activeSlave.underArmHColor = "neon pink",$cash -= $modCost]]
<br><br>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 9fce82b70e9..ee262e48a37 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -192,7 +192,7 @@
<</if>>
/% Get it out of the loop %/
<<set $cash += ($stewardessBonus * $servantsQuartersSlaves)>>
- <br>
+ <br><br>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 0bdfac4cd90..cd2bcd1db48 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -351,17 +351,20 @@
*/
<<set _facListArr = [
- ["Brothel Report", $brothelNameCaps, $brothel, $brothelSlaves, $Madam, "Madam"],
- ["Club Report", $clubNameCaps, $club, $clubSlaves, $DJ, "DJ"],
- ["Arcade Report", $arcadeNameCaps, $arcade, $arcadeSlaves, -1, -1],
- ["Dairy Report", $dairyNameCaps, $dairy, $dairySlaves, $Milkmaid, "Milkmaid"],
+ ["Penthouse Report", "The Penthouse", 1, $slavesVisible, -1, -1], /** must be first - may assign slaves to facilities **/
["Servants' Quarters Report", $servantsQuartersNameCaps, $servantsQuarters, $servantsQuartersSlaves, $Stewardess, "Stewardess"],
["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $schoolroomSlaves, $Schoolteacher, "Schoolteacher"],
["Spa Report", $spaNameCaps, $spa, $spaSlaves, $Attendant, "Attendant"],
["Clinic Report", $clinicNameCaps, $clinic, $clinicSlaves, $Nurse, "Nurse"],
+ ["Arcade Report", $arcadeNameCaps, $arcade, $arcadeSlaves, -1, -1],
+ ["Brothel Report", $brothelNameCaps, $brothel, $brothelSlaves, $Madam, "Madam"],
+ ["Club Report", $clubNameCaps, $club, $clubSlaves, $DJ, "DJ"],
+ ["Dairy Report", $dairyNameCaps, $dairy, $dairySlaves, $Milkmaid, "Milkmaid"],
["Cellblock Report", $cellblockNameCaps, $cellblock, $cellblockSlaves, $Wardeness, "Wardeness"],
+/** ["Lab Report"], "Research Lab", $researchLab.built, $researchLab.hired + $researchLab.menials, -1, -1], **/
["Incubator Report", $incubatorNameCaps, $incubator, $incubatorSlaves, -1, -1],
["Master Suite Report", $masterSuiteNameCaps, $masterSuite, $masterSuiteSlaves, $Concubine, "Concubine"]
+ ["Rules Assistant Report", "Rules Assistant", $rulesAssistantAuto, 1, -1, -1] /** should be last - may reassign slaves **/
]>>
<<for _ii = 0; _ii < _facListArr.length; _ii++>>
@@ -371,7 +374,10 @@
<<if _facSubArr[2] > 0>> /** Do we have one of these facilities? */
<<if $useAccordion > 0>> <<set _accText = " accordion", _disTxt = "">> <</if>> /** Is Accordion turned on? */
<<if (_facSubArr[3] == 0) && (_facSubArr[4] <= 0)>> /** Is there anyone inside the facility? */
- <<= '<div id="button-' + _str + '" class="unStaffed">' + _facSubArr[1] + ' is currently unstaffed</div>'>> /** No, so we display the Unstaffed bar */
+ ''_facSubArr[1] Report''<hr style="margin:0"> /** No - it's empty, so we display the heading without a button and with a thinner bar under it */
+ @@.gray;_facSubArr[1] is currently empty.@@
+ <br><br>
+ /** Old code: <<= '<div id="button-' + _str + '" class="unStaffed">' + _facSubArr[1] + ' is currently unstaffed</div>'>> */
<<else>>
<<= '<button type="button"' + _disTxt + ' id="button-' + _str + '" class="buttonBar' + _accText + '" data-after="' + _facSubArr[3] + ' slaves in ' + _facSubArr[1] + '">' + _facSubArr[1] + ' Report</button>'>> /** Yes, display the bar with information */
<</if>>
@@ -388,45 +394,3 @@
<<include "Lab Report">><br><br>
<</if>>
-<<if $slavesVisible > 0>>
-<br>__''Penthouse Report''__<br>
-<<for $i = 0; $i < _SL; $i++>>
-<<if $slaves[$i].assignmentVisible == 1>>
- <br>
- <<include "Full Report">>
- <<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteSlaves > 0)>>
- <<set _iTemp = $i, $i = $HGSuiteiIDs[0].Index, _ID = $HGSuiteiIDs[0].ID>>
- <<if $i >= _SL || _ID != $slaves[$i].ID>>
- /% Slaves.ID and $HGSuiteiIDs.ID's don't match-up so let's find her %/
- <<for $i = 0; $i < _SL; $i++>>
- <<if _ID == $slaves[$i].ID>>
- /% Correct the Index %/
- <<set $HGSuiteiIDs[0].Index = $i>>
- <<break>>
- <</if>>
- <</for>>
- <</if>>
- <<if $i < _SL && $slaves[$i].assignment != "live with your Head Girl">>
- <br>@@.red;$slaves[$i].slaveName had been assigned to live with your Head Girl, but this week she was assigned to $slaves[$i].assignment. She has been released to your penthouse for reassignment.@@
- <<removeJob $slaves[$i] "live with your head girl">>
- <</if>>
- /% Onward bound as normal %/
- <<set $HGRelease = 1>>
- <br><br><<include "SA live with HG">>
- <<set $i = _iTemp>>
- <</if>>
-<</if>>
-<<if ($rulesAssistantAuto == 1) && ($slaves[$i].useRulesAssistant == 1)>>
- <<if $slaves[$i].assignmentVisible == 0>>
- <<silently>>
- <<CheckAutoRulesActivate $slaves[$i]>>
- <<DefaultRules $slaves[$i]>>
- <</silently>>
- <<else>>
- <<CheckAutoRulesActivate $slaves[$i]>>
- <<DefaultRules $slaves[$i]>>
- <</if>>
-<</if>>
-<<if $slaves[$i].assignmentVisible == 1>><br><</if>>
-<</for>>
-<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 6bf654c6385..f3b77d25fe9 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -331,7 +331,7 @@
[[Include her|Slave Interact][$activeSlave.useRulesAssistant = 1]]
<br>
<<else>>
- __Rules Assistant__
+ __Rules Assistant:__
<<link "//Apply Rules Assistant to this slave//">>
<<silently>>
<<CheckAutoRulesActivate $activeSlave>>
@@ -369,7 +369,7 @@
<span id="fucktoypref">
<<if ($activeSlave.assignment == "please you") || ($activeSlave.assignment == "serve in the master suite") || ($activeSlave.assignment == "be your Concubine")>>
- __Fucktoy use preference__: <strong><span id="hole">$activeSlave.toyHole</span></strong>.
+ Fucktoy use preference: <strong><span id="hole">$activeSlave.toyHole</span></strong>.
<<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
| <<link "Tits">><<set $activeSlave.toyHole = "boobs">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>
<<if ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
@@ -422,7 +422,7 @@
/* CAN BE REASSIGNED */
- __Assignment__: <strong><span id="assign">$activeSlave.assignment<<if $activeSlave.sentence>> ($activeSlave.sentence weeks)<</if>></span>.</strong>
+ Assignment: <strong><span id="assign">$activeSlave.assignment<<if $activeSlave.sentence>> ($activeSlave.sentence weeks)<</if>></span>.</strong>
<<link "Rest">> <<removeJob $activeSlave $activeSlave.assignment>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
| <<link "Fucktoy">> <<assignJob $activeSlave "please you">><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
@@ -481,7 +481,7 @@
<</if>>
<</for>>
- <br>__Transfer to__:
+ <br>Transfer to:
<<if $arcade != 0>>
<<if $arcade > $arcadeSlaves && ($activeSlave.indentureRestrictions <= 0) && $activeSlave.breedingMark != 1>>
@@ -562,13 +562,216 @@
<</switch>> /* END CAN BE REASSIGNED */
-<br>__Body modification__:
+<br><br>__Appearance:__
+
+<<if $activeSlave.fuckdoll == 0>>
+<br>Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
+| <<link "Let her choose">><<set $activeSlave.clothes = "choosing her own clothes",$activeSlave.choosesOwnClothes = 1>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+
+<br> //Nice://
+ <<link "Bangles">><<set $activeSlave.clothes = "slutty jewelry",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Bodysuit">><<set $activeSlave.clothes = "a comfortable bodysuit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Cheerleader outfit">><<set $activeSlave.clothes = "a cheerleader outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeSlave.clothes>><</replace>><</link>>
+| <<link "Clubslut netting">><<set $activeSlave.clothes = "clubslut netting",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Cutoffs and a t-shirt">><<set $activeSlave.clothes = "cutoffs and a t-shirt",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Fallen nun">><<set $activeSlave.clothes = "a fallen nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Haltertop dress">><<set $activeSlave.clothes = "a halter top dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Hijab and abaya">><<set $activeSlave.clothes = "a hijab and abaya",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Latex catsuit">><<set $activeSlave.clothes = "a latex catsuit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Leotard">><<set $activeSlave.clothes = "a leotard",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Maid (nice)">><<set $activeSlave.clothes = "a nice maid outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Maid (slutty)">><<set $activeSlave.clothes = "a slutty maid outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Military uniform">><<set $activeSlave.clothes = "a military uniform",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Mini dress">><<set $activeSlave.clothes = "a mini dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Nice lingerie">><<set $activeSlave.clothes = "attractive lingerie",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Nurse (nice)">><<set $activeSlave.clothes = "a nice nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Nurse (slutty)">><<set $activeSlave.clothes = "a slutty nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Schoolgirl">><<set $activeSlave.clothes = "a schoolgirl outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Silken ballgown">><<set $activeSlave.clothes = "a ball gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Skimpy battledress">><<set $activeSlave.clothes = "battledress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Slave gown">><<set $activeSlave.clothes = "a slave gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "String bikini">><<set $activeSlave.clothes = "a string bikini",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Succubus costume">><<set $activeSlave.clothes = "a succubus outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Suit (nice)">><<set $activeSlave.clothes = "nice business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Suit (slutty)">><<set $activeSlave.clothes = "slutty business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+
+<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityLingerie == 1)>>
+ | //FS// <<link "Attractive lingerie for a pregnant woman">><<set $activeSlave.clothes = "attractive lingerie for a pregnant woman",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
+ | //FS// <<link "Bunny outfit">><<set $activeSlave.clothes = "a bunny outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSPhysicalIdealist != "unset") || ($cheatMode == 1) || ($clothesBoughtOil == 1)>>
+ | //FS// <<link "Body oil">><<set $activeSlave.clothes = "body oil",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
+ | //FS// <<link "Chains">><<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>>
+ | //FS// <<link "Chattel habit">><<set $activeSlave.clothes = "a chattel habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSPaternalist != "unset") || ($cheatMode == 1) || ($clothesBoughtConservative == 1)>>
+ | //FS// <<link "Conservative clothing">><<set $activeSlave.clothes = "conservative clothing",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>>
+ | //FS// <<link "Harem gauze">><<set $activeSlave.clothes = "harem gauze",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
+ | //FS// <<link "Kimono">><<set $activeSlave.clothes = "a kimono",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityDress == 1)>>
+ | //FS// <<link "Maternity dress">><<set $activeSlave.clothes = "a maternity dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>>
+ | //FS// <<link "Slutty qipao">><<set $activeSlave.clothes = "a slutty qipao",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSRomanRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtToga == 1)>>
+ | //FS// <<link "Toga">><<set $activeSlave.clothes = "a toga",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSPastoralist != "unset") || ($cheatMode == 1) || ($clothesBoughtWestern == 1)>>
+ | //FS// <<link "Western clothing">><<set $activeSlave.clothes = "Western clothing",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+<</if>>
+
+<br> //Harsh://
+ <<link "Go naked">><<set $activeSlave.clothes = "no clothing", $activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Penitent nun">><<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Restrictive latex">><<set $activeSlave.clothes = "restrictive latex",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Shibari ropes">><<set $activeSlave.clothes = "shibari ropes",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Uncomfortable straps">><<set $activeSlave.clothes = "uncomfortable straps",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+
+
+<br>Collar: ''<span id="collar">$activeSlave.collar</span>.''
+<<link "None">><<set $activeSlave.collar = "none">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<br> //Nice://
+<<link "Stylish leather">><<set $activeSlave.collar = "stylish leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| <<link "Satin choker">><<set $activeSlave.collar = "satin choker">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| <<link "Silken ribbon">><<set $activeSlave.collar = "silk ribbon">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| <<link "Heavy gold">><<set $activeSlave.collar = "heavy gold">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| <<link "Pretty jewelry">><<set $activeSlave.collar = "pretty jewelry">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+ <<if ($seeAge != 0)>>
+ | <<link "Nice retirement counter">><<set $activeSlave.collar = "nice retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<</if>>
+| <<link "Cowbell">><<set $activeSlave.collar = "leather with cowbell">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
+ | //FS// <<link "Bowtie collar">><<set $activeSlave.collar = "bowtie">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSEgyptianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtEgypt == 1)>>
+ | //FS// <<link "Ancient Egyptian">><<set $activeSlave.collar = "ancient Egyptian">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<</if>>
+<br> //Harsh://
+<<link "Tight steel">><<set $activeSlave.collar = "tight steel">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<<if ($seeAge != 0)>>
+ | <<link "Cruel retirement counter">><<set $activeSlave.collar = "cruel retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<</if>>
+| <<link "Uncomfortable leather">><<set $activeSlave.collar = "uncomfortable leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+ <<if $activeSlave.preg > -1>>
+| <<link "Pregnancy biometrics">><<set $activeSlave.collar = "preg biometrics">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<</if>>
+| <<link "Shock punishment">><<set $activeSlave.collar = "shock punishment">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| <<link "Dildo gag">><<set $activeSlave.collar = "dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<<if $toysBoughtGags == 1 && $activeSlave.oralSkill > 0>>
+| <<link "Massive dildo gag">><<set $activeSlave.collar = "massive dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+<</if>>
+| <<link "Neck corset">><<set $activeSlave.collar = "neck corset">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+
+<<if $activeSlave.amp != 1>>
+<br>Shoes: ''<span id="shoes">$activeSlave.shoes</span>.''
+<<link "Go barefoot">><<set $activeSlave.shoes = "none">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
+| <<link "Flats">><<set $activeSlave.shoes = "flats">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
+| <<link "Heels">><<set $activeSlave.shoes = "heels">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
+| <<link "Thigh boots">><<set $activeSlave.shoes = "boots">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
+| <<link "Painfully extreme heels">><<set $activeSlave.shoes = "extreme heels">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
+<</if>>
+
+<br>Torso accessory: ''<span id="bellyAccessory">$activeSlave.bellyAccessory</span>.''
+<<link "None">><<set $activeSlave.bellyAccessory = "none">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+| <<link "Tight corset">><<set $activeSlave.bellyAccessory = "a corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+<<if $activeSlave.breedingMark != 1>>
+| <<link "Extreme corset">><<set $activeSlave.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+<</if>>
+<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtBelly == 1)>>
+<<if $activeSlave.preg <= 10 && $activeSlave.inflation == 0>>
+| <<link "1st Trimester belly">><<set $activeSlave.bellyAccessory = "a small empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+| <<link "2nd Trimester belly">><<set $activeSlave.bellyAccessory = "a medium empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+| <<link "3rd Trimester belly">><<set $activeSlave.bellyAccessory = "a large empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+| <<link "3rd Trimester twins belly">><<set $activeSlave.bellyAccessory = "a huge empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
+<</if>>
+<</if>>
+
+<br>Anal accessory: ''<span id="buttplug">$activeSlave.buttplug</span>.''
+<<link "None">><<set $activeSlave.buttplug = "none">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
+| <<link "Normal">><<set $activeSlave.buttplug = "plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
+<<if $toysBoughtButtPlugs == 1>>
+<<if $activeSlave.breedingMark != 1>>
+| <<link "Long">><<set $activeSlave.buttplug = "long plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
+<</if>>
+<</if>>
+| <<link "Large">><<set $activeSlave.buttplug = "large plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
+<<if $toysBoughtButtPlugs == 1>>
+<<if $activeSlave.breedingMark != 1>>
+| <<link "Long and large">><<set $activeSlave.buttplug = "long, large plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
+<</if>>
+<</if>>
+<<if $activeSlave.anus >= 2>>| <<link "Huge">><<set $activeSlave.buttplug = "huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>><</if>>
+<<if $toysBoughtButtPlugs == 1>>
+<<if $activeSlave.breedingMark != 1>>
+| <<link "Long and huge">><<set $activeSlave.buttplug = "long, huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
+<</if>>
+<</if>>
+<<if $activeSlave.vagina > -1>>
+<br>Vaginal accessory: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
+<<link "None">><<set $activeSlave.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+| <<link "Dildo">><<set $activeSlave.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
+<<if $toysBoughtDildos == 1>>
+<<if $activeSlave.breedingMark != 1>>
+| <<link "Long dildo">><<set $activeSlave.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
+<</if>>
+<</if>>
+| <<link "Large dildo">><<set $activeSlave.vaginalAccessory = "large dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
+<<if $toysBoughtDildos == 1>>
+<<if $activeSlave.breedingMark != 1>>
+| <<link "Large and long dildo">><<set $activeSlave.vaginalAccessory = "long, large dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
+<</if>>
+<</if>>
+<<if $activeSlave.vagina >= 2>>| <<link "Huge dildo">><<set $activeSlave.vaginalAccessory = "huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>><</if>>
+<<if $toysBoughtDildos == 1>>
+<<if $activeSlave.breedingMark != 1>>
+<<if $activeSlave.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeSlave.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>><</if>>
+<</if>>
+<</if>>
+| <<link "Chastity belt">><<set $activeSlave.vaginalAccessory = "chastity belt",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+| <<link "Anal chastity belt">><<set $activeSlave.vaginalAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+| <<link "Combined chastity belt">><<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+<</if>>
+<<if $activeSlave.dick > 0>>
+<br>Dick accessory: ''<span id="dickAccessory">$activeSlave.dickAccessory</span>.''
+<<link "None">><<set $activeSlave.dickAccessory = "none">><<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+| <<link "Chastity cage">><<set $activeSlave.dickAccessory = "chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+| <<link "Anal chastity belt">><<set $activeSlave.dickAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeSlave.dickAccessory<<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</replace>><</link>>
+| <<link "Combined chastity belt">><<set $activeSlave.dickAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+<</if>>
+
+<<if $arcologies[0].FSRestart != "unset" && $activeSlave.devotion > 20 && $activeSlave.trust > 0 && $activeSlave.choosesOwnClothes == 1>>
+<br>
+ <<if $activeSlave.choosesOwnChastity == 1>>
+ She is allowed to decide whether she to wear chastity devices.
+ [[Withdraw Privilege|Slave Interact][$activeSlave.choosesOwnChastity = 0]]
+ <<else>>
+ She is not allowed to choose whether to wear chastity devices.
+ [[Allow Choice|Slave Interact][$activeSlave.choosesOwnChastity = 1]]
+ <</if>>
+<</if>>
+
+<</if>> /* CLOSES FUCKDOLL CHECK */
+
+<br><br>Body modification:
[[Use remote surgery|Remote Surgery][$degradation = 0]]
| [[Use body mod studio|Body Modification][$degradation = 0]]
| [[Use auto salon|Salon][$degradation = 0]]
<<if $cyberMod == 1>>| [[Configure cybernetics|cyberConfig][$temp = 0]]<</if>>
-<br>__Drugs__: <span id="drugs"><strong>$activeSlave.drugs</strong></span>.
+<br><br>__Physical Regimen:__
+<br>Drugs: <span id="drugs"><strong>$activeSlave.drugs</strong></span>.
<<link "None">><<set $activeSlave.drugs = "no drugs">><<replace "#drugs">><strong>$activeSlave.drugs</strong><</replace>><</link>>
<<if $activeSlave.indentureRestrictions < 2>>
<<if ($activeSlave.intelligence > -2)>>
@@ -723,19 +926,19 @@
<br>
-__Health__: <span id="curatives"><strong><<if $activeSlave.curatives > 1>>curatives<<elseif $activeSlave.curatives > 0>>preventatives<<else>>none<</if>></strong></span>.
+Health: <span id="curatives"><strong><<if $activeSlave.curatives > 1>>curatives<<elseif $activeSlave.curatives > 0>>preventatives<<else>>none<</if>></strong></span>.
<<link "None">><<set $activeSlave.curatives = 0>><<replace "#curatives">><strong>none</strong><</replace>><</link>>
| <<link "Preventatives">><<set $activeSlave.curatives = 1>><<replace "#curatives">><strong>preventatives</strong><</replace>><</link>>
| <<link "Curatives">><<set $activeSlave.curatives = 2>><<replace "#curatives">><strong>curatives</strong><</replace>><</link>>
-__Aphrodisiacs__: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1>>extreme<<elseif $activeSlave.aphrodisiacs > 0>>applied<<else>>none<</if>></strong></span>.
+Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1>>extreme<<elseif $activeSlave.aphrodisiacs > 0>>applied<<else>>none<</if>></strong></span>.
<<link "None">><<set $activeSlave.aphrodisiacs = 0>><<replace "#aphrodisiacs">><strong>none</strong><</replace>><</link>>
| <<link "Apply">><<set $activeSlave.aphrodisiacs = 1>><<replace "#aphrodisiacs">><strong>applied</strong><</replace>><</link>>
| <<link "Extreme">><<set $activeSlave.aphrodisiacs = 2>><<replace "#aphrodisiacs">><strong>extreme</strong><</replace>><</link>>
-<br>
+<br>
<span id="fertilityblock">
<<if $activeSlave.fuckdoll == 0 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>>
<<if ($activeSlave.preg < -1)>>
@@ -748,7 +951,7 @@ __Aphrodisiacs__: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs
<<set $activeSlave.preg = 0>>
<</if>>
<<elseif $activeSlave.preg >= -1>>
-__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
+Contraception: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
<<if ($activeSlave.preg == 0)>>
<<link "Use contraceptives">><<set $activeSlave.preg = -1>>
<<SlaveInteractFertility>>
@@ -867,7 +1070,8 @@ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation is
<</if>>
</span>
-__Hormones__: <strong><span id="hormones">
+<br>
+Hormones: <strong><span id="hormones">
<<if $activeSlave.hormones == -2>>intensive male<<elseif $activeSlave.hormones == -1>>male<<elseif $activeSlave.hormones == 2>>intensive female<<elseif $activeSlave.hormones == 1>>female<<else>>none<</if>></span></strong>.
<<link "Intensive Female">><<set $activeSlave.hormones = 2>><<replace "#hormones">>intensive female<</replace>><</link>> |
<<link "Female">><<set $activeSlave.hormones = 1>><<replace "#hormones">>female<</replace>><</link>> |
@@ -875,7 +1079,7 @@ __Hormones__: <strong><span id="hormones">
<<link "Male">><<set $activeSlave.hormones = -1>><<replace "#hormones">>male<</replace>><</link>> |
<<link "Intensive Male">><<set $activeSlave.hormones = -2>><<replace "#hormones">>intensive male<</replace>><</link>>
-<br>__Diet__: <strong><span id="diet">$activeSlave.diet</span></strong>.
+<br>Diet: <strong><span id="diet">$activeSlave.diet</span></strong>.
<<link "Healthy">><<set $activeSlave.diet = "healthy">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<<if ($activeSlave.balls > 0) && ($cumProDiet == 1)>>
| <<link "Cum production">><<set $activeSlave.diet = "cum production">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
@@ -908,7 +1112,7 @@ __Hormones__: <strong><span id="hormones">
| <<link "Slim down">><<set $activeSlave.diet = "slimming">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<</if>>
-<br>__Diet Base__: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum Based<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 0)>>Cum Added<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 1)>>Cum and Milk Added<<elseif ($activeSlave.dietMilk == 1) && ($activeSlave.dietCum == 0)>>Milk Added<<elseif ($activeSlave.dietMilk == 2)>>Milk Based<<elseif ($activeSlave.dietCum == 0) && ($activeSlave.dietMilk == 0)>>Normal<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>
+<br>Diet Base: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum Based<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 0)>>Cum Added<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 1)>>Cum and Milk Added<<elseif ($activeSlave.dietMilk == 1) && ($activeSlave.dietCum == 0)>>Milk Added<<elseif ($activeSlave.dietMilk == 2)>>Milk Based<<elseif ($activeSlave.dietCum == 0) && ($activeSlave.dietMilk == 0)>>Normal<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>
<<link "Normal">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>Normal<</replace>><</link>> |
<<link "Cum Added">><<set $activeSlave.dietCum = 1>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>Cum Added<</replace>><</link>> |
<<link "Milk Added">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 1>><<replace "#dietBase">>Milk Added<</replace>><</link>> |
@@ -916,7 +1120,9 @@ __Hormones__: <strong><span id="hormones">
<<link "Cum Based">><<set $activeSlave.dietCum = 2>><<set $activeSlave.dietMilk = 0>><<replace "#dietBase">>Cum Based<</replace>><</link>> |
<<link "Milk Based">><<set $activeSlave.dietCum = 0>><<set $activeSlave.dietMilk = 2>><<replace "#dietBase">>Milk Based<</replace>><</link>>
-<br>
+
+
+<br><br>__Behavior__:<br>
<<if $activeSlave.fuckdoll > 0>>
//Rules have little meaning for living sex toys//
<<else>>
@@ -934,7 +1140,7 @@ __Hormones__: <strong><span id="hormones">
<</if>>
<</if>>
<</for>>
- __Living Standard__: ''<span id="livingRules">$activeSlave.livingRules</span>.''
+ Living standard: ''<span id="livingRules">$activeSlave.livingRules</span>.''
<<if $activeSlave.livingRules == "spare">>
<<link "Normal">><<set $activeSlave.livingRules = "normal">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
<<if $roomsPopulation <= $rooms-0.5>><<link "Luxurious">><<set $activeSlave.livingRules = "luxurious">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>><<else>>//No luxurious rooms available//<</if>>
@@ -945,29 +1151,10 @@ __Hormones__: <strong><span id="hormones">
<<link "Spare">><<set $activeSlave.livingRules = "spare">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>> |
<<link "Normal">><<set $activeSlave.livingRules = "normal">><<replace "#livingRules">>$activeSlave.livingRules<</replace>><</link>>
<</if>>
-
- <<if $activeSlave.voice != 0>>
- __Speech Rules__: ''<span id="speechRules">$activeSlave.speechRules</span>.''
- <<if $activeSlave.speechRules == "restrictive">>
- <<link "Permissive">><<set $activeSlave.speechRules = "permissive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><<if $activeSlave.accent > 0 && $activeSlave.accent < 4>> | <<link "Accent elimination">><<set $activeSlave.speechRules = "accent elimination">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><</if>><<if $activeSlave.accent > 3>> | <<link "Language lessons">><<set $activeSlave.speechRules = "language lessons">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><</if>>
- <<elseif $activeSlave.speechRules == "permissive">>
- <<if $activeSlave.accent > 0 && $activeSlave.accent < 4>><<link "Accent elimination">><<set $activeSlave.speechRules = "accent elimination">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> | <</if>><<if $activeSlave.accent > 3>><<link "Language lessons">><<set $activeSlave.speechRules = "language lessons">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> | <</if>><<link "Restrictive">><<set $activeSlave.speechRules = "restrictive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
- <<else>>
- <<link "Permissive">><<set $activeSlave.speechRules = "permissive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> | <<link "Restrictive">><<set $activeSlave.speechRules = "restrictive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
- <</if>>
- <</if>>
- __Relationship Rules__: ''<span id="relationshipRules">$activeSlave.relationshipRules</span>.''
- <<if $activeSlave.relationshipRules == "restrictive">>
- <<link "Just friends">><<set $activeSlave.relationshipRules = "just friends">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
- | <<link "Permissive">><<set $activeSlave.relationshipRules = "permissive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
- <<elseif $activeSlave.relationshipRules == "just friends">>
- <<link "Restrictive">><<set $activeSlave.relationshipRules = "restrictive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
- | <<link "Permissive">><<set $activeSlave.relationshipRules = "permissive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
- <<else>>
- <<link "Just friends">><<set $activeSlave.relationshipRules = "just friends">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
- | <<link "Restrictive">><<set $activeSlave.relationshipRules = "restrictive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
- <</if>>
- <br>__Typical Punishment__: ''<span id="standardPunishment">$activeSlave.standardPunishment</span>.''
+
+
+
+ <br>Typical punishment: ''<span id="standardPunishment">$activeSlave.standardPunishment</span>.''
<<if $activeSlave.standardPunishment !== "confinement">>
<<link "Confinement">><<set $activeSlave.standardPunishment = "confinement">><<replace "#standardPunishment">>$activeSlave.standardPunishment<</replace>><</link>> |
<</if>>
@@ -980,7 +1167,8 @@ __Hormones__: <strong><span id="hormones">
<<if $activeSlave.standardPunishment !== "situational">>
<<link "Situational">><<set $activeSlave.standardPunishment = "situational">><<replace "#standardPunishment">>$activeSlave.standardPunishment<</replace>><</link>>
<</if>>
- __Typical Reward__: ''<span id="standardReward">$activeSlave.standardReward</span>.''
+
+ Typical reward: ''<span id="standardReward">$activeSlave.standardReward</span>.''
<<if $activeSlave.standardReward !== "relaxation">>
<<link "Relaxation">><<set $activeSlave.standardReward = "relaxation">><<replace "#standardReward">>$activeSlave.standardReward<</replace>><</link>> |
<</if>>
@@ -993,7 +1181,7 @@ __Hormones__: <strong><span id="hormones">
<<if $activeSlave.standardReward !== "situational">>
<<link "Situational">><<set $activeSlave.standardReward = "situational">><<replace "#standardReward">>$activeSlave.standardReward<</replace>><</link>>
<</if>>
- <br>__Non-Assignment Orgasm Rules__: ''$activeSlave.releaseRules.''
+ <br>Non-assignment orgasm rules: ''$activeSlave.releaseRules.''
[[Permit masturbation and interslave sex|Slave Interact][$activeSlave.releaseRules = "permissive"]]
| [[Let her get off with other slaves|Slave Interact][$activeSlave.releaseRules = "sapphic"]]
| [[Only with you|Slave Interact][$activeSlave.releaseRules = "restrictive"]]
@@ -1023,198 +1211,29 @@ __Hormones__: <strong><span id="hormones">
| <<link "No sex">><<set $activeSlave.clitSetting = "none">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
<</if>>
-
-<<if $activeSlave.fuckdoll == 0>>
-<br>__Clothes__: ''<span id="clothes">$activeSlave.clothes</span>.''
-<<link "Go naked">><<set $activeSlave.clothes = "no clothing", $activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| //Harsh:// <<link "Uncomfortable straps">><<set $activeSlave.clothes = "uncomfortable straps",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Shibari ropes">><<set $activeSlave.clothes = "shibari ropes",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Restrictive latex">><<set $activeSlave.clothes = "restrictive latex",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Penitent nun">><<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| //Nice:// <<link "Nice lingerie">><<set $activeSlave.clothes = "attractive lingerie",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slutty maid">><<set $activeSlave.clothes = "a slutty maid outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Nice maid">><<set $activeSlave.clothes = "a nice maid outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Haltertop dress">><<set $activeSlave.clothes = "a halter top dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Mini dress">><<set $activeSlave.clothes = "a mini dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Silken ballgown">><<set $activeSlave.clothes = "a ball gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "String bikini">><<set $activeSlave.clothes = "a string bikini",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Clubslut netting">><<set $activeSlave.clothes = "clubslut netting",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Cheerleader outfit">><<set $activeSlave.clothes = "a cheerleader outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeSlave.clothes>><</replace>><</link>>
-| <<link "Cutoffs and a t-shirt">><<set $activeSlave.clothes = "cutoffs and a t-shirt",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slave gown">><<set $activeSlave.clothes = "a slave gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slutty suit">><<set $activeSlave.clothes = "slutty business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Nice suit">><<set $activeSlave.clothes = "nice business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slutty nurse">><<set $activeSlave.clothes = "a slutty nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Nice nurse">><<set $activeSlave.clothes = "a nice nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Schoolgirl">><<set $activeSlave.clothes = "a schoolgirl outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Bodysuit">><<set $activeSlave.clothes = "a comfortable bodysuit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Latex catsuit">><<set $activeSlave.clothes = "a latex catsuit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Leotard">><<set $activeSlave.clothes = "a leotard",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Skimpy battledress">><<set $activeSlave.clothes = "battledress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Military uniform">><<set $activeSlave.clothes = "a military uniform",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Fallen nun">><<set $activeSlave.clothes = "a fallen nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Hijab and abaya">><<set $activeSlave.clothes = "a hijab and abaya",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Bangles">><<set $activeSlave.clothes = "slutty jewelry",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Succubus costume">><<set $activeSlave.clothes = "a succubus outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
- | //FS// <<link "Bunny outfit">><<set $activeSlave.clothes = "a bunny outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSPaternalist != "unset") || ($cheatMode == 1) || ($clothesBoughtConservative == 1)>>
- | //FS// <<link "Conservative clothing">><<set $activeSlave.clothes = "conservative clothing",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSDegradationist != "unset") || ($cheatMode == 1) || ($clothesBoughtChains == 1)>>
- | //FS// <<link "Chains">><<set $activeSlave.clothes = "chains",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSPastoralist != "unset") || ($cheatMode == 1) || ($clothesBoughtWestern == 1)>>
- | //FS// <<link "Western clothing">><<set $activeSlave.clothes = "Western clothing",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityDress == 1)>>
- | //FS// <<link "A maternity dress">><<set $activeSlave.clothes = "a maternity dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtMaternityLingerie == 1)>>
- | //FS// <<link "Attractive lingerie for a pregnant woman">><<set $activeSlave.clothes = "attractive lingerie for a pregnant woman",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSPhysicalIdealist != "unset") || ($cheatMode == 1) || ($clothesBoughtOil == 1)>>
- | //FS// <<link "Body oil">><<set $activeSlave.clothes = "body oil",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSChattelReligionist != "unset") || ($cheatMode == 1) || ($clothesBoughtHabit == 1)>>
- | //FS// <<link "Chattel habit">><<set $activeSlave.clothes = "a chattel habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSRomanRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtToga == 1)>>
- | //FS// <<link "Toga">><<set $activeSlave.clothes = "a toga",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSEdoRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtKimono == 1)>>
- | //FS// <<link "Kimono">><<set $activeSlave.clothes = "a kimono",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSArabianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtHarem == 1)>>
- | //FS// <<link "Harem gauze">><<set $activeSlave.clothes = "harem gauze",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>>
- | //FS// <<link "Slutty qipao">><<set $activeSlave.clothes = "a slutty qipao",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-<</if>>
-| <<link "Select her own clothes">><<set $activeSlave.clothes = "choosing her own clothes",$activeSlave.choosesOwnClothes = 1>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-
-<br>__Collar__: ''<span id="collar">$activeSlave.collar</span>.''
-<<link "None">><<set $activeSlave.collar = "none">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| //Harsh:// <<link "Tight steel">><<set $activeSlave.collar = "tight steel">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<<if ($seeAge != 0)>>
- | <<link "Cruel retirement counter">><<set $activeSlave.collar = "cruel retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<</if>>
-| <<link "Uncomfortable leather">><<set $activeSlave.collar = "uncomfortable leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
- <<if $activeSlave.preg > -1>>
-| <<link "Pregnancy biometrics">><<set $activeSlave.collar = "preg biometrics">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<</if>>
-| <<link "Shock punishment">><<set $activeSlave.collar = "shock punishment">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Dildo gag">><<set $activeSlave.collar = "dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<<if $toysBoughtGags == 1 && $activeSlave.oralSkill > 0>>
-| <<link "Massive dildo gag">><<set $activeSlave.collar = "massive dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<</if>>
-| <<link "Neck corset">><<set $activeSlave.collar = "neck corset">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| //Nice:// <<link "Stylish leather">><<set $activeSlave.collar = "stylish leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Satin choker">><<set $activeSlave.collar = "satin choker">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Silken ribbon">><<set $activeSlave.collar = "silk ribbon">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Heavy gold">><<set $activeSlave.collar = "heavy gold">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Pretty jewelry">><<set $activeSlave.collar = "pretty jewelry">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
- <<if ($seeAge != 0)>>
- | <<link "Nice retirement counter">><<set $activeSlave.collar = "nice retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<</if>>
-| <<link "Cowbell">><<set $activeSlave.collar = "leather with cowbell">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
- | //FS// <<link "Bowtie collar">><<set $activeSlave.collar = "bowtie">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSEgyptianRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtEgypt == 1)>>
- | //FS// <<link "Ancient Egyptian">><<set $activeSlave.collar = "ancient Egyptian">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-<</if>>
-
-<<if $activeSlave.amp != 1>>
-<br>__Shoes__: ''<span id="shoes">$activeSlave.shoes</span>.''
-<<link "Go barefoot">><<set $activeSlave.shoes = "none">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
-| <<link "Flats">><<set $activeSlave.shoes = "flats">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
-| <<link "Heels">><<set $activeSlave.shoes = "heels">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
-| <<link "Thigh boots">><<set $activeSlave.shoes = "boots">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
-| <<link "Painfully extreme heels">><<set $activeSlave.shoes = "extreme heels">><<replace "#shoes">>$activeSlave.shoes<</replace>><</link>>
-<</if>>
-
-<br>__Torso accessory__: ''<span id="bellyAccessory">$activeSlave.bellyAccessory</span>.''
-<<link "None">><<set $activeSlave.bellyAccessory = "none">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-| <<link "Tight corset">><<set $activeSlave.bellyAccessory = "a corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-<<if $activeSlave.breedingMark != 1>>
-| <<link "Extreme corset">><<set $activeSlave.bellyAccessory = "an extreme corset">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-<</if>>
-<<if ($arcologies[0].FSRepopulationFocus != "unset") || ($cheatMode == 1) || ($clothesBoughtBelly == 1)>>
-<<if $activeSlave.preg <= 10 && $activeSlave.inflation == 0>>
-| <<link "1st Trimester belly">><<set $activeSlave.bellyAccessory = "a small empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-| <<link "2nd Trimester belly">><<set $activeSlave.bellyAccessory = "a medium empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-| <<link "3rd Trimester belly">><<set $activeSlave.bellyAccessory = "a large empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-| <<link "3rd Trimester twins belly">><<set $activeSlave.bellyAccessory = "a huge empathy belly">><<replace "#bellyAccessory">>$activeSlave.bellyAccessory<</replace>><</link>>
-<</if>>
-<</if>>
-
-<br>__Anal accessory__: ''<span id="buttplug">$activeSlave.buttplug</span>.''
-<<link "None">><<set $activeSlave.buttplug = "none">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
-| <<link "Normal">><<set $activeSlave.buttplug = "plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
-<<if $toysBoughtButtPlugs == 1>>
-<<if $activeSlave.breedingMark != 1>>
-| <<link "Long">><<set $activeSlave.buttplug = "long plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
-<</if>>
-<</if>>
-| <<link "Large">><<set $activeSlave.buttplug = "large plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
-<<if $toysBoughtButtPlugs == 1>>
-<<if $activeSlave.breedingMark != 1>>
-| <<link "Long and large">><<set $activeSlave.buttplug = "long, large plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
-<</if>>
-<</if>>
-<<if $activeSlave.anus >= 2>>| <<link "Huge">><<set $activeSlave.buttplug = "huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>><</if>>
-<<if $toysBoughtButtPlugs == 1>>
-<<if $activeSlave.breedingMark != 1>>
-| <<link "Long and huge">><<set $activeSlave.buttplug = "long, huge plug">><<replace "#buttplug">>$activeSlave.buttplug<</replace>><</link>>
-<</if>>
-<</if>>
-<<if $activeSlave.vagina > -1>>
-<br>__Vaginal accessory__: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
-<<link "None">><<set $activeSlave.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Dildo">><<set $activeSlave.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
-<<if $toysBoughtDildos == 1>>
-<<if $activeSlave.breedingMark != 1>>
-| <<link "Long dildo">><<set $activeSlave.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
-<</if>>
-<</if>>
-| <<link "Large dildo">><<set $activeSlave.vaginalAccessory = "large dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
-<<if $toysBoughtDildos == 1>>
-<<if $activeSlave.breedingMark != 1>>
-| <<link "Large and long dildo">><<set $activeSlave.vaginalAccessory = "long, large dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
-<</if>>
-<</if>>
-<<if $activeSlave.vagina >= 2>>| <<link "Huge dildo">><<set $activeSlave.vaginalAccessory = "huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>><</if>>
-<<if $toysBoughtDildos == 1>>
-<<if $activeSlave.breedingMark != 1>>
-<<if $activeSlave.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeSlave.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>><</if>>
-<</if>>
-<</if>>
-| <<link "Chastity belt">><<set $activeSlave.vaginalAccessory = "chastity belt",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Anal chastity belt">><<set $activeSlave.vaginalAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Combined chastity belt">><<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-<</if>>
-<<if $activeSlave.dick > 0>>
-<br>__Dick accessory__: ''<span id="dickAccessory">$activeSlave.dickAccessory</span>.''
-<<link "None">><<set $activeSlave.dickAccessory = "none">><<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Chastity cage">><<set $activeSlave.dickAccessory = "chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-| <<link "Anal chastity belt">><<set $activeSlave.dickAccessory = "anal chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeSlave.dickAccessory<<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</replace>><</link>>
-| <<link "Combined chastity belt">><<set $activeSlave.dickAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-<</if>>
-
-<<if $arcologies[0].FSRestart != "unset" && $activeSlave.devotion > 20 && $activeSlave.trust > 0 && $activeSlave.choosesOwnClothes == 1>>
-<br>
- <<if $activeSlave.choosesOwnChastity == 1>>
- She is allowed to decide whether she to wear chastity devices.
- [[Withdraw Privilege|Slave Interact][$activeSlave.choosesOwnChastity = 0]]
+ <<if $activeSlave.voice != 0>>
+ <br>Speech rules: ''<span id="speechRules">$activeSlave.speechRules</span>.''
+ <<if $activeSlave.speechRules == "restrictive">>
+ <<link "Permissive">><<set $activeSlave.speechRules = "permissive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><<if $activeSlave.accent > 0 && $activeSlave.accent < 4>> | <<link "Accent elimination">><<set $activeSlave.speechRules = "accent elimination">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><</if>><<if $activeSlave.accent > 3>> | <<link "Language lessons">><<set $activeSlave.speechRules = "language lessons">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>><</if>>
+ <<elseif $activeSlave.speechRules == "permissive">>
+ <<if $activeSlave.accent > 0 && $activeSlave.accent < 4>><<link "Accent elimination">><<set $activeSlave.speechRules = "accent elimination">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> | <</if>><<if $activeSlave.accent > 3>><<link "Language lessons">><<set $activeSlave.speechRules = "language lessons">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> | <</if>><<link "Restrictive">><<set $activeSlave.speechRules = "restrictive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
<<else>>
- She is not allowed to choose whether to wear chastity devices.
- [[Allow Choice|Slave Interact][$activeSlave.choosesOwnChastity = 1]]
+ <<link "Permissive">><<set $activeSlave.speechRules = "permissive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>> | <<link "Restrictive">><<set $activeSlave.speechRules = "restrictive">><<replace "#speechRules">>$activeSlave.speechRules<</replace>><</link>>
+ <</if>>
<</if>>
-<</if>>
-<</if>> /* CLOSES FUCKDOLL CHECK */
+ <br>
+ Relationship rules: ''<span id="relationshipRules">$activeSlave.relationshipRules</span>.''
+ <<if $activeSlave.relationshipRules == "restrictive">>
+ <<link "Just friends">><<set $activeSlave.relationshipRules = "just friends">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
+ | <<link "Permissive">><<set $activeSlave.relationshipRules = "permissive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
+ <<elseif $activeSlave.relationshipRules == "just friends">>
+ <<link "Restrictive">><<set $activeSlave.relationshipRules = "restrictive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
+ | <<link "Permissive">><<set $activeSlave.relationshipRules = "permissive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
+ <<else>>
+ <<link "Just friends">><<set $activeSlave.relationshipRules = "just friends">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
+ | <<link "Restrictive">><<set $activeSlave.relationshipRules = "restrictive">><<replace "#relationshipRules">>$activeSlave.relationshipRules<</replace>><</link>>
+ <</if>>
<<if $studio == 1>>
<br>
@@ -1222,9 +1241,14 @@ __Hormones__: <strong><span id="hormones">
The media hub is not releasing highlights of her sex life. [[Release|Slave Interact][$activeSlave.pornFameSpending = 0]]
<<else>>
<<if $activeSlave.prestige < 3>>
- The media hub is releasing highlights of her sex life. ¤$activeSlave.pornFameSpending weekly is spent to publicize them.
- <<if $activeSlave.pornFameSpending < 5000>>
- [[Increase|Slave Interact][$activeSlave.pornFameSpending += 1000]]
+ The media hub is releasing <<if $activeSlave.pornFameSpending < 500>> minimal <</if>> highlights of her sex life.
+
+ <<if $activeSlave.pornFameSpending == 0>>
+ [[Begin publicizing?|Slave Interact][$activeSlave.pornFameSpending += 1000]]
+ //Will cost ¤1000 weekly.//
+ <<elseif $activeSlave.pornFameSpending < 5000 && $activeSlave.pornFameSpending > 0>>
+ ¤$activeSlave.pornFameSpending weekly is spent to publicize them.
+ [[Increase|Slave Interact][$activeSlave.pornFameSpending += 1000]]
<</if>>
<<if ($activeSlave.pornFameSpending < 5000) && ($activeSlave.pornFameSpending > 0)>>
|
@@ -1239,6 +1263,7 @@ __Hormones__: <strong><span id="hormones">
<br>
<</if>>
+
<br><br>
<<if ($slaveCostFactor > 1)>>
@@.yellow;The slave market is bullish; the price of slaves is high.@@
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 6f4b2e0838e..fff0baab24d 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -95,188 +95,186 @@
She has a natural mothering instinct and really makes her girls feel at home.
<<set _idleBonus++, _healthBonus++>>
<</if>>
- <<if $spaSlaves > 0>>
- <<set _attendantUsedCure = 0>>
+ <<set _attendantUsedCure = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $SpaiIDs[_dI].Index>>
- <<if ($slaves[_i].fetish == "mindbroken") && ($slaves[_i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
- <<set _attendantUsedCure = 1>>
- <<if (random(1,100) > 90-$Attendant.devotion)>>
- <br> @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[_i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[_i].slaveName has begun to respond, and is stirring from her mental torpor.
- <<set $slaves[_i].devotion = -3, $slaves[_i].sexualFlaw = "apathetic", $slaves[_i].behavioralFlaw = either("hates men", "odd"), $slaves[_i].fetish = "none", $slaves[_i].fetishKnown = 1>>
- <<if ($arcologies[0].FSPaternalist > 0)>>
- Society @@.green;strongly approves@@ of $slaves[_i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
- <<set $repGain += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel), $arcologies[0].FSPaternalist += 0.01*$FSSingleSlaveRep>>
- <</if>>
- <</if>>
- <</if>>
- <<set _seed = _bonusToggle * 10>>
- <<if _bonusToggle == 1 && $slaves[_i].trust < 60>>
- <<set $slaves[_i].trust++>>
- <</if>>
- <<if ($Attendant.intelligence > 0) && (_attendantUsedCure == 0) && ($spaFix == 0)>>
- <<if $slaves[_i].behavioralFlaw != "none">>
- <<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
- <<switch $slaves[_i].behavioralFlaw>>
- <<case "arrogant">>
- <<set $slaves[_i].behavioralQuirk = "confident">>
- <<case "bitchy">>
- <<set $slaves[_i].behavioralQuirk = "cutting">>
- <<case "odd">>
- <<set $slaves[_i].behavioralQuirk = "funny">>
- <<case "hates men">>
- <<set $slaves[_i].behavioralQuirk = "adores women">>
- <<case "hates women">>
- <<set $slaves[_i].behavioralQuirk = "adores men">>
- <<case "gluttonous">>
- <<set $slaves[_i].behavioralQuirk = "fitness">>
- <<case "anorexic">>
- <<set $slaves[_i].behavioralQuirk = "insecure">>
- <<case "devout">>
- <<set $slaves[_i].behavioralQuirk = "sinful">>
- <<case "liberated">>
- <<set $slaves[_i].behavioralQuirk = "advocate">>
- <</switch>>
- <<set $slaves[_i].behavioralFlaw = "none", _attendantUsedCure += 1>>
- <br> $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
- <</if>>
- <<elseif $slaves[_i].sexualFlaw != "none">>
- <<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
- <<switch $slaves[_i].sexualFlaw>>
- <<case "hates oral">>
- <<set $slaves[_i].sexualQuirk = "gagfuck queen">>
- <<case "hates anal">>
- <<set $slaves[_i].sexualQuirk = "painal queen">>
- <<case "hates penetration">>
- <<set $slaves[_i].sexualQuirk = "strugglefuck queen">>
- <<case "shamefast">>
- <<set $slaves[_i].sexualQuirk = "tease">>
- <<case "idealistic">>
- <<set $slaves[_i].sexualQuirk = "romantic">>
- <<case "repressed">>
- <<set $slaves[_i].sexualQuirk = "perverted">>
- <<case "apathetic">>
- <<set $slaves[_i].sexualQuirk = "caring">>
- <<case "crude">>
- <<set $slaves[_i].sexualQuirk = "unflinching">>
- <<case "judgemental">>
- <<set $slaves[_i].sexualQuirk = "size queen">>
- <</switch>>
- <<set $slaves[_i].sexualFlaw = "none", _attendantUsedCure += 1>>
- <br> $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
- <</if>>
- <</if>>
- <</if>>
- <<if $familyTesting == 1>>
- <<if $slaves[_i].mother == $Attendant.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].father == $Attendant.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].ID == $Attendant.father>>
- She makes sure to spend extra time caring for her father, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].ID == $Attendant.mother>>
- She makes sure to spend extra time caring for her mother, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if areSisters($slaves[_i], $Attendant) == 1>>
- She makes sure to spend extra time caring for her twin sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <<elseif areSisters($slaves[_i], $Attendant) == 2>>
- She makes sure to spend extra time caring for her sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <<elseif areSisters($slaves[_i], $Attendant) == 3>>
- She makes sure to spend extra time caring for her half-sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
+ <<set _i = $SpaiIDs[_dI].Index>>
+ <<if ($slaves[_i].fetish == "mindbroken") && ($slaves[_i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
+ <<set _attendantUsedCure = 1>>
+ <<if (random(1,100) > 90-$Attendant.devotion)>>
+ <br> @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[_i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[_i].slaveName has begun to respond, and is stirring from her mental torpor.
+ <<set $slaves[_i].devotion = -3, $slaves[_i].sexualFlaw = "apathetic", $slaves[_i].behavioralFlaw = either("hates men", "odd"), $slaves[_i].fetish = "none", $slaves[_i].fetishKnown = 1>>
+ <<if ($arcologies[0].FSPaternalist > 0)>>
+ Society @@.green;strongly approves@@ of $slaves[_i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
+ <<set $repGain += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel), $arcologies[0].FSPaternalist += 0.01*$FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
- <<else>>
- <<if $Attendant.relationTarget == $slaves[_i].ID>>
- She makes sure to spend extra time caring for her $slaves[_i].relation, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <</if>>
- <</if>> /*closes extended family mode */
- <<if $Attendant.relationshipTarget == $slaves[_i].ID>>
- She dedicates most of her attention to her <<if $Attendant.relationship == 1>>friend<<elseif $Attendant.relationship == 2>>best friend<<elseif $Attendant.relationship == 3>>friend with benefits<<elseif $Attendant.relationship == 4>>lover<<elseif $Attendant.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making her stress, both physical and mental, wash away.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
- <<if $Attendant.rivalryTarget == $slaves[_i].ID>>
- She constantly harasses her <<if $Attendant.rivalry == 1>>growing rival<<elseif $Attendant.rivalry == 2>>rival<<elseif $Attendant.rivalry == 3>>bitter rival<</if>>, $slaves[_i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
- <<set $slaves[_i].devotion -= 4, $slaves[_i].trust -= 4>>
- <<if random(1,100) > 35>>
- <<set $Attendant.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
+ <<set _seed = _bonusToggle * 10>>
+ <<if _bonusToggle == 1 && $slaves[_i].trust < 60>>
+ <<set $slaves[_i].trust++>>
<</if>>
- <</if>>
- <<switch $slaves[_i].prestigeDesc>>
- <<case "She is a famed Free Cities whore, and commands top prices.">>
- She does her best to relax the famous whore, $slaves[_i].slaveName, making sure to pay special attention to her worn holes.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <<case "She is a famed Free Cities slut, and can please anyone.">>
- She does her best to soothe the famous entertainer, $slaves[_i].slaveName, letting her relax in blissful peace.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <<case "She is remembered for winning best in show as a cockmilker.">>
- <<if $Attendant.fetish == "cumslut">>
- She can't keep her hands off $slaves[_i].slaveName's cock and balls, but she doesn't mind being milked constantly. Before long strands of cum can be found floating all throughout the bath.
- <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
- <<else>>
- She does her best to accommodate $slaves[_i].slaveName's massive genitals and tends to her when ever she feels a need for release.
- <<if random(1,100) > 65 && $Attendant.fetish == "none">>
- After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
- <<set $Attendant.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
+ <<if $familyTesting == 1>>
+ <<if $slaves[_i].mother == $Attendant.ID>>
+ She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if $slaves[_i].father == $Attendant.ID>>
+ She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if $slaves[_i].ID == $Attendant.father>>
+ She makes sure to spend extra time caring for her father, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if $slaves[_i].ID == $Attendant.mother>>
+ She makes sure to spend extra time caring for her mother, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <</if>>
+ <<if areSisters($slaves[_i], $Attendant) == 1>>
+ She makes sure to spend extra time caring for her twin sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <<elseif areSisters($slaves[_i], $Attendant) == 2>>
+ She makes sure to spend extra time caring for her sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
+ <<elseif areSisters($slaves[_i], $Attendant) == 3>>
+ She makes sure to spend extra time caring for her half-sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust += 1>>
<</if>>
- <</if>>
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <<case "She is remembered for winning best in show as a dairy cow.">>
- <<if $Attendant.fetish == "boobs">>
- She can't keep her hands off $slaves[_i].slaveName's huge breasts, but she doesn't mind being milked constantly. Before long the bath gains a white tint.
- <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[_i].slaveName's massive breasts and tends to her when ever she feels a need for release.
- <<if $Attendant.fetish == "none" && random(1,100) > 65>>
- After multiple milking sessions, $Attendant.slaveName begins to find herself fantasizing about having giant milky breasts too.
- <<set $Attendant.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
+ <<if $Attendant.relationTarget == $slaves[_i].ID>>
+ She makes sure to spend extra time caring for her $slaves[_i].relation, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <</if>>
+ <</if>> /*closes extended family mode */
+ <<if $Attendant.relationshipTarget == $slaves[_i].ID>>
+ She dedicates most of her attention to her <<if $Attendant.relationship == 1>>friend<<elseif $Attendant.relationship == 2>>best friend<<elseif $Attendant.relationship == 3>>friend with benefits<<elseif $Attendant.relationship == 4>>lover<<elseif $Attendant.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making her stress, both physical and mental, wash away.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <</if>>
+ <<if $Attendant.rivalryTarget == $slaves[_i].ID>>
+ She constantly harasses her <<if $Attendant.rivalry == 1>>growing rival<<elseif $Attendant.rivalry == 2>>rival<<elseif $Attendant.rivalry == 3>>bitter rival<</if>>, $slaves[_i].slaveName, preventing her from getting comfortable and forcing her to keep her guard up.
+ <<set $slaves[_i].devotion -= 4, $slaves[_i].trust -= 4>>
+ <<if random(1,100) > 35>>
+ <<set $Attendant.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
<</if>>
<</if>>
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <<case "She is remembered for winning best in show as a breeder.">>
- <<if $slaves[_i].preg > 10>>
- <<if $Attendant.fetish == "pregnancy">>
- She can't keep her hands off $slaves[_i].slaveName's pregnancy, but she doesn't mind her full belly being fondled.
- <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
+ <<switch $slaves[_i].prestigeDesc>>
+ <<case "She is a famed Free Cities whore, and commands top prices.">>
+ She does her best to relax the famous whore, $slaves[_i].slaveName, making sure to pay special attention to her worn holes.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <<case "She is a famed Free Cities slut, and can please anyone.">>
+ She does her best to soothe the famous entertainer, $slaves[_i].slaveName, letting her relax in blissful peace.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <<case "She is remembered for winning best in show as a cockmilker.">>
+ <<if $Attendant.fetish == "cumslut">>
+ She can't keep her hands off $slaves[_i].slaveName's cock and balls, but she doesn't mind being milked constantly. Before long strands of cum can be found floating all throughout the bath.
+ <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to accommodate $slaves[_i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
- <<if random(1,100) > 65 && $Attendant.fetish is "none">>
- After massaging $slaves[_i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find herself fantasizing about being swollen with life too.
- <<set $Attendant.fetish to "pregnancy", $slaves[_FLs].fetish to "pregnancy">>
- <</if>>
+ She does her best to accommodate $slaves[_i].slaveName's massive genitals and tends to her when ever she feels a need for release.
+ <<if random(1,100) > 65 && $Attendant.fetish == "none">>
+ After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
+ <<set $Attendant.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
+ <</if>>
<</if>>
<<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <<else>>
- <<if $Attendant.fetish == "pregnancy">>
- She can't help but pester $slaves[_i].slaveName with questions about her pregnancy, limiting her ability to truly relax.
- <<set $slaves[_i].devotion += 1, $slaves[_i].trust += 1>>
+ <<case "She is remembered for winning best in show as a dairy cow.">>
+ <<if $Attendant.fetish == "boobs">>
+ She can't keep her hands off $slaves[_i].slaveName's huge breasts, but she doesn't mind being milked constantly. Before long the bath gains a white tint.
+ <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
- She does her best to encourage $slaves[_i].slaveName's fertilization by performing any fertility boosting actions she can.
+ She does her best to accommodate $slaves[_i].slaveName's massive breasts and tends to her when ever she feels a need for release.
+ <<if $Attendant.fetish == "none" && random(1,100) > 65>>
+ After multiple milking sessions, $Attendant.slaveName begins to find herself fantasizing about having giant milky breasts too.
+ <<set $Attendant.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
+ <</if>>
+ <</if>>
<<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <<case "She is remembered for winning best in show as a breeder.">>
+ <<if $slaves[_i].preg > 10>>
+ <<if $Attendant.fetish == "pregnancy">>
+ She can't keep her hands off $slaves[_i].slaveName's pregnancy, but she doesn't mind her full belly being fondled.
+ <<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
+ <<else>>
+ She does her best to accommodate $slaves[_i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
+ <<if random(1,100) > 65 && $Attendant.fetish is "none">>
+ After massaging $slaves[_i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find herself fantasizing about being swollen with life too.
+ <<set $Attendant.fetish to "pregnancy", $slaves[_FLs].fetish to "pregnancy">>
+ <</if>>
+ <</if>>
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <<else>>
+ <<if $Attendant.fetish == "pregnancy">>
+ She can't help but pester $slaves[_i].slaveName with questions about her pregnancy, limiting her ability to truly relax.
+ <<set $slaves[_i].devotion += 1, $slaves[_i].trust += 1>>
+ <<else>>
+ She does her best to encourage $slaves[_i].slaveName's fertilization by performing any fertility boosting actions she can.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
+ <</if>>
+ <</if>>
+ <</switch>>
+ <<if ($Attendant.intelligence > 0) && (_attendantUsedCure == 0) && ($spaFix == 0)>>
+ <<if $slaves[_i].behavioralFlaw != "none">>
+ <<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
+ <<switch $slaves[_i].behavioralFlaw>>
+ <<case "arrogant">>
+ <<set $slaves[_i].behavioralQuirk = "confident">>
+ <<case "bitchy">>
+ <<set $slaves[_i].behavioralQuirk = "cutting">>
+ <<case "odd">>
+ <<set $slaves[_i].behavioralQuirk = "funny">>
+ <<case "hates men">>
+ <<set $slaves[_i].behavioralQuirk = "adores women">>
+ <<case "hates women">>
+ <<set $slaves[_i].behavioralQuirk = "adores men">>
+ <<case "gluttonous">>
+ <<set $slaves[_i].behavioralQuirk = "fitness">>
+ <<case "anorexic">>
+ <<set $slaves[_i].behavioralQuirk = "insecure">>
+ <<case "devout">>
+ <<set $slaves[_i].behavioralQuirk = "sinful">>
+ <<case "liberated">>
+ <<set $slaves[_i].behavioralQuirk = "advocate">>
+ <</switch>>
+ <<set $slaves[_i].behavioralFlaw = "none", _attendantUsedCure += 1>>
+ <br> $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
+ <</if>>
+ <<elseif $slaves[_i].sexualFlaw != "none">>
+ <<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
+ <<switch $slaves[_i].sexualFlaw>>
+ <<case "hates oral">>
+ <<set $slaves[_i].sexualQuirk = "gagfuck queen">>
+ <<case "hates anal">>
+ <<set $slaves[_i].sexualQuirk = "painal queen">>
+ <<case "hates penetration">>
+ <<set $slaves[_i].sexualQuirk = "strugglefuck queen">>
+ <<case "shamefast">>
+ <<set $slaves[_i].sexualQuirk = "tease">>
+ <<case "idealistic">>
+ <<set $slaves[_i].sexualQuirk = "romantic">>
+ <<case "repressed">>
+ <<set $slaves[_i].sexualQuirk = "perverted">>
+ <<case "apathetic">>
+ <<set $slaves[_i].sexualQuirk = "caring">>
+ <<case "crude">>
+ <<set $slaves[_i].sexualQuirk = "unflinching">>
+ <<case "judgemental">>
+ <<set $slaves[_i].sexualQuirk = "size queen">>
+ <</switch>>
+ <<set $slaves[_i].sexualFlaw = "none", _attendantUsedCure += 1>>
+ <br> $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
+ <</if>>
<</if>>
<</if>>
- <</switch>>
<</for>>
- <</if>>
<<if ($spaSlaves < $spa)>>
<<set _seed = random(1,10)+(($spa-$spaSlaves)*(random(150,170)+(_idleBonus*10)))>>
<<set $cash += _seed>>
<br> Since she doesn't have enough girls to occupy all her time, the spa takes in citizens' slaves on a contract basis and she helps them too, earning @@.yellowgreen;¤_seed.@@
<</if>>
- <<if ($spaSlaves > 0)>><br><</if>>
+ <<if ($spaSlaves > 0)>><br><br><</if>>
<</if>>
<<if ($spaSlaves > 0)>>
- <<if ($spaSlaves > 1)>>''There are $spaSlaves slaves resting and recuperating in the spa.''<<else>>''There is one slave resting and recuperating in the spa.''<</if>>
+ ''<<if ($spaSlaves > 1)>>There are $spaSlaves slaves<<else>>There is one slave<</if>> resting and recuperating in the spa.''
<</if>>
<<if $Attendant != 0>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 2a1625fa3a1..ae504b94087 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -58,8 +58,7 @@
<</if>>
<</for>>
<<if _validHost == 0>>
- <<set $dump = $organs.pluck([_j], [_j])>>
- <<set _j-->>
+ <<set $dump = $organs.deleteAt(_j), _j-->>
<</if>>
<</for>>
<</if>>
@@ -77,8 +76,7 @@
<</if>>
<</for>>
<<if _validHost == 0>>
- <<set $dump = $organs.pluck([_j], [_j])>>
- <<set _j-->>
+ <<set $dump = $limbs.deleteAt(_j), _j-->>
<</if>>
<</for>>
<</if>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index a4fa84c34a6..daf0f072493 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -3311,7 +3311,7 @@ Your brand design is ''$brandDesign.''
<<for _s = 0; _s < $args[0].currentRules.length; _s++>>
<<if _currentRule.ID == $args[0].currentRules[_s]>>
<<set _dump = $args[0].currentRules.deleteAt(_s)>>
- <br>//@@.tan;Rule _rule (_currentRule.name) is no longer applying to $args[0].slaveName, who is assigned to $args[0].assignment.@@//
+ <br>//@@.tan;Rule _rule (_currentRule.name) no longer applies to $args[0].slaveName, who is assigned to $args[0].assignment.@@//
<<if $args[0].assignmentVisible == 0>>
<<RAFacilityRemove $args[0] _currentRule>>
<</if>>
@@ -4459,40 +4459,52 @@ is now _combinedRule.hLength cm long.
<<if $args[0].clitSetting !== _combinedRule.clitSetting>>
<<set $args[0].clitSetting = _combinedRule.clitSetting, _used = 1>>
<br>$args[0].slaveName's smart piercing has been set to $args[0].clitSetting.
- <<else>>
- <<if $args[0].fetishStrength < 100>><<set _used = 1>><</if>>
+ <<elseif $args[0].fetishStrength < 100>>
+ <<set _used = 1>>
<</if>>
<</if>>
<<if _used == 0>>
<<if (def _combinedRule.clitSettingXY) && (_combinedRule.clitSettingXY !== "no default setting")>>
- <<if $args[0].attrXY < _combinedRule.clitSettingXY && $args[0].clitSetting !== "men">>
+ <<if $args[0].attrXY < _combinedRule.clitSettingXY>>
+ <<if $args[0].clitSetting !== "men">>
+ <br>$args[0].slaveName's smart piercing has been set to encourage attraction to men.
+ <</if>>
<<set $args[0].clitSetting = "men", _used = 1>>
- <br>$args[0].slaveName's smart piercing has been set to encourage attraction to men.
- <<elseif $args[0].attrXY >= _combinedRule.clitSettingXY + 10 && $args[0].clitSetting !== "anti-men">>
+ <<elseif $args[0].attrXY >= _combinedRule.clitSettingXY + 10>>
+ <<if $args[0].clitSetting !== "anti-men">>
+ <br>$args[0].slaveName's smart piercing has been set to discourage attraction to men.
+ <</if>>
<<set $args[0].clitSetting = "anti-men", _used = 1>>
- <br>$args[0].slaveName's smart piercing has been set to discourage attraction to men.
<</if>>
<</if>>
<</if>>
<<if _used == 0>>
<<if (def _combinedRule.clitSettingXX) && (_combinedRule.clitSettingXX !== "no default setting")>>
- <<if $args[0].attrXX < _combinedRule.clitSettingXX && $args[0].clitSetting !== "women">>
+ <<if $args[0].attrXX < _combinedRule.clitSettingXX>>
+ <<if $args[0].clitSetting !== "women">>
+ <br>$args[0].slaveName's smart piercing has been set to encourage attraction to women.
+ <</if>>
<<set $args[0].clitSetting = "women", _used = 1>>
- <br>$args[0].slaveName's smart piercing has been set to encourage attraction to women.
- <<elseif $args[0].attrXX >= _combinedRule.clitSettingXX + 10 && $args[0].clitSetting !== "anti-women">>
+ <<elseif $args[0].attrXX >= _combinedRule.clitSettingXX + 10>>
+ <<if $args[0].clitSetting !== "anti-women">>
+ <br>$args[0].slaveName's smart piercing has been set to discourage attraction to women.
+ <</if>>
<<set $args[0].clitSetting = "anti-women", _used = 1>>
- <br>$args[0].slaveName's smart piercing has been set to discourage attraction to women.
<</if>>
<</if>>
<</if>>
<<if _used == 0>>
<<if (def _combinedRule.clitSettingEnergy) && (_combinedRule.clitSettingEnergy !== "no default setting")>>
- <<if $args[0].energy < _combinedRule.clitSettingEnergy && $args[0].clitSetting !== "all">>
+ <<if $args[0].energy < _combinedRule.clitSettingEnergy>>
+ <<if $args[0].clitSetting !== "all">>
+ <br>$args[0].slaveName's smart piercing has been set to enhance libido.
+ <</if>>
<<set $args[0].clitSetting = "all", _used = 1>>
- <br>$args[0].slaveName's smart piercing has been set to enhance libido.
- <<elseif $args[0].energy >= _combinedRule.clitSettingEnergy + 10 && $args[0].clitSetting !== "none">>
+ <<elseif $args[0].energy >= _combinedRule.clitSettingEnergy + 10>>
+ <<if $args[0].clitSetting !== "none">>
+ <br>$args[0].slaveName's smart piercing has been set to suppress libido.
+ <</if>>
<<set $args[0].clitSetting = "none", _used = 1>>
- <br>$args[0].slaveName's smart piercing has been set to suppress libido.
<</if>>
<</if>>
<</if>>
@@ -4789,7 +4801,7 @@ is now _combinedRule.hLength cm long.
<<if _ruleAppliesToThisSlave == true>>
<<if !ruleApplied($args[0], _currentRule.ID)>> /* rule applies now, but did not apply before */
<<set $args[0].currentRules.push(_currentRule.ID)>>
- <br>//@@.tan;Rule _rule (_currentRule.name) is now applying to $args[0].slaveName (current assignment: $args[0].assignment).@@//
+ <br>//@@.tan;Rule _rule (_currentRule.name) now applies to $args[0].slaveName, who is assigned to $args[0].assignment.@@//
<</if>>
/* this rule has been applied to this slave now (or was already), so we are done with this rule */
<<elseif ruleApplied($args[0], _currentRule.ID)>> /* rule does not apply now, but did before */
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 6306ddd4e40..2a3e342299c 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -6,7 +6,7 @@
Called from Gen XX, Gen XY, CheatMode DB, InitNationalities.
%/
<<widget "BaseSlave">>
- <<set $activeSlave = {slaveName: "blank", birthName: "blank", genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, prostateImplant: 0, underArmHStyle: "waxed", bodySwap: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: ""}>>
+ <<set $activeSlave = {slaveName: "blank", birthName: "blank", genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", buttplug: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, bellyImplant: 0, bellySag: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, prostateImplant: 0, underArmHStyle: "waxed", bodySwap: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: ""}>>
<</widget>>
/%
--
GitLab