@opencharacter/orc-2e 0.1.0 → 0.3.0

package/content/domains/travel.yaml

@@ -0,0 +1,6 @@
+id: domains.travel
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.agile-feet } }
+grants:
+  - item: spells.agile-feet

package/content/domains/trickery.yaml

@@ -0,0 +1,6 @@
+id: domains.trickery
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.sudden-shift } }
+grants:
+  - item: spells.sudden-shift

package/content/domains/truth.yaml

@@ -0,0 +1,6 @@
+id: domains.truth
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.word-of-truth } }
+grants:
+  - item: spells.word-of-truth

package/content/domains/tyranny.yaml

@@ -0,0 +1,6 @@
+id: domains.tyranny
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.touch-of-obedience } }
+grants:
+  - item: spells.touch-of-obedience

package/content/domains/undeath.yaml

@@ -0,0 +1,6 @@
+id: domains.undeath
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.touch-of-undeath } }
+grants:
+  - item: spells.touch-of-undeath

package/content/domains/water.yaml

@@ -0,0 +1,6 @@
+id: domains.water
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.tidal-surge } }
+grants:
+  - item: spells.tidal-surge

package/content/domains/wealth.yaml

@@ -0,0 +1,6 @@
+id: domains.wealth
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.appearance-of-wealth } }
+grants:
+  - item: spells.appearance-of-wealth

package/content/domains/zeal.yaml

@@ -0,0 +1,6 @@
+id: domains.zeal
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.weapon-surge } }
+grants:
+  - item: spells.weapon-surge

package/content/effects/treated-disease.yaml

@@ -10,12 +10,16 @@ effects:
     stackKey: circumstance-bonus
     when: situational.againstDisease && self.bonus > 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }
   - target: { rolls: [save] }
     op: add
     value: self.bonus
     stackKey: circumstance-penalty
     when: situational.againstDisease && self.bonus < 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }
   - target: { rolls: [save], tally: successToCrit }
     op: add
     value: 1

package/content/effects/treated-poison.yaml

@@ -10,12 +10,16 @@ effects:
     stackKey: circumstance-bonus
     when: situational.againstPoison && self.bonus > 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }
   - target: { rolls: [save] }
     op: add
     value: self.bonus
     stackKey: circumstance-penalty
     when: situational.againstPoison && self.bonus < 0
     scope: applied
+    then:
+      - { type: removeEffect, entry: self }
   - target: { rolls: [save], tally: successToCrit }
     op: add
     value: 1

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/ancestry/gnome-obsession.yaml

@@ -4,45 +4,7 @@ fields: { level: 1, category: ancestry, ancestry: ancestries.gnome }
 choices:
   - id: lore
     from:
