Merge branch 'pregmod-master' into 'pregmod-master'

Fix Cellblock/Club reports trying to fetch the wrong facility leader

Closes #1955

See merge request pregmodfan/fc-pregmod!7228

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 */

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>&nbsp;&nbsp;&nbsp;&nbsp;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.
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;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 _S.DJ.sexAmount citizens, @@.green;pleasing them immensely,@@ since it's more appealing to fuck the DJ than some club slut.
 		<<if $showEWD != 0>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;$He <<= App.SlaveAssignment.serveThePublic($slaves[$i])>>
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;$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 */