@opencharacter/swn-revised 0.1.0 → 0.2.0

package/rules/layout.yaml

@@ -93,6 +93,7 @@ display:
       quantity: { hidden: true }
       state:
         committed: { priority: 0, showWhen: self.committed > 0 }
+        torched: { hidden: true }
     cyberware: { quantity: { hidden: true } }
     weapon:
       state:
@@ -118,7 +119,7 @@ display:
       with: [{ field: hp.max, as: max }]
       rolls: [{ action: take-damage }, { action: heal }]
     hp.max: { groups: [condition], priority: 1 }
-    hp.rolled: { groups: [condition], priority: 2 }
+    hp.rolled: { groups: [condition], priority: 2, visibility: background }
     hp.perLevel: { hidden: true }
     strain.current:
       groups: [condition]
@@ -159,7 +160,8 @@ display:
     effort.active: { groups: [psionics], priority: 1, showWhen: effort.active > 0 }
     effort.torched: { groups: [psionics], priority: 2 }
     psionics.access: { groups: [psionics], priority: 1 }
-    psionics.discipline: { groups: [psionics], priority: 1, showWhen: "psionics.discipline != ''" }
+    psionics.discipline:
+      { groups: [psionics], priority: 1, showWhen: "psionics.discipline != 'none'" }
     psionics.training: { hidden: true }
     effort.bonus: { hidden: true }
     effort.wild: { hidden: true }

package/rules/psionics.yaml

@@ -21,8 +21,7 @@ fields:
   effort.active: { type: integer, formula: 0 }
   effort.available:
     type: integer
-    formula: effort.max + effort.torched - effort.scene - effort.day - effort.active
-    limits: { min: 0 }
+    formula: max(0, effort.max + effort.torched - effort.scene - effort.day - effort.active)
 
 effects:
   - target: { rolls: [attack, damage] }
@@ -32,12 +31,49 @@ effects:
       has(participants.target) && size(participants.target) > 0
         && participants.target[0].psionics.cursedLuck
 
+  # When the scene ends, torched Effort goes, and with it the techniques it sustained.
+  - target: { steps: [rest.scene, rest.night] }
+    op: changes
+    value:
+      changes:
+        - type: adjustState
+          when: "countCopies(copy.type == 'technique' && copy.state.torched > 0) > 0"
+          copies: { type: technique, where: self.torched > 0 }
+          key: committed
+          by: -self.torched
+        - type: setState
+          when: "countCopies(copy.type == 'technique' && copy.state.torched > 0) > 0"
+          copies: { type: technique, where: self.torched > 0 }
+          key: torched
+          value: 0
+        - type: adjustState
+          when: "countPicks(pick.type == 'technique' && pick.state.torched > 0) > 0"
+          picks: { where: self.torched > 0 }
+          key: committed
+          by: -self.torched
+        - type: setState
+          when: "countPicks(pick.type == 'technique' && pick.state.torched > 0) > 0"
+          picks: { where: self.torched > 0 }
+          key: torched
+          value: 0
+        - type: adjustState
+          when: "countGrants(grant.type == 'technique' && grant.state.torched > 0) > 0"
+          grants: { where: self.torched > 0 }
+          key: committed
+          by: -self.torched
+        - type: setState
+          when: "countGrants(grant.type == 'technique' && grant.state.torched > 0) > 0"
+          grants: { where: self.torched > 0 }
+          key: torched
+          value: 0
+
 contentTypes:
   technique:
     copies: { perItem: 1 }
     fields:
       discipline:
         type: enum
+        open: true
         required: true
         values: [biopsionics, metapsionics, precognition, telekinesis, telepathy, teleportation]
       level: { type: integer, required: true, min: 0, max: 4 }
@@ -46,6 +82,8 @@ contentTypes:
     state:
       # Effort Committed to keep the technique going, until it is released.
       committed: { type: integer, default: 0, min: 0 }
+      # The part of it torched Effort pays for, which ends with the scene.
+      torched: { type: integer, default: 0, min: 0 }
     effects:
       - { target: effort.active, op: add, value: self.committed }
     actions:
@@ -57,9 +95,12 @@ constraints:
   - id: psychic-skills
     check: >-
       psionics.access == 'unrestricted'
