@opencharacter/cwn-srd 0.1.0 → 0.2.0

package/dist/release.json

@@ -1,8 +1,8 @@
 {
   "manifest": {
     "id": "cwn-srd",
-    "version": "0.1.0",
-    "specVersion": "0.2.0",
+    "version": "0.2.0",
+    "specVersion": "0.3.0",
     "license": "CC0-1.0",
     "notices": {
       "not-affiliated": "This pack is compatible with Cities Without Number, a game by Kevin Crawford published by Sine Nomine Publishing. It is built on the Cities Without Number System Reference Document, which its author dedicated to the public domain under CC0 1.0. It is unofficial: it is not affiliated with, approved or endorsed by Kevin Crawford or Sine Nomine Publishing."
@@ -16,7 +16,7 @@
         "tags": [
           "advancement"
         ],
-        "available": "!character.creating && level < 10",
+        "available": "!character.creating && level < 10 && xp.current >= xp.next",
         "params": {
           "random": {
             "type": "boolean",
@@ -29,6 +29,9 @@
         "steps": [
           {
             "id": "raise",
+            "tags": [
+              "advancement.level"
+            ],
             "kind": "changes",
             "changes": [
               {
@@ -123,10 +126,11 @@
         "tags": [
           "advancement"
         ],
-        "available": "!character.creating",
+        "available": "!character.creating && (skillPoints.unspent > 0 || maxList(keysOf('skill'), fieldOf('skills.{skill}.credit', x)) > 0)",
         "params": {
           "skill": {
             "type": "enum",
+            "open": true,
             "values": [
               "administer",
               "connect",
@@ -198,14 +202,14 @@
               {
                 "type": "set",
                 "field": {
-                  "formula": "'skills.' + params.skill + '.base'"
+                  "formula": "fieldId('skills.{skill}.base', params.skill)"
                 },
                 "value": "flags.level + 1"
               },
               {
                 "type": "set",
                 "field": {
-                  "formula": "'skills.' + params.skill + '.credit'"
+                  "formula": "fieldId('skills.{skill}.credit', params.skill)"
                 },
                 "value": "max(0, flags.credit - flags.cost)"
               },
@@ -228,7 +232,7 @@
         "tags": [
           "advancement"
         ],
-        "available": "!character.creating && !underdog && advancement.attributeBoosts < 5",
+        "available": "!character.creating && !underdog && advancement.attributeBoosts < 5\n  && skillPoints.unspent > advancement.attributeBoosts\n  && level >= [1, 1, 3, 6, 9][advancement.attributeBoosts]",
         "params": {
           "attribute": {
             "type": "enum",
@@ -293,12 +297,14 @@
       },
       {
         "id": "gain-skill",
+        "listed": false,
         "tags": [
           "building"
         ],
         "params": {
           "code": {
             "type": "enum",
+            "open": true,
             "values": [
               "administer",
               "connect",
@@ -400,7 +406,7 @@
               {
                 "type": "adjust",
                 "field": {
-                  "formula": "'skills.' + flags.skill + '.base'"
+                  "formula": "fieldId('skills.{skill}.base', flags.skill)"
                 },
                 "by": 1
               }
@@ -471,14 +477,14 @@
               {
                 "type": "set",
                 "field": {
-                  "formula": "'skills.' + flags.skill + '.base'"
+                  "formula": "fieldId('skills.{skill}.base', flags.skill)"
                 },
                 "value": "flags.level"
               },
               {
                 "type": "set",
                 "field": {
-                  "formula": "'skills.' + flags.skill + '.credit'"
+                  "formula": "fieldId('skills.{skill}.credit', flags.skill)"
                 },
                 "value": "flags.level >= 4 ? 0 : flags.pool"
               },
@@ -502,6 +508,7 @@
       },
       {
         "id": "gain-attribute",
+        "listed": false,
         "tags": [
           "building"
         ],
@@ -519,6 +526,9 @@
             "default": false
           }
         },
+        "results": [
+          "raised"
+        ],
         "steps": [
           {
             "id": "start",
@@ -567,11 +577,17 @@
               "attributes.wis.base": "size(flags.best) > 0 && flags.best[0] == 'wis' ? flags.amount : 0",
               "attributes.cha.base": "size(flags.best) > 0 && flags.best[0] == 'cha' ? flags.amount : 0"
             }
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'raised'"
           }
         ]
       },
       {
         "id": "gain-focus",
+        "available": "foci.taken < foci.allowed",
         "tags": [
           "building",
           "advancement"
@@ -625,7 +641,7 @@
             "options": {
               "content": {
                 "type": "focus",
-                "where": "('repeatable' in item.tags || countCopies(copy.item == item.id) == 0)\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies(copy.item == @foci.all-natural) > 0))\n  && !(item.id == @foci.all-natural && (underdog || magic.mage || magic.summoner\n    || magic.graced || countCopies(copy.type == 'cyberware' && copy.fields.strain > 0) > 0))"
+                "where": "('repeatable' in item.tags || countCopies(copy.item == item.id) == 0)\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies('bars-cyber' in copy.tags) > 0))\n  && !('bars-cyber' in item.tags && (underdog || magic.mage || magic.summoner\n    || magic.graced || countCopies(copy.type == 'cyberware' && copy.fields.strain > 0) > 0))"
               }
             },
             "recommend": "options[0]",
@@ -828,6 +844,7 @@
         "tags": [
           "building"
         ],
+        "available": "size(picksOf('edge-1')) == 0 || size(picksOf('edge-2')) == 0\n  || (level >= 5 && size(picksOf('edge-5')) == 0)\n  || (underdog && size(picksOf('underdog-edge')) == 0)",
         "params": {
           "choice": {
             "type": "enum",
@@ -844,9 +861,17 @@
           }
         },
         "results": [
-          "gained"
+          "gained",
+          "closed"
         ],
         "steps": [
+          {
+            "id": "closed",
+            "kind": "outcome",
+            "sheet": "proposed",
+            "when": "(params.choice == 'edge-5' && level < 5) || (params.choice == 'underdog-edge' && !underdog)\n  || (params.choice == 'edge-1' && size(picksOf('edge-1')) > 0)\n  || (params.choice == 'edge-2' && size(picksOf('edge-2')) > 0)\n  || (params.choice == 'edge-5' && size(picksOf('edge-5')) > 0)\n  || (params.choice == 'underdog-edge' && size(picksOf('underdog-edge')) > 0)",
+            "result": "'closed'"
+          },
           {
             "id": "edge",
             "kind": "choice",
@@ -857,7 +882,7 @@
             "options": {
               "content": {
                 "type": "edge",
-                "where": "('repeatable' in item.tags || !(item.id in edges.taken))\n  && (!item.magic || (campaign.magic && params.choice != 'underdog-edge'\n    && params.choice != 'edge-5'))\n  && !('not-underdog' in item.tags && (underdog || params.choice == 'underdog-edge'))\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies(copy.item == @foci.all-natural) > 0))"
+                "where": "('repeatable' in item.tags || !(item.id in edges.taken))\n  && (!item.magic || (campaign.magic && params.choice != 'underdog-edge'\n    && params.choice != 'edge-5'))\n  && !('not-underdog' in item.tags && (underdog || params.choice == 'underdog-edge'))\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies('bars-cyber' in copy.tags) > 0))"
               }
             },
             "recommend": "options[0]",
@@ -1262,9 +1287,15 @@
         "tags": [
           "rest"
         ],
+        "results": [
+          "ended"
+        ],
         "steps": [
           {
             "id": "refresh",
+            "tags": [
+              "rest.scene"
+            ],
             "kind": "changes",
             "changes": [
               {
@@ -1296,6 +1327,11 @@
                 "value": 0
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'ended'"
           }
         ]
       },
@@ -1304,9 +1340,15 @@
         "tags": [
           "rest"
         ],
+        "results": [
+          "rested"
+        ],
         "steps": [
           {
             "id": "recover",
+            "tags": [
+              "rest.night"
+            ],
             "kind": "changes",
             "changes": [
               {
@@ -1352,6 +1394,11 @@
                 "value": 0
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'rested'"
           }
         ]
       },
@@ -1368,6 +1415,9 @@
             "max": 4
           }
         },
+        "results": [
+          "healed"
+        ],
         "steps": [
           {
             "id": "heal",
@@ -1400,6 +1450,14 @@
                 "by": 1
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'healed'",
+            "data": {
+              "healed": "max(0, steps.heal.total)"
+            }
           }
         ]
       },
@@ -2106,6 +2164,9 @@
           },
           {
             "id": "freeItemKind",
+            "tags": [
+              "creation.item"
+            ],
             "kind": "choice",
             "options": [
               {
@@ -2234,6 +2295,9 @@
           },
           {
             "id": "gear",
+            "tags": [
+              "creation.gear"
+            ],
             "kind": "changes",
             "changes": [
               {
@@ -2250,6 +2314,9 @@
           },
           {
             "id": "finish",
+            "tags": [
+              "creation.finish"
+            ],
             "kind": "changes",
             "sheet": "proposed",
             "changes": [
@@ -2276,6 +2343,9 @@
           "cyber"
         ],
         "available": "has(item.triggerStrain) && !self.damaged && strain.total + item.triggerStrain <= strain.max",
+        "results": [
+          "triggered"
+        ],
         "steps": [
           {
             "id": "strain",
@@ -2287,11 +2357,17 @@
                 "by": "item.triggerStrain"
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'triggered'"
           }
         ]
       },
       {
         "id": "acquire-wired-cyber",
+        "listed": false,
         "tags": [
           "building"
         ],
@@ -2301,6 +2377,9 @@
             "default": false
           }
         },
+        "results": [
+          "acquired"
+        ],
         "steps": [
           {
             "id": "cyber",
@@ -2328,6 +2407,11 @@
                 }
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'acquired'"
           }
         ]
       },
@@ -2343,6 +2427,9 @@
             "optional": true
           }
         },
+        "results": [
+          "applied"
+        ],
         "steps": [
           {
             "id": "heal",
@@ -2382,6 +2469,14 @@
                 "by": "steps.heal.total"
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'applied'",
+            "data": {
+              "healed": "has(steps.heal) ? steps.heal.total : 0"
+            }
           }
         ]
       },
@@ -2404,6 +2499,9 @@
             "default": false
           }
         },
+        "results": [
+          "acquired"
+        ],
         "steps": [
           {
             "id": "vehicle",
@@ -2510,6 +2608,11 @@
                 }
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'acquired'"
           }
         ]
       },
@@ -2753,6 +2856,9 @@
             "min": 0
           }
         },
+        "results": [
+          "summoned"
+        ],
         "steps": [
           {
             "id": "commit",
@@ -2764,6 +2870,11 @@
                 "by": "self.cost + (self.ritual ? 0 : params.earlier)"
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'summoned'"
           }
         ]
       },
@@ -3103,6 +3214,9 @@
           "reload"
         ],
         "available": "has(item.magazine) && self.loaded < item.magazine",
+        "results": [
+          "reloaded"
+        ],
         "steps": [
           {
             "id": "fill",
@@ -3115,6 +3229,11 @@
                 "value": "item.magazine"
               }
             ]
+          },
+          {
+            "id": "result",
+            "kind": "outcome",
+            "result": "'reloaded'"
           }
         ]
       }
@@ -3440,7 +3559,7 @@
       },
       "attributes.modTotal": {
         "type": "integer",
-        "formula": "attributes.str.mod + attributes.dex.mod + attributes.con.mod + attributes.int.mod\n  + attributes.wis.mod + attributes.cha.mod"
+        "formula": "sumList(['str', 'dex', 'con', 'int', 'wis', 'cha'],\n  fieldOf('attributes.{attribute}.base', x) >= 18 ? 2\n    : fieldOf('attributes.{attribute}.base', x) >= 14 ? 1\n    : fieldOf('attributes.{attribute}.base', x) >= 8 ? 0\n    : fieldOf('attributes.{attribute}.base', x) >= 4 ? -1 : -2)"
       },
       "campaign.magic": {
         "type": "boolean",
@@ -4649,12 +4768,14 @@
         ]
       },
       "background": {
+        "grantOnly": true,
         "copies": {
           "max": 0
         },
         "fields": {
           "freeSkill": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4681,6 +4802,7 @@
           },
           "growth1": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4711,6 +4833,7 @@
           },
           "growth2": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4741,6 +4864,7 @@
           },
           "growth3": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4771,6 +4895,7 @@
           },
           "growth4": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4801,6 +4926,7 @@
           },
           "growth5": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4831,6 +4957,7 @@
           },
           "growth6": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4861,6 +4988,7 @@
           },
           "learning1": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4888,6 +5016,7 @@
           },
           "learning2": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4915,6 +5044,7 @@
           },
           "learning3": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4942,6 +5072,7 @@
           },
           "learning4": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4969,6 +5100,7 @@
           },
           "learning5": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -4996,6 +5128,7 @@
           },
           "learning6": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -5023,6 +5156,7 @@
           },
           "learning7": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -5050,6 +5184,7 @@
           },
           "learning8": {
             "type": "enum",
+            "open": true,
             "required": true,
             "values": [
               "administer",
@@ -5107,6 +5242,7 @@
           },
           "category": {
             "type": "enum",
+            "open": true,
             "values": [
               "body",
               "head",
@@ -5273,7 +5409,8 @@
               "fly",
               "swim"
             ],
-            "required": true
+            "required": true,
+            "open": true
           },
           "hardpoints": {
             "type": "integer",
@@ -5295,12 +5432,14 @@
         }
       },
       "edge": {
+        "grantOnly": true,
         "copies": {
           "max": 0
         },
         "fields": {
           "bonusSkill": {
             "type": "enum",
+            "open": true,
             "values": [
               "administer",
               "connect",
@@ -5400,6 +5539,7 @@
           },
           "bonusSkill": {
             "type": "enum",
+            "open": true,
             "values": [
               "administer",
               "connect",
@@ -5428,6 +5568,7 @@
           },
           "bonusSkill2": {
             "type": "enum",
+            "open": true,
             "values": [
               "administer",
               "connect",
@@ -5452,6 +5593,7 @@
           },
           "levelTwoSkill": {
             "type": "enum",
+            "open": true,
             "values": [
               "administer",
               "connect",
@@ -5682,7 +5824,8 @@
               "device",
               "cyber",
               "program"
-            ]
+            ],
+            "open": true
           }
         },
         "state": {
@@ -5716,6 +5859,7 @@
           },
           "duration": {
             "type": "enum",
+            "open": true,
             "values": [
               "instant",
               "scene",
@@ -5748,6 +5892,13 @@
       },
       "spirit": {
         "nameFrom": "label",
+        "fields": {
+          "powerCount": {
+            "type": "integer",
+            "default": 0,
+            "min": 0
+          }
+        },
         "state": {
           "label": {
             "type": "string",
@@ -5773,7 +5924,7 @@
         "computed": {
           "cost": {
             "type": "integer",
-            "formula": "max(1, size(picksOf('powers')) - (self.ritual ? 1 : 0) - max(0, skills.summon.level))"
+            "formula": "max(1, (item.id == @spirits.spirit ? size(picksOf('powers')) : item.powerCount)\n  - (self.ritual ? 1 : 0) - max(0, skills.summon.level))"
           }
         },
         "actions": [
@@ -5783,6 +5934,7 @@
         ]
       },
       "spiritPower": {
+        "grantOnly": true,
         "copies": {
           "max": 0
         },
@@ -5905,7 +6057,8 @@
               "stab",
               "punch"
             ],
-            "required": true
+            "required": true,
+            "open": true
           },
           "attribute": {
             "type": "enum",
@@ -6167,7 +6320,8 @@
       "check": [
         {
           "id": "success",
-          "when": "roll.total >= flags.dc"
+          "when": "roll.total >= flags.dc",
+          "success": true
         },
         {
           "id": "failure",
@@ -6181,7 +6335,8 @@
         },
         {
           "id": "success",
-          "when": "roll.kept[0] == 20 || roll.total >= flags.target"
+          "when": "roll.kept[0] == 20 || roll.total >= flags.target",
+          "success": true
         },
         {
           "id": "failure",
@@ -6289,7 +6444,8 @@
       "hit": [
         {
           "id": "hit",
-          "when": "roll.total >= flags.ac"
+          "when": "roll.total >= flags.ac",
+          "success": true
         },
         {
           "id": "miss",
@@ -7968,6 +8124,27 @@
           "priority": 8,
           "showWhen": "magic.cyberPenalty > 0"
         },
+        "arts.bonusRolls.used": {
+          "groups": [
+            "magic"
+          ],
+          "priority": 9,
+          "showWhen": "arts.bonusRolls.max > 0",
+          "with": [
+            {
+              "field": "arts.bonusRolls.max",
+              "as": "max"
+            }
+          ]
+        },
+        "arts.bonusRolls.max": {
+          "groups": [
+            "magic"
+          ],
+          "priority": 9,
+          "visibility": "background",
+          "showWhen": "arts.bonusRolls.max > 0"
+        },
         "magic.mage": {
           "hidden": true
         },
@@ -8298,6 +8475,11 @@
           "quantity": {
             "hidden": true
           },
+          "fields": {
+            "powerCount": {
+              "hidden": true
+            }
+          },
           "state": {
             "form": {
               "priority": 0
@@ -8399,8 +8581,12 @@
       "major-injury",
       "overcast",
       "creation",
+      "creation.item",
+      "creation.gear",
+      "creation.finish",
       "building",
       "advancement",
+      "advancement.level",
       "skill-pick",
       "focus-pick",
       "edge-pick",
@@ -8412,6 +8598,8 @@
       "spell",
       "summoning",
       "rest",
+      "rest.night",
+      "rest.scene",
       "injury",
       "armor.heavy",
       "damage.weapon",
@@ -8423,6 +8611,7 @@
       "repeatable",
       "asks-attribute",
       "brings-cyber",
+      "bars-cyber",
       "not-underdog",
       "retroactive-points",
       "restricted",
@@ -11845,7 +12034,8 @@
       "id": "foci.all-natural",
       "type": "focus",
       "tags": [
-        "asks-attribute"
+        "asks-attribute",
+        "bars-cyber"
       ],
       "fields": {
         "maxLevel": 1,
@@ -16743,8 +16933,8 @@
         }
       }
     },
-    "!character.creating && !underdog && advancement.attributeBoosts < 5": {
-      "text": "!character.creating && !underdog && advancement.attributeBoosts < 5",
+    "!character.creating && !underdog && advancement.attributeBoosts < 5\n  && skillPoints.unspent > advancement.attributeBoosts\n  && level >= [1, 1, 3, 6, 9][advancement.attributeBoosts]": {
+      "text": "!character.creating && !underdog && advancement.attributeBoosts < 5 && skillPoints.unspent > advancement.attributeBoosts && level >= [1, 1, 3, 6, 9][advancement.attributeBoosts]",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -16752,40 +16942,111 @@
           "type": "binary",
           "op": "&&",
           "left": {
-            "type": "unary",
-            "op": "!",
-            "operand": {
-              "type": "name",
-              "path": [
-                "character",
-                "creating"
-              ]
+            "type": "binary",
+            "op": "&&",
+            "left": {
+              "type": "binary",
+              "op": "&&",
+              "left": {
+                "type": "unary",
+                "op": "!",
+                "operand": {
+                  "type": "name",
+                  "path": [
+                    "character",
+                    "creating"
+                  ]
+                }
+              },
+              "right": {
+                "type": "unary",
+                "op": "!",
+                "operand": {
+                  "type": "name",
+                  "path": [
+                    "underdog"
+                  ]
+                }
+              }
+            },
+            "right": {
+              "type": "binary",
+              "op": "<",
+              "left": {
+                "type": "name",
+                "path": [
+                  "advancement",
+                  "attributeBoosts"
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 5
+              }
             }
           },
           "right": {
-            "type": "unary",
-            "op": "!",
-            "operand": {
+            "type": "binary",
+            "op": ">",
+            "left": {
               "type": "name",
               "path": [
-                "underdog"
+                "skillPoints",
+                "unspent"
+              ]
+            },
+            "right": {
+              "type": "name",
+              "path": [
+                "advancement",
+                "attributeBoosts"
               ]
             }
           }
         },
         "right": {
           "type": "binary",
-          "op": "<",
+          "op": ">=",
           "left": {
             "type": "name",
             "path": [
-              "advancement",
-              "attributeBoosts"
+              "level"
             ]
           },
           "right": {
-            "type": "int",
-            "value": 5
+            "type": "index",
+            "object": {
+              "type": "list",
+              "items": [
+                {
+                  "type": "int",
+                  "value": 1
+                },
+                {
+                  "type": "int",
+                  "value": 1
+                },
+                {
+                  "type": "int",
+                  "value": 3
+                },
+                {
+                  "type": "int",
+                  "value": 6
+                },
+                {
+                  "type": "int",
+                  "value": 9
+                }
+              ]
+            },
+            "index": {
+              "type": "name",
+              "path": [
+                "advancement",
+                "attributeBoosts"
+              ]
+            }
           }
         }
       }
@@ -16825,6 +17086,83 @@
         }
       }
     },
+    "!character.creating && (skillPoints.unspent > 0 || maxList(keysOf('skill'), fieldOf('skills.{skill}.credit', x)) > 0)": {
+      "text": "!character.creating && (skillPoints.unspent > 0 || maxList(keysOf('skill'), fieldOf('skills.{skill}.credit', x)) > 0)",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "unary",
+          "op": "!",
+          "operand": {
+            "type": "name",
+            "path": [
+              "character",
+              "creating"
+            ]
+          }
+        },
+        "right": {
+          "type": "binary",
+          "op": "||",
+          "left": {
+            "type": "binary",
+            "op": ">",
+            "left": {
+              "type": "name",
+              "path": [
+                "skillPoints",
+                "unspent"
+              ]
+            },
+            "right": {
+              "type": "int",
+              "value": 0
+            }
+          },
+          "right": {
+            "type": "binary",
+            "op": ">",
+            "left": {
+              "type": "call",
+              "fn": "maxList",
+              "args": [
+                {
+                  "type": "call",
+                  "fn": "keysOf",
+                  "args": [
+                    {
+                      "type": "string",
+                      "value": "skill"
+                    }
+                  ]
+                },
+                {
+                  "type": "call",
+                  "fn": "fieldOf",
+                  "args": [
+                    {
+                      "type": "string",
+                      "value": "skills.{skill}.credit"
+                    },
+                    {
+                      "type": "name",
+                      "path": [
+                        "x"
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            "right": {
+              "type": "int",
+              "value": 0
+            }
+          }
+        }
+      }
+    },
     "!character.creating && foci.taken < foci.allowed": {
       "text": "!character.creating && foci.taken < foci.allowed",
       "tree": {
@@ -16861,38 +17199,6 @@
         }
       }
     },
-    "!character.creating && level < 10": {
-      "text": "!character.creating && level < 10",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "unary",
-          "op": "!",
-          "operand": {
-            "type": "name",
-            "path": [
-              "character",
-              "creating"
-            ]
-          }
-        },
-        "right": {
-          "type": "binary",
-          "op": "<",
-          "left": {
-            "type": "name",
-            "path": [
-              "level"
-            ]
-          },
-          "right": {
-            "type": "int",
-            "value": 10
-          }
-        }
-      }
-    },
     "!character.creating && level < 10 && xp.current >= xp.next": {
       "text": "!character.creating && level < 10 && xp.current >= xp.next",
       "tree": {
@@ -17351,6 +17657,13 @@
         "value": "acquaintances"
       }
     },
+    "'acquired'": {
+      "text": "'acquired'",
+      "tree": {
+        "type": "string",
+        "value": "acquired"
+      }
+    },
     "'advancement' in item.tags": {
       "text": "'advancement' in item.tags",
       "tree": {
@@ -17376,6 +17689,13 @@
         "value": "any"
       }
     },
+    "'applied'": {
+      "text": "'applied'",
+      "tree": {
+        "type": "string",
+        "value": "applied"
+      }
+    },
     "'attack' in item.tags || 'reload' in item.tags": {
       "text": "'attack' in item.tags || 'reload' in item.tags",
       "tree": {
@@ -17886,6 +18206,13 @@
         }
       }
     },
+    "'closed'": {
+      "text": "'closed'",
+      "tree": {
+        "type": "string",
+        "value": "closed"
+      }
+    },
     "'combat.attackBonus'": {
       "text": "'combat.attackBonus'",
       "tree": {
@@ -17993,6 +18320,13 @@
         "value": "edge-5"
       }
     },
+    "'ended'": {
+      "text": "'ended'",
+      "tree": {
+        "type": "string",
+        "value": "ended"
+      }
+    },
     "'firearm' in item.tags": {
       "text": "'firearm' in item.tags",
       "tree": {
@@ -18177,6 +18511,13 @@
         }
       }
     },
+    "'healed'": {
+      "text": "'healed'",
+      "tree": {
+        "type": "string",
+        "value": "healed"
+      }
+    },
     "'hp.dieBonus'": {
       "text": "'hp.dieBonus'",
       "tree": {
@@ -18397,6 +18738,13 @@
         "value": "raised"
       }
     },
+    "'reloaded'": {
+      "text": "'reloaded'",
+      "tree": {
+        "type": "string",
+        "value": "reloaded"
+      }
+    },
     "'rest' in item.tags": {
       "text": "'rest' in item.tags",
       "tree": {
@@ -18415,6 +18763,13 @@
         }
       }
     },
+    "'rested'": {
+      "text": "'rested'",
+      "tree": {
+        "type": "string",
+        "value": "rested"
+      }
+    },
     "'roll'": {
       "text": "'roll'",
       "tree": {
@@ -18549,110 +18904,6 @@
         }
       }
     },
-    "'skills.' + flags.skill + '.base'": {
-      "text": "'skills.' + flags.skill + '.base'",
-      "tree": {
-        "type": "binary",
-        "op": "+",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "string",
-            "value": "skills."
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "flags",
-              "skill"
-            ]
-          }
-        },
-        "right": {
-          "type": "string",
-          "value": ".base"
-        }
-      }
-    },
-    "'skills.' + flags.skill + '.credit'": {
-      "text": "'skills.' + flags.skill + '.credit'",
-      "tree": {
-        "type": "binary",
-        "op": "+",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "string",
-            "value": "skills."
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "flags",
-              "skill"
-            ]
-          }
-        },
-        "right": {
-          "type": "string",
-          "value": ".credit"
-        }
-      }
-    },
-    "'skills.' + params.skill + '.base'": {
-      "text": "'skills.' + params.skill + '.base'",
-      "tree": {
-        "type": "binary",
-        "op": "+",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "string",
-            "value": "skills."
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "params",
-              "skill"
-            ]
-          }
-        },
-        "right": {
-          "type": "string",
-          "value": ".base"
-        }
-      }
-    },
-    "'skills.' + params.skill + '.credit'": {
-      "text": "'skills.' + params.skill + '.credit'",
-      "tree": {
-        "type": "binary",
-        "op": "+",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "string",
-            "value": "skills."
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "params",
-              "skill"
-            ]
-          }
-        },
-        "right": {
-          "type": "string",
-          "value": ".credit"
-        }
-      }
-    },
     "'skills.cast.level'": {
       "text": "'skills.cast.level'",
       "tree": {
@@ -18685,6 +18936,13 @@
         }
       }
     },