-      values:
-        [
-          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.lores }
     effects:
       - {
           target: skills.trained,

package/content/feats/ancestry/tengu-feather-fan.yaml

@@ -16,7 +16,7 @@ effects:
       id: wave-fan-gust-of-wind
       flags: { itemPaid: true, rank: 1, dc: ancestry.dc }
       changes:
-        - { type: adjustState, picks: { where: has(self.fanUses) }, key: fanUses, by: 1 }
+        - { type: adjustState, pick: owner, key: fanUses, by: 1 }
   - target: { choices: [spell-cost] }
     op: option
     when: >-
@@ -25,7 +25,7 @@ effects:
       id: wave-fan-wall-of-wind
       flags: { itemPaid: true, rank: 3, dc: ancestry.dc }
       changes:
-        - { type: adjustState, picks: { where: has(self.fanUses) }, key: fanUses, by: 1 }
+        - { type: adjustState, pick: owner, key: fanUses, by: 1 }
   - target: { choices: [spell-cost] }
     op: option
     when: >-
@@ -34,4 +34,4 @@ effects:
       id: wave-fan-lightning-bolt
       flags: { itemPaid: true, rank: 5, dc: ancestry.dc }
       changes:
-        - { type: adjustState, picks: { where: has(self.fanUses) }, key: fanUses, by: 1 }
+        - { type: adjustState, pick: owner, key: fanUses, by: 1 }

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

@@ -23,5 +23,3 @@ grants:
 choices:
   - id: instinct
     from: { values: [animal, dragon, fury, giant, spirit, superstition] }
-    effects:
-      - { target: barbarian.instinct, op: set, value: pick.value }

package/content/feats/archetype/champion/champions-reaction.yaml

@@ -7,15 +7,5 @@ prerequisites:
   - { id: champion-dedication, when: '@feats.archetype.champion.champion-dedication in feats.held' }
 choices:
   - id: reaction
-    from:
-      items:
-        [
-          classes.champion.causes.desecration,
-          classes.champion.causes.grandeur,
-          classes.champion.causes.iniquity,
-          classes.champion.causes.justice,
-          classes.champion.causes.liberation,
-          classes.champion.causes.obedience,
-          classes.champion.causes.redemption,
-        ]
+    from: { type: feature, where: "item.classOption == 'champion.cause'" }
     eligible: "item.id == 'orc-2e:classes.champion.causes.' + champion.cause"

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/investigator/skill-mastery.yaml

@@ -18,35 +18,7 @@ choices:
   - id: to-master
     unique: mastery
     uniqueScope: owner
-    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,
-          ],
-      }
+    from: { values: { formula: skills.offered } }
     eligible: "maxFields(value in f.tags ? f.value : 0, 'skill-rank' in f.tags) == 2 || value in choice.picks"
     effects:
       - target: { fields: { where: "'skill-granted' in item.tags && pick.value in item.tags" } }
@@ -55,35 +27,7 @@ choices:
   - id: to-expert
     unique: mastery
     uniqueScope: owner
-    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,
-          ],
-      }
+    from: { values: { formula: skills.offered } }
     eligible: "maxFields(value in f.tags ? f.value : 0, 'skill-rank' in f.tags) == 1 || value in choice.picks"
     effects:
       - target: { fields: { where: "'skill-granted' in item.tags && pick.value in item.tags" } }

package/content/feats/archetype/rogue/skill-mastery.yaml

@@ -15,35 +15,7 @@ choices:
   - id: to-master
     unique: mastery
     uniqueScope: owner
-    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,
-          ],
-      }
+    from: { values: { formula: skills.offered } }
     eligible: "maxFields(value in f.tags ? f.value : 0, 'skill-rank' in f.tags) == 2 || value in choice.picks"
     effects:
       - target: { fields: { where: "'skill-granted' in item.tags && pick.value in item.tags" } }
@@ -52,35 +24,7 @@ choices:
   - id: to-expert
     unique: mastery
     uniqueScope: owner
-    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,
-          ],
-      }
+    from: { values: { formula: skills.offered } }
     eligible: "maxFields(value in f.tags ? f.value : 0, 'skill-rank' in f.tags) == 1 || value in choice.picks"
     effects:
       - target: { fields: { where: "'skill-granted' in item.tags && pick.value in item.tags" } }

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/champion/deitys-domain.yaml

@@ -5,25 +5,4 @@ effects:
   - { target: focus.points, op: add, value: 1 }
 choices:
   - id: domain
