From 3f621dce081796e2380069be38d5415a7335060e Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 1 Mar 2020 14:01:37 -0500
Subject: [PATCH] drop old slavesOriginal
---
src/init/storyInit.tw | 2 --
src/js/backwardsCompatibility.js | 10 ++++------
src/uncategorized/randomNonindividualEvent.tw | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 233a691ce57..984376b26a6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -194,10 +194,8 @@ You should have received a copy of the GNU General Public License along with thi
<<set $slaves[_i].lastWeeksRepExpenses = 0>>
<<set $slaves[_i].lastWeeksRepIncome = 0>>
<</for>>
- <<set $slavesOriginal = []>> /* not used by pregmod */
<<else>>
<<set $slaves = []>>
- <<set $slavesOriginal = []>> /* not used by pregmod */
<<set $genePool = []>>
<<set $slaveIndices = slaves2indices()>>
<<set $missingTable = {}>>
diff --git a/src/js/backwardsCompatibility.js b/src/js/backwardsCompatibility.js
index dcb66da6d34..7b5a37ebcf5 100644
--- a/src/js/backwardsCompatibility.js
+++ b/src/js/backwardsCompatibility.js
@@ -1108,7 +1108,7 @@ window.backwardsCompatibility = (function() {
if (typeof V.tanks === "undefined") {
V.tanks = [];
}
- /% Nursery Subsection %/;
+ // Nursery Subsection
if (typeof V.nursery === "undefined") {
V.nursery = 0;
}
@@ -2399,7 +2399,9 @@ window.backwardsCompatibility = (function() {
V.building = App.Arcology.defaultBuilding();
}
}
-
+ if (typeof V.slavesOriginal !== "undefined") {
+ delete V.slavesOriginal;
+ }
r += `<<silently>>`;
r += `<<include "MOD_Edit FS Cheat Datatype Cleanup">>`;
@@ -4028,8 +4030,4 @@ window.backwardsCompatibility = (function() {
/* reset NaNArray after BC is run */
V.NaNArray = findNaN();
}
-
-
- V.slavesOriginal = [];
- /* not used by pregmod */
})();
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index dd4804cf317..a56d94d4926 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -778,7 +778,7 @@
<<set $events.push("RE relative recruiter")>>
<<set $recruiterSlave = $recruiterSlave.ID>>
<<break>>
- <<else>> /* no matching slave object in the slavesOriginal array -- bug? */
+ <<else>> /* no matching slave object in the array -- bug? */
<<set $i = $slaveIndices[$recruiterSlave.ID]>>
<<set $slaves[$i].canRecruit = 0>>
<<set $recruiterSlave = -1>>
--
GitLab