+    "'summoned'": {
+      "text": "'summoned'",
+      "tree": {
+        "type": "string",
+        "value": "summoned"
+      }
+    },
     "'take'": {
       "text": "'take'",
       "tree": {
@@ -18757,6 +19015,13 @@
         }
       }
     },
+    "'triggered'": {
+      "text": "'triggered'",
+      "tree": {
+        "type": "string",
+        "value": "triggered"
+      }
+    },
     "'unarmed' in item.tags": {
       "text": "'unarmed' in item.tags",
       "tree": {
@@ -18906,8 +19171,8 @@
         "value": "weapon"
       }
     },
-    "('repeatable' in item.tags || !(item.id in edges.taken))\n  && (!item.magic || (campaign.magic && params.choice != 'underdog-edge'\n    && params.choice != 'edge-5'))\n  && !('not-underdog' in item.tags && (underdog || params.choice == 'underdog-edge'))\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies(copy.item == @foci.all-natural) > 0))": {
-      "text": "('repeatable' in item.tags || !(item.id in edges.taken)) && (!item.magic || campaign.magic && params.choice != 'underdog-edge' && params.choice != 'edge-5') && !('not-underdog' in item.tags && (underdog || params.choice == 'underdog-edge')) && !('brings-cyber' in item.tags && (magic.graced || countCopies(copy.item == @foci.all-natural) > 0))",
+    "('repeatable' in item.tags || !(item.id in edges.taken))\n  && (!item.magic || (campaign.magic && params.choice != 'underdog-edge'\n    && params.choice != 'edge-5'))\n  && !('not-underdog' in item.tags && (underdog || params.choice == 'underdog-edge'))\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies('bars-cyber' in copy.tags) > 0))": {
+      "text": "('repeatable' in item.tags || !(item.id in edges.taken)) && (!item.magic || campaign.magic && params.choice != 'underdog-edge' && params.choice != 'edge-5') && !('not-underdog' in item.tags && (underdog || params.choice == 'underdog-edge')) && !('brings-cyber' in item.tags && (magic.graced || countCopies('bars-cyber' in copy.tags) > 0))",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -19108,17 +19373,17 @@
                   "args": [
                     {
                       "type": "binary",
-                      "op": "==",
+                      "op": "in",
                       "left": {
+                        "type": "string",
+                        "value": "bars-cyber"
+                      },
+                      "right": {
                         "type": "name",
                         "path": [
                           "copy",
-                          "item"
+                          "tags"
                         ]
-                      },
-                      "right": {
-                        "type": "ref",
-                        "id": "foci.all-natural"
                       }
                     }
                   ]
@@ -19133,8 +19398,8 @@
         }
       }
     },
