@opencharacter/swn-revised 0.1.0 → 0.2.0

package/rules/advancement.yaml

@@ -21,7 +21,7 @@ actions:
   # throws and the attack bonus follow the level.
   - id: level-up
     tags: [level-up]
-    available: '!character.creating && level < 20'
+    available: '!character.creating && level < 20 && xp.current >= xp.next'
     results: [advanced]
     steps:
       - id: start
@@ -69,6 +69,7 @@ actions:
       # Psychic Training's second level: a point each level, and the levels before it when it is
       # taken late.
       - id: points
+        tags: [level-up.level]
         kind: changes
         sheet: proposed
         changes:
@@ -92,10 +93,12 @@ actions:
   # doesn't buy a level is saved as credit toward the skill; on a skill at level-4 it goes to the
   # general pool.
   - id: focus-skill-points
+    listed: false
     tags: [level-up]
     params:
       entry:
         type: enum
+        open: true
         required: true
         values:
           [
@@ -130,7 +133,7 @@ actions:
             any-skill,
           ]
       random: { type: boolean, default: false }
-    results: [spent]
+    results: [spent, none]
     steps:
       - id: start
         kind: branch
@@ -145,7 +148,11 @@ actions:
                     ? filterList(keysOf('psychic'), psionics.access == 'unrestricted'
                       || x == psionics.discipline)
                   : params.entry == 'any-skill' ? keysOf('general') + keysOf('combat')
+                  : params.entry in keysOf('psychic') && psionics.access != 'unrestricted'
+                    && params.entry != psionics.discipline ? []
                   : [params.entry]
+      # A psychic skill the character can't learn: nothing to raise.
+      - { id: none, kind: outcome, when: size(flags.open) == 0, result: "'none'" }
       - id: choose
         kind: choice
         when: size(flags.open) > 1
@@ -191,11 +198,11 @@ actions:
         changes:
           - type: set
             when: flags.level != flags.from
-            field: { formula: "'skills.' + flags.skill + '.level'" }
+            field: { formula: "fieldId('skills.{skill}.level', flags.skill)" }
             value: flags.level
           - type: set
             when: '(flags.level >= 4 ? 0 : flags.pool) != flags.had'
-            field: { formula: "'skills.' + flags.skill + '.credit'" }
+            field: { formula: "fieldId('skills.{skill}.credit', flags.skill)" }
             value: 'flags.level >= 4 ? 0 : flags.pool'
           - type: adjust
             when: flags.level >= 4 && flags.pool > 0
@@ -216,10 +223,12 @@ actions:
 
   # A technique of the discipline at or below its skill level, free with a new skill level.
   - id: pick-technique
+    listed: false
     tags: [level-up]
     params:
       discipline:
         type: enum
+        open: true
         required: true
         values: [biopsionics, metapsionics, precognition, telekinesis, telepathy, teleportation]
       random: { type: boolean, default: false }
@@ -245,10 +254,14 @@ actions:
   # higher levels need a character level: level-2 at 3rd, level-3 at 6th, level-4 at 9th.
   - id: raise-skill
     tags: [level-up]
-    available: '!character.creating'
+    available: >-
+      !character.creating
+        && (skillPoints.general + skillPoints.expert + skillPoints.psychic + skillPoints.training > 0
+          || maxList(keysOf('skill'), fieldOf('skills.{skill}.credit', x)) > 0)
     params:
       skill:
         type: enum
