Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update beyond20.js #1080

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update beyond20.js #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcba3ec
Update beyond20.js
koalana51066 Aug 8, 2023
5d9f5e1
Update beyond20.js
koalana51066 Aug 8, 2023
bef085f
Update encounter.js
koalana51066 Aug 9, 2023
7582be9
Update beyond20.js
koalana51066 Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 96 additions & 35 deletions FVTT-module/beyond20/beyond20.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,32 @@


const moduleName = "beyond20";
class Beyond20 {
static skipTargets = [
"Acrobatics",
"Animal Handling",
"Arcana",
"History",
"Insight",
"Initiative",
"Investigation",
"Medicine",
"Nature",
"Perception",
"Performance",
"Religion",
"Sleight of Hand",
"Stealth",
"Survival",
"Spellcasing",
"Strength Save",
"Dexterity Save",
"Constitution Save",
"Intelligence Save",
"Wisdom Save",
"Charisma Save"
];

static getMyActor() {
return game.actors.find(a => a.isOwner && a.getFlag("beyond20", "user") === game.userId);
return game.actors.find(a => a.isOwner && a.getFlag(moduleName, "user") === game.userId);
}
static async getUpdatedActor(request, items=[]) {
const actorData = await this.createActorData(request, items);
Expand Down Expand Up @@ -202,20 +226,24 @@ class Beyond20 {
let type = "feat";
switch (request.type) {
default:
case 'trait':
case 'action':
case 'feature':
type = 'feat';
itemData = this._getDefaultTemplate('Item', type);
if (request.source) {
itemData.requirements = `${request.source}: ${request['source-type']}`;
}
itemData.requirements = `${request.source}: ${request['source-type']}`;
break;
case 'trait':
type = 'feat';
itemData = this._getDefaultTemplate('Item', type);
break;
case 'item':
type = 'equipment';
itemData = this._getDefaultTemplate('Item', type);
itemData.rarity = request['item-type'];
break;
case 'action':
type = 'feat';
itemData = this._getDefaultTemplate('Item', type);
break;
case 'spell-card':
type = 'spell';
itemData = this._getDefaultTemplate('Item', type);
Expand All @@ -235,7 +263,7 @@ class Beyond20 {
if (!itemData) {
itemData = this._getDefaultTemplate('Item', type);
}
itemData.source = "Beyond20";
itemData.source = moduleName;
itemData.description.value = request.description.replace(/\n/g, "</br>");
return {
system: itemData,
Expand Down Expand Up @@ -474,7 +502,7 @@ class Beyond20 {
static async rollSkill(request) {
const actor = await this.getUpdatedActor(request);
const actorData = actor.system;
const token = this.findToken(request);
const token = this.findToken(request.character.name);

const SKILLS = {
"Acrobatics": "acr",
Expand Down Expand Up @@ -545,7 +573,7 @@ class Beyond20 {
static async rollSavingThrow(request) {
const actor = await this.getUpdatedActor(request);
const actorData = actor.system;
const token = this.findToken(request);
const token = this.findToken(request.character.name);

const abl = request.ability.toLowerCase();
const mod = parseInt(request.modifier)
Expand Down Expand Up @@ -583,7 +611,7 @@ class Beyond20 {

static async rollAbility(request) {
const actor = await this.getUpdatedActor(request);
const token = this.findToken(request);
const token = this.findToken(request.character.name);

const abl = request.ability.toLowerCase();
const mod = parseInt(request.modifier)
Expand Down Expand Up @@ -618,7 +646,7 @@ class Beyond20 {
static async rollItems(request) {
const item = this.createItemData(request);
const actor = await this.getUpdatedActor(request, [item]);
const token = this.findToken(request);
const token = this.findToken(request.character.name);
const actorItem = actor.items.find(i => i.type === item.type && i.name === item.name);

const rollMode = request.whisper === 0 ? "roll" : "gmroll";
Expand All @@ -632,7 +660,7 @@ class Beyond20 {

static handleBeyond20Request(action, request) {
if (action !== "roll") return;
if (!game.settings.get("beyond20", "nativeRolls")) return;
if (!game.settings.get(moduleName, "nativeRolls")) return;
// return false to interrupt the beyond20
switch (request.type) {
case "skill":
Expand All @@ -659,13 +687,38 @@ class Beyond20 {
* Add Chat Damage buttons to Beyond20 chat messages;
*/
static handleChatMessage(message, html, data) {
if (!game.settings.get("beyond20", "damageButtons")) return;
this._addTargets(message, html);
if (!game.settings.get(moduleName, "damageButtons")) return;
const damages = html.find(".beyond20-message .beyond20-roll-damage, .beyond20-message .beyond20-total-damage");
if (damages.length === 0) return;
for (let i = 0; i < damages.length; i++) {
this._addChatDamageButtons(damages.eq(i));
}
}

static _addTargets(message, html) {
if (!game.settings.get(moduleName, "rollTargets") || message.getFlag(moduleName, "hasTargets") || message.type != 5) return;
let title = html.find("img").eq(0).attr("title"); //?.split("(");
if (!this.skipTargets.includes(title)) {
// Find user's targets
let targets = game.user.targets;
if (targets.size > 0) {
const targetsArray = Array.from(targets).map((t) => t.name).reverse();
let targetsDetails = "<div class='beyond20-targets'><details><summary>Target";
if (targetsArray.length > 1) targetsDetails += "s";
targetsDetails += ": " + targetsArray.pop();
if (targetsArray.length > 0) targetsDetails += "...";
targetsDetails += "</summary >" + targetsArray.join(", ");
targetsDetails += "</details></div>";
// Add targets to roll
let msg = html.find(".message-content");
let roll = msg.eq(0).find(".beyond20-roll-result");
roll.eq(0).before($(targetsDetails));
message.update({ content: msg.html(), flags: { beyond20: { hasTargets: true, targets: targets } } });
}
}
}

static _addChatDamageButtons(roll) {
let valueSpan = roll.find(".beyond20-roll-value");
if (valueSpan.length === 0) {
Expand Down Expand Up @@ -733,12 +786,12 @@ class Beyond20CreateNativeActorsApplication extends FormApplication {
if (!game.user.isGM) {
return ui.notifications.error("Only the GM can create actors for Beyond20.");
}
let folder = game.folders.find(f => f.name === "Beyond20" && f.type === "Actor");
let folder = game.folders.find(f => f.name === moduleName && f.type === "Actor");
if (!folder) {
folder = await Folder.create({name: "Beyond20", type: "Actor"});
folder = await Folder.create({name: moduleName, type: "Actor"});
}
for (const user of game.users.contents) {
const actor = game.actors.find(a => a.getFlag("beyond20", "user") === user.id);
const actor = game.actors.find(a => a.getFlag(moduleName, "user") === user.id);
if (!actor) {
await Actor.create({
name: user.name,
Expand All @@ -761,12 +814,12 @@ class Beyond20CreateNativeActorsApplication extends FormApplication {
}
}

Hooks.on('beyond20Request', (action, request) => Beyond20.handleBeyond20Request(action, request))
Hooks.on('beyond20Request', (action, request) => Beyond20.handleBeyond20Request(action, request));
Hooks.on("renderChatMessage", (message, html, data) => Beyond20.handleChatMessage(message, html, data));

Hooks.on('init', function () {
const foundryVersion = game.version || game.data.version;
game.settings.register("beyond20", "notifyAtLoad", {
game.settings.register(moduleName, "notifyAtLoad", {
name: "Notify player to activate Beyond20",
hint: "Beyond20 extension doesn't load automatically for Foundry unless permission is granted. The module can show a notification to remind the player to activate it for the current tab.",
scope: "client",
Expand All @@ -777,15 +830,23 @@ Hooks.on('init', function () {
/**
* Inspired by chatdamagebuttons-beyond20 module by Victor Ling: https://gitlab.com/Ionshard/foundry-vtt-chatdamagebuttons-beyond20/
*/
game.settings.register("beyond20", "damageButtons", {
game.settings.register(moduleName, "damageButtons", {
name: "Add chat damage buttons",
hint: "Adds chat damage buttons to rolls to more easily apply damage or healing to tokens",
scope: "client",
config: true,
default: true,
type: Boolean
});
game.settings.register("beyond20", "nativeRolls", {
game.settings.register(moduleName, "rollTargets", {
name: "Add roll targets",
hint: "Adds targets to rolls. Targets are determined by user or by token if no user targets are selected and target tracking is activated.",
scope: "client",
config: true,
default: true,
type: Boolean
});
game.settings.register(moduleName, "nativeRolls", {
name: "Use Foundry native rolls (EXPERIMENTAL)",
hint: "If enabled, will use Foundry native rolls instead of the Beyond20 roll renderer. Cannot work when D&D Beyond Digital Dice are enabled. All Beyond20 features may not be supported.",
scope: "client",
Expand All @@ -796,16 +857,16 @@ Hooks.on('init', function () {
if (!v) return;
if (!isNewerVersion(foundryVersion, "10")) {
ui.notifications.warn(`Cannot enable Beyond20 native rolls on Foundry VTT v${foundryVersion}. Please upgrade to version 10 or newer.`);
return game.settings.set("beyond20", "nativeRolls", false);
return game.settings.set(moduleName, "nativeRolls", false);
}
if (Actor.canUserCreate(game.user)) return true;
if (!Beyond20.getMyActor()) {
ui.notifications.warn(`Cannot enable Beyond20 native rolls because native actor doesn't exist. Please ask your GM to create the actors from the Beyond20 module settings.`, {permanent: true});
return game.settings.set("beyond20", "nativeRolls", false);
return game.settings.set(moduleName, "nativeRolls", false);
}
}
});
game.settings.registerMenu("beyond20", "createNativeActors", {
game.settings.registerMenu(moduleName, "createNativeActors", {
name: "Create native rolls Actors",
label: "Create Actors", // The text label used in the button
hint: "Creates a Beyond20 native rolls actor for each user (if one doesn't exist), allowing them to use the native rolls feature.",
Expand All @@ -817,18 +878,18 @@ Hooks.on('init', function () {

Hooks.on('ready', function () {
const foundryVersion = game.version || game.data.version;
if (game.settings.get("beyond20", "nativeRolls") && !Actor.canUserCreate(game.user)) {
if (game.settings.get(moduleName, "nativeRolls") && !Actor.canUserCreate(game.user)) {
if (!Beyond20.getMyActor()) {
ui.notifications.warn(`Cannot enable Beyond20 native rolls because native actor doesn't exist. Please ask your GM to create the actors from the Beyond20 module settings.`, {permanent: true});
game.settings.set("beyond20", "nativeRolls", false);
ui.notifications.warn(`Cannot enable Beyond20 native rolls because native actor doesn't exist. Please ask your GM to create the actors from the Beyond20 module settings.`, { permanent: true });
game.settings.set(moduleName, "nativeRolls", false);
}
}
// Disable native rolls if Foundry is pre v10
if (game.settings.get("beyond20", "nativeRolls") && !isNewerVersion(foundryVersion, "10")) {
ui.notifications.warn(`Disabled Beyond20 native rolls feature as it is incompatible with Foundry VTT v${foundryVersion}. Please upgrade to version 10 or newer.`, {permanent: true});
game.settings.set("beyond20", "nativeRolls", false);
if (game.settings.get(moduleName, "nativeRolls") && !isNewerVersion(foundryVersion, "10")) {
ui.notifications.warn(`Disabled Beyond20 native rolls feature as it is incompatible with Foundry VTT v${foundryVersion}. Please upgrade to version 10 or newer.`, { permanent: true });
game.settings.set(moduleName, "nativeRolls", false);
}
if (game.settings.get("beyond20", "notifyAtLoad") && !game.beyond20) {
if (game.settings.get(moduleName, "notifyAtLoad") && !game.beyond20) {
dialog = new Dialog({
title: `Beyond20`,
content: "<p>Beyond20 does not load automatically for FVTT games on custom domains.</p>" +
Expand All @@ -842,7 +903,7 @@ Hooks.on('ready', function () {
icon: '<i class="fas fa-times"></i>',
label: "Dismiss",
callback: html => {
game.settings.set("beyond20", "notifyAtLoad", !html.find("input[name=dontaskagain]")[0].checked);
game.settings.set(moduleName, "notifyAtLoad", !html.find("input[name=dontaskagain]")[0].checked);
dialog = null;
}
}
Expand All @@ -859,5 +920,5 @@ Hooks.on('ready', function () {
}
}
setTimeout(cb, 500)
}
})
}
});
4 changes: 4 additions & 0 deletions src/dndbeyond/content-scripts/encounter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ function documentModified(mutations, observer) {
removeRollButtons();
character = new Monster("Monster", null, settings);
character.parseStatBlock(monster);
const activeCombatant = $(".is-turn").find(".combatant-summary__name").text();
if (activeCombatant && (activeCombatant.includes(monster_name))) {
character._name = activeCombatant;
}
}
const customRoll = DigitalDiceManager.updateNotifications();
if (customRoll && settings['use-digital-dice']) {
Expand Down