forked from public/foundryvtt-reve-de-dragon
Utilisation nullish / chaining
Simplifie certaines expressions complexes avec operateur ternaire - Nullish coalescing operator (??) - Relationship with the optional chaining operator (?.) - Math.min / Math.max / Math.ceil
This commit is contained in:
@ -18,12 +18,12 @@ export class RdDCombat {
|
||||
static createUsingTarget(attacker) {
|
||||
const target = RdDCombat.getTarget();
|
||||
if (target == undefined) {
|
||||
ui.notifications.warn((game.user.targets && game.user.targets.size > 1)
|
||||
ui.notifications.warn( (game.user.targets?.size ??0) > 1
|
||||
? "Vous devez choisir <strong>une seule</strong> cible à attaquer!"
|
||||
: "Vous devez choisir une cible à attaquer!");
|
||||
}
|
||||
const defender = target ? target.actor : undefined;
|
||||
const defenderTokenId = target ? target.data._id : undefined;
|
||||
const defender = target?.actor;
|
||||
const defenderTokenId = target?.data._id;
|
||||
return this.create(attacker, defender, defenderTokenId, target)
|
||||
}
|
||||
|
||||
@ -68,8 +68,8 @@ export class RdDCombat {
|
||||
// envoyer le message au destinataire
|
||||
if (!game.user.isGM || recipient.hasPlayerOwner) {
|
||||
let data = {
|
||||
attackerId: sender ? sender.data._id : undefined,
|
||||
defenderId: recipient ? recipient.data._id : undefined,
|
||||
attackerId: sender?.data._id,
|
||||
defenderId: recipient?.data._id,
|
||||
defenderTokenId: defenderTokenId,
|
||||
rollData: duplicate(rollData),
|
||||
rollMode: true
|
||||
@ -128,7 +128,7 @@ export class RdDCombat {
|
||||
case '#particuliere-attaque': return await this.choixParticuliere(rollData, event.currentTarget.attributes['data-mode'].value);
|
||||
case '#parer-button': {
|
||||
const armeId = event.currentTarget.attributes['data-armeid'];
|
||||
return this.parade(rollData, armeId ? armeId.value : undefined);
|
||||
return this.parade(rollData, armeId?.value);
|
||||
}
|
||||
case '#esquiver-button': return this.esquive(rollData);
|
||||
case '#encaisser-button': return this.encaisser(rollData, event.currentTarget.attributes['data-defenderTokenId'].value);
|
||||
@ -182,7 +182,7 @@ export class RdDCombat {
|
||||
options: { height: 540 }
|
||||
}, {
|
||||
name: 'jet-attaque',
|
||||
label: 'Attaque: ' + (arme ? arme.name : competence.name),
|
||||
label: 'Attaque: ' + (arme?.name ?? competence.name),
|
||||
callbacks: [
|
||||
this.attacker.createCallbackExperience(),
|
||||
{ condition: r => (RdDCombat.isReussite(r) && !RdDCombat.isParticuliere(r)), action: r => this._onAttaqueNormale(r) },
|
||||
|
Reference in New Issue
Block a user