diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index ac7203838a93640c491c8c6fa805e34958954c18..d68248c0d9cf1da4bf8fada411ee88b6c9d852b4 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -399,13 +399,6 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
- /* IMPORTANT FOR REASONS!!! */
- // <<unset _ii>>
- /** /Accordion */
-
- /* release loading screen as soon as the event loop can run */
- //App.UI.EndWeekAnim.end();
-
return res;
function _countPenthousePopulation() {
diff --git a/src/events/reRelativeRecruiter.js b/src/events/reRelativeRecruiter.js
index a478be3f8b8cdd4d8b2f31e6cb0aa8eaa3531478..67ff5e83dfed3e222bdb05613ff16201edf0cb45 100644
--- a/src/events/reRelativeRecruiter.js
+++ b/src/events/reRelativeRecruiter.js
@@ -637,10 +637,8 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
let elements = [];
elements.push(`You complete the legalities and biometric scanning quickly and without fuss. ${V.activeSlave.slaveName} arrives shortly. The two slaves remember each other only dimly — they parted a long time ago — but they embrace. The devoted ${SlaveTitle(eventSlave)} explains the situation and encourages ${his} ${_this.params.relative} to be a good slave to you. ${V.activeSlave.slaveName} looks a little fearful but clearly realizes that ${he2}'s lucky to be here.`);
- let desc = document.createDocumentFragment();
V.eventSlave = eventSlave; // New Slave Intro uses global $eventSlave, so set it here
- $(desc).wiki(`<<include "New Slave Intro">>`);
- elements.push(desc);
+ elements.push(App.UI.DOM.renderPassage("New Slave Intro"));
return elements;
}
diff --git a/src/gui/multipleInspect.js b/src/gui/multipleInspect.js
index c46c8d3b712da7fb6619caf355ec8825db6e4e73..508a63e29e7e59a6092f6ffd6c91c92408e5c092 100644
--- a/src/gui/multipleInspect.js
+++ b/src/gui/multipleInspect.js
@@ -4,11 +4,9 @@ App.UI.MultipleInspect = (function() {
V.saleDescription = (saleDescription ? 1 : 0);
V.applyLaw = (applyLaw ? 1 : 0);
- // embedded sugarcube sucks but that's just how LSD works right now
const oldAS = V.activeSlave;
V.activeSlave = slave;
- const frag = document.createDocumentFragment();
- $(frag).wiki(`<<include "Long Slave Description">>`);
+ const frag = App.UI.DOM.renderPassage("Long Slave Description");
V.activeSlave = oldAS;
return frag;
}
@@ -47,22 +45,5 @@ App.UI.MultipleInspect = (function() {
return frag;
}
- /**
- * Provide a mechanism to inspect multiple slaves at once (for example, for Household Liquidators and recETS).
- * Usable directly from SugarCube passages.
- * @param {Array<App.Entity.SlaveState>} slaves
- * @param {boolean} showFamilyTree
- * @param {boolean} saleDescription
- * @param {boolean} applyLaw
- * @returns {string}
- */
- function MultipleInspectSugarcube(slaves, showFamilyTree, saleDescription, applyLaw) {
- const frag = MultipleInspectDOM(slaves, showFamilyTree, saleDescription, applyLaw);
- return App.UI.DOM.includeDOM(frag, "MultipleInspect", "div");
- }
-
- return {
- DOM: MultipleInspectDOM,
- SC: MultipleInspectSugarcube
- };
+ return MultipleInspectDOM;
})();
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index e31d80f560576d5a27522837ff11e407069a25ba..c3727380d2880993148a76b949a457e760e95f43 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1308,8 +1308,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
Engine.play(sexOption.goto);
} else if (sexOption.scene) {
// Run scene and store render results temporarily
- let frag = document.createDocumentFragment();
- $(frag).wiki(`<<include "${sexOption.scene}">>`);
+ let frag = App.UI.DOM.renderPassage(sexOption.scene);
// Refresh (clears scene display)
App.UI.SlaveInteract.refreshAll(V.slaves[V.slaveIndices[V.activeSlave.ID]]);
diff --git a/src/js/main.js b/src/js/main.js
index e65ab93f01e88162c8087e8b24104f8c0d9e0978..1854c4e6343b57ee130cb45a5faad2fcb66b0a0e 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -162,11 +162,11 @@ App.MainView.useFucktoy = function(slave) {
* @returns {HTMLDivElement}
*/
App.MainView.useGuard = function() {
- const guard = V.slaves[V.slaveIndices[V.Bodyguard.ID]];
+ const guard = S.Bodyguard;
const outerDiv = document.createElement("div");
- if (guard === undefined || guard.assignment !== "guard you") {
+ if (!guard || guard.assignment !== "guard you") {
return outerDiv;
}
@@ -273,5 +273,5 @@ App.MainView.full = function() {
fragment.append(App.MainView.useGuard());
}
- return App.UI.DOM.includeDOM(fragment, "mainFullDOM");
+ return fragment;
};
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index 030d439d05b4ce89a7f167a956f3278c737e9283..25cbe24234b9c02415a77302d294d5c3c9d62de8 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -251,21 +251,6 @@ App.UI.DOM.colorInput = function(defaultValue, onEnter) {
return input;
};
-/**
- * @param {Node} node
- * @param {string} [uniqueID] - should be unique in the whole passage
- * @param {string} [tag]
- * @returns {string}
- */
-App.UI.DOM.includeDOM = function(node, uniqueID, tag = "span") {
- if (uniqueID === undefined) {
- uniqueID = Math.random().toString(36).substring(2, 10); // TODO not perfect, but works for now
- }
- $(document).one(':passagedisplay', () => { $(`#inclDOM${uniqueID}`).append(node); });
-
- return `<${tag} id='inclDOM${uniqueID}'></${tag}>`;
-};
-
/**
* Concats an array of DOM nodes or strings into a human readable list.
*
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index af511e4ad9b774c250bdd8ce8896c46250da1c2f..7220553e7049efef3aa861447665c84a6d3b6bad 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -278,8 +278,9 @@ App.UI._showDescriptionDialog = function(slave) {
const oldActiveSlave = V.activeSlave;
V.activeSlave = slave;
Dialog.setup(SlaveFullName(slave));
- const image = V.seeImages ? `<div class="imageRef medImg"><<= SlaveArt($activeSlave, 2, 0)>></div>` : ``;
- Dialog.wiki(`${image}<<include "Long Slave Description">>`);
+ const image = App.UI.DOM.makeElement("div", App.Art.SlaveArtElement(slave, 2, 0), ["imageRef", "medImg"]);
+ const lsd = App.UI.DOM.renderPassage("Long Slave Description");
+ Dialog.append(image).append(lsd);
Dialog.open();
V.activeSlave = oldActiveSlave;
V.eventDescription = oldEventDescription;
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index b2cd1488b4b18d1cbb7697e18036a0252b4acbf5..5d6b023b379ec8aeadb52d483cf8d5a2dfbb8794 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -107,4 +107,4 @@ The price is <<print cashFormatColor(_totalCost)>>. <<if $slavesSeen > $slaveMar
<br>[[Decline to purchase them and check out another set of slaves|Household Liquidator][$slavesSeen += 2]]
<br><br>
-<<= App.UI.MultipleInspect.SC(_newSlaves, true, true, true)>>
+<<includeDOM App.UI.MultipleInspect(_newSlaves, true, true, true)>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 7df482f44febb0ff06a6ef8ff6f8579e28a618bd..d505c8d2d6ef097fb4fdcca244332c4a69ddbd7f 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -50,7 +50,7 @@
[[Hide|Main][$seeDesk = 0]]
<</if>>
-<<print App.MainView.full()>>
+<<includeDOM App.MainView.full()>>
<<set $activeSlave = $slaves.random()>>
<<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 4287f086cc26fc6039e332c9c515dd49b2b1a4a1..b9a3c46185a6c9beac85358c177f8ec00f823b52 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -68,7 +68,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<set _totalValue = slaveCost($activeSlave) + slaveCost(_secondSlave)>>
//Enslaving them will cost <<print cashFormat(_contractCost)>>. Selling them immediately will bring in approximately <<print cashFormat(_totalValue-_contractCost)>>.//
<br><br>
-<<= App.UI.MultipleInspect.SC(_newSlaves, true, false, false)>>
+<<includeDOM App.UI.MultipleInspect(_newSlaves, true, false, false)>>
<br><br>
<span id="result">
<<if $cash >= _contractCost>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 95113206f3f2004033c26f60d32706ba6423ab5b..628bf12cd0f121087e39ea7873b7217fc9f8325f 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1404,7 +1404,7 @@
<<elseif ["addict mother daughter", "posh mother daughter", "mismatched pair"].includes($RecETSevent)>>
<<set _newSlaves = [$relative]>> /* caller doesn't want relative involved, so you don't get to inspect her even if you can force a sale */
<</if>>
- <<= App.UI.MultipleInspect.SC(_newSlaves, true, true, false)>>
+ <<includeDOM App.UI.MultipleInspect(_newSlaves, true, true, false)>>
</span>
<span id="result">
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index c020c8ce15fa00d24d8a6c5f2f7e385fd5dfe737..d1145b3b4f0851d4c11ae9a236f128f5d3261090 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -4,6 +4,5 @@
<h1> $arcologies[0].name Weekly Slave Report - Week $week</h1>
-<<print App.UI.DOM.includeDOM(App.EndWeek.slaveAssignmentReport(), "weeklyReport", "div")>>
-/* release loading screen as soon as the event loop can run */
+<<includeDOM App.EndWeek.slaveAssignmentReport()>>
<<run App.UI.EndWeekAnim.end()>>