From afa39e31bd1a03fb13901fa3dd93aeb50387a762 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sun, 4 Nov 2018 09:34:26 -0500
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 10 +++++-----
src/init/storyInit.tw | 13 -------------
src/js/removeActiveSlave.tw | 10 +++++-----
src/npc/acquisition.tw | 2 +-
src/pregmod/incubator.tw | 6 ++++--
5 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index ec3d1827da6..be73806c9c5 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 61dd250983a..4aeab96bde9 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 4cd6a98b062..9202be0dbd8 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 47b88b611ed..f0d2d761d42 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 73c7f2fb8c2..32ae69f18ed 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>>
--
GitLab