.gitea/workflows/release.yaml

@@ -1,63 +0,0 @@
-name: Release Creation
-
-on: 
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."
-    
-    #- uses: actions/checkout@v3
-    - uses: RouxAntoine/checkout@v3.5.4
-
-    # get part of the tag after the `v`
-    - name: Extract tag version number
-      id: get_version
-      uses: battila7/get-version-action@v2
-
-    # Substitute the Manifest and Download URLs in the module.json
-    - name: Substitute Manifest and Download Links For Versioned Ones
-      id: sub_manifest_link_version
-      uses: microsoft/variable-substitution@v1
-      with:
-        files: 'system.json'
-      env:
-        version: ${{steps.get_version.outputs.version-without-v}}
-        url: https://www.uberwald.me/gitea/${{gitea.repository}}
-        manifest: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download//${{github.event.release.tag_name}}/system.json
-        download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/foundryvtt-reve-de-dragon-${{github.event.release.tag_name}}.zip
-    
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '18'  # Use the node version your project requires
-
-    - name: Install dependencies
-      run: npm install
-      
-    - name: Build the compendiums
-      run: node ./tools/packCompendiumsToDist.mjs
-
-    # Create a zip file with all files required by the module to add to the release
-    - run: |
-         apt update -y
-         apt install -y zip
-
-    - run: zip -r ./foundryvtt-reve-de-dragon-${{github.event.release.tag_name}}.zip system.json template.json README.md LICENSE.txt assets/ fonts/ icons lang/ module/ packs/ pic/ sounds/ styles/ templates/ 
-    
-    - name: setup go
-      uses: actions/setup-go@v3
-      with:
-        go-version: '>=1.20.1'
-    
-    - name: Use Go Action  
-      id: use-go-action
-      uses: https://gitea.com/actions/release-action@main
-      with:
-        files: |-
-          ./foundryvtt-reve-de-dragon-${{github.event.release.tag_name}}.zip  
-          system.json
-        api_key: '${{secrets.ALLOW_PUSH_RELEASE}}'

changelog.md

@@ -1,17 +1,4 @@
 # 12.0
-## 12.0.21 - La nomination d'Astrobazzarh
-- Les noms pour les messages dans le tchat sont maintenant ceux des tokens plutôt que ceux des acteurs
-- Fix: le choix des effets dans les options s'affiche correctement
-
-## 12.0.20 - Le tableau d'Astrobazzarh
-- Ecran d'accueil officiel Scriptarium
-
-## 12.0.19 - La témérité d'Astrobazzarh
-- Fix
-  - les défenses des créatures sont correctement filtrées
-  - le lancer d'initiative pour tous les personnages/PNJs fonctionne correctement
-  - les lieux et commerces n'ont pas d'initiative
-
 ## 12.0.18 - A la barbe d'Astrobazzarh
 - Améliorations sur la feuille de PNJ simplifiée
   - Ajout du portrait

module/actor.js

@@ -36,8 +36,6 @@ import { ITEM_TYPES } from "./item.js";
 import { RdDBaseActorSang } from "./actor/base-actor-sang.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";
 import { DialogChoixXpCarac } from "./dialog-choix-xp-carac.js";
-import { RdDItemArme } from "./item-arme.js";
-import { RdDCombatManager } from "./rdd-combat.js";
 
 export const MAINS_DIRECTRICES = ['Droitier', 'Gaucher', 'Ambidextre']
 
@@ -132,23 +130,6 @@ export class RdDActor extends RdDBaseActorSang {
       .reduce(Misc.sum(), 0);
   }
 
-  listActionsCombat() {
-    // Recupération des armes
-    const actions = RdDCombatManager.listActionsArmes(
-      this.itemTypes[ITEM_TYPES.arme]
-        .filter(it => RdDItemArme.isAttaque(it))
-        .concat(RdDItemArme.empoignade(this))
-        .concat(RdDItemArme.mainsNues(this))
-      ,
-      this.itemTypes[ITEM_TYPES.competence],
-      this.system.carac)
-
-    if (this.system.attributs.hautrevant.value) {
-      actions.push({ name: "Draconic", action: 'haut-reve', system: { initOnly: true, competence: "Draconic" } });
-    }
-    return actions
-  }
-
   /* -------------------------------------------- */
   getTache(id) { return this.findItemLike(id, 'tache') }
   getMeditation(id) { return this.findItemLike(id, 'meditation') }
