Merge branch 'master' into 'fix-recul-desarme'

# Conflicts:
#   module/rdd-combat.js
This commit is contained in:
Vincent Vandemeulebrouck 2021-01-23 18:07:27 +00:00
commit 5b4c172af2
2 changed files with 4 additions and 4 deletions

View File

@ -2350,7 +2350,7 @@ export class RdDActor extends Actor {
} }
} }
count = encaissement.critique; count = encaissement.critiques;
while (count > 0) { while (count > 0) {
let critique = blessures.critiques.liste[0]; let critique = blessures.critiques.liste[0];
if (!critique.active) { if (!critique.active) {
@ -2358,8 +2358,8 @@ export class RdDActor extends Actor {
count--; count--;
} else { } else {
// TODO: status effect dead // TODO: status effect dead
ChatMessage.create({ content: `<strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>` }); ChatMessage.create({ content: `<strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>` });
encaissement.critique -= count; encaissement.critiques -= count;
break; break;
} }
} }

View File

@ -2,7 +2,7 @@
"name": "foundryvtt-reve-de-dragon", "name": "foundryvtt-reve-de-dragon",
"title": "Rêve de Dragon", "title": "Rêve de Dragon",
"description": "Rêve de Dragon RPG for FoundryVTT", "description": "Rêve de Dragon RPG for FoundryVTT",
"version": "1.2.35", "version": "1.2.37",
"manifestPlusVersion": "1.0.0", "manifestPlusVersion": "1.0.0",
"minimumCoreVersion": "0.7.5", "minimumCoreVersion": "0.7.5",
"compatibleCoreVersion": "0.7.8", "compatibleCoreVersion": "0.7.8",