From 42c09a76fb0db1a0d4b39215e5b0d8395de99f64 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Mon, 5 Nov 2018 23:27:36 -0500
Subject: [PATCH] Fix
---
devNotes/twine JS.txt | 41 ++++++++++++++++++++++---------------
src/js/removeActiveSlave.tw | 41 ++++++++++++++++++++++---------------
2 files changed, 50 insertions(+), 32 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 3c806b04612..c80520cf7ba 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -24581,30 +24581,37 @@ window.removeActiveSlave = function removeActiveSlave() {
}
}
- let _o = V.organs.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
- if (_o !== -1) {
- V.organs.deleteAt(_o);
+ let _o;
+ for (_o = 0; _o < V.organs.length; _o++) {
+ if (V.organs[_o].ID === AS_ID) {
+ V.organs.deleteAt(_o);
+ _o--;
+ }
}
- _o = V.completedOrgans.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
- if (_o !== -1) {
- V.completedOrgans.deleteAt(_o);
+ for (_o = 0; _o < V.completedOrgans.length; _o++) {
+ if (V.completedOrgans[_o].ID === AS_ID) {
+ V.completedOrgans.deleteAt(_o);
+ _o--;
+ }
}
- _o = V.limbs.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
- if (_o !== -1) {
- V.limbs.deleteAt(_o);
- V.limbsCompleted--;
+ for (_o = 0; _o < V.limbs.length; _o++) {
+ if (V.limbs[_o].ID === AS_ID) {
+ V.limbs.deleteAt(_o);
+ V.limbsCompleted--;
+ _o--;
+ }
}
- const _geneIndex = V.genePool.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
+ const _geneIndex = V.genePool.findIndex(function(s) { return s.ID === AS_ID; });
if (_geneIndex !== -1) {
let keep = false;
if (V.traitor !== 0) {
- if (isImpregnatedBy(V.traitor, V.activeSlave) || V.traitor.ID === V.activeSlave.ID) { /* did we impregnate the traitor, or are we the traitor? */
+ if (isImpregnatedBy(V.traitor, V.activeSlave) || V.traitor.ID === AS_ID) { /* did we impregnate the traitor, or are we the traitor? */
keep = true;
}
}
if (V.boomerangSlave !== 0) {
- if (isImpregnatedBy(V.boomerangSlave, V.activeSlave) || V.boomerangSlave.ID === V.activeSlave.ID) { /* did we impregnate the boomerang, or are we the boomerang? */
+ if (isImpregnatedBy(V.boomerangSlave, V.activeSlave) || V.boomerangSlave.ID === AS_ID) { /* did we impregnate the boomerang, or are we the boomerang? */
keep = true;
}
}
@@ -24614,7 +24621,7 @@ window.removeActiveSlave = function removeActiveSlave() {
if (!keep) { /* avoid going through this loop if possible */
keep = V.slaves.some(slave => {
/* have we impregnated a slave that is not ourself? */
- return (slave.ID !== V.activeSlave.ID && isImpregnatedBy(slave, V.activeSlave))
+ return (slave.ID !== AS_ID && isImpregnatedBy(slave, V.activeSlave))
});
}
if (!keep) {
@@ -24623,12 +24630,14 @@ window.removeActiveSlave = function removeActiveSlave() {
}
if (missing) {
- V.missingTable[V.missingParentID] = { slaveName: V.activeSlave.slaveName,
+ 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 };
+ ID : V.missingParentID
+ };
V.missingParentID--;
}
diff --git a/src/js/removeActiveSlave.tw b/src/js/removeActiveSlave.tw
index 9202be0dbd8..e8ea98fbe9a 100644
--- a/src/js/removeActiveSlave.tw
+++ b/src/js/removeActiveSlave.tw
@@ -180,30 +180,37 @@ window.removeActiveSlave = function removeActiveSlave() {
}
}
- let _o = V.organs.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
- if (_o !== -1) {
- V.organs.deleteAt(_o);
+ let _o;
+ for (_o = 0; _o < V.organs.length; _o++) {
+ if (V.organs[_o].ID === AS_ID) {
+ V.organs.deleteAt(_o);
+ _o--;
+ }
}
- _o = V.completedOrgans.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
- if (_o !== -1) {
- V.completedOrgans.deleteAt(_o);
+ for (_o = 0; _o < V.completedOrgans.length; _o++) {
+ if (V.completedOrgans[_o].ID === AS_ID) {
+ V.completedOrgans.deleteAt(_o);
+ _o--;
+ }
}
- _o = V.limbs.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
- if (_o !== -1) {
- V.limbs.deleteAt(_o);
- V.limbsCompleted--;
+ for (_o = 0; _o < V.limbs.length; _o++) {
+ if (V.limbs[_o].ID === AS_ID) {
+ V.limbs.deleteAt(_o);
+ V.limbsCompleted--;
+ _o--;
+ }
}
- const _geneIndex = V.genePool.findIndex(function(s) { return s.ID === V.activeSlave.ID; });
+ const _geneIndex = V.genePool.findIndex(function(s) { return s.ID === AS_ID; });
if (_geneIndex !== -1) {
let keep = false;
if (V.traitor !== 0) {
- if (isImpregnatedBy(V.traitor, V.activeSlave) || V.traitor.ID === V.activeSlave.ID) { /* did we impregnate the traitor, or are we the traitor? */
+ if (isImpregnatedBy(V.traitor, V.activeSlave) || V.traitor.ID === AS_ID) { /* did we impregnate the traitor, or are we the traitor? */
keep = true;
}
}
if (V.boomerangSlave !== 0) {
- if (isImpregnatedBy(V.boomerangSlave, V.activeSlave) || V.boomerangSlave.ID === V.activeSlave.ID) { /* did we impregnate the boomerang, or are we the boomerang? */
+ if (isImpregnatedBy(V.boomerangSlave, V.activeSlave) || V.boomerangSlave.ID === AS_ID) { /* did we impregnate the boomerang, or are we the boomerang? */
keep = true;
}
}
@@ -213,7 +220,7 @@ window.removeActiveSlave = function removeActiveSlave() {
if (!keep) { /* avoid going through this loop if possible */
keep = V.slaves.some(slave => {
/* have we impregnated a slave that is not ourself? */
- return (slave.ID !== V.activeSlave.ID && isImpregnatedBy(slave, V.activeSlave))
+ return (slave.ID !== AS_ID && isImpregnatedBy(slave, V.activeSlave))
});
}
if (!keep) {
@@ -222,12 +229,14 @@ window.removeActiveSlave = function removeActiveSlave() {
}
if (missing) {
- V.missingTable[V.missingParentID] = { slaveName: V.activeSlave.slaveName,
+ 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 };
+ ID : V.missingParentID
+ };
V.missingParentID--;
}
--
GitLab