Improve implement roll options and weapon filter

foundryvtt · Oct 16, 2024 · 96576b8 · 96576b8
1 parent de5f751
commit 96576b8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -39,7 +39,7 @@
             },
             {
                 "key": "RollOption",
-                "option": "wand-implement:equipped"
+                "option": "implement:wand:equipped"
             }
         ],
         "size": "med",