diff --git a/packs/actions/confident-finisher.json b/packs/actions/confident-finisher.json index ca83d64ab1c..b1f4d7e1956 100644 --- a/packs/actions/confident-finisher.json +++ b/packs/actions/confident-finisher.json @@ -45,7 +45,12 @@ "failure" ], "predicate": [ - "finisher:confident", + { + "or": [ + "finisher:confident", + "eternal-confidence" + ] + }, { "or": [ "item:melee", @@ -63,9 +68,12 @@ "item:trait:agile", "item:trait:finesse" ] + }, + { + "not": "feat:precise-finisher" } ], - "selector": "attack-roll", + "selector": "strike-attack-roll", "text": "PF2E.SpecificRule.Swashbuckler.Finisher.ConfidentNote", "title": "{item|name}" } diff --git a/packs/actions/opportune-riposte.json b/packs/actions/opportune-riposte.json index 70d449f1e4d..bc16bb2a87e 100644 --- a/packs/actions/opportune-riposte.json +++ b/packs/actions/opportune-riposte.json @@ -18,12 +18,19 @@ "remaster": false, "title": "Pathfinder Advanced Player's Guide" }, - "rules": [], + "rules": [ + { + "key": "RollOption", + "option": "opportune-riposte", + "predicate": [ + "add-opportune-riposte-toggle" + ], + "toggleable": true + } + ], "traits": { "rarity": "common", - "value": [ - "swashbuckler" - ] + "value": [] } }, "type": "action" diff --git a/packs/classfeatures/continuous-flair.json b/packs/classfeatures/continuous-flair.json index 779318b516f..f149b0f8c2a 100644 --- a/packs/classfeatures/continuous-flair.json +++ b/packs/classfeatures/continuous-flair.json @@ -11,7 +11,7 @@ }, "category": "classfeature", "description": { - "value": "

While not equal to the heights of your panache in combat, you have a dramatic flair about you in any situation.

\n

Whenever you succeed at a check during exploration that would have granted you panache in combat, you gain a +1 circumstance bonus to further checks for actions that would grant you panache in combat. This benefit ends when the exploration changes to a different scene (as determined by the GM) or shifts to an encounter or downtime.

" + "value": "

While not equal to the heights of your panache in combat, you have a dramatic flair about you in any situation.

\n

Whenever you succeed at a check during exploration that would have granted you panache in combat, you gain a +1 circumstance bonus to further checks for actions that would grant you panache in combat. This benefit ends when the exploration changes to a different scene (as determined by the GM) or shifts to an encounter or downtime.

\n

@UUID[Compendium.pf2e.feat-effects.Item.Effect: Continuous Flair]

" }, "level": { "value": 11 @@ -24,7 +24,27 @@ "remaster": false, "title": "Pathfinder Advanced Player's Guide" }, - "rules": [], + "rules": [ + { + "key": "Note", + "outcome": [ + "success", + "criticalSuccess" + ], + "predicate": [ + { + "nor": [ + "encounter", + "self:effect:continuous-flair" + ] + }, + "grants-panache" + ], + "selector": "skill-check", + "text": "{item|description}", + "title": "{item|name}" + } + ], "traits": { "rarity": "common", "value": [ diff --git a/packs/classfeatures/eternal-confidence.json b/packs/classfeatures/eternal-confidence.json index 41542a5965a..6a648a8a61d 100644 --- a/packs/classfeatures/eternal-confidence.json +++ b/packs/classfeatures/eternal-confidence.json @@ -24,10 +24,29 @@ "remaster": false, "title": "Pathfinder Advanced Player's Guide" }, - "rules": [], + "rules": [ + { + "key": "RollOption", + "option": "add-opportune-riposte-toggle", + "priority": 49 + }, + { + "key": "RollOption", + "option": "eternal-confidence", + "predicate": [ + { + "or": [ + "finisher", + "opportune-riposte" + ] + } + ] + } + ], "subfeatures": { "proficiencies": { "swashbuckler": { + "attribute": null, "rank": 3 } } diff --git a/packs/classfeatures/exemplary-finisher.json b/packs/classfeatures/exemplary-finisher.json index b34df446f1e..d6ad8b4fb71 100644 --- a/packs/classfeatures/exemplary-finisher.json +++ b/packs/classfeatures/exemplary-finisher.json @@ -11,7 +11,7 @@ }, "category": "classfeature", "description": { - "value": "

You execute your finishing moves with spectacular flair, adding special effects to your finishers. If a Strike you make as part of a finisher hits a foe, you add one of the following effects to the Strike, depending on your swashbuckler's style.

\n" + "value": "

You execute your finishing moves with spectacular flair, adding special effects to your finishers. If a Strike you make as part of a finisher hits a foe, you add one of the following effects to the Strike, depending on your swashbuckler's style.

\n" }, "level": { "value": 9 diff --git a/packs/feat-effects/effect-continuous-flair.json b/packs/feat-effects/effect-continuous-flair.json new file mode 100644 index 00000000000..f7c93289f4d --- /dev/null +++ b/packs/feat-effects/effect-continuous-flair.json @@ -0,0 +1,49 @@ +{ + "_id": "DVIxPdgUN8T5LwIp", + "img": "systems/pf2e/icons/features/classes/continuous-flair.webp", + "name": "Effect: Continuous Flair", + "system": { + "description": { + "value": "

Granted by @UUID[Compendium.pf2e.classfeatures.Item.Continuous Flair]

\n

You gain a +1 circumstance bonus to further checks for actions that would grant you panache in combat.

" + }, + "duration": { + "expiry": null, + "sustained": false, + "unit": "unlimited", + "value": -1 + }, + "level": { + "value": 1 + }, + "publication": { + "license": "OGL", + "remaster": false, + "title": "Pathfinder Advanced Player's Guide" + }, + "rules": [ + { + "key": "FlatModifier", + "predicate": [ + { + "not": "encounter" + }, + "grants-panache" + ], + "selector": "skill-check", + "type": "circumstance", + "value": 1 + } + ], + "start": { + "initiative": null, + "value": 0 + }, + "tokenIcon": { + "show": true + }, + "traits": { + "value": [] + } + }, + "type": "effect" +} diff --git a/packs/feat-effects/effect-exemplary-finisher-wit.json b/packs/feat-effects/effect-exemplary-finisher-wit.json new file mode 100644 index 00000000000..4d314d79b4a --- /dev/null +++ b/packs/feat-effects/effect-exemplary-finisher-wit.json @@ -0,0 +1,46 @@ +{ + "_id": "cu10OjQUdY0a9gpj", + "img": "systems/pf2e/icons/features/classes/wit-style.webp", + "name": "Effect: Exemplary Finisher (Wit)", + "system": { + "description": { + "value": "

Granted by @UUID[Compendium.pf2e.classfeatures.Item.Exemplary Finisher]

\n

The foe takes a -2 circumstance penalty to attack rolls against you until the start of your next turn.

" + }, + "duration": { + "expiry": "turn-start", + "sustained": false, + "unit": "rounds", + "value": 1 + }, + "level": { + "value": 1 + }, + "publication": { + "license": "OGL", + "remaster": false, + "title": "Pathfinder Advanced Player's Guide" + }, + "rules": [ + { + "key": "FlatModifier", + "predicate": [ + "target:signature:{item|origin.signature}" + ], + "selector": "attack", + "type": "circumstance", + "value": -2 + } + ], + "start": { + "initiative": null, + "value": 0 + }, + "tokenIcon": { + "show": true + }, + "traits": { + "value": [] + } + }, + "type": "effect" +} diff --git a/packs/feats/felicitous-riposte.json b/packs/feats/felicitous-riposte.json index e142299a31a..8ccde3eaaaf 100644 --- a/packs/feats/felicitous-riposte.json +++ b/packs/feats/felicitous-riposte.json @@ -24,7 +24,21 @@ "remaster": false, "title": "Pathfinder Advanced Player's Guide" }, - "rules": [], + "rules": [ + { + "key": "RollOption", + "option": "add-opportune-riposte-toggle", + "priority": 49 + }, + { + "keep": "higher", + "key": "RollTwice", + "predicate": [ + "opportune-riposte" + ], + "selector": "strike-attack-roll" + } + ], "traits": { "rarity": "common", "value": [ diff --git a/packs/feats/impossible-riposte.json b/packs/feats/impossible-riposte.json index 5386dc054af..991e243e716 100644 --- a/packs/feats/impossible-riposte.json +++ b/packs/feats/impossible-riposte.json @@ -28,7 +28,109 @@ "remaster": false, "title": "Pathfinder Advanced Player's Guide" }, - "rules": [], + "rules": [ + { + "key": "RollOption", + "option": "add-opportune-riposte-toggle", + "priority": 49 + }, + { + "disabledIf": [ + { + "not": "opportune-riposte" + } + ], + "disabledValue": false, + "key": "RollOption", + "option": "impossible-riposte", + "priority": 51, + "suboptions": [ + { + "label": "PF2E.TraitBludgeoning", + "value": "bludgeoning" + }, + { + "label": "PF2E.TraitPiercing", + "value": "piercing" + }, + { + "label": "PF2E.TraitSlashing", + "value": "slashing" + }, + { + "label": "PF2E.TraitAcid", + "value": "acid" + }, + { + "label": "PF2E.TraitCold", + "value": "cold" + }, + { + "label": "PF2E.TraitElectricity", + "value": "electricity" + }, + { + "label": "PF2E.TraitFire", + "value": "fire" + }, + { + "label": "PF2E.TraitSonic", + "value": "sonic" + }, + { + "label": "PF2E.TraitVitality", + "value": "vitality" + }, + { + "label": "PF2E.TraitVoid", + "value": "void" + }, + { + "label": "PF2E.TraitForce", + "value": "force" + }, + { + "label": "PF2E.TraitSpirit", + "value": "spirit" + }, + { + "label": "PF2E.TraitMental", + "value": "mental" + }, + { + "label": "PF2E.TraitPoison", + "value": "poison" + }, + { + "label": "PF2E.TraitBleed", + "value": "bleed" + } + ], + "toggleable": true + }, + { + "itemType": "weapon", + "key": "ItemAlteration", + "mode": "override", + "predicate": [ + "impossible-riposte" + ], + "property": "damage-type", + "value": "{item|flags.pf2e.rulesSelections.impossibleRiposte}" + }, + { + "key": "DamageAlteration", + "mode": "override", + "predicate": [ + "impossible-riposte" + ], + "property": "damage-type", + "selectors": [ + "strike-damage" + ], + "value": "{item|flags.pf2e.rulesSelections.impossibleRiposte}" + } + ], "traits": { "rarity": "common", "value": [ diff --git a/packs/feats/precise-finisher.json b/packs/feats/precise-finisher.json index 9f5fff0e571..cfe47fafccc 100644 --- a/packs/feats/precise-finisher.json +++ b/packs/feats/precise-finisher.json @@ -28,7 +28,43 @@ "remaster": false, "title": "Pathfinder Advanced Player's Guide" }, - "rules": [], + "rules": [ + { + "key": "Note", + "outcome": [ + "failure" + ], + "predicate": [ + { + "or": [ + "finisher:confident", + "eternal-confidence" + ] + }, + { + "or": [ + "item:melee", + { + "and": [ + "feat:flying-blade", + "item:thrown", + "target:range-increment:1" + ] + } + ] + }, + { + "or": [ + "item:trait:agile", + "item:trait:finesse" + ] + } + ], + "selector": "strike-attack-roll", + "text": "PF2E.SpecificRule.Swashbuckler.Finisher.PreciseNote", + "title": "{item|name}" + } + ], "traits": { "rarity": "common", "value": [ diff --git a/static/lang/re-en.json b/static/lang/re-en.json index 9949bd2f003..329432861c7 100644 --- a/static/lang/re-en.json +++ b/static/lang/re-en.json @@ -2265,7 +2265,7 @@ "Braggart": "If the foe was temporarily immune to your @UUID[Compendium.pf2e.actionspf2e.Item.2u915NdUyQan6uKF]{Demoralize}, their temporary immunity ends.", "Fencer": "The foe is @UUID[Compendium.pf2e.conditionitems.Item.AJh5ex99aV6VTggg]{Off-Guard} until your next turn.", "Name": "Exemplary Finisher", - "Wit": "The foe takes a -2 circumstance penalty to attack rolls against you until the start of your next turn." + "Wit": "The foe takes a -2 circumstance penalty to attack rolls against you until the start of your next turn. @UUID[Compendium.pf2e.feat-effects.Item.cu10OjQUdY0a9gpj]{Effect: Exemplary Finisher (Wit)}" }, "ExorcistDedication": { "SpiritDwelling": "Your Spirit Dwelling contains a spirit" @@ -3662,6 +3662,7 @@ "Lethal": "Lethal", "Mobile": "Mobile", "Perfect": "Perfect", + "PreciseNote": "On a failure, you apply your @Damage[((@actor.flags.pf2e.swashbuckler.preciseStrike)d6[precision])[@item.system.damage.damageType]]{full precise strike damage} instead of half.", "Stunning": "Stunning", "Targeting": "Targeting", "Unbalancing": "Unbalancing"