@opencharacter/orc-2e 0.1.0 → 0.3.0

package/content/feats/cleric/domain-initiate.yaml

@@ -8,202 +8,4 @@ choices:
   - id: domain
     unique: initial-domains
     requiresOption: true
-    from:
-      options:
-        - id: air
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.pushing-gust } }
-          grants:
-            - item: spells.pushing-gust
-        - id: ambition
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.ignite-ambition } }
-          grants:
-            - item: spells.ignite-ambition
-        - id: cities
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.face-in-the-crowd } }
-          grants:
-            - item: spells.face-in-the-crowd
-        - id: confidence
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.veil-of-confidence } }
-          grants:
-            - item: spells.veil-of-confidence
-        - id: creation
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.creative-splash } }
-          grants:
-            - item: spells.creative-splash
-        - id: darkness
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.cloak-of-shadow } }
-          grants:
-            - item: spells.cloak-of-shadow
-        - id: death
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.deaths-call } }
-          grants:
-            - item: spells.deaths-call
-        - id: destruction
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.cry-of-destruction } }
-          grants:
-            - item: spells.cry-of-destruction
-        - id: dreams
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.sweet-dream } }
-          grants:
-            - item: spells.sweet-dream
-        - id: earth
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.hurtling-stone } }
-          grants:
-            - item: spells.hurtling-stone
-        - id: family
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.soothing-words } }
-          grants:
-            - item: spells.soothing-words
-        - id: fate
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.read-fate } }
-          grants:
-            - item: spells.read-fate
-        - id: fire
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.fire-ray } }
-          grants:
-            - item: spells.fire-ray
-        - id: freedom
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.unimpeded-stride } }
-          grants:
-            - item: spells.unimpeded-stride
-        - id: healing
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.healers-blessing } }
-          grants:
-            - item: spells.healers-blessing
-        - id: indulgence
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.overstuff } }
-          grants:
-            - item: spells.overstuff
-        - id: knowledge
-          effects:
-            - {
-                target: cleric.domainSpells,
-                op: grant,
-                value: { item: spells.scholarly-recollection },
-              }
-          grants:
-            - item: spells.scholarly-recollection
-        - id: luck
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.bit-of-luck } }
-          grants:
-            - item: spells.bit-of-luck
-        - id: magic
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.magics-vessel } }
-          grants:
-            - item: spells.magics-vessel
-        - id: might
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.athletic-rush } }
-          grants:
-            - item: spells.athletic-rush
-        - id: moon
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.moonbeam } }
-          grants:
-            - item: spells.moonbeam
-        - id: nature
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.vibrant-thorns } }
-          grants:
-            - item: spells.vibrant-thorns
-        - id: nightmares
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.waking-nightmare } }
-          grants:
-            - item: spells.waking-nightmare
-        - id: pain
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.savor-the-sting } }
-          grants:
-            - item: spells.savor-the-sting
-        - id: passion
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.charming-touch } }
-          grants:
-            - item: spells.charming-touch
-        - id: perfection
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.perfected-mind } }
-          grants:
-            - item: spells.perfected-mind
-        - id: protection
-          effects:
-            - {
-                target: cleric.domainSpells,
-                op: grant,
-                value: { item: spells.protectors-sacrifice },
-              }
-          grants:
-            - item: spells.protectors-sacrifice
-        - id: secrecy
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.whispering-quiet } }
-          grants:
-            - item: spells.whispering-quiet
-        - id: sun
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.dazzling-flash } }
-          grants:
-            - item: spells.dazzling-flash
-        - id: travel
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.agile-feet } }
-          grants:
-            - item: spells.agile-feet
-        - id: trickery
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.sudden-shift } }
-          grants:
-            - item: spells.sudden-shift
-        - id: truth
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.word-of-truth } }
-          grants:
-            - item: spells.word-of-truth
-        - id: tyranny
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.touch-of-obedience } }
-          grants:
-            - item: spells.touch-of-obedience
-        - id: undeath
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.touch-of-undeath } }
-          grants:
-            - item: spells.touch-of-undeath
-        - id: water
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.tidal-surge } }
-          grants:
-            - item: spells.tidal-surge
-        - id: wealth
-          effects:
-            - {
-                target: cleric.domainSpells,
-                op: grant,
-                value: { item: spells.appearance-of-wealth },
-              }
-          grants:
-            - item: spells.appearance-of-wealth
-        - id: zeal
-          effects:
-            - { target: cleric.domainSpells, op: grant, value: { item: spells.weapon-surge } }
-          grants:
-            - item: spells.weapon-surge
+    from: { type: domain, where: '!item.advanced' }

package/content/feats/oracle/domain-acumen.yaml

@@ -6,141 +6,7 @@ choices:
   - id: domain
     unique: initial-domains
     requiresOption: true
