@opencharacter/orc-2e 0.1.0 → 0.2.0

package/README.md

@@ -28,9 +28,9 @@ const { ruleset } = loaded;
 
 // A new character, made by the random creation start: every pick is drawn, so it finishes.
 const blank = {
-  specVersion: '0.1.0',
+  specVersion: '0.2.0',
   id: 'new-character',
-  packs: [{ id: 'orc-2e', version: '0.1.0' }],
+  packs: [{ id: 'orc-2e', version: '0.2.0' }],
   creating: true,
 };
 const created = startAction(ruleset, blank, {
@@ -271,7 +271,7 @@ reading is listed under [Rule readings](#rule-readings).
   first of three Lores of the player's choice, named by the subject the player writes
   (`skills.lore.custom1.subject`); Additional Lore offers all three. Assurance (farmhand, nomad, raised by belief, scholar) is an action for the skill it's
   chosen for: a fixed 10 + the proficiency bonus against the DC, no dice and no other bonus or
-  penalty. Content can grant Assurance for a named skill (the grant's `skill` state): each background's Assurance is for the skill the book names (the driver's Lore, the scholar's and raised by belief's chosen skill, an inline option each). Player Core 2's eight new Lores and its
+  penalty. Its skill is a pick (any skill, or a trained Lore), which content granting Assurance for a named skill presets: each background's Assurance is for the skill the book names (the driver's Lore, the scholar's and raised by belief's chosen skill, an inline option each). Player Core 2's eight new Lores and its
   ten ancestry Lores are `rules/lores-pc2.yaml`; the cursed background's Warding Sign is the
   situational choice `wardingSign`, the feybound's Fey's Fortune `fortune`.
 - **Feats:** a slot per level for ancestry (1, 5, 9, 13, 17), general (3, 7, 11, 15, 19; skill feats
@@ -428,8 +428,9 @@ reading is listed under [Rule readings](#rule-readings).
   `prepare-spells` (inputs per rank the slot counts read); Improved Familiar Attunement
   and Staff Nexus text). Split Slot: `prepare-spells` may put a second
   spell in one slot below the highest rank, its copy naming the first's (`split`); casting either
-  expends both. Drain Bonded Item is an action (the ranks drained today are the
-  class copy's state, which `daily-preparations` clears). Feats: Counterspell (the expending),
+  expends both. Drain Bonded Item is an action (the ranks drained today, `bondDrained`, and
+  Linked Focus's `linkedFocusUsed` are Arcane Bond's saved grant state, which `daily-preparations`
+  clears). Feats: Counterspell (the expending),
   Linked Focus and twelve more, text where they shape a spell's range, area or traits.
 - **The cleric** (Player Core): Wisdom, divine prepared, and the divine font's 4 to 6 extra slots
   of heal or harm at the highest rank (to 9th), which `prepare-spells` fills. The deity is the
@@ -825,7 +826,7 @@ reads it as below. These are the pack's provisional calls; a table may rule othe
   any other Lore is a homebrew increases input and a trained-by-increase input (tagged
   `skill-increase`, they join level-up) and rank and modifier fields, trained by a homebrew
   effect granting its tag into `skills.trained`. The class's free skills and `extra-training`
-  offer the first seven Lores only: a value choice lists its values.
+  offer the first seven Lores only: their lists are written out, as no formula lists fields by tag.
 
 ## Sources
 

package/content/backgrounds/driver.yaml

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

package/content/backgrounds/farmhand.yaml

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

package/content/backgrounds/miner.yaml

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

package/content/backgrounds/nomad.yaml

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

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

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

package/content/backgrounds/scholar.yaml

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

package/content/classes/champion/resistance.yaml

@@ -9,3 +9,5 @@ effects:
     value: min(-incoming.amount, self.amount)
     when: incoming.amount < 0 && 'damage' in incoming.tags
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }

package/content/classes/wizard.yaml

@@ -3,12 +3,6 @@ type: class
 tags: [trait.wizard]
 fields: { hp: 6 }
 # Every pick that adds to the spellbook shares `unique: spellbook`, so no spell is added twice.
-# Drain Bonded Item's use today is the class copy's state `bondDrained`, a bit per rank drained (1
-# for 1st, 2 for 2nd, 4 for 3rd, …), and Linked Focus's `linkedFocusUsed`; daily preparations reset
-# both.
-state:
-  bondDrained: { type: integer, default: 0, min: 0, max: 511 }
-  linkedFocusUsed: { type: boolean, default: false }
 effects:
   # The class's trait, for content that reads the class by it (such as Natural Ambition).
   - { target: class.traits, op: grant, value: { tag: trait.wizard } }

package/content/feats/ancestry/changeling-lore.yaml

@@ -16,4 +16,6 @@ effects:
     }
   - { target: skills.trainings, op: add, value: 2 }
 grants:
-  - { item: feats.skill.additional-lore, waivePrerequisites: true }
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: hag }] }

package/content/feats/archetype/gladiator/gladiator-dedication.yaml

@@ -6,4 +6,4 @@ fields: { level: 2, category: class, archetype: archetypes.gladiator }
 prerequisites:
   - { id: impressive-performance, when: '@feats.skill.impressive-performance in feats.held' }
 grants:
-  - { item: feats.skill.additional-lore }
+  - { item: feats.skill.additional-lore, choices: { lore: [{ option: gladiatorial }] } }

package/content/feats/archetype/scout/terrain-scout.yaml

@@ -7,3 +7,9 @@ prerequisites:
   - { id: scout-dedication, when: '@feats.archetype.scout.scout-dedication in feats.held' }
 grants:
   - { item: feats.skill.terrain-stalker, waivePrerequisites: true }
+# The second Terrain Stalker is written out as the feat's own terrain choice: a second grant of
+# the feat would share the first's picks. Terrain Stalker has no effects beyond its terrain.
+choices:
+  - id: terrain
+    unique: terrain-stalker
+    from: { values: [rubble, snow, underbrush] }

package/content/feats/archetype/viking/viking-dedication.yaml

@@ -15,6 +15,8 @@ effects:
   - target: { fields: { where: "'archetype-extra.at10' in item.tags" } }
     op: grant
     value: { item: feats.fighter.quick-shield-block }
+  # Additional Lore for Warfare Lore is written out: a second grant of the feat would share the
+  # first's picks.
   - {
       target: skills.trained,
       op: grant,
@@ -26,4 +28,4 @@ effects:
     op: add
     value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
 grants:
-  - item: feats.skill.additional-lore
+  - { item: feats.skill.additional-lore, choices: { lore: [{ option: sailing }] } }

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/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/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/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/spells/enduring-might.yaml

@@ -12,3 +12,5 @@ effects:
     value: min(-incoming.amount, 8 + attributes.str.mod + 2 * (self.rank - 4))
     when: incoming.amount < 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }

package/content/spells/energy-absorption.yaml

@@ -16,3 +16,5 @@ effects:
     value: min(-incoming.amount, 15 + 5 * (self.rank - 4))
     when: incoming.amount < 0 && ('damage.' + self.damageType) in incoming.tags
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }

