From 4f14d86c720bb11923fbc177010b9d382ba05ded Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 2 Aug 2019 01:22:52 -0400
Subject: [PATCH] DJ fuck count fix and code position tweaking
---
src/endWeek/saServeThePublic.js | 7 ++++++-
src/uncategorized/clubReport.tw | 19 +++++--------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 7052457d372..75eaf26d173 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -1183,7 +1183,12 @@ window.saServeThePublic = (function saServeThePublic() {
*/
function addRep(slave) {
if (slave.assignment !== "recruit girls") {
- if (slave.assignment === "serve in the club" || slave.assignment === "be the DJ") {
+ if (slave.assignment === "be the DJ") {
+ repX(Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServant", slave);
+ // DJ donus rep
+ repX(Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServantClub", slave);
+ T.incomeStats.income += Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15);
+ } else if (slave.assignment === "serve in the club") {
repX(Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServantClub", slave);
} else if (slave.assignment === "serve the public") {
repX(Math.trunc((slave.sexAmount * slave.sexQuality) * (1 + (0.003 * slave.skill.entertainment)) * 0.15), "publicServant", slave);
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index df6e2576119..60c27f0658a 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -91,21 +91,12 @@
<<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].skill.entertainment >= 100) && ($slaves[_FLs].devotion > 50)>>
<<set $legendaryEntertainerID = $slaves[_FLs].ID>>
<</if>>
- <<if (_DL+$slavesGettingHelp < 10)>>
- <<set $i = _FLs>> /* apply following SA passages to facility leader */
- <<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].skill.entertainment >= 100) && ($slaves[_FLs].devotion > 50)>>
- <<set $legendaryEntertainerID = $slaves[_FLs].ID>>
- <</if>>
- <br> Since $he doesn't have enough sluts in $clubName to make it worthwhile for $him to be on stage 24/7, $he spends $his extra time slutting it up $himself. $He has sex with $beauty citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
- <<if $showEWD != 0>>
- <br> $He <<= saServeThePublic($slaves[$i])>>
- <<else>>
- <<run saServeThePublic($slaves[$i])>>
- <</if>>
- /* The "extra" that she makes. Move into saServeThePublic to match saWhore, someday. */
- <<run repX(Math.trunc(($beauty*$FResult)*(1+(0.003*$slaves[_FLs].skill.entertainment))*0.1*0.5), "publicServantClub", $slaves[_FLs])>>
+ <br> Since $he doesn't have enough sluts in $clubName to make it worthwhile for $him to be on stage 24/7, $he spends $his extra time slutting it up $himself. $He has sex with $slaves[$i].sexAmount citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
+ <<if $showEWD != 0>>
+ <br> $He <<= saServeThePublic($slaves[$i])>>
+ <<else>>
+ <<run saServeThePublic($slaves[$i])>>
<</if>>
- <<run repX(Math.trunc(($slaves[_FLs].sexAmount*$slaves[_FLs].sexQuality)*(1+(0.003*$slaves[_FLs].skill.entertainment))*0.1*0.5), "publicServantClub", $slaves[_FLs])>>
<</if>>
<<if (_DL > 0)>><br><br><</if>>
<</if>>
--
GitLab