-    from:
-      options:
-        - id: air
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'tempest'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.pushing-gust
-        - id: darkness
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'cosmos'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.cloak-of-shadow
-        - id: death
-          prerequisites:
-            - {
-                id: mystery,
-                when: "oracle.mystery == 'ancestors' || oracle.mystery == 'bones' || oracle.mystery == 'life'",
-              }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.deaths-call
-        - id: destruction
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'battle'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.cry-of-destruction
-        - id: family
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'ancestors'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.soothing-words
-        - id: fire
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'flames'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.fire-ray
-        - id: healing
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'life'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.healers-blessing
-        - id: knowledge
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'lore'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.scholarly-recollection
-        - id: magic
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'lore'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.magics-vessel
-        - id: might
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'battle'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.athletic-rush
-        - id: moon
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'cosmos'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.moonbeam
-        - id: pain
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'life'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.savor-the-sting
-        - id: protection
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'battle'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.protectors-sacrifice
-        - id: secrecy
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'lore'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.whispering-quiet
-        - id: sun
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'flames'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.dazzling-flash
-        - id: truth
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'lore'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.word-of-truth
-        - id: undeath
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'bones'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.touch-of-undeath
-        - id: water
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'tempest'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.tidal-surge
-        - id: zeal
-          prerequisites:
-            - { id: mystery, when: "oracle.mystery == 'battle'" }
-          effects:
-            - { target: focus.points, op: add, value: 1 }
-          grants:
-            - item: spells.weapon-surge
+    from: { type: domain, where: '!item.advanced' }
+    eligible: item.id in oracle.domains
+    effects:
+      - { target: focus.points, op: add, value: 1 }

package/content/feats/skill/additional-lore.yaml

@@ -655,6 +655,18 @@ choices:
             - target: skills.lore.vampire.rank
               op: add
               value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+        - id: hag
+          effects:
+            - {
+                target: skills.trained,
+                op: grant,
+                value: { tag: skill.lore.hag },
+                when: "!('skill.lore.hag' in skills.chosen)",
+              }
+            - { target: skills.trainings, op: add, value: 1 }
+            - target: skills.lore.hag.rank
+              op: add
+              value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
         - id: custom1
           effects:
             - {

package/content/feats/skill/assurance.yaml

@@ -4,40 +4,18 @@ tags: [trait.fortune]
 fields: { level: 1, category: skill, skills: [skill] }
 repeatable: true
 
-# Content that grants Assurance for a skill it names passes it as the grant's `skill` state, and the
-# choice isn't asked.
-state:
-  skill: { type: string, default: '' }
-effects:
-  - {
-      target: assurance.skills,
-      op: grant,
-      value: { formula: self.skill },
-      when: "has(self.skill) && self.skill != ''",
-    }
+# Any skill, or a Lore the character is trained in. Content that grants Assurance for a skill it
+# names presets the choice.
 choices:
   - id: skill
-    when: "!has(self.skill) || self.skill == ''"
     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,
-        ]
+        formula: >-
+          ['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']
+            + sortList(skills.trained + skills.chosen)
     effects:
       - { target: assurance.skills, op: grant, value: { formula: pick.value } }
 

package/content/feats/skill/skill-training.yaml

@@ -10,61 +10,7 @@ choices:
   - id: skill
     unique: skill-training
     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,
-          skill.lore.alcohol,
-          skill.lore.art,
-          skill.lore.cooking,
-          skill.lore.engineering,
-          skill.lore.fortune-telling,
-          skill.lore.games,
-          skill.lore.genealogy,
-          skill.lore.gladiatorial,
-          skill.lore.guild,
-          skill.lore.heraldry,
-          skill.lore.herbalism,
-          skill.lore.labor,
-          skill.lore.mercantile,
-          skill.lore.mining,
-          skill.lore.sailing,
-          skill.lore.tanning,
-          skill.lore.theater,
-          skill.lore.cave,
-          skill.lore.desert,
-          skill.lore.forest,
-          skill.lore.mountain,
-          skill.lore.plains,
-          skill.lore.swamp,
-          skill.lore.dwarf,
-          skill.lore.elf,
-          skill.lore.goblin,
-          skill.lore.halfling,
-          skill.lore.leshy,
-          skill.lore.orc,
-        ]
+      values: { formula: skills.offered + skills.lores }
       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/feats/skill/terrain-stalker.yaml

@@ -8,4 +8,5 @@ prerequisites:
     when: 'skills.stealth.rank >= 1'
 choices:
   - id: terrain
+    unique: terrain-stalker
     from: { values: [rubble, snow, underbrush] }

package/content/feats/sorcerer/arcane-evolution.yaml

@@ -81,32 +81,7 @@ choices:
   - id: skill
     unique: skill-training
     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/feats/sorcerer/occult-evolution.yaml

@@ -77,32 +77,7 @@ choices:
   - id: skill
     unique: skill-training
     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/features/wizard/arcane-bond.yaml

