@opencharacter/orc-2e 0.2.0 → 0.3.0

package/i18n/en.yaml

@@ -9,6 +9,7 @@ actions.create-character.name: Build a character
 actions.create-character.steps.ancestry.prompt: Choose an ancestry
 actions.create-character.steps.background.prompt: Choose a background
 actions.create-character.steps.class.prompt: Choose a class
+actions.create-character.steps.freeBoosts.prompt: Choose four free attribute boosts
 actions.create-character.steps.heritage.prompt: Choose a heritage
 actions.random-character.name: Build a random character
 actions.random-character.steps.ancestry.prompt: Choose an ancestry
@@ -409,6 +410,18 @@ groups.feats.sections.skill.name: Skill feats
 groups.gear.label: Gear
 groups.heritage.label: Heritage
 groups.consumables.label: Consumables
+groups.consumables.sections.potion.name: Potions
+groups.consumables.sections.elixir.name: Elixirs
+groups.consumables.sections.mutagen.name: Mutagens
+groups.consumables.sections.bomb.name: Bombs
+groups.consumables.sections.poison.name: Poisons
+groups.consumables.sections.tool.name: Tools
+groups.consumables.sections.scroll.name: Scrolls
+groups.consumables.sections.talisman.name: Talismans
+groups.consumables.sections.oil.name: Oils
+groups.consumables.sections.ammunition.name: Ammunition
+groups.consumables.sections.snare.name: Snares
+groups.consumables.sections.other.name: Other consumables
 groups.rituals.label: Rituals
 groups.variant-features.label: Variant rules
 groups.boost-picks.label: Attribute boosts picked
@@ -418,7 +431,6 @@ groups.reactions.label: Reactions and shields
 groups.saves.label: Saving throws and Perception
 groups.shields.label: Shields
 groups.skill-increases.label: Skill increases
-groups.skill-ranks.label: Skill proficiency
 groups.skills.label: Skills
 groups.strikes.label: Strikes
 groups.summary.label: Character
@@ -682,6 +694,11 @@ tags.feat-action.name: 'Feat action'
 tags.class-dc.name: 'Class DC'
 tags.condition.name: 'Condition'
 tags.creation.name: 'Creation'
+tags.creation.ancestry.name: 'Creation: ancestry'
+tags.creation.heritage.name: 'Creation: heritage'
+tags.creation.background.name: 'Creation: background'
+tags.creation.class.name: 'Creation: class'
+tags.creation.finish.name: 'Creation: finish'
 tags.d20.name: 'd20 roll'
 tags.damage.name: 'Damage'
 tags.damage.acid.name: 'Acid damage'
@@ -723,6 +740,7 @@ tags.group.spear.name: 'Spear group'
 tags.group.sword.name: 'Sword group'
 tags.hunt-prey.name: 'Hunt Prey'
 tags.level-up.name: 'Level up'
+tags.level-up.gain.name: 'Level up: gain'
 tags.lore.name: 'Lore'
 tags.perception.name: 'Perception'
 tags.persistent-damage.name: 'Persistent damage'

package/pack.yaml

@@ -1,6 +1,6 @@
 id: orc-2e
