diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index ec3d1827da664498dcc147d0d241b2eeee5096ec..be73806c9c547d66e68e435b31a230f94bebaec2 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -24624,11 +24624,11 @@ window.removeActiveSlave = function removeActiveSlave() { if (missing) { V.missingTable[V.missingParentID] = { slaveName: V.activeSlave.slaveName, - slaveSurname: V.activeSlave.slaveSurname, - fullName: SlaveFullName(V.activeSlave), - dick : V.activeSlave.dick, - vagina : V.activeSlave.vagina, - ID : V.missingParentID }; + slaveSurname: V.activeSlave.slaveSurname, + fullName: SlaveFullName(V.activeSlave), + dick : V.activeSlave.dick, + vagina : V.activeSlave.vagina, + ID : V.missingParentID }; V.missingParentID--; } diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 61dd250983af00f1d30c8402b5c9d25ed6974075..4aeab96bde9f794ff791e345449a3f351f1aa8ed 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -108,19 +108,6 @@ You should have received a copy of the GNU General Public License along with thi <<else>> <<set $missingTable = ngUpdateMissingTable($missingTable)>> <</if>> - /* - <<for $i = 0; $i < $genePool.length; $i++>> - <<for $k = 0; $k < $slaves.length; $k++>> - <<if $genePool[$i].ID+1200000 == $slaves[$k].ID>> - <<set $genePool[$i].ID += 1200000>> - <<break>> - <</if>> - <</for>> - <<if $k == $slaves.length>> - <<set $dump = $genePool.pluck([$i], [$i])>><<set $i-->> - <</if>> - <</for>> - */ <<for _i = 0; _i < _SL; _i++>> <<if $slaves[_i].relation != 0>> <<set _seed = 0, _rt = $slaves[_i].relationTarget, _ID = $slaves[_i].ID>> diff --git a/src/js/removeActiveSlave.tw b/src/js/removeActiveSlave.tw index 4cd6a98b06287343cd0c686f1b674d4fdd8c8211..9202be0dbd8ca724358147099509cb6d3f1e27e0 100644 --- a/src/js/removeActiveSlave.tw +++ b/src/js/removeActiveSlave.tw @@ -223,11 +223,11 @@ window.removeActiveSlave = function removeActiveSlave() { if (missing) { V.missingTable[V.missingParentID] = { slaveName: V.activeSlave.slaveName, - slaveSurname: V.activeSlave.slaveSurname, - fullName: SlaveFullName(V.activeSlave), - dick : V.activeSlave.dick, - vagina : V.activeSlave.vagina, - ID : V.missingParentID }; + slaveSurname: V.activeSlave.slaveSurname, + fullName: SlaveFullName(V.activeSlave), + dick : V.activeSlave.dick, + vagina : V.activeSlave.vagina, + ID : V.missingParentID }; V.missingParentID--; } diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 47b88b611edccf97b502c3f074211429a9841609..f0d2d761d428c07bdfdf307efbe6b0c7db7e3404 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -579,7 +579,7 @@ The previous owner seems to have left in something of a hurry. <<break>> <</if>> <<set $activeSlave = getHeroSlave($heroSlaves[$j], $baseHeroSlave)>> - <<set $dump = $heroSlaves.pluck($j,$j)>> + <<run $heroSlaves.splice($j,1)>> <<slaveCost $activeSlave>> <<if _valueGiven + $slaveCost < _valueOwed*2>> <<run nationalityToAccent($activeSlave)>> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index 73c7f2fb8c2c3b76f71b831fd6c2fce28833c5ca..32ae69f18ed74321884ab1d4b279bdacf8f38ec8 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -435,7 +435,8 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu <br>''Cheatmode:'' <<link "Retrieve immediately">> <<set $incubatorOldID = $tanks[$i].ID>> - <<set $readySlave = $tanks.pluck([$i], [$i])>> + <<set $readySlave = $tanks[$i]>> + <<run $tanks.splice($i, 1)>> <<goto "Incubator Retrieval Workaround">> <</link>> <</if>> @@ -574,7 +575,8 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu <<for $i = 0; $i < $incubatorSlaves; $i++>> <<if $tanks[$i].growTime <= 0>> <<set $incubatorOldID = $tanks[$i].ID>> - <<set $readySlave = $tanks.pluck([$i], [$i])>> + <<set $readySlave = $tanks[$i]>> + <<run $tanks.splice($i, 1)>> <<break>> <</if>> <</for>> diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index b286804204bafb8442e764a88cbca5f7ad8e569f..a991b409b80bf4c4975215e2b67f7caa536565ba 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -69,7 +69,6 @@ <<set _validOrgans = 0>> <<for _dwi = 0; _dwi < $slaves.length; _dwi++>> <<capture _dwi>> - <<set $dumped = 0>> <<set _slaveOrgans = 0>> <<for _dwj = 0; _dwj < $completedOrgans.length; _dwj++>> <<if ($completedOrgans[_dwj] != 0) && ($completedOrgans[_dwj].ID == $slaves[_dwi].ID)>> @@ -108,7 +107,6 @@ <<if $limbsCompleted > 0>> <<for _dwj = 0; _dwj < $limbs.length; _dwj++>> <<set _validHost = 0>> - <<set $dumped = 0>> <<for _dwi = 0; _dwi < $slaves.length; _dwi++>> <<set _Slave = $slaves[_dwi]>> <<if ($limbs[_dwj] != 0) && ($limbs[_dwj].ID == _Slave.ID)>> @@ -119,7 +117,7 @@ <</if>> <</for>> <<if _validHost == 0>> - <<set $dump = $limbs.deleteAt(_dwj), _dwj-->> + <<set _dump = $limbs.deleteAt(_dwj), _dwj-->> <</if>> <</for>> <</if>>