diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js index a07144e3f36a884301b6b09b4bb1ee7843c5ab43..093c31365a108a29a78cb974793d58493009e902 100644 --- a/src/interaction/slaveInteract.js +++ b/src/interaction/slaveInteract.js @@ -884,11 +884,17 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) { Object.assign(V, sexOption.update); } + // Update activeSlave to be used in scene + V.activeSlave = V.slaves[V.slaveIndices[slave.ID]]; + + // Scene if (sexOption.scene) { App.UI.replace('#miniscene', `<<include "${sexOption.scene}">>`); } else if (sexOption.goto) { App.UI.replace('#miniscene', `<<goto "${sexOption.goto}">>`); } + + // Record scene results in slave array V.slaves[V.slaveIndices[V.activeSlave.ID]] = V.activeSlave; App.UI.SlaveInteract.refreshAll(V.slaves[V.slaveIndices[V.activeSlave.ID]]); diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 8ff0623eef488812e7bf9e93e2fd0679e0e75c89..c37b4da16b11ed53f8293bad888bdb0036fe0028 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -85,7 +85,7 @@ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button> <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button> <<if $familyTesting == 1>> - <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, getSlave(V.activeSlave.ID).ID)" id="tab FamilyTab">Family</button> + <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button> <</if>> <div id="artFrame">