From 7b18fd25c38490722cedd029238ee59632eb4238 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandeme@gmail.com>
Date: Wed, 18 Oct 2023 21:08:01 +0200
Subject: [PATCH] =?UTF-8?q?Macro=20pour=20comp=C3=A9tences=20de=20cr=C3=A9?=
 =?UTF-8?q?ature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/rdd-hotbar-drop.js | 64 +++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/module/rdd-hotbar-drop.js b/module/rdd-hotbar-drop.js
index de0378bb..bb8c61ec 100644
--- a/module/rdd-hotbar-drop.js
+++ b/module/rdd-hotbar-drop.js
@@ -1,3 +1,4 @@
+import { TYPES } from "./item.js";
 
 export class RdDHotbar {
 
@@ -16,21 +17,29 @@ export class RdDHotbar {
   }
 
   static async addToHotbar(item, slot) {
-    if (item?.type == "arme") { // Used to manage weapons with multiple skills
-      if (item.system.competence != "") {
-        await this.createItemMacro(item, slot, "competence")
-        slot++
-      }
-      if (item.system.lancer != "") {
-        await this.createItemMacro(item, slot, "lancer")
-        slot++
-      }
-      if (item.system.tir != "") {
-        await this.createItemMacro(item, slot, "lancer")
-        slot++
-      }
-    } else {
-      await this.createItemMacro(item, slot)
+    switch (item?.type ?? "") {
+      case TYPES.arme:
+        {
+          // Les armes peuvent avoir plusieurs usages
+          if (item.system.competence != "") {
+            await this.createItemMacro(item, slot, "competence")
+            slot++
+          }
+          if (item.system.lancer != "") {
+            await this.createItemMacro(item, slot, "lancer")
+            slot++
+          }
+          if (item.system.tir != "") {
+            await this.createItemMacro(item, slot, "lancer")
+            slot++
+          }
+        }
+        return
+      case TYPES.competence:
+      case TYPES.competencecreature:
+      default:
+        await this.createItemMacro(item, slot)
+        return
     }
   }
 
@@ -46,16 +55,16 @@ export class RdDHotbar {
 
       // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
       if (documentData.type == "Item") {
-        let item = fromUuidSync(documentData.uuid)
-        if (item == undefined) {
-          item = this.actor.items.get(documentData.uuid)
-        }
+        const item = fromUuidSync(documentData.uuid) ?? this.actor.items.get(documentData.uuid)
         console.log("DROP", documentData, item)
-        if (!item || (item.type != "arme" && item.type != "competence")) {
-          return true
+        switch (item?.type ?? "")
+        {
+          case TYPES.arme:
+          case TYPES.competence:
+          case TYPES.competencecreature:
+            this.addToHotbar(item, slot)
+            return false
         }
-        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);
     }
   }