-        || sumFields(f.value >= 0 && (psionics.access == 'none'
-          || f.id != 'swn-revised:skills.' + psionics.discipline + '.level') ? 1 : 0,
+        || sumFields(f.value >= 0 && (psionics.access == 'none' || psionics.discipline == 'none'
+          || f.id != fieldId('skills.{psychic}.level', psionics.discipline)) ? 1 : 0,
           'skill.psychic' in f.tags) == 0
+  # Torching can lower the maximum under what is Committed; the commitments stay until released.
+  - id: effort-overcommitted
+    check: effort.max + effort.torched - effort.scene - effort.day - effort.active >= 0
 
 actions:
   # Commit a point of Effort for as long as the technique lasts: it stays Committed on the
@@ -81,12 +122,28 @@ actions:
                 countCopies(copy.id == self.id && copy.type == 'technique') > 0 ? 'copy'
                   : countCopies(copy.id == self.id && copy.type == 'focus') > 0 ? 'pick'
                   : 'grant'
+              torched: effort.max - effort.scene - effort.day - effort.active <= 0
       - id: commit
         kind: changes
         changes:
           - { type: adjustState, when: "flags.held == 'copy'", entry: self, key: committed, by: 1 }
           - { type: adjustState, when: "flags.held == 'pick'", pick: self, key: committed, by: 1 }
           - { type: adjustState, when: "flags.held == 'grant'", grant: self, key: committed, by: 1 }
+          - type: adjustState
+            when: "flags.torched && flags.held == 'copy'"
+            entry: self
+            key: torched
+            by: 1
+          - type: adjustState
+            when: "flags.torched && flags.held == 'pick'"
+            pick: self
+            key: torched
+            by: 1
+          - type: adjustState
+            when: "flags.torched && flags.held == 'grant'"
+            grant: self
+            key: torched
+            by: 1
       - { id: result, kind: outcome, result: "'committed'" }
 
   # Reclaim the Effort a technique holds, ending it.
@@ -102,4 +159,7 @@ actions:
           - { type: setState, when: "flags.held == 'copy'", entry: self, key: committed, value: 0 }
           - { type: setState, when: "flags.held == 'pick'", pick: self, key: committed, value: 0 }
           - { type: setState, when: "flags.held == 'grant'", grant: self, key: committed, value: 0 }
+          - { type: setState, when: "flags.held == 'copy'", entry: self, key: torched, value: 0 }
+          - { type: setState, when: "flags.held == 'pick'", pick: self, key: torched, value: 0 }
+          - { type: setState, when: "flags.held == 'grant'", grant: self, key: torched, value: 0 }
       - { id: result, kind: outcome, result: "'released'" }

package/rules/start.yaml

@@ -194,7 +194,7 @@ actions:
       - id: partialPsychic
         kind: action
         sheet: proposed
-        when: "psionics.access == 'restricted' && psionics.discipline != ''"
+        when: "psionics.access == 'restricted' && psionics.discipline != 'none'"
         use: gain-skill
         params: { entry: psionics.discipline }
       # One focus level of any kind, then the Expert's non-combat and the Warrior's combat one.
@@ -226,6 +226,7 @@ actions:
         kind: action
         use: starting-gear
       - id: hitPoints
+        tags: [creation.finish]
         kind: changes
         sheet: proposed
         changes:
@@ -238,9 +239,10 @@ actions:
           - { type: finishCreation }
       - { id: result, kind: outcome, result: "'created'" }
 
-  # The quick tables: class and style (d8), background (d20), two psychic disciplines (d6) for
-  # a psychic, foci (d6 on the style's row) and a bonus skill (d20). With `random`, every table
-  # is rolled; otherwise each is a pick.
+  # The quick tables: class and style (a d8 over the book's eight styles; add-on packs may add
+  # styles), background (d20), two psychic disciplines (d6) for a psychic, foci (d6 on the
+  # style's row) and a bonus skill (d20). With `random`, every table is rolled; otherwise each is
+  # a pick.
   - id: quick-character
     tags: [creation]
     available: character.creating && countCopies(copy.type == 'class') == 0
@@ -251,35 +253,19 @@ actions:
       - id: style
         kind: choice
         random: params.random
-        recommend: options[0]
-        options:
-          - id: expert-smart
-            flags: { style: 0, class: "'classes.expert'", scores: '[10, 12, 11, 14, 7, 9]' }
-          - id: expert-smooth
-            flags: { style: 1, class: "'classes.expert'", scores: '[7, 9, 10, 12, 11, 14]' }
-          - id: expert-nimble
-            flags: { style: 2, class: "'classes.expert'", scores: '[10, 14, 12, 11, 9, 7]' }
-          - id: warrior-melee
-            flags: { style: 3, class: "'classes.warrior'", scores: '[14, 9, 12, 7, 10, 11]' }
-          - id: warrior-ranged
-            flags: { style: 4, class: "'classes.warrior'", scores: '[9, 14, 12, 10, 7, 11]' }
-          - id: warrior-leader
-            flags: { style: 5, class: "'classes.warrior'", scores: '[7, 10, 9, 11, 12, 14]' }
-          - id: psychic-seer
-            flags: { style: 6, class: "'classes.psychic'", scores: '[9, 11, 12, 10, 14, 7]' }
-          - id: psychic-adept
-            flags: { style: 7, class: "'classes.psychic'", scores: '[12, 10, 14, 9, 11, 7]' }
+        recommend: 'filterList([@styles.expert-smart, options[0]], x in options)[0]'
+        options: { content: { type: style } }
       - id: setup
         kind: changes
         changes:
           - type: addItem
-            entry: { id: class, item: flags.class }
-          - { type: set, field: attributes.str.score, value: 'flags.scores[0]' }
-          - { type: set, field: attributes.dex.score, value: 'flags.scores[1]' }
-          - { type: set, field: attributes.con.score, value: 'flags.scores[2]' }
-          - { type: set, field: attributes.int.score, value: 'flags.scores[3]' }
-          - { type: set, field: attributes.wis.score, value: 'flags.scores[4]' }
-          - { type: set, field: attributes.cha.score, value: 'flags.scores[5]' }
+            entry: { id: class, item: steps.style.item.class }
+          - { type: set, field: attributes.str.score, value: steps.style.item.str }
+          - { type: set, field: attributes.dex.score, value: steps.style.item.dex }
+          - { type: set, field: attributes.con.score, value: steps.style.item.con }
+          - { type: set, field: attributes.int.score, value: steps.style.item.int }
+          - { type: set, field: attributes.wis.score, value: steps.style.item.wis }
+          - { type: set, field: attributes.cha.score, value: steps.style.item.cha }
       - id: background
         kind: choice
         random: params.random
@@ -302,16 +288,21 @@ actions:
         params: { entry: steps.background.item.quick2, random: params.random }
       - id: psychic1
         kind: action
-        when: flags.style >= 6
+        sheet: proposed
+        when: "psionics.access == 'unrestricted'"
         use: gain-skill
         params: { entry: "'any-psychic'", random: params.random }
       - id: psychic2
         kind: action
-        when: flags.style >= 6
+        sheet: proposed
+        when: "psionics.access == 'unrestricted'"
         use: gain-skill
         params: { entry: "'any-psychic'", random: params.random }
+      # A style with a row of the book's foci table rolls on it; another (an add-on pack's) picks
+      # foci as the full procedure does.
       - id: focusRoll
         kind: choice
+        when: has(steps.style.item.table)
         random: params.random
         recommend: options[0]
         options:
@@ -325,23 +316,28 @@ actions:
       - id: foci
         kind: branch
         cases:
+          - when: '!has(steps.style.item.table)'
+            flags: { foci: '[]' }
           - when: true
             flags:
               foci: >-
-                [[[['specialist', 'fix', 'fix'], ['die-hard', 'none', '']], [['hacker', 'program', ''], ['tinker', 'fix', '']], [['specialist', 'know', 'know'], ['healer', 'heal', '']], [['specialist', 'fix', 'fix'], ['tinker', 'fix', '']], [['healer', 'heal', ''], ['ironhide', 'none', '']], [['specialist', 'fix', 'fix'], ['hacker', 'program', '']]], [[['diplomat', 'talk', ''], ['connected', 'connect', '']], [['specialist', 'talk', 'talk'], ['die-hard', 'none', '']], [['diplomat', 'talk', ''], ['alert', 'notice', '']], [['specialist', 'lead', 'lead'], ['authority', 'lead', '']], [['healer', 'heal', ''], ['specialist', 'talk', 'talk']], [['specialist', 'notice', 'notice'], ['specialist', 'talk', 'talk']]], [[['specialist', 'pilot', 'pilot'], ['starfarer', 'pilot', '']], [['healer', 'heal', ''], ['die-hard', 'none', '']], [['tinker', 'fix', ''], ['gunslinger', 'shoot', '']], [['specialist', 'sneak', 'sneak'], ['assassin', 'sneak', '']], [['specialist', 'sneak', 'sneak'], ['specialist', 'exert', 'exert']], [['specialist', 'perform', 'perform'], ['specialist', 'sneak', 'sneak']]], [[['savage-fray', 'stab', ''], ['shocking-assault', 'punch-or-stab', '']], [['assassin', 'sneak', ''], ['specialist', 'sneak', 'sneak']], [['armsman', 'stab', ''], ['close-combatant', 'any-combat', '']], [['close-combatant', 'any-combat', ''], ['savage-fray', 'stab', '']], [['ironhide', 'none', ''], ['die-hard', 'none', '']], [['unarmed-combatant', 'punch', ''], ['close-combatant', 'any-combat', '']]], [[['gunslinger', 'shoot', ''], ['close-combatant', 'any-combat', '']], [['sniper', 'shoot', ''], ['specialist', 'sneak', 'sneak']], [['assassin', 'sneak', ''], ['specialist', 'sneak', 'sneak']], [['ironhide', 'none', ''], ['die-hard', 'none', '']], [['gunslinger', 'shoot', ''], ['tinker', 'fix', '']], [['close-combatant', 'any-combat', ''], ['alert', 'notice', '']]], [[['gunslinger', 'shoot', ''], ['authority', 'lead', '']], [['ironhide', 'none', ''], ['connected', 'connect', '']], [['armsman', 'stab', ''], ['specialist', 'lead', 'lead']], [['gunslinger', 'shoot', ''], ['specialist', 'talk', 'talk']], [['assassin', 'sneak', ''], ['die-hard', 'none', '']], [['close-combatant', 'any-combat', ''], ['henchkeeper', 'lead', '']]], [[['alert', 'notice', '']], [['healer', 'heal', '']], [['specialist', 'notice', 'notice']], [['psychic-training', 'any-psychic', '']], [['savage-fray', 'stab', '']], [['hacker', 'program', '']]], [[['armsman', 'stab', '']], [['ironhide', 'none', '']], [['die-hard', 'none', '']], [['psychic-training', 'any-psychic', '']], [['healer', 'heal', '']], [['unarmed-combatant', 'punch', '']]]][flags.style][flags.row]
+                [[[['specialist', 'fix', 'fix'], ['die-hard', 'none', '']], [['hacker', 'program', ''], ['tinker', 'fix', '']], [['specialist', 'know', 'know'], ['healer', 'heal', '']], [['specialist', 'fix', 'fix'], ['tinker', 'fix', '']], [['healer', 'heal', ''], ['ironhide', 'none', '']], [['specialist', 'fix', 'fix'], ['hacker', 'program', '']]], [[['diplomat', 'talk', ''], ['connected', 'connect', '']], [['specialist', 'talk', 'talk'], ['die-hard', 'none', '']], [['diplomat', 'talk', ''], ['alert', 'notice', '']], [['specialist', 'lead', 'lead'], ['authority', 'lead', '']], [['healer', 'heal', ''], ['specialist', 'talk', 'talk']], [['specialist', 'notice', 'notice'], ['specialist', 'talk', 'talk']]], [[['specialist', 'pilot', 'pilot'], ['starfarer', 'pilot', '']], [['healer', 'heal', ''], ['die-hard', 'none', '']], [['tinker', 'fix', ''], ['gunslinger', 'shoot', '']], [['specialist', 'sneak', 'sneak'], ['assassin', 'sneak', '']], [['specialist', 'sneak', 'sneak'], ['specialist', 'exert', 'exert']], [['specialist', 'perform', 'perform'], ['specialist', 'sneak', 'sneak']]], [[['savage-fray', 'stab', ''], ['shocking-assault', 'punch-or-stab', '']], [['assassin', 'sneak', ''], ['specialist', 'sneak', 'sneak']], [['armsman', 'stab', ''], ['close-combatant', 'any-combat', '']], [['close-combatant', 'any-combat', ''], ['savage-fray', 'stab', '']], [['ironhide', 'none', ''], ['die-hard', 'none', '']], [['unarmed-combatant', 'punch', ''], ['close-combatant', 'any-combat', '']]], [[['gunslinger', 'shoot', ''], ['close-combatant', 'any-combat', '']], [['sniper', 'shoot', ''], ['specialist', 'sneak', 'sneak']], [['assassin', 'sneak', ''], ['specialist', 'sneak', 'sneak']], [['ironhide', 'none', ''], ['die-hard', 'none', '']], [['gunslinger', 'shoot', ''], ['tinker', 'fix', '']], [['close-combatant', 'any-combat', ''], ['alert', 'notice', '']]], [[['gunslinger', 'shoot', ''], ['authority', 'lead', '']], [['ironhide', 'none', ''], ['connected', 'connect', '']], [['armsman', 'stab', ''], ['specialist', 'lead', 'lead']], [['gunslinger', 'shoot', ''], ['specialist', 'talk', 'talk']], [['assassin', 'sneak', ''], ['die-hard', 'none', '']], [['close-combatant', 'any-combat', ''], ['henchkeeper', 'lead', '']]], [[['alert', 'notice', '']], [['healer', 'heal', '']], [['specialist', 'notice', 'notice']], [['psychic-training', 'any-psychic', '']], [['savage-fray', 'stab', '']], [['hacker', 'program', '']]], [[['armsman', 'stab', '']], [['ironhide', 'none', '']], [['die-hard', 'none', '']], [['psychic-training', 'any-psychic', '']], [['healer', 'heal', '']], [['unarmed-combatant', 'punch', '']]]][steps.style.item.table][flags.row]
       - id: focus1
         kind: changes
+        when: size(flags.foci) > 0
         changes:
           - type: addItem
             entry: { item: "'foci.' + flags.foci[0][0]" }
       - id: focusSkill1
         kind: action
+        when: size(flags.foci) > 0
         use: gain-skill
         params:
           entry: "flags.foci[0][0] == 'specialist' ? flags.foci[0][2] : flags.foci[0][1]"
           random: params.random
       - id: focusPicks1
         kind: choice
+        when: size(flags.foci) > 0
         options: { pending: { entry: 'steps.focus1.added[0]' } }
         recommend: >-
           choice.id == 'skill' ? flags.foci[0][2]
@@ -370,6 +366,23 @@ actions:
             : choice.id == 'discipline' && has(steps.focusSkill2.data)
               && steps.focusSkill2.data.skill in options ? steps.focusSkill2.data.skill
             : options[0]
+      - id: anyFocus
+        kind: action
+        when: '!has(steps.style.item.table)'
+        use: gain-focus
+        params: { random: params.random }
+      - id: noncombatFocus
+        kind: action
+        sheet: proposed
+        when: '!has(steps.style.item.table) && class.focus.noncombat > 0'
+        use: gain-focus
+        params: { kind: "'noncombat'", random: params.random }
+      - id: combatFocus
+        kind: action
+        sheet: proposed
+        when: '!has(steps.style.item.table) && class.focus.combat > 0'
+        use: gain-focus
+        params: { kind: "'combat'", random: params.random }
       # The d20 table: every non-psychic skill in order, then a level-0 skill raised to level-1.
       - id: bonus
         kind: choice
@@ -390,6 +403,7 @@ actions:
         use: starting-gear
         params: { random: params.random }
       - id: hitPoints
+        tags: [creation.finish]
         kind: changes
         sheet: proposed
         changes:

package/rules/tags.yaml

@@ -48,9 +48,20 @@ tags:
   - health
   - combat
   - psionics
+  # Foci open only to a character with psionic access, or only to one without.
+  - needs-psionics
+  - no-psionics
   - strain
   - torch
   - creation
+  # Choice and changes steps an add-on pack's rules effects reach.
+  - creation.focus
+  - creation.kit
+  - creation.finish
+  - level-up.focus
+  - level-up.level
+  - rest.night
+  - rest.scene
   - level-up
   - failed-check
   - missed-attack