@opencharacter/orc-2e 0.2.0 → 0.3.0

package/content/classes/cleric/doctrines/cloistered-cleric.yaml

@@ -1,6 +1,6 @@
 id: classes.cleric.doctrines.cloistered-cleric
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: cleric.doctrine }
 effects:
   - { target: cleric.doctrine, op: set, value: "'cloistered'" }
   - { target: saves.fortitude.rank, op: atLeast, value: 2, when: level >= 3 }

package/content/classes/cleric/doctrines/warpriest.yaml

@@ -1,6 +1,6 @@
 id: classes.cleric.doctrines.warpriest
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: cleric.doctrine }
 effects:
   - { target: cleric.doctrine, op: set, value: "'warpriest'" }
   - { target: defenses.light.rank, op: atLeast, value: 'level >= 13 ? 2 : 1' }

package/content/classes/cleric.yaml

@@ -121,38 +121,12 @@ choices:
     effects:
       - { target: attacks.favoredWeapons, op: grant, value: { formula: pick.id } }
   - id: doctrine
-    from:
-      items: [classes.cleric.doctrines.cloistered-cleric, classes.cleric.doctrines.warpriest]
+    from: { type: feature, where: "item.classOption == 'cleric.doctrine'" }
   - 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/druid/orders/animal.yaml

@@ -1,6 +1,6 @@
 id: classes.druid.orders.animal
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: druid.order }
 effects:
   - { target: druid.order, op: set, value: "'animal'" }
   - { target: druid.orders, op: grant, value: { tag: druid-order.animal } }

package/content/classes/druid/orders/leaf.yaml

@@ -1,6 +1,6 @@
 id: classes.druid.orders.leaf
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: druid.order }
 effects:
   - { target: druid.order, op: set, value: "'leaf'" }
   - { target: druid.orders, op: grant, value: { tag: druid-order.leaf } }

package/content/classes/druid/orders/storm.yaml

@@ -1,6 +1,6 @@
 id: classes.druid.orders.storm
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: druid.order }
 effects:
   - { target: druid.order, op: set, value: "'storm'" }
   - { target: druid.orders, op: grant, value: { tag: druid-order.storm } }

package/content/classes/druid/orders/untamed.yaml

@@ -1,6 +1,6 @@
 id: classes.druid.orders.untamed
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: druid.order }
 effects:
   - { target: druid.order, op: set, value: "'untamed'" }
   - { target: druid.orders, op: grant, value: { tag: druid-order.untamed } }

package/content/classes/druid.yaml

@@ -49,14 +49,7 @@ grants:
   - { item: features.druid.primal-hierophant, when: level >= 19 }
 choices:
   - id: order
-    from:
-      items:
-        [
-          classes.druid.orders.animal,
-          classes.druid.orders.leaf,
-          classes.druid.orders.storm,
-          classes.druid.orders.untamed,
-        ]
+    from: { type: feature, where: "item.classOption == 'druid.order'" }
   - id: voice-of-nature
     unique: feats
     from: { items: [feats.druid.animal-empathy, feats.druid.plant-empathy] }
@@ -64,32 +57,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 } }

package/content/classes/fighter.yaml

@@ -62,32 +62,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/investigator.yaml

@@ -117,32 +117,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/monk.yaml

@@ -48,32 +48,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/oracle/mysteries/ancestors.yaml

@@ -1,7 +1,9 @@
 id: classes.oracle.mysteries.ancestors
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.death } }
+  - { target: oracle.domains, op: grant, value: { item: domains.family } }
   - { target: oracle.mystery, op: set, value: "'ancestors'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/battle.yaml

@@ -1,7 +1,11 @@
 id: classes.oracle.mysteries.battle
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.destruction } }
+  - { target: oracle.domains, op: grant, value: { item: domains.might } }
+  - { target: oracle.domains, op: grant, value: { item: domains.protection } }
+  - { target: oracle.domains, op: grant, value: { item: domains.zeal } }
   - { target: oracle.mystery, op: set, value: "'battle'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/bones.yaml

@@ -1,7 +1,9 @@
 id: classes.oracle.mysteries.bones
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.death } }
+  - { target: oracle.domains, op: grant, value: { item: domains.undeath } }
   - { target: oracle.mystery, op: set, value: "'bones'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/cosmos.yaml

@@ -1,7 +1,9 @@
 id: classes.oracle.mysteries.cosmos
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.darkness } }
+  - { target: oracle.domains, op: grant, value: { item: domains.moon } }
   - { target: oracle.mystery, op: set, value: "'cosmos'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/flames.yaml

@@ -1,7 +1,9 @@
 id: classes.oracle.mysteries.flames
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.fire } }
+  - { target: oracle.domains, op: grant, value: { item: domains.sun } }
   - { target: oracle.mystery, op: set, value: "'flames'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/life.yaml

@@ -1,7 +1,10 @@
 id: classes.oracle.mysteries.life
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.death } }
+  - { target: oracle.domains, op: grant, value: { item: domains.healing } }
+  - { target: oracle.domains, op: grant, value: { item: domains.pain } }
   - { target: oracle.mystery, op: set, value: "'life'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/lore.yaml

@@ -1,7 +1,11 @@
 id: classes.oracle.mysteries.lore
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.knowledge } }
+  - { target: oracle.domains, op: grant, value: { item: domains.magic } }
+  - { target: oracle.domains, op: grant, value: { item: domains.secrecy } }
+  - { target: oracle.domains, op: grant, value: { item: domains.truth } }
   - { target: oracle.mystery, op: set, value: "'lore'" }
   - {
       target: skills.trained,

package/content/classes/oracle/mysteries/tempest.yaml

@@ -1,7 +1,9 @@
 id: classes.oracle.mysteries.tempest
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: oracle.mystery }
 effects:
+  - { target: oracle.domains, op: grant, value: { item: domains.air } }
+  - { target: oracle.domains, op: grant, value: { item: domains.water } }
   - { target: oracle.mystery, op: set, value: "'tempest'" }
   - {
       target: skills.trained,

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