Etant donné son ${action.name}, son initative pour ce premier round est désormais de ${initData.init}.
@@ -754,7 +754,7 @@ export class RdDCombat {
/* -------------------------------------------- */
_prepareAttaque(competence, arme) {
let rollData = {
- alias: this.attackerToken.name,
+ alias: this.attacker?.getAlias(),
passeArme: foundry.utils.randomID(16),
mortalite: arme?.system.mortalite,
competence: competence,
@@ -803,10 +803,10 @@ export class RdDCombat {
}
const choixParticuliere = await ChatMessage.create({
- alias: this.attacker.name,
+ alias: this.attacker.getAlias(),
whisper: ChatUtility.getOwners(this.attacker),
content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-particuliere.html', {
- alias: this.attackerToken.name,
+ alias: this.attacker.getAlias(),
attackerId: this.attackerId,
attackerToken: this.attackerToken,
defenderToken: this.defenderToken,
@@ -826,7 +826,7 @@ export class RdDCombat {
attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker, this.defender.isEntite());
let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
attackerRoll.show = {
- cible: this.defenderToken?.name ?? 'la cible',
+ cible: this.defender?.getAlias() ?? 'la cible',
isRecul: (attackerRoll.particuliere == 'force' || attackerRoll.tactique == 'charge')
}
await RdDResolutionTable.displayRollData(attackerRoll, this.attacker, 'chat-resultat-attaque.html');
@@ -892,7 +892,7 @@ export class RdDCombat {
const choixDefense = await ChatMessage.create({
// message privé: du défenseur à lui même (et aux GMs)
speaker: ChatMessage.getSpeaker(this.defender, canvas.tokens.get(this.defenderTokenId)),
- alias: this.attackerToken.name,
+ alias: this.attacker?.getAlias(),
whisper: ChatUtility.getOwners(this.defender),
content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.html', paramDemandeDefense),
});
@@ -1015,7 +1015,7 @@ export class RdDCombat {
/* -------------------------------------------- */
_prepareParade(attackerRoll, armeParade, competenceParade) {
let defenderRoll = {
- alias: this.defenderToken?.name,
+ alias: this.defender?.getAlias(),
passeArme: attackerRoll.passeArme,
diffLibre: attackerRoll.diffLibre,
attackerToken: this.attackerToken,
@@ -1072,7 +1072,7 @@ export class RdDCombat {
async esquive(attackerRoll, compId, compName) {
const esquive = this.defender.getCompetence(compId) ?? this.defender.getCompetence(compName)
if (esquive == undefined) {
- ui.notifications.error(this.defender.name + " n'a pas de compétence " + compName);
+ ui.notifications.error(this.defender.getAlias() + " n'a pas de compétence " + compName);
return;
}
console.log("RdDCombat.esquive >>>", attackerRoll, esquive);
@@ -1099,7 +1099,7 @@ export class RdDCombat {
/* -------------------------------------------- */
_prepareEsquive(attackerRoll, competence) {
let rollData = {
- alias: this.defenderToken?.name,
+ alias: this.defender.getAlias(),
passeArme: attackerRoll.passeArme,
diffLibre: attackerRoll.diffLibre,
attackerToken: this.attackerToken,
@@ -1278,9 +1278,10 @@ export class RdDCombat {
if (!actor?.isActorCombat()) {
return
}
+ const alias = token?.name ?? actor.getAlias();
const formData = {
combatId: combat._id,
- alias: token.name ?? actor.name,
+ alias: alias,
etatGeneral: actor.getEtatGeneral(),
isSonne: actor.isSonne(),
blessuresStatus: actor.computeResumeBlessure(),
@@ -1293,12 +1294,12 @@ export class RdDCombat {
}
await ChatMessage.create({
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-acteur.hbs`, formData),
- alias: token.name ?? actor.name
+ alias: alias
})
await ChatMessage.create({
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-sante.hbs`, formData),
whisper: ChatUtility.getOwners(actor),
- alias: token.name ?? actor.name
+ alias: alias
})
}
}
\ No newline at end of file
diff --git a/module/rdd-roll.js b/module/rdd-roll.js
index 5613e322..296e9ca1 100644
--- a/module/rdd-roll.js
+++ b/module/rdd-roll.js
@@ -32,7 +32,7 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */
static _setDefaultOptions(actor, rollData) {
let defaultRollData = {
- alias: actor.name,
+ alias: actor.getAlias(),
ajustementsConditions: CONFIG.RDD.ajustementsConditions,
difficultesLibres: CONFIG.RDD.difficultesLibres,
etat: actor.getEtatGeneral(),
@@ -345,24 +345,25 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */
_getTitle(rollData) {
+ const alias = rollData.alias
const carac = rollData.selectedCarac.label;
if (!rollData.competence) {
- return carac;
+ return `${alias}: ${carac}`
}
const compName = rollData.competence.name;
const niveau = Misc.toSignedString(rollData.competence.system.niveau)
if (compName == carac) {
// cas des créatures
- return `${carac} Niveau ${niveau}`
+ return `${alias}: ${carac} Niveau ${niveau}`
}
if (rollData.draconicList && rollData.selectedSort) {
// cas de lancer de sort
- return `${rollData.competence.name} Niveau ${niveau} ${rollData.selectedSort.name}`
+ return `${alias}: ${rollData.competence.name} Niveau ${niveau} ${rollData.selectedSort.name}`
}
if (rollData.arme && rollData.arme.name != compName) {
// ajouter l'arme au titre si son nom n'est pas la compétence
- return `${carac} / ${compName} (${rollData.arme.name}) Niveau ${niveau}`
+ return `${alias}: ${carac} / ${compName} (${rollData.arme.name}) Niveau ${niveau}`
}
- return `${carac} / ${compName} Niveau ${niveau}`
+ return `${alias}: ${carac} / ${compName} Niveau ${niveau}`
}
}
diff --git a/module/rdd-rolltables.js b/module/rdd-rolltables.js
index d47d270a..a80e94d5 100644
--- a/module/rdd-rolltables.js
+++ b/module/rdd-rolltables.js
@@ -1,4 +1,3 @@
-import { Grammar } from "./grammar.js";
import { CompendiumTable, CompendiumTableHelpers, SystemCompendiums } from "./settings/system-compendiums.js";
export class RdDRollTables {
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index a80eaba3..7389b9ad 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -460,7 +460,7 @@ export class RdDTMRDialog extends Dialog {
let rencontreData = {
actor: this.actor,
- alias: this.actor.name,
+ alias: this.actor.getAlias(),
reveDepart: this.actor.getReveActuel(),
competence: this.actor.getBestDraconic(),
rencontre: this.currentRencontre,
@@ -641,7 +641,7 @@ export class RdDTMRDialog extends Dialog {
// simuler une rencontre
let rencontreData = {
actor: this.actor,
- alias: this.actor.name,
+ alias: this.actor.getAlias(),
reveDepart: this.actor.getReveActuel(),
competence: this.actor.getBestDraconic(),
rencontre: this.currentRencontre,
@@ -1098,7 +1098,10 @@ export class RdDTMRDialog extends Dialog {
if (!this.viewOnly && this.actor.isResonanceSigneDraconique(coord)) {
ChatMessage.create({
whisper: ChatUtility.getOwners(this.actor),
- content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-resonance.html`, { alias: this.actor.name, typeTMR: TMRUtility.getTMRType(coord) })
+ content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-resonance.html`, {
+ alias: this.actor.getAlias(),
+ typeTMR: TMRUtility.getTMRType(coord)
+ })
});
}
}
diff --git a/templates/actor/export-scriptarium/actor-encart-sheet.hbs b/templates/actor/export-scriptarium/actor-encart-sheet.hbs
index 1368d560..b98f27e9 100644
--- a/templates/actor/export-scriptarium/actor-encart-sheet.hbs
+++ b/templates/actor/export-scriptarium/actor-encart-sheet.hbs
@@ -89,11 +89,12 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs" competences=competences}}
+ {{#if system.attributs.hautrevant.value}}
{{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs" competences=draconic }}
-
+
{{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/sort.hbs" voie=export.sort_voie_0.value description=export.sort_description_0.value bonus=export.sort_bonus_0.value}}
{{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/sort.hbs" voie=export.sort_voie_1.value description=export.sort_description_1.value bonus=export.sort_bonus_1.value}}
@@ -128,5 +129,6 @@
+ {{/if}}
\ No newline at end of file
diff --git a/templates/dialog-roll-alchimie.html b/templates/dialog-roll-alchimie.html
index 91733581..e313e218 100644
--- a/templates/dialog-roll-alchimie.html
+++ b/templates/dialog-roll-alchimie.html
@@ -1,5 +1,5 @@
- ${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !`
+ ${this.getAlias()} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !`
});
}
return blessure;
@@ -218,7 +218,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
async jetDeVie() {
if (this.isDead()) {
ChatMessage.create({
- content: `Jet de Vie: ${this.name} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`,
+ content: `Jet de Vie: ${this.getAlias()} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`,
whisper: ChatUtility.getOwners(this)
})
return
@@ -242,7 +242,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
await this.santeIncDec("vie", -perte);
}
if (this.isDead()) {
- msgText += `