From 3561dabbb8c29ddc0358c3890a0be748202a6eaf Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 7 Mar 2020 21:47:23 -0800
Subject: [PATCH] simpler
---
src/interaction/slaveInteract.js | 15 ++++++++-------
src/uncategorized/slaveInteract.tw | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index de04b7fde1e..ae78eca65a2 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1,12 +1,13 @@
/* eslint-disable no-unused-vars */ // TODO: remove after testing
App.UI.SlaveInteract = {};
-App.UI.SlaveInteract.placeInLine = function(slaveIndex) {
+App.UI.SlaveInteract.placeInLine = function(slave) {
let slavesInLine = [];
+ let activeSlaveIndex = V.slaveIndices[slave.ID];
let SL = V.slaves.length;
if (assignmentVisible(slave)) {
- for (let pil = slaveIndex - 1; pil !== slaveIndex; pil--) {
+ for (let pil = activeSlaveIndex - 1; pil !== activeSlaveIndex; pil--) {
/* loops backwards through the V.slaves array */
if (pil < 0) {
pil = SL;
@@ -17,7 +18,7 @@ App.UI.SlaveInteract.placeInLine = function(slaveIndex) {
break;
}
}
- for (let pil = slaveIndex + 1; pil !== slaveIndex; pil++) {
+ for (let pil = activeSlaveIndex + 1; pil !== activeSlaveIndex; pil++) {
/* this loops forwards through the V.slaves array */
if (pil === SL) {
pil = -1;
@@ -29,7 +30,7 @@ App.UI.SlaveInteract.placeInLine = function(slaveIndex) {
}
}
} else {
- for (let pil = slaveIndex - 1; pil !== slaveIndex; pil--) {
+ for (let pil = activeSlaveIndex - 1; pil !== activeSlaveIndex; pil--) {
/* loops backwards through the V.slaves array */
if (pil < 0) {
pil = SL;
@@ -40,7 +41,7 @@ App.UI.SlaveInteract.placeInLine = function(slaveIndex) {
break;
}
}
- for (let pil = slaveIndex + 1; pil !== slaveIndex; pil++) {
+ for (let pil = activeSlaveIndex + 1; pil !== activeSlaveIndex; pil++) {
/* this loops forwards through the V.slaves array */
if (pil === SL) {
pil = -1;
@@ -55,8 +56,8 @@ App.UI.SlaveInteract.placeInLine = function(slaveIndex) {
if (slavesInLine.length === 0) {
/* if there are no other slaves available, set previous/next slave to self */
- slavesInLine[0] = slaveIndex;
- slavesInLine[1] = slaveIndex;
+ slavesInLine[0] = activeSlaveIndex;
+ slavesInLine[1] = activeSlaveIndex;
}
return slavesInLine;
};
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index f76d1b72ce0..237dd14d7fa 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -51,7 +51,7 @@
<<set $showEncyclopedia = 1, $encyclopedia = "Gender">>
<</if>>
-<<set _slavesInLine = App.UI.SlaveInteract.placeInLine(_i)>>
+<<set _slavesInLine = App.UI.SlaveInteract.placeInLine($slaves[_i])>>
<<set _desc = `<<set $activeSlave = $slaves[_i]>><<include "Long Slave Description">>`>>
--
GitLab