@@ -181,7 +162,7 @@ export class RdDActor extends RdDBaseActorSang {
         whisper: ChatUtility.getOwners(this),
         content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-potionenchantee-chateaudormant.html`, {
           pr: nouveauReve,
-          alias: this.getAlias(),
+          alias: this.name,
           potionName: it.name,
           potionImg: it.img
         })
@@ -1341,7 +1322,7 @@ export class RdDActor extends RdDBaseActorSang {
     const etat = this.getEtatGeneral({ ethylisme: true });
     const nbDoses = Number(this.system.compteurs.ethylisme.nb_doses || 0);
     const ethylismeData = {
-      alias: this.getAlias(),
+      alias: this.name,
       actor: this,
       vie: this.system.sante.vie.max,
       alcool: alcool,
@@ -1426,7 +1407,7 @@ export class RdDActor extends RdDBaseActorSang {
     const perteDissolution = Math.max(0, Math.min(dissolution, conversion));
 
     let stressRollData = {
-      alias: this.getAlias(),
+      alias: this.name,
       selectedCarac: this.system.carac.reve,
       rolled: stressRoll,
       stress: fromStress,
@@ -1517,7 +1498,7 @@ export class RdDActor extends RdDBaseActorSang {
         carac.value = niveauSuivant;
 
         let checkXp = {
-          alias: this.getAlias(),
+          alias: this.name,
           carac: caracName,
           value: niveauSuivant,
           xp: carac.xp
@@ -1547,7 +1528,7 @@ export class RdDActor extends RdDBaseActorSang {
         newCompData.system.niveau += 1;
         newCompData.system.xp = newXP;
         let checkXp = {
-          alias: this.getAlias(),
+          alias: this.name,
           competence: newCompData.name,
           niveau: newCompData.system.niveau,
           xp: newCompData.system.xp,
@@ -1784,7 +1765,7 @@ export class RdDActor extends RdDBaseActorSang {
     }
     const competence = this.getCompetence(compName);
     let rollData = {
-      alias: this.getAlias(),
+      alias: this.name,
       caracValue: Number(carac.value),
       selectedCarac: carac,
       competence: competence,
@@ -1857,7 +1838,7 @@ export class RdDActor extends RdDBaseActorSang {
       label: 'Jet ' + Grammar.apostrophe('de', competence.name),
       template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
       rollData: {
-        alias: this.getAlias(),
+        alias: this.name,
         carac: this.system.carac,
         selectedCarac: this.getCaracByName(caracName),
         selectedCaracName: caracName,
@@ -2930,7 +2911,7 @@ export class RdDActor extends RdDBaseActorSang {
 
     let newQuantite = herbeData.system.quantite - herbeData.nbBrins;
     let messageData = {
-      alias: this.getAlias(),
+      alias: this.name,
       nbBrinsReste: newQuantite,
       potion: newPotion,
       herbe: herbeData

module/actor/base-actor-reve.js

@@ -15,7 +15,7 @@ import { StatusEffects } from "../settings/status-effects.js";
 import { ITEM_TYPES } from "../item.js";
 import { Targets } from "../targets.js";
 import { RdDPossession } from "../rdd-possession.js";
-import { RdDCombat, RdDCombatManager } from "../rdd-combat.js";
+import { RdDCombat } from "../rdd-combat.js";
 import { RdDConfirm } from "../rdd-confirm.js";
 import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
 import { RdDItemArme } from "../item-arme.js";
@@ -83,23 +83,6 @@ export class RdDBaseActorReve extends RdDBaseActor {
   getEtatGeneral(options = { ethylisme: false }) { return 0 }
   isActorCombat() { return true }
 
-  getCaracInit(competence) {
-    if (!competence){
-      return 0
-    }
-    if (competence.type == ITEM_TYPES.competencecreature) {
-      return competence.system.carac_value
-    }
-    return this.system.carac[competence.system.defaut_carac].value;
-  }
-  listActionsCombat() {
-    return this.itemTypes[ITEM_TYPES.competencecreature]
-      .filter(it => RdDItemCompetenceCreature.isAttaque(it))
-      .map(it => RdDItemCompetenceCreature.armeCreature(it))
-      .filter(it => it != undefined);
-  }
-
-
   async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
   async remiseANeuf() { }
   async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
@@ -117,7 +100,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
     for (let effect of this.getEffects()) {
       if (effect.duration.type !== 'none' && (effect.duration.remaining <= 0 || options.terminer)) {
         await effect.delete();
-        ChatMessage.create({ content: `${this.getAlias()} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
+        ChatMessage.create({ content: `${this.name} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
       }
     }
   }
@@ -172,6 +155,9 @@ export class RdDBaseActorReve extends RdDBaseActor {
   getPossession(possessionId) {
     return this.itemTypes[ITEM_TYPES.possession].find(it => it.system.possessionid == possessionId);
   }
+  getPossessions() {
+    return this.itemTypes[ITEM_TYPES.possession];
+  }
   getEmpoignades() {
     return this.itemTypes[ITEM_TYPES.empoignade];
   }
@@ -288,7 +274,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
     await this.openRollDialog({
       name: `jet-${this.id}`,
-      label: `Jet de ${this.getAlias()}`,
+      label: `Jet de ${this.name}`,
       template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll.html',
       rollData: {
         carac: carac,
@@ -384,7 +370,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   rollArme(arme, categorieArme, token) {
     token = token ?? RdDUtility.getSelectedToken(this)
     const compToUse = this.$getCompetenceArme(arme, categorieArme)
-    if (!RdDItemArme.isUtilisable(arme)) {
+    if (!RdDItemArme.isArmeUtilisable(arme)) {
       ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
       return
     }
@@ -463,7 +449,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   async $afficherEncaissement(encaissement, show, defenderToken) {
     foundry.utils.mergeObject(encaissement, {
-      alias: defenderToken?.name ?? this.getAlias(),
+      alias: defenderToken?.name ?? this.name,
       hasPlayerOwner: this.hasPlayerOwner,
       show: show ?? {}
     }, {overwrite: false});
@@ -496,7 +482,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
     }
     const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.system.carac.niveau.value));
     const rollData = {
-      alias: this.getAlias(),
+      alias: this.name,
       rolled: rolled,
       entite: entite.name,
       selectedCarac: this.system.carac.reve
@@ -516,7 +502,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   isEntiteAccordee(attacker) { return true }
 
   async setEntiteReveAccordee(actor) {
-    ui.notifications.error("Impossible de s'accorder à " + this.getAlias() + ": ce n'est pas une entité incarnée");
+    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entité incarnée");
   }
 
 }

module/actor/base-actor-sang.js

@@ -191,7 +191,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
       encaissement.mort = true;
       ChatMessage.create({
         content: `<img class="chat-icon" src="icons/svg/skull.svg" data-tooltip="charge" />
-        <strong>${this.getAlias()} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
+        <strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
       });
     }
     return blessure;
