@opencharacter/orc-sf-2e 0.1.1 → 0.3.0

package/content/classes/witchwarper/anchors/core-memories.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.anchors.core-memories
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.anchor }
 state: { used: { type: boolean, default: false } }
 effects:
   - target: { steps: [turn.start] }
@@ -36,222 +36,10 @@ actions:
       - id: skill
         kind: choice
         recommend: 'options[0]'
-        options:
-          - id: acrobatics
-            when: "'skill.acrobatics' in skills.trained || 'skill.acrobatics' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.acrobatics'" }
-          - id: arcana
-            when: "'skill.arcana' in skills.trained || 'skill.arcana' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.arcana'" }]
-          - id: athletics
-            when: "'skill.athletics' in skills.trained || 'skill.athletics' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.athletics'" }]
-          - id: computers
-            when: "'skill.computers' in skills.trained || 'skill.computers' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.computers'" }]
-          - id: crafting
-            when: "'skill.crafting' in skills.trained || 'skill.crafting' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.crafting'" }]
-          - id: deception
-            when: "'skill.deception' in skills.trained || 'skill.deception' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.deception'" }]
-          - id: diplomacy
-            when: "'skill.diplomacy' in skills.trained || 'skill.diplomacy' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.diplomacy'" }]
-          - id: intimidation
-            when: "'skill.intimidation' in skills.trained || 'skill.intimidation' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.intimidation'" }
-          - id: medicine
-            when: "'skill.medicine' in skills.trained || 'skill.medicine' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.medicine'" }]
-          - id: nature
-            when: "'skill.nature' in skills.trained || 'skill.nature' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.nature'" }]
-          - id: occultism
-            when: "'skill.occultism' in skills.trained || 'skill.occultism' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.occultism'" }]
-          - id: performance
-            when: "'skill.performance' in skills.trained || 'skill.performance' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.performance'" }
-          - id: piloting
-            when: "'skill.piloting' in skills.trained || 'skill.piloting' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.piloting'" }]
-          - id: religion
-            when: "'skill.religion' in skills.trained || 'skill.religion' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.religion'" }]
-          - id: society
-            when: "'skill.society' in skills.trained || 'skill.society' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.society'" }]
-          - id: stealth
-            when: "'skill.stealth' in skills.trained || 'skill.stealth' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.stealth'" }]
-          - id: survival
-            when: "'skill.survival' in skills.trained || 'skill.survival' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.survival'" }]
-          - id: thievery
-            when: "'skill.thievery' in skills.trained || 'skill.thievery' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.thievery'" }]
-          - id: lore-academia
-            when: "'skill.lore.academia' in skills.trained || 'skill.lore.academia' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.academia'" }
-          - id: lore-alcohol
-            when: "'skill.lore.alcohol' in skills.trained || 'skill.lore.alcohol' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.alcohol'" }
-          - id: lore-android
-            when: "'skill.lore.android' in skills.trained || 'skill.lore.android' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.android'" }
-          - id: lore-animal
-            when: "'skill.lore.animal' in skills.trained || 'skill.lore.animal' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.animal'" }
-          - id: lore-art
-            when: "'skill.lore.art' in skills.trained || 'skill.lore.art' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.lore.art'" }]
-          - id: lore-augmentation
-            when: "'skill.lore.augmentation' in skills.trained || 'skill.lore.augmentation' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.augmentation'"
-          - id: lore-barathu
-            when: "'skill.lore.barathu' in skills.trained || 'skill.lore.barathu' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.barathu'" }
-          - id: lore-borai
-            when: "'skill.lore.borai' in skills.trained || 'skill.lore.borai' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.borai'" }
-          - id: lore-business
-            when: "'skill.lore.business' in skills.trained || 'skill.lore.business' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.business'" }
-          - id: lore-cooking
-            when: "'skill.lore.cooking' in skills.trained || 'skill.lore.cooking' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.cooking'" }
-          - id: lore-corporate
-            when: "'skill.lore.corporate' in skills.trained || 'skill.lore.corporate' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.corporate'" }
-          - id: lore-games
-            when: "'skill.lore.games' in skills.trained || 'skill.lore.games' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.games'" }
-          - id: lore-genealogy
-            when: "'skill.lore.genealogy' in skills.trained || 'skill.lore.genealogy' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.genealogy'" }
-          - id: lore-history
-            when: "'skill.lore.history' in skills.trained || 'skill.lore.history' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.history'" }
-          - id: lore-hyperspace
-            when: "'skill.lore.hyperspace' in skills.trained || 'skill.lore.hyperspace' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.hyperspace'"
-          - id: lore-infosphere
-            when: "'skill.lore.infosphere' in skills.trained || 'skill.lore.infosphere' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.infosphere'"
-          - id: lore-kasatha
-            when: "'skill.lore.kasatha' in skills.trained || 'skill.lore.kasatha' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.kasatha'" }
-          - id: lore-labor
-            when: "'skill.lore.labor' in skills.trained || 'skill.lore.labor' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.labor'" }
-          - id: lore-lashunta
-            when: "'skill.lore.lashunta' in skills.trained || 'skill.lore.lashunta' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.lashunta'" }
-          - id: lore-legal
-            when: "'skill.lore.legal' in skills.trained || 'skill.lore.legal' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.legal'" }
-          - id: lore-life-science
-            when: "'skill.lore.life-science' in skills.trained || 'skill.lore.life-science' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.life-science'"
-          - id: lore-media
-            when: "'skill.lore.media' in skills.trained || 'skill.lore.media' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.media'" }
-          - id: lore-mining
-            when: "'skill.lore.mining' in skills.trained || 'skill.lore.mining' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.mining'" }
-          - id: lore-pahtra
-            when: "'skill.lore.pahtra' in skills.trained || 'skill.lore.pahtra' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.pahtra'" }
-          - id: lore-physical-science
-            when: "'skill.lore.physical-science' in skills.trained || 'skill.lore.physical-science' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.physical-science'"
-          - id: lore-piracy
-            when: "'skill.lore.piracy' in skills.trained || 'skill.lore.piracy' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.piracy'" }
-          - id: lore-plant
-            when: "'skill.lore.plant' in skills.trained || 'skill.lore.plant' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.plant'" }
-          - id: lore-prismeni
-            when: "'skill.lore.prismeni' in skills.trained || 'skill.lore.prismeni' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.prismeni'" }
-          - id: lore-shirren
-            when: "'skill.lore.shirren' in skills.trained || 'skill.lore.shirren' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.shirren'" }
-          - id: lore-skittermander
-            when: "'skill.lore.skittermander' in skills.trained || 'skill.lore.skittermander' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.skittermander'"
-          - id: lore-sports
-            when: "'skill.lore.sports' in skills.trained || 'skill.lore.sports' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.sports'" }
-          - id: lore-underworld
-            when: "'skill.lore.underworld' in skills.trained || 'skill.lore.underworld' in skills.chosen"
-            changes:
-              - type: set
-                field: witchwarper.memorySkill
-                value: "'skill.lore.underworld'"
-          - id: lore-vesk
-            when: "'skill.lore.vesk' in skills.trained || 'skill.lore.vesk' in skills.chosen"
-            changes: [{ type: set, field: witchwarper.memorySkill, value: "'skill.lore.vesk'" }]
-          - id: lore-vidgame
-            when: "'skill.lore.vidgame' in skills.trained || 'skill.lore.vidgame' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.vidgame'" }
-          - id: lore-warfare
-            when: "'skill.lore.warfare' in skills.trained || 'skill.lore.warfare' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.warfare'" }
-          - id: lore-ysoki
-            when: "'skill.lore.ysoki' in skills.trained || 'skill.lore.ysoki' in skills.chosen"
-            changes:
-              - { type: set, field: witchwarper.memorySkill, value: "'skill.lore.ysoki'" }
+        options: { values: { formula: 'skills.trained + skills.chosen' } }
+        changes: [{ type: set, field: witchwarper.memorySkill, value: picked.value }]
       - { id: result, kind: outcome, result: "'chosen'" }
 grants:
   - item: feats.skill.assurance
     when: "witchwarper.memorySkill != ''"
