@opencharacter/wwn-srd 0.1.0 → 0.2.0

package/i18n/en/content.yaml

@@ -32,7 +32,7 @@ arts.accursed.tendrils-of-night.name: 'Tendrils of Night'
 arts.accursed.unseen-steps.name: 'Unseen Steps'
 arts.accursed.weeping-wounds.name: 'Weeping Wounds'
 arts.accursed.weight-of-sin.name: 'Weight of Sin'
-arts.bard.a-thousand-tongues.name: 'A Thousand Tongues'
+arts.bard.a-thousand-tongues.name: 'A Thousand Tongues (Bard)'
 arts.bard.battle-cry.name: 'Battle Cry'
 arts.bard.cursed-tune.name: 'Cursed Tune'
 arts.bard.deft-fingers.name: 'Deft Fingers'
@@ -57,7 +57,7 @@ arts.beastmaster.savage-senses.name: 'Savage Senses'
 arts.beastmaster.shared-vitality.name: 'Shared Vitality'
 arts.beastmaster.swift-healing.name: 'Swift Healing'
 arts.beastmaster.tongue-of-the-beasts.name: 'Tongue of the Beasts'
-arts.blood-priest.a-thousand-tongues.name: 'A Thousand Tongues'
+arts.blood-priest.a-thousand-tongues.name: 'A Thousand Tongues (Blood Priest)'
 arts.blood-priest.armor-of-god.name: 'Armor of God'
 arts.blood-priest.divine-guidance.name: 'Divine Guidance'
 arts.blood-priest.fear-no-flame.name: 'Fear No Flame'
@@ -226,10 +226,6 @@ classes.adventurer.choices.first.prompt: 'First partial class'
 classes.adventurer.choices.second.prompt: 'Second partial class'
 classes.adventurer.name: 'Adventurer'
 classes.expert.name: 'Expert'
-classes.mage.choices.tradition.options.elementalist.name: 'Elementalist'
-classes.mage.choices.tradition.options.high-mage.name: 'High Mage'
-classes.mage.choices.tradition.options.invoker.name: 'Invoker'
-classes.mage.choices.tradition.options.necromancer.name: 'Necromancer'
 classes.mage.choices.tradition.prompt: 'Magical tradition'
 classes.mage.name: 'Mage'
 classes.warrior.name: 'Warrior'
@@ -255,7 +251,7 @@ foci.henchkeeper.name: 'Henchkeeper'
 foci.impervious-defense.name: 'Impervious Defense'
 foci.impostor.name: 'Impostor'
 foci.lucky.name: 'Lucky'
-foci.lucky.prerequisites.low-attribute: 'An attribute modifier of -1 or less'
+foci.lucky.prerequisites.low-attribute: 'An attribute score of 7 or less (a modifier of -1 or worse)'
 foci.nullifier.name: 'Nullifier'
 foci.nullifier.prerequisites.non-mage: 'Not a Mage or partial Mage'
 foci.poisoner.name: 'Poisoner'
@@ -337,14 +333,6 @@ partials.blood-priest.name: 'Blood Priest'
 partials.duelist.name: 'Duelist'
 partials.expert.name: 'Partial Expert'
 partials.healer.name: 'Healer'
-partials.mage.choices.tradition.options.elementalist.name: 'Elementalist'
-partials.mage.choices.tradition.options.elementalist.prerequisites.no-invoker: 'No partial Invoker'
-partials.mage.choices.tradition.options.high-mage.name: 'High Mage'
-partials.mage.choices.tradition.options.high-mage.prerequisites.no-invoker: 'No partial Invoker'
-partials.mage.choices.tradition.options.invoker.name: 'Invoker'
-partials.mage.choices.tradition.options.invoker.prerequisites.no-other-caster: 'No other partial spellcasting class'
-partials.mage.choices.tradition.options.necromancer.name: 'Necromancer'
-partials.mage.choices.tradition.options.necromancer.prerequisites.no-invoker: 'No partial Invoker'
 partials.mage.choices.tradition.prompt: 'Magical tradition'
 partials.mage.name: 'Partial Mage'
 partials.mageslayer.name: 'Mageslayer'