@@ -218,7 +218,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   async jetDeVie() {
     if (this.isDead()) {
       ChatMessage.create({
-        content: `Jet de Vie: ${this.getAlias()} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`,
+        content: `Jet de Vie: ${this.name} 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 += `<br><strong>${this.getAlias()} est mort !!!!</strong>`;
+      msgText += `<br><strong>${this.name} est mort !!!!</strong>`;
     }
     else if (prochainJet > 0) {
       msgText += `<br>Prochain jet de vie dans ${prochainJet} ${isCritique ? 'round' : 'minute'}${prochainJet > 1 ? 's' : ''} ${isCritique ? '(état critique)' : '(état grave)'}`
@@ -273,7 +273,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
 
   async setSonne(sonne = true) {
     if (!game.combat && sonne) {
-      ui.notifications.info(`${this.getAlias()} est hors combat, il ne reste donc pas sonné`);
+      ui.notifications.info(`${this.name} est hors combat, il ne reste donc pas sonné`);
       return;
     }
     await this.setEffect(STATUSES.StatusStunned, sonne)

module/actor/base-actor.js

@@ -78,13 +78,6 @@ export class RdDBaseActor extends Actor {
     return game.actors.get(actorId)
   }
 
-  getAlias() {
-    if (this.token?.name != null && this.token != this.prototypeToken) {
-      return this.token.name
-    }
-    return this.name
-  }
-
   isPersonnageJoueur() { return false }
 
   static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
@@ -374,7 +367,7 @@ export class RdDBaseActor extends Actor {
     chatAchatItem.quantiteTotal = quantite;
     ChatMessage.create({
       user: achat.userId,
-      speaker: { alias: (acheteur ?? vendeur).getAlias() },
+      speaker: { alias: (acheteur ?? vendeur).name },
       whisper: ChatUtility.getOwners(this),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.html', chatAchatItem)
     });
@@ -690,7 +683,7 @@ export class RdDBaseActor extends Actor {
       type: this.type,
       img: this.img,
       pack: this.pack,
-      name: this.getAlias(),
+      name: this.name,
       system: { description: this.system.description }
     }
     renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.html', chatData)
@@ -698,10 +691,10 @@ export class RdDBaseActor extends Actor {
   }
 
   actionImpossible(action) {
-    ui.notifications.info(`${this.getAlias()} ne peut pas faire cette action: ${action}`)
+    ui.notifications.info(`${this.name} ne peut pas faire cette action: ${action}`)
 
   }
-
+  async roll() { this.actionImpossible("jet de caractéristiques") }
   async jetEthylisme() { this.actionImpossible("jet d'éthylisme") }
   async rollAppelChance() { this.actionImpossible("appel à la chance") }
   async jetDeMoral() { this.actionImpossible("jet de moral") }
@@ -717,19 +710,4 @@ export class RdDBaseActor extends Actor {
   getItemUse(itemId) { return 0; }
   async finDeRound(options = { terminer: false }) { }
   isActorCombat() { return false }
-  getCaracInit(competence) { return 0 }
-  listActionsCombat() { return [] }
-  listActionsPossessions() {
-    return this.itemTypes[ITEM_TYPES.possession]
-      .map(p => {
-        return {
-          name: p.name,
-          action: 'possession',
-          system: {
-            competence: p.name,
-            possessionid: p.system.possessionid,
-          }
-        }
-      })
-  }
 }

module/actor/commerce-sheet.js

@@ -73,7 +73,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
     }
     const disponible = this.actor.getQuantiteDisponible(item)
     if (disponible == 0) {
-      ui.notifications.warn(`${this.getAlias()} n'a plus de ${item.name} en vente`);
+      ui.notifications.warn(`${this.name} n'a plus de ${item.name} en vente`);
       return;
     }
 

module/actor/export-scriptarium/mapping.js

@@ -152,8 +152,8 @@ export class Mapping {
   }
 
   static prepareArme(actor, arme, maniement) {
-    const nameCompetenceArme = RdDItemArme.getCompetenceArme(arme, maniement)
-    const competence = actor.getCompetence(nameCompetenceArme)
+    const nameCompArme = RdDItemArme.getCompetenceArme(arme, maniement)
+    const competence = actor.getCompetence(nameCompArme)
     if (RdDItemCompetence.isNiveauBase(competence)) {
       return undefined
     }

module/actor/random/app-personnage-aleatoire.js

@@ -19,7 +19,7 @@ const PATHS = [
 
 const RANDOM_VALUES = {
   'system.sexe': { 'masculin': 1, 'féminin': 1 },
-  'system.main': { 'droitier': 51, 'gaucher': 15, 'ambidextre': 6 },
+  'system.main': { 'droitier': 51, 'gaucher': 15, 'ambidectre': 6 },
   'system.cheveux': { 'noirs': 2, 'bruns': 5, 'châtains clair': 5, 'blonds': 4, 'blonds très clair': 1, 'roux carotte': 1, 'roux cuivré': 3 },
   'system.yeux': { 'noirs': 2, 'noisettes': 3, 'bruns vert': 4, 'verts': 3, 'bleus clair': 3, 'bleus gris': 2, 'gris': 1, 'mauves': 1, 'indigos': 1 },
 }

module/dialog-create-signedraconique.js

@@ -51,7 +51,7 @@ export class DialogCreateSigneDraconique extends Dialog {
       whisper: ChatUtility.getOwners(actor),
       content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-actor.html", {
         signe: signe,
-        alias: actor.getAlias()
+        alias: actor.name
       })
     });
   }

module/item-arme.js

@@ -206,7 +206,7 @@ export class RdDItemArme extends Item {
     return arme.system.competence.replace(" 1 main", " 2 mains");
   }
 
-  static isUtilisable(arme) {
+  static isArmeUtilisable(arme) {
     switch (arme.type) {
       case ITEM_TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
       case ITEM_TYPES.competencecreature: return true
@@ -214,26 +214,6 @@ export class RdDItemArme extends Item {
     return false
   }
 
-  static isAttaque(arme) {
-    switch (arme.type) {
-      case ITEM_TYPES.arme:
-        return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
-      case ITEM_TYPES.competencecreature:
-        return arme.system.iscombat && RdDItemCompetenceCreature.isAttaque(item)
-    }
-    return false
-  }
-
-  static isParade(arme) {
-    switch (arme.type) {
-      case ITEM_TYPES.arme:
-        return arme.system.equipe && arme.system.resistance > 0 && true/* TODO: regarder la categorie d'arme?*/
-      case ITEM_TYPES.competencecreature:
-        return arme.system.iscombat && RdDItemCompetenceCreature.isParade(arme)
-    }
-    return false
-  }
-
   static ajoutCorpsACorps(armes, actor) {
     armes.push(RdDItemArme.mainsNues(actor));
     armes.push(RdDItemArme.empoignade(actor));

module/item-competencecreature.js

@@ -27,28 +27,29 @@ export class RdDItemCompetenceCreature extends Item {
   static armeCreature(item) {
     const categorieAttaque = RdDItemCompetenceCreature.getCategorieAttaque(item)
     if (categorieAttaque != undefined) {
-      // cloner pour ne pas modifier la compétence
-      return foundry.utils.mergeObject(item, {
+      // si c'est un Item compétence: cloner pour ne pas modifier la compétence
+      let arme = item.clone();
+      return foundry.utils.mergeObject(arme, {
           action: item.isCompetencePossession() ? 'possession' : 'attaque',
           system: {
-            competence: item.name,
+            competence: arme.name,
             cac: categorieAttaque == "naturelle" ? "naturelle" : "",
             niveau: item.system.niveau,
             initiative: RdDCombatManager.calculInitiative(item.system.niveau, item.system.carac_value),
             equipe: true,
             resistance: 100,
-            dommagesReels: item.system.dommages,
+            dommagesReels: arme.system.dommages,
             penetration: 0,
             force: 0,
             rapide: true,
           }
-        }, { inplace: false, });
+        }, { inplace: false });
     }
     return undefined;
   }
 
   /* -------------------------------------------- */
-  static isAttaque(item) {
+  static isCompetenceAttaque(item) {
     if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
         case "melee":
@@ -59,7 +60,7 @@ export class RdDItemCompetenceCreature extends Item {
           return true
       }
     }
-    return false
+    return undefined
   }
 
   static getCategorieAttaque(item) {
@@ -76,7 +77,6 @@ export class RdDItemCompetenceCreature extends Item {
     }
     return undefined
   }
-
   static isDommages(item) {
     if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
@@ -89,7 +89,6 @@ export class RdDItemCompetenceCreature extends Item {
     }
     return false
   }
-
   static isParade(item) {
     if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
@@ -102,4 +101,8 @@ export class RdDItemCompetenceCreature extends Item {
     return false
   }
 
+  /* -------------------------------------------- */
+  static isCompetenceParade(item) {
+    return item.type == 'competencecreature' && item.system.categorie_parade !== "";
+  }
 }  

module/rdd-combat.js

@@ -72,28 +72,19 @@ export class RdDCombatManager extends Combat {
 
   /* -------------------------------------------- */
   async finDeRound(options = { terminer: false }) {
-    this.combatants.map(it => RdDCombatManager.getActorCombatant(it, { warning: false }))
-      .filter(it => it != undefined)
-      .forEach(async actor => {
-        await actor.finDeRound(options)
-        await actor.resetItemUse()
-      })
-  }
 
-  static getActorCombatant(combatant, options = { warning: true }) {
+    for (let combatant of this.combatants) {
       if (!combatant.actor) {
-      if (options.warning) {
         ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur!`)
       }
-      return undefined
-    }
       else if (!combatant.actor.isActorCombat()) {
-      if (options.warning) {
-        ui.notifications.warn(`${combatant.name} ne peut pas combattre!`)
+        ui.notifications.warn(`Le combatant ${combatant.name} ne peut pas combattre!`)
+      }
+      else {
+        await combatant.actor.finDeRound(options)
+        await combatant.actor.resetItemUse()
       }
-      return undefined
     }
-    return combatant.actor
   }
 
   static calculAjustementInit(actor, arme) {
@@ -104,27 +95,56 @@ export class RdDCombatManager extends Combat {
   }
 
   /************************************************************************************/
-  async rollInitiative(ids, messageOptions = {}) {
-    console.log(`${game.system.title} | Combat.rollInitiative()`, ids, messageOptions)
-    ids = typeof ids === "string" ? [ids] : ids
-    ids.forEach(async id =>
-      await this.rollInitRdD(id, undefined, messageOptions)
-    )
-    return this
-  }
+  async rollInitiative(ids, formula = undefined, messageOptions = {}) {
+    console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
 
-  async rollInitRdD(id, formula, messageOptions = {}) {
-    const combatant = this.combatants.get(id);
-    const actor = RdDCombatManager.getActorCombatant(combatant)
-    if (actor) {
-      const rollFormula = formula ?? RdDCombatManager.getFirstInitRollFormula(actor)
+    ids = typeof ids === "string" ? [ids] : ids;
+    // calculate initiative
+    for (let cId = 0; cId < ids.length; cId++) {
+      const combatant = this.combatants.get(ids[cId]);
+      const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, undefined);
+      let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, ajustement);
+
+      if (!formula) {
+        if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
+          const competence = combatant.actor.items.find(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+          if (competence) {
+            rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, etatGeneral);
+          }
+        } else {
+          const armeCombat = combatant.actor.itemTypes['arme'].find(it => it.system.equipe)
+          let compName = "Corps à corps"
+          if (armeCombat) {
+            if (armeCombat.system.competence != "") {
+              compName = armeCombat.system.competence
+            }
+            if (armeCombat.system.lancer != "") {
+              compName = armeCombat.system.lancer
+            }
+            if (armeCombat.system.tir != "") {
+              compName = armeCombat.system.tir
+            }
+          }
+          const competence = RdDItemCompetence.findCompetence(combatant.actor.items, compName);
+          if (competence && competence.system.defaut_carac) {
+            const carac = combatant.actor.system.carac[competence.system.defaut_carac].value;
+            const niveau = competence.system.niveau;
+
+            const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, armeCombat)
+            rollFormula = RdDCombatManager.formuleInitiative(2, carac, niveau, ajustement);
+          } else {
+            ui.notifications.warn(`Votre arme ${armeCombat.name} n'a pas de compétence renseignée`);
+          }
+        }
+      }
       const roll = combatant.getInitiativeRoll(rollFormula);
       if (!roll.total) {
         await roll.evaluate();
       }
       const total = Math.max(roll.total, 0.00);
       console.log("Compute init for", rollFormula, roll, total, combatant);
-      await this.updateEmbeddedDocuments("Combatant", [{ _id: combatant._id || combatant.id, initiative: total }]);
+      let id = combatant._id || combatant.id;
+      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: total }]);
 
       // Send a chat message
       let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
@@ -133,10 +153,10 @@ export class RdDCombatManager extends Combat {
           scene: canvas.scene._id,
           actor: combatant.actor?._id,
           token: combatant.token._id,
-          alias: combatant.token?.name,
+          alias: combatant.token.name,
           sound: CONFIG.sounds.dice,
         },
-        flavor: `${combatant.token?.name} a fait son jet d'Initiative (${messageOptions.info})<br>`
+        flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})<br>`,
       },
         messageOptions);
       roll.toMessage(messageData, { rollMode, create: true });
@@ -144,20 +164,7 @@ export class RdDCombatManager extends Combat {
       RdDCombatManager.processPremierRoundInit();
     }
     return this;
-  }
-
-  static getFirstInitRollFormula(actor) {
-    const actions = actor.listActionsCombat()
-    if (actions.length > 0) {
-      const action = actions[0]
-      const init = RdDCombatManager.getInitData(actor, action)
-      const ajustement = RdDCombatManager.calculAjustementInit(actor, action)
-      return RdDCombatManager.formuleInitiative(init.offset, init.carac, init.niveau, ajustement);
-    }
-
-    let ajustement = RdDCombatManager.calculAjustementInit(actor, undefined);
-    return RdDCombatManager.formuleInitiative(2, 10, 0, ajustement);
-  }
+  };
 
   static formuleInitiative(rang, carac, niveau, bonusMalus) {
     return `${rang} +( (${RdDCombatManager.calculInitiative(niveau, carac, bonusMalus)} )/100)`;
@@ -240,6 +247,61 @@ export class RdDCombatManager extends Combat {
     return attaque;
   }
 
+  /* -------------------------------------------- */
+  static listActionsCombat(combatant) {
+    const actor = combatant.actor;
+    if (!actor.isActorCombat()) {
+      return
+    }
+    let actions = RdDCombatManager.listActionsPossessions(actor);
+    if (actions.length > 0) {
+      return actions;
+    }
+    if (actor.isCreatureEntite()) {
+      actions = RdDCombatManager.listActionsCreature(actor.itemTypes['competencecreature']);
+    } else if (actor.isPersonnage()) {
+      // Recupération des items 'arme'
+      const competences = actor.itemTypes['competence'];
+      const armes = actor.itemTypes['arme'].filter(it => RdDItemArme.isArmeUtilisable(it))
+        .concat(RdDItemArme.empoignade(actor))
+        .concat(RdDItemArme.mainsNues(actor));
+      actions = RdDCombatManager.listActionsArmes(armes, competences, actor.system.carac);
+
+      if (actor.system.attributs.hautrevant.value) {
+        actions.push({ name: "Draconic", action: 'haut-reve', system: { initOnly: true, competence: "Draconic" } });
+      }
+    }
+
+    return RdDCombatManager._indexActions(actions);
+  }
+
+  static listActionsCreature(competences) {
+    return competences
+      .filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+      .map(it => RdDItemCompetenceCreature.armeCreature(it))
+      .filter(it => it != undefined);
+  }
+
+  static listActionsPossessions(actor) {
+    return RdDCombatManager._indexActions(actor.getPossessions().map(p => {
+      return {
+        name: p.name,
+        action: 'possession',
+        system: {
+          competence: p.name,
+          possessionid: p.system.possessionid,
+        }
+      }
+    }));
+  }
+
+  static _indexActions(actions) {
+    for (let index = 0; index < actions.length; index++) {
+      actions[index].index = index;
+    }
+    return actions;
+  }
+
   /* -------------------------------------------- */
   static processPremierRoundInit() {
     // Check if we have the whole init !
@@ -252,7 +314,7 @@ export class RdDCombatManager extends Combat {
           if (action && action.type == "arme") {
             for (let initData of premierRoundInit) {
               if (Grammar.toLowerCaseNoAccentNoSpace(action.system.initpremierround).includes(initData.pattern)) {
-                let msg = `<h4>L'initiative de ${combatant.actor.getAlias()} a été modifiée !</h4>
+                let msg = `<h4>L'initiative de ${combatant.actor.name} a été modifiée !</h4>
                       <hr>
                       <div>
                         Etant donné son ${action.name}, son initative pour ce premier round est désormais de ${initData.init}.
@@ -277,13 +339,13 @@ export class RdDCombatManager extends Combat {
   /* -------------------------------------------- */
   static pushInitiativeOptions(html, options) {
     for (let i = 0; i < options.length; i++) {
-      let option = options[i]
+      let option = options[i];
       if (option.name == 'COMBAT.CombatantReroll') { // Replace !
-        option.name = "Sélectionner l'initiative..."
-        option.condition = true
-        option.icon = '<i class="far fa-question-circle"></i>'
+        option.name = "Sélectionner l'initiative...";
+        option.condition = true;
+        option.icon = '<i class="far fa-question-circle"></i>';
         option.callback = target => {
-          RdDCombatManager.displayInitiativeMenu(html, target.data('combatant-id'))
+          RdDCombatManager.displayInitiativeMenu(html, target.data('combatant-id'));
         }
       }
     }
@@ -294,82 +356,95 @@ export class RdDCombatManager extends Combat {
   }
   /* -------------------------------------------- */
   static rollInitiativeAction(combatantId, action) {
-    const combatant = game.combat.combatants.get(combatantId)
-    const actor = RdDCombatManager.getActorCombatant(combatant)
-    if (actor == undefined) { return [] }
+    const combatant = game.combat.combatants.get(combatantId);
+    if (combatant.actor == undefined) {
+      ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
+      return [];
+    }
+    let initInfo = "";
+    let initOffset = 0;
+    let caracForInit = 0;
+    let compNiveau = 0;
+    let compData = { name: "Aucune" };
+    if (combatant.actor.getSurprise() == "totale") {
+      initOffset = -1; // To force 0
+      initInfo = "Surprise Totale"
+    } else if (combatant.actor.getSurprise() == "demi") {
+      initOffset = 0;
+      initInfo = "Demi Surprise"
+    } else if (action.action == 'possession') {
+      initOffset = 10;
+      caracForInit = combatant.actor.getReveActuel();
+      initInfo = "Possession"
+    } else if (action.action == 'autre') {
+      initOffset = 2;
+      initInfo = "Autre Action"
+    } else if (action.action == 'haut-reve') {
+      initOffset = 9;
+      initInfo = "Draconic"
+    } else {
+      compData = RdDItemCompetence.findCompetence(combatant.actor.items, action.system.competence);
+      compNiveau = compData.system.niveau;
+      initInfo = action.name + " / " + action.system.competence;
 
+      if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
+        caracForInit = compData.system.carac_value;
+      } else {
+        caracForInit = combatant.actor.system.carac[compData.system.defaut_carac].value;
+      }
+      initOffset = RdDCombatManager._baseInitOffset(compData.system.categorie, action);
+    }
+
+    // Cas des créatures et entités vs personnages
+    const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, action)
+    let rollFormula = RdDCombatManager.formuleInitiative(initOffset, caracForInit, compNiveau, ajustement);
+    // Garder la trace de l'arme/compétence utilisée pour l'iniative
     combatant.initiativeData = { arme: action } // pour reclasser l'init au round 0
-
-    const init = RdDCombatManager.getInitData(actor, action)
-    const ajustement = RdDCombatManager.calculAjustementInit(actor, action)
-    const rollFormula = RdDCombatManager.formuleInitiative(init.offset, init.carac, init.niveau, ajustement);
-
-    game.combat.rollInitRdD(combatantId, rollFormula, init);
+    game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo });
   }
 
-  static getInitData(actor, action) {
-    if (actor.getSurprise() == "totale") { return { offset: -1, info: "Surprise Totale", carac: 0, niveau: 0 } }
-    if (actor.getSurprise() == "demi") { return { offset: 0, info: "Demi Surprise", carac: 0, niveau: 0 } }
-    if (action.action == 'autre') { return { offset: 2, info: "Autre Action", carac: 0, niveau: 0 } }
-    if (action.action == 'possession') { return { offset: 10, info: "Possession", carac: actor.getReveActuel(), niveau: 0 } }
-    if (action.action == 'haut-reve') { return { offset: 9, info: "Draconic", carac: actor.getReveActuel(), niveau: 0 } }
-
-    const comp = RdDItemCompetence.findCompetence(actor.items, action.system.competence);
-    return {
-      offset: RdDCombatManager.initOffset(comp?.system.categorie, action),
-      info: action.name + " / " + action.system.competence,
-      carac: actor.getCaracInit(comp),
-      niveau: comp?.system.niveau ?? -8
+  /* -------------------------------------------- */
+  static _baseInitOffset(categorie, arme) {
+    if (categorie == "tir") { // Offset de principe pour les armes de jet
+      return 8;
     }
+    if (categorie == "lancer") { // Offset de principe pour les armes de jet
+      return 7;
     }
-
-  static initOffset(categorie, arme) {
-    switch (categorie) {
-      case "tir": return 8
-      case "lancer": return 7
-      default:
     switch (arme.system.cac) {
-          case "empoignade": return 3
-          case "pugilat": return 4
-          case "naturelle": return 4
-          default: return 5
-        }
+      case "empoignade":
+        return 3;
+      case "pugilat":
+      case "naturelle":
+        return 4;
     }
+    return 5;
   }
 
   /* -------------------------------------------- */
   static displayInitiativeMenu(html, combatantId) {
-    const combatant = game.combat.combatants.get(combatantId)
-    const actor = RdDCombatManager.getActorCombatant(combatant, { warning: false })
-    if (actor) {
-      const actions = RdDCombatManager.listActionsActorCombatant(actor)
+    console.log("Combatant ; ", combatantId);
+    const combatant = game.combat.combatants.get(combatantId);
+    if (!(combatant?.actor)) {
+      ui.notifications.warn(`Le combatant ${combatant.name ?? combatantId} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
+      return;
+    }
+
+    let actions = RdDCombatManager.listActionsCombat(combatant);
+
     // Build the relevant submenu
-      const menuItems = actions.map(action => {
-        return {
+    if (actions) {
+      let menuItems = [];
+      for (let action of actions) {
+        menuItems.push({
           name: action.system.competence,
           icon: "<i class='fas fa-dice-d6'></i>",
           callback: target => { RdDCombatManager.rollInitiativeAction(combatantId, action) }
+        });
       }
-      })
-      if (menuItems.length > 0) {
       new ContextMenu(html, ".directory-list", menuItems).render();
     }
   }
-  }
-
-  /* -------------------------------------------- */
-  static listActionsActorCombatant( actor) {
-    const possessions = actor.listActionsPossessions()
-    const actions = possessions.length > 0
-      ? possessions
-      : actor.listActionsCombat()
-
-    for (let index = 0; index < actions.length; index++) {
-      actions[index].index = index
-    }
-    return actions
-  }
-
 
 }
 
@@ -754,7 +829,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _prepareAttaque(competence, arme) {
     let rollData = {
-      alias: this.attacker?.getAlias(),
+      alias: this.attackerToken.name,
       passeArme: foundry.utils.randomID(16),
       mortalite: arme?.system.mortalite,
       competence: competence,
@@ -803,10 +878,10 @@ export class RdDCombat {
     }
 
     const choixParticuliere = await ChatMessage.create({
-      alias: this.attacker.getAlias(),
+      alias: this.attacker.name,
       whisper: ChatUtility.getOwners(this.attacker),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-particuliere.html', {
-        alias: this.attacker.getAlias(),
+        alias: this.attackerToken.name,
         attackerId: this.attackerId,
         attackerToken: this.attackerToken,
         defenderToken: this.defenderToken,
@@ -826,7 +901,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.defender?.getAlias() ?? 'la cible',
+      cible: this.defenderToken?.name ?? 'la cible',
       isRecul: (attackerRoll.particuliere == 'force' || attackerRoll.tactique == 'charge')
     }
     await RdDResolutionTable.displayRollData(attackerRoll, this.attacker, 'chat-resultat-attaque.html');
@@ -892,7 +967,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.attacker?.getAlias(),
+      alias: this.attackerToken.name,
       whisper: ChatUtility.getOwners(this.defender),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.html', paramDemandeDefense),
     });
@@ -917,13 +992,13 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  _filterArmesParade(defender, competence, armeAttaque) {
-    let defenses = defender.items.filter(it => RdDItemArme.isParade(it))
+  _filterArmesParade(defender, competence, arme) {
+    let defenses = defender.items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it))
     defenses = foundry.utils.duplicate(defenses)
     defenses.forEach(armeDefense => {
       // Ajout du # d'utilisation ce round  
       armeDefense.nbUsage = defender.getItemUse(armeDefense.id)
-      armeDefense.typeParade = RdDItemArme.defenseArmeParade(armeAttaque, armeDefense)
+      armeDefense.typeParade = RdDItemArme.defenseArmeParade(arme, armeDefense)
     })
 
     switch (competence.system.categorie) {
@@ -1015,7 +1090,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _prepareParade(attackerRoll, armeParade, competenceParade) {
     let defenderRoll = {
-      alias: this.defender?.getAlias(),
+      alias: this.defenderToken?.name,
       passeArme: attackerRoll.passeArme,
       diffLibre: attackerRoll.diffLibre,
       attackerToken: this.attackerToken,
@@ -1072,7 +1147,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.getAlias() + " n'a pas de compétence " + compName);
+      ui.notifications.error(this.defender.name + " n'a pas de compétence " + compName);
       return;
     }
     console.log("RdDCombat.esquive >>>", attackerRoll, esquive);
@@ -1099,7 +1174,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _prepareEsquive(attackerRoll, competence) {
     let rollData = {
-      alias: this.defender.getAlias(),
+      alias: this.defenderToken?.name,
       passeArme: attackerRoll.passeArme,
       diffLibre: attackerRoll.diffLibre,
       attackerToken: this.attackerToken,
@@ -1278,10 +1353,9 @@ export class RdDCombat {
     if (!actor?.isActorCombat()) {
       return
     }
-    const alias = token?.name ?? actor.getAlias();
-    const formData = {
+    let formData = {
       combatId: combat._id,
-      alias: alias,
+      alias: token.name ?? actor.name,
       etatGeneral: actor.getEtatGeneral(),
       isSonne: actor.isSonne(),
       blessuresStatus: actor.computeResumeBlessure(),
@@ -1294,12 +1368,12 @@ export class RdDCombat {
     }
     await ChatMessage.create({
       content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-acteur.hbs`, formData),
-      alias: alias
+      alias: token.name ?? actor.name
     })
     await ChatMessage.create({
       content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-sante.hbs`, formData),
       whisper: ChatUtility.getOwners(actor),
-      alias: alias
-    })
+      alias: token.name ?? actor.name
+    });
   }
 }

module/rdd-main.js

@@ -274,16 +274,6 @@ export class SystemReveDeDragon {
     })
   }
 
-  static async setupAccueil() {
-    let exists = game.scenes.find(j => j.name == "Accueil RdD");
-    if (!exists) {
-      const scenes = await SystemCompendiums.loadCompendium("foundryvtt-reve-de-dragon.scenes-rdd")
-      let newDocuments = scenes.filter(i => i.name == "Accueil RdD");
-      await game.scenes.documentClass.create(newDocuments);
-      game.scenes.find(i => i.name == "Accueil RdD").activate();
-    }
-  }
-
   async onReady() {
 
     /* -------------------------------------------- */
@@ -317,8 +307,6 @@ export class SystemReveDeDragon {
         user: game.user.id
       })
     }