-    from:
-      type: spell
-      where: >-
-        item.id in [@spells.pushing-gust, @spells.ignite-ambition,
-          @spells.face-in-the-crowd, @spells.veil-of-confidence,
-          @spells.creative-splash, @spells.cloak-of-shadow,
-          @spells.deaths-call, @spells.cry-of-destruction,
-          @spells.sweet-dream, @spells.hurtling-stone,
-          @spells.soothing-words, @spells.read-fate,
-          @spells.fire-ray, @spells.unimpeded-stride,
-          @spells.healers-blessing, @spells.overstuff,
-          @spells.scholarly-recollection, @spells.bit-of-luck,
-          @spells.magics-vessel, @spells.athletic-rush,
-          @spells.moonbeam, @spells.vibrant-thorns,
-          @spells.waking-nightmare, @spells.savor-the-sting,
-          @spells.charming-touch, @spells.perfected-mind,
-          @spells.protectors-sacrifice, @spells.whispering-quiet,
-          @spells.dazzling-flash, @spells.agile-feet,
-          @spells.sudden-shift, @spells.word-of-truth,
-          @spells.touch-of-obedience, @spells.touch-of-undeath,
-          @spells.tidal-surge, @spells.appearance-of-wealth,
-          @spells.weapon-surge]
+    from: { type: spell, where: has(item.domain) }

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

@@ -11,190 +11,4 @@ choices:
   - id: domain
     unique: advanced-domains
     requiresOption: true