@@ -472,3 +460,13 @@ weapons.throwing-blade.name: 'Throwing blade'
 weapons.unarmed.name: 'Unarmed attack'
 weapons.war-axe.name: 'War axe'
 weapons.war-hammer.name: 'War hammer'
+types.tradition.name: 'Magical tradition'
+types.tradition.fields.key.name: 'Tradition key'
+traditions.elementalist.name: 'Elementalist'
+traditions.high-mage.name: 'High Mage'
+traditions.invoker.name: 'Invoker'
+traditions.necromancer.name: 'Necromancer'
+traditions.elementalist.prerequisites.no-invoker: 'No partial Invoker'
+traditions.high-mage.prerequisites.no-invoker: 'No partial Invoker'
+traditions.invoker.prerequisites.no-other-caster: 'No other partial spellcasting class'
+traditions.necromancer.prerequisites.no-invoker: 'No partial Invoker'

package/i18n/en.yaml

@@ -415,11 +415,11 @@ fields.xp.nextLevel.name: 'Next level at'
 fields.xp.pace.name: 'Leveling pace'
 fields.xp.pace.values.fast.name: 'Fast'
 fields.xp.pace.values.slow.name: 'Slow'
-groups.advancement-actions.label: 'Advancement'
+groups.advancement-actions.label: 'Level up'
 groups.advancement.label: 'Advancement'
 groups.armor.label: 'Armor'
 groups.arts.label: 'Arts'
-groups.attacks.label: 'Combat'
+groups.attacks.label: 'Attacks'
 groups.attributes.label: 'Attributes'
 groups.background.label: 'Background'
 groups.checks.label: 'Checks and saves'
@@ -449,6 +449,7 @@ headline: 'Level {field_level} {type_background} {type_class}'
 pack.name: 'Worlds Without Number (SRD)'
 situational.nullified.name: 'Near a Nullifier (+2 against magic)'
 tags.advancement.name: 'Advancement'
+tags.advancement.level.name: 'New level'
 tags.armor-piercing.name: 'Armor Piercing'
 tags.art.name: 'Art'
 tags.attack.melee.name: 'Melee attack'
@@ -469,6 +470,8 @@ tags.beast.name: 'Beast'
 tags.check.name: 'Skill check'
 tags.combat.name: 'Combat'
 tags.creation.name: 'Creation'
+tags.creation.finish.name: 'Creation finish'
+tags.creation.purse.name: 'Starting silver'
 tags.curse-blessing.name: 'Curse or blessing'
 tags.damage.melee.name: 'Melee damage'
 tags.damage.name: 'Damage'
@@ -487,6 +490,7 @@ tags.initiative.name: 'Initiative'
 tags.less-lethal.name: 'Less Lethal'
 tags.long.name: 'Long'
 tags.mage-class.name: 'Mage class'
+tags.full-mage.name: 'Full Mage class'
 tags.mod-bonus.name: 'Modifier bonus'
 tags.mod-cap.name: 'Modifier cap'
 tags.noncombat.name: 'Non-combat'
@@ -495,6 +499,8 @@ tags.precise.name: 'Precisely Murderous'
 tags.reload.name: 'Reload'
 tags.repeatable.name: 'Taken more than once'
 tags.rest.name: 'Rest'
+tags.rest.night.name: "Night's rest"
+tags.rest.scene.name: 'Scene end'
 tags.save.evasion.name: 'Evasion save'
 tags.save.luck.name: 'Luck save'
 tags.save.mental.name: 'Mental save'

package/pack.yaml

@@ -1,6 +1,6 @@
 id: wwn-srd
