Update some NPC separate toggles to suboptions (#8365)

foundryvtt · Jun 20, 2023 · 321146e · 321146e
1 parent 9447af5
commit 321146e
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 104 deletions.
diff --git a/packs/npc-gallery/surgeon.json b/packs/npc-gallery/surgeon.json
@@ -355,38 +355,28 @@
  },
  "rules": [
  {
- "domain": "all",
+ "domain": "damage-roll",
  "key": "RollOption",
  "option": "medical-malpractice",
- "toggleable": true
- },
- {
- "domain": "all",
- "key": "RollOption",
- "label": "PF2E.NPCAbility.Surgeon.MedicalMalpracticeCriticalSuccess",
- "option": "medical-malpractice-crit",
- "toggleable": true
- },
- {
- "category": "precision",
- "diceNumber": 1,
- "dieSize": "d6",
- "key": "DamageDice",
- "predicate": [
- "medical-malpractice",
+ "suboptions": [
  {
- "not": "medical-malpractice-crit"
+ "label": "PF2E.Check.Result.Degree.Check.success",
+ "value": "1"
+ },
+ {
+ "label": "PF2E.Check.Result.Degree.Check.criticalSuccess",
+ "value": "2"
  }
  ],
- "selector": "strike-damage"
+ "toggleable": true
  },
  {
  "category": "precision",
- "diceNumber": 2,
+ "diceNumber": "@item.flags.pf2e.rulesSelections.medicalMalpractice",
  "dieSize": "d6",
  "key": "DamageDice",
  "predicate": [
- "medical-malpractice-crit"
+ "medical-malpractice"
  ],
  "selector": "strike-damage"
  }

diff --git a/packs/pathfinder-bestiary-3/hellbound-attorney.json b/packs/pathfinder-bestiary-3/hellbound-attorney.json
@@ -548,40 +548,30 @@
  },
  "rules": [
  {
- "category": "precision",
- "diceNumber": 2,
- "dieSize": "d6",
- "key": "DamageDice",
- "predicate": [
- "opening-statement",
+ "domain": "damage-roll",
+ "key": "RollOption",
+ "option": "opening-statement",
+ "suboptions": [
+ {
+ "label": "PF2E.Check.Result.Degree.Check.success",
+ "value": "2"
+ },
  {
- "not": "opening-statement-crit"
+ "label": "PF2E.Check.Result.Degree.Check.criticalSuccess",
+ "value": "4"
  }
  ],
- "selector": "strike-damage"
+ "toggleable": true
  },
  {
  "category": "precision",
- "diceNumber": 4,
+ "diceNumber": "@item.flags.pf2e.rulesSelections.openingStatement",
  "dieSize": "d6",
  "key": "DamageDice",
  "predicate": [
- "opening-statement-crit"
+ "opening-statement"
  ],
  "selector": "strike-damage"
- },
- {
- "domain": "all",
- "key": "RollOption",
- "option": "opening-statement",
- "toggleable": true
- },
- {
- "domain": "all",
- "key": "RollOption",
- "label": "PF2E.NPCAbility.HellboundAttorney.OpeningStatementCriticalSuccess",
- "option": "opening-statement-crit",
- "toggleable": true
  }
  ],
  "slug": null,

diff --git a/packs/pfs-season-1-bestiary/webhekiz-3-4.json b/packs/pfs-season-1-bestiary/webhekiz-3-4.json
@@ -1847,34 +1847,26 @@
  {
  "domain": "damage-roll",
  "key": "RollOption",
- "label": "Bespell Weapon (Poison)",
- "option": "bespell-poison",
- "toggleable": true
- },
- {
- "domain": "damage-roll",
- "key": "RollOption",
- "label": "Bespell Weapon (Piercing)",
- "option": "bespell-piercing",
- "toggleable": true
- },
- {
- "damageType": "poison",
- "diceNumber": 1,
- "dieSize": "d6",
- "key": "DamageDice",
- "predicate": [
- "bespell-poison"
+ "option": "bespell-primal-weapon",
+ "suboptions": [
+ {
+ "label": "PF2E.TraitPoison",
+ "value": "poison"
+ },
+ {
+ "label": "PF2E.TraitPiercing",
+ "value": "piercing"
+ }
  ],
- "selector": "strike-damage"
+ "toggleable": true
  },
  {
- "damageType": "piercing",
+ "damageType": "{item|flags.pf2e.rulesSelections.bespellPrimalWeapon}",
  "diceNumber": 1,
  "dieSize": "d6",
  "key": "DamageDice",
  "predicate": [
- "bespell-piercing"
+ "bespell-primal-weapon"
  ],
  "selector": "strike-damage"
  }

diff --git a/packs/pfs-season-1-bestiary/webhekiz-5-6.json b/packs/pfs-season-1-bestiary/webhekiz-5-6.json
@@ -2087,34 +2087,26 @@
  {
  "domain": "damage-roll",
  "key": "RollOption",
- "label": "Bespell Weapon (Poison)",
- "option": "bespell-poison",
- "toggleable": true
- },
- {
- "domain": "damage-roll",
- "key": "RollOption",
- "label": "Bespell Weapon (Piercing)",
- "option": "bespell-piercing",
- "toggleable": true
- },
- {
- "damageType": "poison",
- "diceNumber": 1,
- "dieSize": "d6",
- "key": "DamageDice",
- "predicate": [
- "bespell-poison"
+ "option": "bespell-primal-weapon",
+ "suboptions": [
+ {
+ "label": "PF2E.TraitPoison",
+ "value": "poison"
+ },
+ {
+ "label": "PF2E.TraitPiercing",
+ "value": "piercing"
+ }
  ],
- "selector": "strike-damage"
+ "toggleable": true
  },
  {
- "damageType": "piercing",
+ "damageType": "{item|flags.pf2e.rulesSelections.bespellPrimalWeapon}",
  "diceNumber": 1,
  "dieSize": "d6",
  "key": "DamageDice",
  "predicate": [
- "bespell-piercing"
+ "bespell-primal-weapon"
  ],
  "selector": "strike-damage"
  }

diff --git a/packs/strength-of-thousands-bestiary/halbrux-far-sight.json b/packs/strength-of-thousands-bestiary/halbrux-far-sight.json
@@ -4366,33 +4366,28 @@
  },
  "rules": [
  {
- "domain": "all",
+ "domain": "damage-roll",
  "key": "RollOption",
  "option": "predictive-blows",
- "toggleable": true
- },
- {
- "diceNumber": 4,
- "dieSize": "d6",
- "key": "DamageDice",
- "predicate": [
- "predictive-blows"
+ "suboptions": [
+ {
+ "label": "PF2E.Check.Result.Degree.Check.success",
+ "value": "4"
+ },
+ {
+ "label": "PF2E.Check.Result.Degree.Check.criticalSuccess",
+ "value": "6"
+ }
  ],
- "selector": "strike-damage"
- },
- {
- "domain": "all",
- "key": "RollOption",
- "label": "Predictive Blows - Critical Success",
- "option": "predictive-blows-critical",
  "toggleable": true
  },
  {
- "diceNumber": 6,
+ "category": "precision",
+ "diceNumber": "@item.flags.pf2e.rulesSelections.predictiveBlows",
  "dieSize": "d6",
  "key": "DamageDice",
  "predicate": [
- "predictive-blows-critical"
+ "predictive-blows"
  ],
  "selector": "strike-damage"
  }