From e4f7ce05604f62ad272cb1c03c6eb0bff665c065 Mon Sep 17 00:00:00 2001
From: Mute <mute@devnull>
Date: Sun, 18 Jun 2023 02:07:49 +0000
Subject: [PATCH] dev.8

* R93
* /do fix
---
 mbchc-dev.user.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/mbchc-dev.user.js b/mbchc-dev.user.js
index 23932ea..7b8e759 100644
--- a/mbchc-dev.user.js
+++ b/mbchc-dev.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         MBCHC
-// @version      dev.7
+// @version      dev.8
 // @description  Mute's Bondage Club Hacks Collection
 // @author       codename.mute@proton.me
 // @namespace    https://code.fleshless.org/mute/
@@ -21,8 +21,8 @@
 if (!window.AsylumGGTSSAddItems) throw "AsylumGGTSSAddItems() not found, aborting MBCHC loading"
 if (window.MBCHC) throw "MBCHC found, aborting loading"
 window.MBCHC = {
-	VERSION: "dev.7",
-	TARGET_VERSION: "R86",
+	VERSION: "dev.8",
+	TARGET_VERSION: "R93",
 	NEXT_MESSAGE: 1,
 	LOG_MESSAGES: false,
 	RETHROW: false,
@@ -287,10 +287,8 @@ window.MBCHC = {
 		if ((activity.Name || activity.Activity.Name).endsWith("Item")) {
 			const item = this.ensure("no toy found", () => window.Player.Inventory.find(i => i.Asset?.Name === "SpankingToys" && i.Asset.Group?.Name === char.FocusGroup.Name && window.AssetSpankingToys.DynamicActivity(char) === (activity.Name || activity.Activity.Name)))
 			window.DialogPublishAction(char, item)
-		} else window.ActivityRun(char, activity)
-	} finally {
-		char.FocusGroup = null
-	} },
+		} else window.ActivityRun(window.Player, char, char.FocusGroup, activity)
+	} finally {char.FocusGroup = null} },
 	replace_me: function(match, offset, string) {
 		let text = string.slice(1)
 		let suffix = " "
@@ -359,7 +357,7 @@ window.MBCHC = {
 		/* (["anim", "pose"]).forEach(tag => {let cmd = window.Commands.find(c => tag === c.Tag); if (cmd) cmd.AutoComplete = this[`complete_fbc_${tag}`]}) */ // this line explodes, don't ask me why
 		let cmd = window.Commands.find(c => "anim" === c.Tag)
 		if (cmd) cmd.AutoComplete = this.complete_fbc_anim
-			cmd = window.Commands.find(c => "pose" === c.Tag)
+		cmd = window.Commands.find(c => "pose" === c.Tag)
 		if (cmd) cmd.AutoComplete = this.complete_fbc_pose
 	},
 	gather_versions: function() { return(window.ChatRoomCharacter.filter(c => c.MBCHC).map(c => ({name: c.dn, cid: c.cid, version: c.MBCHC.VERSION}))) },
@@ -588,9 +586,9 @@ window.MBCHC = {
 		this.before("ChatRoomSendChat", () => {
 			let input = window.ElementValue("InputChat")
 			if (!input.startsWith("@@@") && input.startsWith("@")) {
-			input = input.replace(this.RE_PREF_ACTIVITY, this.PREF_ACTIVITY)
-			input = input.replace(this.RE_PREF_ACTIVITY_ME, this.replace_me)
-			window.ElementValue("InputChat", input)
+				input = input.replace(this.RE_PREF_ACTIVITY, this.PREF_ACTIVITY)
+				input = input.replace(this.RE_PREF_ACTIVITY_ME, this.replace_me)
+				window.ElementValue("InputChat", input)
 			}
 		})
 		this.after("ChatRoomSendChat", () => {
@@ -632,13 +630,11 @@ window.MBCHC = {
 		})
 
 		// Chat room handlers
-		window.ChatRoomRegisterMessageHandler({ Priority: -220, Description: "MBCHC preprocessor",
-			Callback: (data, sender, msg, metadata) => {
-				data.MBCHC_ID = this.NEXT_MESSAGE
-				this.NEXT_MESSAGE += 1
-				if (this.LOG_MESSAGES) console.debug({data, sender, msg, metadata})
-			}
-		})
+		window.ChatRoomRegisterMessageHandler({ Priority: -220, Description: "MBCHC preprocessor", Callback: (data, sender, msg, metadata) => {
+			data.MBCHC_ID = this.NEXT_MESSAGE
+			this.NEXT_MESSAGE += 1
+			if (this.LOG_MESSAGES) console.debug({data, sender, msg, metadata})
+		}})
 		window.ChatRoomRegisterMessageHandler({ Priority: -219, Description: "MBCHC room enter hook",
 			Callback: (data, sender, msg, metadata) => { if (("Action" === data.Type) && ("ServerEnter" === data.Content) && (data.Sender === window.Player.cid)) this.player_enters_room() }
 		})