Migration à Foundry v11/v12 + changes requests
This commit is contained in:
@@ -22,24 +22,24 @@ export class VadentisTokenHud {
|
||||
|
||||
let token = canvas.tokens.get(tokenId);
|
||||
let actor = token.actor;
|
||||
let combatant = game.combat.data.combatants.find(c => c.tokenId == token.data._id);
|
||||
//let combatant = game.combat.combatants.find(c => c.tokenId == token._id);
|
||||
app.hasExtension = true;
|
||||
|
||||
let armesList = combatant.actor.getArmes() ;
|
||||
let sortsList = combatant.actor.getSorts().concat( combatant.actor.getDevotions() );
|
||||
const hudData = { combatant: combatant, armes: armesList, sorts: sortsList }
|
||||
let armesList = actor.getArmes() ;
|
||||
let sortsList = actor.getSorts().concat( actor.getDevotions() );
|
||||
const hudData = { actor: actor, armes: armesList, sorts: sortsList }
|
||||
|
||||
// sort
|
||||
await VadentisTokenHud._configureSubMenu(html.find('.control-icon.combat'), 'systems/foundryvtt-vadentis/templates/hud-actor-sort.html', hudData,
|
||||
await VadentisTokenHud._configureSubMenu(html.find('.control-icon[data-action=combat]'), 'systems/foundryvtt-vadentis/templates/hud-actor-sort.html', hudData,
|
||||
(event) => {
|
||||
let combatantId = event.currentTarget.attributes['data-combatant-id'].value;
|
||||
const combatant = game.combat.getCombatant(combatantId);
|
||||
let actorId = event.currentTarget.attributes['data-actor-id'].value;
|
||||
const actor = game.actors.get(actorId);
|
||||
let sortId = event.currentTarget.attributes['data-sort-id'].value;
|
||||
combatant.actor.rollSortOuDevotion( sortId );
|
||||
actor.rollSortOuDevotion( sortId );
|
||||
});
|
||||
|
||||
// combat
|
||||
await VadentisTokenHud._configureSubMenu(html.find('.control-icon.target'), 'systems/foundryvtt-vadentis/templates/hud-actor-attaque.html', hudData,
|
||||
await VadentisTokenHud._configureSubMenu(html.find('.control-icon[data-action=target]'), 'systems/foundryvtt-vadentis/templates/hud-actor-attaque.html', hudData,
|
||||
(event) => {
|
||||
let armeId = event.currentTarget.attributes['data-arme-id'].value;
|
||||
actor.rollArme(armeId);
|
||||
@@ -49,7 +49,7 @@ export class VadentisTokenHud {
|
||||
/* -------------------------------------------- */
|
||||
static async addTokenHudExtensions(app, html, tokenId) {
|
||||
|
||||
html.find('.control-icon.combat').click(event => {
|
||||
html.find('.control-icon[data-action=combat]').click(event => {
|
||||
if ( event.currentTarget.className.includes('active')) {
|
||||
VadentisTokenHud.removeExtensionHud( app, html, tokenId);
|
||||
} else {
|
||||
@@ -57,9 +57,9 @@ export class VadentisTokenHud {
|
||||
}
|
||||
} );
|
||||
|
||||
let combatIcon = html.find('.control-icon.combat');
|
||||
let combatIcon = html.find('.control-icon[data-action=combat]');
|
||||
//console.log("COMBAT ICON", combatIcon)
|
||||
if ( combatIcon[0] && combatIcon[0].className.includes('active') ) {
|
||||
if ( combatIcon[0]?.className.includes('active') ) {
|
||||
VadentisTokenHud.addExtensionHud( app, html, tokenId);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user