diff --git a/src/005-passages/arcologyBuildingPassages.js b/src/005-passages/arcologyBuildingPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf43a8f8c94f8fe949f96093d7cd9e8f2d71481b
--- /dev/null
+++ b/src/005-passages/arcologyBuildingPassages.js
@@ -0,0 +1,8 @@
+new App.DomPassage("Cell",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Main";
+
+ return V.building.renderCell(V.cellPath);
+ }, ["jump-from-safe", "no-history"]
+);
diff --git a/src/005-passages/birthPassages.js b/src/005-passages/birthPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa602b32314ea310487e22002f3668a037b3f6df
--- /dev/null
+++ b/src/005-passages/birthPassages.js
@@ -0,0 +1,17 @@
+new App.DomPassage("BirthStorm",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Slave Interact";
+
+ return birth(getSlave(V.AS), {birthStorm: true});
+ }
+);
+
+new App.DomPassage("csec",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Slave Interact";
+
+ return birth(getSlave(V.AS), {cSection: true});
+ }
+);
diff --git a/src/005-passages/endWeekPassages.js b/src/005-passages/endWeekPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..510a03aaa94a118e1d3745ea7d21e684f24cc5d9
--- /dev/null
+++ b/src/005-passages/endWeekPassages.js
@@ -0,0 +1,13 @@
+new App.DomPassage("Slave Assignments Report",
+ () => {
+ V.nextLink = "Economics"; V.nextButton = "Continue";
+
+ const f = document.createDocumentFragment();
+ App.UI.DOM.appendNewElement("h1", f, `${V.arcologies[0].name} Weekly Slave Report - Week ${V.week}`);
+ f.append(App.EndWeek.slaveAssignmentReport());
+
+ App.UI.EndWeekAnim.end();
+
+ return f;
+ }
+);
diff --git a/src/005-passages/eventsPassages.js b/src/005-passages/eventsPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..c9c0031adfeed933e1a62ed820c8ea9789feb3e8
--- /dev/null
+++ b/src/005-passages/eventsPassages.js
@@ -0,0 +1,59 @@
+/* ### Scheduled Events ### */
+new App.DomPassage("SE Burst",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Scheduled Event";
+
+ return allBursts();
+ }
+);
+
+new App.DomPassage("SE Death",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Scheduled Event";
+
+ return allDeaths();
+ }
+);
+
+new App.DomPassage("SE Birth",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Scheduled Event";
+
+ return allBirths();
+ }
+);
+
+new App.DomPassage("SE pit fight", () => App.Facilities.Pit.fight(V.pit.lethal));
+
+new App.DomPassage("SE pc birthday", () => App.Events.pcBirthday.runEvent());
+
+/* ### Non Random Events ### */
+
+new App.DomPassage("Murder Attempt",
+ () => {
+ if (V.event === "slave trade") {
+ return App.Events.murderAttemptFollowup("slave", V.illegalDeals.slave.company, V.illegalDeals.slave.type);
+ } else if (V.event === "trade deal") {
+ return App.Events.murderAttemptFollowup("trade", V.illegalDeals.trade.company);
+ } else if (V.event === "military deal") {
+ return App.Events.murderAttemptFollowup("military", V.illegalDeals.military.company);
+ } else {
+ return App.Events.murderAttempt();
+ }
+ }
+);
+
+/* ### Random Events ### */
+
+new App.DomPassage("JS Random Event",
+ () => {
+ V.nextButton = "Continue";
+
+ const f = document.createDocumentFragment();
+ V.event.execute(f);
+ return f;
+ }
+);
diff --git a/src/005-passages/facilitiesPassages.js b/src/005-passages/facilitiesPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d537fa220a3978dfc0837949f2016cc0d5be6a4
--- /dev/null
+++ b/src/005-passages/facilitiesPassages.js
@@ -0,0 +1,70 @@
+/* ### Standard Facilities ### */
+new App.DomPassage("Pit", () => { return App.Facilities.Pit.pit(); }, ["jump-to-safe", "jump-from-safe"]);
+
+new App.DomPassage("Incubator", () => { return App.UI.incubator(); }, ["jump-to-safe", "jump-from-safe"]);
+
+/* ### Slave Interact Facilities ### */
+new App.DomPassage("Wardrobe",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Manage Penthouse";
+
+ return App.UI.WardrobeShopping("FS");
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Salon",
+ () => {
+ V.nextButton = "Confirm changes";
+ V.nextLink = "Slave Interact";
+ V.encyclopedia = "The Auto Salon";
+
+ return App.UI.salon(getSlave(V.AS));
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+new App.DomPassage("Body Modification",
+ () => {
+ V.nextButton = "Confirm changes";
+ V.nextLink = "Slave Interact";
+ V.encyclopedia = "The Studio";
+
+ return App.UI.bodyModification(getSlave(V.AS));
+ }, ["jump-to-safe", "jump-from-safe"]
+);
+
+/* ### Special Facilities ### */
+new App.DomPassage("Agent Select",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Neighbor Interact";
+ V.encyclopedia = "Agents";
+
+ const f = document.createDocumentFragment();
+ App.UI.DOM.appendNewElement("h2", f, "Appoint an Agent from your devoted slaves");
+
+ // TODO Logic should not be handled here.
+ f.append(App.UI.SlaveList.slaveSelectionList(
+ s => s.fuckdoll === 0
+ && s.devotion > 20
+ && s.intelligence + s.intelligenceImplant > 15
+ && s.intelligenceImplant >= 15
+ && canWalk(s) && canSee(s) && canHear(s) && canTalk(s)
+ && s.broodmother < 2
+ && (s.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"),
+ (slave) => App.UI.DOM.passageLink(SlaveFullName(slave), "Agent Workaround",
+ () => { V.i = V.slaves.findIndex((s) => s.ID === slave.ID); }),
+ s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)
+ ));
+
+ return f;
+ }, ["jump-from-safe"]
+);
+
+new App.DomPassage("Rules Assistant",
+ () => {
+ const div = document.createElement("div");
+ App.RA.options(div);
+ return div;
+ }, ["jump-to-safe", "jump-from-safe"]
+);
diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..d04947c2ba4414ae06cd52b643f3a517d96435d2
--- /dev/null
+++ b/src/005-passages/interactPassages.js
@@ -0,0 +1,23 @@
+/* ### Central Slave Interact ### */
+new App.DomPassage("Slave Interact",
+ () => {
+ V.nextButton = "Confirm changes";
+ V.nextLink = "Main";
+
+ return App.UI.SlaveInteract.mainPage(getSlave(V.AS));
+ }
+);
+
+/* ### Single Interaction ### */
+new App.DomPassage("BeastFucked", () => App.Interact.fAnimal(getSlave(V.AS), V.animalType));
+
+new App.DomPassage("SlaveOnSlaveFeeding",
+ () => {
+ V.nextButton = "Back";
+ V.nextLink = "Slave Interact";
+
+ return App.UI.SlaveInteract.slaveOnSlaveFeedingSelection(getSlave(V.AS));
+ }
+);
+
+new App.DomPassage("KillSlave", () => App.UI.SlaveInteract.killSlave(getSlave(V.AS)));
diff --git a/src/005-passages/introPassages.js b/src/005-passages/introPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a7e68624eac9916e331dc1bf3758d286173ba32
--- /dev/null
+++ b/src/005-passages/introPassages.js
@@ -0,0 +1,10 @@
+new App.DomPassage("PC Body Intro", () => { return App.Intro.PCBodyIntro(); });
+
+new App.DomPassage("Intro Summary", () => { return App.Intro.summary(); });
+
+new App.DomPassage("Acquisition",
+ () => {
+ V.encyclopedia = "How to Play";
+ return App.Intro.acquisition();
+ }
+);
diff --git a/src/005-passages/optionsPassage.js b/src/005-passages/optionsPassages.js
similarity index 93%
rename from src/005-passages/optionsPassage.js
rename to src/005-passages/optionsPassages.js
index ec6cf6a86d09225e9cc68b31c654cfde8b48b2de..00ce48b86345f5f972262dc8399c754de6f2cddd 100644
--- a/src/005-passages/optionsPassage.js
+++ b/src/005-passages/optionsPassages.js
@@ -27,8 +27,7 @@ new App.DomPassage("Description Options",
V.nextLink = V.storedLink;
return App.UI.descriptionOptions();
- },
- ["jump-to-safe", "jump-from-safe"]
+ }, ["jump-to-safe", "jump-from-safe"]
);
new App.DomPassage("Summary Options",
@@ -45,8 +44,7 @@ new App.DomPassage("Summary Options",
V.passageSwitchHandler = App.EventHandlers.optionsChanged;
return App.UI.summaryOptions();
- },
- ["jump-to-safe", "jump-from-safe"]
+ }, ["jump-to-safe", "jump-from-safe"]
);
new App.DomPassage("Hotkey Settings",
diff --git a/src/arcologyBuilding/cell.tw b/src/arcologyBuilding/cell.tw
deleted file mode 100644
index 5875dadfa14b53fb708c8d3c3e7436dfae16616a..0000000000000000000000000000000000000000
--- a/src/arcologyBuilding/cell.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Cell [nobr jump-from-safe no-history]
-
-<<set $nextButton = "Back", $nextLink = "Main">>
-
-<<includeDOM V.building.renderCell(V.cellPath)>>
diff --git a/src/endWeek/reportsTW/slaveAssignmentsReport.tw b/src/endWeek/reportsTW/slaveAssignmentsReport.tw
deleted file mode 100644
index d1145b3b4f0851d4c11ae9a236f128f5d3261090..0000000000000000000000000000000000000000
--- a/src/endWeek/reportsTW/slaveAssignmentsReport.tw
+++ /dev/null
@@ -1,8 +0,0 @@
-:: Slave Assignments Report [nobr]
-
-<<set $nextLink = "Economics", $nextButton = "Continue">>
-
-<h1> $arcologies[0].name Weekly Slave Report - Week $week</h1>
-
-<<includeDOM App.EndWeek.slaveAssignmentReport()>>
-<<run App.UI.EndWeekAnim.end()>>
diff --git a/src/events/intro/acquisition.tw b/src/events/intro/acquisition.tw
deleted file mode 100644
index 15af72727f501a40741b9b601aae933abce6594e..0000000000000000000000000000000000000000
--- a/src/events/intro/acquisition.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Acquisition [nobr]
-
-<<set $encyclopedia = "How to Play">>
-
-<<includeDOM App.Intro.acquisition()>>
\ No newline at end of file
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
deleted file mode 100644
index 27d3c57173f853f6fb5737a6721f6d46862d7f44..0000000000000000000000000000000000000000
--- a/src/events/intro/introSummary.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Intro Summary [nobr]
-
-<<includeDOM App.Intro.summary()>>
\ No newline at end of file
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
deleted file mode 100644
index 1d857050e432f15ae9ece9ee57952db52706c38b..0000000000000000000000000000000000000000
--- a/src/events/intro/pcBodyIntro.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: PC Body Intro [nobr]
-
-<<includeDOM App.Intro.PCBodyIntro()>>
\ No newline at end of file
diff --git a/src/events/jsRandomEvent.tw b/src/events/jsRandomEvent.tw
deleted file mode 100644
index 727de9081521a8aef6911e5c7bab34d519a112e5..0000000000000000000000000000000000000000
--- a/src/events/jsRandomEvent.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: JS Random Event [nobr]
-
-<<set $nextButton = "Continue">>
-
-<<run html5passage(n => $event.execute(n))>>
diff --git a/src/events/scheduled/burst/seBurst.tw b/src/events/scheduled/burst/seBurst.tw
deleted file mode 100644
index 74189c5a03b92eb1a819943da5c34c0e0757fed8..0000000000000000000000000000000000000000
--- a/src/events/scheduled/burst/seBurst.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: SE Burst [nobr]
-
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
-
-<<includeDOM allBursts()>>
diff --git a/src/events/scheduled/murderAttempt.tw b/src/events/scheduled/murderAttempt.tw
deleted file mode 100644
index fbf1e9c509e5cdc191716f2eca68eed40d61518c..0000000000000000000000000000000000000000
--- a/src/events/scheduled/murderAttempt.tw
+++ /dev/null
@@ -1,11 +0,0 @@
-:: Murder Attempt [nobr]
-
-<<if $event == "slave trade">>
- <<includeDOM App.Events.murderAttemptFollowup("slave", V.illegalDeals.slave.company, V.illegalDeals.slave.type)>>
-<<elseif $event == "trade deal">>
- <<includeDOM App.Events.murderAttemptFollowup("trade", V.illegalDeals.trade.company)>>
-<<elseif $event == "military deal">>
- <<includeDOM App.Events.murderAttemptFollowup("military", V.illegalDeals.military.company)>>
-<<else>>
- <<includeDOM App.Events.murderAttempt()>>
-<</if>>
diff --git a/src/events/scheduled/pitFight.tw b/src/events/scheduled/pitFight.tw
deleted file mode 100644
index ac9e7f27f3cb48d6d70ab48d352cb8dc875478d8..0000000000000000000000000000000000000000
--- a/src/events/scheduled/pitFight.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: SE pit fight
-
-<<includeDOM App.Facilities.Pit.fight(V.pit.lethal)>>
diff --git a/src/events/scheduled/sePCBirthday.tw b/src/events/scheduled/sePCBirthday.tw
deleted file mode 100644
index ca2a41894161bd2bba7e52bbe58f06af45140f84..0000000000000000000000000000000000000000
--- a/src/events/scheduled/sePCBirthday.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: SE pc birthday [nobr]
-
-<<includeDOM App.Events.pcBirthday.runEvent()>>
\ No newline at end of file
diff --git a/src/facilities/bodyModification/bodyModification.tw b/src/facilities/bodyModification/bodyModification.tw
deleted file mode 100644
index 74cbfe0d6445fe245e36d74688fd68b05eacfec5..0000000000000000000000000000000000000000
--- a/src/facilities/bodyModification/bodyModification.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Body Modification [nobr jump-from-safe]
-
-<<set $nextButton = "Confirm changes", $nextLink = "Slave Interact", $encyclopedia = "The Studio">>
-
-<<includeDOM App.UI.bodyModification(getSlave($AS))>>
\ No newline at end of file
diff --git a/src/facilities/incubator/incubator.tw b/src/facilities/incubator/incubator.tw
deleted file mode 100644
index 5c699aa7bde10c6d2cb9d29dbb745fea5f56c909..0000000000000000000000000000000000000000
--- a/src/facilities/incubator/incubator.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Incubator [nobr jump-to-safe jump-from-safe]
-
-<<includeDOM App.UI.incubator()>>
\ No newline at end of file
diff --git a/src/facilities/pit/pit.tw b/src/facilities/pit/pit.tw
deleted file mode 100644
index e0ebcece67db665fb8dac13416878ac687a4265e..0000000000000000000000000000000000000000
--- a/src/facilities/pit/pit.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Pit [nobr jump-to-safe jump-from-safe]
-
-<<includeDOM App.Facilities.Pit.pit()>>
diff --git a/src/facilities/salon/salon.tw b/src/facilities/salon/salon.tw
deleted file mode 100644
index 07bb6f37df73148445f546bf7c0e95cc38fb42a3..0000000000000000000000000000000000000000
--- a/src/facilities/salon/salon.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Salon [nobr jump-from-safe]
-
-<<set $nextButton = "Confirm changes", $nextLink = "Slave Interact", $encyclopedia = "The Auto Salon">>
-
-<<includeDOM App.UI.salon(getSlave($AS))>>
\ No newline at end of file
diff --git a/src/facilities/wardrobe/wardrobe.tw b/src/facilities/wardrobe/wardrobe.tw
deleted file mode 100644
index 56636db39ef96275968236cfa04b805d00db57ac..0000000000000000000000000000000000000000
--- a/src/facilities/wardrobe/wardrobe.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Wardrobe [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back", $nextLink = "Manage Penthouse">>
-
-<<includeDOM App.UI.WardrobeShopping("FS")>>
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 084ea51d06e2220cd9c20c1cf637a6927c7576f7..c084389ccd93fe2e570bc7cf0c1f91e6cddd3a37 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -5,14 +5,17 @@
// wrapped in a closure so as not to pollute the global namespace
// the widgets are generic enough to be reusable; if similar user interfaces are ported to JS, we could move the classes to the global scope
-globalThis.rulesAssistantOptions = (function() {
+/**
+ * @param {HTMLDivElement} div container for the RA UI
+ */
+App.RA.options = (function() {
"use strict";
const noDefaultSetting = {value: "!NDS!", text: "no default setting"};
/** @type {FC.RA.Rule} */
let current_rule, root;
- function rulesAssistantOptions(element) {
+ function rulesAssistantOptions(div) {
V.nextButton = "Back to Main";
V.nextLink = "Main";
V.returnTo = "Main";
@@ -25,7 +28,7 @@ globalThis.rulesAssistantOptions = (function() {
current_rule = V.defaultRules[idx];
}
}
- root = new Root(element);
+ root = new Root(div);
}
function returnP(e) { return e.keyCode === 13; }
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index baf505a24abd25c10d4ef741642a139a24a28f67..4f9316836e7081b3ced53a33acc7bec8ea6d04bd 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -1,18 +1,3 @@
-/**
- * circumvents SugarCube, allowing a plain HTML5 UI within it
- *
- * @param {function(HTMLElement): HTMLElement} passageFunction
- */
-globalThis.html5passage = function(passageFunction) {
- $(document).one(":passagedisplay", (ev) => {
- const element = document.createElement("div");
- element.classList.add("passage");
- document.getElementById("passages").appendChild(element);
- passageFunction(element);
- $(document).off(":passagedisplay");
- });
-};
-
/**
* If you want to include a SugarCube passage in a JS function use this. The result must be printed using the <<print>>
* macro.
diff --git a/src/npc/agent/agentSelect.tw b/src/npc/agent/agentSelect.tw
deleted file mode 100644
index e337c0d0ba671437a066fa34cdf110e684d62163..0000000000000000000000000000000000000000
--- a/src/npc/agent/agentSelect.tw
+++ /dev/null
@@ -1,11 +0,0 @@
-:: Agent Select [nobr jump-from-safe]
-
-<<set $nextButton = "Back", $nextLink = "Neighbor Interact", $encyclopedia = "Agents">>
-''Appoint an Agent from your devoted slaves:''
-
-<<includeDOM App.UI.SlaveList.slaveSelectionList(
- s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset")),
- (slave) => App.UI.DOM.passageLink(SlaveFullName(slave), 'Agent Workaround',
- () => { V.i = V.slaves.findIndex((s) => s.ID === slave.ID); }),
- s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)
- )>>
diff --git a/src/npc/interaction/killSlave.tw b/src/npc/interaction/killSlave.tw
deleted file mode 100644
index 7b1327b99eb466fdfcceb6cc6ed56cb6fe077e18..0000000000000000000000000000000000000000
--- a/src/npc/interaction/killSlave.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: KillSlave [nobr]
-
-<<includeDOM App.UI.SlaveInteract.killSlave(getSlave($AS))>>
diff --git a/src/npc/interaction/passage/birthStorm.tw b/src/npc/interaction/passage/birthStorm.tw
deleted file mode 100644
index c083ae497bae8b1a90794713c0201f5fad278547..0000000000000000000000000000000000000000
--- a/src/npc/interaction/passage/birthStorm.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: BirthStorm [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-
-<<includeDOM birth(getSlave(V.AS), {birthStorm: true})>>
diff --git a/src/npc/interaction/passage/csec.tw b/src/npc/interaction/passage/csec.tw
deleted file mode 100644
index 9b82c7aa9b7b764da02cf3f09bafa164f855f78c..0000000000000000000000000000000000000000
--- a/src/npc/interaction/passage/csec.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: csec [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-
-<<includeDOM birth(getSlave(V.AS), {cSection: true})>>
\ No newline at end of file
diff --git a/src/npc/interaction/slaveOnSlaveFeeding/slaveOnSlaveFeeding.tw b/src/npc/interaction/slaveOnSlaveFeeding/slaveOnSlaveFeeding.tw
deleted file mode 100644
index eb76ca5c03a99a60215323121d4b4953c300fc74..0000000000000000000000000000000000000000
--- a/src/npc/interaction/slaveOnSlaveFeeding/slaveOnSlaveFeeding.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: SlaveOnSlaveFeeding [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Slave Interact">>
-
-<<includeDOM App.UI.SlaveInteract.slaveOnSlaveFeedingSelection(getSlave($AS))>>
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
deleted file mode 100644
index 29e64e842d9b31af59617d31a2bbf8291313915d..0000000000000000000000000000000000000000
--- a/src/pregmod/beastFucked.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: BeastFucked [nobr]
-
-<<includeDOM App.Interact.fAnimal(getSlave($AS), $animalType)>>
diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw
deleted file mode 100644
index 0aa3e98c7c554378bcd5712ee0730a4b896521ec..0000000000000000000000000000000000000000
--- a/src/pregmod/seDeath.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: SE Death [nobr]
-
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
-
-<<includeDOM allDeaths()>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
deleted file mode 100644
index 662b7abb69484c8d982fcd4bf31a37733e7507a6..0000000000000000000000000000000000000000
--- a/src/uncategorized/rulesAssistant.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Rules Assistant [nobr jump-to-safe jump-from-safe]
-
-<<run html5passage(rulesAssistantOptions)>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
deleted file mode 100644
index ad8e39fce25d28e8d32e36d87f2121abceef402b..0000000000000000000000000000000000000000
--- a/src/uncategorized/seBirth.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: SE Birth [nobr]
-
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Scheduled Event">>
-
-<<includeDOM allBirths()>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
deleted file mode 100644
index aea8b167fc824af6937dd5e2a7ee5102faea00a7..0000000000000000000000000000000000000000
--- a/src/uncategorized/slaveInteract.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: Slave Interact [nobr jump-from-safe]
-
-<<set $nextButton = "Confirm changes", $nextLink = "Main">>
-
-<<includeDOM App.UI.SlaveInteract.mainPage(getSlave(V.AS))>>