Merge branch 'cleanGlobals' into 'pregmod-master'

Replaced (V.eligibleSlaves) with a global function / Improved randomNonindividualEvent selection readability

See merge request pregmodfan/fc-pregmod!9766

src/endWeek/nextWeek/resetGlobals.js

@@ -5,12 +5,6 @@ App.EndWeek.resetGlobals = function() {
 	// Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string.
 	V.i = 0;
 	V.j = 0;
-	V.motherSlave = -1;
-	V.daughterSlave = -1;
-	V.devMother = -1;
-	V.devDaughter = -1;
-	V.youngerSister = -1;
-	V.olderSister = -1;
 
 	// Other arrays
 	V.events = [];
@@ -25,8 +19,6 @@ App.EndWeek.resetGlobals = function() {
 	V.PETSevent = [];
 	V.FSNonconformistEvents = [];
 	V.REButtholeCheckinIDs = [];
-	V.rebelSlaves = [];
-	V.eligibleSlaves = [];
 
 	// Slave Objects using 0 instead of null. Second most memory eaten up.
 	V.activeSlave = 0;

src/js/utilsSlaves.js

 globalThis.cumSlaves = function() {
 	return V.slaves.filter(s => (s.assignment === Job.MILKED || s.assignment === Job.DAIRY) && s.balls > 0 && s.ballType === "human");
-}
+};
 globalThis.fuckSlavesLength = function() {
 	return V.slaves.filter(s => [Job.FUCKTOY, Job.MASTERSUITE, Job.CONCUBINE].includes(s.assignment)).length;
-}
+};
+
+globalThis.getRieEligibleSlaves = function() {
+	return V.slaves.filter(s => assignmentVisible(s) || [Job.MASTERSUITE, Job.CONCUBINE, Job.HOUSE].includes(s.assignment) && s.fuckdoll === 0);
+};
 
 globalThis.SlaveSort = function() {
 	const effectivePreg = (slave) => {

src/uncategorized/randomIndividualEvent.tw

 :: Random Individual Event [nobr]
 
 <<if $eventSlave == 0>>
+	<<set _eligibleSlaves = getRieEligibleSlaves()>>
 	<<if ($debugMode > 0 && $debugModeEventSelection > 0)>>
 		<<set $nextButton = "Refresh", $nextLink = "Random Individual Event", $returnTo = "Random Individual Event", $encyclopedia = "Random Events">>
 
@@ -9,32 +10,25 @@
 
 		''One of the following eligible slaves would have been selected for an individual random event:''
 		<br>
-		<<for $i = 0; $i < $eligibleSlaves.length; $i++>>
-			<<capture $i>>
-			<<set $eventSlave = getSlave($eligibleSlaves[$i])>>
-			<<set _slaveName = SlaveFullName($eventSlave)>>
-			<br><<print "[[_slaveName|Random Individual Event][$eventSlave = getSlave($eligibleSlaves[$i])]]">>
-			<</capture>>
+		<<for _slave range _eligibleSlaves>>
+			<<set _slaveName = SlaveFullName(_slave)>>
+			<br><<print "[[_slaveName|Random Individual Event][$eventSlave = getSlave(_slave)]]">>
 		<</for>>
 		<br><br>[[Switch to Random Nonindividual Event|Random Nonindividual Event][$activeSlave = 0, $eventSlave = 0]]
 	<<else>>
-		<<set $eventSlave = getSlave($eligibleSlaves.random())>>
+		<<set $eventSlave = getSlave(_eligibleSlaves.random())>>
 		<<goto "Random Individual Event">>
 	<</if>>
 <<else>>
-
 	/* initialize event lists as arrays [], not objects {} */
 	<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $activeSlave = 0, $legendaryFacility = 0>>
 
 	<<run generateRandomEventPool($eventSlave)>>
-
 	/* EVENT RANDOMIZATION */
 	<<set $events = populateEventArray().concat(App.Events.getIndividualEventsPassageList($eventSlave))>>
-
 	<<if ($debugMode > 0 && $debugModeEventSelection > 0)>>
 		<<goto "random event select">>
 	<<else>>
 		<<goto "random event roll">>
 	<</if>>
-
 <</if>> /* CLOSES SLAVE SELECT */

src/uncategorized/randomNonindividualEvent.tw

@@ -10,9 +10,9 @@
 
 		''Any one of your slaves would have been selected for a random non-individual event:''
 		<br>
-		<<for $i = 0; $i < $slaves.length; $i++>>
-			<<set _slaveName = SlaveFullName($slaves[$i])>>
-			<br><<print "[[_slaveName|Random Nonindividual Event][$eventSlave = $slaves[" + $i + "]]]">>
+		<<for _slave range $slaves>>
+			<<set _slaveName = SlaveFullName(_slave)>>
+			<br><<print "[[_slaveName|Random Nonindividual Event][$eventSlave = _slave]]">>
 		<</for>>
 		<br><br>[[Switch to RIE Eligibility Check|RIE Eligibility Check][$activeSlave = 0, $eventSlave = 0]]
 	<<else>>

src/uncategorized/rieEligibilityCheck.tw

 :: RIE Eligibility Check
 
 <<silently>>
-
-<<set $eventSlave = 0, $eligibleSlaves = []>>
-
-<<for $i = 0; $i < $slaves.length; $i++>>
-	<<if assignmentVisible($slaves[$i]) || $slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your Concubine" || $slaves[$i].assignment == "work as a servant">>
-		<<if $slaves[$i].fuckdoll == 0>>
-			<<set $eligibleSlaves.push($slaves[$i].ID)>>
-		<</if>>
-	<</if>>
-<</for>>
-
+<<set $eventSlave = 0>>
 <<if $hostageRescued == 1>>
 	<<goto "P hostage acquisition">>
-<<elseif $eligibleSlaves.length == 0>>
+<<elseif getRieEligibleSlaves().length === 0>>
 	<<goto "Next Week">>
 <<else>>
 	<<goto "Random Individual Event">>
 <</if>>
-
 <</silently>>