-version: 0.1.0
-specVersion: 0.2.0
+version: 0.2.0
+specVersion: 0.3.0
 license: CC0-1.0
 notices:
   not-affiliated: >-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencharacter/wwn-srd",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Open Character Format pack for the character rules of the Worlds Without Number SRD (CC0). Unofficial.",
   "keywords": [
     "character-sheet",
@@ -52,7 +52,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opencharacter/engine": "0.2.0"
+    "@opencharacter/engine": "0.3.0"
   },
   "engines": {
     "node": ">=22"

package/rules/advancement.yaml

@@ -21,7 +21,7 @@ actions:
   # spells. Saves and attack bonus follow the level.
   - id: level-up
     tags: [advancement]
-    available: '!character.creating && level < 10'
+    available: '!character.creating && level < 10 && xp.levelUp'
     params:
       random: { type: boolean, default: false }
     results: [advanced]
@@ -32,6 +32,7 @@ actions:
           - when: true
             flags: { oldMax: hp.max, oldRolled: hp.rolled }
       - id: gain
+        tags: [advancement.level]
         kind: changes
         changes:
           - { type: adjust, field: level, by: 1 }
@@ -77,7 +78,7 @@ actions:
         sheet: proposed
         random: params.random
         options:
-          values: [highmage, elementalist, necromancer, invoker]
+          values: { formula: "keysOf('spellTrad') + ['invoker']" }
           where: "fieldOf('tradition.{trad}.tier', value) > 0"
         recommend: options[0]
       - id: newSpells
@@ -97,11 +98,8 @@ actions:
             type: spell
             where: >-
               item.level <= spells.maxLevel && countCopies(copy.item == item.id) == 0
-                && (item.list == 'high'
-                  || (item.list == 'elementalist' && (steps.spellTradition.picked == 'elementalist'
-                    || (steps.spellTradition.picked == 'invoker' && invoker.education == 'elementalist')))
-                  || (item.list == 'necromancer' && (steps.spellTradition.picked == 'necromancer'
-                    || (steps.spellTradition.picked == 'invoker' && invoker.education == 'necromancer'))))
+                && (item.list == 'high' || item.list == steps.spellTradition.picked
+                  || (steps.spellTradition.picked == 'invoker' && invoker.education == item.list))
         recommend: options[0]
         changes:
           - type: addItem
@@ -172,11 +170,11 @@ actions:
           - { type: adjust, when: flags.attribute, field: attributes.boosts, by: 1 }
           - type: adjust
             when: '!flags.attribute'
-            field: { formula: "'skills.' + steps.pick.picked" }
+            field: { formula: "fieldId('skills.{skill}', steps.pick.picked)" }
             by: 1
           - type: set
             when: '!flags.attribute'
-            field: { formula: "'skillCredit.' + steps.pick.picked" }
+            field: { formula: "fieldId('skillCredit.{skill}', steps.pick.picked)" }
             value: 0
           - { type: adjust, when: flags.expert > 0, field: skillPoints.expert, by: -flags.expert }
           - type: adjust

package/rules/backgrounds.yaml

@@ -27,6 +27,7 @@ contentTypes:
     fields:
       '{backgroundEntry}':
         type: enum
+        open: true
         values:
           [
             administer,

package/rules/classes.yaml

@@ -58,6 +58,7 @@ contentTypes:
     copies: { max: 1 }
   # An Adventurer's two halves.
   partial:
+    grantOnly: true
     copies: { max: 0 }
 
 constraints:

package/rules/combat.yaml

@@ -71,7 +71,7 @@ contentTypes:
       shock: { type: integer, default: 0, min: 0 }
       shockAc: { type: integer, default: 0, min: 0 }
       attribute: { type: enum, values: [str, dex, str-dex], required: true }
-      skill: { type: enum, values: [stab, shoot, punch], required: true }
+      skill: { type: enum, values: [stab, shoot, punch], required: true, open: true }
       rangeShort: { type: integer, min: 0 }
       rangeLong: { type: integer, min: 0 }
       cost: { type: integer, min: 0 }
@@ -114,7 +114,7 @@ resultBands:
     - { id: hit, when: 'roll.kept[0] == 20' }
     - { id: miss, when: 'roll.kept[0] == 1' }
     - { id: rolled, when: flags.ac < 0 }
-    - { id: hit, when: roll.total >= flags.ac }
+    - { id: hit, when: roll.total >= flags.ac, success: true }
     - { id: miss, when: true }
 
 actions:

package/rules/creation-steps.yaml

@@ -101,15 +101,15 @@ actions:
         changes:
           - type: adjust
             when: params.points == 0
-            field: { formula: "'skills.' + flags.target" }
+            field: { formula: "fieldId('skills.{skill}', flags.target)" }
             by: 1
           - type: adjust
             when: params.points > 0 && flags.first + flags.second > 0
-            field: { formula: "'skills.' + flags.target" }
+            field: { formula: "fieldId('skills.{skill}', flags.target)" }
             by: flags.first + flags.second
           - type: set
             when: params.points > 0
-            field: { formula: "'skillCredit.' + flags.target" }
+            field: { formula: "fieldId('skillCredit.{skill}', flags.target)" }
             value: >-
               flags.second > 0 ? flags.left - flags.from - flags.first - 2 : flags.left
       - id: result
@@ -181,9 +181,9 @@ actions:
                   || (item.requires == 'non-mage' && class.mage == 0)
                   || (item.requires == 'expert' && class.expert > 0)
                   || (item.requires == 'invoker' && tradition.invoker.tier > 0)
-                  || (item.requires == 'low-attribute' && min(attributes.str.mod,
-                    attributes.dex.mod, attributes.con.mod, attributes.int.mod,
-                    attributes.wis.mod, attributes.cha.mod) <= -1))
+                  || (item.requires == 'low-attribute' && min(attributes.str.score,
+                    attributes.dex.score, attributes.con.score, attributes.int.score,
+                    attributes.wis.score, attributes.cha.score) <= 7))
         recommend: options[0]
       - id: held
         kind: branch

