Skip to content
Snippets Groups Projects
Commit 160adfcc authored by Pregmodder's avatar Pregmodder
Browse files

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

parents cbe67ff3 0be431c3
No related branches found
No related tags found
1 merge request!2902Pregmod v1031-46
Hide whitespace changes
Inline Side-by-side
devNotes/twine JS.txt
+ 25
− 16
View file @ 160adfcc
......@@ -24826,30 +24826,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;
}
}
......@@ -24859,7 +24866,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) {
......@@ -24868,12 +24875,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--;
}
 
src/js/removeActiveSlave.tw
+ 25
− 16
View file @ 160adfcc
......@@ -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--;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment