@opencharacter/orc-2e 0.1.0 → 0.3.0

package/content/classes/oracle.yaml

@@ -52,48 +52,12 @@ grants:
 choices:
   # Asked first, so the free skills leave its skill out.
   - id: mystery
-    from:
-      items:
-        [
-          classes.oracle.mysteries.ancestors,
-          classes.oracle.mysteries.battle,
-          classes.oracle.mysteries.bones,
-          classes.oracle.mysteries.cosmos,
-          classes.oracle.mysteries.flames,
-          classes.oracle.mysteries.life,
-          classes.oracle.mysteries.lore,
-          classes.oracle.mysteries.tempest,
-        ]
+    from: { type: feature, where: "item.classOption == 'oracle.mystery'" }
   - 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/ranger/edges/flurry.yaml

@@ -1,6 +1,6 @@
 id: classes.ranger.edges.flurry
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: ranger.hunters-edge }
 # The edge replaces the Strike's penalty part: the Strike's own penalty (`flags.map`) less 2 per
 # step, 3 at 17th.
 effects:

package/content/classes/ranger/edges/outwit.yaml

@@ -1,6 +1,6 @@
 id: classes.ranger.edges.outwit
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: ranger.hunters-edge }
 # AC against the prey is `defenses.acPrey`, which the prey's Strikes and spell attacks read when you
 # are their target.
 effects:

package/content/classes/ranger/edges/precision.yaml

@@ -1,6 +1,6 @@
 id: classes.ranger.edges.precision
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: ranger.hunters-edge }
 # Hits on the prey are counted in `prey.hits` on each hit and reset at the start of the turn. Two
 # Strikes in one action (Double Slice) both read the count as the action starts.
 effects:

package/content/classes/ranger.yaml

@@ -62,39 +62,12 @@ choices:
             - { target: attributes.dex.boosts, op: add, value: 1 }
             - { target: class.keyAttribute, op: set, value: "'dex'" }
   - id: hunters-edge
-    from:
-      items:
-        [classes.ranger.edges.flurry, classes.ranger.edges.outwit, classes.ranger.edges.precision]
+    from: { type: feature, where: "item.classOption == 'ranger.hunters-edge'" }
   - 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/rogue/rackets/mastermind.yaml

@@ -1,6 +1,6 @@
 id: classes.rogue.rackets.mastermind
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: rogue.racket }
 effects:
   - { target: rogue.racket, op: set, value: "'mastermind'" }
   - {

package/content/classes/rogue/rackets/ruffian.yaml

@@ -1,6 +1,6 @@
 id: classes.rogue.rackets.ruffian
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: rogue.racket }
 effects:
   - { target: rogue.racket, op: set, value: "'ruffian'" }
   - {

package/content/classes/rogue/rackets/scoundrel.yaml

@@ -1,6 +1,6 @@
 id: classes.rogue.rackets.scoundrel
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: rogue.racket }
 effects:
   - { target: rogue.racket, op: set, value: "'scoundrel'" }
   - {

package/content/classes/rogue/rackets/thief.yaml

@@ -1,6 +1,6 @@
 id: classes.rogue.rackets.thief
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: rogue.racket }
 effects:
   - { target: rogue.racket, op: set, value: "'thief'" }
   - {

package/content/classes/rogue.yaml

@@ -47,14 +47,7 @@ choices:
   # The racket first: it names the other key attributes the rogue may take, and its own choice (a
   # mastermind's skill) is asked right after it, before the free skills.
   - id: racket
-    from:
-      items:
-        [
-          classes.rogue.rackets.mastermind,
-          classes.rogue.rackets.ruffian,
-          classes.rogue.rackets.scoundrel,
-          classes.rogue.rackets.thief,
-        ]
+    from: { type: feature, where: "item.classOption == 'rogue.racket'" }
   - id: key-attribute
     from:
       options:
@@ -81,32 +74,7 @@ choices:
     unique: skill-training
     pick: 7 + 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/sorcerer/bloodlines/aberrant.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.aberrant
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'aberrant'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/sorcerer/bloodlines/angelic.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.angelic
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'angelic'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/sorcerer/bloodlines/demonic.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.demonic
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'demonic'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/sorcerer/bloodlines/diabolic.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.diabolic
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'diabolic'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/sorcerer/bloodlines/draconic.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.draconic
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'draconic'" }
   - {

package/content/classes/sorcerer/bloodlines/elemental.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.elemental
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'elemental'" }
   - { target: spellcasting.tradition, op: set, value: "'primal'" }

package/content/classes/sorcerer/bloodlines/fey.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.fey
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'fey'" }
   - { target: spellcasting.tradition, op: set, value: "'primal'" }

package/content/classes/sorcerer/bloodlines/hag.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.hag
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'hag'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/sorcerer/bloodlines/imperial.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.imperial
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'imperial'" }
   - { target: spellcasting.tradition, op: set, value: "'arcane'" }

package/content/classes/sorcerer/bloodlines/undead.yaml

@@ -1,6 +1,6 @@
 id: classes.sorcerer.bloodlines.undead
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: sorcerer.bloodline }
 effects:
   - { target: sorcerer.bloodline, op: set, value: "'undead'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/sorcerer.yaml

@@ -42,50 +42,12 @@ choices:
   # Asked first, so the repertoire's picks see the tradition and the free skills the bloodline's
   # trainings.
   - id: bloodline
-    from:
-      items:
-        [
-          classes.sorcerer.bloodlines.aberrant,
-          classes.sorcerer.bloodlines.angelic,
-          classes.sorcerer.bloodlines.demonic,
-          classes.sorcerer.bloodlines.diabolic,
-          classes.sorcerer.bloodlines.draconic,
-          classes.sorcerer.bloodlines.elemental,
-          classes.sorcerer.bloodlines.fey,
-          classes.sorcerer.bloodlines.hag,
-          classes.sorcerer.bloodlines.imperial,
-          classes.sorcerer.bloodlines.undead,
-        ]
+    from: { type: feature, where: "item.classOption == 'sorcerer.bloodline'" }
   - id: skills
     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 } }