-    state: { skill: witchwarper.memorySkill }
+    choices: { skill: [{ option: { formula: witchwarper.memorySkill } }] }

package/content/classes/witchwarper/anchors/focal-point.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.anchors.focal-point
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.anchor }
 state: { used: { type: boolean, default: false } }
 effects:
   - target: { steps: [turn.start] }

package/content/classes/witchwarper/anchors/tangible-object.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.anchors.tangible-object
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.anchor }
 state: { used: { type: boolean, default: false } }
 effects:
   - target: { steps: [turn.start] }

package/content/classes/witchwarper/paradoxes/analyst.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.paradoxes.analyst
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.paradox }
 effects:
   - { target: witchwarper.paradox, op: set, value: "'analyst'" }
   - { target: spellcasting.tradition, op: set, value: "'arcane'" }

package/content/classes/witchwarper/paradoxes/anomaly.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.paradoxes.anomaly
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.paradox }
 effects:
   - { target: witchwarper.paradox, op: set, value: "'anomaly'" }
   - { target: spellcasting.tradition, op: set, value: "'arcane'" }

package/content/classes/witchwarper/paradoxes/lost-history.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.paradoxes.lost-history
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.paradox }
 effects:
   - { target: witchwarper.paradox, op: set, value: "'lost-history'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/witchwarper/paradoxes/precog.yaml

@@ -1,6 +1,6 @@
 id: classes.witchwarper.paradoxes.precog
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: witchwarper.paradox }
 effects:
   - { target: witchwarper.paradox, op: set, value: "'precog'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/witchwarper.yaml

@@ -50,66 +50,14 @@ choices:
             - { target: attributes.int.boosts, op: add, value: 1 }
             - { target: class.keyAttribute, op: set, value: "'int'" }
   - id: paradox
-    from:
-      items:
-        - classes.witchwarper.paradoxes.analyst
-        - classes.witchwarper.paradoxes.anomaly
-        - classes.witchwarper.paradoxes.lost-history
-        - classes.witchwarper.paradoxes.precog
+    from: { type: feature, where: "item.classOption == 'witchwarper.paradox'" }
   - id: anchor
-    from:
-      items:
-        - classes.witchwarper.anchors.core-memories
-        - classes.witchwarper.anchors.focal-point
-        - classes.witchwarper.anchors.tangible-object
+    from: { type: feature, where: "item.classOption == 'witchwarper.anchor'" }
   - id: skills
     unique: skill-training
     pick: '3 + max(0, attributes.int.mod)'
     from:
-      values:
-        - skill.acrobatics
-        - skill.arcana
-        - skill.athletics
-        - skill.computers
-        - skill.crafting
-        - skill.deception
-        - skill.diplomacy
-        - skill.intimidation
-        - skill.medicine
-        - skill.nature
-        - skill.occultism
-        - skill.performance
-        - skill.piloting
-        - skill.religion
-        - skill.society
-        - skill.stealth
-        - skill.survival
-        - skill.thievery
-        - skill.lore.academia
-        - skill.lore.alcohol
-        - skill.lore.animal
-        - skill.lore.art
-        - skill.lore.augmentation
-        - skill.lore.business
-        - skill.lore.cooking
-        - skill.lore.corporate
-        - skill.lore.games
-        - skill.lore.genealogy
-        - skill.lore.history
-        - skill.lore.hyperspace
-        - skill.lore.infosphere
-        - skill.lore.labor
-        - skill.lore.legal
-        - skill.lore.life-science
-        - skill.lore.media
-        - skill.lore.mining
-        - skill.lore.physical-science
-        - skill.lore.piracy
-        - skill.lore.plant
-        - skill.lore.sports
-        - skill.lore.underworld
-        - skill.lore.vidgame
-        - 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 } }]
   - id: class-feat

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/android-lore.yaml

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.thievery }
     when: "!('skill.thievery' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.android }