-version: 0.2.0
-specVersion: 0.2.0
+version: 0.3.0
+specVersion: 0.3.0
 license: ORC
 # The ORC License's four notices (Article III): the attribution of the Licensed Material used is the
 # credit line; the ORC Notice, the Reserved Material notice and the Expressly Designated Licensed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencharacter/orc-2e",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Open Character Format pack: Second Edition fantasy rules (Player Core, Player Core 2 and GM Core) under the ORC License.",
   "keywords": [
     "character-sheet",
@@ -51,7 +51,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opencharacter/engine": "0.2.0"
+    "@opencharacter/engine": "0.3.0"
   },
   "engines": {
     "node": ">=22"

package/rules/advancement.yaml

@@ -18,6 +18,7 @@ actions:
     available: '!character.creating && level < 20'
     steps:
       - id: gain
+        tags: [level-up.gain]
         kind: changes
         changes:
           - { type: adjust, field: level, by: 1 }

package/rules/afflictions.yaml

@@ -15,6 +15,7 @@ contentTypes:
       dc: { type: integer, min: 0 }
       stages: { type: integer, required: true, min: 1, max: 7 }
       damageType:
+        open: true
         type: enum
         values:
           [
@@ -40,6 +41,7 @@ contentTypes:
       stage5Damage: { type: dice }
       stage6Damage: { type: dice }
       damage2Type:
+        open: true
         type: enum
         values: [acid, cold, electricity, fire, mental, poison, sonic, spirit, vitality, void]
         default: poison

package/rules/alchemist.yaml

@@ -12,7 +12,12 @@ fields:
     formula: '[[0, 0, 0, 0, 0], [0, 0, 2, 3, 4], [0, 0, 4, 6, 8]][weapons.specialization][attacks.bomb.rank]'
   # A formula is for a family of alchemical consumables, recorded as the family's lowest item.
   alchemist.field:
-    { type: enum, values: [none, bomber, chirurgeon, mutagenist, toxicologist], formula: "'none'" }
+    {
+      type: enum,
+      values: [none, bomber, chirurgeon, mutagenist, toxicologist],
+      formula: "'none'",
+      open: true,
+    }
   alchemist.vials.max: { type: integer, formula: 'max(0, 2 + attributes.int.mod)' }
   alchemist.vials.used: { type: integer, input: true, default: 0, min: 0, max: alchemist.vials.max }
   alchemist.formulas: { type: set, of: consumable }
@@ -44,6 +49,7 @@ actions:
       flat: { type: integer, optional: true }
       damageType:
         type: enum
+        open: true
         values:
           [
             acid,
@@ -61,7 +67,8 @@ actions:
       splash: { type: integer, optional: true, min: 0 }
       persistent: { type: dice, optional: true }
       persistentFlat: { type: integer, optional: true, min: 0 }
-      persistentType: { type: enum, optional: true, values: [acid, bleed, fire, poison] }
+      persistentType:
+        { type: enum, optional: true, values: [acid, bleed, fire, poison], open: true }
       itemBonus: { type: integer, optional: true, min: 0, max: 4 }
       hitCondition:
         { type: enum, optional: true, values: [none, off-guard, enfeebled, frightened, speed] }
@@ -254,7 +261,11 @@ actions:
 display:
   fields:
     attacks.bomb.rank:
-      { groups: [proficiencies], format: { bands: rank }, showWhen: attacks.bomb.rank > 0 }
+      {
+        groups: [proficiencies],
+        format: { bands: rank },
+        showWhen: attacks.bomb.rank > attacks.martial.rank,
+      }
     attacks.bomb.proficiency: { hidden: true }
     attacks.bomb.specialization: { hidden: true }
     alchemist.field: { groups: [summary], priority: 2, showWhen: "alchemist.field != 'none'" }

package/rules/ancestry-feats.yaml

@@ -350,25 +350,67 @@ effects:
 
 display:
   fields:
-    attacks.familiar: { groups: [proficiencies], priority: 2 }
+    attacks.familiar: { groups: [proficiencies], priority: 2, showWhen: size(attacks.familiar) > 0 }
     conditions.mistChild: { hidden: true }
     conditions.obfuscated: { hidden: true }
     bounceBack.ready: { hidden: true }
-    skills.lore.dwarf.rank: { format: { bands: rank } }
+    skills.lore.dwarf.rank: { format: { bands: rank }, showWhen: skills.lore.dwarf.rank > 0 }
     skills.lore.dwarf.mod:
-      { format: signed, rolls: [{ action: check, params: { check: skills.lore.dwarf.mod } }] }
-    skills.lore.elf.rank: { format: { bands: rank } }
+      {
+        format: signed,
+        rolls: [{ action: check, params: { check: skills.lore.dwarf.mod } }],
+        with: [{ field: skills.lore.dwarf.rank, as: detail }],
+        showWhen: skills.lore.dwarf.rank > 0,
+      }
+    skills.lore.dwarf.increases: { showWhen: skills.lore.dwarf.rank > 0 }
+    skills.lore.dwarf.trainedByIncrease: { showWhen: skills.lore.dwarf.rank > 0 }
+    skills.lore.elf.rank: { format: { bands: rank }, showWhen: skills.lore.elf.rank > 0 }
     skills.lore.elf.mod:
-      { format: signed, rolls: [{ action: check, params: { check: skills.lore.elf.mod } }] }
-    skills.lore.goblin.rank: { format: { bands: rank } }
+      {
+        format: signed,
+        rolls: [{ action: check, params: { check: skills.lore.elf.mod } }],
+        with: [{ field: skills.lore.elf.rank, as: detail }],
+        showWhen: skills.lore.elf.rank > 0,
+      }
+    skills.lore.elf.increases: { showWhen: skills.lore.elf.rank > 0 }
+    skills.lore.elf.trainedByIncrease: { showWhen: skills.lore.elf.rank > 0 }
+    skills.lore.goblin.rank: { format: { bands: rank }, showWhen: skills.lore.goblin.rank > 0 }
     skills.lore.goblin.mod:
-      { format: signed, rolls: [{ action: check, params: { check: skills.lore.goblin.mod } }] }
-    skills.lore.halfling.rank: { format: { bands: rank } }
+      {
+        format: signed,
+        rolls: [{ action: check, params: { check: skills.lore.goblin.mod } }],
+        with: [{ field: skills.lore.goblin.rank, as: detail }],
+        showWhen: skills.lore.goblin.rank > 0,
+      }
+    skills.lore.goblin.increases: { showWhen: skills.lore.goblin.rank > 0 }
+    skills.lore.goblin.trainedByIncrease: { showWhen: skills.lore.goblin.rank > 0 }
+    skills.lore.halfling.rank: { format: { bands: rank }, showWhen: skills.lore.halfling.rank > 0 }
     skills.lore.halfling.mod:
-      { format: signed, rolls: [{ action: check, params: { check: skills.lore.halfling.mod } }] }
-    skills.lore.leshy.rank: { format: { bands: rank } }
+      {
+        format: signed,
+        rolls: [{ action: check, params: { check: skills.lore.halfling.mod } }],
+        with: [{ field: skills.lore.halfling.rank, as: detail }],
+        showWhen: skills.lore.halfling.rank > 0,
+      }
+    skills.lore.halfling.increases: { showWhen: skills.lore.halfling.rank > 0 }
+    skills.lore.halfling.trainedByIncrease: { showWhen: skills.lore.halfling.rank > 0 }
+    skills.lore.leshy.rank: { format: { bands: rank }, showWhen: skills.lore.leshy.rank > 0 }
     skills.lore.leshy.mod:
-      { format: signed, rolls: [{ action: check, params: { check: skills.lore.leshy.mod } }] }
-    skills.lore.orc.rank: { format: { bands: rank } }
+      {
+        format: signed,
+        rolls: [{ action: check, params: { check: skills.lore.leshy.mod } }],
+        with: [{ field: skills.lore.leshy.rank, as: detail }],
+        showWhen: skills.lore.leshy.rank > 0,
+      }
+    skills.lore.leshy.increases: { showWhen: skills.lore.leshy.rank > 0 }
+    skills.lore.leshy.trainedByIncrease: { showWhen: skills.lore.leshy.rank > 0 }
+    skills.lore.orc.rank: { format: { bands: rank }, showWhen: skills.lore.orc.rank > 0 }
     skills.lore.orc.mod:
-      { format: signed, rolls: [{ action: check, params: { check: skills.lore.orc.mod } }] }
+      {
+        format: signed,
+        rolls: [{ action: check, params: { check: skills.lore.orc.mod } }],
+        with: [{ field: skills.lore.orc.rank, as: detail }],
+        showWhen: skills.lore.orc.rank > 0,
+      }
+    skills.lore.orc.increases: { showWhen: skills.lore.orc.rank > 0 }
+    skills.lore.orc.trainedByIncrease: { showWhen: skills.lore.orc.rank > 0 }

package/rules/archetypes.yaml

@@ -29,6 +29,7 @@ tags:
 
 contentTypes:
   archetype:
+    grantOnly: true
     copies: { max: 0 }
     fields:
       dedication: { type: id, of: feat, required: true }

package/rules/barbarian.yaml

@@ -2,16 +2,14 @@ fields:
   barbarian.instinct:
     type: enum
     values: [none, animal, dragon, fury, giant, spirit, superstition]
-    formula: "'none'"
+    open: true
+    # The class's instinct sets it (each instinct's effect); Barbarian Dedication's pick otherwise.
+    formula: >-
+      size(picksOf('feats.archetype.barbarian.barbarian-dedication', 'instinct')) > 0
+        ? picksOf('feats.archetype.barbarian.barbarian-dedication', 'instinct')[0] : 'none'
   rage.active: { type: boolean, formula: false }
   rage.damage: { type: integer, formula: 2 }
   rage.altDamage: { type: integer, formula: 0 }
-  rage.altType:
-    {
-      type: enum,
-      values: [none, bludgeoning, fire, force, mental, poison, spirit],
-      formula: "'none'",
-    }
   rage.animalDamage: { type: integer, formula: 2 }
   rage.resists:
     {
@@ -129,22 +127,12 @@ display:
     - id: rage
       kind: actions
       priority: 0
-      showWhen: 'countCopies(copy.item == @classes.barbarian) > 0'
+      showWhen: class.has.barbarian
       members: { type: action, where: "'rage' in item.tags" }
   fields:
-    rage.active:
-      {
-        groups: [summary],
-        priority: 1,
-        showWhen: 'countCopies(copy.item == @classes.barbarian) > 0',
-      }
+    rage.active: { groups: [summary], priority: 1, showWhen: class.has.barbarian }
     rage.tempHpBlocked:
-      {
-        groups: [turn],
-        priority: 2,
-        input: { widget: checkbox },
-        showWhen: 'countCopies(copy.item == @classes.barbarian) > 0',
-      }
+      { groups: [turn], priority: 2, input: { widget: checkbox }, showWhen: class.has.barbarian }
     rage.largerWeapon:
       {
         groups: [turn],
@@ -154,7 +142,6 @@ display:
       }
     rage.damage: { hidden: true }
     rage.altDamage: { hidden: true }
-    rage.altType: { hidden: true }
     rage.animalDamage: { hidden: true }
     rage.resists: { groups: [defenses], priority: 2, showWhen: size(rage.resists) > 0 }
     rage.thrown: { hidden: true }

package/rules/bard.yaml

@@ -1,5 +1,11 @@
 fields:
-  bard.muse: { type: enum, values: [none, enigma, maestro, polymath, warrior], formula: "'none'" }
+  bard.muse:
+    {
+      type: enum,
+      values: [none, enigma, maestro, polymath, warrior],
+      formula: "'none'",
+      open: true,
+    }
   bard.muses: { type: set, of: tag, members: { under: [muse] } }
   bard.grantedFeats: { type: set, of: feat }
   # Bardic Lore has no increases input: it is trained by the feat and becomes expert only when
@@ -42,13 +48,13 @@ situational:
 
 display:
   fields:
-    bard.muse: { groups: [summary], priority: 2 }
+    bard.muse: { groups: [summary], priority: 2, showWhen: class.has.bard }
     bard.muses: { hidden: true }
     bard.grantedFeats: { hidden: true }
-    skills.lore.bardic.rank:
-      { groups: [skill-ranks], format: { bands: rank }, showWhen: skills.lore.bardic.rank > 0 }
+    skills.lore.bardic.rank: { format: { bands: rank }, showWhen: skills.lore.bardic.rank > 0 }
     skills.lore.bardic.mod:
       groups: [skills]
       format: signed
       showWhen: skills.lore.bardic.rank > 0
       rolls: [{ action: check, params: { check: skills.lore.bardic.mod } }]
+      with: [{ field: skills.lore.bardic.rank, as: detail }]

package/rules/building.yaml

@@ -19,6 +19,7 @@ contentTypes:
       - { target: ancestry.held, op: grant, value: { formula: item.id } }
 
   heritage:
+    grantOnly: true
     fields:
       ancestry: { type: id, of: ancestry }
       versatile: { type: boolean, default: false }
@@ -38,13 +39,18 @@ contentTypes:
       - { target: hp.class, op: add, value: item.hp }
 
   feature:
+    grantOnly: true
     fields:
       level: { type: integer, required: true, min: 1, max: 20 }
+      # The class option a subclass-like feature is, `<class>.<choice>`, which the class's choice
+      # offers: add-on instincts, muses and the like set it too.
+      classOption: { type: string, default: '' }
 
   feat:
     fields:
       level: { type: integer, required: true, min: 1, max: 20 }
-      category: { type: enum, values: [ancestry, class, general, skill], required: true }
+      category:
+        { type: enum, values: [ancestry, class, general, skill], required: true, open: true }
       ancestry: { type: id, of: ancestry }
       heritage: { type: id, of: heritage }
       class: { type: id, of: class }

package/rules/champion.yaml

@@ -6,6 +6,7 @@ fields:
   champion.favoredCategory:
     { type: enum, values: [none, unarmed, simple, martial, advanced], formula: "'none'" }
   champion.cause:
+    open: true
     type: enum
     values: [none, desecration, grandeur, iniquity, justice, liberation, obedience, redemption]
     formula: "'none'"
@@ -67,8 +68,8 @@ situational:
 
 display:
   fields:
-    champion.sanctification: { groups: [summary], priority: 2 }
-    champion.cause: { groups: [summary], priority: 2 }
+    champion.sanctification: { groups: [summary], priority: 2, showWhen: class.has.champion }
+    champion.cause: { groups: [summary], priority: 2, showWhen: class.has.champion }
     champion.font: { hidden: true }
     champion.mercies: { hidden: true }
     champion.favoredCategory: { hidden: true }

package/rules/checks.yaml

@@ -27,7 +27,7 @@ resultBands:
         when: >-
           roll.value == 3 || (roll.value == 2 && (roll.tallies.successToCrit > 0
             || (roll.tallies.successToCritOn19 > 0 && size(roll.kept) > 0 && roll.kept[0] == 19)))
-      - { id: success, when: roll.value == 2 }
+      - { id: success, when: roll.value == 2, success: true }
       - id: failure
         when: >-
           (roll.value == 1 && roll.tallies.failToCritFail == 0)

package/rules/cleric.yaml

@@ -3,9 +3,19 @@ fields:
   # Asked before the weapon itself, whose choice reads it.
   cleric.favoredCategory:
     { type: enum, values: [none, unarmed, simple, martial, advanced], formula: "'none'" }
-  cleric.doctrine: { type: enum, values: [none, cloistered, warpriest], formula: "'none'" }
+  cleric.doctrine:
+    { type: enum, values: [none, cloistered, warpriest], formula: "'none'", open: true }
   cleric.domainSpells: { type: set, of: spell }
 
+# A domain is picked by Domain Initiate (its initial domain spell) or Advanced Domain (its advanced
+# one); Domain Acumen picks the initial domains of the oracle's mystery.
+contentTypes:
+  domain:
+    grantOnly: true
+    copies: { max: 0 }
+    fields:
+      advanced: { type: boolean, default: false }
+
 tags:
   - trait.shadow
   - trait.consecration
@@ -76,7 +86,7 @@ situational:
 
 display:
   fields:
-    cleric.sanctification: { groups: [summary], priority: 2 }
-    cleric.doctrine: { groups: [summary], priority: 2 }
+    cleric.sanctification: { groups: [summary], priority: 2, showWhen: class.has.cleric }
+    cleric.doctrine: { groups: [summary], priority: 2, showWhen: class.has.cleric }
     cleric.favoredCategory: { hidden: true }
     cleric.domainSpells: { hidden: true }

package/rules/conditions.yaml

@@ -7,6 +7,7 @@ contentTypes:
       by: { type: string, default: '' }
       damage: { type: dice, default: 1d6 }
       damageType:
+        open: true
         type: enum
         values:
           [

package/rules/core.yaml

@@ -63,6 +63,7 @@ contentTypes:
 
   # Each pick is one activation, so a boost picked twice in different choices counts twice.
   boost:
+    grantOnly: true
     fields:
       attribute: { type: enum, values: [str, dex, con, int, wis, cha], required: true }
 

package/rules/creation.yaml

@@ -18,12 +18,14 @@ actions:
     available: character.creating
     steps:
       - id: ancestry
+        tags: [creation.ancestry]
         kind: choice
         options: { content: { type: ancestry } }
         changes:
           - type: addItem
             entry: { id: ancestry, item: picked.id }
       - id: heritage
+        tags: [creation.heritage]
         kind: choice
         options:
           content:
@@ -32,12 +34,14 @@ actions:
         changes:
           - { type: choose, path: { entry: ancestry, choice: [heritage] }, option: picked.id }
       - id: background
+        tags: [creation.background]
         kind: choice
         options: { content: { type: background } }
         changes:
           - type: addItem
             entry: { id: background, item: picked.id }
       - id: class
+        tags: [creation.class]
         kind: choice
         options: { content: { type: class } }
         changes:
@@ -49,6 +53,14 @@ actions:
       - id: backgroundPicks
         kind: choice
         options: { pending: { entry: "'background'" } }
+      # The four free boosts come before the class's choices, whose trained skills count the final
+      # Intelligence modifier.
+      - id: freeBoosts
+        kind: choice
+        options: { content: { type: boost, where: picks == 0 } }
+        repeat: { max: 4, min: 4 }
+        changes:
+          - { type: choose, path: { choice: [free-boosts] }, option: picked.id }
       - id: classPicks
         kind: choice
         options: { pending: { entry: "'class'" } }
@@ -56,6 +68,7 @@ actions:
         kind: choice
         options: { pending: {} }
       - id: finish
+        tags: [creation.finish]
         kind: changes
         sheet: proposed
         changes:
@@ -73,6 +86,7 @@ actions:
     available: character.creating
     steps:
       - id: ancestry
+        tags: [creation.ancestry]
         kind: choice
         options: { content: { type: ancestry } }
         random: true
@@ -80,6 +94,7 @@ actions:
           - type: addItem
             entry: { id: ancestry, item: picked.id }
       - id: heritage
+        tags: [creation.heritage]
         kind: choice
         options:
           content:
@@ -89,6 +104,7 @@ actions:
         changes:
           - { type: choose, path: { entry: ancestry, choice: [heritage] }, option: picked.id }
       - id: background
+        tags: [creation.background]
         kind: choice
         options: { content: { type: background } }
         random: true
@@ -96,6 +112,7 @@ actions:
           - type: addItem
             entry: { id: background, item: picked.id }
       - id: class
+        tags: [creation.class]
         kind: choice
         options: { content: { type: class } }
         random: true
@@ -146,6 +163,7 @@ actions:
         random: *random
         recommend: *pick
       - id: finish
+        tags: [creation.finish]
         kind: changes
         sheet: proposed
         changes:

package/rules/druid.yaml

@@ -1,5 +1,6 @@
 fields:
-  druid.order: { type: enum, values: [none, animal, leaf, storm, untamed], formula: "'none'" }
+  druid.order:
+    { type: enum, values: [none, animal, leaf, storm, untamed], formula: "'none'", open: true }
   druid.orders: { type: set, of: tag }
   druid.orderSpells: { type: set, of: spell }
   # Granted, not picked, so the class feat choice leaves them out (grants aren't in the `feats`
@@ -15,7 +16,7 @@ tags:
 
 display:
   fields:
-    druid.order: { groups: [summary], priority: 2 }
+    druid.order: { groups: [summary], priority: 2, showWhen: class.has.druid }
     druid.orders: { hidden: true }
     druid.orderSpells: { hidden: true }
     druid.grantedFeats: { hidden: true }

package/rules/equipment.yaml

@@ -46,7 +46,7 @@ contentTypes:
       checkPenalty: { type: integer, default: 0, min: 0 }
       speedPenalty: { type: integer, default: 0, min: 0 }
       strength: { type: integer }
-      group: { type: enum, values: [cloth, leather, composite, chain, plate] }
+      group: { type: enum, values: [cloth, leather, composite, chain, plate], open: true }
       bulk: { type: decimal, default: 0, min: 0 }
       price: { type: decimal, min: 0 }
     # The item bonus to AC works without investing; the resilient rune's bonus and property runes
@@ -202,6 +202,7 @@ contentTypes:
     carried: true
     fields:
       category:
+        open: true
         type: enum
         values:
           [
@@ -228,6 +229,7 @@ contentTypes:
       damage: { type: dice }
       damageFlat: { type: integer, default: 0, min: 0 }
       damageType:
+        open: true
         type: enum
         values:
           [
@@ -249,6 +251,7 @@ contentTypes:
       persistent: { type: dice }
       persistentFlat: { type: integer, default: 0, min: 0 }
       persistentType:
+        open: true
         type: enum
         values: [none, acid, bleed, fire, poison]
         default: none
@@ -529,6 +532,9 @@ actions:
 
 # `trait.versatile` alone; the other damage type is the weapon's `versatile` field.
 tags:
+  - tool.compass
+  - tool.crowbar
+  - shield.against-spells
   - trait.attached
   - trait.concealable
   - trait.free-hand

package/rules/heritages.yaml

@@ -9,5 +9,5 @@ situational:
 
 display:
   fields:
-    speed.swim: { groups: [summary], priority: 2, unit: ft }
+    speed.swim: { groups: [summary], priority: 2, unit: ft, showWhen: speed.swim > 0 }
     speed.swim.base: { hidden: true }

package/rules/investigator.yaml

@@ -1,6 +1,7 @@
 fields:
   investigator.leadBonus: { type: integer, formula: 0, min: 0 }
   investigator.methodology:
+    open: true
     type: enum
     values: [none, alchemical-sciences, empiricism, forensic-medicine, interrogation]
     formula: "'none'"
@@ -27,14 +28,5 @@ tags:
 display:
   fields:
     investigator.leadBonus:
-      {
-        groups: [proficiencies],
-        priority: 2,
-        showWhen: 'countCopies(copy.item == @classes.investigator) > 0',
-      }
-    investigator.methodology:
-      {
-        groups: [summary],
-        priority: 2,
-        showWhen: 'countCopies(copy.item == @classes.investigator) > 0',
-      }
+      { groups: [proficiencies], priority: 2, showWhen: class.has.investigator }
+    investigator.methodology: { groups: [summary], priority: 2, showWhen: class.has.investigator }