@opencharacter/orc-2e 0.2.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.2.0',
+  specVersion: '0.3.0',
   id: 'new-character',
-  packs: [{ id: 'orc-2e', version: '0.2.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
@@ -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
@@ -648,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
@@ -744,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.
@@ -807,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,

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' }

package/content/classes/barbarian/raging.yaml

@@ -14,7 +14,9 @@ effects:
         / ('trait.agile' in roll.item.tags ? 2 : 1))
     tags:
       - formula: >-
-          self.alternate && rage.altDamage > 0 ? 'damage.' + rage.altType
+          self.alternate && barbarian.instinct == 'spirit' ? 'damage.spirit'
+            : self.alternate && size(picksOf('classes.barbarian.instincts.dragon', 'breath')) > 0
+              ? 'damage.' + picksOf('classes.barbarian.instincts.dragon', 'breath')[0]
             : 'damage.' + roll.item.damageType
     when: >-
       roll.item.range == 0 && (!(has(flags.thrown) && flags.thrown) || rage.thrown)

package/content/classes/barbarian.yaml

@@ -46,46 +46,12 @@ grants:
   - { item: classes.barbarian.devastator, when: level >= 19 }
 choices:
   - id: instinct
-    from:
-      items:
-        [
-          classes.barbarian.instincts.animal,
-          classes.barbarian.instincts.dragon,
-          classes.barbarian.instincts.fury,
-          classes.barbarian.instincts.giant,
-          classes.barbarian.instincts.spirit,
-          classes.barbarian.instincts.superstition,
-        ]
+    from: { type: feature, where: "item.classOption == 'barbarian.instinct'" }
   - 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/bard/muses/enigma.yaml

@@ -1,6 +1,6 @@
 id: classes.bard.muses.enigma
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: bard.muse }
 effects:
   - { target: bard.muse, op: set, value: "'enigma'" }
   - { target: bard.muses, op: grant, value: { tag: muse.enigma } }

package/content/classes/bard/muses/maestro.yaml

@@ -1,6 +1,6 @@
 id: classes.bard.muses.maestro
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: bard.muse }
 effects:
   - { target: bard.muse, op: set, value: "'maestro'" }
   - { target: bard.muses, op: grant, value: { tag: muse.maestro } }

package/content/classes/bard/muses/polymath.yaml

@@ -1,6 +1,6 @@
 id: classes.bard.muses.polymath
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: bard.muse }
 effects:
   - { target: bard.muse, op: set, value: "'polymath'" }
   - { target: bard.muses, op: grant, value: { tag: muse.polymath } }

package/content/classes/bard/muses/warrior.yaml

@@ -1,6 +1,6 @@
 id: classes.bard.muses.warrior
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: bard.muse }
 effects:
   - { target: bard.muse, op: set, value: "'warrior'" }
   - { target: bard.muses, op: grant, value: { tag: muse.warrior } }

package/content/classes/bard.yaml

@@ -56,44 +56,12 @@ grants:
 choices:
   # The muse is asked first, so the repertoire's picks follow it.
   - id: muse
-    from:
-      items:
-        [
-          classes.bard.muses.enigma,
-          classes.bard.muses.maestro,
-          classes.bard.muses.polymath,
-          classes.bard.muses.warrior,
-        ]
+    from: { type: feature, where: "item.classOption == 'bard.muse'" }
   - id: skills
     unique: skill-training
     pick: 4 + 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/champion/causes/desecration.yaml

@@ -1,7 +1,7 @@
 id: classes.champion.causes.desecration
 type: feature
 tags: [trait.uncommon]
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 prerequisites:
   - { id: sanctification, when: "champion.sanctification == 'unholy'" }
 effects:

package/content/classes/champion/causes/grandeur.yaml

@@ -1,6 +1,6 @@
 id: classes.champion.causes.grandeur
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 prerequisites:
   - { id: sanctification, when: "champion.sanctification == 'holy'" }
 effects:

package/content/classes/champion/causes/iniquity.yaml

@@ -1,7 +1,7 @@
 id: classes.champion.causes.iniquity
 type: feature
 tags: [trait.uncommon]
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 prerequisites:
   - { id: sanctification, when: "champion.sanctification == 'unholy'" }
 effects:

package/content/classes/champion/causes/justice.yaml

@@ -1,6 +1,6 @@
 id: classes.champion.causes.justice
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 effects:
   - { target: champion.cause, op: set, value: "'justice'", when: class.has.champion }
 actions:

package/content/classes/champion/causes/liberation.yaml

@@ -1,6 +1,6 @@
 id: classes.champion.causes.liberation
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 effects:
   - { target: champion.cause, op: set, value: "'liberation'", when: class.has.champion }
 actions:

package/content/classes/champion/causes/obedience.yaml

@@ -1,6 +1,6 @@
 id: classes.champion.causes.obedience
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 effects:
   - { target: champion.cause, op: set, value: "'obedience'", when: class.has.champion }
 actions:

package/content/classes/champion/causes/redemption.yaml

@@ -1,6 +1,6 @@
 id: classes.champion.causes.redemption
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: champion.cause }
 prerequisites:
   - { id: sanctification, when: "champion.sanctification == 'holy'" }
 effects:

package/content/classes/champion.yaml

@@ -140,17 +140,7 @@ choices:
     effects:
       - { target: attacks.favoredWeapons, op: grant, value: { formula: pick.id } }
   - id: cause
-    from:
-      items:
-        [
-          classes.champion.causes.desecration,
-          classes.champion.causes.grandeur,
-          classes.champion.causes.iniquity,
-          classes.champion.causes.justice,
-          classes.champion.causes.liberation,
-          classes.champion.causes.obedience,
-          classes.champion.causes.redemption,
-        ]
+    from: { type: feature, where: "item.classOption == 'champion.cause'" }
   - id: devotion-spell
     from:
       options:
@@ -171,32 +161,7 @@ choices:
     unique: skill-training
     pick: 2 + 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 } }