From 6137248cf81f10835e680a402ba91b352b484e8a Mon Sep 17 00:00:00 2001
From: corncobman21 <corncobman21@hotmail.com>
Date: Mon, 1 Jan 2018 22:00:43 -0500
Subject: [PATCH] Count slim, stacked, etc. from within the passage itself
---
src/uncategorized/brothelReport.tw | 78 ++++++++++++++++++++++++------
1 file changed, 64 insertions(+), 14 deletions(-)
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 6c496f7fcfc..a3fddf3b0b3 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -5,9 +5,9 @@
<<SlaveSort $BrothiIDs>>
<<set _DL = $BrothiIDs.length, $brothelSlaves = _DL, _SL = $slaves.length, $implanted = 0, $legendaryWhoreID = 0, $madamCashBonus = 0, _FLsFetish = 0, _profits = 0>>
-
<<set $legendaryWombID = 0>>
-<<set _brothelSlaves = $slaves.filter(function(s) { return s.assignment == "work in the brothel" || s.ID == $Madam.ID })>>
+<<set _modded = 0, _old = 0, _pure = 0, _slim = 0, _stacked = 0, _unmodded = 0, _XX = 0, _XY = 0, _young = 0, _pregYes = 0, _pregNo = 0>>
+
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.brothel = initFacilityStatistics($facility.brothel)>>
@@ -254,6 +254,37 @@
<</silently>>
<</if>>
<<set $Madam = $slaves[_FLs]>>
+ <<if isSlim($slaves[_FLs]) == true>>
+ <<set _slim += 1>>
+ <</if>>
+ <<if isStacked($slaves[_FLs]) == true>>
+ <<set _stacked += 1>>
+ <</if>>
+ <<if isYoung($slaves[_FLs]) == true>>
+ <<set _young += 1>>
+ <<else>>
+ <<set _old += 1>>
+ <</if>>
+ <<if isModded($slaves[_FLs]) == true>>
+ <<set _young += 1>>
+ <<else>>
+ <<set _old += 1>>
+ <</if>>
+ <<if isXX($slaves[_FLs]) == true>>
+ <<set _XX += 1>>
+ <<else>>
+ <<set _XY += 1>>
+ <</if>>
+ <<if isPure($slaves[_FLs]) == true>>
+ <<set _pure += 1>>
+ <<else>>
+ <<set _implanted += 1>>
+ <</if>>
+ <<if isPreg($slaves[_FLs]) == true>>
+ <<set _pregYes += 1>>
+ <<else>>
+ <<set _pregNo += 1>>
+ <</if>>
<</if>>
<<if (_DL > 0)>>
@@ -343,6 +374,37 @@
<<include "SA devotion">>
<</silently>>
<</if>>
+ <<if isSlim($slaves[$i]) == true>>
+ <<set _slim += 1>>
+ <</if>>
+ <<if isStacked($slaves[$i]) == true>>
+ <<set _stacked += 1>>
+ <</if>>
+ <<if isYoung($slaves[$i]) == true>>
+ <<set _young += 1>>
+ <<else>>
+ <<set _old += 1>>
+ <</if>>
+ <<if isModded($slaves[$i]) == true>>
+ <<set _young += 1>>
+ <<else>>
+ <<set _old += 1>>
+ <</if>>
+ <<if isXX($slaves[$i]) == true>>
+ <<set _XX += 1>>
+ <<else>>
+ <<set _XY += 1>>
+ <</if>>
+ <<if isPure($slaves[$i]) == true>>
+ <<set _pure += 1>>
+ <<else>>
+ <<set _implanted += 1>>
+ <</if>>
+ <<if isPreg($slaves[$i]) == true>>
+ <<set _pregYes += 1>>
+ <<else>>
+ <<set _pregNo += 1>>
+ <</if>>
<<if $brothelAdsSpending != 0>>
<<set _seed = 0>>
<<if $brothelAdsStacked == 1>>
@@ -430,8 +492,6 @@
<<if ($arcologies[0].FSAssetExpansionist == "unset") && ($arcologies[0].FSSlimnessEnthusiast == "unset")>>
<<if ($brothelAdsSpending == 0) || ($brothelAdsStacked == 0)>>
<<set _possibleBonuses++>>
- <<set _slim = slimCount(_brothelSlaves)>>
- <<set _stacked = stackedCount(_brothelSlaves)>>
<<if (_slim > 0) && (_stacked > 0) && (Math.abs(_slim-_stacked) <= (_DL/3))>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
The brothel offers a @@.yellowgreen;wide@@ variety of slim and stacked slaves.
@@ -441,8 +501,6 @@
<<if ($arcologies[0].FSRepopulationFocus == "unset") && ($arcologies[0].FSRestart == "unset")>>
<<if ($brothelAdsSpending == 0) || ($brothelAdsPreg == 0)>>
<<set _possibleBonuses++>>
- <<set _pregYes = pregYesCount(_brothelSlaves)>>
- <<set _pregNo = pregNoCount(_brothelSlaves)>>
<<if (_pregYes > 0) && (_pregNo > 0) && (Math.abs(_pregYes-_pregNo) <= (_DL/3))>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
The brothel offers a @@.yellowgreen;wide@@ variety of slaves with big bellies and slaves with flat bellies.
@@ -452,8 +510,6 @@
<<if ($arcologies[0].FSDegradationist == "unset") && ($arcologies[0].FSBodyPurist == "unset")>>
<<if ($brothelAdsSpending == 0) || ($brothelAdsModded == 0)>>
<<set _possibleBonuses++>>
- <<set _modded = moddedCount(_brothelSlaves)>>
- <<set _unmodded = unmoddedCount(_brothelSlaves)>>
<<if (_modded > 0) && (_unmodded > 0) && (Math.abs(_modded-_unmodded) <= (_DL/3))>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
The brothel offers a @@.yellowgreen;both@@ heavily pierced and tattooed slaves and slaves with more natural bodies.
@@ -463,8 +519,6 @@
<<if ($arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSBodyPurist == "unset")>>
<<if ($brothelAdsSpending == 0) || ($brothelAdsImplanted == 0)>>
<<set _possibleBonuses++>>
- <<set _implanted = implantedCount(_brothelSlaves)>>
- <<set _pure = pureCount(_brothelSlaves)>>
<<if (_implanted > 0) && (_pure > 0) && (Math.abs(_implanted-_pure) <= (_DL/3))>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
The brothel offers @@.yellowgreen;both@@ all-natural girls, and slaves whose beauty has been improved by surgical means.
@@ -474,8 +528,6 @@
<<if $seeDicks != 0>>
<<if ($brothelAdsSpending == 0) || ($brothelAdsXX == 0)>>
<<set _possibleBonuses++>>
- <<set _XX = XXCount(_brothelSlaves)>>
- <<set _XY = XYCount(_brothelSlaves)>>
<<if (_XX > 0) && (_XY > 0) && (Math.abs(_XX-_XY) <= (_DL/3))>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
The brothel offers a @@.yellowgreen;mix@@ of whores that can appeal to varied tastes in genitalia.
@@ -485,8 +537,6 @@
<<if ($arcologies[0].FSMaturityPreferentialist == "unset") && ($arcologies[0].FSYouthPreferentialist == "unset")>>
<<if ($brothelAdsSpending == 0) || ($brothelAdsOld == 0)>>
<<set _possibleBonuses++>>
- <<set _young = youngCount(_brothelSlaves)>>
- <<set _old = oldCount(_brothelSlaves)>>
<<if (_young > 0) && (_old > 0) && (Math.abs(_young-_old) <= (_DL/3))>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
The brothel offers girls @@.yellowgreen;both@@ young and mature.
--
GitLab