package/content/spells/fire-shield.yaml

@@ -7,6 +7,10 @@ fields:
   duration: minutes
   durationAmount: 1
   applyTo: self
+# `blocked` is the Hit Points the shield has lost to Shield Block; at its Hit Points it is
+# destroyed and the spell ends.
+state:
+  blocked: { type: integer, default: 0, min: 0 }
 effects:
   - target:
       incoming:
@@ -17,3 +21,30 @@ effects:
     value: min(-incoming.amount, 5 + 5 * floor((self.rank - 4) / 2))
     when: incoming.amount < 0
     scope: applied
+  - target: { fields: { where: "'ac' in item.tags" } }
+    op: add
+    value: 1
+    stackKey: circumstance-bonus
+    when: shield.raised
+    scope: applied
+  - id: block
+    target: { incoming: { fields: [hp.current], tags: [damage] } }
+    op: add
+    value: min(10, -incoming.amount)
+    when: situational.fireShieldBlock && incoming.amount < 0
+    scope: applied
+    then:
+      - type: adjustState
+        entry: self
+        key: blocked
+        by: max(0, -incoming.amount - 10)
+  - id: destroyed
+    target: { incoming: { fields: [hp.current], tags: [damage] } }
+    op: add
+    value: 0
+    when: >-
+      situational.fireShieldBlock && incoming.amount < 0
+        && self.blocked + max(0, -incoming.amount - 10) >= 40 + 10 * floor((self.rank - 4) / 2)
+    scope: applied
+    then:
+      - { type: removeEffect, entry: self }

package/content/spells/flame-barrier.yaml

@@ -17,3 +17,5 @@ effects:
     value: min(-incoming.amount, 15 + 5 * floor((self.rank - 4) / 2))
     when: incoming.amount < 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }

package/content/spells/shield.yaml

@@ -26,3 +26,5 @@ effects:
     value: min(5 + 5 * floor((self.rank - 1) / 2), -incoming.amount)
     when: situational.shieldSpellBlock && incoming.amount < 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }