From 96576b8e351ec73a1f78d530c48961fd56e67b75 Mon Sep 17 00:00:00 2001
From: pedrogrullada <pedrogrullada@gmail.com>
Date: Tue, 15 Oct 2024 21:44:14 -0300
Subject: [PATCH] Improve implement roll options and weapon filter

---
 packs/classfeatures/weapon.json        | 13 +++++++++++--
 packs/equipment/amulet-implement.json  |  2 +-
 packs/equipment/bell-implement.json    |  2 +-
 packs/equipment/chalice-implement.json |  2 +-
 packs/equipment/lantern-implement.json |  2 +-
 packs/equipment/mirror-implement.json  |  2 +-
 packs/equipment/regalia-implement.json |  2 +-
 packs/equipment/tome-implement.json    |  2 +-
 packs/equipment/wand-implement.json    |  2 +-
 9 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packs/classfeatures/weapon.json b/packs/classfeatures/weapon.json
index b93033360d8..8830ebf0393 100644
--- a/packs/classfeatures/weapon.json
+++ b/packs/classfeatures/weapon.json
@@ -33,10 +33,12 @@
                 "adjustName": false,
                 "choices": {
                     "filter": [
-                        "item:level:0",
                         "item:usage:hands:1",
                         {
-                            "not": "item:trait:consumable"
+                            "nor": [
+                                "item:trait:consumable",
+                                "item:magical"
+                            ]
                         }
                     ],
                     "itemType": "weapon"
@@ -65,6 +67,13 @@
                     "weapon-implement:equipped"
                 ]
             },
+            {
+                "key": "RollOption",
+                "option": "implement:weapon:equipped",
+                "predicate": [
+                    "weapon-implement:equipped"
+                ]
+            },
             {
                 "itemId": "{item|flags.pf2e.itemGrants.weaponImplement.id}",
                 "key": "ItemAlteration",
diff --git a/packs/equipment/amulet-implement.json b/packs/equipment/amulet-implement.json
index 9029a0f446c..d658074530a 100644
--- a/packs/equipment/amulet-implement.json
+++ b/packs/equipment/amulet-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "amulet-implement:equipped"
+                "option": "implement:amulet:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/bell-implement.json b/packs/equipment/bell-implement.json
index c05ff10f4a9..1a986e99a52 100644
--- a/packs/equipment/bell-implement.json
+++ b/packs/equipment/bell-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "bell-implement:equipped"
+                "option": "implement:bell:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/chalice-implement.json b/packs/equipment/chalice-implement.json
index 2bef5b7f5d2..fa9de583c99 100644
--- a/packs/equipment/chalice-implement.json
+++ b/packs/equipment/chalice-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "chalice-implement:equipped"
+                "option": "implement:chalice:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/lantern-implement.json b/packs/equipment/lantern-implement.json
index f05f8634ecd..444fc7bc123 100644
--- a/packs/equipment/lantern-implement.json
+++ b/packs/equipment/lantern-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "lantern-implement:equipped"
+                "option": "implement:lantern:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/mirror-implement.json b/packs/equipment/mirror-implement.json
index 69aec669325..87d1974bac4 100644
--- a/packs/equipment/mirror-implement.json
+++ b/packs/equipment/mirror-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "mirror-implement:equipped"
+                "option": "implement:mirror:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/regalia-implement.json b/packs/equipment/regalia-implement.json
index ed0bc665eb9..db1d471a92f 100644
--- a/packs/equipment/regalia-implement.json
+++ b/packs/equipment/regalia-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "regalia-implement:equipped"
+                "option": "implement:regalia:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/tome-implement.json b/packs/equipment/tome-implement.json
index 30f95f1b5a4..421b8c64e05 100644
--- a/packs/equipment/tome-implement.json
+++ b/packs/equipment/tome-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "tome-implement:equipped"
+                "option": "implement:wand:equipped"
             }
         ],
         "size": "med",
diff --git a/packs/equipment/wand-implement.json b/packs/equipment/wand-implement.json
index 62017e4af53..fbccce514ee 100644
--- a/packs/equipment/wand-implement.json
+++ b/packs/equipment/wand-implement.json
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "wand-implement:equipped"
+                "option": "implement:wand:equipped"
             }
         ],
         "size": "med",