diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 233a691ce57e0b46c2d7921bfc870f5106ba06ac..984376b26a6c7116380a51bd9b9e448f22fbc962 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 dcb66da6d34eab7e4110baaa1fe985d2f5f21ea6..7b5a37ebcf5b921c4972eba284b525fba82a531d 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 dd4804cf31744ff66b8f7ca70b67990a8c78796f..a56d94d4926c3e0ad1def06a673e587450aea970 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>>