remove unused code
This commit is contained in:
parent
a68b34c161
commit
3ff3d3f199
@ -218,110 +218,6 @@ export async function requestRollFromTokens(tokens, rollType, rollDesc, options
|
||||
console.log(message);
|
||||
}
|
||||
|
||||
export async function oldRequestRollFromTokens(tokens, rollType, rollDesc, options = {}) {
|
||||
// tokens: list of tokens to request a roll from
|
||||
// rollType: 'attribute' or 'skill
|
||||
// rollDesc: name of attribute or skill
|
||||
// options:
|
||||
// title: title for the roll dialog. Will have "- {{ token name }}"
|
||||
// appended
|
||||
// flavour: flavor text for the roll card. Defaults to title
|
||||
// targetNumber: defaults to 4
|
||||
// mods: list of modifiers {label: "", value: 0, ignore: false}
|
||||
// modCallback: callback function that takes a token and returns a list of
|
||||
// modifiers in the same format as modifiers, above
|
||||
const requestingUser = game.user;
|
||||
const title = options?.title || `${requestingUser.name} requests a ${rollDesc} roll`;
|
||||
const flavour = options?.flavour || options?.flavor || title;
|
||||
const targetNumber = options?.targetNumber || 4;
|
||||
const promises = [];
|
||||
for (const token of tokens) {
|
||||
const owner = firstOwner(token.document);
|
||||
const rollOpts = {
|
||||
title: `${title} - ${token.name}`,
|
||||
targetNumber,
|
||||
flavour,
|
||||
};
|
||||
const additionalMods = [];
|
||||
if ('mods' in options) {
|
||||
for (const mod of options.mods) {
|
||||
additionalMods.push(mod);
|
||||
}
|
||||
}
|
||||
if ('modCallback' in options) {
|
||||
const tokenMods = await options.modCallback(token);
|
||||
for (const tm of tokenMods) {
|
||||
additionalMods.push(tm);
|
||||
}
|
||||
}
|
||||
if (additionalMods.length > 0) {
|
||||
rollOpts.additionalMods = additionalMods;
|
||||
}
|
||||
promises.push(
|
||||
moduleHelpers.socket.executeAsUser(
|
||||
requestTokenRoll,
|
||||
owner.id,
|
||||
token.scene.id,
|
||||
token.id,
|
||||
rollType,
|
||||
rollDesc,
|
||||
rollOpts,
|
||||
),
|
||||
);
|
||||
}
|
||||
const results = (await Promise.allSettled(promises)).map((r) => r.value);
|
||||
const contentExtra = targetNumber === 4 ? '' : ` vs TN: ${targetNumber}`;
|
||||
const messageData = {
|
||||
flavor: flavour,
|
||||
speaker: { alias: 'Requested Roll Results' },
|
||||
whisper: [...ChatMessage.getWhisperRecipients('GM'), requestingUser],
|
||||
content: `<p>Results of ${rollDesc[0].toUpperCase()}${rollDesc.slice(1)} roll${contentExtra}:</p>
|
||||
<table><thead><tr><th>Token</th><th>Roll</th><th>Result</th></tr></thead><tbody>`,
|
||||
};
|
||||
for (const result of results) {
|
||||
const token = game.scenes.get(result.sceneId).tokens.get(result.tokenId);
|
||||
const roll =
|
||||
result.result instanceof CONFIG.Dice.SwadeRoll
|
||||
? result.result
|
||||
: CONFIG.Dice[result.result.class].fromData(result.result);
|
||||
roll.targetNumber = targetNumber;
|
||||
let textResult = '';
|
||||
if (roll.successes === -1) {
|
||||
textResult = 'CRITICAL FAILURE';
|
||||
} else if (roll.successes === 0) {
|
||||
textResult = 'failed';
|
||||
} else if (roll.successes === 1) {
|
||||
textResult = 'success';
|
||||
} else {
|
||||
textResult = `success and ${roll.successes - 1} raise${roll.successes > 2 ? 's' : ''}`;
|
||||
}
|
||||
messageData.content +=
|
||||
'<tr>' +
|
||||
`<th>${token.name}</th>` +
|
||||
`<td>${roll ? roll.total : '<i>Canceled</i>'}</td>` +
|
||||
`<td>${textResult}</td>` +
|
||||
'</tr>';
|
||||
}
|
||||
messageData.content += '</tbody></table>';
|
||||
ChatMessage.create(messageData, {});
|
||||
return results;
|
||||
}
|
||||
|
||||
export async function requestTokenRoll(sceneId, tokenId, rollType, rollDesc, options) {
|
||||
const scene = game.scenes.get(sceneId);
|
||||
const token = scene.tokens.get(tokenId);
|
||||
let rollFunc = 'rollAttribute';
|
||||
let rollId = rollDesc.toLowerCase();
|
||||
if (rollType === 'skill') {
|
||||
rollFunc = 'rollSkill';
|
||||
rollId = token.actor.items
|
||||
.filter((i) => i.type === 'skill')
|
||||
.find((i) => i.system.swid === rollDesc.toLowerCase() || i.name.toLowerCase() === rollDesc.toLowerCase())?.id;
|
||||
}
|
||||
const result = await token.actor[rollFunc](rollId, options);
|
||||
return { sceneId, tokenId, result };
|
||||
}
|
||||
|
||||
function _getSceneToken(sceneId, tokenId) {
|
||||
const scene = game.scenes.get(sceneId);
|
||||
const token = scene.tokens.get(tokenId);
|
||||
|
||||
@ -10,7 +10,6 @@ import {
|
||||
deleteActiveEffectsFromToken,
|
||||
deleteItemsFromActor,
|
||||
deleteToken,
|
||||
requestTokenRoll,
|
||||
SwadeVAEbuttons,
|
||||
updateOwnedToken,
|
||||
helpersRenderChatMessage,
|
||||
@ -66,7 +65,6 @@ Hooks.on('visual-active-effects.createEffectButtons', SwadeVAEbuttons);
|
||||
Hooks.once('socketlib.ready', () => {
|
||||
const _socket = socketlib.registerModule('swade-mb-helpers');
|
||||
_socket.register('updateRequestRollChat', updateRequestRollChat);
|
||||
_socket.register('requestTokenRoll', requestTokenRoll);
|
||||
_socket.register('updateOwnedToken', updateOwnedToken);
|
||||
_socket.register('deleteToken', deleteToken);
|
||||
_socket.register('addActiveEffectsToToken', addActiveEffectsToToken);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user