-    "('repeatable' in item.tags || countCopies(copy.item == item.id) == 0)\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies(copy.item == @foci.all-natural) > 0))\n  && !(item.id == @foci.all-natural && (underdog || magic.mage || magic.summoner\n    || magic.graced || countCopies(copy.type == 'cyberware' && copy.fields.strain > 0) > 0))": {
-      "text": "('repeatable' in item.tags || countCopies(copy.item == item.id) == 0) && !('brings-cyber' in item.tags && (magic.graced || countCopies(copy.item == @foci.all-natural) > 0)) && !(item.id == @foci.all-natural && (underdog || magic.mage || magic.summoner || magic.graced || countCopies(copy.type == 'cyberware' && copy.fields.strain > 0) > 0))",
+    "('repeatable' in item.tags || countCopies(copy.item == item.id) == 0)\n  && !('brings-cyber' in item.tags\n    && (magic.graced || countCopies('bars-cyber' in copy.tags) > 0))\n  && !('bars-cyber' in item.tags && (underdog || magic.mage || magic.summoner\n    || magic.graced || countCopies(copy.type == 'cyberware' && copy.fields.strain > 0) > 0))": {
+      "text": "('repeatable' in item.tags || countCopies(copy.item == item.id) == 0) && !('brings-cyber' in item.tags && (magic.graced || countCopies('bars-cyber' in copy.tags) > 0)) && !('bars-cyber' in item.tags && (underdog || magic.mage || magic.summoner || magic.graced || countCopies(copy.type == 'cyberware' && copy.fields.strain > 0) > 0))",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -19232,17 +19497,17 @@
                     "args": [
                       {
                         "type": "binary",
-                        "op": "==",
+                        "op": "in",
                         "left": {
+                          "type": "string",
+                          "value": "bars-cyber"
+                        },
+                        "right": {
                           "type": "name",
                           "path": [
                             "copy",
-                            "item"
+                            "tags"
                           ]
-                        },
-                        "right": {
-                          "type": "ref",
-                          "id": "foci.all-natural"
                         }
                       }
                     ]
@@ -19264,17 +19529,17 @@
             "op": "&&",
             "left": {
               "type": "binary",
-              "op": "==",
+              "op": "in",
               "left": {
+                "type": "string",
+                "value": "bars-cyber"
+              },
+              "right": {
                 "type": "name",
                 "path": [
                   "item",
-                  "id"
+                  "tags"
                 ]
-              },
-              "right": {
-                "type": "ref",
-                "id": "foci.all-natural"
               }
             },
             "right": {
@@ -19502,6 +19767,263 @@
         }
       }
     },
