Merge branch 'master-fix-187' into 'master'

Fix: recul sur encaissement créature #187

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!213
This commit is contained in:
Leratier Bretonnien 2021-04-25 22:06:21 +00:00
commit 40f99da8ac
2 changed files with 2 additions and 1 deletions

View File

@ -25,6 +25,7 @@ export class RdDItemCompetenceCreature extends Item {
competence: arme.name,
resistance: 100,
equipe: true,
dommagesReels: arme.data.dommages,
penetration: 0,
force: 0,
rapide: true

View File

@ -1185,7 +1185,7 @@ export class RdDCombat {
_computeImpactRecul(attaque) {
const taille = this.defender.getTaille();
const force = this.attacker.getForce();
const dommages = attaque.arme.data.dommagesReels;
const dommages = attaque.arme.data.dommagesReels ?? attaque.arme.data.dommages;
return taille - (force + dommages);
}