-    from:
-      options:
-        - id: air
-          prerequisites:
-            - { id: initial, when: '@spells.pushing-gust in cleric.domainSpells' }
-          grants:
-            - item: spells.disperse-into-air
-        - id: ambition
-          prerequisites:
-            - { id: initial, when: '@spells.ignite-ambition in cleric.domainSpells' }
-          grants:
-            - item: spells.competitive-edge
-        - id: cities
-          prerequisites:
-            - { id: initial, when: '@spells.face-in-the-crowd in cleric.domainSpells' }
-          grants:
-            - item: spells.pulse-of-civilization
-        - id: confidence
-          prerequisites:
-            - { id: initial, when: '@spells.veil-of-confidence in cleric.domainSpells' }
-          grants:
-            - item: spells.delusional-pride
-        - id: creation
-          prerequisites:
-            - { id: initial, when: '@spells.creative-splash in cleric.domainSpells' }
-          grants:
-            - item: spells.artistic-flourish
-        - id: darkness
-          prerequisites:
-            - { id: initial, when: '@spells.cloak-of-shadow in cleric.domainSpells' }
-          grants:
-            - item: spells.darkened-sight
-        - id: death
-          prerequisites:
-            - { id: initial, when: '@spells.deaths-call in cleric.domainSpells' }
-          grants:
-            - item: spells.eradicate-undeath
-        - id: destruction
-          prerequisites:
-            - { id: initial, when: '@spells.cry-of-destruction in cleric.domainSpells' }
-          grants:
-            - item: spells.destructive-aura
-        - id: dreams
-          prerequisites:
-            - { id: initial, when: '@spells.sweet-dream in cleric.domainSpells' }
-          grants:
-            - item: spells.dreamers-call
-        - id: earth
-          prerequisites:
-            - { id: initial, when: '@spells.hurtling-stone in cleric.domainSpells' }
-          grants:
-            - item: spells.localized-quake
-        - id: family
-          prerequisites:
-            - { id: initial, when: '@spells.soothing-words in cleric.domainSpells' }
-          grants:
-            - item: spells.unity
-        - id: fate
-          prerequisites:
-            - { id: initial, when: '@spells.read-fate in cleric.domainSpells' }
-          grants:
-            - item: spells.tempt-fate
-        - id: fire
-          prerequisites:
-            - { id: initial, when: '@spells.fire-ray in cleric.domainSpells' }
-          grants:
-            - item: spells.flame-barrier
-        - id: freedom
-          prerequisites:
-            - { id: initial, when: '@spells.unimpeded-stride in cleric.domainSpells' }
-          grants:
-            - item: spells.word-of-freedom
-        - id: healing
-          prerequisites:
-            - { id: initial, when: '@spells.healers-blessing in cleric.domainSpells' }
-          grants:
-            - item: spells.rebuke-death
-        - id: indulgence
-          prerequisites:
-            - { id: initial, when: '@spells.overstuff in cleric.domainSpells' }
-          grants:
-            - item: spells.take-its-course
-        - id: knowledge
-          prerequisites:
-            - { id: initial, when: '@spells.scholarly-recollection in cleric.domainSpells' }
-          grants:
-            - item: spells.know-the-enemy
-        - id: luck
-          prerequisites:
-            - { id: initial, when: '@spells.bit-of-luck in cleric.domainSpells' }
-          grants:
-            - item: spells.lucky-break
-        - id: magic
-          prerequisites:
-            - { id: initial, when: '@spells.magics-vessel in cleric.domainSpells' }
-          grants:
-            - item: spells.mystic-beacon
-        - id: might
-          prerequisites:
-            - { id: initial, when: '@spells.athletic-rush in cleric.domainSpells' }
-          grants:
-            - item: spells.enduring-might
-        - id: moon
-          prerequisites:
-            - { id: initial, when: '@spells.moonbeam in cleric.domainSpells' }
-          grants:
-            - item: spells.touch-of-the-moon
-        - id: nature
-          prerequisites:
-            - { id: initial, when: '@spells.vibrant-thorns in cleric.domainSpells' }
-          grants:
-            - item: spells.natures-bounty
-        - id: nightmares
-          prerequisites:
-            - { id: initial, when: '@spells.waking-nightmare in cleric.domainSpells' }
-          grants:
-            - item: spells.shared-nightmare
-        - id: pain
-          prerequisites:
-            - { id: initial, when: '@spells.savor-the-sting in cleric.domainSpells' }
-          grants:
-            - item: spells.retributive-pain
-        - id: passion
-          prerequisites:
-            - { id: initial, when: '@spells.charming-touch in cleric.domainSpells' }
-          grants:
-            - item: spells.captivating-adoration
-        - id: perfection
-          prerequisites:
-            - { id: initial, when: '@spells.perfected-mind in cleric.domainSpells' }
-          grants:
-            - item: spells.perfected-body
-        - id: protection
-          prerequisites:
-            - { id: initial, when: '@spells.protectors-sacrifice in cleric.domainSpells' }
-          grants:
-            - item: spells.protectors-sphere
-        - id: secrecy
-          prerequisites:
-            - { id: initial, when: '@spells.whispering-quiet in cleric.domainSpells' }
-          grants:
-            - item: spells.safeguard-secret
-        - id: sun
-          prerequisites:
-            - { id: initial, when: '@spells.dazzling-flash in cleric.domainSpells' }
-          grants:
-            - item: spells.vital-luminance
-        - id: travel
-          prerequisites:
-            - { id: initial, when: '@spells.agile-feet in cleric.domainSpells' }
-          grants:
-            - item: spells.travelers-transit
-        - id: trickery
-          prerequisites:
-            - { id: initial, when: '@spells.sudden-shift in cleric.domainSpells' }
-          grants:
-            - item: spells.tricksters-twin
-        - id: truth
-          prerequisites:
-            - { id: initial, when: '@spells.word-of-truth in cleric.domainSpells' }
-          grants:
-            - item: spells.glimpse-the-truth
-        - id: tyranny
-          prerequisites:
-            - { id: initial, when: '@spells.touch-of-obedience in cleric.domainSpells' }
-          grants:
-            - item: spells.commanding-lash
-        - id: undeath
-          prerequisites:
-            - { id: initial, when: '@spells.touch-of-undeath in cleric.domainSpells' }
-          grants:
-            - item: spells.malignant-sustenance
-        - id: water
-          prerequisites:
-            - { id: initial, when: '@spells.tidal-surge in cleric.domainSpells' }
-          grants:
-            - item: spells.downpour
-        - id: wealth
-          prerequisites:
-            - { id: initial, when: '@spells.appearance-of-wealth in cleric.domainSpells' }
-          grants:
-            - item: spells.precious-metals
-        - id: zeal
-          prerequisites:
-            - { id: initial, when: '@spells.weapon-surge in cleric.domainSpells' }
-          grants:
-            - item: spells.zeal-for-battle
+    from: { type: domain, where: item.advanced }