Update Dutiful Challenge spell effect to use Token Mark (#16627)

foundryvtt · Sep 23, 2024 · 0fdf125 · 0fdf125
1 parent adedab9
commit 0fdf125
Showing 1 changed file with 9 additions and 87 deletions.
diff --git a/packs/spell-effects/spell-effect-dutiful-challenge.json b/packs/spell-effects/spell-effect-dutiful-challenge.json
@@ -4,7 +4,7 @@
     "name": "Spell Effect: Dutiful Challenge",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Dutiful Challenge]</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Dutiful Challenge]</p>\n<p>You take a -1 status penalty to attack rolls, damage rolls, and skill checks against creatures other than the marked creature.</p>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -22,101 +22,23 @@
         },
         "rules": [
             {
-                "domain": "all",
-                "key": "RollOption",
-                "label": "Attacking target of Dutiful Challenge",
-                "option": "dutiful-challenge",
-                "toggleable": true
+                "key": "TokenMark",
+                "slug": "dutiful-challenge"
             },
             {
                 "key": "FlatModifier",
-                "label": "Dutiful Challenge (against other targets)",
                 "predicate": [
                     {
-                        "not": "dutiful-challenge"
+                        "not": "target:mark:dutiful-challenge"
                     }
                 ],
-                "selector": "attack",
-                "type": "status",
-                "value": {
-                    "brackets": [
-                        {
-                            "end": 6,
-                            "start": 4,
-                            "value": -1
-                        },
-                        {
-                            "end": 9,
-                            "start": 9,
-                            "value": -2
-                        },
-                        {
-                            "start": 10,
-                            "value": -3
-                        }
-                    ],
-                    "field": "item|system.level.value"
-                }
-            },
-            {
-                "key": "FlatModifier",
-                "label": "Dutiful Challenge (against other targets)",
-                "predicate": [
-                    {
-                        "not": "dutiful-challenge"
-                    }
-                ],
-                "selector": "strike-damage",
-                "type": "status",
-                "value": {
-                    "brackets": [
-                        {
-                            "end": 6,
-                            "start": 4,
-                            "value": -1
-                        },
-                        {
-                            "end": 9,
-                            "start": 9,
-                            "value": -2
-                        },
-                        {
-                            "start": 10,
-                            "value": -3
-                        }
-                    ],
-                    "field": "item|system.level.value"
-                }
-            },
-            {
-                "key": "FlatModifier",
-                "label": "Dutiful Challenge (against other targets)",
-                "predicate": [
-                    {
-                        "not": "dutiful-challenge"
-                    }
+                "selector": [
+                    "attack-roll",
+                    "damage",
+                    "skill-check"
                 ],
-                "selector": "skill-check",
                 "type": "status",
-                "value": {
-                    "brackets": [
-                        {
-                            "end": 6,
-                            "start": 4,
-                            "value": -1
-                        },
-                        {
-                            "end": 9,
-                            "start": 9,
-                            "value": -2
-                        },
-                        {
-                            "start": 10,
-                            "value": -3
-                        }
-                    ],
-                    "field": "item|system.level.value"
-                }
+                "value": "-floor((@item.level - 1)/3)"
             }
         ],
         "start": {