-
-    SystemReveDeDragon.setupAccueil()
   }
 
   /* -------------------------------------------- */

module/rdd-roll.js

@@ -32,7 +32,7 @@ export class RdDRoll extends Dialog {
   /* -------------------------------------------- */
   static _setDefaultOptions(actor, rollData) {
     let defaultRollData = {
-      alias: actor.getAlias(),
+      alias: actor.name,
       ajustementsConditions: CONFIG.RDD.ajustementsConditions,
       difficultesLibres: CONFIG.RDD.difficultesLibres,
       etat: actor.getEtatGeneral(),
@@ -345,25 +345,24 @@ export class RdDRoll extends Dialog {
 
   /* -------------------------------------------- */
   _getTitle(rollData) {
-    const alias = rollData.alias
     const carac = rollData.selectedCarac.label;
     if (!rollData.competence) {
-      return `${alias}: ${carac}`
+      return carac;
     }
     const compName = rollData.competence.name;
     const niveau = Misc.toSignedString(rollData.competence.system.niveau)
     if (compName == carac) {
       // cas des créatures
-      return `${alias}: ${carac} Niveau ${niveau}`
+      return `${carac} Niveau ${niveau}`
     }
     if (rollData.draconicList && rollData.selectedSort) {
       // cas de lancer de sort
-      return `${alias}: ${rollData.competence.name} Niveau ${niveau} ${rollData.selectedSort.name}`
+      return `${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 `${alias}: ${carac} /  ${compName} (${rollData.arme.name}) Niveau ${niveau}`
+      return `${carac} /  ${compName} (${rollData.arme.name}) Niveau ${niveau}`
     }
-    return `${alias}: ${carac} / ${compName} Niveau ${niveau}`
+    return `${carac} / ${compName} Niveau ${niveau}`
   }
 }

module/rdd-rolltables.js

@@ -1,3 +1,4 @@
+import { Grammar } from "./grammar.js";
 import { CompendiumTable, CompendiumTableHelpers, SystemCompendiums } from "./settings/system-compendiums.js";
 
 export class RdDRollTables {

module/rdd-tmr-dialog.js

@@ -460,7 +460,7 @@ export class RdDTMRDialog extends Dialog {
 
     let rencontreData = {
       actor: this.actor,
-      alias: this.actor.getAlias(),
+      alias: this.actor.name,
       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.getAlias(),
+      alias: this.actor.name,
       reveDepart: this.actor.getReveActuel(),
       competence: this.actor.getBestDraconic(),
       rencontre: this.currentRencontre,
@@ -1098,10 +1098,7 @@ 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.getAlias(),
-          typeTMR: TMRUtility.getTMRType(coord)
-        })
+        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-resonance.html`, { alias: this.actor.name, typeTMR: TMRUtility.getTMRType(coord) })
       });
     }
   }

module/rdd-token-hud.js

@@ -28,15 +28,16 @@ export class RdDTokenHud {
     await RdDTokenHud.addExtensionHudSoins(html, actor);
 
     if (isCombat) {
-      const combatant = game.combat.combatants.find(c => c.tokenId == tokenId)
-      const actor = RdDCombatManager.getActorCombatant(combatant, { warning: false })
-      if (actor) {
-        let actions = RdDCombatManager.listActionsActorCombatant(actor)
-        // initiative
-        await RdDTokenHud.addExtensionHudInit(html, combatant, actions)
-        // combat
-        await RdDTokenHud.addExtensionHudCombat(html, combatant, token, actions)
+      let combatant = game.combat.combatants.find(c => c.tokenId == tokenId);
+      if (!(combatant?.actor)) {
+        ui.notifications.warn(`Le combatant ${token.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
+        return;
       }
+      let actions = RdDCombatManager.listActionsCombat(combatant);
+      // initiative
+      await RdDTokenHud.addExtensionHudInit(html, combatant, actions);
+      // combat
+      await RdDTokenHud.addExtensionHudCombat(html, combatant, token, actions);
     }
 
 

module/settings/status-effects.js

@@ -15,17 +15,17 @@ export const STATUSES = {
 }
 
 const rddStatusEffects = [
-  { rdd: true, id: STATUSES.StatusStunned, name:  'EFFECT.StatusStunned', img: 'icons/svg/stoned.svg', "duration.rounds": 1 },
-  { rdd: true, id: STATUSES.StatusBleeding, name:  'EFFECT.StatusBleeding', img: 'icons/svg/blood.svg' },
-  { rdd: true, id: STATUSES.StatusProne, name:  'EFFECT.StatusProne', img: 'icons/svg/falling.svg' },
-  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', name:  'EFFECT.StatusGrappling', img: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
-  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', name:  'EFFECT.StatusGrappled', img: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
-  { rdd: true, id: STATUSES.StatusRestrained, name:  'EFFECT.StatusRestrained', img: 'icons/svg/net.svg' },
-  { rdd: true, id: STATUSES.StatusUnconscious, name:  'EFFECT.StatusUnconscious', img: 'icons/svg/unconscious.svg' },
-  { rdd: true, id: STATUSES.StatusBlind, name:  'EFFECT.StatusBlind', img: 'icons/svg/blind.svg' },
-  { rdd: true, id: STATUSES.StatusComma, name:  'EFFECT.StatusComma', img: 'icons/svg/skull.svg' },
-  { rdd: true, id: STATUSES.StatusDead, name:  'EFFECT.StatusDead', img: 'icons/svg/skull.svg' },
-  { rdd: true, id: STATUSES.StatusDemiReve, name:  'EFFECT.StatusDemiReve', img: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' }
+  { rdd: true, id: STATUSES.StatusStunned, label: 'EFFECT.StatusStunned', icon: 'icons/svg/stoned.svg', "duration.rounds": 1 },
+  { rdd: true, id: STATUSES.StatusBleeding, label: 'EFFECT.StatusBleeding', icon: 'icons/svg/blood.svg' },
+  { rdd: true, id: STATUSES.StatusProne, label: 'EFFECT.StatusProne', icon: 'icons/svg/falling.svg' },
+  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
+  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
+  { rdd: true, id: STATUSES.StatusRestrained, label: 'EFFECT.StatusRestrained', icon: 'icons/svg/net.svg' },
+  { rdd: true, id: STATUSES.StatusUnconscious, label: 'EFFECT.StatusUnconscious', icon: 'icons/svg/unconscious.svg' },
+  { rdd: true, id: STATUSES.StatusBlind, label: 'EFFECT.StatusBlind', icon: 'icons/svg/blind.svg' },
+  { rdd: true, id: STATUSES.StatusComma, label: 'EFFECT.StatusComma', icon: 'icons/svg/skull.svg' },
+  { rdd: true, id: STATUSES.StatusDead, label: 'EFFECT.StatusDead', icon: 'icons/svg/skull.svg' },
+  { rdd: true, id: STATUSES.StatusDemiReve, label: 'EFFECT.StatusDemiReve', icon: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' }
 ];
 const demiReveStatusEffect = rddStatusEffects.find(it => it.id == STATUSES.StatusDemiReve);
 
@@ -57,7 +57,7 @@ export class StatusEffects extends FormApplication {
       restricted: true
     });
 
-    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddEffectIds.includes(it.id)))
+    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddEffectIds.includes(it.id)));
 
     StatusEffects._setUseStatusEffects(StatusEffects._getUseStatusEffects());
     console.log('statusEffects', CONFIG.statusEffects);

module/settings/system-compendiums.js

@@ -112,19 +112,6 @@ export class SystemCompendiums extends FormApplication {
     return elements;
   }
 
-  /* -------------------------------------------- */
-  static async loadCompendiumData(compendium) {
-    const pack = game.packs.get(compendium);
-    return await pack?.getDocuments() ?? [];
-  }
-
-  /* -------------------------------------------- */
-  static async loadCompendium(compendium, filter = item => true) {
-    let compendiumData = await SystemCompendiums.loadCompendiumData(compendium);
-    return compendiumData.filter(filter);
-  }
-
-
   static async getDefaultItems(compendium) {
     const pack = game.packs.get(SystemCompendiums._getDefaultCompendium(compendium));
     if (pack.metadata.type == 'Item') {

module/time/auto-adjust-darkness.js

@@ -15,7 +15,7 @@ export class AutoAdjustDarkness {
   }
 
   static async adjust(darkness) {
-    if (game.user.isGM && AutoAdjustDarkness.isAuto()) {
+    if (AutoAdjustDarkness.isAuto()) {
       const scene = game.scenes.viewed;
       if (scene?.environment?.globalLight?.enabled && scene?.tokenVision) {
         await scene.update({ darkness });

pack_ref/animaux/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000022

pack_ref/animaux/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.183093 7fed63e006c0 Recovering log #21
-2024/11/10-18:39:00.195436 7fed63e006c0 Delete type=0 #21
-2024/11/10-18:39:00.195482 7fed63e006c0 Delete type=3 #20

pack_ref/animaux/LOG.old

@@ -1,3 +0,0 @@
-2024/11/10-18:38:41.533242 7f4c0b8006c0 Recovering log #19
-2024/11/10-18:38:41.547823 7f4c0b8006c0 Delete type=0 #19
-2024/11/10-18:38:41.547917 7f4c0b8006c0 Delete type=3 #18

pack_ref/archetypes/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/archetypes/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.253481 7fed62a006c0 Recovering log #8
-2024/11/10-18:39:00.263751 7fed62a006c0 Delete type=3 #6
-2024/11/10-18:39:00.263866 7fed62a006c0 Delete type=0 #8

pack_ref/archetypes/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:34.139501 7f9d7f4006c0 Recovering log #4
-2024/11/08-19:40:34.182207 7f9d7f4006c0 Delete type=3 #2
-2024/11/08-19:40:34.182311 7f9d7f4006c0 Delete type=0 #4
-2024/11/08-19:56:45.129455 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:45.129487 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.135738 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.142639 7f9d7d6006c0 Manual compaction at level-0 from '!actors!1Nng9d8r6lrPHCaJ' @ 72057594037927935 : 1 .. '!actors.items!ryUZTa17LzNv25UY.zyNYa3hYtrOcF2jA' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.142697 7f9d7d6006c0 Manual compaction at level-1 from '!actors!1Nng9d8r6lrPHCaJ' @ 72057594037927935 : 1 .. '!actors.items!ryUZTa17LzNv25UY.zyNYa3hYtrOcF2jA' @ 0 : 0; will stop at (end)

pack_ref/arts-et-divertissements/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/arts-et-divertissements/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.448675 7fed63e006c0 Recovering log #8
-2024/11/10-18:39:00.460061 7fed63e006c0 Delete type=3 #6
-2024/11/10-18:39:00.460115 7fed63e006c0 Delete type=0 #8

pack_ref/arts-et-divertissements/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:32.605216 7f9d7fe006c0 Recovering log #4
-2024/11/08-19:40:32.664872 7f9d7fe006c0 Delete type=3 #2
-2024/11/08-19:40:32.665020 7f9d7fe006c0 Delete type=0 #4
-2024/11/08-19:56:44.948429 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:44.948495 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:44.954943 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:44.975424 7f9d7d6006c0 Manual compaction at level-0 from '!items!240HPtZsgZQERFMF' @ 72057594037927935 : 1 .. '!items!zRQ5WnPI483CKm9Q' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:44.975473 7f9d7d6006c0 Manual compaction at level-1 from '!items!240HPtZsgZQERFMF' @ 72057594037927935 : 1 .. '!items!zRQ5WnPI483CKm9Q' @ 0 : 0; will stop at (end)

pack_ref/competences-creatures/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/competences-creatures/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.493027 7fed63e006c0 Recovering log #8
-2024/11/10-18:39:00.503119 7fed63e006c0 Delete type=3 #6
-2024/11/10-18:39:00.503242 7fed63e006c0 Delete type=0 #8

pack_ref/competences-creatures/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:32.670029 7f9d7ea006c0 Recovering log #4
-2024/11/08-19:40:32.734322 7f9d7ea006c0 Delete type=3 #2
-2024/11/08-19:40:32.734474 7f9d7ea006c0 Delete type=0 #4
-2024/11/08-19:56:44.968549 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:44.968601 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:44.975299 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:44.975466 7f9d7d6006c0 Manual compaction at level-0 from '!items!0zRL8bOpCXNQnIR4' @ 72057594037927935 : 1 .. '!items!yDHZfK4RmwQW4YaW' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:44.975488 7f9d7d6006c0 Manual compaction at level-1 from '!items!0zRL8bOpCXNQnIR4' @ 72057594037927935 : 1 .. '!items!yDHZfK4RmwQW4YaW' @ 0 : 0; will stop at (end)

pack_ref/competences-entites/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/competences-entites/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.509122 7fed634006c0 Recovering log #8
-2024/11/10-18:39:00.519320 7fed634006c0 Delete type=3 #6
-2024/11/10-18:39:00.519377 7fed634006c0 Delete type=0 #8

pack_ref/competences-entites/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:32.738419 7f9d7f4006c0 Recovering log #4
-2024/11/08-19:40:32.795459 7f9d7f4006c0 Delete type=3 #2
-2024/11/08-19:40:32.795589 7f9d7f4006c0 Delete type=0 #4
-2024/11/08-19:56:44.996588 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:44.996618 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.003008 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.003203 7f9d7d6006c0 Manual compaction at level-0 from '!items!0Ms9iKxqigNNpZEx' @ 72057594037927935 : 1 .. '!items!wDHR5UHWq568lfGa' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.003226 7f9d7d6006c0 Manual compaction at level-1 from '!items!0Ms9iKxqigNNpZEx' @ 72057594037927935 : 1 .. '!items!wDHR5UHWq568lfGa' @ 0 : 0; will stop at (end)

pack_ref/competences/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/competences/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.471288 7fed63e006c0 Recovering log #8
-2024/11/10-18:39:00.481737 7fed63e006c0 Delete type=3 #6
-2024/11/10-18:39:00.481786 7fed63e006c0 Delete type=0 #8

pack_ref/competences/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:32.544114 7f9d7e0006c0 Recovering log #4
-2024/11/08-19:40:32.600711 7f9d7e0006c0 Delete type=3 #2
-2024/11/08-19:40:32.600809 7f9d7e0006c0 Delete type=0 #4
-2024/11/08-19:56:44.962085 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:44.962125 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:44.968340 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:44.975455 7f9d7d6006c0 Manual compaction at level-0 from '!items!2JLK5e97WbTM5WxX' @ 72057594037927935 : 1 .. '!items!zyNYa3hYtrOcF2jA' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:44.975495 7f9d7d6006c0 Manual compaction at level-1 from '!items!2JLK5e97WbTM5WxX' @ 72057594037927935 : 1 .. '!items!zyNYa3hYtrOcF2jA' @ 0 : 0; will stop at (end)

pack_ref/entites-de-cauchemar/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/entites-de-cauchemar/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.523722 7fed690006c0 Recovering log #8
-2024/11/10-18:39:00.533930 7fed690006c0 Delete type=3 #6
-2024/11/10-18:39:00.533977 7fed690006c0 Delete type=0 #8

pack_ref/entites-de-cauchemar/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:34.274388 7f9d7f4006c0 Recovering log #4
-2024/11/08-19:40:34.331636 7f9d7f4006c0 Delete type=3 #2
-2024/11/08-19:40:34.331841 7f9d7f4006c0 Delete type=0 #4
-2024/11/08-19:56:45.135878 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:45.135910 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.142458 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.142680 7f9d7d6006c0 Manual compaction at level-0 from '!actors!47YUryMgpq1UnLuB' @ 72057594037927935 : 1 .. '!actors.items!xngqS9HtwWOLf3Vo.iwfr7ekbLFzDCayP' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.142706 7f9d7d6006c0 Manual compaction at level-1 from '!actors!47YUryMgpq1UnLuB' @ 72057594037927935 : 1 .. '!actors.items!xngqS9HtwWOLf3Vo.iwfr7ekbLFzDCayP' @ 0 : 0; will stop at (end)

pack_ref/equipement/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/equipement/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.544474 7fed690006c0 Recovering log #8
-2024/11/10-18:39:00.555177 7fed690006c0 Delete type=3 #6
-2024/11/10-18:39:00.555255 7fed690006c0 Delete type=0 #8

pack_ref/equipement/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:33.076530 7f9d7e0006c0 Recovering log #4
-2024/11/08-19:40:33.128870 7f9d7e0006c0 Delete type=3 #2
-2024/11/08-19:40:33.128972 7f9d7e0006c0 Delete type=0 #4
-2024/11/08-19:56:45.003377 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:45.003402 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.009778 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.031135 7f9d7d6006c0 Manual compaction at level-0 from '!items!0I30m9qcYJk6UR6o' @ 72057594037927935 : 1 .. '!items!zlDa1vwmls6Uf4pt' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.031185 7f9d7d6006c0 Manual compaction at level-1 from '!items!0I30m9qcYJk6UR6o' @ 72057594037927935 : 1 .. '!items!zlDa1vwmls6Uf4pt' @ 0 : 0; will stop at (end)

pack_ref/extrait-poetique/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/extrait-poetique/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.599542 7fed63e006c0 Recovering log #8
-2024/11/10-18:39:00.610171 7fed63e006c0 Delete type=3 #6
-2024/11/10-18:39:00.610222 7fed63e006c0 Delete type=0 #8

pack_ref/extrait-poetique/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:33.631893 7f9d7fe006c0 Recovering log #4
-2024/11/08-19:40:33.691489 7f9d7fe006c0 Delete type=3 #2
-2024/11/08-19:40:33.691603 7f9d7fe006c0 Delete type=0 #4
-2024/11/08-19:56:45.074153 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:45.074177 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.081226 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.087832 7f9d7d6006c0 Manual compaction at level-0 from '!items!1xzVPsfnO3uukbc4' @ 72057594037927935 : 1 .. '!items!yJ3m3fheGJluiGDx' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.087874 7f9d7d6006c0 Manual compaction at level-1 from '!items!1xzVPsfnO3uukbc4' @ 72057594037927935 : 1 .. '!items!yJ3m3fheGJluiGDx' @ 0 : 0; will stop at (end)

pack_ref/faune-flore-mineraux/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/faune-flore-mineraux/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.613190 7fed634006c0 Recovering log #8
-2024/11/10-18:39:00.622547 7fed634006c0 Delete type=3 #6
-2024/11/10-18:39:00.622602 7fed634006c0 Delete type=0 #8

pack_ref/faune-flore-mineraux/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:34.398961 7f9d7fe006c0 Recovering log #4
-2024/11/08-19:40:34.452615 7f9d7fe006c0 Delete type=3 #2
-2024/11/08-19:40:34.452747 7f9d7fe006c0 Delete type=0 #4
-2024/11/08-19:56:45.142823 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:45.142856 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.149531 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.170462 7f9d7d6006c0 Manual compaction at level-0 from '!items!0EA5It28VyLzQE6n' @ 72057594037927935 : 1 .. '!items!ySY57JWhYS7PWBXv' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.170535 7f9d7d6006c0 Manual compaction at level-1 from '!items!0EA5It28VyLzQE6n' @ 72057594037927935 : 1 .. '!items!ySY57JWhYS7PWBXv' @ 0 : 0; will stop at (end)

pack_ref/humanoides/CURRENT

@@ -1 +0,0 @@
-MANIFEST-000010

pack_ref/humanoides/LOG

@@ -1,3 +0,0 @@
-2024/11/10-18:39:00.646846 7fed62a006c0 Recovering log #8
-2024/11/10-18:39:00.657496 7fed62a006c0 Delete type=3 #6
-2024/11/10-18:39:00.657547 7fed62a006c0 Delete type=0 #8

pack_ref/humanoides/LOG.old

@@ -1,8 +0,0 @@
-2024/11/08-19:40:34.201420 7f9d7e0006c0 Recovering log #4
-2024/11/08-19:40:34.259552 7f9d7e0006c0 Delete type=3 #2
-2024/11/08-19:40:34.259666 7f9d7e0006c0 Delete type=0 #4
-2024/11/08-19:56:45.115692 7f9d7d6006c0 Level-0 table #9: started
-2024/11/08-19:56:45.115723 7f9d7d6006c0 Level-0 table #9: 0 bytes OK
-2024/11/08-19:56:45.122012 7f9d7d6006c0 Delete type=0 #7
-2024/11/08-19:56:45.142609 7f9d7d6006c0 Manual compaction at level-0 from '!actors!EzV1Zxuwi7jwa6bj' @ 72057594037927935 : 1 .. '!actors.items!zACge7QxwyJkC6nD.zyNYa3hYtrOcF2jA' @ 0 : 0; will stop at (end)
-2024/11/08-19:56:45.142652 7f9d7d6006c0 Manual compaction at level-1 from '!actors!EzV1Zxuwi7jwa6bj' @ 72057594037927935 : 1 .. '!actors.items!zACge7QxwyJkC6nD.zyNYa3hYtrOcF2jA' @ 0 : 0; will stop at (end)