From 145593cdb77fa20fc14f835acdac091284db6be7 Mon Sep 17 00:00:00 2001 From: Svornost <11434-svornost@users.noreply.gitgud.io> Date: Mon, 20 Jul 2020 00:43:57 -0700 Subject: [PATCH] Finish getting rid of _FLs in Cellblock/Club reports --- src/uncategorized/cellblockReport.tw | 2 +- src/uncategorized/clubReport.tw | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw index 96f92583c6a..40f1671c561 100644 --- a/src/uncategorized/cellblockReport.tw +++ b/src/uncategorized/cellblockReport.tw @@ -121,7 +121,7 @@ <</if>> <<if (_S.Wardeness)>> - <<set $i = _FLs>> /* apply following SA passages to facility leader */ + <<set $i = $slaveIndices[$WardenessID]>> /* apply following SA passages to facility leader */ <<if $showEWD != 0>> <br><br> /* 000-250-006 */ diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw index 86815abbe5c..3eae804d1ac 100644 --- a/src/uncategorized/clubReport.tw +++ b/src/uncategorized/clubReport.tw @@ -83,15 +83,14 @@ <<set _S.DJ.skill.DJ += random(1,Math.ceil((_S.DJ.intelligence+_S.DJ.intelligenceImplant)/15) + 8)>> <</if>> <<if (_DL + $clubSlavesGettingHelp < 10)>> - <<set $i = _FLs>> /* apply following SA passages to facility leader */ <<if ($legendaryEntertainerID == 0) && (_S.DJ.prestige == 0) && (_S.DJ.skill.entertainment >= 100) && (_S.DJ.devotion > 50)>> <<set $legendaryEntertainerID = _S.DJ.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 $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 <<= App.SlaveAssignment.serveThePublic($slaves[$i])>> + <br> $He <<= App.SlaveAssignment.serveThePublic(_S.DJ)>> <<else>> - <<run App.SlaveAssignment.serveThePublic($slaves[$i])>> + <<run App.SlaveAssignment.serveThePublic(_S.DJ)>> <</if>> <</if>> <<if (_DL > 0)>><br><br><</if>> @@ -103,7 +102,7 @@ <</if>> <<if _S.DJ>> - <<set $i = _FLs>> /* apply following SA passages to facility leader */ + <<set $i = $slaveIndices[$djID]>> /* apply following SA passages to facility leader */ <<if $showEWD != 0>> <br><br> /* 000-250-006 */ -- GitLab