diff --git a/devNotes/twine JS b/devNotes/twine JS
index 1cf9a84de95c52140bf67eb31aa03141603fc6a2..43e13477e3d44b34bd1e40269cd530771d21868b 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -3888,6 +3888,135 @@ window.isPure = function(slave) {
return ((slave.boobsImplant == 0) && (slave.buttImplant == 0) && (slave.waist >= -95) && (slave.lipsImplant == 0) && (slave.faceImplant < 30) && (slave.bellyImplant == -1) && (Math.abs(slave.shouldersImplant) < 2) && (Math.abs(slave.hipsImplant) < 2));
}
+window.PiercingScore = function(slave) {
+ var piercingScore = 0;
+
+ if (slave.earPiercing > 0) {
+ piercingScore += slave.earPiercing*0.75-0.5;
+ }
+ if (slave.nosePiercing > 0) {
+ piercingScore += slave.nosePiercing*0.75-0.5;
+ }
+ if (slave.eyebrowPiercing > 0) {
+ piercingScore += slave.eyebrowPiercing*0.75-0.5;
+ }
+ if (slave.navelPiercing > 0) {
+ piercingScore += slave.navelPiercing*0.75-0.5;
+ }
+ if (slave.corsetPiercing > 0) {
+ piercingScore += slave.corsetPiercing*0.75+0.5;
+ }
+ if (slave.nipplesPiercing > 0) {
+ piercingScore += slave.nipplesPiercing*0.75-0.25;
+ }
+ if (slave.areolaePiercing > 0) {
+ piercingScore += slave.areolaePiercing*0.75+0.5;
+ }
+ if (slave.lipsPiercing > 0) {
+ piercingScore += slave.lipsPiercing*0.75-0.25;
+ }
+ if (slave.tonguePiercing > 0 ) {
+ piercingScore += slave.tonguePiercing*0.75-0.25;
+ }
+ if (slave.clitPiercing == 3) {
+ piercingScore += 1.25; /* smart piercing */
+ } else if (slave.clitPiercing > 0) {
+ piercingScore += slave.clitPiercing*0.75-0.25;
+ }
+ if (slave.vaginaPiercing > 0) {
+ piercingScore += slave.vaginaPiercing*0.75-0.25;
+ }
+ if (slave.dickPiercing > 0) {
+ piercingScore += slave.dickPiercing*0.75-0.25;
+ }
+ if (slave.anusPiercing > 0) {
+ piercingScore += slave.anusPiercing*0.75-0.25;
+ }
+ return piercingScore;
+}
+
+window.TatScore = function(slave) {
+ var tatScore = 0;
+
+ if (slave.boobsTat != 0) {
+ tatScore += 1.25;
+ }
+ if (slave.buttTat != 0) {
+ tatScore += 1.25;
+ }
+ if (slave.lipsTat != 0) {
+ tatScore += 1.25;
+ }
+ if (slave.shouldersTat != 0) {
+ tatScore += 1;
+ }
+ if (slave.backTat != 0) {
+ tatScore += 1.25;
+ }
+ if (slave.armsTat != 0) {
+ tatScore += 1;
+ }
+ if (slave.legsTat != 0) {
+ tatScore += 1;
+ }
+ if (slave.stampTat != 0) {
+ tatScore += 1;
+ }
+ if (slave.vaginaTat != 0) {
+ tatScore += 1;
+ }
+ if (slave.dickTat != 0) {
+ tatScore += 1;
+ }
+ if (slave.bellyTat != 0) {
+ if (((slave.preg > 30) && (slave.pregType >= 20)) || (slave.belly >= 300000)) {
+ tatScore += 0.75;
+ } else if (((slave.preg > 20) && (slave.pregType >= 20)) || ((slave.preg > 30) && (slave.pregType >= 10)) || (slave.belly >= 150000)) {
+ tatScore += 1;
+ } else if ((slave.belly >= 10000) || (slave.bellyImplant >= 8000)) {
+ tatScore += 1;
+ } else if (((slave.preg >= 10) && (slave.pregType >= 20)) || ((slave.preg > 10) && (slave.pregType >= 10)) || (slave.belly >= 5000)) {
+ tatScore += 0.5;
+ } else if (slave.belly >= 1500) {
+ tatScore += 0.25;
+ } else {
+ tatScore += 0.1;
+ }
+ }
+ if (slave.anusTat == "bleached") {
+ tatScore += 0.5;
+ } else if (slave.anusTat != 0) {
+ tatScore += 1.25;
+ }
+
+ return tatScore;
+}
+
+window.slimPass = function(slave) {
+ var slimPass = 0;
+ var ArcologyZero = State.variables.arcologies[0];
+
+ if (ArcologyZero.FSSlimnessEnthusiastLaw == 1) {
+ if ((slave.boobs < 300) && (slave.butt <= 1) && (slave.waist <= 10)) {
+ State.variables.slimPass = 1;
+ if ((ArcologyZero.FSPhysicalIdealist == "unset") && (ArcologyZero.FSHedonisticDecadenceStrongFat == 0) && (slave.muscles > 30)) { /*muscle check*/
+ slimPass = 0;
+ }
+ if (State.variables.slimPass == 1) {
+ if ((ArcologyZero.FSHedonisticDecadence != "unset") || (ArcologyZero.FSPhysicalIdealistStrongFat == 1)) { /*weight check*/
+ if (slave.weight > 30) {
+ slimPass = 0;
+ }
+ } else if (slave.weight > 10) {
+ slimPass = 0;
+ }
+ }
+ }
+ }
+
+ return slimPass;
+}
+
/*:: DTreeJS [script]*/
/* This is the minified version of lodash, d3 and dTree */
;
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 90d4d94bbc5e81790dd26d14c33c23261fe2b162..080acee43ec65538f0e36066b5af51f893accda8 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -24,4 +24,6 @@ $$i
$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.HasBeenAssignedToFacilitySupport
$drugs
$PC.origRace, $PC.origSkin
+$FacilitySupportCapacity
+$modded, $XY, $XX, $old, $young, $pregYes, $pregNo, $implanted
*/
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 5cdba9ecac5f5a221ddea979e4f324f8f7a9f0ba..92dc2139698ba44b3bba0106c77882d2668066a6 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -522,10 +522,10 @@
<</if>>
<<if (_slim > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the brothel are slim.<br>
+ Most of the slaves in the brothel are slim.<br>
<<elseif (_stacked > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the brothel are stacked.<br>
+ Most of the slaves in the brothel are stacked.<br>
<<else>>
<<set _girls = 0>>
The slaves in the brothel vary in slimness.<br>
@@ -590,10 +590,10 @@
<</if>>
<<if (_pregNo > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the brothel have flat bellies.<br>
+ Most of the slaves in the brothel have flat bellies.<br>
<<elseif (_pregYes > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the brothel have big bellies.<br>
+ Most of the slaves in the brothel have big bellies.<br>
<<else>>
<<set _girls = 0>>
The slaves in the brothel vary in belly size.<br>
@@ -660,10 +660,10 @@
<</if>>
<<if (_modded > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the brothel are heavily pierced and tattoed.<br>
+ Most of the slaves in the brothel are heavily pierced and tattoed.<br>
<<elseif (_unmodded > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the brothel have natural unmodded bodies.<br>
+ Most of the slaves in the brothel have natural unmodded bodies.<br>
<<else>>
<<set _girls = 0>>
Some girls in the brothel have piercings or tattoos, some do not and others have both.<br>
@@ -704,7 +704,7 @@
<<set _ads = -1>>
<<else>>
Its advertisements feature some girls that are surgically improved and implanted and some that are all-natural.
- <<set ads = 0>>
+ <<set _ads = 0>>
<</if>>
<</if>>
<<if ($arcologies[0].FSTransformationFetishist != "unset") && ($arcologies[0].FSDegradationist >= 80)>>
@@ -728,10 +728,10 @@
<</if>>
<<if (_implanted > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the brothel are heavily implanted or surgically enhanced.<br>
+ Most of the slaves in the brothel are heavily implanted or surgically enhanced.<br>
<<elseif (_pure > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the brothel have naturally pure bodies.<br>
+ Most of the slaves in the brothel have naturally pure bodies.<br>
<<else>>
<<set _girls = 0>>
The slaves in the brothel vary in body modification.<br>
@@ -795,9 +795,9 @@
<</if>>
<<if (_XX > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the brothel have female genitalia.<br>
+ Most of the slaves in the brothel have female genitalia.<br>
<<elseif (_XY > (_DL/2))>>
- Most of the the slaves in the brothel have male genitalia.<br>
+ Most of the slaves in the brothel have male genitalia.<br>
<<set _girls = -1>>
<<else>>
<<set _girls = 0>>
@@ -871,10 +871,10 @@
<</if>>
<<if (_young > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the brothel are young.<br>
+ Most of the slaves in the brothel are young.<br>
<<elseif (_old > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the brothel are mature.<br>
+ Most of the slaves in the brothel are mature.<br>
<<else>>
<<set _girls = 0>>
The slaves in the brothel vary in age.<br>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 44754e077fc4b471ca8ad1074c86fdf041ce3ce1..767be2e410d443818a3dadceb212b108915ffa92 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -341,10 +341,10 @@
<</if>>
<<if (_slim > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the club are slim.<br>
+ Most of the slaves in the club are slim.<br>
<<elseif (_stacked > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the club are stacked.<br>
+ Most of the slaves in the club are stacked.<br>
<<elseif (_slim > 0) && (_stacked > 0) && (Math.abs(_slim-_stacked) <= (_DL/3))>>
<<set _girls = 0>>
The slaves in the club vary in slimness.<br>
@@ -409,10 +409,10 @@
<</if>>
<<if (_modded > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the club are heavily pierced and tattoed.<br>
+ Most of the slaves in the club are heavily pierced and tattoed.<br>
<<elseif (_unmodded > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the club have natural unmodded bodies.<br>
+ Most of the slaves in the club have natural unmodded bodies.<br>
<<else>>
<<set _girls = 0>>
Some girls in the club have piercings or tattoos, some do not and others have both.<br>
@@ -453,7 +453,7 @@
<<set _ads = -1>>
<<else>>
Its advertisements feature some girls that are surgically improved and implanted and some that are all-natural.
- <<set ads = 0>>
+ <<set _ads = 0>>
<</if>>
<</if>>
<<if ($arcologies[0].FSTransformationFetishist != "unset") && ($arcologies[0].FSDegradationist >= 80)>>
@@ -477,10 +477,10 @@
<</if>>
<<if (_implanted > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the club are heavily implanted or surgically enhanced.<br>
+ Most of the slaves in the club are heavily implanted or surgically enhanced.<br>
<<elseif (_pure > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the club have naturally pure bodies.<br>
+ Most of the slaves in the club have naturally pure bodies.<br>
<<else>>
<<set _girls = 0>>
The slaves in the club vary in body modification.<br>
@@ -544,9 +544,9 @@
<</if>>
<<if (_XX > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the club have female genitalia.<br>
+ Most of the slaves in the club have female genitalia.<br>
<<elseif (_XY > (_DL/2))>>
- Most of the the slaves in the club have male genitalia.<br>
+ Most of the slaves in the club have male genitalia.<br>
<<set _girls = -1>>
<<else>>
<<set _girls = 0>>
@@ -620,10 +620,10 @@
<</if>>
<<if (_old > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the club are mature.<br>
+ Most of the slaves in the club are mature.<br>
<<elseif (_young > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the club are young.<br>
+ Most of the slaves in the club are young.<br>
<<else>>
<<set _girls = 0>>
The slaves in the club vary in age.<br>
@@ -688,10 +688,10 @@
<</if>>
<<if (_pregNo > (_DL/2))>>
<<set _girls = -1>>
- Most of the the slaves in the club have flat bellies.<br>
+ Most of the slaves in the club have flat bellies.<br>
<<elseif (_pregYes > (_DL/2))>>
<<set _girls = 1>>
- Most of the the slaves in the club have big bellies.<br>
+ Most of the slaves in the club have big bellies.<br>
<<else>>
<<set _girls = 0>>
The slaves in the club vary in belly size.<br>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 040cab16d3f989b584bb4164b3b040485f688ec2..f8fbbe7ae08d1fa36dcd5ca7cbc696eecfc9c648 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -774,7 +774,7 @@ serves you this week.
<<if $slaves[$i].father == -1 && $slaves[$i].mother != -1>>
Keeping your own daughter as a personal fucktoy leaves quite a public impression.
<<elseif $slaves[$i].father > 0 && $slaves[$i].mother != $slaves[$i].father>>
- <<set _spy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].father && s.assignment == "please you"; })>>
+ <<set _spy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].father && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine"); })>>
<<if _spy != -1>>
Since you are also keeping $possessive father as a sexual servant, you often use them together, which leaves quite a public impression.
<</if>>
@@ -783,13 +783,13 @@ serves you this week.
<<if $slaves[$i].mother == -1>>
Keeping your own daughter as a sexual servant leaves quite a public impression.
<<elseif $slaves[$i].mother > 0>>
- <<set _spy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].mother && s.assignment == "please you"; })>>
+ <<set _spy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].mother && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine"); })>>
<<if _spy != -1>>
Since you are also keeping $possessive mother as a sexual servant, you often use them together, which leaves quite a public impression.
<</if>>
<</if>>
- <<set _children = $slaves.filter(function(s) { return (s.father == $slaves[$i].ID || s.mother == $slaves[$i].ID) && s.assignment == "please you"; })>>
+ <<set _children = $slaves.filter(function(s) { return (s.father == $slaves[$i].ID || s.mother == $slaves[$i].ID) && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine"); })>>
<<if _children.length > 2>>
Since you are also keeping $possessive daughters,
<<for _spy = 0; _spy < _children.length; _spy++>>
@@ -806,7 +806,7 @@ serves you this week.
Since you are also keeping $possessive daughter as a sexual servant, you often use them together, which leaves quite a public impression.
<</if>>
- <<set _children = $slaves.filter(function(s) { return (areSisters($slaves[$i], s) > 0) && s.assignment == "please you"; })>>
+ <<set _children = $slaves.filter(function(s) { return (areSisters($slaves[$i], s) > 0) && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine"); })>>
<<if _children.length > 2>>
Since you are also keeping $possessive sisters,
<<for _spy = 0; _spy < _children.length; _spy++>>
@@ -825,7 +825,7 @@ serves you this week.
<<else>>
<<if ($slaves[$i].relation != 0)>>
- <<set _spy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].relationTarget && s.assignment == "please you"; })>>
+ <<set _spy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].relationTarget && (s.assignment == "please you" || s.assignment == "serve in the master suite" || s.assignment == "be your Concubine"); })>>
<<if _spy != -1>>
Since you are also keeping $possessive $slaves[_spy].relation as a sexual servant, you often use them together, which leaves quite a public impression.
<</if>>