Merge branch 'master' of https://github.com/foundryvtt/pf2e

packs/abomination-vaults-bestiary/chandriu-invisar.json

@@ -222,36 +222,11 @@
  },
  "type": "lore"
  },
- {
- "_id": "a08Gf29QPITHX7mo",
- "img": "systems/pf2e/icons/default-icons/lore.svg",
- "name": "Scriptorium Lore",
- "sort": 700000,
- "system": {
- "description": {
- "value": ""
- },
- "mod": {
- "value": 18
- },
- "proficient": {
- "value": 0
- },
- "publication": {
- "license": "OGL",
- "remaster": false,
- "title": ""
- },
- "rules": [],
- "slug": null
- },
- "type": "lore"
- },
  {
  "_id": "zYG8EuV0zKNI1RWM",
  "img": "systems/pf2e/icons/default-icons/lore.svg",
  "name": "Society",
- "sort": 800000,
+ "sort": 700000,
  "system": {
  "description": {
  "value": ""
@@ -276,7 +251,7 @@
  "_id": "CMa1dfaIpWa90Qch",
  "img": "systems/pf2e/icons/default-icons/lore.svg",
  "name": "Stealth",
- "sort": 900000,
+ "sort": 800000,
  "system": {
  "description": {
  "value": ""

packs/actions/treat-wounds.json

@@ -11,7 +11,7 @@
  },
  "category": "interaction",
  "description": {
- "value": "<p><strong>Requirements</strong> You're wearing or holding a @UUID[Compendium.pf2e.equipment-srd.Item.Healer's Toolkit].</p>\n<hr />\n<p>You spend 10 minutes treating one injured living creature (targeting yourself, if you so choose). The target is then temporarily @UUID[Compendium.pf2e.feat-effects.Item.Effect: Treat Wounds Immunity]{immune} to Treat Wounds actions for 1 hour, but this interval overlaps with the time you spent treating (so a patient can be treated once per hour, not once per 70 minutes).</p>\n<p>The Medicine check DC is usually 15, though the GM might adjust it based on the circumstances, such as treating a patient outside in a storm, or treating magically cursed wounds. If you're an expert in Medicine, you can instead attempt a DC 20 check to increase the Hit Points regained by 10; if you're a master of Medicine, you can instead attempt a DC 30 check to increase the Hit Points regained by 30; and if you're legendary, you can instead attempt a DC 40 check to increase the Hit Points regained by 50. The damage dealt on a critical failure remains the same.</p>\n<p>If you succeed at your check, you can continue treating the target to grant additional healing. If you treat them for a total of 1 hour, double the Hit Points they regain from Treat Wounds.</p>\n<p>The result of your Medicine check determines how many Hit Points the target regains.</p>\n<p>@UUID[Compendium.pf2e.pf2e-macros.Macro.Treat Wounds]</p>\n<hr />\n<p><strong>Critical Success</strong> The target regains [[/r 4d8]] Hit Points, and its @UUID[Compendium.pf2e.conditionitems.Item.Wounded] condition is removed.</p>\n<p><strong>Success</strong> The target regains [[/r 2d8]] Hit Points, and its wounded condition is removed.</p>\n<p><strong>Critical Failure</strong> The target takes [[/r 1d8]] damage.</p>"
+ "value": "<p><strong>Requirements</strong> You're wearing or holding a @UUID[Compendium.pf2e.equipment-srd.Item.Healer's Toolkit].</p>\n<hr />\n<p>You spend 10 minutes treating one injured living creature (targeting yourself, if you so choose). The target is then temporarily @UUID[Compendium.pf2e.feat-effects.Item.Effect: Treat Wounds Immunity]{immune} to Treat Wounds actions for 1 hour, but this interval overlaps with the time you spent treating (so a patient can be treated once per hour, not once per 70 minutes).</p>\n<p>The Medicine check DC is usually 15, though the GM might adjust it based on the circumstances, such as treating a patient outside in a storm, or treating magically cursed wounds. If you're an expert in Medicine, you can instead attempt a DC 20 check to increase the Hit Points regained by 10; if you're a master of Medicine, you can instead attempt a DC 30 check to increase the Hit Points regained by 30; and if you're legendary, you can instead attempt a DC 40 check to increase the Hit Points regained by 50. The damage dealt on a critical failure remains the same.</p>\n<p>If you succeed at your check, you can continue treating the target to grant additional healing. If you treat it for a total of 1 hour, double the Hit Points it regains from Treat Wounds.</p>\n<p>The result of your Medicine check determines how many Hit Points the target regains.</p>\n<p>@UUID[Compendium.pf2e.pf2e-macros.Macro.Treat Wounds]</p>\n<hr />\n<p><strong>Critical Success</strong> The target regains [[/r 4d8[healing] #Treat Wounds]] Hit Points and loses the @UUID[Compendium.pf2e.conditionitems.Item.Wounded] condition.</p>\n<p><strong>Success</strong> The target regains [[/r 2d8[healing] #Treat Wounds]] Hit Points, and loses the wounded condition.</p>\n<p><strong>Critical Failure</strong> The target takes [[/r 1d8[damage] #Treat Wounds (Critical Failure)]] damage.</p>"
  },
  "publication": {
  "license": "ORC",
@@ -24,8 +24,7 @@
  "value": [
  "exploration",
  "healing",
- "manipulate",
- "skill"
+ "manipulate"
  ]
  }
  },

packs/age-of-ashes-bestiary/dragonstorm-fire-giant.json

@@ -543,20 +543,23 @@
  "title": "Pathfinder Bestiary"
  },
  "rules": [
+ {
+ "domain": "all",
+ "key": "RollOption",
+ "option": "catch-rock",
+ "toggleable": true
+ },
  {
  "key": "FlatModifier",
  "predicate": [
  "catch-rock"
  ],
- "selector": "ac",
+ "selector": [
+ "ac",
+ "saving-throw"
+ ],
  "type": "circumstance",
  "value": 4
- },
- {
- "domain": "all",
- "key": "RollOption",
- "option": "catch-rock",
- "toggleable": true
  }
  ],
  "slug": "catch-rock",

packs/age-of-ashes-bestiary/saggorak-poltergeist.json

@@ -272,27 +272,67 @@
  "damageRolls": {
  "9i9jkoq251cos6qcgcp3": {
  "damage": "4d12",
- "damageType": "bludgeoning"
+ "damageType": "untyped"
  }
  },
  "description": {
- "value": ""
+ "value": "<p>Damage type depends on object thrown</p>"
  },
  "publication": {
  "license": "OGL",
  "remaster": false,
  "title": ""
  },
- "rules": [],
+ "rules": [
+ {
+ "alwaysActive": true,
+ "domain": "damage",
+ "key": "RollOption",
+ "option": "telekinetic-object",
+ "suboptions": [
+ {
+ "label": "PF2E.TraitBludgeoning",
+ "value": "bludgeoning"
+ },
+ {
+ "label": "PF2E.TraitPiercing",
+ "value": "piercing"
+ },
+ {
+ "label": "PF2E.TraitSlashing",
+ "value": "slashing"
+ }
+ ],
+ "toggleable": true,
+ "value": true
+ },
+ {
+ "key": "DamageDice",
+ "override": {
+ "damageType": "{item|flags.pf2e.rulesSelections.telekineticObject}"
+ },
+ "selector": "{item|id}-damage"
+ },
+ {
+ "key": "DamageAlteration",
+ "mode": "override",
+ "predicate": [
+ "item:slug:telekinetic-storm"
+ ],
+ "property": "damage-type",
+ "selectors": [
+ "inline-damage"
+ ],
+ "value": "{item|flags.pf2e.rulesSelections.telekineticObject}"
+ }
+ ],
  "slug": null,
  "traits": {
  "rarity": "common",
  "value": [
  "magical",
  "occult",
- "range-increment-60",
- "versatile-p",
- "versatile-s"
+ "range-increment-60"
  ]
  },
  "weaponType": {
@@ -484,7 +524,7 @@
  },
  "category": "offensive",
  "description": {
- "value": "<p>The poltergeist telekinetically throws numerous small and jagged chunks of stone rubble, either spreading them out among multiple foes or directing them at one target.</p>\n<ul>\n<li>When this effect is spread out among multiple foes, the poltergeist makes a telekinetic object Strike at a -2 penalty against each creature within 30 feet. These count as one attack for the poltergeist's multiple attack penalty, and the penalty doesn't increase until after all the attacks.</li>\n<li>When this effect has only one target, the poltergeist makes a telekinetic object Strike against the target, and the damage increases to 6d12. It deals [[/r 2d12 #Telekinetic Storm Failure]]{2d12 damage} on a failure, and no damage on a critical failure.</li>\n</ul>"
+ "value": "<p>The poltergeist telekinetically throws numerous small and jagged chunks of stone rubble, either spreading them out among multiple foes or directing them at one target.</p>\n<ul>\n<li>When this effect is spread out among multiple foes, the poltergeist makes a telekinetic object Strike at a -2 penalty against each creature within @Template[type:emanation|distance:30]{30 feet}. These count as one attack for the poltergeist's multiple attack penalty, and the penalty doesn't increase until after all the attacks.</li>\n<li>When this effect has only one target, the poltergeist makes a telekinetic object Strike against the target, and the damage increases to 6d12. It deals @Damage[2d12[untyped]] damage on a failure, and no damage on a critical failure.</li>\n</ul>"
  },
  "publication": {
  "license": "OGL",
@@ -513,20 +553,20 @@
  "predicate": [
  "telekinetic-storm:multi"
  ],
- "selector": "attack",
+ "selector": "telekinetic-object-attack",
  "value": -2
  },
  {
- "diceNumber": 1,
+ "diceNumber": 2,
  "dieSize": "d12",
  "key": "DamageDice",
  "predicate": [
  "telekinetic-storm:single"
  ],
- "selector": "damage"
+ "selector": "telekinetic-object-damage"
  }
  ],
- "slug": null,
+ "slug": "telekinetic-storm",
  "traits": {
  "rarity": "common",
  "value": [

packs/bestiary-ability-glossary-srd/catch-rock.json

@@ -18,7 +18,26 @@
  "remaster": false,
  "title": "Pathfinder Bestiary"
  },
- "rules": [],
+ "rules": [
+ {
+ "domain": "all",
+ "key": "RollOption",
+ "option": "catch-rock",
+ "toggleable": true
+ },
+ {
+ "key": "FlatModifier",
+ "predicate": [
+ "catch-rock"
+ ],
+ "selector": [
+ "ac",
+ "saving-throw"
+ ],
+ "type": "circumstance",
+ "value": 4
+ }
+ ],
  "traits": {
  "rarity": "common",
  "value": []

packs/blood-lords-bestiary/agorron-guard.json

@@ -766,7 +766,26 @@
  "remaster": false,
  "title": "Pathfinder Bestiary"
  },
- "rules": [],
+ "rules": [
+ {
+ "domain": "all",
+ "key": "RollOption",
+ "option": "catch-rock",
+ "toggleable": true
+ },
+ {
+ "key": "FlatModifier",
+ "predicate": [
+ "catch-rock"
+ ],
+ "selector": [
+ "ac",
+ "saving-throw"
+ ],
+ "type": "circumstance",
+ "value": 4
+ }
+ ],
  "slug": "catch-rock",
  "traits": {
  "rarity": "common",

packs/blood-lords-bestiary/blaanlool.json

@@ -709,7 +709,26 @@
  "remaster": false,
  "title": "Pathfinder Bestiary"
  },
- "rules": [],
+ "rules": [
+ {
+ "domain": "all",
+ "key": "RollOption",
+ "option": "catch-rock",
+ "toggleable": true
+ },
+ {
+ "key": "FlatModifier",
+ "predicate": [
+ "catch-rock"
+ ],
+ "selector": [
+ "ac",
+ "saving-throw"
+ ],
+ "type": "circumstance",
+ "value": 4
+ }
+ ],
  "slug": "catch-rock",
  "traits": {
  "rarity": "common",
@@ -797,14 +816,31 @@
  },
  "category": "offensive",
  "description": {
- "value": "<p>The marsh giant makes a melee Strike with its gaff. If it hits, it twists and yanks the gaff to create an awful wound, dealing @Damage[3d6[bleed]] to the creature.</p>"
+ "value": "<p>The marsh giant makes a melee Strike with its gaff. If it hits, it twists and yanks the gaff to create an awful wound, dealing 3d6 persistent bleed damage to the creature.</p>"
  },
  "publication": {
  "license": "OGL",
  "remaster": false,
  "title": ""
  },
- "rules": [],
+ "rules": [
+ {
+ "domain": "damage",
+ "key": "RollOption",
+ "option": "twist-the-hook",
+ "toggleable": true
+ },
+ {
+ "damageType": "bleed",
+ "diceNumber": 3,
+ "dieSize": "d6",
+ "key": "DamageDice",
+ "predicate": [
+ "twist-the-hook"
+ ],
+ "selector": "gaff-damage"
+ }
+ ],
  "slug": null,
  "traits": {
  "rarity": "common",