From 49ef69543d27fb0cfc53680d926f4855d2d2fe8f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 28 Sep 2020 17:38:11 -0400
Subject: [PATCH] fix body swap
---
src/pregmod/slaveSlaveSwap.tw | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pregmod/slaveSlaveSwap.tw b/src/pregmod/slaveSlaveSwap.tw
index 670152e16ce..9ef4e1554ac 100644
--- a/src/pregmod/slaveSlaveSwap.tw
+++ b/src/pregmod/slaveSlaveSwap.tw
@@ -1,8 +1,8 @@
:: Slave Slave Swap [nobr]
<<set $nextButton = "Continue">>
-<<set _ss1 = $slaveIndices[$activeSlave.ID]>>
-<<set _ss1Clone = clone($activeSlave)>>
+<<set _ss1 = $slaveIndices[$AS]>>
+<<set _ss1Clone = clone(getSlave(V.AS))>>
<<set _ss2 = $slaveIndices[$swappingSlave.ID]>>
<<set _ss2Clone = clone($swappingSlave)>>
<<set _gps1 = $genePool.findIndex(function(s) { return s.ID == $slaves[_ss1].ID; })>>
@@ -10,7 +10,7 @@
<<set _gps2 = $genePool.findIndex(function(s) { return s.ID == $slaves[_ss2].ID; })>>
<<set _gps2Clone = clone($genePool[_gps2])>>
-You strap $activeSlave.slaveName and $swappingSlave.slaveName into the remote surgery and stand back as it goes to work.
+You strap <<= getSlave($AS).slaveName>> and $swappingSlave.slaveName into the remote surgery and stand back as it goes to work.
<<BodySwap $slaves[_ss1] _ss2Clone>>
<<BodySwap $genePool[_gps1] _gps2Clone 1>> /* passing a third argument just to detect if it's a slave from the genepool */
<<BodySwap $slaves[_ss2] _ss1Clone>>
--
GitLab