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

Fix jets encaissements faits par le défenseur

Browse Source 
=> Les dés sont ceux du défenseur
=> Le message d'encaissement est visible par le joueur
This commit is contained in:
Vincent Vandemeulebrouck
2022-01-29 18:49:06 +01:00
parent 67b4070c27
commit c0b5bb3f35
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/rdd-combat.js
View File

@ -544,16 +544,15 @@ export class RdDCombat {
/* -------------------------------------------- */
static onMsgEncaisser(data) {
if (Misc.isUniqueConnectedGM()) {
let defender = canvas.tokens.get(data.defenderTokenId).actor;
if (Misc.isOwnerPlayerOrUniqueConnectedGM()) {
let attackerRoll = RdDCombat._getAttaque(data.attackerId); // Retrieve the rolldata from the store
let attacker = data.attackerId ? game.actors.get(data.attackerId) : null;
let defender = canvas.tokens.get(data.defenderTokenId).actor;
defender.encaisserDommages(attackerRoll, attacker);
RdDCombat._deleteDefense(attackerRoll.passeArme);
RdDCombat._deleteAttaque(data.attackerId);
}
}
/* -------------------------------------------- */
@ -917,11 +916,11 @@ export class RdDCombat {
dmg: attackerRoll.dmg,
};
if (!Misc.isUniqueConnectedGM()) {
this._socketSendMessageDefense(paramChatDefense, defenderRoll);
if (Misc.isUniqueConnectedGM()) {
await this._chatMessageDefense(paramChatDefense);
}
else {
await this._chatMessageDefense(paramChatDefense);
this._socketSendMessageDefense(paramChatDefense, defenderRoll);
}
}
@ -1295,7 +1294,7 @@ export class RdDCombat {
this._onEchecTotal(defenderRoll);
}
if (Misc.isUniqueConnectedGM()) {
if (Misc.isOwnerPlayerOrUniqueConnectedGM(this.defender)) {
attackerRoll.attackerId = this.attackerId;
attackerRoll.defenderTokenId = defenderTokenId;