From 754b1e99cbf8389ac08ad4d66b124699e9ccdf9c Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Sun, 4 Jul 2021 14:10:24 +1200
Subject: [PATCH] quickFixAndMinorCleanup
---
src/endWeek/nextWeek/resetGlobals.js | 7 -------
src/events/RE/reBusyServantsQuarters.js | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 6 +++---
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/endWeek/nextWeek/resetGlobals.js b/src/endWeek/nextWeek/resetGlobals.js
index ac5fc9999b4..183ec6d4a27 100644
--- a/src/endWeek/nextWeek/resetGlobals.js
+++ b/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,7 +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.
diff --git a/src/events/RE/reBusyServantsQuarters.js b/src/events/RE/reBusyServantsQuarters.js
index 24fcfbcbd62..fd47a24e668 100644
--- a/src/events/RE/reBusyServantsQuarters.js
+++ b/src/events/RE/reBusyServantsQuarters.js
@@ -21,7 +21,7 @@ App.Events.REBusyServantsQuarters = class REBusyServantsQuarters extends App.Eve
for (const slave of V.slaves) {
if (slave.assignment !== Job.QUARTER) {
slave.devotion += 4;
- if (canPenetrate(slave) {
+ if (canPenetrate(slave)) {
actX(slave, "penetrative", 2);
if (canDoVaginal(slave)) {
actX(slave, "vaginal", 1);
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index eb531a13b0f..c932445f6a6 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/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>>
--
GitLab