package/content/classes/swashbuckler.yaml

@@ -118,32 +118,7 @@ choices:
     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/witch/patrons/faiths-flamekeeper.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.faiths-flamekeeper
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'faiths-flamekeeper'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/witch/patrons/inscribed-one.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.inscribed-one
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'inscribed-one'" }
   - { target: spellcasting.tradition, op: set, value: "'arcane'" }

package/content/classes/witch/patrons/resentment.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.resentment
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'resentment'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/witch/patrons/silence-in-snow.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.silence-in-snow
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'silence-in-snow'" }
   - { target: spellcasting.tradition, op: set, value: "'primal'" }

package/content/classes/witch/patrons/spinner-of-threads.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.spinner-of-threads
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'spinner-of-threads'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/witch/patrons/starless-shadow.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.starless-shadow
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'starless-shadow'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/witch/patrons/wilding-steward.yaml

@@ -1,6 +1,6 @@
 id: classes.witch.patrons.wilding-steward
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witch.patron }
 effects:
   - { target: witch.patron, op: set, value: "'wilding-steward'" }
   - { target: spellcasting.tradition, op: set, value: "'primal'" }

package/content/classes/witch.yaml

@@ -41,17 +41,7 @@ grants:
 choices:
   # Asked first, so the familiar's spells follow the tradition.
   - id: patron
-    from:
-      items:
-        [
-          classes.witch.patrons.faiths-flamekeeper,
-          classes.witch.patrons.inscribed-one,
-          classes.witch.patrons.resentment,
-          classes.witch.patrons.silence-in-snow,
-          classes.witch.patrons.spinner-of-threads,
-          classes.witch.patrons.starless-shadow,
-          classes.witch.patrons.wilding-steward,
-        ]
+    from: { type: feature, where: "item.classOption == 'witch.patron'" }
   - id: hex
     from:
       options:
@@ -65,32 +55,7 @@ choices:
     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/wizard/schools/ars-grammatica.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.ars-grammatica
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'ars-grammatica'" }
   - { target: spellcasting.extraSlots, op: add, value: 1 }

package/content/classes/wizard/schools/battle-magic.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.battle-magic
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'battle-magic'" }
   - { target: spellcasting.extraSlots, op: add, value: 1 }

package/content/classes/wizard/schools/boundary.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.boundary
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'boundary'" }
   - { target: spellcasting.extraSlots, op: add, value: 1 }

package/content/classes/wizard/schools/civic-wizardry.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.civic-wizardry
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'civic-wizardry'" }
   - { target: spellcasting.extraSlots, op: add, value: 1 }

package/content/classes/wizard/schools/mentalism.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.mentalism
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'mentalism'" }
   - { target: spellcasting.extraSlots, op: add, value: 1 }

package/content/classes/wizard/schools/protean-form.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.protean-form
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'protean-form'" }
   - { target: spellcasting.extraSlots, op: add, value: 1 }

package/content/classes/wizard/schools/unified-magical-theory.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.schools.unified-magical-theory
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.school }
 effects:
   - { target: wizard.school, op: set, value: "'unified-magical-theory'" }
   - { target: focus.points, op: add, value: 1 }

package/content/classes/wizard/theses/experimental-spellshaping.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.theses.experimental-spellshaping
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.thesis }
 effects:
   - { target: wizard.thesis, op: set, value: "'experimental-spellshaping'" }
 choices:

package/content/classes/wizard/theses/improved-familiar-attunement.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.theses.improved-familiar-attunement
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.thesis }
 # Drain Familiar is Drain Bonded Item's action here.
 effects:
   - { target: wizard.thesis, op: set, value: "'improved-familiar-attunement'" }

package/content/classes/wizard/theses/spell-blending.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.theses.spell-blending
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.thesis }
 # The trades are inputs per rank that the slot counts read (`spellBlending.*`).
 effects:
   - { target: wizard.thesis, op: set, value: "'spell-blending'" }

package/content/classes/wizard/theses/spell-substitution.yaml

@@ -1,6 +1,6 @@
 id: classes.wizard.theses.spell-substitution
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.thesis }
 # A curriculum slot still takes only a curriculum spell (the `curriculum-slots` constraint checks
 # it).
 effects:

package/content/classes/wizard/theses/staff-nexus.yaml

@@ -1,5 +1,5 @@
 id: classes.wizard.theses.staff-nexus
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: wizard.thesis }
 effects:
   - { target: wizard.thesis, op: set, value: "'staff-nexus'" }