@opencharacter/orc-2e 0.2.0 → 0.3.0

package/content/domains/advanced/trickery.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.trickery
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.sudden-shift in cleric.domainSpells' }
+grants:
+  - item: spells.tricksters-twin

package/content/domains/advanced/truth.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.truth
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.word-of-truth in cleric.domainSpells' }
+grants:
+  - item: spells.glimpse-the-truth

package/content/domains/advanced/tyranny.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.tyranny
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.touch-of-obedience in cleric.domainSpells' }
+grants:
+  - item: spells.commanding-lash

package/content/domains/advanced/undeath.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.undeath
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.touch-of-undeath in cleric.domainSpells' }
+grants:
+  - item: spells.malignant-sustenance

package/content/domains/advanced/water.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.water
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.tidal-surge in cleric.domainSpells' }
+grants:
+  - item: spells.downpour

package/content/domains/advanced/wealth.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.wealth
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.appearance-of-wealth in cleric.domainSpells' }
+grants:
+  - item: spells.precious-metals

package/content/domains/advanced/zeal.yaml

@@ -0,0 +1,7 @@
+id: domains.advanced.zeal
+type: domain
+fields: { advanced: true }
+prerequisites:
+  - { id: initial, when: '@spells.weapon-surge in cleric.domainSpells' }
+grants:
+  - item: spells.zeal-for-battle

package/content/domains/air.yaml

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

package/content/domains/ambition.yaml

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

package/content/domains/cities.yaml

@@ -0,0 +1,6 @@
+id: domains.cities
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.face-in-the-crowd } }
+grants:
+  - item: spells.face-in-the-crowd

package/content/domains/confidence.yaml

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

package/content/domains/creation.yaml

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

package/content/domains/darkness.yaml

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

package/content/domains/death.yaml

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

package/content/domains/destruction.yaml

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

package/content/domains/dreams.yaml

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

package/content/domains/earth.yaml

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

package/content/domains/family.yaml

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

package/content/domains/fate.yaml

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

package/content/domains/fire.yaml

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

package/content/domains/freedom.yaml

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

package/content/domains/healing.yaml

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

package/content/domains/indulgence.yaml

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

package/content/domains/knowledge.yaml

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

package/content/domains/luck.yaml

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

package/content/domains/magic.yaml

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

package/content/domains/might.yaml

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

package/content/domains/moon.yaml

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

package/content/domains/nature.yaml

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

package/content/domains/nightmares.yaml

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

package/content/domains/pain.yaml

@@ -0,0 +1,6 @@
+id: domains.pain
+type: domain
+effects:
+  - { target: cleric.domainSpells, op: grant, value: { item: spells.savor-the-sting } }
+grants:
+  - item: spells.savor-the-sting

package/content/domains/passion.yaml

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

package/content/domains/perfection.yaml

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

package/content/domains/protection.yaml

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

package/content/domains/secrecy.yaml

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

package/content/domains/sun.yaml

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

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