-    when: "!('skill.lore.android' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.android.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: android }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.medicine }
     when: "!('skill.medicine' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.barathu }
-    when: "!('skill.lore.barathu' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.barathu.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: barathu }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.religion }
     when: "!('skill.religion' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.borai }
-    when: "!('skill.lore.borai' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.borai.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: borai }] }

package/content/feats/ancestry/extra-devotion.yaml

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.thievery }
     when: "!('skill.thievery' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.custom3 }
-    when: "!('skill.lore.custom3' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.custom3.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: custom3 }] }

package/content/feats/ancestry/fixation.yaml

@@ -2,4 +2,18 @@ id: feats.ancestry.fixation
 type: feat
 tags: [trait.skittermander]
 fields: { level: 1, category: ancestry, ancestry: ancestries.skittermander }
-grants: [{ item: feats.skill.additional-lore, waivePrerequisites: true }]
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+  - item: feats.skill.assurance
+    when: size(grantedPicksOf('feats.skill.additional-lore', 'lore')) > 0
+    choices:
+      skill:
+        [
+          {
+            option:
+              {
+                formula: "'skill.lore.' + grantedPicksOf('feats.skill.additional-lore', 'lore')[0]",
+              },
+          },
+        ]

package/content/feats/ancestry/harmonic-sensitivity.yaml