+        open: true
         required: true
         values:
           [
@@ -327,7 +340,7 @@ actions:
         changes:
           - type: adjust
             when: flags.fromCredit > 0
-            field: { formula: "'skills.' + params.skill + '.credit'" }
+            field: { formula: "fieldId('skills.{skill}.credit', params.skill)" }
             by: -flags.fromCredit
           - {
               type: adjust,
@@ -353,7 +366,11 @@ actions:
               by: -flags.fromGeneral,
               when: flags.fromGeneral > 0,
             }
-          - { type: adjust, field: { formula: "'skills.' + params.skill + '.level'" }, by: 1 }
+          - {
+              type: adjust,
+              field: { formula: "fieldId('skills.{skill}.level', params.skill)" },
+              by: 1,
+            }
       - id: technique
         kind: action
         when: >-
@@ -368,7 +385,9 @@ actions:
   # Spend skill points on a technique: as many as its level.
   - id: learn-technique
     tags: [level-up]
-    available: "!character.creating && psionics.access != 'none'"
+    available: >-
+      !character.creating && psionics.access != 'none'
+        && skillPoints.general + skillPoints.psychic + skillPoints.training > 0
     params:
       technique: { type: id, of: technique, required: true, where: '!item.core' }
     results: [learned, refused]
@@ -433,7 +452,9 @@ actions:
   # the third needs 3rd level, the fourth 6th and the fifth 9th.
   - id: boost-attribute
     tags: [level-up]
-    available: '!character.creating && attributes.boosts < 5'
+    available: >-
+      !character.creating && attributes.boosts < 5 && skillPoints.general > attributes.boosts
+        && level >= [1, 1, 3, 6, 9][attributes.boosts]
     params:
       attribute: { type: enum, required: true, values: [str, dex, con, int, wis, cha] }
     results: [boosted, refused]

package/rules/character.yaml

@@ -6,7 +6,11 @@ fields:
   # Set by the class and its partial classes.
   psionics.access: { type: enum, values: [none, restricted, unrestricted], formula: "'none'" }
   # A restricted psychic's one discipline, picked with the Partial Psychic option.
-  psionics.discipline: { type: string, formula: "''" }
+  psionics.discipline:
+    type: enum
+    open: true
+    values: [none, biopsionics, metapsionics, precognition, telekinesis, telepathy, teleportation]
+    formula: "'none'"
   # Extra focus levels a new character picks: non-combat (Expert) and combat (Warrior).
   class.focus.noncombat: { type: integer, formula: 0 }
   class.focus.combat: { type: integer, formula: 0 }
@@ -19,14 +23,34 @@ fields:
 contentTypes:
   class:
     copies: { max: 1 }
+    fields:
+      # The starting package recommended for the class.
+      kit: { type: id, of: kit }
   # Picked, two of them, by the Adventurer.
   partialClass:
+    grantOnly: true
+    copies: { max: 0 }
+  # A quick character's class and style: the class, the attribute scores and, for the book's
+  # styles, the style's column of the quick foci table (0-7).
+  style:
+    grantOnly: true
+    carried: false
     copies: { max: 0 }
+    fields:
+      class: { type: id, of: class, required: true }
+      str: { type: integer, required: true }
+      dex: { type: integer, required: true }
+      con: { type: integer, required: true }
+      int: { type: integer, required: true }
+      wis: { type: integer, required: true }
+      cha: { type: integer, required: true }
+      table: { type: integer, min: 0, max: 7 }
   background:
     copies: { max: 1 }
     fields:
       freeSkill:
         type: enum
+        open: true
         required: true
         values:
           &entries [
@@ -58,16 +82,17 @@ contentTypes:
             mental,
           ]
       # The quick skills besides the free one.
-      quick1: { type: enum, required: true, values: *entries }
-      quick2: { type: enum, required: true, values: *entries }
-      'growth{growthRow}': { type: enum, required: true, values: *entries }
-      'learning{learningRow}': { type: enum, required: true, values: *entries }
+      quick1: { type: enum, required: true, values: *entries, open: true }
+      quick2: { type: enum, required: true, values: *entries, open: true }
+      'growth{growthRow}': { type: enum, required: true, values: *entries, open: true }
+      'learning{learningRow}': { type: enum, required: true, values: *entries, open: true }
   focus:
     fields:
       kind: { type: enum, values: [combat, noncombat, psychic, special], required: true }
       # The bonus skill its first level gives; `chosen` is the skill the focus's own choice names.
       skill:
         type: enum
+        open: true
         default: none
         values:
           [

package/rules/checks.yaml

@@ -27,7 +27,11 @@ situational:
 
 resultBands:
   check:
-    - { id: success, when: 'flags.difficulty >= 0 && roll.total >= flags.difficulty' }
+    - {
+        id: success,
+        when: 'flags.difficulty >= 0 && roll.total >= flags.difficulty',
+        success: true,
+      }
     - { id: failure, when: 'flags.difficulty >= 0' }
     - { id: rolled, when: true }
   # A natural 1 always fails and a natural 20 always succeeds.
@@ -35,10 +39,11 @@ resultBands:
     - {
         id: success,
         when: 'roll.faces[0] == 20 || (roll.faces[0] != 1 && roll.total >= flags.target)',
+        success: true,
       }
     - { id: failure, when: true }
   attack:
-    - { id: hit, when: 'flags.ac >= 0 && roll.total >= flags.ac' }
+    - { id: hit, when: 'flags.ac >= 0 && roll.total >= flags.ac', success: true }
     - { id: miss, when: 'flags.ac >= 0' }
     - { id: rolled, when: true }
 
@@ -49,6 +54,7 @@ actions:
     params:
       skill:
         type: enum
+        open: true
         required: true
         values:
           &skills [

package/rules/combat.yaml

@@ -179,6 +179,7 @@ actions:
     results: [rested]
     steps:
       - id: rest
+        tags: [rest.night]
         kind: changes
         changes:
           - { type: adjust, field: hp.current, by: level, when: hp.current > 0, tags: [healing] }
@@ -195,6 +196,7 @@ actions:
     results: [ended]
     steps:
       - id: reset
+        tags: [rest.scene]
         kind: changes
         changes:
           - { type: set, field: effort.scene, value: 0 }
@@ -265,11 +267,18 @@ actions:
       until: { type: enum, values: [scene, day], default: scene }
     results: [committed]
     steps:
+      # Torched Effort lasts only for the scene, whatever it is committed for.
+      - id: source
+        kind: branch
+        cases:
+          - when: true
+            flags:
+              day: "params.until == 'day' && effort.max - effort.scene - effort.day - effort.active > 0"
       - id: commit
         kind: changes
         changes:
-          - { type: adjust, field: effort.scene, by: 1, when: "params.until == 'scene'" }
-          - { type: adjust, field: effort.day, by: 1, when: "params.until == 'day'" }
+          - { type: adjust, field: effort.scene, by: 1, when: '!flags.day' }
+          - { type: adjust, field: effort.day, by: 1, when: flags.day }
       - { id: result, kind: outcome, result: "'committed'" }
 
   # Torching: a free point of Effort for the scene, at a risk to Wisdom or Constitution.