package/rules/creation.yaml

@@ -224,97 +224,29 @@ actions:
         use: gain-skill
         params: { skill: "'any'", random: params.random }
 
-      # Each tradition's bonus skill: Magic for most Mages, the class's own skill for the rest.
-      - id: highmageSkill
-        kind: action
-        sheet: proposed
-        when: tradition.highmage.tier > 0
-        use: gain-skill
-        params: { skill: "'magic'", random: params.random }
-      - id: elementalistSkill
-        kind: action
-        sheet: proposed
-        when: tradition.elementalist.tier > 0
-        use: gain-skill
-        params: { skill: "'magic'", random: params.random }
-      - id: necromancerSkill
-        kind: action
-        sheet: proposed
-        when: tradition.necromancer.tier > 0
-        use: gain-skill
-        params: { skill: "'magic'", random: params.random }
-      - id: invokerSkill
-        kind: action
-        sheet: proposed
-        when: tradition.invoker.tier > 0
-        use: gain-skill
-        params: { skill: "'magic'", random: params.random }
-      - id: healerSkill
-        kind: action
-        sheet: proposed
-        when: tradition.healer.tier > 0
-        use: gain-skill
-        params: { skill: "'heal'", random: params.random }
-      - id: vowedSkill
-        kind: action
-        sheet: proposed
-        when: tradition.vowed.tier > 0 && vowed.skill != ''
-        use: gain-skill
-        params: { skill: vowed.skill, random: params.random }
-      - id: accursedSkill
-        kind: action
-        sheet: proposed
-        when: tradition.accursed.tier > 0
-        use: gain-skill
-        params: { skill: "'magic'", random: params.random }
-      - id: bardSkill
-        kind: action
-        sheet: proposed
-        when: tradition.bard.tier > 0
-        use: gain-skill
-        params: { skill: "'perform'", random: params.random }
-      - id: beastmasterSkill
-        kind: action
-        sheet: proposed
-        when: tradition.beastmaster.tier > 0
-        use: gain-skill
-        params: { skill: "'survive'", random: params.random }
-      - id: bloodpriestSkill
-        kind: action
-        sheet: proposed
-        when: tradition.bloodpriest.tier > 0
-        use: gain-skill
-        params: { skill: "'pray'", random: params.random }
-      - id: duelistSkill
-        kind: action
-        sheet: proposed
-        when: tradition.duelist.tier > 0
-        use: gain-skill
-        params: { skill: "'stab'", random: params.random }
-      - id: mageslayerSkill
-        kind: action
-        sheet: proposed
-        when: tradition.mageslayer.tier > 0
-        use: gain-skill
-        params: { skill: "'magic'", random: params.random }
-      - id: skinshifterSkill
-        kind: action
-        sheet: proposed
-        when: tradition.skinshifter.tier > 0
-        use: gain-skill
-        params: { skill: "'survive'", random: params.random }
-      - id: thoughtnobleSkill
-        kind: action
-        sheet: proposed
-        when: tradition.thoughtnoble.tier > 0
-        use: gain-skill
-        params: { skill: "'notice'", random: params.random }
-      - id: wiseSkill
-        kind: action
+      # Each tradition's bonus skill (`tradition.<key>.skill`): Magic for most Mages, the class's
+      # own skill for the rest, in tradition order.
+      - id: traditionSkills
+        kind: branch
         sheet: proposed
