From d8a4d250d70febf154fa295445544f41fe62ccf0 Mon Sep 17 00:00:00 2001 From: Mute Date: Wed, 4 Dec 2024 00:50:36 +0000 Subject: [PATCH] 110.13.0 * changed assert to only check for undefined by default * fixes a bug with 0 time offset * updated the club to R110 --- mbchc.mjs | 20 ++++++++++---------- package-lock.json | 12 ++++++------ package.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mbchc.mjs b/mbchc.mjs index 834853e..1718b48 100644 --- a/mbchc.mjs +++ b/mbchc.mjs @@ -1,5 +1,5 @@ // Take a look at the .d.ts for comments. -export const version = '108.13.1' +export const version = '110.13.0' const W = window, D = W.document, /**fuck money*/$ = undefined, /**@type {''}*/$S = '', /**@type {{}}*/$O = {}, /**@type {Set}*/$Ss = new Set() // /**@type {readonly []}*/$A = [], const/**@type {TextDictionaryEntry}*/MISSING_PLAYER_DIALOG = {Tag: 'MISSING TEXT IN "Interface.csv": ', Text: '\u200C'} // Zero-width non-joiner, used to break up ligatures, does nothing here, but an empty string is a falsey value @@ -19,7 +19,7 @@ const/**@type {FP.run}*/run = (fs, ...args) => {fs.forEach(f => fun(f) && void f const/**@type {FP.yes}*/yes = (...args) => run(args, $) const/**@type {FP.mut}*/mut = (v, ...args) => run(args, v) && v const/**@type {FP.del}*/del = (o, p) => mut(o, Reflect.deleteProperty(o, p)) -const/**@type {FP.ass}*/ass = (x, v, c = Boolean) => {if (v === $ || !c(v)) throw new Error(x); return v} +const/**@type {FP.ass}*/ass = (x, v, c) => {if (v === $ || !(c?.(v) ?? true)) throw new Error(x); return v} const/**@type {FP.asa}*/asa = (p, v) => v instanceof p ? v : $ const/**@type {FP.rsc}*/rsc = (f, r) => {try {f($)} catch (x) {r(x)} return true} const/**@type {FP.Interval}*/range = new (class { proxy = new Proxy($O, this); min = 0; max = 0; mini = false; maxi = false @@ -214,7 +214,7 @@ const/**@type {InputHistory}*/H = { input: undefined, ids: undefined, bottom: un exit: (ic, e) => yes(H.icro(ic, false), H.key[e.key]?.(e, ic), val(H.bottom, b => b && U.scroll()), W.ChatRoomLastMessageIndex = W.ChatRoomLastMessage.length) } -ass('MBCHC found, aborting loading', W.MBCHC === $) +ass('MBCHC found, aborting loading', W.MBCHC === $, Boolean) ass('AsylumGGTSSAddItems() not found, aborting MBCHC loading', W.AsylumGGTSSAddItems) const sdk = ass('SDK not found, please load with (or after) FUSAM or any other mod that uses SDK', W.bcModSdk) const mod = sdk.registerMod({name: 'MBCHC', fullName: 'Mute\'s Bondage Club Hacks Collection', version, repository: 'https://code.fleshless.org/mute/MBCHC/'}) @@ -364,20 +364,20 @@ const/**@type {SDK.Hook}*/after = (name, f) => mod.hookFunction(name, 0, (na, n) }, donate_data(/**@type {string}*/target) { const char = U.target2char(target) - ass('target must not be you', !char.IsPlayer()) - ass('target must be bound', char.IsRestrained()) + ass('target must not be you', !char.IsPlayer(), Boolean) + ass('target must be bound', char.IsRestrained(), Boolean) const cost = Math.round(((Math.random() * 10) + 15)) - ass('not enough money', W.Player.Money >= cost) + ass('not enough money', W.Player.Money >= cost, Boolean) W.CharacterChangeMoney(W.Player, -cost) W.ServerSend('ChatRoomChat', {Content: 'ReceiveSuitcaseMoney', Type: 'Hidden', Target: U.cid(char)}) W.ChatRoomMessage({Sender: ass('...', U.cid(W.Player)), Type: 'Action', Content: `You've bought data for $${cost} and sent it to ${U.dn(char)}.`, Dictionary: [MISSING_PLAYER_DIALOG]}) }, run_activity(/**@type {Character}*/char, /**@type {AssetGroupItemName}*/ag, /**@type {ActivityName}*/action) { try { - ass('activities disabled in this room', W.ActivityAllowed()) - ass('no permissions', W.ServerChatRoomGetAllowItem(W.Player, char)) + ass('activities disabled in this room', W.ActivityAllowed(), Boolean) + ass('no permissions', W.ServerChatRoomGetAllowItem(W.Player, char), Boolean) char.FocusGroup = ass('invalid AssetGroup', n2u(W.AssetGroupGet(char.AssetFamily, ag))) - const activity = ass('invalid activity', W.ActivityAllowedForGroup(char, char.FocusGroup.Name).find(a => a.Activity?.Name === action)) + const activity = ass('invalid activity', W.ActivityAllowedForGroup(char, char.FocusGroup.Name).find(a => a.Activity?.Name === action), Boolean) //if ((activity.Name || activity.Activity.Name).endsWith('Item')) { // const item = this.ensure('no toy found', () => w.Player.Inventory.find(i => i.Asset?.Name === 'SpankingToys' && i.Asset.Group?.Name === char.FocusGroup.Name && w.AssetSpankingToys.DynamicActivity(char) === (activity.Name || activity.Activity.Name))) // w.DialogPublishAction(char, item) @@ -397,7 +397,7 @@ const/**@type {SDK.Hook}*/after = (name, f) => mod.hookFunction(name, 0, (na, n) }, set_timezone(/**@type {string[]}*/args) { const tz = ass(`invalid offset "${args[0]}"`, int(args[0] ?? $S)) - ass('offset should be [-12,12]', tz in rng(-12, 12)) + ass('offset should be in [-12,12]', tz in rng(-12, 12), Boolean) const char = U.target2char(args[1] ?? $S) return val(U.cid(char), cid => Settings.save(v1 => v1.TZ[cid] = tz) && TZ.memo(cid)) }, diff --git a/package-lock.json b/package-lock.json index ab449f1..3a94697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "mbchc", - "version": "108.13.1", + "version": "110.13.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mbchc", - "version": "108.13.1", + "version": "110.13.0", "license": "SEE LICENSE IN LICENSE", "devDependencies": { - "bc-stubs": "^108.0.0", + "bc-stubs": "^110.0.0", "bondage-club-mod-sdk": "^1.2.0", "typescript": "^5.5.2", "xo": "^0.56.0" @@ -1074,9 +1074,9 @@ "dev": true }, "node_modules/bc-stubs": { - "version": "108.0.0", - "resolved": "https://registry.npmjs.org/bc-stubs/-/bc-stubs-108.0.0.tgz", - "integrity": "sha512-b3ko8zl9zn5umYKC7uMQjEtOQxcbAdalUvJ7DoOPyJX4WcsdJFq+R76Rr8bhTtcRq7aW3tk7DtDjTy9awd7CRw==", + "version": "110.0.2", + "resolved": "https://registry.npmjs.org/bc-stubs/-/bc-stubs-110.0.2.tgz", + "integrity": "sha512-kwiLXIZNoI+DaIYLCkUH6glfXZjgpxTbjZeaoITSn7UEfd5dTVLbFrT5nRP74uUHVmySeKSR0dgGWtJFFSexvQ==", "dev": true, "dependencies": { "socket.io-client": "4.6.1" diff --git a/package.json b/package.json index 3039a8a..7e1f770 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "mbchc", - "version": "108.13.1", + "version": "110.13.0", "description": "Mute's Bondage Club Hacks Collection", "author": "Mute", "private": true, "type": "module", "devDependencies": { - "bc-stubs": "^108.0.0", + "bc-stubs": "^110.0.0", "bondage-club-mod-sdk": "^1.2.0", "typescript": "^5.5.2", "xo": "^0.56.0"