+    "(params.choice == 'edge-5' && level < 5) || (params.choice == 'underdog-edge' && !underdog)\n  || (params.choice == 'edge-1' && size(picksOf('edge-1')) > 0)\n  || (params.choice == 'edge-2' && size(picksOf('edge-2')) > 0)\n  || (params.choice == 'edge-5' && size(picksOf('edge-5')) > 0)\n  || (params.choice == 'underdog-edge' && size(picksOf('underdog-edge')) > 0)": {
+      "text": "params.choice == 'edge-5' && level < 5 || params.choice == 'underdog-edge' && !underdog || params.choice == 'edge-1' && size(picksOf('edge-1')) > 0 || params.choice == 'edge-2' && size(picksOf('edge-2')) > 0 || params.choice == 'edge-5' && size(picksOf('edge-5')) > 0 || params.choice == 'underdog-edge' && size(picksOf('underdog-edge')) > 0",
+      "tree": {
+        "type": "binary",
+        "op": "||",
+        "left": {
+          "type": "binary",
+          "op": "||",
+          "left": {
+            "type": "binary",
+            "op": "||",
+            "left": {
+              "type": "binary",
+              "op": "||",
+              "left": {
+                "type": "binary",
+                "op": "||",
+                "left": {
+                  "type": "binary",
+                  "op": "&&",
+                  "left": {
+                    "type": "binary",
+                    "op": "==",
+                    "left": {
+                      "type": "name",
+                      "path": [
+                        "params",
+                        "choice"
+                      ]
+                    },
+                    "right": {
+                      "type": "string",
+                      "value": "edge-5"
+                    }
+                  },
+                  "right": {
+                    "type": "binary",
+                    "op": "<",
+                    "left": {
+                      "type": "name",
+                      "path": [
+                        "level"
+                      ]
+                    },
+                    "right": {
+                      "type": "int",
+                      "value": 5
+                    }
+                  }
+                },
+                "right": {
+                  "type": "binary",
+                  "op": "&&",
+                  "left": {
+                    "type": "binary",
+                    "op": "==",
+                    "left": {
+                      "type": "name",
+                      "path": [
+                        "params",
+                        "choice"
+                      ]
+                    },
+                    "right": {
+                      "type": "string",
+                      "value": "underdog-edge"
+                    }
+                  },
+                  "right": {
+                    "type": "unary",
+                    "op": "!",
+                    "operand": {
+                      "type": "name",
+                      "path": [
+                        "underdog"
+                      ]
+                    }
+                  }
+                }
+              },
+              "right": {
+                "type": "binary",
+                "op": "&&",
+                "left": {
+                  "type": "binary",
+                  "op": "==",
+                  "left": {
+                    "type": "name",
+                    "path": [
+                      "params",
+                      "choice"
+                    ]
+                  },
+                  "right": {
+                    "type": "string",
+                    "value": "edge-1"
+                  }
+                },
+                "right": {
+                  "type": "binary",
+                  "op": ">",
+                  "left": {
+                    "type": "call",
+                    "fn": "size",
+                    "args": [
+                      {
+                        "type": "call",
+                        "fn": "picksOf",
+                        "args": [
+                          {
+                            "type": "string",
+                            "value": "edge-1"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "right": {
+                    "type": "int",
+                    "value": 0
+                  }
+                }
+              }
+            },
+            "right": {
+              "type": "binary",
+              "op": "&&",
+              "left": {
+                "type": "binary",
+                "op": "==",
+                "left": {
+                  "type": "name",
+                  "path": [
+                    "params",
+                    "choice"
+                  ]
+                },
+                "right": {
+                  "type": "string",
+                  "value": "edge-2"
+                }
+              },
+              "right": {
+                "type": "binary",
+                "op": ">",
+                "left": {
+                  "type": "call",
+                  "fn": "size",
+                  "args": [
+                    {
+                      "type": "call",
+                      "fn": "picksOf",
+                      "args": [
+                        {
+                          "type": "string",
+                          "value": "edge-2"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "right": {
+                  "type": "int",
+                  "value": 0
+                }
+              }
+            }
+          },
+          "right": {
+            "type": "binary",
+            "op": "&&",
+            "left": {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "name",
+                "path": [
+                  "params",
+                  "choice"
+                ]
+              },
+              "right": {
+                "type": "string",
+                "value": "edge-5"
+              }
+            },
+            "right": {
+              "type": "binary",
+              "op": ">",
+              "left": {
+                "type": "call",
+                "fn": "size",
+                "args": [
+                  {
+                    "type": "call",
+                    "fn": "picksOf",
+                    "args": [
+                      {
+                        "type": "string",
+                        "value": "edge-5"
+                      }
+                    ]
+                  }
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 0
+              }
+            }
+          }
+        },
+        "right": {
+          "type": "binary",
+          "op": "&&",
+          "left": {
+            "type": "binary",
+            "op": "==",
+            "left": {
+              "type": "name",
+              "path": [
+                "params",
+                "choice"
+              ]
+            },
+            "right": {
+              "type": "string",
+              "value": "underdog-edge"
+            }
+          },
+          "right": {
+            "type": "binary",
+            "op": ">",
+            "left": {
+              "type": "call",
+              "fn": "size",
+              "args": [
+                {
+                  "type": "call",
+                  "fn": "picksOf",
+                  "args": [
+                    {
+                      "type": "string",
+                      "value": "underdog-edge"
+                    }
+                  ]
+                }
+              ]
+            },
+            "right": {
+              "type": "int",
+              "value": 0
+            }
+          }
+        }
+      }
+    },
     "(self.equipped || 'standard' in item.tags || 'implant' in item.tags)\n  && !('trap' in item.tags) && (!has(item.magazine) || self.loaded >= 1)": {
       "text": "(self.equipped || 'standard' in item.tags || 'implant' in item.tags) && !('trap' in item.tags) && (!has(item.magazine) || self.loaded >= 1)",
       "tree": {
@@ -20984,6 +21506,25 @@
         }
       }
     },
+    "arts.bonusRolls.max > 0": {
+      "text": "arts.bonusRolls.max > 0",
+      "tree": {
+        "type": "binary",
+        "op": ">",
+        "left": {
+          "type": "name",
+          "path": [
+            "arts",
+            "bonusRolls",
+            "max"
+          ]
+        },
+        "right": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
     "arts.points": {
       "text": "arts.points",
       "tree": {
@@ -21722,77 +22263,6 @@
         }
       }
     },
-    "attributes.str.mod + attributes.dex.mod + attributes.con.mod + attributes.int.mod\n  + attributes.wis.mod + attributes.cha.mod": {
-      "text": "attributes.str.mod + attributes.dex.mod + attributes.con.mod + attributes.int.mod + attributes.wis.mod + attributes.cha.mod",
-      "tree": {
-        "type": "binary",
-        "op": "+",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "binary",
-            "op": "+",
-            "left": {
-              "type": "binary",
-              "op": "+",
-              "left": {
-                "type": "binary",
-                "op": "+",
-                "left": {
-                  "type": "name",
-                  "path": [
-                    "attributes",
-                    "str",
-                    "mod"
-                  ]
-                },
-                "right": {
-                  "type": "name",
-                  "path": [
-                    "attributes",
-                    "dex",
-                    "mod"
-                  ]
-                }
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "attributes",
-                  "con",
-                  "mod"
-                ]
-              }
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "attributes",
-                "int",
-                "mod"
-              ]
-            }
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "attributes",
-              "wis",
-              "mod"
-            ]
-          }
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "attributes",
-            "cha",
-            "mod"
-          ]
-        }
-      }
-    },
     "attributes.str.score": {
       "text": "attributes.str.score",
       "tree": {
@@ -22884,6 +23354,86 @@
         "value": false
       }
     },
+    "fieldId('skills.{skill}.base', flags.skill)": {
+      "text": "fieldId('skills.{skill}.base', flags.skill)",
+      "tree": {
+        "type": "call",
+        "fn": "fieldId",
+        "args": [
+          {
+            "type": "string",
+            "value": "skills.{skill}.base"
+          },
+          {
+            "type": "name",
+            "path": [
+              "flags",
+              "skill"
+            ]
+          }
+        ]
+      }
+    },
+    "fieldId('skills.{skill}.base', params.skill)": {
+      "text": "fieldId('skills.{skill}.base', params.skill)",
+      "tree": {
+        "type": "call",
+        "fn": "fieldId",
+        "args": [
+          {
+            "type": "string",
+            "value": "skills.{skill}.base"
+          },
+          {
+            "type": "name",
+            "path": [
+              "params",
+              "skill"
+            ]
+          }
+        ]
+      }
+    },
+    "fieldId('skills.{skill}.credit', flags.skill)": {
+      "text": "fieldId('skills.{skill}.credit', flags.skill)",
+      "tree": {
+        "type": "call",
+        "fn": "fieldId",
+        "args": [
+          {
+            "type": "string",
+            "value": "skills.{skill}.credit"
+          },
+          {
+            "type": "name",
+            "path": [
+              "flags",
+              "skill"
+            ]
+          }
+        ]
+      }
+    },
+    "fieldId('skills.{skill}.credit', params.skill)": {
+      "text": "fieldId('skills.{skill}.credit', params.skill)",
+      "tree": {
+        "type": "call",
+        "fn": "fieldId",
+        "args": [
+          {
+            "type": "string",
+            "value": "skills.{skill}.credit"
+          },
+          {
+            "type": "name",
+            "path": [
+              "params",
+              "skill"
+            ]
+          }
+        ]
+      }
+    },
     "fieldOf('saves.{save}', params.save)": {
       "text": "fieldOf('saves.{save}', params.save)",
       "tree": {
@@ -24706,6 +25256,27 @@
         ]
       }
     },
+    "foci.taken < foci.allowed": {
+      "text": "foci.taken < foci.allowed",
+      "tree": {
+        "type": "binary",
+        "op": "<",
+        "left": {
+          "type": "name",
+          "path": [
+            "foci",
+            "taken"
+          ]
+        },
+        "right": {
+          "type": "name",
+          "path": [
+            "foci",
+            "allowed"
+          ]
+        }
+      }
+    },
     "foci.taken <= foci.allowed": {
       "text": "foci.taken <= foci.allowed",
       "tree": {
@@ -25933,6 +26504,37 @@
         ]
       }
     },
+    "has(steps.heal) ? steps.heal.total : 0": {
+      "text": "has(steps.heal) ? steps.heal.total : 0",
+      "tree": {
+        "type": "conditional",
+        "test": {
+          "type": "call",
+          "fn": "has",
+          "args": [
+            {
+              "type": "name",
+              "path": [
+                "steps",
+                "heal"
+              ]
+            }
+          ]
+        },
+        "then": {
+          "type": "name",
+          "path": [
+            "steps",
+            "heal",
+            "total"
+          ]
+        },
+        "else": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
     "has(steps.mode) ? steps.mode.picked : 'new'": {
       "text": "has(steps.mode) ? steps.mode.picked : 'new'",
       "tree": {
@@ -29592,8 +30194,8 @@
         }
       }
     },
-    "max(1, prior.hp - ceil(base.hp * 0.2))": {
-      "text": "max(1, prior.hp - ceil(base.hp * 0.2))",
+    "max(1, (item.id == @spirits.spirit ? size(picksOf('powers')) : item.powerCount)\n  - (self.ritual ? 1 : 0) - max(0, skills.summon.level))": {
+      "text": "max(1, (item.id == @spirits.spirit ? size(picksOf('powers')) : item.powerCount) - (self.ritual ? 1 : 0) - max(0, skills.summon.level))",
       "tree": {
         "type": "call",
         "fn": "max",
@@ -29606,68 +30208,48 @@
             "type": "binary",
             "op": "-",
             "left": {
-              "type": "name",
-              "path": [
-                "prior",
-                "hp"
-              ]
-            },
-            "right": {
-              "type": "call",
-              "fn": "ceil",
-              "args": [
-                {
+              "type": "binary",
+              "op": "-",
+              "left": {
+                "type": "conditional",
+                "test": {
                   "type": "binary",
-                  "op": "*",
+                  "op": "==",
                   "left": {
                     "type": "name",
                     "path": [
-                      "base",
-                      "hp"
+                      "item",
+                      "id"
                     ]
                   },
                   "right": {
-                    "type": "decimal",
-                    "value": 0.2
+                    "type": "ref",
+                    "id": "spirits.spirit"
                   }
+                },
+                "then": {
+                  "type": "call",
+                  "fn": "size",
+                  "args": [
+                    {
+                      "type": "call",
+                      "fn": "picksOf",
+                      "args": [
+                        {
+                          "type": "string",
+                          "value": "powers"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "else": {
+                  "type": "name",
+                  "path": [
+                    "item",
+                    "powerCount"
+                  ]
                 }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "max(1, size(picksOf('powers')) - (self.ritual ? 1 : 0) - max(0, skills.summon.level))": {
-      "text": "max(1, size(picksOf('powers')) - (self.ritual ? 1 : 0) - max(0, skills.summon.level))",
-      "tree": {
-        "type": "call",
-        "fn": "max",
-        "args": [
-          {
-            "type": "int",
-            "value": 1
-          },
-          {
-            "type": "binary",
-            "op": "-",
-            "left": {
-              "type": "binary",
-              "op": "-",
-              "left": {
-                "type": "call",
-                "fn": "size",
-                "args": [
-                  {
-                    "type": "call",
-                    "fn": "picksOf",
-                    "args": [
-                      {
-                        "type": "string",
-                        "value": "powers"
-                      }
-                    ]
-                  }
-                ]
               },
               "right": {
                 "type": "conditional",
@@ -29710,6 +30292,51 @@
         ]
       }
     },
+    "max(1, prior.hp - ceil(base.hp * 0.2))": {
+      "text": "max(1, prior.hp - ceil(base.hp * 0.2))",
+      "tree": {
+        "type": "call",
+        "fn": "max",
+        "args": [
+          {
+            "type": "int",
+            "value": 1
+          },
+          {
+            "type": "binary",
+            "op": "-",
+            "left": {
+              "type": "name",
+              "path": [
+                "prior",
+                "hp"
+              ]
+            },
+            "right": {
+              "type": "call",
+              "fn": "ceil",
+              "args": [
+                {
+                  "type": "binary",
+                  "op": "*",
+                  "left": {
+                    "type": "name",
+                    "path": [
+                      "base",
+                      "hp"
+                    ]
+                  },
+                  "right": {
+                    "type": "decimal",
+                    "value": 0.2
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
     "max(1, skills.punch.level, skills.shoot.level, skills.stab.level)": {
       "text": "max(1, skills.punch.level, skills.shoot.level, skills.stab.level)",
       "tree": {
@@ -33976,6 +34603,145 @@
         }
       }
     },
+    "size(picksOf('edge-1')) == 0 || size(picksOf('edge-2')) == 0\n  || (level >= 5 && size(picksOf('edge-5')) == 0)\n  || (underdog && size(picksOf('underdog-edge')) == 0)": {
+      "text": "size(picksOf('edge-1')) == 0 || size(picksOf('edge-2')) == 0 || level >= 5 && size(picksOf('edge-5')) == 0 || underdog && size(picksOf('underdog-edge')) == 0",
+      "tree": {
+        "type": "binary",
+        "op": "||",
+        "left": {
+          "type": "binary",
+          "op": "||",
+          "left": {
+            "type": "binary",
+            "op": "||",
+            "left": {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "call",
+                "fn": "size",
+                "args": [
+                  {
+                    "type": "call",
+                    "fn": "picksOf",
+                    "args": [
+                      {
+                        "type": "string",
+                        "value": "edge-1"
+                      }
+                    ]
+                  }
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 0
+              }
+            },
+            "right": {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "call",
+                "fn": "size",
+                "args": [
+                  {
+                    "type": "call",
+                    "fn": "picksOf",
+                    "args": [
+                      {
+                        "type": "string",
+                        "value": "edge-2"
+                      }
+                    ]
+                  }
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 0
+              }
+            }
+          },
+          "right": {
+            "type": "binary",
+            "op": "&&",
+            "left": {
+              "type": "binary",
+              "op": ">=",
+              "left": {
+                "type": "name",
+                "path": [
+                  "level"
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 5
+              }
+            },
+            "right": {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "call",
+                "fn": "size",
+                "args": [
+                  {
+                    "type": "call",
+                    "fn": "picksOf",
+                    "args": [
+                      {
+                        "type": "string",
+                        "value": "edge-5"
+                      }
+                    ]
+                  }
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 0
+              }
+            }
+          }
+        },
+        "right": {
+          "type": "binary",
+          "op": "&&",
+          "left": {
+            "type": "name",
+            "path": [
+              "underdog"
+            ]
+          },
+          "right": {
+            "type": "binary",
+            "op": "==",
+            "left": {
+              "type": "call",
+              "fn": "size",
+              "args": [
+                {
+                  "type": "call",
+                  "fn": "picksOf",
+                  "args": [
+                    {
+                      "type": "string",
+                      "value": "underdog-edge"
+                    }
+                  ]
+                }
+              ]
+            },
+            "right": {
+              "type": "int",
+              "value": 0
+            }
+          }
+        }
+      }
+    },
     "size(steps.edge.item.startingCyber) > 0\n  && strain.total + steps.edge.item.startingCyberStrain <= strain.max && !magic.graced": {
       "text": "size(steps.edge.item.startingCyber) > 0 && strain.total + steps.edge.item.startingCyberStrain <= strain.max && !magic.graced",
       "tree": {
@@ -37317,6 +38083,180 @@
         ]
       }
     },
+    "sumList(['str', 'dex', 'con', 'int', 'wis', 'cha'],\n  fieldOf('attributes.{attribute}.base', x) >= 18 ? 2\n    : fieldOf('attributes.{attribute}.base', x) >= 14 ? 1\n    : fieldOf('attributes.{attribute}.base', x) >= 8 ? 0\n    : fieldOf('attributes.{attribute}.base', x) >= 4 ? -1 : -2)": {
+      "text": "sumList(['str', 'dex', 'con', 'int', 'wis', 'cha'], fieldOf('attributes.{attribute}.base', x) >= 18 ? 2 : fieldOf('attributes.{attribute}.base', x) >= 14 ? 1 : fieldOf('attributes.{attribute}.base', x) >= 8 ? 0 : fieldOf('attributes.{attribute}.base', x) >= 4 ? -1 : -2)",
+      "tree": {
+        "type": "call",
+        "fn": "sumList",
+        "args": [
+          {
+            "type": "list",
+            "items": [
+              {
+                "type": "string",
+                "value": "str"
+              },
+              {
+                "type": "string",
+                "value": "dex"
+              },
+              {
+                "type": "string",
+                "value": "con"
+              },
+              {
+                "type": "string",
+                "value": "int"
+              },
+              {
+                "type": "string",
+                "value": "wis"
+              },
+              {
+                "type": "string",
+                "value": "cha"
+              }
+            ]
+          },
+          {
+            "type": "conditional",
+            "test": {
+              "type": "binary",
+              "op": ">=",
+              "left": {
+                "type": "call",
+                "fn": "fieldOf",
+                "args": [
+                  {
+                    "type": "string",
+                    "value": "attributes.{attribute}.base"
+                  },
+                  {
+                    "type": "name",
+                    "path": [
+                      "x"
+                    ]
+                  }
+                ]
+              },
+              "right": {
+                "type": "int",
+                "value": 18
+              }
+            },
+            "then": {
+              "type": "int",
+              "value": 2
+            },
+            "else": {
+              "type": "conditional",
+              "test": {
+                "type": "binary",
+                "op": ">=",
+                "left": {
+                  "type": "call",
+                  "fn": "fieldOf",
+                  "args": [
+                    {
+                      "type": "string",
+                      "value": "attributes.{attribute}.base"
+                    },
+                    {
+                      "type": "name",
+                      "path": [
+                        "x"
+                      ]
+                    }
+                  ]
+                },
+                "right": {
+                  "type": "int",
+                  "value": 14
+                }
+              },
+              "then": {
+                "type": "int",
+                "value": 1
+              },
+              "else": {
+                "type": "conditional",
+                "test": {
+                  "type": "binary",
+                  "op": ">=",
+                  "left": {
+                    "type": "call",
+                    "fn": "fieldOf",
+                    "args": [
+                      {
+                        "type": "string",
+                        "value": "attributes.{attribute}.base"
+                      },
+                      {
+                        "type": "name",
+                        "path": [
+                          "x"
+                        ]
+                      }
+                    ]
+                  },
+                  "right": {
+                    "type": "int",
+                    "value": 8
+                  }
+                },
+                "then": {
+                  "type": "int",
+                  "value": 0
+                },
+                "else": {
+                  "type": "conditional",
+                  "test": {
+                    "type": "binary",
+                    "op": ">=",
+                    "left": {
+                      "type": "call",
+                      "fn": "fieldOf",
+                      "args": [
+                        {
+                          "type": "string",
+                          "value": "attributes.{attribute}.base"
+                        },
+                        {
+                          "type": "name",
+                          "path": [
+                            "x"
+                          ]
+                        }
+                      ]
+                    },
+                    "right": {
+                      "type": "int",
+                      "value": 4
+                    }
+                  },
+                  "then": {
+                    "type": "unary",
+                    "op": "-",
+                    "operand": {
+                      "type": "int",
+                      "value": 1
+                    }
+                  },
+                  "else": {
+                    "type": "unary",
+                    "op": "-",
+                    "operand": {
+                      "type": "int",
+                      "value": 2
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
     "underdog": {
       "text": "underdog",
       "tree": {