Merge branch 'pleaseYou' into 'pregmod-master'

convert useFucktoys to DOM

See merge request !6279

src/js/main.js

@@ -67,7 +67,7 @@ App.MainView.errors = function() {
 };
 
 /**
- * @return {Text}
+ * @returns {Text}
  */
 App.MainView.fcnn = function() {
 	let text;
@@ -81,8 +81,77 @@ App.MainView.fcnn = function() {
 	return document.createTextNode(`${text} `);
 };
 
+App.MainView.useFucktoys = function() {
+	const fragment = document.createDocumentFragment();
+
+	function setEnvironment(slave) {
+		return () => {
+			V.activeSlave = slave;
+			V.nextButton = "Back";
+			V.nextLink = "AS Dump";
+			V.returnTo = passage();
+		};
+	}
+
+	for (const slave of V.slaves) {
+		if (slave.assignment !== "please you") {
+			continue;
+		}
+
+		const {him, his} = getPronouns(slave);
+
+		const div = document.createElement("div");
+		div.classList.add("note");
+
+		div.append(App.Interact.ToyChest(slave));
+
+		div.append(" In the coming week you plan to concentrate on ");
+
+		if (slave.toyHole !== "all her holes") {
+			div.append(`${his} ${slave.toyHole}`);
+		} else {
+			div.append(`all of ${his} holes equally`);
+		}
+
+		if (slave.fuckdoll === 0) {
+			div.append(", but for now:");
+
+			const optionDiv = document.createElement("div");
+			optionDiv.classList.add("indent");
+
+			optionDiv.append(App.UI.DOM.passageLink(`Use ${his} mouth`, "FLips", setEnvironment(slave)),
+				" | ", App.UI.DOM.passageLink("Play with " + his + " tits", "FBoobs", setEnvironment(slave)));
+
+			if (canDoVaginal(slave)) {
+				optionDiv.append(" | ", App.UI.DOM.passageLink(`Fuck ${him}`, "FVagina", setEnvironment(slave)));
+				if (canDoAnal(slave)) {
+					optionDiv.append(" | ", App.UI.DOM.passageLink(`Use ${his} holes`, "FButt", setEnvironment(slave)));
+				}
+			}
+			if (canDoAnal(slave)) {
+				optionDiv.append(" | ", App.UI.DOM.passageLink(`Fuck ${his} ass`, "FAnus", setEnvironment(slave)));
+			}
+			if (canDoVaginal(slave) || canDoAnal(slave)) {
+				if (slave.belly >= 300000) {
+					optionDiv.append(" | ", App.UI.DOM.passageLink(`Fuck ${him} over ${his} belly`, "FBellyFuck", setEnvironment(slave)));
+				}
+			}
+			if (canPenetrate(slave)) {
+				optionDiv.append(" | ", App.UI.DOM.passageLink(`Ride ${him}`, "FDick", setEnvironment(slave)));
+			}
+			optionDiv.append(" | ", App.UI.DOM.passageLink(`Abuse ${him}`, "FAbuse", setEnvironment(slave)));
+
+			div.append(optionDiv);
+		} else {
+			div.append(".");
+		}
+		fragment.append(div);
+	}
+	return fragment;
+};
+
 /**
- * @return {HTMLDivElement}
+ * @returns {HTMLDivElement}
  */
 App.MainView.useGuard = function() {
 	const guard = V.slaves[V.slaveIndices[V.Bodyguard.ID]];

src/uncategorized/main.tw

@@ -95,52 +95,15 @@ __''MAIN MENU''__    //[[Summary Options]]//
 
 <<print App.UI.SlaveList.penthousePage()>>
 
-<<if $useSlaveSummaryTabs === 0>>  /*Display traditionally, without tabs*/
-
-<<set _j = "Back", _k = "AS Dump", _l = "Main">>
-<<for $i = 0; $i < _SL; $i++>>
-<<capture $i>>
-<<if ($slaves[$i].assignment == "please you")>>
-	<<setLocalPronouns $slaves[$i]>>
-	<br>
-	//<<= App.Interact.ToyChest($slaves[$i])>>//
-	//In the coming week you plan to concentrate on
-	<<if $slaves[$i].fuckdoll == 0>>
-		<<if $slaves[$i].toyHole != "all her holes">>
-			$his $slaves[$i].toyHole, but for now://
-		<<else>>
-			all of $his holes equally, but for now://
-		<</if>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;[["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]] | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
-		<<if canDoVaginal($slaves[$i])>>
-			| [["Fuck "+$him|FVagina][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
-			<<if canDoAnal($slaves[$i])>>
-				| [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
-			<</if>>
-		<</if>>
-		<<if canDoAnal($slaves[$i])>>
-			| [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
-		<</if>>
-		<<if canDoVaginal($slaves[$i]) || canDoAnal($slaves[$i])>>
-			<<if $slaves[$i].belly >= 300000>>
-				| [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[$i], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
-			<</if>>
-		<</if>>
-		/*check*/
-		<<if canPenetrate($slaves[$i])>>
-			| [["Ride "+$him|FDick][$activeSlave = $slaves[$i],$nextButton = _j,$nextLink = _k,$returnTo = _l]]
-		<</if>>
-		| [["Abuse "+$him|FAbuse][$activeSlave = $slaves[$i],$nextButton = _j,$nextLink = _k,$returnTo = _l]]
-	<<else>>
-		<<if $slaves[$i].toyHole != "all her holes">>
-			$his $slaves[$i].toyHole.
-		<<else>>
-			all of $his holes.
-		<</if>>
-	<</if>>
-<</if>>
-<</capture>>
-<</for>>
+<<if $useSlaveSummaryTabs === 0>>
+	<span id="fucktoy"></span>
+	<<script>>
+		$(document).one(':passageend', () => {
+			$('#fucktoy').append(
+				App.MainView.useFucktoys(),
+			);
+		});
+	<</script>>
 <</if>>
 
 <span id="BG"></span>