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

package/README.md

@@ -14,6 +14,9 @@ cast spells, use skill actions, and buy, sell, implant and upgrade equipment. Th
 pnpm add @opencharacter/engine @opencharacter/orc-sf-2e
 ```
 
+This release needs spec 0.3: `@opencharacter/engine` 0.3.0 or later. An engine for an older
+spec refuses it (`spec-version-unsupported`).
+
 The package's default export is the built pack (a `PackRelease`), and `i18n/en` its English
 text:
 
@@ -28,9 +31,9 @@ const { ruleset } = loaded;
 
 // A new character, made by the random creation start: every pick is drawn, so it finishes.
 const blank = {
-  specVersion: '0.2.0',
+  specVersion: '0.3.0',
   id: 'new-character',
-  packs: [{ id: 'orc-sf-2e', version: '0.2.0' }],
+  packs: [{ id: 'orc-sf-2e', version: '0.3.0' }],
   creating: true,
 };
 const created = startAction(ruleset, blank, {
@@ -84,6 +87,45 @@ offer fantasy content. The format can hide a dependency's content only item by i
 would still be in the ruleset. Where the two books print the same rule or item, this pack's
 copy has the same shape as `orc-2e`'s, and the same text where the wording matches.
 
+## Add-on packs
+
+A pack that depends on `orc-sf-2e` can add to what it offers:
+
+- **Subclasses:** a feature whose `classOption` names a class's choice (`envoy.leadership-style`,
+  `mystic.connection`, `soldier.fighting-style`, `witchwarper.paradox`, `witchwarper.anchor`)
+  joins it, and gear tagged `tool.compass` counts for Sense Direction.
+- **Open enums** (`extendEnums`): `mystic.connection` and `witchwarper.paradox`, which a new
+  connection or paradox sets with its own effect, as the core's do; weapon `group`,
+  `damageType` and `ammoKind`, ammunition `kind`, armor `group`, consumable `category`,
+  `damageType` and `persistentType`, spell damage types, affliction and persistent damage
+  condition damage types, feat `category`, and `cast-spell`'s `damageType` parameter
+  (`orc-sf-2e:actions.cast-spell.params.damageType`). A new damage type or group also needs its tag,
+  declared and named in the add-on.
+- **Choices** (`extendChoices`): written value and inline option choices take additions: the
+  operative's `specialization`, the epiphany feats' `spell` (Basic, New, Advanced, Greater and
+  Syncretic Epiphany), Additional Lore's `lore`, and the short skill lists. A new connection's
+  epiphany counts for New Epiphany, Syncretic Epiphany and Realized Epiphany through rules
+  effects on `mystic.otherExpertConnections`, `mystic.otherMasterEpiphanies` and
+  `mystic.connectionRank`.
+- **Naming what an add-on adds:** it names each added value, option or key in its own text,
+  under the key this pack would use, and `createText` finds it there when the app passes the
+  ruleset's `enumOrigins`, `optionOrigins` and `familyOrigins`. For example,
+  `void` added to `orc-sf-2e:mystic.connection` is
+  `fields.mystic.connection.values.void.name: Void` (through `enumOrigins`), and a Specialized
+  Operative option `saboteur` is
+  `feats.archetype.operative.specialized-operative.choices.specialization.options.saboteur.name: Saboteur`
+  (through `optionOrigins`).
+- **Skills and Lores:** a choice of any skill reads `skills.offered` and one of any Lore
+  `skills.lores`; an add-on's Lore declares its fields (`skills.lore.<name>.rank`, `.mod`, …,
+  as `rules/skills.yaml` does) and grants its tag into both with a rules effect.
+- **Step tags** for rules-level `option` and `changes` effects: `creation.ancestry`,
+  `creation.heritage`, `creation.background`, `creation.class` and `creation.finish` (guided and
+  random creation), `level-up.gain`, and the actions' own (`strike.hit`, …).
+
+Still closed: attributes, proficiency ranks, saves, spell traditions, weapon and armor
+categories, the solarian's attunement and physical damage types for `versatile`, the game's
+fixed sets.
+
 ## License
 
 - **License:** the ORC License. Its four notices (Article III) are in the manifest, which apps
@@ -198,7 +240,8 @@ Where the book leaves a rule open, or the format needs a choice the book doesn't
 reads it as below. These are the pack's provisional calls; a table may rule otherwise.
 
 - **Random start:** the book has players choose, so the odds are the pack's, as in `orc-2e`:
-  each pick is drawn uniformly among the options eligible then, in the guided start's order, and
+  each pick is drawn uniformly among the options eligible then, in the guided start's order
+  (except that the free boosts follow the class's picks, once the key attribute is known), and
   boosts follow the planned key attribute, then Constitution, Dexterity, Wisdom, Strength,
   Intelligence and Charisma.
 - **Specialized Skill Set:** a slot can find no eligible feat (the specialization's skill has few
@@ -212,7 +255,11 @@ reads it as below. These are the pack's provisional calls; a table may rule othe
 - **Mystic:** Transfer Vitality moves as many Hit Points as the target is missing, up to the
   limit and what the network holds, unless the player gives an amount; the mystic archetype's
   network regains Hit Points each turn and on Refocus as the class's does; the rhythm
-  connection's 9th-rank spell (_unfathomable song_) is the fantasy core's.
+  connection's 9th-rank spell (_unfathomable song_) is the fantasy core's. Elemental weapon and
+  elemental barrier are applied to the caster with their element (Cast a Spell's `element`), the
+  record of the active spell; what they give the target is text. While one is active, the
+  elemental connection's wall of fire and absolute zero take its element's trait and first damage
+  type (electricity, bludgeoning, fire, acid, cold, poison), a kept template per element.
 - **Witchwarper:** the spellcasting attribute is the key attribute chosen; Core Memories'
   Assurance skill and In Another Life's ancestry feat are set by an action and kept until the
   player sets them again (the book's "during daily preparations").
@@ -231,7 +278,9 @@ reads it as below. These are the pack's provisional calls; a table may rule othe
 - **Left to the app:** turns (it runs `start-turn` and `end-turn`), movement, reach, distances,
   areas and auras (who is in a burst, a quantum field, a harmony's emanation or a bond's range is
   the participants the app passes), cover and flanking (situational choices), when a condition
-  is gained, daily preparations and rests, a spell's duration and sustaining.
+  is gained, daily preparations and rests, a spell's duration and sustaining (a spell or
+  treatment for the next roll, such as guidance, sure strike or Treat Poison, ends on the roll it
+  changes).
 - **Text only:** critical specialization; the feats and features about movement, positions,
   other creatures' sheets, starships and drones; most harmony and quantum field effects; skill
   feats that change time or what the GM tells you; more than half the spells (utility,

package/content/classes/envoy.yaml

@@ -53,62 +53,12 @@ choices:
         when: '!(pick.value in skills.chosen)'
       - { target: skills.trainings, op: add, value: 1 }
   - id: leadership-style
-    from:
-      items:
-        - features.envoy.style.from-the-front
-        - features.envoy.style.from-the-shadows
-        - features.envoy.style.guns-blazing
-        - features.envoy.style.in-the-spotlight
-        - features.envoy.style.infosphere-director
-        - features.envoy.style.through-desperate-times
+    from: { type: feature, where: "item.classOption == 'envoy.leadership-style'" }
   - id: skills
     unique: skill-training
     pick: '6 + 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/classes/mystic/connections/akashic.yaml

@@ -1,6 +1,6 @@
 id: classes.mystic.connections.akashic
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: mystic.connection }
 effects:
   - { target: mystic.connection, op: set, value: "'akashic'" }
   - { target: spellcasting.tradition, op: set, value: "'occult'" }

package/content/classes/mystic/connections/elemental.yaml

@@ -1,6 +1,6 @@
 id: classes.mystic.connections.elemental
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: mystic.connection }
 effects:
   - { target: mystic.connection, op: set, value: "'elemental'" }
   - { target: spellcasting.tradition, op: set, value: "'primal'" }
@@ -100,3 +100,64 @@ grants:
   - { item: spells.falling-stars, when: 'level >= 17' }
   - { item: spells.elemental-weapon }
   - { item: feats.general.shield-block, waivePrerequisites: true }
+keepsTemplates:
+  - template: templates.elemental.air
+    content:
+      type: spell
+      where: item.id == @spells.wall-of-fire || item.id == @spells.absolute-zero
+    when: >-
+      countList(character.applied, x.active
+        && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier)) > 0
+        && filterList(character.applied, x.active
+          && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier))[0]
+          .state.element == 'air'
+  - template: templates.elemental.earth
+    content:
+      type: spell
+      where: item.id == @spells.wall-of-fire || item.id == @spells.absolute-zero
+    when: >-
+      countList(character.applied, x.active
+        && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier)) > 0
+        && filterList(character.applied, x.active
+          && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier))[0]
+          .state.element == 'earth'
+  - template: templates.elemental.fire
+    content:
+      type: spell
+      where: item.id == @spells.wall-of-fire || item.id == @spells.absolute-zero
+    when: >-
+      countList(character.applied, x.active
+        && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier)) > 0
+        && filterList(character.applied, x.active
+          && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier))[0]
+          .state.element == 'fire'
+  - template: templates.elemental.metal
+    content:
+      type: spell
+      where: item.id == @spells.wall-of-fire || item.id == @spells.absolute-zero
+    when: >-
+      countList(character.applied, x.active
+        && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier)) > 0
+        && filterList(character.applied, x.active
+          && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier))[0]
+          .state.element == 'metal'
+  - template: templates.elemental.water
+    content:
+      type: spell
+      where: item.id == @spells.wall-of-fire || item.id == @spells.absolute-zero
+    when: >-
+      countList(character.applied, x.active
+        && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier)) > 0
+        && filterList(character.applied, x.active
+          && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier))[0]
+          .state.element == 'water'
+  - template: templates.elemental.wood
+    content:
+      type: spell
+      where: item.id == @spells.wall-of-fire || item.id == @spells.absolute-zero
+    when: >-
+      countList(character.applied, x.active
+        && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier)) > 0
+        && filterList(character.applied, x.active
+          && (x.source == @spells.elemental-weapon || x.source == @spells.elemental-barrier))[0]
+          .state.element == 'wood'

package/content/classes/mystic/connections/healing.yaml

@@ -1,6 +1,6 @@
 id: classes.mystic.connections.healing
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: mystic.connection }
 effects:
   - { target: mystic.connection, op: set, value: "'healing'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/mystic/connections/rhythm.yaml

@@ -1,6 +1,6 @@
 id: classes.mystic.connections.rhythm
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: mystic.connection }
 effects:
   - { target: mystic.connection, op: set, value: "'rhythm'" }
   - { target: spellcasting.tradition, op: set, value: "'primal'" }

package/content/classes/mystic/connections/shadow.yaml

@@ -1,6 +1,6 @@
 id: classes.mystic.connections.shadow
 type: feature
-fields: { level: 1 }
+fields: { level: 1, classOption: mystic.connection }
 effects:
   - { target: mystic.connection, op: set, value: "'shadow'" }
   - { target: spellcasting.tradition, op: set, value: "'divine'" }

package/content/classes/mystic.yaml

@@ -42,61 +42,12 @@ grants:
   - { item: features.mystic.transcendence, when: 'level >= 19' }
 choices:
   - id: connection
-    from:
-      items:
-        - classes.mystic.connections.akashic
-        - classes.mystic.connections.elemental
-        - classes.mystic.connections.healing
-        - classes.mystic.connections.rhythm
-        - classes.mystic.connections.shadow
+    from: { type: feature, where: "item.classOption == 'mystic.connection'" }
   - 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/classes/operative.yaml

@@ -144,50 +144,7 @@ choices:
     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/classes/solarian.yaml

@@ -53,50 +53,7 @@ choices:
     unique: skill-training
     pick: '4 + 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/classes/soldier.yaml

@@ -43,61 +43,12 @@ grants:
   - { item: features.soldier.legendary-soldier, when: 'level >= 19' }
 choices:
   - id: fighting-style
-    from:
-      items:
-        - features.soldier.style.action-hero
-        - features.soldier.style.armor-storm
-        - features.soldier.style.bombard
-        - features.soldier.style.close-quarters
-        - features.soldier.style.erudite-warrior
+    from: { type: feature, where: "item.classOption == 'soldier.fighting-style'" }
   - 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/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] }

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