module/rdd-hotbar-drop.js

@@ -1,3 +1,4 @@
+import { TYPES } from "./item.js";
 
 export class RdDHotbar {
 
@@ -16,7 +17,10 @@ export class RdDHotbar {
   }
 
   static async addToHotbar(item, slot) {
-    if (item?.type == "arme") { // Used to manage weapons with multiple skills
+    switch (item?.type ?? "") {
+      case TYPES.arme:
+        {
+          // Les armes peuvent avoir plusieurs usages
           if (item.system.competence != "") {
             await this.createItemMacro(item, slot, "competence")
             slot++
@@ -29,8 +33,13 @@ export class RdDHotbar {
             await this.createItemMacro(item, slot, "lancer")
             slot++
           }
-    } else {
+        }
+        return
+      case TYPES.competence:
+      case TYPES.competencecreature:
+      default:
         await this.createItemMacro(item, slot)
+        return
     }
   }
 
@@ -46,17 +55,17 @@ export class RdDHotbar {
 
       // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
       if (documentData.type == "Item") {
-        let item = fromUuidSync(documentData.uuid)
+        const item = fromUuidSync(documentData.uuid) ?? this.actor.items.get(documentData.uuid)
-        if (item == undefined) {
-          item = this.actor.items.get(documentData.uuid)
-        }
         console.log("DROP", documentData, item)
-        if (!item || (item.type != "arme" && item.type != "competence")) {
+        switch (item?.type ?? "")
-          return true
+        {
-        }
+          case TYPES.arme:
+          case TYPES.competence:
+          case TYPES.competencecreature:
             this.addToHotbar(item, slot)
             return false
         }
+      }
 
       return true
     })
@@ -68,7 +77,9 @@ export class RdDHotbar {
     let actor;
     if (speaker.token) actor = game.actors.tokens[speaker.token];
     if (!actor) actor = game.actors.get(speaker.actor);
-
+    if (!actor) {
+      return ui.notifications.warn(`Impossible de trouver le personnage concerné`);
+    }
     let item = actor?.items.find(it => it.name === itemName && it.type == itemType) ?? undefined;
     if (!item) {
       return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
@@ -76,9 +87,10 @@ export class RdDHotbar {
 
     // Trigger the item roll
     switch (item.type) {
-      case "arme":
+      case TYPES.arme:
         return actor.rollArme(item, competenceName);
-      case "competence":
+      case TYPES.competence:
+      case TYPES.competencecreature:
         return actor.rollCompetence(itemName);
     }
   }