@@ -1,8 +1,12 @@
 id: features.wizard.arcane-bond
 type: feature
 fields: { level: 1 }
-# The ranks drained today are the class copy's `bondDrained` (bit `2^(rank - 1)` each). With
-# Improved Familiar Attunement this is Drain Familiar.
+# The ranks drained today are its `bondDrained` (bit `2^(rank - 1)` each), and Linked Focus's use
+# its `linkedFocusUsed`; daily preparations reset both. With Improved Familiar Attunement this is
+# Drain Familiar.
+state:
+  bondDrained: { type: integer, default: 0, min: 0, max: 511 }
+  linkedFocusUsed: { type: boolean, default: false }
 actions:
   - id: drain-bonded-item
     tags: [class-action, spell]
@@ -30,7 +34,7 @@ actions:
         kind: changes
         changes:
           - type: adjustState
-            entry: self
+            grant: self
             key: bondDrained
             by: '[1, 2, 4, 8, 16, 32, 64, 128, 256][steps.spell.self.rank - 1]'
       - id: linked
@@ -40,7 +44,7 @@ actions:
             && steps.spell.item.id in spells.curriculum && focus.spent > 0
         changes:
           - { type: adjust, field: focus.spent, by: -1 }
-          - { type: setState, entry: self, key: linkedFocusUsed, value: true }
+          - { type: setState, grant: self, key: linkedFocusUsed, value: true }
       - id: result
         kind: outcome
         result: "'drained'"

package/content/gear/compass-lensatic.yaml

@@ -1,3 +1,4 @@
 id: gear.compass-lensatic
 type: gear
+tags: [tool.compass]
 fields: { bulk: 0, price: 20 }

package/content/gear/compass.yaml

@@ -1,3 +1,4 @@
 id: gear.compass
 type: gear
+tags: [tool.compass]
 fields: { bulk: 0, price: 1 }

package/content/gear/crowbar-levered.yaml

@@ -1,3 +1,4 @@
 id: gear.crowbar-levered
 type: gear
+tags: [tool.crowbar]
 fields: { bulk: 0.1, price: 20 }

package/content/gear/crowbar.yaml

@@ -1,3 +1,4 @@
 id: gear.crowbar
 type: gear
+tags: [tool.crowbar]
 fields: { bulk: 0.1, price: 0.5 }

package/content/heritages/deep-orc.yaml

@@ -2,5 +2,7 @@ id: heritages.deep-orc
 type: heritage
 fields: { ancestry: ancestries.orc }
 grants:
-  - { item: feats.skill.terrain-expertise, waivePrerequisites: true }
+  - item: feats.skill.terrain-expertise
+    waivePrerequisites: true
+    choices: { terrain: [{ option: underground }] }
   - { item: feats.skill.combat-climber, waivePrerequisites: true }

package/content/heritages/woodstalker-lizardfolk.yaml

@@ -2,4 +2,6 @@ id: heritages.woodstalker-lizardfolk
 type: heritage
 fields: { ancestry: ancestries.lizardfolk }
 grants:
-  - { item: feats.skill.terrain-stalker, waivePrerequisites: true }
+  - item: feats.skill.terrain-stalker
+    waivePrerequisites: true
+    choices: { terrain: [{ option: underbrush }] }

package/content/shields/specific/reflecting-shield.yaml

@@ -1,7 +1,7 @@
 id: shields.specific.reflecting-shield
 type: shield
 extends: shields.buckler
-tags: [trait.magical, trait.uncommon]
+tags: [trait.magical, trait.uncommon, shield.against-spells]
 fields:
   price: 18000
   hardness: 6

package/content/shields/specific/spellguard-shield.yaml

@@ -1,5 +1,6 @@
 id: shields.specific.spellguard-shield
 type: shield
+tags: [shield.against-spells]
 extends: shields.steel-shield
 fields:
   price: 250

package/content/spells/agile-feet.yaml

@@ -2,6 +2,7 @@ id: spells.agile-feet
 type: spell
 tags: [trait.cleric, trait.focus, trait.manipulate, trait.uncommon]
 fields:
+  domain: domains.travel
   rank: 1
   cast: one
   duration: until-end-of-turn

package/content/spells/appearance-of-wealth.yaml

@@ -3,6 +3,7 @@ type: spell
 tags:
   [trait.cleric, trait.concentrate, trait.focus, trait.illusion, trait.manipulate, trait.uncommon]
 fields:
+  domain: domains.wealth
   rank: 1
   cast: two
   range: 30

package/content/spells/athletic-rush.yaml

@@ -2,6 +2,7 @@ id: spells.athletic-rush
 type: spell
 tags: [trait.cleric, trait.focus, trait.manipulate, trait.uncommon]
 fields:
+  domain: domains.might
   rank: 1
   cast: one
   duration: rounds