@@ -2,9 +2,19 @@ id: feats.ancestry.harmonic-sensitivity
 type: feat
 tags: [trait.pahtra]
 fields: { level: 1, category: ancestry, ancestry: ancestries.pahtra }
-effects:
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.performance }
-    when: "!('skill.performance' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
+choices:
+  - id: harmonic
+    from: { values: [training, assurance] }
+    eligible: >-
+      value == 'assurance' ? 'skill.performance' in skills.trained
+        : !('skill.performance' in skills.trained)
+    recommend: "'skill.performance' in skills.trained ? 'assurance' : 'training'"
+    effects:
+      - target: skills.chosen
+        op: grant
+        value: { tag: skill.performance }
+        when: "pick.value == 'training'"
+grants:
+  - item: feats.skill.assurance
+    when: "'assurance' in picksOf('harmonic')"
+    choices: { skill: [{ option: skill.performance }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.society }
     when: "!('skill.society' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.kasatha }
-    when: "!('skill.lore.kasatha' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.kasatha.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: kasatha }] }

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

@@ -2,6 +2,12 @@ id: feats.ancestry.lashunta-lore
 type: feat
 tags: [trait.lashunta]
 fields: { level: 1, category: ancestry, ancestry: ancestries.lashunta }
+# Its Additional Lore can't repeat one the character already took for Lashunta Lore.
+prerequisites:
+  - id: lore
+    when: >-
+      countList(picksOf('feats.skill.additional-lore', 'lore'), x == 'lashunta')
+        <= (@feats.ancestry.lashunta-lore in feats.held ? 1 : 0)
 effects:
   - target: skills.trained
     op: grant
@@ -13,11 +19,7 @@ effects:
     value: { tag: skill.society }
     when: "!('skill.society' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.lashunta }
-    when: "!('skill.lore.lashunta' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.lashunta.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: lashunta }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.performance }
     when: "!('skill.performance' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.pahtra }
-    when: "!('skill.lore.pahtra' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.pahtra.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: pahtra }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.stealth }
     when: "!('skill.stealth' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.prismeni }
-    when: "!('skill.lore.prismeni' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.prismeni.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: prismeni }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.society }
     when: "!('skill.society' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.shirren }
-    when: "!('skill.lore.shirren' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.shirren.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: shirren }] }

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

@@ -13,12 +13,8 @@ effects:
     value: { tag: skill.society }
     when: "!('skill.society' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.skittermander }
-    when: "!('skill.lore.skittermander' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.skittermander.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
   - { target: languages, op: grant, value: { item: languages.skittermander } }
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: skittermander }] }

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

@@ -13,11 +13,7 @@ effects:
     value: { tag: skill.stealth }
     when: "!('skill.stealth' in skills.chosen)"
   - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.trained
-    op: grant
-    value: { tag: skill.lore.ysoki }
-    when: "!('skill.lore.ysoki' in skills.chosen)"
-  - { target: skills.trainings, op: add, value: 1 }
-  - target: skills.lore.ysoki.granted
-    op: add
-    value: '(level >= 3 ? 1 : 0) + (level >= 7 ? 1 : 0) + (level >= 15 ? 1 : 0)'
+grants:
+  - item: feats.skill.additional-lore
+    waivePrerequisites: true
+    choices: { lore: [{ option: ysoki }] }