VincentVk/foundryvtt-reve-de-dragon
0
0
Fork 0
forked from public/foundryvtt-reve-de-dragon
Code Issues Pull Requests Projects Releases Wiki Activity

Fix parade créatures

Browse Source
This commit is contained in:
Vincent Vandemeulebrouck
2021-01-14 00:35:55 +01:00
parent 23966c1056
commit 0d599d41f9
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/rdd-combat.js
View File

@ -355,7 +355,7 @@ export class RdDCombat {
}
/* -------------------------------------------- */
async attaque(competence, arme) {
async attaque(competence, arme = undefined) {
if (!await this.accorderEntite('avant-attaque')) {
return;
}
@ -535,8 +535,8 @@ export class RdDCombat {
/* -------------------------------------------- */
async parade(attackerRoll, armeParadeId) {
let arme = RdDItemArme.getArmeData(armeParadeId ? this.defender.getOwnedItem(armeParadeId) : null);
let arme = this.defender.getArmeParade(armeParadeId);
console.log("RdDCombat.parade >>>", attackerRoll, armeParadeId, arme);
let rollData = this._prepareParade(attackerRoll, arme);
@ -559,10 +559,11 @@ export class RdDCombat {
dialog.render(true);
}
_prepareParade(attackerRoll, armeParade) {
const compName = armeParade.data.competence;
const armeAttaque = attackerRoll.arme;
let rollData = {
passeArme: attackerRoll.passeArme,
forceValue: this.defender.getForceValue(),
@ -581,15 +582,16 @@ export class RdDCombat {
if (this.defender.isCreature()) {
RdDItemCompetenceCreature.setRollDataCreature(rollData);
}
return rollData;
}
/* -------------------------------------------- */
_getDiviseurSignificative(defenderRoll) {
let facteurSign = 1;
if (defenderRoll.surprise == 'demi'){
if (defenderRoll.surprise == 'demi') {
facteurSign *= 2;
}
}
if (defenderRoll.needParadeSignificative) {
facteurSign *= 2;
}