diff --git a/src/003-assets/CSS/slaveList.css b/src/003-assets/CSS/slaveList.css
index c0750f9317c2a1b8e535123baa1716d621df1786..02752b4df4063806c8b2144b96f5c587ae99facb 100644
--- a/src/003-assets/CSS/slaveList.css
+++ b/src/003-assets/CSS/slaveList.css
@@ -2,6 +2,14 @@ div.slaveSummary {
clear: both;
}
+div.slaveSummary.card {
+ border-radius: 8px;
+ background-color: #1a1a1a;
+ box-shadow: 10px 10px 5px black;
+ padding: 10px;
+ margin-bottom: 15px;
+}
+
/* slave summary paragraph when "see images" is enabled */
p.si {
margin-bottom: 0;
@@ -28,8 +36,3 @@ span.freeAssignment {
.strong {
font-weight: bold;
}
-
-.emphasizedSlave{
- font-weight: bold;
- text-decoration: underline;
-}
diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css
index fd8adaf4b1e507cb3ea37edbcf3202dfc50a85fb..125de5fdfcf5c0839480d0bc0ae8234b8a24de4c 100644
--- a/src/003-assets/CSS/tabs.css
+++ b/src/003-assets/CSS/tabs.css
@@ -1,8 +1,8 @@
-div.tab {
+div.tabbar {
overflow: hidden;
}
-div.tab button {
+div.tabbar button {
background-color: #252525;
border: solid 2px #252525;
color: #68d;
@@ -14,11 +14,11 @@ div.tab button {
font-size: large;
}
-div.tab button:hover {
+div.tabbar button:hover {
background-color: #414141;
}
-div.tab button.active {
+div.tabbar button.active {
background-color: #050505;
color: #c7cedf;
}
diff --git a/src/004-base/arcologyBuilding.js b/src/004-base/arcologyBuilding.js
index 262d9d94a5795cbd6f0a091ade74d7c6d1fedf02..ba1f746564abc68335c11bbca038c708fc1d3c9d 100644
--- a/src/004-base/arcologyBuilding.js
+++ b/src/004-base/arcologyBuilding.js
@@ -88,7 +88,7 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
buySpan.classList.add("clear-formatting");
buySpan.append(App.UI.DOM.passageLink("Buy", "Main",
() => {
- cashX(-(price + 10000));
+ cashX(-(price + 10000), "capEx");
A.demandFactor += 20;
App.Arcology.updateOwnership();
cell.owner = 1;
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 92cec1cbe427a6e9e89b3430fa3d0adbcde71e14..4e6c863d5ad70d2f9e9bd1e057bdebdb698d393f 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -557,11 +557,8 @@
/*<br style="clear:both" />*/
<br>
- <<if $activeSlave.origin != 0>>
- <<set $toSearch = $activeSlave.origin>>
- <<if $toSearch.indexOf("Slave Shelter") != -1>>
- <<set $shelterAbuse += 1>>
- <</if>>
+ <<if isShelterSlave($activeSlave)>>
+ <<set $shelterAbuse += 1>>
<</if>>
<<= removeActiveSlave() >>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 2761cbe3e19b0ff8ad7a7eca8738653fac8f429d..adff1a2a021c54671033d639aff5ab8c88ebcab7 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -779,17 +779,17 @@ SLAVE ASSIGNMENTS:
<<case "Head Girl">>
- //Most Free Cities slaveowners eventually find it convenient to promote a @@.mediumaquamarine;[[trusted|Encyclopedia][$encyclopedia = "Trust"]]@@y slave to a position over others. The stable of slaves necessary to present a proper public image has become so large that assistance managing and overseeing slaves is quite useful. In addition, such a slave can be an example to lesser livestock.
+ //Most Free Cities slaveowners eventually find it convenient to promote a @@.mediumaquamarine;[[trusting|Encyclopedia][$encyclopedia = "Trust"]]@@ slave to a position over others. The stable of slaves necessary to present a proper public image has become so large that assistance managing and overseeing slaves is quite useful. In addition, such a slave can be an example to lesser livestock.
- <br><br>A good Head Girl will be @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ to her master and sexually skilled. Experienced slaveowners have also found that an older slave girl is often more effective than a young one. Since slavery is new, older slave girls will have spent part of their adult lives as free women, and have a deeper body of life experience to draw on.
+ <br><br>A good Head Girl will be @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ to her master and sexually skilled. Experienced slaveowners have also found that an older slave girl is often more effective than a young one. Since slavery is new, older slave girls will have spent part of their adult lives as free women, and have a deeper body of life experience to draw on.
<br><br>Naturally, some slaveowners form a strong emotional bond with their Head Girl. @@.mediumaquamarine;[[Trusting|Encyclopedia][$encyclopedia = "Trust"]]@@ and relying on a close companion can begin to resemble old world relationships. It is a paradox of modern Free Cities life that such closeness is strongly frowned upon. Rumors that a prominent person is emotionally involved with his or her Head Girl can be as socially devastating as rumors of infidelity were a hundred years ago.
<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
- <br><br>A ''Head Girl'' can be selected from among your @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ slaves immediately. Duties are numerous, but mostly involve training slaves. They will generally train whichever girls they think appropriate, but can be given some direction on the same menu used to select one. Giving your [[Head Girl a suite|Encyclopedia][$encyclopedia = "Head Girl Suite"]] and a personal slave will allow her to train an extra slave each week, an extremely powerful ability.
+ <br><br>A ''Head Girl'' can be selected from among your @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ slaves immediately. Duties are numerous, but mostly involve training slaves. They will generally train whichever girls they think appropriate, but can be given some direction on the same menu used to select one. Giving your [[Head Girl a suite|Encyclopedia][$encyclopedia = "Head Girl Suite"]] and a personal slave will allow her to train an extra slave each week, an extremely powerful ability.
- @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]],@@ @@.cyan;intelligence,@@ and age over 35 all help Head Girls do well. Head Girls will do better if they are comfortable with the arcology's [[lingua franca|Encyclopedia][$encyclopedia = "Lingua Franca"]]. Skills are required when teaching that skill, meaning that slaves without vaginas cannot teach vaginal skills. Conversely, slaves with functional dicks are better at teaching other sexual skills. Also having max sex skills, dom as their fetish and being your wife provide more boosts.
+ @@.hotpink;[[Devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]],@@ @@.cyan;intelligence,@@ and age over 35 all help Head Girls do well. Head Girls will do better if they are comfortable with the arcology's [[lingua franca|Encyclopedia][$encyclopedia = "Lingua Franca"]]. Skills are required when teaching that skill, meaning that slaves without vaginas cannot teach vaginal skills. Conversely, slaves with functional dicks are better at teaching other sexual skills. Also having max sex skills, dom as their fetish and being your wife provide more boosts.
<<case "Madam">>
@@ -836,12 +836,12 @@ SLAVE ASSIGNMENTS:
<<case "Recruiter">>
- A ''recruiter'' can be selected from among your @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ slaves immediately. @@.cyan;intelligence,@@ entertainment skills, and luxurious living standards help a recruiter convince vulnerable people to submit to voluntary enslavement. Each targetable group is also more sympathetic to an appropriate recruiter:
- <br> <br> <br> <br> Desperate whores: a sexually veteran recruiter
- <br> <br> <br> <br> Expectant mothers: a visibly pregnant recruiter
- <br> <br> <br> <br> Young migrants: a [[healthy|Encyclopedia][$encyclopedia = "Health"]] and pretty recruiter
- <br> <br> <br> <br> Dissolute sissies: a recruiter with a working dick
- <br> <br> <br> <br> Reassignment candidates: a pretty recruiter without working female reproductive organs
+ A ''Recruiter'' can be selected from among your @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ slaves immediately. @@.cyan;Intelligence,@@ entertainment skills, and luxurious living standards help a recruiter convince vulnerable people to submit to voluntary enslavement. Each targetable group is also more sympathetic to an appropriate recruiter:
+ <br> Desperate whores: a sexually veteran recruiter
+ <br> Expectant mothers: a visibly pregnant recruiter
+ <br> Young migrants: a [[healthy|Encyclopedia][$encyclopedia = "Health"]] and pretty recruiter
+ <br> Dissolute sissies: a recruiter with a working dick
+ <br> Reassignment candidates: a pretty recruiter without working female reproductive organs
<br><br>Once your household reaches a significant number of slaves you may direct the Recruiter to do publicity instead of acquisitions, for a boost to @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ and possibly advancing [[future societies|Encyclopedia][$encyclopedia = "Future Societies"]]. Activating this ability does not influence any other means of obtaining new slaves. (Note that "Facilities & leadership" includes the Recruiter herself and a slot for Head Girl, two positions that do not require a facility.)
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 4190785dd6ba934a70aef69c497288a650fd8c81..2333008aae8e1822e05ff258608aba080874c5fd 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1815,3 +1815,11 @@ window.retirementReady = function RetirementReady(slave) {
// no retirement for you
return false;
};
+
+/** Is the slave a shelter slave?
+ * @param {SlaveState} slave
+ * @returns {boolean}
+ */
+window.isShelterSlave = function isShelterSlave(slave) {
+ return (typeof slave.origin === "string" && slave.origin.includes("Slave Shelter"));
+};
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 9e67529d96a1e51ff738758598ec8010786ced52..558bcc1b4e4ba26003ba30057dc2f4d314ddbd25 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -78,6 +78,9 @@ App.UI.SlaveList.render = function() {
let slaveDiv = document.createElement("div");
slaveDiv.id = `slave-${slaves[_si].ID}`;
slaveDiv.classList.add("slaveSummary");
+ if (V.slavePanelStyle === 2) {
+ slaveDiv.classList.add("card");
+ }
slaveDiv.appendChild(ss);
res.appendChild(slaveDiv);
}
@@ -147,9 +150,9 @@ App.UI.SlaveList.render = function() {
*/
function renderSlave(index, interactionLink, showTransfers, postNote) {
let res = document.createDocumentFragment();
- if (V.lineSeparations === 0) {
+ if (V.slavePanelStyle === 0) {
res.appendChild(document.createElement("br"));
- } else {
+ } else if (V.slavePanelStyle === 1) {
const hr = document.createElement("hr");
hr.style.margin = "0";
res.appendChild(hr);
@@ -611,7 +614,7 @@ App.UI.SlaveList.listSJFacilitySlaves = function(facility, facilityPassage, show
if (V.sortSlavesMain) {
r += this.sortingLinks(facilityPassage) + '<br>';
}
- r += '<div class="tab">' +
+ r += '<div class="tabbar">' +
App.UI.tabbar.tabButton('assign', tabCaptions.assign) +
App.UI.tabbar.tabButton('remove', tabCaptions.remove) +
(showTransfersTab ? App.UI.tabbar.tabButton('transfer', tabCaptions.transfer) : '')+
@@ -699,7 +702,7 @@ App.UI.SlaveList.listNGPSlaves = function() {
const thisPassage = 'New Game Plus';
let r = this.sortingLinks(thisPassage) + '<br>';
- r += '<div class="tab">' +
+ r += '<div class="tabbar">' +
App.UI.tabbar.tabButton('assign', 'Import a slave') +
App.UI.tabbar.tabButton('remove', 'Remove from import') +
'</div>';
@@ -1022,7 +1025,7 @@ App.UI.SlaveList.penthousePage = function() {
this.render.listMarkup(penthouseSlavesIndices, [], App.UI.SlaveList.SlaveInteract.penthouseInteract)));
- r += '<div class="tab">';
+ r += '<div class="tabbar">';
for (const tab of tabs) {
r += App.UI.tabbar.tabButton(tab.tabName, tab.caption);
}
diff --git a/src/personalAssistant/assistant.js b/src/personalAssistant/assistant.js
index 2d1d7e269b58ec5ca411ad4d8864cd1318716d1b..dbe3c99bd22e76149e0f99a79114e2dd7a5f4d3a 100644
--- a/src/personalAssistant/assistant.js
+++ b/src/personalAssistant/assistant.js
@@ -48,9 +48,9 @@ window.assistant = (function() {
}
function pronouns() {
- let o = {}
+ let o = {};
if (V.assistant.personality === 0 || V.assistant.appearance === "normal") {
- o.main = {pronoun: App.Data.Pronouns.Kind.ai};
+ o.main = o.market = {pronoun: App.Data.Pronouns.Kind.ai};
} else {
if (V.assistant.appearance === "incubus" && V.diversePronouns > 0) {
o.main = {pronoun: App.Data.Pronouns.Kind.male};
@@ -87,4 +87,4 @@ window.assistant = (function() {
delete V.assistant.options;
}
}
-})();
\ No newline at end of file
+})();
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index cfb1917caea79307c0a683789951c950c2c93689..923a1d9f05e23d86f2744359f8dd4ffb6acaacbc 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1180,8 +1180,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<</link>>
<</if>>
-<<set $toSearch = $activeSlave.hStyle>>
-<<if ($toSearch.indexOf("shaved") == -1)>>
+<<if ($activeSlave.hStyle.indexOf("shaved") == -1)>>
<br><<link "Shave $his hair">>
<<set $activeSlave.devotion -= 25>>
<<set $activeSlave.hStyle = "shaved">>
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 6bc875d5f3b81393c87a9bc3ca7975f57a6fe91a..753c70d78704d633796ab2bd3f95d3ee363062a1 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -326,7 +326,12 @@
<<set $slaves[$i].devotion += 1>>
<<set $slaves[$i].fetishKnown = 1>>
<<elseif $slaves[$i].devotion < -20>>
- $His collar's display reveals all sorts of personal information about $his fertility, filling $him @@.mediumorchid;with disgust@@ that you that you consider $his womb little more than property, as well as @@.gold;fear@@ that it will soon be swelling with an unwelcome child.
+ $His collar's display reveals all sorts of personal information about $his fertility, filling $him @@.mediumorchid;with disgust@@ that you that you consider $his womb little more than property, as well as @@.gold;fear@@ that
+ <<if $slaves[$i].pregKnown == 1>>
+ it will be promptly filled with an unwelcome child once $his pregnancy ends.
+ <<else>>
+ it will soon be swelling with an unwelcome child.
+ <</if>>
<<set $slaves[$i].devotion -= 2>>
<<set $slaves[$i].trust -= 2>>
<<elseif ($slaves[$i].devotion <= 20)>>
@@ -514,7 +519,7 @@
<<if $slaves[$i].belly > 10000>>
$His pregnancy support band takes some weight off $his back, but it does little beyond that.
<</if>>
- <<elseif setup.fakeBellies.includes($bellyAccessory)>>
+ <<elseif setup.fakeBellies.includes($slaves[$i].bellyAccessory)>>
<<if $slaves[$i].weight > 130>>
$He has trouble keeping $his fake belly strapped around $his huge gut, forcing it to be removed to prevent damage.
<<set $slaves[$i].bellyAccessory = "none">>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 4be22e1e7f749bb80a7865c7c7fccc676df63b25..22f7189c9d550d7b7a59eb5a34dd8e0fc0fefa02 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -77,11 +77,11 @@
<</for>>
<<if (skinToneLevel($activeSlave.skin) < 10)>>
- <<set $skinDesc = "pink">>
+ <<set _skinDesc = "pink">>
<<elseif (skinToneLevel($activeSlave.skin) > 20)>>
- <<set $skinDesc = "dark brown">>
+ <<set _skinDesc = "dark brown">>
<<else>>
- <<set $skinDesc = "brown">>
+ <<set _skinDesc = "brown">>
<</if>>
The slave bathrooms are designed to completely eliminate privacy. There are few partitions, and those are glass. Your better-behaved slaves have all long since lost any hesitation about performing their ablutions nude. As you pass through the area, you notice <<EventNameLink>> checking out $his own anus in the bathroom mirror.
<br><br>
@@ -93,7 +93,7 @@ There's no other way to describe what $he's doing: the $desc has $his back to th
<<else>>
got $his hips cocked to spread $his sleek butt and
<</if>>
-reveal $his backdoor. Your slaves are trained to check themselves daily, but $he seems fascinated. As you pause to watch, $he begins to clench and relax $his <<if $activeSlave.anus > 2>>loose<<else>>cute<</if>> hole, <<if ($activeSlave.analArea - $activeSlave.anus) > 1>> lewdly flexing<<else>>alternately puckering and relaxing<</if>> the $skinDesc skin around it. $He giggles self-consciously at the sight, and then relaxes all the way, causing $his asspussy to open into a <<if $activeSlave.anus > 2>><<if $PC.dick != 0>>cock<<else>>dildo<</if>>-hungry<<else>>slight<</if>> gape. $He notices you out of the corner of $his eye and
+reveal $his backdoor. Your slaves are trained to check themselves daily, but $he seems fascinated. As you pause to watch, $he begins to clench and relax $his <<if $activeSlave.anus > 2>>loose<<else>>cute<</if>> hole, <<if ($activeSlave.analArea - $activeSlave.anus) > 1>> lewdly flexing<<else>>alternately puckering and relaxing<</if>> the _skinDesc skin around it. $He giggles self-consciously at the sight, and then relaxes all the way, causing $his asspussy to open into a <<if $activeSlave.anus > 2>><<if $PC.dick != 0>>cock<<else>>dildo<</if>>-hungry<<else>>slight<</if>> gape. $He notices you out of the corner of $his eye and
<<if $activeSlave.butt > 6>>
releases $his grip on $his heavy buttocks to turn and greet you, letting them clap gently together and conceal $his asshole again.
<<elseif $activeSlave.butt > 3>>
@@ -111,7 +111,7 @@ reveal $his backdoor. Your slaves are trained to check themselves daily, but $he
cocks $his hips again and starts blatantly winking $his anus for you<<if hasAnyArms($activeSlave)>>, using $his hand<<if hasBothArms($activeSlave)>>s<</if>> to <<if $activeSlave.nipples != "fuckable">>tweak<<else>>finger<</if>> $his nipples<</if>>.
<</if>>
<<if $activeSlave.analArea > 3>>
- The huge area of $skinDesc anus around $his actual hole certainly draws the eye towards its center, though the way $he's using $his sphincter as a come-on does enhance the effect.
+ The huge area of _skinDesc anus around $his actual hole certainly draws the eye towards its center, though the way $he's using $his sphincter as a come-on does enhance the effect.
<</if>>
<<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>
"Plea<<s>>e, <<Master>>," $he begins to beg. "I can't wait to feel <<if $PC.dick != 0>>your cock<<else>>you<</if>> in<<s>>ide me."
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 3c231ffa4636ebf284f713b9885d507ba34df0ae..feedbdd88c77442f8ce6c298fcf887ad1223d740 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -428,6 +428,6 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<if $lastWeeksCashErrors !== "Errors: ">>
<<link "Reset">>
<<set $lastWeeksCashErrors = "Errors: ">>
- <</link>>
- <<print cashFormatColor($lastWeeksCashErrors)>>
+ <</link>><br>
+ @@.red;<<print $lastWeeksCashErrors>>@@
<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 14f1dd5142ce54431475302423c87091296a3173..513b2d7f14a2745a57bf63f66aa5e83bd55d6cf7 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -55,7 +55,7 @@
<<else>>
<body>
-<div class="tab">
+<div class="tabbar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Management')">Arcology Management</button>
<<if $FSAnnounced > 0>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 10451f259c24538c7b5caa3d6521f25f49bcb0dd..556d17cd2410f25d397ce74663600b7e5477cd43 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -626,10 +626,10 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<link "Rename your obedient slaves according to Paternalist custom">>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($slaves[$i].devotion > 20) || (($slaves[$i].devotion >= -20) && ($slaves[$i].trust < -20))>>
- <<set $toSearch = $slaves[$i].slaveName>>
- <<if ($toSearch.indexOf("Miss") == -1)>>
- <<if ($toSearch.indexOf("Ms.") == -1)>>
- <<if ($toSearch.indexOf("Mrs.") == -1)>>
+ <<set _toSearch = $slaves[$i].slaveName>>
+ <<if (_toSearch.indexOf("Miss") == -1)>>
+ <<if (_toSearch.indexOf("Ms.") == -1)>>
+ <<if (_toSearch.indexOf("Mrs.") == -1)>>
<<if ($slaves[$i].relationship > 4)>>
/*
<<for $j = 0; $j < $slaves.length; $j++>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 95985e80fc454625a4d194d63e79d75926efb290..fc72395e59ec7a6298090f9ad37d1a1737970e51 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1089,8 +1089,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
<br>
<<default>>
<<if $activeSlave.origin>>
- <<set $toSearch = $activeSlave.origin>>
- <<if ($toSearch.includes("enslavement for the attempted rape of a free"))>>
+ <<if ($activeSlave.origin.includes("enslavement for the attempted rape of a free"))>>
//and since $he tried to rape you...//
<br>
<<link "Show $him how a professional does it">>
@@ -1155,8 +1154,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
<</if>>
-<<set $toSearch = $activeSlave.hStyle>>
-<<if ($toSearch.indexOf("shaved") == -1)>>
+<<if ($activeSlave.hStyle.indexOf("shaved") == -1)>>
<br>
<<link "Shave $his hair">>
<<replace "#introResult">>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 268799fe4674a7850ce1ef441fac193fde5054cf..3ab4871a051ce622581ea41c32e0eb51bcc3d4c9 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -342,7 +342,7 @@
<<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestTargetID = -1, $subID = -1, $submissiveInterestTargetID = -1>>
/% Other arrays %/
-<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $qualifiedFS = [], $eligibleSlaves = [], $slavesInLine = []>>
+<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $eligibleSlaves = [], $slavesInLine = []>>
/% Slave Objects using 0 instead of null. Second most memory eaten up. %/
<<set $activeSlave = 0, $eventSlave = 0, $slaveWithoutBonuses = 0, $subSlave = 0, $milkTap = 0, $relation = 0, $relative = 0, $relative2 = 0>>
@@ -351,7 +351,7 @@
<<set $beforeGingering = null>>
/% Strings Memory varies. %/
-<<set $analSkinDesc = "", $bellyAccessory = "", $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $oldName = "", $oldSurname = "", $skinDesc = "", $k = "">>
+<<set $buyer = "", $desc = "", $event = "", $goto = "", $malefactor = "", $oldName = "", $oldSurname = "", $k = "">>
/% Done with zeroing out, what should be for the most part Temps %/
<<run clearSummaryCache()>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 71d6335e10664faa06dce7691734d19c00d11158..03e15d6c1b64a4472ead706b4802e34792adf4e1 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -5,8 +5,7 @@
<<if $plot>>
<<set _effectiveWeek = $week-$nationHate>>
-<<set $toSearch = $arcologies[0].name>>
-<<if (_effectiveWeek == 4) && ($toSearch.indexOf("Arcology ") != -1)>>
+<<if (_effectiveWeek == 4) && ($arcologies[0].name.indexOf("Arcology ") != -1)>>
<<set $Event = "arcology naming">>
<<goto "Generic Plot Events">>
<<elseif (_effectiveWeek >= 5 && $receiverAvailable == 0)>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index d23f707e2f72d9d31d9ebfba40b1b7e52c0c656e..b45be0ef4dbaa77c07b1615fcca3ea5be7945603 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -240,6 +240,12 @@ This save was created using FC version $ver build $releaseID.
<</options>>
<</if>>
+ <<options $lineSeparations "Summary Options">>
+ Line separations are
+ <<option 1 "Shown">>
+ <<option 0 "Hidden">>
+ <</options>>
+
<div class="subHeading">
''Sidebar''
</div>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index c7bbe5c81fd37c9de47e9b7764cd20ea4c4cd342..ac7ee2278b7936099d0ae93eab8641418cc1e79f 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -33,6 +33,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<set _newSlaves.push($activeSlave)>>
<</for>>
<<else>>
+ <<set _nurseGender = $seeDicks == 100 ? 100 : 0>> /* nurse gender is female unless seeDicks is 100 */
<<setNonlocalPronouns $seeDicks>>
Under orders to target the largest possible group of people, your mercenaries head for the sick and injured. As the VTOL settles, it becomes apparent that most of the injuries are from combat, almost certainly in the defeat at $arcologies[0].name. The tent proves to contain a harassed nurse, almost without medical supplies and at the end of _hisU rope. When _heU sees the mercenaries push through the tent flap, _heU heaves a sigh of mixed defeat and relief and wordlessly offers _hisU wrists. The mercenaries give you a larger share of the other slaves in return for _himU: they tell you in confidence that _heU'll be a medical asset to them as well as the usual amusement. The successful raid @@.green;is the talk of the Free City.@@
<<set $slaveMedic = 1>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index bf5965cb19f20776886f9317ac2c2dd427ec908f..8fb85f0ef323c31f3e31c687cd0cde478e14c4b6 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -8,29 +8,51 @@
<<if $pedo_mode == 1>>
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 18>>
+<<else>>
+ <<set $activeSlaveOneTimeMinAge = 25>>
+ <<set $activeSlaveOneTimeMaxAge = 42>>
+<</if>>
+<<if $seeDicks >= 100>>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<set $activeSlave.dick = 5>>
+ <<set $activeSlave.foreskin = 0>>
+ <<set $activeSlave.balls = 3>>
+ <<set $activeSlave.scrotum = 3>>
+ <<set $activeSlave.butt = 3>>
+ <<set $activeSlave.attrXY = 70>>
+<<else>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave.vagina = 2>>
+ <<set $activeSlave.preg = -1>>
+ <<set $activeSlave.ovaries = 1>>
+ <<set $activeSlave.skill.vaginal = 35>>
+<</if>>
+<<if $pedo_mode == 1>>
<<set $activeSlave.sexualQuirk = "caring">>
<<set $activeSlave.intelligenceImplant = 15>>
<<if $activeSlave.physicalAge >= 12>>
<<set $activeSlave.teeth = "cosmetic braces">>
<</if>>
- <<set $activeSlave.hips = 1>>
- <<set $activeSlave.boobs = 2000>>
- <<set $activeSlave.boobShape = "perky">>
- <<set $activeSlave.geneticQuirks.macromastia = 2>>
- <<set $activeSlave.butt = 4>>
- <<set $activeSlave.voice = 3>>
+ <<if $seeDicks < 100>>
+ <<set $activeSlave.hips = 1>>
+ <<set $activeSlave.boobs = 2000>>
+ <<set $activeSlave.boobShape = "perky">>
+ <<set $activeSlave.geneticQuirks.macromastia = 2>>
+ <<set $activeSlave.butt = 4>>
+ <<set $activeSlave.voice = 3>>
+ <<else>>
+ <<set $activeSlave.geneticQuirks.wellHung = 2>>
+ <</if>>
<<else>>
- <<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 42>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.anusTat = "bleached">>
<<set $activeSlave.height = random(165,190)>>
<<set $activeSlave.intelligenceImplant = 30>>
<<set $activeSlave.teeth = "normal">>
- <<set $activeSlave.boobs += 400>>
- <<set $activeSlave.butt += 1>>
- <<set $activeSlave.stampTat = either("flowers", "tribal patterns")>>
+ <<if $seeDicks < 100>>
+ <<set $activeSlave.boobs += 400>>
+ <<set $activeSlave.butt += 1>>
+ <<set $activeSlave.stampTat = either("flowers", "tribal patterns")>>
+ <</if>>
<</if>>
<<set $activeSlave.origin = "$He was captured while caring for those injured in a failed attack on the Free City.">>
<<set $activeSlave.career = "a nurse">>
@@ -40,11 +62,7 @@
<<set $activeSlave.devotion = random(30,40)>>
<<set $activeSlave.trust = $activeSlave.devotion-20>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
-<<set $activeSlave.vagina = 2>>
-<<set $activeSlave.preg = -1>>
<<set $activeSlave.muscles = random(20,50)>>
-<<set $activeSlave.ovaries = 1>>
-<<set $activeSlave.skill.vaginal = 35>>
<<set $activeSlave.skill.oral = 35>>
<<set $activeSlave.skill.anal = 15>>
<<set $activeSlave.skill.whoring = 0>>
@@ -75,22 +93,24 @@
<<setLocalPronouns $activeSlave>>
<<run Enunciate($activeSlave)>>
-<<if $pedo_mode == 1>>
-
-You make a habit of dropping in on your mercenaries whenever you get the chance. You have regular meetings with their grizzled captain, of course, but turning up unannounced to get to know them is simply a matter of self-preservation. The better they like you, the more likely they are to think of more than their pay when deciding how to hazard themselves on your behalf.
+<<if $pedo_mode == 1 && $seeDicks < 100>>
+ You make a habit of dropping in on your mercenaries whenever you get the chance. You have regular meetings with their grizzled captain, of course, but turning up unannounced to get to know them is simply a matter of self-preservation. The better they like you, the more likely they are to think of more than their pay when deciding how to hazard themselves on your behalf.
-When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName kneeling next to a mercenary with most of his armor stripped off. $He's the <<print aNational($activeSlave.nationality)>> nurse they captured and enslaved, and $he seems to be doing pretty well in $his new life. $He seems to be checking the sutures on a minor wound to the man's flank.
-
-"Don't <<s>>quirm!" $he says with an annoyed tone. "I'll get you off when I've checked thi<<s>>." He chuckles and holds still; $he redresses the wound, stands up, and strips off $his tank top, allowing $his huge tits to swing free. $He's quite young, but $his $activeSlave.skin body is appealingly curvy. As $he swings one leg across the seated mercenary, $he continues, "Plea<<s>>e <<s>>it <<s>>till and let me do the work. You need to take it ea<<s>>y for a day or two or you'll pop tho<<s>>e <<s>>uture<<s>>." Using $his hands, $he gently caresses his stiff prick with $his pillowy breasts, eliciting a grunt. $He's a strong $girl, and pleasures him without letting any of $his weight rest on his body at all. When he climaxes, $he leans in to clean him with $his mouth and then heads off to wash out $his cleavage.
+ When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName kneeling next to a mercenary with most of his armor stripped off. $He's the <<print aNational($activeSlave.nationality)>> nurse they captured and enslaved, and $he seems to be doing pretty well in $his new life. $He seems to be checking the sutures on a minor wound to the man's flank.
+ "Don't <<s>>quirm!" $he says with an annoyed tone. "I'll get you off when I've checked thi<<s>>." He chuckles and holds still; $he redresses the wound, stands up, and strips off $his tank top, allowing $his huge tits to swing free. $He's quite young, but $his $activeSlave.skin body is appealingly curvy. As $he swings one leg across the seated mercenary, $he continues, "Plea<<s>>e <<s>>it <<s>>till and let me do the work. You need to take it ea<<s>>y for a day or two or you'll pop tho<<s>>e <<s>>uture<<s>>." Using $his hands, $he gently caresses his stiff prick with $his pillowy breasts, eliciting a grunt. $He's a strong $girl, and pleasures him without letting any of $his weight rest on his body at all. When he climaxes, $he leans in to clean him with $his mouth and then heads off to wash out $his cleavage.
<<else>>
+ You make a habit of dropping in on your mercenaries whenever you get the chance. You have regular meetings with their grizzled captain, of course, but turning up unannounced to get to know them is simply a matter of self-preservation. The better they like you, the more likely they are to think of more than their pay when deciding how to hazard themselves on your behalf.
-You make a habit of dropping in on your mercenaries whenever you get the chance. You have regular meetings with their grizzled captain, of course, but turning up unannounced to get to know them is simply a matter of self-preservation. The better they like you, the more likely they are to think of more than their pay when deciding how to hazard themselves on your behalf.
-
-When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName bending over a mercenary with most of his armor stripped off. $He's the <<print aNational($activeSlave.nationality)>> nurse they captured and enslaved, and $he seems to be doing pretty well in $his new life. $He seems to be checking the sutures on a minor wound to the man's flank.
-
-"Don't <<s>>quirm," $he says quietly. "I'll get you off when I've checked thi<<s>>." He chuckles and holds still; $he redresses the wound, stands up, and strips off $his fatigue pants. $He's no longer young, but $his $activeSlave.skin legs are pretty enough. As $he swings one leg across the seated mercenary, $he continues, "Please <<s>>it <<s>>till and let me do the work. You need to take it ea<<s>>y for a day or two or you'll pop tho<<s>>e <<s>>uture<<s>>." Using a hand, $he guides $himself down onto his stiff prick, eliciting a grunt. $He's a strong $girl, and rides him without letting any of $his weight rest on his hips at all. When he climaxes, $he kneels to clean him with $his mouth and then heads off to wash.
+ When you enter the lounge of their <<if $barracks>>barracks<<else>>main living area<</if>>, you see $activeSlave.slaveName bending over a mercenary with most of his armor stripped off. $He's the <<print aNational($activeSlave.nationality)>> nurse they captured and enslaved, and $he seems to be doing pretty well in $his new life. $He seems to be checking the sutures on a minor wound to the man's flank.
+ "Don't <<s>>quirm," $he says quietly. "I'll get you off when I've checked thi<<s>>." He chuckles and holds still; $he redresses the wound, stands up, and strips off $his fatigue pants.
+ <<if $pedo_mode == 1>>
+ $He's quite youthful, nimble and knows just how to manage $his impressive asset without it touching $his charge.
+ <<else>>
+ $He's no longer young, but $his $activeSlave.skin legs are pretty enough.
+ <</if>>
+ As $he swings one leg across the seated mercenary, $he continues, "Please <<s>>it <<s>>till and let me do the work. You need to take it ea<<s>>y for a day or two or you'll pop tho<<s>>e <<s>>uture<<s>>." Using a hand, $he guides $himself down onto his stiff prick, eliciting a grunt. $He's a strong $girl, and rides him without letting any of $his weight rest on his hips at all. When he climaxes, $he kneels to clean him with $his mouth and then heads off to wash.
<</if>>
<span id="result">
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index f17e29dc1408b72e07181fed47538084ab48cd05..2c193e06d3834bfc2e148601f0f12a5613d20b97 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -5,7 +5,7 @@
<<set $activeSlave = $Bodyguard>>
<<setLocalPronouns $activeSlave>>
-<<set $deadliness = Deadliness($activeSlave)>>
+<<set _deadliness = Deadliness($activeSlave)>>
<<set $PPit = 0>>
@@ -151,11 +151,11 @@ Across the ring, $his opponent's owner nods civilly to you and examines $activeS
<</if>>
-<<if $deadliness > 5>>
+<<if _deadliness > 5>>
$activeSlave.slaveName seems supremely confident, even eager to please you.
-<<elseif $deadliness > 3>>
+<<elseif _deadliness > 3>>
$activeSlave.slaveName seems nervous, but steels $himself to fight for you.
-<<elseif $deadliness > 1>>
+<<elseif _deadliness > 1>>
$activeSlave.slaveName seems terrified, and barely controls $himself.
<<else>>
$activeSlave.slaveName is obviously terrified, and might flee if there were a way out of the pit.
@@ -189,20 +189,20 @@ The umpire announces gravely that the fight is to the death and rings a bell.
<br><br>
-<<if $deadliness > (_opponent + 1)>>
+<<if _deadliness > (_opponent + 1)>>
$activeSlave.slaveName senses that $he is greatly superior, and decides to make a quick end before $his opponent can try something foolish. $He feints high and stabs low; $his enemy just manages to parry the low stab, but is so much weaker that $activeSlave.slaveName simply overpowers _himU, so that _heU falls onto _hisU back with the force of the clash. $activeSlave.slaveName takes one step forward and runs $his sword through the prostrate slave's heart. This victory has @@.green;won you some renown@@ and @@.yellowgreen;a sum of money@@ from each of the spectators.
<<run repX(500, "pit", $activeSlave)>>
<<run cashX(5000, "pit", $activeSlave)>>
<<set $activeSlave.counter.pitKills += 1>>
<<set $pitKillsTotal += 1>>
-<<elseif $deadliness > (_opponent)>>
+<<elseif _deadliness > (_opponent)>>
The combat is long and exhausting. $activeSlave.slaveName and $his opponent are closely matched in terms of skill, so neither takes foolish risks and a protracted, bloody fight results as both slaves take horrible but non-life-threatening cuts. Finally, $activeSlave.slaveName's superior physical condition wins out and $his opponent falls from exhaustion and blood loss. $activeSlave.slaveName stumbles over to open _hisU throat. This victory has @@.green;won you some renown@@ and @@.yellowgreen;a sum of money@@ from each of the spectators, though $activeSlave.slaveName is @@.red;badly hurt.@@
<<run repX(500, "pit", $activeSlave)>>
<<run cashX(5000, "pit", $activeSlave)>>
<<set $activeSlave.health.condition = -50>>
<<set $activeSlave.counter.pitKills += 1>>
<<set $pitKillsTotal += 1>>
-<<elseif $deadliness > (_opponent-1)>>
+<<elseif _deadliness > (_opponent-1)>>
The combat is long and exhausting. $activeSlave.slaveName and $his opponent are closely matched in terms of skill, so neither takes foolish risks and a protracted, bloody fight results as both slaves take horrible but non-life-threatening cuts. Finally, $activeSlave.slaveName's inferior physical condition fails $him and $he falls from exhaustion and blood loss. As $he slumps $he catches your eye with a look of apology. $His opponent stumbles over to open $his throat. $activeSlave.slaveName @@.red;has been killed.@@
<<run healthDamage($activeSlave, 1000)>>
<<else>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 8763178ad221fcc32fd1bb99255772ac013fff22..8f57105528d97458885050785867dd8afe197f97 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -118,95 +118,95 @@
<<elseif ($personalAttention == "proclamation")>>
/* handled after this if chain */
<<elseif ($personalAttention == "smuggling")>>
- <<set $qualifiedFS = []>>
+ <<set _qualifiedFS = []>>
<<if $arcologies[0].FSDegradationistDecoration >= 80>>
- <<set $qualifiedFS.push("degradationist")>>
+ <<set _qualifiedFS.push("degradationist")>>
<</if>>
<<if $arcologies[0].FSPaternalistDecoration >= 80>>
- <<set $qualifiedFS.push("paternalist")>>
+ <<set _qualifiedFS.push("paternalist")>>
<</if>>
<<if $arcologies[0].FSHedonisticDecadenceDecoration >= 80>>
- <<set $qualifiedFS.push("hedonistic")>>
+ <<set _qualifiedFS.push("hedonistic")>>
<</if>>
<<if $arcologies[0].FSSlaveProfessionalismLaw == 1>>
- <<set $qualifiedFS.push("professionalism")>>
+ <<set _qualifiedFS.push("professionalism")>>
<</if>>
<<if $arcologies[0].FSIntellectualDependencyLaw == 1>>
- <<set $qualifiedFS.push("dependency")>>
+ <<set _qualifiedFS.push("dependency")>>
<</if>>
<<if $arcologies[0].FSPetiteAdmiration >= 80>>
- <<set $qualifiedFS.push("petite")>>
+ <<set _qualifiedFS.push("petite")>>
<</if>>
<<if $arcologies[0].FSStatuesqueGlorification >= 80>>
- <<set $qualifiedFS.push("statuesque")>>
+ <<set _qualifiedFS.push("statuesque")>>
<</if>>
<<if $arcologies[0].FSPastoralistDecoration >= 80 && $arcologies[0].FSPastoralistLaw == 1>>
- <<set $qualifiedFS.push("pastoralist")>>
+ <<set _qualifiedFS.push("pastoralist")>>
<</if>>
<<if $arcologies[0].FSSupremacistDecoration >= 80>>
- <<set $qualifiedFS.push("supremacist")>>
+ <<set _qualifiedFS.push("supremacist")>>
<</if>>
<<if $arcologies[0].FSBodyPuristDecoration >= 80>>
- <<set $qualifiedFS.push("body purist")>>
+ <<set _qualifiedFS.push("body purist")>>
<</if>>
<<if $arcologies[0].FSRestartDecoration >= 80>>
- <<set $qualifiedFS.push("eugenics")>>
+ <<set _qualifiedFS.push("eugenics")>>
<</if>>
<<if $arcologies[0].FSRepopulationFocusDecoration >= 80>>
- <<set $qualifiedFS.push("repopulation")>>
+ <<set _qualifiedFS.push("repopulation")>>
<</if>>
<<if $arcologies[0].FSGenderFundamentalistDecoration >= 80>>
- <<set $qualifiedFS.push("fundamentalist")>>
+ <<set _qualifiedFS.push("fundamentalist")>>
<</if>>
<<if $arcologies[0].FSSubjugationistDecoration >= 80>>
- <<set $qualifiedFS.push("subjugationist")>>
+ <<set _qualifiedFS.push("subjugationist")>>
<</if>>
<<if $arcologies[0].FSGenderRadicalistResearch == 1>>
- <<set $qualifiedFS.push("radicalist")>>
+ <<set _qualifiedFS.push("radicalist")>>
<</if>>
<<if $arcologies[0].FSTransformationFetishistResearch == 1>>
- <<set $qualifiedFS.push("transformation")>>
+ <<set _qualifiedFS.push("transformation")>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialistDecoration >= 80>>
- <<set $qualifiedFS.push("youth")>>
+ <<set _qualifiedFS.push("youth")>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialistDecoration >= 80>>
- <<set $qualifiedFS.push("maturity")>>
+ <<set _qualifiedFS.push("maturity")>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiastDecoration >= 80>>
- <<set $qualifiedFS.push("slimness")>>
+ <<set _qualifiedFS.push("slimness")>>
<</if>>
<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
- <<set $qualifiedFS.push("expansionist")>>
+ <<set _qualifiedFS.push("expansionist")>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealistDecoration >= 80>>
- <<set $qualifiedFS.push("idealist")>>
+ <<set _qualifiedFS.push("idealist")>>
<</if>>
<<if $arcologies[0].FSChattelReligionistLaw == 1>>
- <<set $qualifiedFS.push("religion")>>
+ <<set _qualifiedFS.push("religion")>>
<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>
- <<set $qualifiedFS.push("roman law")>>
+ <<set _qualifiedFS.push("roman law")>>
<<elseif $arcologies[0].FSRomanRevivalistDecoration >= 80>>
- <<set $qualifiedFS.push("roman")>>
+ <<set _qualifiedFS.push("roman")>>
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 80>>
- <<set $qualifiedFS.push("egyptian")>>
+ <<set _qualifiedFS.push("egyptian")>>
<<elseif $arcologies[0].FSAztecRevivalistLaw == 1>>
- <<set $qualifiedFS.push("aztec law")>>
+ <<set _qualifiedFS.push("aztec law")>>
<<elseif $arcologies[0].FSAztecRevivalistDecoration >= 80>>
- <<set $qualifiedFS.push("aztec")>>
+ <<set _qualifiedFS.push("aztec")>>
<<elseif $arcologies[0].FSArabianRevivalistLaw == 1>>
- <<set $qualifiedFS.push("arabian law")>>
+ <<set _qualifiedFS.push("arabian law")>>
<<elseif $arcologies[0].FSArabianRevivalistDecoration >= 80>>
- <<set $qualifiedFS.push("arabian")>>
+ <<set _qualifiedFS.push("arabian")>>
<<elseif $arcologies[0].FSEdoRevivalistLaw == 1>>
- <<set $qualifiedFS.push("edo law")>>
+ <<set _qualifiedFS.push("edo law")>>
<<elseif $arcologies[0].FSEdoRevivalistDecoration >= 80>>
- <<set $qualifiedFS.push("edo")>>
+ <<set _qualifiedFS.push("edo")>>
<<elseif $arcologies[0].FSChineseRevivalistLaw == 1>>
- <<set $qualifiedFS.push("chinese law")>>
+ <<set _qualifiedFS.push("chinese law")>>
<<elseif $arcologies[0].FSChineseRevivalistDecoration >= 80>>
- <<set $qualifiedFS.push("chinese")>>
+ <<set _qualifiedFS.push("chinese")>>
<</if>>
<<set _caught = 0>>
<<if $rep >= 18000>> /* prestigious */
@@ -216,7 +216,7 @@
<<else>>
<<set _income = random(1500,2000)>>
<</if>>
- <<switch $qualifiedFS.random()>>
+ <<switch _qualifiedFS.random()>>
<<case "eugenics">>
<<set _income += random(2500,4000)>>
<<if $eugenicsFullControl != 1>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index a56d94d4926c3e0ad1def06a673e587450aea970..2b07f23227b2be8349786d65dd3ed0567737200c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -30,10 +30,9 @@
<<if $nicknamesAllowed == 1>>
<<if $eventSlave.assignment != "be confined in the arcade">>
- <<set $toSearch = $eventSlave.slaveName.toLowerCase()>>
- <<if ($toSearch.indexOf("'") == -1)>>
- <<if ($week-$eventSlave.weekAcquired >= 4)>>
- <<if ($eventSlave.devotion >= -20)>>
+ <<if ($eventSlave.slaveName.indexOf("'") == -1)>>
+ <<if ($week-$eventSlave.weekAcquired >= 4)>>
+ <<if ($eventSlave.devotion >= -20)>>
<<set $events.push("RE nickname")>>
<<set $events.push("RE nickname")>>
<<set $events.push("RE nickname")>>
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index 3b6877ece92b7ee88523b33d1d5b60174c6a9853..dccd2197e93d292a4078d1fd71addb51d1a66854 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -61,7 +61,7 @@ When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $
<<run Enunciate($HeadGirl)>>
You page $HeadGirl.slaveName, telling _him2 to get back up to your office. $activeSlave.slaveName hears you, of course, and stiffens with fear. $He knows $he's in trouble, but $he doesn't yet know how much. You tell $HeadGirl.slaveName to have a seat next to $activeSlave.slaveName on the couch, and instruct $assistant.name to replay the last five minutes of the feeds from your office on a wallscreen. $activeSlave.slaveName's<<if $activeSlave.lips > 40>> pillowlike<</if>> lower lip begins to tremble at this, and $he can barely manage to keep $his gaze on the fatal replay of $his attempt to convince you to replace $HeadGirl.slaveName with $him. $HeadGirl.slaveName, who is no fool, is not surprised by this, but the replay still angers _him2. As it rolls on, _his2 hands begin to roam across $activeSlave.slaveName, who winces at _his2 touch. About halfway through, $HeadGirl.slaveName looks straight at you and cruelly pinches one of $activeSlave.slaveName's nipples. You respond to the nonverbal question with a silent nod, and $HeadGirl.slaveName smiles briefly at you. Then, _he2 sticks _his2 tongue in $activeSlave.slaveName's ear. The poor slave starts at the warm, wet intrusion, but knows better than to try to resist. $He closes $his eyes tight.
<br><br>
- $HeadGirl.slaveName hops off the couch, gets down in front of _his2 victim, and shoves $his legs apart. $activeSlave.slaveName scrunches up $his face, expecting something agonizing to happen to $his <<if $activeSlave.dick == 0>>pussy, but $HeadGirl.slaveName shocks $him by starting to hungrily eat $him out.<<else>>cock, but $HeadGirl.slaveName shocks $him by giving $him a lush blowjob.<</if>> $activeSlave.slaveName clearly expects a trap, but $HeadGirl.slaveName's attentions slowly distract $him. When $he's on the very verge of orgasm, your Head Girl suddenly stops and <<if $activeSlave.dick == 0>>pinches the $girl's pussylips,<<else>>tugs the $girl's cock downward by its head,<</if>> not painfully, but hard enough to communicate threat. $activeSlave.slaveName, shocked out of $his pleasure, looks down at _him2. $HeadGirl.slaveName <<say>>s menacingly, "Bitch, if you orga<<s>>m, I'm going to fucking de<<s>>troy you." Then _hes goes back to giving $activeSlave.slaveName oral. $activeSlave.slaveName begins to cry, realizing how comprehensively fucked $he is.
+ $HeadGirl.slaveName hops off the couch, gets down in front of _his2 victim, and shoves $his legs apart. $activeSlave.slaveName scrunches up $his face, expecting something agonizing to happen to $his <<if $activeSlave.dick == 0>>pussy, but $HeadGirl.slaveName shocks $him by starting to hungrily eat $him out.<<else>>cock, but $HeadGirl.slaveName shocks $him by giving $him a lush blowjob.<</if>> $activeSlave.slaveName clearly expects a trap, but $HeadGirl.slaveName's attentions slowly distract $him. When $he's on the very verge of orgasm, your Head Girl suddenly stops and <<if $activeSlave.dick == 0>>pinches the $girl's pussylips,<<else>>tugs the $girl's cock downward by its head,<</if>> not painfully, but hard enough to communicate threat. $activeSlave.slaveName, shocked out of $his pleasure, looks down at _him2. $HeadGirl.slaveName <<say>>s menacingly, "Bitch, if you orga<<s>>m, I'm going to fucking de<<s>>troy you." Then _he2 goes back to giving $activeSlave.slaveName oral. $activeSlave.slaveName begins to cry, realizing how comprehensively fucked $he is.
<br><br>
Eventually, $he climaxes. $HeadGirl.slaveName has a talented tongue. $HeadGirl.slaveName does not begrudge the slave $his pleasure, <<if $activeSlave.dick == 0>>tonguing $his clit all the way through $his orgasm.<<else>>industriously sucking $his cock until _he2's swallowed every last drop of cum.<</if>> _He2 stands up and seizes $activeSlave.slaveName by the ear, <<say>>ing, "And now, <<s>>lut, you are fucked." $activeSlave.slaveName's weeping stopped during $his climax, but now $he starts to @@.gold;sob with terror,@@ and $he cries harder as your Head Girl hauls $him out of your office by $his ear. $HeadGirl.slaveName @@.mediumaquamarine;waves cheerfully@@ to you as _he2 leaves with _his2 victim.
<<set $i = $slaveIndices[$HeadGirl.ID]>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 98f1a4ad9774a395617ec44e8e1840e2aa59cce5..9335e3222a83ad02fc282f2f431c3d7905cd12a6 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1256,8 +1256,7 @@
<br><br>
<span id="result">
-<<set $toSearch = $activeSlave.slaveName.toLowerCase()>>
-<<if ($toSearch.indexOf("'") == -1)>>
+<<if ($activeSlave.slaveName.indexOf("'") == -1)>>
<<link "Encourage use of the nickname">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index 5868ab27f68060bfc697f8dcf75880f3b4e77eb2..d8d58f71416037b99d65cb8af0639ccb590c1b46 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -233,6 +233,6 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
<<if $lastWeeksRepErrors !== "Errors: ">>
<<link "Reset">>
<<set $lastWeeksRepErrors = "Errors: ">>
- <</link>>
+ <</link>><br>
@@.red;<<print $lastWeeksRepErrors>>@@
<</if>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 30db404a8a6da854b5a913f10b802f585ea8efcb..094e5322f049c7091fc50082c01b7125855c07f5 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -6,7 +6,7 @@ carries arms in your defense.
<<set $slaves[$i].rules.living = "luxurious">>
<</if>>
-<<set $deadliness = Deadliness($slaves[$i])>>
+<<set _deadliness = Deadliness($slaves[$i])>>
<<if $slaves[$i].skill.combat > 0>>
$His combat skills greatly increase $his deadliness.
@@ -163,19 +163,19 @@ carries arms in your defense.
<</if>>
$His constant presence is
-<<if $deadliness > 6>>
+<<if _deadliness > 6>>
extremely intimidating, @@.green;adding much to your reputation.@@
<<if $slaves[$i].career == "an arcology owner">>
You've made a one-time rival arcology owner into a deadly and loyal protector, a feat of slaveownership that's @@.green;internationally famous.@@
- <<run repX($deadliness*50, "bodyguard", $slaves[$i])>>
+ <<run repX(_deadliness*50, "bodyguard", $slaves[$i])>>
<</if>>
-<<elseif $deadliness > 3>>
+<<elseif _deadliness > 3>>
intimidating, @@.green;adding to your reputation.@@
<<else>>
hardly intimidating, @@.yellow;barely adding to your reputation.@@
<</if>>
-<<run repX($deadliness*50, "bodyguard", $slaves[$i])>>
+<<run repX(_deadliness*50, "bodyguard", $slaves[$i])>>
Being continually trusted with your life @@.hotpink;increases $his devotion to you@@ and encourages $him to @@.mediumaquamarine;trust you in turn.@@
<<set $slaves[$i].devotion += 2>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4f46b4c08e05d7f397a975138a609500799914d3..dbe39955dbcfa68689092eab892b79ee991d4686 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1,8 +1,8 @@
:: SA long term effects [nobr]
<<set _fetishChangeChance = fetishChangeChance($slaves[$i])>>
-<<set $bellyAccessory = $slaves[$i].bellyAccessory>>
-<<if $bellyAccessory == "a support band">>
+<<set _bellyAccessory = $slaves[$i].bellyAccessory>>
+<<if _bellyAccessory == "a support band">>
<<set _bellyBand = 2>>
<<else>>
<<set _bellyBand = 1>>
@@ -1399,7 +1399,7 @@
<<elseif $slaves[$i].bellyImplant >= 60000>>
$His paraphilia is satisfied by $his overfilled belly implant.
<<set _para = 1>>
- <<elseif setup.fakeBellies.includes($bellyAccessory)>>
+ <<elseif setup.fakeBellies.includes(_bellyAccessory)>>
$He @@.mediumorchid;loathes@@ being forced to carry a fake pregnancy.
<<set _para = -1>>
<<set $slaves[$i].devotion -= 3>>
@@ -4202,7 +4202,7 @@
$His areolae darken with $his progressing pregnancy.
<</if>>
<<elseif $slaves[$i].bellyPreg >= 1500>>
- <<if setup.fakeBellies.includes($bellyAccessory)>>
+ <<if setup.fakeBellies.includes(_bellyAccessory)>>
$His growing pregnancy renders $his fake belly moot.
<<set $slaves[$i].bellyAccessory = "none">>
<</if>>
@@ -4550,7 +4550,7 @@
<<include "SA inflation">>
- <<if setup.fakeBellies.includes($bellyAccessory)>>
+ <<if setup.fakeBellies.includes(_bellyAccessory)>>
$He has trouble keeping $himself full of
<<switch $slaves[$i].inflationType>>
<<case "cum" "food" "milk" "urine" "water">>
@@ -4853,7 +4853,7 @@
<</if>>
<</if>>
<<elseif $slaves[$i].bellyImplant >= 1500>>
- <<if setup.fakeBellies.includes($bellyAccessory)>>
+ <<if setup.fakeBellies.includes(_bellyAccessory)>>
$His implant rounded belly renders $his fake one moot.
<<set $slaves[$i].bellyAccessory = "none">>
<</if>>
@@ -5411,7 +5411,7 @@
<<elseif $slaves[$i].pregWeek < 0>>
Society is @@.green;pleased@@ by $slaves[$i].slaveName's recent birth.
<<= FutureSocieties.ChangePorn("RepopulationFocus", 2)>>
- <<elseif setup.fakeBellies.includes($bellyAccessory)>>
+ <<elseif setup.fakeBellies.includes(_bellyAccessory)>>
Society is @@.green;placated@@ by $slaves[$i].slaveName's fake belly.
<<run repX(0.01*$FSSingleSlaveRep, "futureSocieties", $slaves[$i])>>
<<elseif $arcologies[0].FSSubjugationist != "unset" && ($slaves[$i].race == $arcologies[0].FSSubjugationistRace)>>
@@ -5663,7 +5663,7 @@
<<if ($slaves[$i].intelligence+$slaves[$i].intelligenceImplant < -10)>>
Society @@.green;approves@@ of $slaves[$i].slaveName's dimwitted mind; this supports the idea that slaves should be entirely dependent on their owner.
<<= FutureSocieties.ChangePorn("IntellectualDependency", 1)>>
- <<elseif ["be your Head Girl", "be the Attendant", "be the Farmer", "be the Madam", "be the Matron", "be the Nurse", "be the Schoolteacher", "be the Stewardess"].includes($slaves[$i].assignment)>>
+ <<elseif ["be your Head Girl", "be the Attendant", "be the Farmer", "be the Madam", "be the Matron", "be the Nurse", "be the Schoolteacher", "be the Stewardess", "guard you"].includes($slaves[$i].assignment)>>
Society understands the value of intelligence in $his appointed position and is willing to overlook it.
<<elseif ($slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 10)>>
Society @@.red;disapproves@@ of $slaves[$i].slaveName's sharp mind; this holds back acceptance of the idea that slaves should be dumb and dependent.
@@ -5966,24 +5966,21 @@
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
- <<if typeof $slaves[$i].origin == "string">>
- <<set $toSearch = $slaves[$i].origin>>
- <<if $toSearch.indexOf("Slave Shelter") != -1>>
- <<if ["serve in the club", "serve the public", "whore", "work in the brothel"].includes($slaves[$i].assignment)>>
- <<if ($slaves[$i].trust > 20) && ($slaves[$i].health.condition > 40)>>
- <<if $arcologies[0].FSPaternalist != "unset">>
- Society @@.green;strongly approves@@ of how you've brought a shelter $girl health and happiness.
- <<= FutureSocieties.ChangePorn("Paternalist", 2)>>
- <<switch $slaves[$i].assignment>>
- <<case "work in the brothel">><<run getSlaveStatisticData($slaves[$i], $facility.brothel).rep += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel)>>
- <</switch>>
- <<elseif $arcologies[0].FSDegradationist == "unset">>
- The public knows $he's a shelter $girl you took in, and is @@.green;touched@@ that $he now seems happy and healthy.
- <<run repX(10, "futureSocieties", $slaves[$i])>>
- <<switch $slaves[$i].assignment>>
- <<case "work in the brothel">><<run getSlaveStatisticData($slaves[$i], $facility.brothel).rep += 10>>
- <</switch>>
- <</if>>
+ <<if isShelterSlave($slaves[$i])>>
+ <<if ["serve in the club", "serve the public", "whore", "work in the brothel"].includes($slaves[$i].assignment)>>
+ <<if ($slaves[$i].trust > 20) && ($slaves[$i].health.condition > 40)>>
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ Society @@.green;strongly approves@@ of how you've brought a shelter $girl health and happiness.
+ <<= FutureSocieties.ChangePorn("Paternalist", 2)>>
+ <<switch $slaves[$i].assignment>>
+ <<case "work in the brothel">><<run getSlaveStatisticData($slaves[$i], $facility.brothel).rep += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel)>>
+ <</switch>>
+ <<elseif $arcologies[0].FSDegradationist == "unset">>
+ The public knows $he's a shelter $girl you took in, and is @@.green;touched@@ that $he now seems happy and healthy.
+ <<run repX(10, "futureSocieties", $slaves[$i])>>
+ <<switch $slaves[$i].assignment>>
+ <<case "work in the brothel">><<run getSlaveStatisticData($slaves[$i], $facility.brothel).rep += 10>>
+ <</switch>>
<</if>>
<</if>>
<</if>>
@@ -7729,7 +7726,11 @@
<<set $slaves[$i].boobs -= $slaves[$i].boobsMilk>>
<<set $slaves[$i].boobsMilk = 0, $slaves[$i].lactationDuration = 2>>
<<elseif ($slaves[$i].drugs == "fertility drugs" || $slaves[$i].drugs == "super fertility drugs")>>
- and, since $he is on lactation inducing drugs, eventually can no longer hold back the flow, releasing $his milk supply
+ <<if $slaves[$i].boobsMilk > 0>>
+ and, since $he is on lactation inducing drugs, eventually can no longer hold back the flow, releasing $his milk supply
+ <<else>>
+ Since $he is on lactation inducing drugs and not being milked, $he eventually can no longer hold back the flow, and releases $his milk supply
+ <</if>>
<<if $slaves[$i].fetish == "boobs">>
in a @@.hotpink;lewd breastgasm.@@
<<set $slaves[$i].devotion += 2>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 70e1fce44d86e1b4889b1c5d746b3113609a2e67..59419b94c3052c66343ba778822f032cac895c56 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -1,6 +1,6 @@
:: SA recruit girls [nobr]
-<<set $bellyAccessory = $slaves[$i].bellyAccessory>>
+<<set _bellyAccessory = $slaves[$i].bellyAccessory>>
/* Note on target sum: HG and Recruiter are the initial 2 counted (no facility req'd), while HGSuite counts the HG's girl, other facilities count associated leader */
<<if $recruiterIdleRule == "number">>
@@ -399,7 +399,7 @@
$He does $his best to convince them that being your slave whore will be safer and healthier than streetwalking.
<</if>>
<<elseif $recruiterTarget == "expectant mothers">> /* now you can ginger too */
- <<if (($Recruiter.belly >= 1500 || setup.fakeBellies.includes($bellyAccessory) && $Recruiter.weight < 130) || $Recruiter.belly >= 100000)>>
+ <<if (($Recruiter.belly >= 1500 || setup.fakeBellies.includes(_bellyAccessory) && $Recruiter.weight < 130) || $Recruiter.belly >= 100000)>>
<<if $Recruiter.preg > $Recruiter.pregData.normalBirth/8>>
Since $he's visibly pregnant $himself, $he speaks with authority when $he says that Free Cities medicine can keep them and their pregnancies safe and healthy.
<<else>>
@@ -544,7 +544,7 @@
<<set _seed += 1>>
<</if>>
<<else>>
- <<if $slaves[$i].balls < 1 && ($slaves[$i].bellPreg >= 1500 || setup.fakeBellies.includes($bellyAccessory))>>
+ <<if $slaves[$i].balls < 1 && ($slaves[$i].bellPreg >= 1500 || setup.fakeBellies.includes(_bellyAccessory))>>
<<if $slaves[$i].bellPreg >= 1500>>
<<set _seed += 4>>
<<else>>
@@ -888,7 +888,7 @@
<<if $arcologies[0].FSRestart == "unset">>
<<if $slaves[$i].bellyPreg >= 1500>>
$He unashamedly live streams an obstetric health check in the nude, promising to broadcast similar footage right up until, and during, the birth.
- <<elseif setup.fakeBellies.includes($bellyAccessory)>>
+ <<elseif setup.fakeBellies.includes(_bellyAccessory)>>
With some discreet editing, $he uploads fake ultrasounds to match $his plastic pregnancy, bringing a little more attention to your fertility campaigns.
<<else>>
$He posts plenty of snapshots of gravid mothers-to-be. But with no belly bump of $his own to feature, the impact is no different from any preggo porn already floating around the net.
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 8a3f643ad5c5df783b0ba2dcda56da76a4edf19f..332901687204206d68c45e99e48495636aba5076 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -82,16 +82,16 @@ $He's certainly going to have some adjustments to make.
<</if>>
<<if $activeSlave.prestigeDesc == 0>>
- <<set $toSearch = "">>
+ <<set _toSearch = "">>
<<else>>
- <<set $toSearch = $activeSlave.prestigeDesc>>
+ <<set _toSearch = $activeSlave.prestigeDesc>>
<</if>>
<<if $activeSlave.porn.prestigeDesc == 0>>
- <<set $toSearchAlt = "">>
+ <<set _toSearchAlt = "">>
<<else>>
- <<set $toSearchAlt = $activeSlave.porn.prestigeDesc>>
+ <<set _toSearchAlt = $activeSlave.porn.prestigeDesc>>
<</if>>
-<<if ($toSearch.indexOf("Head Girl") != -1) || ($HeadGirl.ID == $activeSlave.ID)>>
+<<if (_toSearch.indexOf("Head Girl") != -1) || ($HeadGirl.ID == $activeSlave.ID)>>
<br><br>
$He has a reputation from $his long service as your Head Girl. To $his bemusement, and considerable satisfaction, $he has multiple job offers from slaving operations without even having to circulate $his resume.
<<if $activeSlave.fetish == "sadist">>
@@ -101,7 +101,7 @@ $He's certainly going to have some adjustments to make.
<<else>>
$His annuity means that $he doesn't have to work, but $he's inclined to do so. $His skills command reasonable wages in the slave training field, and between those prospects and $his annuity, $he stands to become wealthy.
<</if>>
-<<elseif ($toSearchAlt.indexOf("is world famous for") != -1)>>
+<<elseif (_toSearchAlt.indexOf("is world famous for") != -1)>>
<br><br>
<<set _pornFame = $activeSlave.porn.prestigeDesc>>
<<set _pornFame = _pornFame.replace("$He is world famous for $his career in slave pornography. Millions are intimately familiar with", "enjoy")>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index db320ebf475fb1c50d704d28b09c8f6838be4618..ad1631c7a1d06936fa2aa8a9059c61f178154bc0 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -820,7 +820,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
<</if>>
<</if>>
-<<if $slaves[$i].origin && $slaves[$i].origin.includes("Slave Shelter")>>
+<<if isShelterSlave($slaves[$i])>>
<<set $shelterGirlsIDs.push($slaves[$i].ID)>>
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index fb0d0139d4f1b3daa26c636554a9daf9a860fe62..82413da028bc353304a9bb8c7a39526d32a9b297 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -1256,11 +1256,8 @@
<</switch>>
-<<if $activeSlave.origin != 0>>
- <<set $toSearch = $activeSlave.origin>>
- <<if $toSearch.indexOf("Slave Shelter") != -1>>
- <<set $shelterAbuse += 1>>
- <</if>>
+<<if isShelterSlave($activeSlave)>>
+ <<set $shelterAbuse += 1>>
<</if>>
<<= removeActiveSlave() >>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 29632ae7eca187b1974d204b45badd67182cb9c3..cec8d828caf092903dde74efcf241c0f3000e1fd 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -63,10 +63,11 @@ Sample summary:
App.UI.SlaveList.SlaveInteract.stdInteract
)>>
-<<options $lineSeparations "Summary Options">>
- Line separations are
- <<option 1 "Shown">>
- <<option 0 "Hidden">>
+<<options $slavePanelStyle "Summary Options">>
+ Panel style is
+ <<option 0 "None">>
+ <<option 1 "Line Seperators">>
+ <<option 2 "Card">>
<</options>>
<<options $abbreviateDevotion "Summary Options">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 8c85c9b2e0b9a136d286adcb0d945224c8ff4c10..f6ba5f14ac44b7a92a6cd13b524235db0bbcfd15 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1419,60 +1419,60 @@ $He's got a
<<widget "AnusDescription">>
<<if (skinToneLevel($activeSlave.skin) < 13)>>
- <<set $skinDesc = "pink">>
+ <<set _skinDesc = "pink">>
<<elseif ($activeSlave.anusTat == "bleached")>>
- <<set $skinDesc = $activeSlave.skin>>
+ <<set _skinDesc = $activeSlave.skin>>
<<elseif (skinToneLevel($activeSlave.skin) > 19)>>
- <<set $skinDesc = "dark">>
+ <<set _skinDesc = "dark">>
<<else>>
- <<set $skinDesc = "darker">>
+ <<set _skinDesc = "darker">>
<</if>>
-<<set $analSkinDesc = either("crinkled", "puckered", "puffy")>>
+<<set _analSkinDesc = either("crinkled", "puckered", "puffy")>>
<<if $activeSlave.anus == 0>>
$He is an @@.lime;anal virgin;@@ $his asshole is fresh and tight.
<<elseif $activeSlave.anus == 1>>
<<set _ass = either("anal opening", "anus", "asshole", "butthole")>>
$His _ass is <<set _ass = either("nice and", "very")>>_ass tight,
<<if $activeSlave.analArea-$activeSlave.anus > 3>>
- but it's surrounded by a massive oval of $analSkinDesc $skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
+ but it's surrounded by a massive oval of _analSkinDesc _skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
<<elseif $activeSlave.analArea-$activeSlave.anus > 2>>
- but it's surrounded by an oval of $analSkinDesc $skinDesc skin that occupies $his entire <<set _ass = either("asscrack", "buttcrack")>>_ass.
+ but it's surrounded by an oval of _analSkinDesc _skinDesc skin that occupies $his entire <<set _ass = either("asscrack", "buttcrack")>>_ass.
<<elseif $activeSlave.analArea-$activeSlave.anus > 1>>
- but it's surrounded by a big ring of $analSkinDesc $skinDesc skin.
+ but it's surrounded by a big ring of _analSkinDesc _skinDesc skin.
<<elseif $activeSlave.analArea-$activeSlave.anus > 0>>
- and it's surrounded by a cute <<set _ass = either("pucker", "ring", "rosebud")>>_ass of $skinDesc skin.
+ and it's surrounded by a cute <<set _ass = either("pucker", "ring", "rosebud")>>_ass of _skinDesc skin.
<<else>>
- and the $skinDesc skin around it is stretched smooth, since it's been deflowered only recently.
+ and the _skinDesc skin around it is stretched smooth, since it's been deflowered only recently.
<</if>>
<<elseif $activeSlave.anus == 2>>
<<set _ass = either("anal opening", "anus", "asshole", "asspussy", "butthole")>>
$His _ass is <<if $activeSlave.analArea-$activeSlave.anus > 1>>only <</if>><<set _ass = either("relaxed", "loose", "accommodating")>>_ass,
<<if $activeSlave.analArea-$activeSlave.anus > 2>>
- but it's surrounded by a massive oval of $analSkinDesc $skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
+ but it's surrounded by a massive oval of _analSkinDesc _skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
<<elseif $activeSlave.analArea-$activeSlave.anus > 1>>
- but it's surrounded by an oval of $analSkinDesc $skinDesc skin that occupies $his entire <<set _ass = either("asscrack", "buttcrack")>>_ass.
+ but it's surrounded by an oval of _analSkinDesc _skinDesc skin that occupies $his entire <<set _ass = either("asscrack", "buttcrack")>>_ass.
<<elseif $activeSlave.analArea-$activeSlave.anus > 0>>
- and it's surrounded by a big ring of $analSkinDesc $skinDesc skin.
+ and it's surrounded by a big ring of _analSkinDesc _skinDesc skin.
<<else>>
- and the $skinDesc skin around it is stretched smooth, suggesting it's getting used to being this way.
+ and the _skinDesc skin around it is stretched smooth, suggesting it's getting used to being this way.
<</if>>
<<elseif $activeSlave.anus == 3>>
<<set _ass = either("anal opening", "anus", "asshole", "asspussy", "butthole")>>
$His _ass is a <<set _ass = either("lewd", "loose", "relaxed", "welcoming")>>_ass slit,
<<if $activeSlave.analArea-$activeSlave.anus > 1>>
- and it's surrounded by a massive oval of $analSkinDesc $skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
+ and it's surrounded by a massive oval of _analSkinDesc _skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
<<elseif $activeSlave.analArea-$activeSlave.anus > 0>>
- and it's surrounded by an oval of $analSkinDesc $skinDesc skin that occupies $his entire <<set _ass = either("asscrack", "buttcrack")>>_ass.
+ and it's surrounded by an oval of _analSkinDesc _skinDesc skin that occupies $his entire <<set _ass = either("asscrack", "buttcrack")>>_ass.
<<else>>
- and the $skinDesc skin around it is stretched smooth, suggesting $he's getting used to having such a cock-hungry rear fuckhole.
+ and the _skinDesc skin around it is stretched smooth, suggesting $he's getting used to having such a cock-hungry rear fuckhole.
<</if>>
<<else>>
<<set _ass = either("anal opening", "anal slit", "anus", "asshole", "asspussy", "butthole")>>
$His _ass is a <<set _ass = either("loose", "open", "permanent", "relaxed")>>_ass gape,
<<if $activeSlave.analArea-$activeSlave.anus > 0>>
- and it's surrounded by a massive oval of $skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
+ and it's surrounded by a massive oval of _skinDesc skin that runs from $his tailbone all the way down to the <<if $activeSlave.vagina > -1>>bottom of $his pussy<<else>>base of $his cock<</if>>.
<<else>>
- and the $skinDesc skin around it is stretched smooth, suggesting $he's only recently had $his ass ruined.
+ and the _skinDesc skin around it is stretched smooth, suggesting $he's only recently had $his ass ruined.
<</if>>
<</if>>
@@ -4611,7 +4611,6 @@ $He has
<<widget "BellyDescription">>
-<<set $bellyAccessory = $activeSlave.bellyAccessory>>
<<if $activeSlave.belly >= 30000>>
<<if ($activeSlave.belly >= 400000+($activeSlave.muscles*2000) && $activeSlave.physicalAge >= 18)>>
<<set _heavyBelly = 1>>
@@ -15647,7 +15646,7 @@ $He has
<</if>> /* closes show clothing */
<<if $activeSlave.fuckdoll == 0>>
- <<if setup.fakeBellies.includes($bellyAccessory)>>
+ <<if setup.fakeBellies.includes($activeSlave.bellyAccessory)>>
<<switch $activeSlave.bellyAccessory>>
<<case "a huge empathy belly">>
$He is wearing a carefully sculpted silicone belly modeled after a full-term pregnant woman carrying twins.
diff --git a/src/utility/descriptionWidgetsPiercings.tw b/src/utility/descriptionWidgetsPiercings.tw
index 91e83e21e8682b7fbfb53cfe8e40ff4e42a04d49..75f27373d8a8be60c4f47dc7ee7da7b0efcbdd57 100644
--- a/src/utility/descriptionWidgetsPiercings.tw
+++ b/src/utility/descriptionWidgetsPiercings.tw
@@ -239,7 +239,7 @@
<<widget "navelPiercingDescription">>
<<if $activeSlave.fuckdoll == 0>>
- <<if setup.fakeBellies.includes($bellyAccessory)>>
+ <<if setup.fakeBellies.includes($activeSlave.bellyAccessory)>>
<<if $activeSlave.navelPiercing == 1>>
$His fake navel bears a simple stud.
<<elseif $activeSlave.navelPiercing == 2>>