DjLeChuck/bol
0
0
Fork 0
forked from public/bol
Code Pull Requests Activity

Fix hotbar + tooltip

Browse Source
This commit is contained in:
sladecraven 2022-09-25 21:13:15 +02:00
parent a1c20019e8
commit a7991bce92
5 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
module/system/bol-hotbar.js
View File

@ -2,19 +2,8 @@ import { BoLRoll } from "../controllers/bol-rolls.js";
export class BoLHotbar {
/**
* Create a macro when dropping an entity on the hotbar
* Item - open roll dialog for item
* Actor - open actor sheet
* Journal - open journal sheet
*/
static init( ) {
Hooks.on("hotbarDrop", async (bar, documentData, slot) => {
// Create item macro if rollable item - weapon, spell, prayer, trait, or skill
if (documentData.type == "Item") {
console.log("Drop done !!!", bar, documentData, slot)
let item = documentData.data
static async assignToHotBar( item, slot) {
let command = `game.bol.BoLHotbar.rollMacro("${item.name}", "${item.type}");`
let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command))
if (!macro) {
@ -25,40 +14,31 @@ export class BoLHotbar {
command: command
}, { displaySheet: false })
}
game.user.assignHotbarMacro(macro, slot);
await game.user.assignHotbarMacro(macro, slot);
}
// Create a macro to open the actor sheet of the actor dropped on the hotbar
else if (documentData.type == "Actor") {
let actor = game.actors.get(documentData.id);
let command = `game.actors.get("${documentData.id}").sheet.render(true)`
let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
if (!macro) {
macro = await Macro.create({
name: actor.data.name,
type: "script",
img: actor.data.img,
command: command
}, { displaySheet: false })
game.user.assignHotbarMacro(macro, slot);
/**
* Create a macro when dropping an entity on the hotbar
* Item - open roll dialog for item
* Actor - open actor sheet
* Journal - open journal sheet
*/
static init( ) {
Hooks.on("hotbarDrop", (bar, documentData, slot) => {
// Create item macro if rollable item - weapon, spell, prayer, trait, or skill
if (documentData.type == "Item") {
let item = fromUuidSync(documentData.uuid)
if (item == undefined) {
item = this.actor.items.get(documentData.uuid)
}
if (item && (item.system.subtype === "weapon" || item.system.category === "spell")) {
this.assignToHotBar( item, slot )
return false
}
}
// Create a macro to open the journal sheet of the journal dropped on the hotbar
else if (documentData.type == "JournalEntry") {
let journal = game.journal.get(documentData.id);
let command = `game.journal.get("${documentData.id}").sheet.render(true)`
let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command));
if (!macro) {
macro = await Macro.create({
name: journal.data.name,
type: "script",
img: "systems/bol/icons/images/icone_parchement_vierge.webp",
command: command
}, { displaySheet: false })
game.user.assignHotbarMacro(macro, slot);
}
}
return false;
});
return true
})
}
/** Roll macro */
@ -76,10 +56,10 @@ export class BoLHotbar {
return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`)
}
// Trigger the item roll
if (item.data.data.category === "equipment" && item.data.data.subtype === "weapon") {
if (item.system.category === "equipment" && item.system.subtype === "weapon") {
return BoLRoll.weaponCheckWithWeapon( actor, item)
}
if (item.data.data.category === "spell") {
if (item.system.category === "spell") {
return BoLRoll.spellCheckWithSpell( actor, item)
}
}

2
templates/dialogs/boons-roll-part.hbs
View File

@ -1,6 +1,6 @@
{{#if (count boons)}}
<div class="flexrow roll-box" >
<div class="flex1 center bg-darkred">
<div class="flex1 center bg-darkred" data-tooltip-direction="LEFT" data-tooltip="Click-gauche pour sélectionner, CTRL+Click gauche pour déselectionner">
<label for="mod">{{localize 'BOL.ui.boons'}}</label>
</div>
<div class="flex1 center cell">

2
templates/dialogs/career-roll-part.hbs
View File

@ -1,6 +1,6 @@
{{#if careers}}
<div class="flexrow roll-box">
<div class="flex1 center bg-darkred">
<div class="flex1 center bg-darkred" data-tooltip-direction="LEFT" data-tooltip="Click-gauche pour selectionner, CTRL+Click gauche pour déselectionner">
<label for="mod">{{localize 'BOL.ui.careers'}}</label>
</div>
<div class="flex1 center cell">

2
templates/dialogs/flaws-roll-part.hbs
View File

@ -1,6 +1,6 @@
{{#if (count flaws)}}
<div class="flexrow roll-box">
<div class="flex1 center bg-darkred">
<div class="flex1 center bg-darkred" data-tooltip-direction="LEFT" data-tooltip="Click-gauche pour selectionner, CTRL+Click gauche pour déselectionner">
<label for="mod">{{localize 'BOL.ui.flaws'}}</label>
</div>
<div class="flex1 center cell">