From 1d17e5a98a7e7217b48ad259a85752dca15bd881 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 6 Jan 2018 09:06:11 -0500
Subject: [PATCH] Manual Merge of !1274
---
src/uncategorized/brothelReport.tw | 3 ++-
src/uncategorized/clubReport.tw | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 92dc2139698..6a32b49a9b5 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -807,7 +807,7 @@
<<elseif ($brothelAdsSpending > 0) >>
<<if (_ads == _pref) && (_girls == _ads)>>
<<set _adsIncome = _DL*random(20,30), $cash += _adsIncome, $facility.brothel.adsIncome += _adsIncome, _brothelBonuses++>>
- Its advertising for girls <<if _ads == 1>>with pussies <<elseif _ads == -1>>with dicks <</if>> matches most customers' age preferences as advertised. Your @@.green;reputation@@ increased slightly as a result.
+ Its advertising for girls <<if _ads == 1>>with pussies <<elseif _ads == -1>>with dicks <</if>> matches most customers' preferences as advertised. Your @@.green;reputation@@ increased slightly as a result.
<<set $rep += random(_minBonus,_maxBonus)>>
<<elseif (_ads == _pref) && (_girls != _ads)>>
Its advertising for girls <<if _ads == 1>>with pussies <<elseif _ads == -1>>with dicks <</if>> matched most customers preferences, but the girls in the brothel are not as advertised. Your @@.red;reputation@@ dropped slightly as a result.
@@ -816,6 +816,7 @@
The girls <<if _girls == 1>> with pussies<<elseif _girls == -1>> with dicks<</if>>in the brothel did not match the advertisements, but since the girls in the brothel matched most customers preferences for girls<<if _pref == 1>> with pussies<<elseif _pref == -1>> with dicks<</if>>, your reputation was not affected.
<<elseif (_girls != _pref)>>
Some customers were put off since the girls <<if _girls == 1>>with female genitalia <<elseif _girls == -1>>with male genitalia <</if>> did not match their preferences for girls<<if _pref == 1>> with pussies<<elseif _pref == -1>> with dicks<</if>>. Your @@.red;reputation@@ dropped slightly as a result.
+ <<set $rep -= random(_minBonus,_maxBonus)>>
<</if>>
<br>
<<else>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 767be2e410d..2c4c838d626 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -269,35 +269,35 @@
<<include "SA devotion">>
<</silently>>
<</if>>
- <<if isSlim($slaves[$i]) == true>>
+ <<if isSlim($slaves[$i])>>
<<set _slim += 1>>
<</if>>
- <<if isStacked($slaves[$i]) == true>>
+ <<if isStacked($slaves[$i])>>
<<set _stacked += 1>>
<</if>>
- <<if isYoung($slaves[$i]) == true>>
+ <<if isYoung($slaves[$i])>>
<<set _young += 1>>
<<else>>
<<set _old += 1>>
<</if>>
- <<if isModded($slaves[$i]) == true>>
+ <<if isModded($slaves[$i])>>
<<set _modded += 1>>
- <<elseif isUnmodded($slaves[$i]) == true>>
+ <<elseif isUnmodded($slaves[$i])>>
<<set _unmodded += 1>>
<</if>>
- <<if isXY($slaves[$i]) == true>>
+ <<if isXY($slaves[$i])>>
<<set _XY += 1>>
<<else>>
<<set _XX += 1>>
<</if>>
- <<if isPure($slaves[$i]) == true>>
+ <<if isPure($slaves[$i])>>
<<set _pure += 1>>
<<else>>
<<set _implanted += 1>>
<</if>>
- <<if isPreg($slaves[$i]) == true>>
+ <<if isPreg($slaves[$i])>>
<<set _pregYes += 1>>
- <<elseif isNotPreg($slaves[$i]) == true>>
+ <<elseif isNotPreg($slaves[$i])>>
<<set _pregNo += 1>>
<</if>>
<</for>>
@@ -345,7 +345,7 @@
<<elseif (_stacked > (_DL/2))>>
<<set _girls = 1>>
Most of the slaves in the club are stacked.<br>
- <<elseif (_slim > 0) && (_stacked > 0) && (Math.abs(_slim-_stacked) <= (_DL/3))>>
+ <<else>>
<<set _girls = 0>>
The slaves in the club vary in slimness.<br>
<</if>>
@@ -398,7 +398,7 @@
<<if ($arcologies[0].FSDegradationist == "unset") && ($arcologies[0].FSBodyPurist == "unset")>>
<<if ($clubAdsSpending == 0) || ($clubAdsModded == 0)>>
<<set _possibleBonuses++>>
- <<if (_modded > 0) && (_unmodded > 0) && (Math.abs(_modded-$unmodded) <= (_DL/3))>>
+ <<if (_modded > 0) && (_unmodded > 0) && (Math.abs(_modded-_unmodded) <= (_DL/3))>>
<<set $repGain += _DL*random(5,10), $clubBonuses++>>
There are @@.green;both@@ heavily pierced and tattooed slaves and slaves with more natural bodies filling the club.
<</if>>
--
GitLab