@opencharacter/orc-2e 0.1.0 → 0.3.0

package/README.md

@@ -14,6 +14,9 @@ planes and characters) is left out.
 pnpm add @opencharacter/engine @opencharacter/orc-2e
 ```
 
+This release needs spec 0.3: `@opencharacter/engine` 0.3.0 or later. An engine for an older
+spec refuses it (`spec-version-unsupported`).
+
 The package's default export is the built pack (a `PackRelease`), and `i18n/en` its English
 text:
 
@@ -28,9 +31,9 @@ const { ruleset } = loaded;
 
 // A new character, made by the random creation start: every pick is drawn, so it finishes.
 const blank = {
-  specVersion: '0.1.0',
+  specVersion: '0.3.0',
   id: 'new-character',
-  packs: [{ id: 'orc-2e', version: '0.1.0' }],
+  packs: [{ id: 'orc-2e', version: '0.3.0' }],
   creating: true,
 };
 const created = startAction(ruleset, blank, {
@@ -75,6 +78,54 @@ reading is listed under [Rule readings](#rule-readings).
   GM Core's relics and vehicles, the setting's proper nouns, and anything from the pre-Remaster
   (OGL) books, such as Ancestry Paragon and dual-class characters; GM Core's level 0 characters.
 
+## Add-on packs
+
+A pack that depends on `orc-2e` can add to what it offers:
+
+- **Subclasses:** a feature whose `classOption` names a class's choice (`barbarian.instinct`,
+  `bard.muse`, `cleric.doctrine`, `wizard.school`, …) joins that choice, and Champion's Reaction
+  for causes.
+- **Domains:** a `domain` item joins Domain Initiate and Domain Acumen (an advanced one, with
+  `advanced: true`, Advanced Domain); an initial domain spell names its domain in its `domain`
+  field for Deity's Domain; a mystery grants its domains into `oracle.domains`.
+- **Gear:** tags, not IDs, mark Force Open's crowbar (`tool.crowbar`), Sense Direction's compass
+  (`tool.compass`) and shields against spells (`shield.against-spells`).
+- **Archetypes:** a new archetype declares its own `archetypes.<name>.feats` field tagged
+  `archetype-feats`; a feat for an existing archetype adds 1 to that archetype's field.
+- **Open enums** (`extendEnums`): the identity fields (`barbarian.instinct`, `bard.muse`,
+  `champion.cause`, `cleric.doctrine`, `druid.order`, `investigator.methodology`,
+  `oracle.mystery`, `ranger.edge`, `rogue.racket`, `sorcerer.bloodline`, `swashbuckler.style`,
+  `wizard.school`, `wizard.thesis`, `witch.patron`, `alchemist.field`, `stance.current`), which
+  a new subclass feature sets with its own effect (`{ target: barbarian.instinct, op: set,
+  value: "'thunder'" }`), as the core's do; weapon `group` and `damageType`, armor `group`,
+  consumable `category`, `damageType` and `persistentType`, spell damage types (`damageType`,
+  `damage2Type`, `persistentType` and the cast's `damageType` state), affliction and persistent
+  damage condition damage types, feat `category`, and the damage type parameters of `cast-spell`
+  (`damageType`) and `bomb-strike` (`damageType`, `persistentType`), so an added bomb or spell
+  deals its type (`orc-2e:actions.bomb-strike.params.damageType`). A new damage type or group also needs its
+  tag (`damage.sonic`, `group.firearm`), declared and named in the add-on.
+- **Choices** (`extendChoices`): written value and inline option choices take additions: the
+  dedications' identity picks (Barbarian Dedication's `instinct`), the follow-up feats' inline
+  options (Order Explorer's `order`, Additional Lore's `lore`), and the 15- and 16-skill lists.
+- **Naming what an add-on adds:** it names each added value, option or key in its own text,
+  under the key this pack would use, and `createText` finds it there when the app passes the
+  ruleset's `enumOrigins`, `optionOrigins` and `familyOrigins`. For example,
+  `sonic` added to `orc-2e:types.weapon.fields.damageType` is
+  `types.weapon.fields.damageType.values.sonic.name: Sonic` (through `enumOrigins`), and an
+  Order Explorer option `stone` is
+  `feats.druid.order-explorer.choices.order.options.stone.name: Stone` (through
+  `optionOrigins`).
+- **Skills and Lores:** a choice of any skill reads `skills.offered` and one of any Lore
+  `skills.lores`; an add-on's Lore declares its fields (`skills.lore.<name>.rank`, `.mod`, …,
+  as `rules/lores.yaml` does) and grants its tag into both with a rules effect.
+- **Step tags** for rules-level `option` and `changes` effects: `creation.ancestry`,
+  `creation.heritage`, `creation.background`, `creation.class` and `creation.finish` (guided and
+  random creation), `level-up.gain`, and the actions' own (`strike.hit`, …).
+
+Still closed: attributes, proficiency ranks, saves, spell traditions (and a staff's
+`tradition`), weapon and armor categories, and physical damage types for `versatile` and
+`modular`, the game's fixed sets.
+
 ## License
 
 - **License:** the ORC License. Its four notices (Article III) are in the manifest, which apps
@@ -271,7 +322,7 @@ reading is listed under [Rule readings](#rule-readings).
   first of three Lores of the player's choice, named by the subject the player writes
   (`skills.lore.custom1.subject`); Additional Lore offers all three. Assurance (farmhand, nomad, raised by belief, scholar) is an action for the skill it's
   chosen for: a fixed 10 + the proficiency bonus against the DC, no dice and no other bonus or
-  penalty. Content can grant Assurance for a named skill (the grant's `skill` state): each background's Assurance is for the skill the book names (the driver's Lore, the scholar's and raised by belief's chosen skill, an inline option each). Player Core 2's eight new Lores and its
+  penalty. Its skill is a pick (any skill, or a trained Lore), which content granting Assurance for a named skill presets: each background's Assurance is for the skill the book names (the driver's Lore, the scholar's and raised by belief's chosen skill, an inline option each). Player Core 2's eight new Lores and its
   ten ancestry Lores are `rules/lores-pc2.yaml`; the cursed background's Warding Sign is the
   situational choice `wardingSign`, the feybound's Fey's Fortune `fortune`.
 - **Feats:** a slot per level for ancestry (1, 5, 9, 13, 17), general (3, 7, 11, 15, 19; skill feats
@@ -307,8 +358,8 @@ reading is listed under [Rule readings](#rule-readings).
   trained. Demoralize frightens, Trip knocks prone (1d6 bludgeoning on a critical success),
   Grapple grabs or restrains, Escape frees; Treat Wounds (any DC your rank allows, an hour
   doubling it) and Battle Medicine heal, Treat Poison and Treat Disease give the next save a
-  circumstance modifier (an applied effect), Administer First Aid stabilizes; Feint makes the
-  target off-guard to your melee Strikes (`feint.target`, which the Strike reads); a critical
+  circumstance modifier (an applied effect that save removes), Administer First Aid stabilizes;
+  Feint makes the target off-guard to your melee Strikes (`feint.target`, which the Strike reads); a critical
   failure to Trip or Shove is prone, to Disarm off-guard; Subsist's failure is fatigued. Attack-
   trait actions take and count the multiple attack penalty. Actions against several creatures
   (Hide, Sneak, Lie, Coerce, Make an Impression, Seek, …) roll once and give each one's degree
@@ -428,8 +479,9 @@ reading is listed under [Rule readings](#rule-readings).
   `prepare-spells` (inputs per rank the slot counts read); Improved Familiar Attunement
   and Staff Nexus text). Split Slot: `prepare-spells` may put a second
   spell in one slot below the highest rank, its copy naming the first's (`split`); casting either
-  expends both. Drain Bonded Item is an action (the ranks drained today are the
-  class copy's state, which `daily-preparations` clears). Feats: Counterspell (the expending),
+  expends both. Drain Bonded Item is an action (the ranks drained today, `bondDrained`, and
+  Linked Focus's `linkedFocusUsed` are Arcane Bond's saved grant state, which `daily-preparations`
+  clears). Feats: Counterspell (the expending),
   Linked Focus and twelve more, text where they shape a spell's range, area or traits.
 - **The cleric** (Player Core): Wisdom, divine prepared, and the divine font's 4 to 6 extra slots
   of heal or harm at the highest rank (to 9th), which `prepare-spells` fills. The deity is the
@@ -647,16 +699,19 @@ reading is listed under [Rule readings](#rule-readings).
 - **Hero Points**: an input, 1 to start, at most 3; spending them is the app's.
 - **Creation**: a guided start, `standard`, and a random one,
   `random`. Guided: an ancestry and its heritage, a background and a class, then what each brings in the book's order: the ancestry's
-  boosts and the heritage's choices, the background's boosts (and a scholar's skill), the class's
-  key attribute, its skill, its trained skills (3 + Intelligence, each one not trained yet) and
-  its feat; then the rest (four free boosts, the ancestry feat, languages, a training freed by a
-  skill trained twice), and full Hit Points. While being created the character needs an
+  boosts and the heritage's choices, the background's boosts (and a scholar's skill), the four
+  free boosts, the class's key attribute, its skill, its trained skills (3 + Intelligence, each
+  one not trained yet, counted with the free boosts in) and its feat; then the rest (the ancestry
+  feat, languages, a training freed by a skill trained twice), and full Hit Points. While being created the character needs an
   ancestry, a background and a class (`creation-ancestry-background-class`); it never has more
   than one of each (the content types' `copies: { max: 1 }`), created or not.
   - **Random** (`random-character`): the rules have players choose, so the odds are the pack's. The same picks in the same order, each drawn by the engine uniformly among the
     options eligible then (`random`): the ancestry, its heritage, the background
     and the class, then every pick they bring (heritage feats, the key attribute, trained
-    skills, feats, languages, a freed training). Boosts follow a priority instead. An ancestry
+    skills, feats, languages, a freed training). One difference: the four free boosts come
+    after the class's picks, so a choice that sets the key attribute (a rogue's racket) is made
+    before they're placed; a trained skill the final Intelligence adds is drawn with the rest.
+    Boosts follow a priority instead. An ancestry
     takes its standard boosts (the book's default). The key attribute is planned with the
     class: the class's own (a barbarian's Strength), else Strength or Dexterity, a d2 deciding;
     the class's key attribute pick takes the planned one when it is offered (a rogue other than
@@ -743,7 +798,8 @@ Where the books leave a rule open, or the format needs a choice the books don't
 reads it as below. These are the pack's provisional calls; a table may rule otherwise.
 
 - **Random start:** the books have players choose, so the odds are the pack's. Each pick is
-  drawn uniformly among the options eligible then, in the guided start's order. Boosts follow a
+  drawn uniformly among the options eligible then, in the guided start's order, except that
+  the free boosts follow the class's picks, once the key attribute is known. Boosts follow a
   priority instead: an ancestry takes its standard boosts; the key attribute is planned with the
   class (its own, else Strength or Dexterity on a d2); every boost goes to the first offered of
   the key attribute, Constitution, Dexterity, Wisdom, Strength, Intelligence and Charisma.
@@ -806,8 +862,10 @@ reads it as below. These are the pack's provisional calls; a table may rule othe
   flanked or in cover (situational choices), when a condition is gained (`applyEffect`), daily
   preparations (the pack's `daily-preparations` and `prepare-spells` say what happens), rests; a
   spell's duration, sustaining and dismissing it, its area and who is in it (an applied spell
-  stays until the app removes it; a spell on "you and your allies" takes the caster as an ally
-  too); summoned creatures; onset, intervals and virulence of afflictions.
+  stays until the app removes it, but one for the next roll, such as guidance, sure strike,
+  true target or weapon surge, ends on the roll it changes; a spell on "you and your allies"
+  takes the caster as an ally too); summoned creatures; onset, intervals and virulence of
+  afflictions.
 - **Text only:** critical specialization, armor specialization, the skill feats that change
   time, other creatures or what the GM tells you (58 of 106), the skill actions' movement,
   attitudes and detection toward one observer, innate spells from heritages, Lunge; the rogue's,
@@ -825,7 +883,7 @@ reads it as below. These are the pack's provisional calls; a table may rule othe
   any other Lore is a homebrew increases input and a trained-by-increase input (tagged
   `skill-increase`, they join level-up) and rank and modifier fields, trained by a homebrew
   effect granting its tag into `skills.trained`. The class's free skills and `extra-training`
-  offer the first seven Lores only: a value choice lists its values.
+  offer the first seven Lores only: their lists are written out, as no formula lists fields by tag.
 
 ## Sources
 

package/content/backgrounds/driver.yaml

@@ -1,6 +1,6 @@
 id: backgrounds.driver
 type: background
-# Assurance gets the picked Lore through its `skill` state, so its own choice isn't asked.
+# Assurance's skill choice is preset to the picked Lore.
 effects:
   - target: skills.trained
     op: grant
@@ -27,7 +27,7 @@ choices:
               }
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.lore.driving'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.lore.driving }] } }
         - id: piloting
           effects:
             - {
@@ -38,4 +38,4 @@ choices:
               }
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.lore.piloting'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.lore.piloting }] } }

package/content/backgrounds/farmhand.yaml

@@ -15,7 +15,7 @@ effects:
     }
   - { target: skills.trainings, op: add, value: 2 }
 grants:
-  - { item: feats.skill.assurance, state: { skill: "'skill.athletics'" } }
+  - { item: feats.skill.assurance, choices: { skill: [{ option: skill.athletics }] } }
 choices:
   - id: boost
     unique: background-boosts

package/content/backgrounds/miner.yaml

@@ -15,7 +15,7 @@ effects:
     }
   - { target: skills.trainings, op: add, value: 2 }
 grants:
-  - item: feats.skill.terrain-expertise
+  - { item: feats.skill.terrain-expertise, choices: { terrain: [{ option: underground }] } }
 choices:
   - id: boost
     unique: background-boosts

package/content/backgrounds/nomad.yaml

@@ -9,7 +9,7 @@ effects:
     }
   - { target: skills.trainings, op: add, value: 1 }
 grants:
-  - { item: feats.skill.assurance, state: { skill: "'skill.survival'" } }
+  - { item: feats.skill.assurance, choices: { skill: [{ option: skill.survival }] } }
 choices:
   - id: boost
     unique: background-boosts

package/content/backgrounds/raised-by-belief.yaml

@@ -28,7 +28,7 @@ choices:
               when: "!('skill.acrobatics' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.acrobatics'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.acrobatics }] } }
         - id: arcana
           effects:
             - target: skills.trained
@@ -37,7 +37,7 @@ choices:
               when: "!('skill.arcana' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.arcana'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.arcana }] } }
         - id: athletics
           effects:
             - target: skills.trained
@@ -46,7 +46,7 @@ choices:
               when: "!('skill.athletics' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.athletics'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.athletics }] } }
         - id: crafting
           effects:
             - target: skills.trained
@@ -55,7 +55,7 @@ choices:
               when: "!('skill.crafting' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.crafting'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.crafting }] } }
         - id: deception
           effects:
             - target: skills.trained
@@ -64,7 +64,7 @@ choices:
               when: "!('skill.deception' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.deception'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.deception }] } }
         - id: diplomacy
           effects:
             - target: skills.trained
@@ -73,7 +73,7 @@ choices:
               when: "!('skill.diplomacy' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.diplomacy'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.diplomacy }] } }
         - id: intimidation
           effects:
             - target: skills.trained
@@ -82,7 +82,7 @@ choices:
               when: "!('skill.intimidation' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.intimidation'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.intimidation }] } }
         - id: medicine
           effects:
             - target: skills.trained
@@ -91,7 +91,7 @@ choices:
               when: "!('skill.medicine' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.medicine'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.medicine }] } }
         - id: nature
           effects:
             - target: skills.trained
@@ -100,7 +100,7 @@ choices:
               when: "!('skill.nature' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.nature'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.nature }] } }
         - id: occultism
           effects:
             - target: skills.trained
@@ -109,7 +109,7 @@ choices:
               when: "!('skill.occultism' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.occultism'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.occultism }] } }
         - id: performance
           effects:
             - target: skills.trained
@@ -118,7 +118,7 @@ choices:
               when: "!('skill.performance' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.performance'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.performance }] } }
         - id: religion
           effects:
             - target: skills.trained
@@ -127,7 +127,7 @@ choices:
               when: "!('skill.religion' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.religion'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.religion }] } }
         - id: society
           effects:
             - target: skills.trained
@@ -136,7 +136,7 @@ choices:
               when: "!('skill.society' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.society'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.society }] } }
         - id: stealth
           effects:
             - target: skills.trained
@@ -145,7 +145,7 @@ choices:
               when: "!('skill.stealth' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.stealth'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.stealth }] } }
         - id: survival
           effects:
             - target: skills.trained
@@ -154,7 +154,7 @@ choices:
               when: "!('skill.survival' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.survival'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.survival }] } }
         - id: thievery
           effects:
             - target: skills.trained
@@ -163,4 +163,4 @@ choices:
               when: "!('skill.thievery' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.thievery'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.thievery }] } }

package/content/backgrounds/scholar.yaml

@@ -26,7 +26,7 @@ choices:
               when: "!('skill.arcana' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.arcana'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.arcana }] } }
         - id: nature
           effects:
             - target: skills.trained
@@ -35,7 +35,7 @@ choices:
               when: "!('skill.nature' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.nature'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.nature }] } }
         - id: occultism
           effects:
             - target: skills.trained
@@ -44,7 +44,7 @@ choices:
               when: "!('skill.occultism' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.occultism'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.occultism }] } }
         - id: religion
           effects:
             - target: skills.trained
@@ -53,4 +53,4 @@ choices:
               when: "!('skill.religion' in skills.chosen)"
             - { target: skills.trainings, op: add, value: 1 }
           grants:
-            - { item: feats.skill.assurance, state: { skill: "'skill.religion'" } }
+            - { item: feats.skill.assurance, choices: { skill: [{ option: skill.religion }] } }

package/content/classes/alchemist/fields/bomber.yaml

@@ -1,6 +1,6 @@
 id: classes.alchemist.fields.bomber
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: alchemist.research-field }
 effects:
   - { target: alchemist.field, op: set, value: "'bomber'" }
 choices:

package/content/classes/alchemist/fields/chirurgeon.yaml

@@ -1,6 +1,6 @@
 id: classes.alchemist.fields.chirurgeon
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: alchemist.research-field }
 # Medicine checks use Crafting's modifier through an `atLeast` on Medicine's.
 effects:
   - { target: alchemist.field, op: set, value: "'chirurgeon'" }

package/content/classes/alchemist/fields/mutagenist.yaml

@@ -1,6 +1,6 @@
 id: classes.alchemist.fields.mutagenist
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: alchemist.research-field }
 effects:
   - { target: alchemist.field, op: set, value: "'mutagenist'" }
   - target: { steps: [consumable.drink] }

package/content/classes/alchemist/fields/toxicologist.yaml

@@ -1,6 +1,6 @@
 id: classes.alchemist.fields.toxicologist
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: alchemist.research-field }
 effects:
   - { target: alchemist.field, op: set, value: "'toxicologist'" }
   - target: { incoming: { fields: [hp.current], tags: [damage.poison] } }

package/content/classes/alchemist.yaml

@@ -45,44 +45,12 @@ grants:
   - { item: features.alchemist.medium-armor-mastery, when: level >= 19 }
 choices:
   - id: research-field
-    from:
-      items:
-        [
-          classes.alchemist.fields.bomber,
-          classes.alchemist.fields.chirurgeon,
-          classes.alchemist.fields.mutagenist,
-          classes.alchemist.fields.toxicologist,
-        ]
+    from: { type: feature, where: "item.classOption == 'alchemist.research-field'" }
   - id: skills
     unique: skill-training
     pick: 3 + max(0, attributes.int.mod)
     from:
-      values:
-        [
-          skill.acrobatics,
-          skill.arcana,
-          skill.athletics,
-          skill.crafting,
-          skill.deception,
-          skill.diplomacy,
-          skill.intimidation,
-          skill.medicine,
-          skill.nature,
-          skill.occultism,
-          skill.performance,
-          skill.religion,
-          skill.society,
-          skill.stealth,
-          skill.survival,
-          skill.thievery,
-          skill.lore.academia,
-          skill.lore.circus,
-          skill.lore.farming,
-          skill.lore.legal,
-          skill.lore.scribing,
-          skill.lore.underworld,
-          skill.lore.warfare,
-        ]
+      values: { formula: skills.offered }
       where: '!(value in skills.trained) && !(value in skills.chosen) || value in choice.picks'
     effects:
       - { target: skills.chosen, op: grant, value: { formula: pick.value } }

package/content/classes/barbarian/animals/ape.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.ape
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.ape' in item.tags" }

package/content/classes/barbarian/animals/bear.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.bear
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.bear' in item.tags" }

package/content/classes/barbarian/animals/bull.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.bull
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.bull' in item.tags" }

package/content/classes/barbarian/animals/cat.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.cat
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.cat' in item.tags" }

package/content/classes/barbarian/animals/deer.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.deer
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.deer' in item.tags" }

package/content/classes/barbarian/animals/frog.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.frog
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.frog' in item.tags" }

package/content/classes/barbarian/animals/shark.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.shark
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.shark' in item.tags" }

package/content/classes/barbarian/animals/snake.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.snake
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.snake' in item.tags" }

package/content/classes/barbarian/animals/wolf.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.animals.wolf
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.animal }
 # The animal's unarmed attacks are standard copies while you have it; Rage equips them.
 standardCopies:
   - { type: weapon, where: "'animal.wolf' in item.tags" }

package/content/classes/barbarian/instincts/animal.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.instincts.animal
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.instinct }
 effects:
   - { target: barbarian.instinct, op: set, value: "'animal'" }
   - { target: rage.animalDamage, op: set, value: 'level >= 15 ? 12 : level >= 7 ? 5 : 2' }
@@ -8,16 +8,4 @@ effects:
   - { target: rage.resists, op: grant, value: { tag: damage.slashing }, when: level >= 9 }
 choices:
   - id: animal
-    from:
-      items:
-        [
-          classes.barbarian.animals.ape,
-          classes.barbarian.animals.bear,
-          classes.barbarian.animals.bull,
-          classes.barbarian.animals.cat,
-          classes.barbarian.animals.deer,
-          classes.barbarian.animals.frog,
-          classes.barbarian.animals.shark,
-          classes.barbarian.animals.snake,
-          classes.barbarian.animals.wolf,
-        ]
+    from: { type: feature, where: "item.classOption == 'barbarian.animal'" }

package/content/classes/barbarian/instincts/dragon.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.instincts.dragon
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.instinct }
 effects:
   - { target: barbarian.instinct, op: set, value: "'dragon'" }
   - { target: rage.altDamage, op: set, value: 'level >= 15 ? 16 : level >= 7 ? 8 : 4' }
@@ -9,7 +9,6 @@ choices:
   - id: breath
     from: { values: [bludgeoning, fire, force, mental, poison, spirit] }
     effects:
-      - { target: rage.altType, op: set, value: pick.value }
       - target: rage.resists
         op: grant
         value: { formula: "'damage.' + pick.value" }

package/content/classes/barbarian/instincts/fury.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.instincts.fury
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.instinct }
 effects:
   - { target: barbarian.instinct, op: set, value: "'fury'" }
   - { target: rage.damage, op: set, value: 'level >= 15 ? 13 : level >= 7 ? 7 : 3' }

package/content/classes/barbarian/instincts/giant.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.instincts.giant
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.instinct }
 # The player sets `rage.largerWeapon` while wielding a larger weapon, since weapon size isn't
 # modeled.
 effects:

package/content/classes/barbarian/instincts/spirit.yaml

@@ -1,8 +1,7 @@
 id: classes.barbarian.instincts.spirit
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.instinct }
 effects:
   - { target: barbarian.instinct, op: set, value: "'spirit'" }
   - { target: rage.altDamage, op: set, value: 'level >= 15 ? 13 : level >= 7 ? 7 : 3' }
-  - { target: rage.altType, op: set, value: "'spirit'" }
   - { target: rage.resists, op: grant, value: { tag: damage.void }, when: level >= 9 }

package/content/classes/barbarian/instincts/superstition.yaml

@@ -1,6 +1,6 @@
 id: classes.barbarian.instincts.superstition
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: barbarian.instinct }
 effects:
   - { target: barbarian.instinct, op: set, value: "'superstition'" }
   - { target: rage.damage, op: set, value: 'level >= 15 ? 13 : level >= 7 ? 7 : 3' }