public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 186 Wiki Activity

Fix armes 2m dans l'onglet Combat

Browse Source 
Les armes 1 ou 2 mains n'étaient pas bien choisies dans l'onglet
combat de la feuille de personnage.

Un message d'erreur pour les dommages 1/2 mains était faux
depuis cet onglet
This commit is contained in:
Vincent Vandemeulebrouck
2021-11-20 01:19:29 +01:00
parent f91dfd04a2
commit a2f859a460
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module/actor-sheet.js
View File

@ -344,24 +344,16 @@ export class RdDActorSheet extends ActorSheet {
// Roll Weapon1
html.find('.arme-label a').click(async event => {
let armeName = event.currentTarget.text;
let compName = event.currentTarget.attributes['data-competence-name'].value;
let arme = this.actor.data.items.find(it =>
it.name == armeName &&
RdDItemArme.isArme(it) &&
((compName || it.data.data.competence) == it.data.data.competence)
);
if (!arme) {
arme = { name: armeName, data: { competence: compName } };
}
const li = $(event.currentTarget).parents(".item");
let arme = this._getArmeCombat(li);
this.actor.rollArme( duplicate(arme) );
});
// Initiative pour l'arme
html.find('.arme-initiative a').click(async event => {
let combatant = game.combat.data.combatants.find(c => c.actor.data._id == this.actor.data._id);
if (combatant) {
let armeName = event.currentTarget.attributes['data-arme-name'].value;
let arme = this.armesList.find(a => a.name == armeName);
const li = $(event.currentTarget).parents(".item");
let arme = this._getArmeCombat(li);
RdDCombatManager.rollInitiativeCompetence(combatant._id, arme);
} else {
ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
@ -543,6 +535,16 @@ export class RdDActorSheet extends ActorSheet {
}
_getArmeCombat(li) {
let armeName = li.data("arme-name");
let compName = li.data('competence-name');
const arme = this.armesList.find(a => a.name == armeName && a.data.competence == compName);
if (!arme) {
return { name: armeName, data: { competence: compName } };
}
return arme;
}
/* -------------------------------------------- */
/** @override */
setPosition(options = {}) {