-        when: tradition.wise.tier > 0 && wise.skill != ''
-        use: gain-skill
-        params: { skill: wise.skill, random: params.random }
+        cases:
+          - when: true
+            flags:
+              traditionSkills: >-
+                mapList(filterList(keysOf('trad'), fieldOf('tradition.{trad}.tier', x) > 0
+                  && fieldOf('tradition.{trad}.skill', x) != ''), fieldOf('tradition.{trad}.skill', x))
+      - id: traditionSkill
+        kind: group
+        when: size(flags.traditionSkills) > 0
+        repeat: { while: size(steps.traditionSkill) < size(flags.traditionSkills), max: 15 }
+        steps:
+          - id: gain
+            kind: action
+            sheet: proposed
+            use: gain-skill
+            params:
+              skill: flags.traditionSkills[size(steps.traditionSkill)]
+              random: params.random
 
       # The arts each tradition lets a new mage pick, and the first-level spells they know.
       - id: arts
@@ -332,10 +264,9 @@ actions:
             type: spell
             where: >-
               item.level == 1 && countCopies(copy.item == item.id) == 0
-                && (item.list == 'high' || (item.list == 'elementalist'
-                  && (tradition.elementalist.tier > 0 || invoker.education == 'elementalist'))
-                  || (item.list == 'necromancer' && (tradition.necromancer.tier > 0
-                    || invoker.education == 'necromancer')))
+                && (item.list == 'high' || (item.list in keysOf('trad')
+                  && (fieldOf('tradition.{trad}.tier', item.list) > 0
+                    || invoker.education == item.list)))
         recommend: options[0]
         changes:
           - type: addItem
@@ -361,6 +292,7 @@ actions:
       # afford; spellcasters and the Vowed skip armor, which hinders their magic.
       - { id: silverRoll, kind: roll, tags: [creation], parts: [{ dice: 3d6 }] }
       - id: purse
+        tags: [creation.purse]
         kind: changes
         changes:
           - { type: adjust, field: coins.silver, by: steps.silverRoll.total * 10 }
@@ -416,7 +348,7 @@ actions:
           - { type: addItem, entry: { item: picked.id, equipped: true } }
           - *pay
           - *change
-      # Up to six pieces of gear, one of each.
+      # Up to six pieces of gear, one of each, no more than the character can carry.
       - id: gear
         kind: choice
         sheet: proposed
@@ -428,6 +360,8 @@ actions:
             where: >-
               picks == 0
                 && (item.costUnit == 'cp' ? ceil(item.cost / 10) : item.cost) <= coins.silver
+                && (item.id == @gear.backpack ? enc.readied + item.enc <= enc.readiedLimit + 4
+                  : enc.stowed + item.enc <= enc.stowedLimit + 8)
         recommend: >-
           filterList([@gear.backpack, @gear.rations, @gear.waterskin, @gear.tinder-box,
             @gear.torch, @gear.rope, options[0]], x in options)[0]
