diff --git a/js/003-data/constants.js b/js/003-data/constants.js index cb1c940f55d50adc0924cd0110d3f329a1d674ab..7ea5626c4be9c8a5635348d54f4f412c1990f35f 100644 --- a/js/003-data/constants.js +++ b/js/003-data/constants.js @@ -48,7 +48,8 @@ globalThis.Job = Object.freeze({ CHOICE: 'choose her own job', // Pseudo-jobs LURCHER: '@Lurcher', - PIT: '@Pit' + PIT: '@Pit', + IMPORTED: '@be imported' }); globalThis.PersonalAttention = Object.freeze({ diff --git a/src/data/newGamePlus.js b/src/data/newGamePlus.js index 3ed274660e281518ef404d0e57c7ba9aa96f26e1..f5a569ea612662e0a39f428dcde935087e67530a 100644 --- a/src/data/newGamePlus.js +++ b/src/data/newGamePlus.js @@ -81,7 +81,7 @@ App.Data.NewGamePlus = (function() { return newTable; }; - V.slaves.deleteWith((s) => s.assignment !== "be imported"); + V.slaves.deleteWith((s) => s.assignment !== Job.IMPORTED); for (let slave of V.slaves) { slave.ID += NGPOffset; diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js index 96ff072885d60422f1cd9c7db8f5d83587b9b322..0f70407f7fd204f1b1827a2d81d098d1ead11d6e 100644 --- a/src/js/removeActiveSlave.js +++ b/src/js/removeActiveSlave.js @@ -276,7 +276,7 @@ globalThis.removeNonNGPSlave = function(removedSlave) { if (INDEX >= 0 && INDEX < LENGTH) { V.slaves.forEach(slave => { - if (slave.assignment === "be imported") { + if (slave.assignment === this.Job.IMPORTED) { WombChangeID(slave, ID, V.missingParentID); /* This check is complex, should be done in JS now, all needed will be done here. */ WombChangeGeneID(slave, ID, V.missingParentID); if (slave.pregSource === V.missingParentID) { diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js index e2fb368b1d8a5836c6441a7c0b368f6e09bda17d..b81ac228afc990217712bb50c2b1a83c3662898a 100644 --- a/src/js/slaveListing.js +++ b/src/js/slaveListing.js @@ -732,10 +732,17 @@ App.UI.SlaveList.listNGPSlaves = function() { App.UI.tabbar.tabButton('remove', 'Remove from import') + '</div>'; - const NGPassignment = "be imported"; + const NGPassignment = Job.IMPORTED; /** @type {App.Entity.SlaveState[]} */ const slaves = V.slaves; + /* handle the legacy assignment string */ + for (const slave of slaves) { + if (slave.assignment === "be imported") { + slave.assignment = Job.IMPORTED; + } + } + if (V.slavesToImport > 0) { const importedSlavesIndices = slaves.reduce((acc, s, i) => { if (s.assignment === NGPassignment) { diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw index 32041f40d4c0c45b5cb08ec8246f9af87585e54a..ed8e42b62e09064ac4ca23b74b50995e39b6a931 100644 --- a/src/uncategorized/newGamePlus.tw +++ b/src/uncategorized/newGamePlus.tw @@ -52,7 +52,7 @@ You <<if $cash >= _fee>>have<<else>>lack<</if>> the funds to bring more than $sl <br><br> -<<if $cheatMode == 1>> <<link "DEBUG: Add all slaves to import list" "New Game Plus">> <<for _ngi = 0; _ngi < $slaves.length; _ngi++>> <<= assignJob($slaves[_ngi], "be imported")>> <</for>> <</link>> <br> <</if>> +<<if $cheatMode == 1>> <<link "DEBUG: Add all slaves to import list" "New Game Plus">> <<for _ngi = 0; _ngi < $slaves.length; _ngi++>> <<= assignJob($slaves[_ngi], Job.IMPORTED)>> <</for>> <</link>> <br> <</if>> Select up to $slavesToImportMax slaves to be imported into a new game and then click [[here.|init][$saveImported = 1,$oldCareer = "undefined",$slavesToImport = 0]]