From 5ed7d1b9277c764bddfb6acbc4e3cf1a8160ffdf Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 16 Feb 2020 13:27:25 -0500
Subject: [PATCH] move OG .SlaveInteract function in here

fix
---
 src/js/assignJS.js                 | 44 ------------------------------
 src/js/slaveInteract.js            | 44 ++++++++++++++++++++++++++++++
 src/uncategorized/slaveInteract.tw |  2 +-
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 073941522aa..66389005800 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -869,50 +869,6 @@ App.UI.jobLinks = function() {
 	}
 }();
 
-App.UI.SlaveInteract = {
-	fucktoyPref: function() {
-		let res = "";
-		/** @type {App.Entity.SlaveState} */
-		const slave = State.variables.activeSlave;
-		const {his} = getPronouns(slave);
-		if ((slave.assignment === "please you") || (slave.assignment === "serve in the master suite") || (slave.assignment === "be your Concubine")) {
-			res += `<span class="story-label">Fucktoy use preference:</span> <span id = "hole" style="font-weight:bold">${slave.toyHole}.</span> `;
-			/** @type {string[]} */
-			let links = [];
-			links.push('<<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
-			links.push('<<link "Tits">><<set $activeSlave.toyHole = "boobs">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
-			if ((slave.vagina > 0) && canDoVaginal(slave)) {
-				links.push('<<link "Pussy">><<set $activeSlave.toyHole = "pussy">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
-			} else if (slave.vagina === 0) {
-				links.push(App.UI.disabledLink("Pussy",
-					[`Take ${his} virginity before giving ${his} pussy special attention`]));
-			}
-			if ((slave.anus > 0) && canDoAnal(slave)) {
-				links.push('<<link "Ass">><<set $activeSlave.toyHole = "ass">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
-			} else {
-				links.push(App.UI.disabledLink("Ass",
-					[`Take ${his} anal virginity before giving ${his} ass special attention`]));
-			}
-			if ((slave.dick > 0) && canPenetrate(slave)) {
-				links.push('<<link "Dick">><<set $activeSlave.toyHole = "dick">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
-			}
-			links.push(`<<link "No Preference">><<set $activeSlave.toyHole = "all ${his} holes">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>`);
-			res += links.join('&thinsp;|&thinsp;') + '<br>';
-		}
-		App.UI.replace('#fucktoypref', res);
-	},
-
-	assignmentBlock: function(blockId) {
-		let res = App.UI.jobLinks.assignments(-1, undefined, () => {
-			return `<<replace "#assign">>$activeSlave.assignment<</replace>><<replace "#${blockId}">><<= App.UI.SlaveInteract.assignmentBlock("${blockId}")>><<= App.UI.SlaveInteract.fucktoyPref()>><</replace>>`;
-		});
-		if (State.variables.activeSlave.assignment !== "choose her own job") {
-			res += '&thinsp;|&thinsp; <<link "Stay on this assignment for another month">><<set $activeSlave.sentence += 4>><<replace "#assign">>$activeSlave.assignment($activeSlave.sentence weeks)<</replace>><</link>>';
-		}
-		return res;
-	}
-};
-
 App.activeArcology = function() {
 	return V.arcologies[V.activeArcologyIdx];
 };
diff --git a/src/js/slaveInteract.js b/src/js/slaveInteract.js
index 795673c95f5..75eb5cae4a3 100644
--- a/src/js/slaveInteract.js
+++ b/src/js/slaveInteract.js
@@ -1,3 +1,47 @@
+App.UI.SlaveInteract = {
+	fucktoyPref: function() {
+		let res = "";
+		/** @type {App.Entity.SlaveState} */
+		const slave = State.variables.activeSlave;
+		const {his} = getPronouns(slave);
+		if ((slave.assignment === "please you") || (slave.assignment === "serve in the master suite") || (slave.assignment === "be your Concubine")) {
+			res += `<span class="story-label">Fucktoy use preference:</span> <span id = "hole" style="font-weight:bold">${slave.toyHole}.</span> `;
+			/** @type {string[]} */
+			let links = [];
+			links.push('<<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
+			links.push('<<link "Tits">><<set $activeSlave.toyHole = "boobs">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
+			if ((slave.vagina > 0) && canDoVaginal(slave)) {
+				links.push('<<link "Pussy">><<set $activeSlave.toyHole = "pussy">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
+			} else if (slave.vagina === 0) {
+				links.push(App.UI.disabledLink("Pussy",
+					[`Take ${his} virginity before giving ${his} pussy special attention`]));
+			}
+			if ((slave.anus > 0) && canDoAnal(slave)) {
+				links.push('<<link "Ass">><<set $activeSlave.toyHole = "ass">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
+			} else {
+				links.push(App.UI.disabledLink("Ass",
+					[`Take ${his} anal virginity before giving ${his} ass special attention`]));
+			}
+			if ((slave.dick > 0) && canPenetrate(slave)) {
+				links.push('<<link "Dick">><<set $activeSlave.toyHole = "dick">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
+			}
+			links.push(`<<link "No Preference">><<set $activeSlave.toyHole = "all ${his} holes">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>`);
+			res += links.join('&thinsp;|&thinsp;') + '<br>';
+		}
+		App.UI.replace('#fucktoypref', res);
+	},
+
+	assignmentBlock: function(blockId) {
+		let res = App.UI.jobLinks.assignments(-1, undefined, () => {
+			return `<<replace "#assign">>$activeSlave.assignment<</replace>><<replace "#${blockId}">><<= App.UI.SlaveInteract.assignmentBlock("${blockId}")>><<= App.UI.SlaveInteract.fucktoyPref()>><</replace>>`;
+		});
+		if (State.variables.activeSlave.assignment !== "choose her own job") {
+			res += '&thinsp;|&thinsp; <<link "Stay on this assignment for another month">><<set $activeSlave.sentence += 4>><<replace "#assign">>$activeSlave.assignment($activeSlave.sentence weeks)<</replace>><</link>>';
+		}
+		return res;
+	}
+};
+
 App.UI.SlaveInteract.drugs = function(slave) {
 	let el = document.createElement('div');
 
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index aff9b54d9d5..2a0d874100e 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -69,7 +69,7 @@
 <div id="miniscene"></div>
 <span id="useSlave"></span>
 <script>
-	useSlaveDisplay(V.activeSlave)
+	App.UI.SlaveInteract.useSlaveDisplay(V.activeSlave)
 </script>
 
 /* pregmod start */
-- 
GitLab