@@ -438,6 +372,7 @@ actions:
           - *change
 
       - id: finish
+        tags: [creation.finish]
         kind: changes
         sheet: proposed
         changes:

package/rules/display.yaml

@@ -241,71 +241,158 @@ display:
     attributes.cha.modCap: { hidden: true }
     skills.administer:
       rolls: [{ action: skill-check, params: { skill: skills.administer, attribute: int } }]
-    skillCredit.administer: { visibility: background, showWhen: skillCredit.administer > 0 }
+    skillCredit.administer:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.administer > 0,
+      }
     skills.connect:
       rolls: [{ action: skill-check, params: { skill: skills.connect, attribute: cha } }]
-    skillCredit.connect: { visibility: background, showWhen: skillCredit.connect > 0 }
+    skillCredit.connect:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.connect > 0,
+      }
     skills.convince:
       rolls: [{ action: skill-check, params: { skill: skills.convince, attribute: cha } }]
-    skillCredit.convince: { visibility: background, showWhen: skillCredit.convince > 0 }
+    skillCredit.convince:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.convince > 0,
+      }
     skills.craft:
       rolls: [{ action: skill-check, params: { skill: skills.craft, attribute: int } }]
-    skillCredit.craft: { visibility: background, showWhen: skillCredit.craft > 0 }
+    skillCredit.craft:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.craft > 0,
+      }
     skills.exert:
       rolls: [{ action: skill-check, params: { skill: skills.exert, attribute: str } }]
-    skillCredit.exert: { visibility: background, showWhen: skillCredit.exert > 0 }
+    skillCredit.exert:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.exert > 0,
+      }
     skills.heal:
       rolls: [{ action: skill-check, params: { skill: skills.heal, attribute: int } }]
-    skillCredit.heal: { visibility: background, showWhen: skillCredit.heal > 0 }
+    skillCredit.heal:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.heal > 0 }
     skills.know:
       rolls: [{ action: skill-check, params: { skill: skills.know, attribute: int } }]
-    skillCredit.know: { visibility: background, showWhen: skillCredit.know > 0 }
+    skillCredit.know:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.know > 0 }
     skills.lead:
       rolls: [{ action: skill-check, params: { skill: skills.lead, attribute: cha } }]
-    skillCredit.lead: { visibility: background, showWhen: skillCredit.lead > 0 }
+    skillCredit.lead:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.lead > 0 }
     skills.magic:
       rolls: [{ action: skill-check, params: { skill: skills.magic, attribute: int } }]
-    skillCredit.magic: { visibility: background, showWhen: skillCredit.magic > 0 }
+    skillCredit.magic:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.magic > 0,
+      }
     skills.notice:
       rolls: [{ action: skill-check, params: { skill: skills.notice, attribute: wis } }]
-    skillCredit.notice: { visibility: background, showWhen: skillCredit.notice > 0 }
+    skillCredit.notice:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.notice > 0,
+      }
     skills.perform:
       rolls: [{ action: skill-check, params: { skill: skills.perform, attribute: cha } }]
-    skillCredit.perform: { visibility: background, showWhen: skillCredit.perform > 0 }
+    skillCredit.perform:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.perform > 0,
+      }
     skills.pray:
       rolls: [{ action: skill-check, params: { skill: skills.pray, attribute: wis } }]
-    skillCredit.pray: { visibility: background, showWhen: skillCredit.pray > 0 }
+    skillCredit.pray:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.pray > 0 }
     skills.punch:
       rolls: [{ action: skill-check, params: { skill: skills.punch, attribute: str } }]
-    skillCredit.punch: { visibility: background, showWhen: skillCredit.punch > 0 }
+    skillCredit.punch:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.punch > 0,
+      }
     skills.ride:
       rolls: [{ action: skill-check, params: { skill: skills.ride, attribute: dex } }]
-    skillCredit.ride: { visibility: background, showWhen: skillCredit.ride > 0 }
+    skillCredit.ride:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.ride > 0 }
     skills.sail:
       rolls: [{ action: skill-check, params: { skill: skills.sail, attribute: dex } }]
