From 51958115898d8762c92202a15eed2cc52b2df64b Mon Sep 17 00:00:00 2001 From: Mike Bloy Date: Sun, 1 May 2022 17:50:37 -0500 Subject: [PATCH] update br2 actions --- macros/BR2_actions.json | 102 +++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 38 deletions(-) diff --git a/macros/BR2_actions.json b/macros/BR2_actions.json index 1ce78fc..618399b 100644 --- a/macros/BR2_actions.json +++ b/macros/BR2_actions.json @@ -1,53 +1,56 @@ [ { - "id": "Smite", - "name": "Smite", - "button_name": "Smite Bonus", - "dmgMod": "+2", + "id": "Deflection-melee", + "name": "Target has Melee Deflection", + "button_name": "Deflection", + "skillMod": -2, "defaultChecked": true, + "group": "Target", "and_selector": [ { - "not_selector": [ - { - "selector_type": "actor_has_effect", - "selector_value": "Smite with raise" - } - ] + "selector_type": "skill", + "selector_value": "Fighting" }, { - "selector_type": "actor_has_effect", - "selector_value": "Smite" - }, - { - "or_selector": [ - { - "selector_type": "skill", - "selector_value": "Fighting" - }, - { - "selector_type": "skill", - "selector_value": "Athletics" - }, - { - "selector_type": "skill", - "selector_value": "Shooting" - } - ] + "selector_type": "target_has_effect", + "selector_value": "Melee Deflection" } - ], - "group": "Spell Effects" + ] }, { - "id": "SmiteRaise", - "name": "Smite with Raise", - "button_name": "Smite Bonus", - "dmgMod": "+4", + "id": "Deflection-ranged", + "name": "Target has Ranged Deflection", + "button_name": "Deflection", + "skillMod": -2, "defaultChecked": true, + "group": "Target", "and_selector": [ { - "selector_type": "actor_has_effect", - "selector_value": "Smite with raise" + "or_selector": [ + { + "selector_type": "skill", + "selector_value": "Athletics" + }, + { + "selector_type": "skill", + "selector_value": "Shooting" + } + ] }, + { + "selector_type": "target_has_effect", + "selector_value": "Ranged Deflection" + } + ] + }, + { + "id": "Deflection", + "name": "Target has Deflection", + "button_name": "Deflection", + "skillMod": -2, + "defaultChecked": true, + "group": "Target", + "and_selector": [ { "or_selector": [ { @@ -63,8 +66,31 @@ "selector_value": "Shooting" } ] + }, + { + "and_selector": [ + { + "not_selector": [ + { + "or_selector": [ + { + "selector_type": "target_has_effect", + "selector_value": "Melee Deflection" + }, + { + "selector_type": "target_has_effect", + "selector_value": "Ranged Deflection" + } + ] + } + ] + }, + { + "selector_type": "target_has_effect", + "selector_value": "Deflection" + } + ] } - ], - "group": "Spell Effects" + ] } ] \ No newline at end of file