-    skillCredit.sail: { visibility: background, showWhen: skillCredit.sail > 0 }
+    skillCredit.sail:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.sail > 0 }
     skills.shoot:
       rolls: [{ action: skill-check, params: { skill: skills.shoot, attribute: dex } }]
-    skillCredit.shoot: { visibility: background, showWhen: skillCredit.shoot > 0 }
+    skillCredit.shoot:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.shoot > 0,
+      }
     skills.sneak:
       rolls: [{ action: skill-check, params: { skill: skills.sneak, attribute: dex } }]
-    skillCredit.sneak: { visibility: background, showWhen: skillCredit.sneak > 0 }
+    skillCredit.sneak:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.sneak > 0,
+      }
     skills.stab:
       rolls: [{ action: skill-check, params: { skill: skills.stab, attribute: str } }]
-    skillCredit.stab: { visibility: background, showWhen: skillCredit.stab > 0 }
+    skillCredit.stab:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.stab > 0 }
     skills.survive:
       rolls: [{ action: skill-check, params: { skill: skills.survive, attribute: wis } }]
-    skillCredit.survive: { visibility: background, showWhen: skillCredit.survive > 0 }
+    skillCredit.survive:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.survive > 0,
+      }
     skills.trade:
       rolls: [{ action: skill-check, params: { skill: skills.trade, attribute: cha } }]
-    skillCredit.trade: { visibility: background, showWhen: skillCredit.trade > 0 }
+    skillCredit.trade:
+      {
+        groups: [advancement],
+        priority: 7,
+        visibility: background,
+        showWhen: skillCredit.trade > 0,
+      }
     skills.work:
       rolls: [{ action: skill-check, params: { skill: skills.work, attribute: int } }]
-    skillCredit.work: { visibility: background, showWhen: skillCredit.work > 0 }
+    skillCredit.work:
+      { groups: [advancement], priority: 7, visibility: background, showWhen: skillCredit.work > 0 }
     saves.physical: { rolls: [{ action: saving-throw, params: { save: saves.physical } }] }
     saves.evasion: { rolls: [{ action: saving-throw, params: { save: saves.evasion } }] }
     saves.mental: { rolls: [{ action: saving-throw, params: { save: saves.mental } }] }
     saves.luck: { rolls: [{ action: saving-throw, params: { save: saves.luck } }] }
+    'tradition.{trad}.skill': { hidden: true }
     tradition.highmage.tier: { hidden: true }
     tradition.elementalist.tier: { hidden: true }
     tradition.necromancer.tier: { hidden: true }

package/rules/foci.yaml

@@ -7,6 +7,7 @@ contentTypes:
       # the combat skills) or `none`.
       bonusSkill:
         type: enum
+        open: true
         values:
           [
             none,

package/rules/health.yaml

@@ -131,6 +131,7 @@ actions:
     results: [rested]
     steps:
       - id: recover
+        tags: [rest.night]
         kind: changes
         changes:
           - {
@@ -150,11 +151,11 @@ actions:
           - { type: set, field: spells.pointsUsed, value: 0 }
           - type: set
             forEach: keysOf('effortTrad')
-            field: { formula: "'effort.' + x + '.day'" }
+            field: { formula: "fieldId('effort.{effortTrad}.day', x)" }
             value: 0
           - type: set
             forEach: keysOf('effortTrad')
-            field: { formula: "'effort.' + x + '.scene'" }
+            field: { formula: "fieldId('effort.{effortTrad}.scene', x)" }
             value: 0
       - id: result
         kind: outcome
@@ -165,11 +166,12 @@ actions:
     results: [ended]
     steps:
       - id: reclaim
+        tags: [rest.scene]
         kind: changes
         changes:
           - type: set
             forEach: keysOf('effortTrad')
-            field: { formula: "'effort.' + x + '.scene'" }
+            field: { formula: "fieldId('effort.{effortTrad}.scene', x)" }
             value: 0
       - id: result
         kind: outcome