@opencharacter/5e-srd-5.1 0.1.0 → 0.2.0

package/dist/release.json

@@ -1,8 +1,8 @@
 {
   "manifest": {
     "id": "5e-srd-5.1",
-    "version": "0.1.0",
-    "specVersion": "0.1.0",
+    "version": "0.2.0",
+    "specVersion": "0.2.0",
     "license": "CC-BY-4.0",
     "credit": "This work includes material taken from the System Reference Document 5.1 (“SRD 5.1”) by Wizards of the Coast LLC and available at https://dnd.wizards.com/resources/systems-reference-document. The SRD 5.1 is licensed under the Creative Commons Attribution 4.0 International License available at https://creativecommons.org/licenses/by/4.0/legalcode.",
     "defaultLanguage": "en"
@@ -717,10 +717,6 @@
         "type": "integer",
         "formula": "level.total >= 17 ? 4 : level.total >= 11 ? 3 : level.total >= 5 ? 2 : 1"
       },
-      "eldritchBlast.range": {
-        "type": "integer",
-        "formula": 120
-      },
       "eldritchBlast.push": {
         "type": "integer",
         "formula": 0
@@ -3313,6 +3309,7 @@
         "results": [
           "breathed"
         ],
+        "available": "!self.used",
         "participants": {
           "target": {}
         },
@@ -3372,6 +3369,18 @@
               }
             ]
           },
+          {
+            "id": "spend",
+            "kind": "changes",
+            "changes": [
+              {
+                "type": "setState",
+                "pick": "self",
+                "key": "used",
+                "value": true
+              }
+            ]
+          },
           {
             "id": "result",
             "kind": "outcome",
@@ -3424,7 +3433,9 @@
               {
                 "type": "choose",
                 "path": {
-                  "entry": "race",
+                  "entry": {
+                    "formula": "steps.race.added[0]"
+                  },
                   "choice": [
                     "subrace"
                   ]
@@ -3819,7 +3830,9 @@
               {
                 "type": "choose",
                 "path": {
-                  "entry": "race",
+                  "entry": {
+                    "formula": "steps.race.added[0]"
+                  },
                   "choice": [
                     "subrace"
                   ]
@@ -4746,7 +4759,9 @@
                 "type": "choose",
                 "when": "has(steps.monster.item.startingForm)",
                 "path": {
-                  "entry": "monster",
+                  "entry": {
+                    "formula": "steps.monster.added[0]"
+                  },
                   "choice": [
                     "form"
                   ]
@@ -6058,20 +6073,18 @@
               },
               {
                 "type": "setState",
-                "when": "countCopies(has(copy.state.hellishRebukeUsed) && copy.state.hellishRebukeUsed) > 0",
-                "copies": {
-                  "type": "race",
-                  "where": "has(self.hellishRebukeUsed) && self.hellishRebukeUsed"
+                "when": "countCopies(copy.item == @races.tiefling) > 0",
+                "grants": {
+                  "where": "item.id == @traits.infernal-legacy && self.hellishRebukeUsed"
                 },
                 "key": "hellishRebukeUsed",
                 "value": false
               },
               {
                 "type": "setState",
-                "when": "countCopies(has(copy.state.darknessUsed) && copy.state.darknessUsed) > 0",
-                "copies": {
-                  "type": "race",
-                  "where": "has(self.darknessUsed) && self.darknessUsed"
+                "when": "countCopies(copy.item == @races.tiefling) > 0",
+                "grants": {
+                  "where": "item.id == @traits.infernal-legacy && self.darknessUsed"
                 },
                 "key": "darknessUsed",
                 "value": false
@@ -6088,12 +6101,11 @@
               },
               {
                 "type": "setState",
-                "when": "countCopies(has(copy.state.relentlessEnduranceUsed)\n  && copy.state.relentlessEnduranceUsed) > 0",
-                "copies": {
-                  "type": "race",
-                  "where": "has(self.relentlessEnduranceUsed) && self.relentlessEnduranceUsed"
+                "when": "countCopies(copy.item == @races.half-orc) > 0",
+                "grants": {
+                  "where": "item.id == @traits.relentless-endurance && self.used"
                 },
-                "key": "relentlessEnduranceUsed",
+                "key": "used",
                 "value": false
               },
               {
@@ -6118,72 +6130,20 @@
               },
               {
                 "type": "setState",
-                "when": "countCopies(has(copy.state.bewitchingWhispersUsed) && copy.state.bewitchingWhispersUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.bewitchingWhispersUsed) && self.bewitchingWhispersUsed"
-                },
-                "key": "bewitchingWhispersUsed",
-                "value": false
-              },
-              {
-                "type": "setState",
-                "when": "countCopies(has(copy.state.dreadfulWordUsed) && copy.state.dreadfulWordUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.dreadfulWordUsed) && self.dreadfulWordUsed"
-                },
-                "key": "dreadfulWordUsed",
-                "value": false
-              },
-              {
-                "type": "setState",
-                "when": "countCopies(has(copy.state.minionsOfChaosUsed) && copy.state.minionsOfChaosUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.minionsOfChaosUsed) && self.minionsOfChaosUsed"
+                "when": "countCopies(copy.item == @classes.warlock) > 0",
+                "picks": {
+                  "where": "item.type == 'invocation' && self.used"
                 },
-                "key": "minionsOfChaosUsed",
-                "value": false
-              },
-              {
-                "type": "setState",
-                "when": "countCopies(has(copy.state.mireTheMindUsed) && copy.state.mireTheMindUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.mireTheMindUsed) && self.mireTheMindUsed"
-                },
-                "key": "mireTheMindUsed",
-                "value": false
-              },
-              {
-                "type": "setState",
-                "when": "countCopies(has(copy.state.sculptorOfFleshUsed) && copy.state.sculptorOfFleshUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.sculptorOfFleshUsed) && self.sculptorOfFleshUsed"
-                },
-                "key": "sculptorOfFleshUsed",
-                "value": false
-              },
-              {
-                "type": "setState",
-                "when": "countCopies(has(copy.state.signOfIllOmenUsed) && copy.state.signOfIllOmenUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.signOfIllOmenUsed) && self.signOfIllOmenUsed"
-                },
-                "key": "signOfIllOmenUsed",
+                "key": "used",
                 "value": false
               },
               {
                 "type": "setState",
-                "when": "countCopies(has(copy.state.thiefOfFiveFatesUsed) && copy.state.thiefOfFiveFatesUsed) > 0",
-                "copies": {
-                  "type": "class",
-                  "where": "has(self.thiefOfFiveFatesUsed) && self.thiefOfFiveFatesUsed"
+                "when": "countCopies(copy.item == @races.dragonborn) > 0",
+                "picks": {
+                  "where": "item.type == 'draconicAncestry' && self.used"
                 },
-                "key": "thiefOfFiveFatesUsed",
+                "key": "used",
                 "value": false
               },
               {
@@ -7250,6 +7210,15 @@
                 "key": "signatureSpell2Used",
                 "value": false
               },
+              {
+                "type": "setState",
+                "when": "countCopies(copy.item == @races.dragonborn) > 0",
+                "picks": {
+                  "where": "item.type == 'draconicAncestry' && self.used"
+                },
+                "key": "used",
+                "value": false
+              },
               {
                 "type": "setState",
                 "when": "countCopies(copy.type == 'monsterAction') > 0",
@@ -11305,13 +11274,6 @@
           "priority": 1,
           "showWhen": "@spells.eldritch-blast in spells.warlock"
         },
-        "eldritchBlast.range": {
-          "groups": [
-            "class-features"
-          ],
-          "priority": 2,
-          "showWhen": "@spells.eldritch-blast in spells.warlock"
-        },
         "eldritchBlast.push": {
           "groups": [
             "class-features"
@@ -13641,6 +13603,12 @@
             "required": true
           }
         },
+        "state": {
+          "used": {
+            "type": "boolean",
+            "default": false
+          }
+        },
         "actions": [
           {
             "use": "breath-weapon"
@@ -17187,34 +17155,6 @@
         "hurlThroughHellUsed": {
           "type": "boolean",
           "default": false
-        },
-        "bewitchingWhispersUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "dreadfulWordUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "minionsOfChaosUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "mireTheMindUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "sculptorOfFleshUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "signOfIllOmenUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "thiefOfFiveFatesUsed": {
-          "type": "boolean",
-          "default": false
         }
       },
       "prerequisites": [
@@ -20363,97 +20303,42 @@
             "feature"
           ],
           "results": [
-            "recovered",
-            "too-many"
+            "recovered"
           ],
-          "available": "!self.naturalRecoveryUsed",
-          "params": {
-            "level1": {
-              "type": "integer",
-              "optional": true,
-              "min": 0
-            },
-            "level2": {
-              "type": "integer",
-              "optional": true,
-              "min": 0
-            },
-            "level3": {
-              "type": "integer",
-              "optional": true,
-              "min": 0
-            },
-            "level4": {
-              "type": "integer",
-              "optional": true,
-              "min": 0
-            },
-            "level5": {
-              "type": "integer",
-              "optional": true,
-              "min": 0
-            }
-          },
+          "available": "!self.naturalRecoveryUsed\n  && spellSlots.level1.used + spellSlots.level2.used + spellSlots.level3.used\n    + spellSlots.level4.used + spellSlots.level5.used > 0",
           "steps": [
             {
-              "id": "count",
-              "kind": "branch",
-              "cases": [
+              "id": "slots",
+              "kind": "choice",
+              "options": {
+                "values": [
+                  1,
+                  2,
+                  3,
+                  4,
+                  5
+                ],
+                "where": "picks < fieldOf('spellSlots.level{slot}.used', value)\n  && value + sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)\n    <= ceil(self.level / 2)"
+              },
+              "repeat": {
+                "max": "ceil(self.level / 2)",
+                "min": 1
+              },
+              "prefer": "value",
+              "changes": [
                 {
-                  "when": true,
-                  "flags": {
-                    "l1": "has(params.level1) ? params.level1 : 0",
-                    "l2": "has(params.level2) ? params.level2 : 0",
-                    "l3": "has(params.level3) ? params.level3 : 0",
-                    "l4": "has(params.level4) ? params.level4 : 0",
-                    "l5": "has(params.level5) ? params.level5 : 0"
-                  }
+                  "type": "adjust",
+                  "field": {
+                    "formula": "'spellSlots.level' + string(picked.value) + '.used'"
+                  },
+                  "by": -1
                 }
               ]
             },
-            {
-              "id": "tooMany",
-              "kind": "outcome",
-              "when": "flags.l1 + 2 * flags.l2 + 3 * flags.l3 + 4 * flags.l4 + 5 * flags.l5 > ceil(self.level / 2)",
-              "result": "'too-many'",
-              "data": {
-                "limit": "ceil(self.level / 2)"
-              }
-            },
             {
               "id": "recover",
               "kind": "changes",
               "changes": [
-                {
-                  "type": "set",
-                  "field": "spellSlots.level1.used",
-                  "value": "max(0, spellSlots.level1.used - flags.l1)",
-                  "when": "flags.l1 > 0"
-                },
-                {
-                  "type": "set",
-                  "field": "spellSlots.level2.used",
-                  "value": "max(0, spellSlots.level2.used - flags.l2)",
-                  "when": "flags.l2 > 0"
-                },
-                {
-                  "type": "set",
-                  "field": "spellSlots.level3.used",
-                  "value": "max(0, spellSlots.level3.used - flags.l3)",
-                  "when": "flags.l3 > 0"
-                },
-                {
-                  "type": "set",
-                  "field": "spellSlots.level4.used",
-                  "value": "max(0, spellSlots.level4.used - flags.l4)",
-                  "when": "flags.l4 > 0"
-                },
-                {
-                  "type": "set",
-                  "field": "spellSlots.level5.used",
-                  "value": "max(0, spellSlots.level5.used - flags.l5)",
-                  "when": "flags.l5 > 0"
-                },
                 {
                   "type": "setState",
                   "entry": "self",
@@ -20465,7 +20350,10 @@
             {
               "id": "result",
               "kind": "outcome",
-              "result": "'recovered'"
+              "result": "'recovered'",
+              "data": {
+                "levels": "sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)"
+              }
             }
           ]
         }
@@ -24835,70 +24723,38 @@
             "feature"
           ],
           "results": [
-            "too-many",
             "recovered"
           ],
-          "available": "!self.arcaneRecoveryUsed",
-          "params": {
-            "level1": {
-              "type": "integer",
-              "optional": true
-            },
-            "level2": {
-              "type": "integer",
-              "optional": true
-            },
-            "level3": {
-              "type": "integer",
-              "optional": true
-            },
-            "level4": {
-              "type": "integer",
-              "optional": true
-            },
-            "level5": {
-              "type": "integer",
-              "optional": true
-            }
-          },
+          "available": "!self.arcaneRecoveryUsed\n  && spellSlots.level1.used + spellSlots.level2.used + spellSlots.level3.used\n    + spellSlots.level4.used + spellSlots.level5.used > 0",
           "steps": [
             {
-              "id": "counts",
-              "kind": "branch",
-              "cases": [
-                {
-                  "when": true,
-                  "flags": {
-                    "level1": "has(params.level1) ? params.level1 : 0",
-                    "level2": "has(params.level2) ? params.level2 : 0",
-                    "level3": "has(params.level3) ? params.level3 : 0",
-                    "level4": "has(params.level4) ? params.level4 : 0",
-                    "level5": "has(params.level5) ? params.level5 : 0"
-                  }
-                }
-              ]
-            },
-            {
-              "id": "total",
-              "kind": "branch",
-              "cases": [
+              "id": "slots",
+              "kind": "choice",
+              "options": {
+                "values": [
+                  1,
+                  2,
+                  3,
+                  4,
+                  5
+                ],
+                "where": "picks < fieldOf('spellSlots.level{slot}.used', value)\n  && value + sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)\n    <= ceil(self.level / 2)"
+              },
+              "repeat": {
+                "max": "ceil(self.level / 2)",
+                "min": 1
+              },
+              "prefer": "value",
+              "changes": [
                 {
-                  "when": true,
-                  "flags": {
-                    "levels": "flags.level1 + 2 * flags.level2 + 3 * flags.level3 + 4 * flags.level4 + 5 * flags.level5"
-                  }
+                  "type": "adjust",
+                  "field": {
+                    "formula": "'spellSlots.level' + string(picked.value) + '.used'"
+                  },
+                  "by": -1
                 }
               ]
             },
-            {
-              "id": "tooMany",
-              "kind": "outcome",
-              "when": "flags.levels == 0 || flags.levels > ceil(self.level / 2)\n  || flags.level1 < 0 || flags.level1 > spellSlots.level1.used\n  || flags.level2 < 0 || flags.level2 > spellSlots.level2.used\n  || flags.level3 < 0 || flags.level3 > spellSlots.level3.used\n  || flags.level4 < 0 || flags.level4 > spellSlots.level4.used\n  || flags.level5 < 0 || flags.level5 > spellSlots.level5.used",
-              "result": "'too-many'",
-              "data": {
-                "maxLevels": "ceil(self.level / 2)"
-              }
-            },
             {
               "id": "recover",
               "kind": "changes",
@@ -24908,36 +24764,6 @@
                   "entry": "self",
                   "key": "arcaneRecoveryUsed",
                   "value": true
-                },
-                {
-                  "type": "adjust",
-                  "field": "spellSlots.level1.used",
-                  "by": "-flags.level1",
-                  "when": "flags.level1 > 0"
-                },
-                {
-                  "type": "adjust",
-                  "field": "spellSlots.level2.used",
-                  "by": "-flags.level2",
-                  "when": "flags.level2 > 0"
-                },
-                {
-                  "type": "adjust",
-                  "field": "spellSlots.level3.used",
-                  "by": "-flags.level3",
-                  "when": "flags.level3 > 0"
-                },
-                {
-                  "type": "adjust",
-                  "field": "spellSlots.level4.used",
-                  "by": "-flags.level4",
-                  "when": "flags.level4 > 0"
-                },
-                {
-                  "type": "adjust",
-                  "field": "spellSlots.level5.used",
-                  "by": "-flags.level5",
-                  "when": "flags.level5 > 0"
                 }
               ]
             },
@@ -24946,7 +24772,7 @@
               "kind": "outcome",
               "result": "'recovered'",
               "data": {
-                "levels": "flags.levels"
+                "levels": "sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)"
               }
             }
           ]
@@ -27648,6 +27474,12 @@
     {
       "id": "invocations.bewitching-whispers",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "prerequisites": [
         {
           "id": "level",
@@ -27681,7 +27513,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.compulsion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.bewitchingWhispersUsed",
+          "when": "action.item.id == @spells.compulsion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -27692,8 +27524,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "bewitchingWhispersUsed",
+                "picks": {
+                  "where": "item.id == @invocations.bewitching-whispers"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -27772,6 +27606,12 @@
     {
       "id": "invocations.dreadful-word",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "prerequisites": [
         {
           "id": "level",
@@ -27805,7 +27645,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.confusion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.dreadfulWordUsed",
+          "when": "action.item.id == @spells.confusion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -27816,8 +27656,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "dreadfulWordUsed",
+                "picks": {
+                  "where": "item.id == @invocations.dreadful-word"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -27852,11 +27694,13 @@
           "when": "@spells.eldritch-blast in spells.warlock"
         }
       ],
-      "effects": [
+      "keepsTemplates": [
         {
-          "target": "eldritchBlast.range",
-          "op": "atLeast",
-          "value": 300
+          "template": "templates.eldritch-spear",
+          "content": {
+            "type": "spell",
+            "where": "item.id == @spells.eldritch-blast"
+          }
         }
       ]
     },
@@ -27960,6 +27804,12 @@
     {
       "id": "invocations.minions-of-chaos",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "prerequisites": [
         {
           "id": "level",
@@ -27993,7 +27843,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.conjure-elemental && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.minionsOfChaosUsed",
+          "when": "action.item.id == @spells.conjure-elemental && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -28004,8 +27854,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "minionsOfChaosUsed",
+                "picks": {
+                  "where": "item.id == @invocations.minions-of-chaos"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -28016,6 +27868,12 @@
     {
       "id": "invocations.mire-the-mind",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "prerequisites": [
         {
           "id": "level",
@@ -28049,7 +27907,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.slow && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.mireTheMindUsed",
+          "when": "action.item.id == @spells.slow && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -28060,8 +27918,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "mireTheMindUsed",
+                "picks": {
+                  "where": "item.id == @invocations.mire-the-mind"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -28141,6 +28001,12 @@
     {
       "id": "invocations.sculptor-of-flesh",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "prerequisites": [
         {
           "id": "level",
@@ -28174,7 +28040,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.polymorph && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.sculptorOfFleshUsed",
+          "when": "action.item.id == @spells.polymorph && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -28185,8 +28051,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "sculptorOfFleshUsed",
+                "picks": {
+                  "where": "item.id == @invocations.sculptor-of-flesh"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -28197,6 +28065,12 @@
     {
       "id": "invocations.sign-of-ill-omen",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "prerequisites": [
         {
           "id": "level",
@@ -28230,7 +28104,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.bestow-curse && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.signOfIllOmenUsed",
+          "when": "action.item.id == @spells.bestow-curse && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -28241,8 +28115,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "signOfIllOmenUsed",
+                "picks": {
+                  "where": "item.id == @invocations.sign-of-ill-omen"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -28253,6 +28129,12 @@
     {
       "id": "invocations.thief-of-five-fates",
       "type": "invocation",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "grants": [
         {
           "item": "spells.bane"
@@ -28280,7 +28162,7 @@
             ]
           },
           "op": "option",
-          "when": "action.item.id == @spells.bane && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.thiefOfFiveFatesUsed",
+          "when": "action.item.id == @spells.bane && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used",
           "value": {
             "id": "invocation",
             "changes": [
@@ -28291,8 +28173,10 @@
               },
               {
                 "type": "setState",
-                "entry": "self",
-                "key": "thiefOfFiveFatesUsed",
+                "picks": {
+                  "where": "item.id == @invocations.thief-of-five-fates"
+                },
+                "key": "used",
                 "value": true
               }
             ]
@@ -82511,12 +82395,6 @@
         "speed": 30,
         "size": "medium"
       },
-      "state": {
-        "relentlessEnduranceUsed": {
-          "type": "boolean",
-          "default": false
-        }
-      },
       "effects": [
         {
           "target": "abilities.str.base",
@@ -82646,16 +82524,6 @@
         "speed": 30,
         "size": "medium"
       },
-      "state": {
-        "hellishRebukeUsed": {
-          "type": "boolean",
-          "default": false
-        },
-        "darknessUsed": {
-          "type": "boolean",
-          "default": false
-        }
-      },
       "effects": [
         {
           "target": "abilities.int.base",
@@ -84817,12 +84685,42 @@
         "somatic": true,
         "material": false,
         "durationUnit": "hour",
-        "durationAmount": 8
+        "durationAmount": 8,
+        "applied": true
       },
       "actions": [
         {
           "use": "cast-spell"
         }
+      ],
+      "effects": [
+        {
+          "id": "ward",
+          "target": {
+            "incoming": {
+              "fields": [
+                "hp.current"
+              ],
+              "tags": [
+                "damage"
+              ]
+            }
+          },
+          "op": "atLeast",
+          "value": "-(hp.current + hp.temp - 1)",
+          "when": "hp.current > 0 && hp.current + hp.temp + incoming.amount <= 0",
+          "scope": "applied",
+          "duration": {
+            "amount": 8,
+            "unit": "hour"
+          },
+          "then": [
+            {
+              "type": "removeEffect",
+              "entry": "self"
+            }
+          ]
+        }
       ]
     },
     {
@@ -85548,7 +85446,7 @@
               "data": {
                 "critical": "flags.critical",
                 "attack": "steps.attack.total",
-                "range": "eldritchBlast.range",
+                "range": "item.range",
                 "push": "has(steps.damage) ? eldritchBlast.push : 0"
               }
             }
@@ -93277,6 +93175,16 @@
         }
       ]
     },
+    {
+      "id": "templates.eldritch-spear",
+      "type": "template",
+      "appliesTo": {
+        "type": "spell"
+      },
+      "fields": {
+        "range": 300
+      }
+    },
     {
       "id": "tools.alchemists-supplies",
       "type": "tool",
@@ -93924,6 +93832,16 @@
     {
       "id": "traits.infernal-legacy",
       "type": "trait",
+      "state": {
+        "hellishRebukeUsed": {
+          "type": "boolean",
+          "default": false
+        },
+        "darknessUsed": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "effects": [
         {
           "target": "spellcasting.racial.mod",
@@ -94012,7 +93930,9 @@
             "changes": [
               {
                 "type": "setState",
-                "entry": "self",
+                "grants": {
+                  "where": "item.id == @traits.infernal-legacy"
+                },
                 "key": "hellishRebukeUsed",
                 "value": true
               }
@@ -94036,7 +93956,9 @@
             "changes": [
               {
                 "type": "setState",
-                "entry": "self",
+                "grants": {
+                  "where": "item.id == @traits.infernal-legacy"
+                },
                 "key": "darknessUsed",
                 "value": true
               }
@@ -94116,11 +94038,17 @@
     {
       "id": "traits.relentless-endurance",
       "type": "trait",
+      "state": {
+        "used": {
+          "type": "boolean",
+          "default": false
+        }
+      },
       "followUps": [
         {
           "id": "relentless-endurance",
           "becomes": "hp.current == 0",
-          "when": "countCopies(has(copy.state.relentlessEnduranceUsed)\n  && !copy.state.relentlessEnduranceUsed) > 0",
+          "when": "!self.used",
           "action": "relentless-endurance"
         }
       ],
@@ -94133,7 +94061,7 @@
           "results": [
             "endured"
           ],
-          "available": "hp.current == 0 && countCopies(has(copy.state.relentlessEnduranceUsed)\n  && !copy.state.relentlessEnduranceUsed) > 0",
+          "available": "hp.current == 0 && !self.used",
           "steps": [
             {
               "id": "endure",
@@ -94146,11 +94074,8 @@
                 },
                 {
                   "type": "setState",
-                  "copies": {
-                    "type": "race",
-                    "where": "has(self.relentlessEnduranceUsed)"
-                  },
-                  "key": "relentlessEnduranceUsed",
+                  "grant": "self",
+                  "key": "used",
                   "value": true
                 }
               ]
@@ -95109,7 +95034,97 @@
       }
     }
   ],
-  "upgrades": [],
+  "upgrades": [
+    {
+      "pack": "5e-srd-5.1",
+      "from": "0.1.0",
+      "to": "0.2.0",
+      "steps": [
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "bewitchingWhispersUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.bewitching-whispers"
+        },
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "dreadfulWordUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.dreadful-word"
+        },
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "minionsOfChaosUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.minions-of-chaos"
+        },
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "mireTheMindUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.mire-the-mind"
+        },
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "sculptorOfFleshUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.sculptor-of-flesh"
+        },
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "signOfIllOmenUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.sign-of-ill-omen"
+        },
+        {
+          "op": "moveState",
+          "type": "class",
+          "from": "thiefOfFiveFatesUsed",
+          "to": "used",
+          "owner": "features.warlock.eldritch-invocations",
+          "choice": "invocations",
+          "option": "invocations.thief-of-five-fates"
+        },
+        {
+          "op": "moveState",
+          "type": "race",
+          "from": "relentlessEnduranceUsed",
+          "to": "used",
+          "grant": "traits.relentless-endurance"
+        },
+        {
+          "op": "moveState",
+          "type": "race",
+          "from": "hellishRebukeUsed",
+          "grant": "traits.infernal-legacy"
+        },
+        {
+          "op": "moveState",
+          "type": "race",
+          "from": "darknessUsed",
+          "grant": "traits.infernal-legacy"
+        }
+      ]
+    }
+  ],
   "formulas": {
     "1": {
       "text": "1",
@@ -96552,17 +96567,85 @@
         }
       }
     },
-    "!self.arcaneRecoveryUsed": {
-      "text": "!self.arcaneRecoveryUsed",
+    "!self.arcaneRecoveryUsed\n  && spellSlots.level1.used + spellSlots.level2.used + spellSlots.level3.used\n    + spellSlots.level4.used + spellSlots.level5.used > 0": {
+      "text": "!self.arcaneRecoveryUsed && spellSlots.level1.used + spellSlots.level2.used + spellSlots.level3.used + spellSlots.level4.used + spellSlots.level5.used > 0",
       "tree": {
-        "type": "unary",
-        "op": "!",
-        "operand": {
-          "type": "name",
-          "path": [
-            "self",
-            "arcaneRecoveryUsed"
-          ]
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "unary",
+          "op": "!",
+          "operand": {
+            "type": "name",
+            "path": [
+              "self",
+              "arcaneRecoveryUsed"
+            ]
+          }
+        },
+        "right": {
+          "type": "binary",
+          "op": ">",
+          "left": {
+            "type": "binary",
+            "op": "+",
+            "left": {
+              "type": "binary",
+              "op": "+",
+              "left": {
+                "type": "binary",
+                "op": "+",
+                "left": {
+                  "type": "binary",
+                  "op": "+",
+                  "left": {
+                    "type": "name",
+                    "path": [
+                      "spellSlots",
+                      "level1",
+                      "used"
+                    ]
+                  },
+                  "right": {
+                    "type": "name",
+                    "path": [
+                      "spellSlots",
+                      "level2",
+                      "used"
+                    ]
+                  }
+                },
+                "right": {
+                  "type": "name",
+                  "path": [
+                    "spellSlots",
+                    "level3",
+                    "used"
+                  ]
+                }
+              },
+              "right": {
+                "type": "name",
+                "path": [
+                  "spellSlots",
+                  "level4",
+                  "used"
+                ]
+              }
+            },
+            "right": {
+              "type": "name",
+              "path": [
+                "spellSlots",
+                "level5",
+                "used"
+              ]
+            }
+          },
+          "right": {
+            "type": "int",
+            "value": 0
+          }
         }
       }
     },
@@ -96641,17 +96724,85 @@
         }
       }
     },
-    "!self.naturalRecoveryUsed": {
-      "text": "!self.naturalRecoveryUsed",
+    "!self.naturalRecoveryUsed\n  && spellSlots.level1.used + spellSlots.level2.used + spellSlots.level3.used\n    + spellSlots.level4.used + spellSlots.level5.used > 0": {
+      "text": "!self.naturalRecoveryUsed && spellSlots.level1.used + spellSlots.level2.used + spellSlots.level3.used + spellSlots.level4.used + spellSlots.level5.used > 0",
       "tree": {
-        "type": "unary",
-        "op": "!",
-        "operand": {
-          "type": "name",
-          "path": [
-            "self",
-            "naturalRecoveryUsed"
-          ]
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "unary",
+          "op": "!",
+          "operand": {
+            "type": "name",
+            "path": [
+              "self",
+              "naturalRecoveryUsed"
+            ]
+          }
+        },
+        "right": {
+          "type": "binary",
+          "op": ">",
+          "left": {
+            "type": "binary",
+            "op": "+",
+            "left": {
+              "type": "binary",
+              "op": "+",
+              "left": {
+                "type": "binary",
+                "op": "+",
+                "left": {
+                  "type": "binary",
+                  "op": "+",
+                  "left": {
+                    "type": "name",
+                    "path": [
+                      "spellSlots",
+                      "level1",
+                      "used"
+                    ]
+                  },
+                  "right": {
+                    "type": "name",
+                    "path": [
+                      "spellSlots",
+                      "level2",
+                      "used"
+                    ]
+                  }
+                },
+                "right": {
+                  "type": "name",
+                  "path": [
+                    "spellSlots",
+                    "level3",
+                    "used"
+                  ]
+                }
+              },
+              "right": {
+                "type": "name",
+                "path": [
+                  "spellSlots",
+                  "level4",
+                  "used"
+                ]
+              }
+            },
+            "right": {
+              "type": "name",
+              "path": [
+                "spellSlots",
+                "level5",
+                "used"
+              ]
+            }
+          },
+          "right": {
+            "type": "int",
+            "value": 0
+          }
         }
       }
     },
@@ -96711,6 +96862,20 @@
         }
       }
     },
+    "!self.used": {
+      "text": "!self.used",
+      "tree": {
+        "type": "unary",
+        "op": "!",
+        "operand": {
+          "type": "name",
+          "path": [
+            "self",
+            "used"
+          ]
+        }
+      }
+    },
     "!self.wholenessUsed": {
       "text": "!self.wholenessUsed",
       "tree": {
@@ -101363,6 +101528,38 @@
         }
       }
     },
+    "'spellSlots.level' + string(picked.value) + '.used'": {
+      "text": "'spellSlots.level' + string(picked.value) + '.used'",
+      "tree": {
+        "type": "binary",
+        "op": "+",
+        "left": {
+          "type": "binary",
+          "op": "+",
+          "left": {
+            "type": "string",
+            "value": "spellSlots.level"
+          },
+          "right": {
+            "type": "call",
+            "fn": "string",
+            "args": [
+              {
+                "type": "name",
+                "path": [
+                  "picked",
+                  "value"
+                ]
+              }
+            ]
+          }
+        },
+        "right": {
+          "type": "string",
+          "value": ".used"
+        }
+      }
+    },
     "'spent'": {
       "text": "'spent'",
       "tree": {
@@ -101523,13 +101720,6 @@
         "value": "tiny"
       }
     },
-    "'too-many'": {
-      "text": "'too-many'",
-      "tree": {
-        "type": "string",
-        "value": "too-many"
-      }
-    },
     "'tools.disguise-kit'": {
       "text": "'tools.disguise-kit'",
       "tree": {
@@ -117400,6 +117590,39 @@
         }
       }
     },
+    "-(hp.current + hp.temp - 1)": {
+      "text": "-(hp.current + hp.temp - 1)",
+      "tree": {
+        "type": "unary",
+        "op": "-",
+        "operand": {
+          "type": "binary",
+          "op": "-",
+          "left": {
+            "type": "binary",
+            "op": "+",
+            "left": {
+              "type": "name",
+              "path": [
+                "hp",
+                "current"
+              ]
+            },
+            "right": {
+              "type": "name",
+              "path": [
+                "hp",
+                "temp"
+              ]
+            }
+          },
+          "right": {
+            "type": "int",
+            "value": 1
+          }
+        }
+      }
+    },
     "-1d4": {
       "text": "-1d4",
       "tree": {
@@ -117427,76 +117650,6 @@
         }
       }
     },
-    "-flags.level1": {
-      "text": "-flags.level1",
-      "tree": {
-        "type": "unary",
-        "op": "-",
-        "operand": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level1"
-          ]
-        }
-      }
-    },
-    "-flags.level2": {
-      "text": "-flags.level2",
-      "tree": {
-        "type": "unary",
-        "op": "-",
-        "operand": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level2"
-          ]
-        }
-      }
-    },
-    "-flags.level3": {
-      "text": "-flags.level3",
-      "tree": {
-        "type": "unary",
-        "op": "-",
-        "operand": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level3"
-          ]
-        }
-      }
-    },
-    "-flags.level4": {
-      "text": "-flags.level4",
-      "tree": {
-        "type": "unary",
-        "op": "-",
-        "operand": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level4"
-          ]
-        }
-      }
-    },
-    "-flags.level5": {
-      "text": "-flags.level5",
-      "tree": {
-        "type": "unary",
-        "op": "-",
-        "operand": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level5"
-          ]
-        }
-      }
-    },
     "-flags.slot": {
       "text": "-flags.slot",
       "tree": {
@@ -126122,8 +126275,8 @@
         }
       }
     },
-    "action.item.id == @spells.bane && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.thiefOfFiveFatesUsed": {
-      "text": "action.item.id == @spells.bane && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.thiefOfFiveFatesUsed",
+    "action.item.id == @spells.bane && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.bane && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -126194,14 +126347,14 @@
             "type": "name",
             "path": [
               "self",
-              "thiefOfFiveFatesUsed"
+              "used"
             ]
           }
         }
       }
     },
-    "action.item.id == @spells.bestow-curse && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.signOfIllOmenUsed": {
-      "text": "action.item.id == @spells.bestow-curse && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.signOfIllOmenUsed",
+    "action.item.id == @spells.bestow-curse && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.bestow-curse && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -126272,14 +126425,14 @@
             "type": "name",
             "path": [
               "self",
-              "signOfIllOmenUsed"
+              "used"
             ]
           }
         }
       }
     },
-    "action.item.id == @spells.compulsion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.bewitchingWhispersUsed": {
-      "text": "action.item.id == @spells.compulsion && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.bewitchingWhispersUsed",
+    "action.item.id == @spells.compulsion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.compulsion && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -126350,7 +126503,7 @@
             "type": "name",
             "path": [
               "self",
-              "bewitchingWhispersUsed"
+              "used"
             ]
           }
         }
@@ -126573,8 +126726,8 @@
         }
       }
     },
-    "action.item.id == @spells.confusion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.dreadfulWordUsed": {
-      "text": "action.item.id == @spells.confusion && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.dreadfulWordUsed",
+    "action.item.id == @spells.confusion && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.confusion && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -126645,14 +126798,14 @@
             "type": "name",
             "path": [
               "self",
-              "dreadfulWordUsed"
+              "used"
             ]
           }
         }
       }
     },
-    "action.item.id == @spells.conjure-elemental && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.minionsOfChaosUsed": {
-      "text": "action.item.id == @spells.conjure-elemental && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.minionsOfChaosUsed",
+    "action.item.id == @spells.conjure-elemental && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.conjure-elemental && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -126723,7 +126876,7 @@
             "type": "name",
             "path": [
               "self",
-              "minionsOfChaosUsed"
+              "used"
             ]
           }
         }
@@ -127144,8 +127297,8 @@
         }
       }
     },
-    "action.item.id == @spells.polymorph && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.sculptorOfFleshUsed": {
-      "text": "action.item.id == @spells.polymorph && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.sculptorOfFleshUsed",
+    "action.item.id == @spells.polymorph && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.polymorph && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -127216,14 +127369,14 @@
             "type": "name",
             "path": [
               "self",
-              "sculptorOfFleshUsed"
+              "used"
             ]
           }
         }
       }
     },
-    "action.item.id == @spells.slow && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.mireTheMindUsed": {
-      "text": "action.item.id == @spells.slow && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.mireTheMindUsed",
+    "action.item.id == @spells.slow && flags.slot == pactSlots.level\n  && pactSlots.used < pactSlots.max && !self.used": {
+      "text": "action.item.id == @spells.slow && flags.slot == pactSlots.level && pactSlots.used < pactSlots.max && !self.used",
       "tree": {
         "type": "binary",
         "op": "&&",
@@ -127294,7 +127447,7 @@
             "type": "name",
             "path": [
               "self",
-              "mireTheMindUsed"
+              "used"
             ]
           }
         }
@@ -136835,6 +136988,38 @@
         }
       }
     },
+    "countCopies(copy.item == @classes.warlock) > 0": {
+      "text": "countCopies(copy.item == @classes.warlock) > 0",
+      "tree": {
+        "type": "binary",
+        "op": ">",
+        "left": {
+          "type": "call",
+          "fn": "countCopies",
+          "args": [
+            {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "name",
+                "path": [
+                  "copy",
+                  "item"
+                ]
+              },
+              "right": {
+                "type": "ref",
+                "id": "classes.warlock"
+              }
+            }
+          ]
+        },
+        "right": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
     "countCopies(copy.item == @magic-items.ring-of-x-ray-vision\n  && copy.state.used) > 0": {
       "text": "countCopies(copy.item == @magic-items.ring-of-x-ray-vision && copy.state.used) > 0",
       "tree": {
@@ -136879,6 +137064,102 @@
         }
       }
     },
+    "countCopies(copy.item == @races.dragonborn) > 0": {
+      "text": "countCopies(copy.item == @races.dragonborn) > 0",
+      "tree": {
+        "type": "binary",
+        "op": ">",
+        "left": {
+          "type": "call",
+          "fn": "countCopies",
+          "args": [
+            {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "name",
+                "path": [
+                  "copy",
+                  "item"
+                ]
+              },
+              "right": {
+                "type": "ref",
+                "id": "races.dragonborn"
+              }
+            }
+          ]
+        },
+        "right": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
+    "countCopies(copy.item == @races.half-orc) > 0": {
+      "text": "countCopies(copy.item == @races.half-orc) > 0",
+      "tree": {
+        "type": "binary",
+        "op": ">",
+        "left": {
+          "type": "call",
+          "fn": "countCopies",
+          "args": [
+            {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "name",
+                "path": [
+                  "copy",
+                  "item"
+                ]
+              },
+              "right": {
+                "type": "ref",
+                "id": "races.half-orc"
+              }
+            }
+          ]
+        },
+        "right": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
+    "countCopies(copy.item == @races.tiefling) > 0": {
+      "text": "countCopies(copy.item == @races.tiefling) > 0",
+      "tree": {
+        "type": "binary",
+        "op": ">",
+        "left": {
+          "type": "call",
+          "fn": "countCopies",
+          "args": [
+            {
+              "type": "binary",
+              "op": "==",
+              "left": {
+                "type": "name",
+                "path": [
+                  "copy",
+                  "item"
+                ]
+              },
+              "right": {
+                "type": "ref",
+                "id": "races.tiefling"
+              }
+            }
+          ]
+        },
+        "right": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
     "countCopies(copy.type == 'gear' && has(copy.state.quivered)\n  && copy.state.quivered && copy.fields.category != 'ammunition') == 0": {
       "text": "countCopies(copy.type == 'gear' && has(copy.state.quivered) && copy.state.quivered && copy.fields.category != 'ammunition') == 0",
       "tree": {
@@ -137420,49 +137701,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.bewitchingWhispersUsed) && copy.state.bewitchingWhispersUsed) > 0": {
-      "text": "countCopies(has(copy.state.bewitchingWhispersUsed) && copy.state.bewitchingWhispersUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "bewitchingWhispersUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "bewitchingWhispersUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.channelDivinitySpent) && copy.state.channelDivinitySpent > 0) > 0": {
       "text": "countCopies(has(copy.state.channelDivinitySpent) && copy.state.channelDivinitySpent > 0) > 0",
       "tree": {
@@ -137608,49 +137846,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.darknessUsed) && copy.state.darknessUsed) > 0": {
-      "text": "countCopies(has(copy.state.darknessUsed) && copy.state.darknessUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "darknessUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "darknessUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.divineIntervention) && copy.state.divineIntervention == 'failed') > 0": {
       "text": "countCopies(has(copy.state.divineIntervention) && copy.state.divineIntervention == 'failed') > 0",
       "tree": {
@@ -137753,49 +137948,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.dreadfulWordUsed) && copy.state.dreadfulWordUsed) > 0": {
-      "text": "countCopies(has(copy.state.dreadfulWordUsed) && copy.state.dreadfulWordUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "dreadfulWordUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "dreadfulWordUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.eldritchMasterUsed) && copy.state.eldritchMasterUsed) > 0": {
       "text": "countCopies(has(copy.state.eldritchMasterUsed) && copy.state.eldritchMasterUsed) > 0",
       "tree": {
@@ -137839,49 +137991,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.hellishRebukeUsed) && copy.state.hellishRebukeUsed) > 0": {
-      "text": "countCopies(has(copy.state.hellishRebukeUsed) && copy.state.hellishRebukeUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "hellishRebukeUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "hellishRebukeUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.holyNimbusUsed) && copy.state.holyNimbusUsed) > 0": {
       "text": "countCopies(has(copy.state.holyNimbusUsed) && copy.state.holyNimbusUsed) > 0",
       "tree": {
@@ -138121,92 +138230,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.minionsOfChaosUsed) && copy.state.minionsOfChaosUsed) > 0": {
-      "text": "countCopies(has(copy.state.minionsOfChaosUsed) && copy.state.minionsOfChaosUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "minionsOfChaosUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "minionsOfChaosUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "countCopies(has(copy.state.mireTheMindUsed) && copy.state.mireTheMindUsed) > 0": {
-      "text": "countCopies(has(copy.state.mireTheMindUsed) && copy.state.mireTheMindUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "mireTheMindUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "mireTheMindUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.naturalRecoveryUsed) && copy.state.naturalRecoveryUsed) > 0": {
       "text": "countCopies(has(copy.state.naturalRecoveryUsed) && copy.state.naturalRecoveryUsed) > 0",
       "tree": {
@@ -138352,96 +138375,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.relentlessEnduranceUsed)\n  && !copy.state.relentlessEnduranceUsed) > 0": {
-      "text": "countCopies(has(copy.state.relentlessEnduranceUsed) && !copy.state.relentlessEnduranceUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "relentlessEnduranceUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "unary",
-                "op": "!",
-                "operand": {
-                  "type": "name",
-                  "path": [
-                    "copy",
-                    "state",
-                    "relentlessEnduranceUsed"
-                  ]
-                }
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "countCopies(has(copy.state.relentlessEnduranceUsed)\n  && copy.state.relentlessEnduranceUsed) > 0": {
-      "text": "countCopies(has(copy.state.relentlessEnduranceUsed) && copy.state.relentlessEnduranceUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "relentlessEnduranceUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "relentlessEnduranceUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.relentlessRageSpent) && copy.state.relentlessRageSpent > 0) > 0": {
       "text": "countCopies(has(copy.state.relentlessRageSpent) && copy.state.relentlessRageSpent > 0) > 0",
       "tree": {
@@ -138493,49 +138426,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.sculptorOfFleshUsed) && copy.state.sculptorOfFleshUsed) > 0": {
-      "text": "countCopies(has(copy.state.sculptorOfFleshUsed) && copy.state.sculptorOfFleshUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "sculptorOfFleshUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "sculptorOfFleshUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.secondWindUsed) && copy.state.secondWindUsed) > 0": {
       "text": "countCopies(has(copy.state.secondWindUsed) && copy.state.secondWindUsed) > 0",
       "tree": {
@@ -138579,49 +138469,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.signOfIllOmenUsed) && copy.state.signOfIllOmenUsed) > 0": {
-      "text": "countCopies(has(copy.state.signOfIllOmenUsed) && copy.state.signOfIllOmenUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "signOfIllOmenUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "signOfIllOmenUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.signatureSpell1Used) && copy.state.signatureSpell1Used) > 0": {
       "text": "countCopies(has(copy.state.signatureSpell1Used) && copy.state.signatureSpell1Used) > 0",
       "tree": {
@@ -138891,49 +138738,6 @@
         }
       }
     },
-    "countCopies(has(copy.state.thiefOfFiveFatesUsed) && copy.state.thiefOfFiveFatesUsed) > 0": {
-      "text": "countCopies(has(copy.state.thiefOfFiveFatesUsed) && copy.state.thiefOfFiveFatesUsed) > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "call",
-          "fn": "countCopies",
-          "args": [
-            {
-              "type": "binary",
-              "op": "&&",
-              "left": {
-                "type": "call",
-                "fn": "has",
-                "args": [
-                  {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "thiefOfFiveFatesUsed"
-                    ]
-                  }
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "copy",
-                  "state",
-                  "thiefOfFiveFatesUsed"
-                ]
-              }
-            }
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "countCopies(has(copy.state.usedToday) && size(copy.state.usedToday) > 0) > 0": {
       "text": "countCopies(has(copy.state.usedToday) && size(copy.state.usedToday) > 0) > 0",
       "tree": {
@@ -141443,16 +141247,6 @@
         }
       }
     },
-    "eldritchBlast.range": {
-      "text": "eldritchBlast.range",
-      "tree": {
-        "type": "name",
-        "path": [
-          "eldritchBlast",
-          "range"
-        ]
-      }
-    },
     "elementalAffinity.resistant": {
       "text": "elementalAffinity.resistant",
       "tree": {
@@ -142866,207 +142660,6 @@
         }
       }
     },
-    "flags.l1 + 2 * flags.l2 + 3 * flags.l3 + 4 * flags.l4 + 5 * flags.l5 > ceil(self.level / 2)": {
-      "text": "flags.l1 + 2 * flags.l2 + 3 * flags.l3 + 4 * flags.l4 + 5 * flags.l5 > ceil(self.level / 2)",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "binary",
-            "op": "+",
-            "left": {
-              "type": "binary",
-              "op": "+",
-              "left": {
-                "type": "binary",
-                "op": "+",
-                "left": {
-                  "type": "name",
-                  "path": [
-                    "flags",
-                    "l1"
-                  ]
-                },
-                "right": {
-                  "type": "binary",
-                  "op": "*",
-                  "left": {
-                    "type": "int",
-                    "value": 2
-                  },
-                  "right": {
-                    "type": "name",
-                    "path": [
-                      "flags",
-                      "l2"
-                    ]
-                  }
-                }
-              },
-              "right": {
-                "type": "binary",
-                "op": "*",
-                "left": {
-                  "type": "int",
-                  "value": 3
-                },
-                "right": {
-                  "type": "name",
-                  "path": [
-                    "flags",
-                    "l3"
-                  ]
-                }
-              }
-            },
-            "right": {
-              "type": "binary",
-              "op": "*",
-              "left": {
-                "type": "int",
-                "value": 4
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "flags",
-                  "l4"
-                ]
-              }
-            }
-          },
-          "right": {
-            "type": "binary",
-            "op": "*",
-            "left": {
-              "type": "int",
-              "value": 5
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "l5"
-              ]
-            }
-          }
-        },
-        "right": {
-          "type": "call",
-          "fn": "ceil",
-          "args": [
-            {
-              "type": "binary",
-              "op": "/",
-              "left": {
-                "type": "name",
-                "path": [
-                  "self",
-                  "level"
-                ]
-              },
-              "right": {
-                "type": "int",
-                "value": 2
-              }
-            }
-          ]
-        }
-      }
-    },
-    "flags.l1 > 0": {
-      "text": "flags.l1 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "l1"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.l2 > 0": {
-      "text": "flags.l2 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "l2"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.l3 > 0": {
-      "text": "flags.l3 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "l3"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.l4 > 0": {
-      "text": "flags.l4 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "l4"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.l5 > 0": {
-      "text": "flags.l5 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "l5"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "flags.landed && has(item.condition)\n  && (!has(item.saveDc) || (has(steps.saves) && steps.saves.result == 'failure'))": {
       "text": "flags.landed && has(item.condition) && (!has(item.saveDc) || has(steps.saves) && steps.saves.result == 'failure')",
       "tree": {
@@ -143326,456 +142919,6 @@
         }
       }
     },
-    "flags.level1 + 2 * flags.level2 + 3 * flags.level3 + 4 * flags.level4 + 5 * flags.level5": {
-      "text": "flags.level1 + 2 * flags.level2 + 3 * flags.level3 + 4 * flags.level4 + 5 * flags.level5",
-      "tree": {
-        "type": "binary",
-        "op": "+",
-        "left": {
-          "type": "binary",
-          "op": "+",
-          "left": {
-            "type": "binary",
-            "op": "+",
-            "left": {
-              "type": "binary",
-              "op": "+",
-              "left": {
-                "type": "name",
-                "path": [
-                  "flags",
-                  "level1"
-                ]
-              },
-              "right": {
-                "type": "binary",
-                "op": "*",
-                "left": {
-                  "type": "int",
-                  "value": 2
-                },
-                "right": {
-                  "type": "name",
-                  "path": [
-                    "flags",
-                    "level2"
-                  ]
-                }
-              }
-            },
-            "right": {
-              "type": "binary",
-              "op": "*",
-              "left": {
-                "type": "int",
-                "value": 3
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "flags",
-                  "level3"
-                ]
-              }
-            }
-          },
-          "right": {
-            "type": "binary",
-            "op": "*",
-            "left": {
-              "type": "int",
-              "value": 4
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "level4"
-              ]
-            }
-          }
-        },
-        "right": {
-          "type": "binary",
-          "op": "*",
-          "left": {
-            "type": "int",
-            "value": 5
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "flags",
-              "level5"
-            ]
-          }
-        }
-      }
-    },
-    "flags.level1 > 0": {
-      "text": "flags.level1 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level1"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.level2 > 0": {
-      "text": "flags.level2 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level2"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.level3 > 0": {
-      "text": "flags.level3 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level3"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.level4 > 0": {
-      "text": "flags.level4 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level4"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.level5 > 0": {
-      "text": "flags.level5 > 0",
-      "tree": {
-        "type": "binary",
-        "op": ">",
-        "left": {
-          "type": "name",
-          "path": [
-            "flags",
-            "level5"
-          ]
-        },
-        "right": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "flags.levels": {
-      "text": "flags.levels",
-      "tree": {
-        "type": "name",
-        "path": [
-          "flags",
-          "levels"
-        ]
-      }
-    },
-    "flags.levels == 0 || flags.levels > ceil(self.level / 2)\n  || flags.level1 < 0 || flags.level1 > spellSlots.level1.used\n  || flags.level2 < 0 || flags.level2 > spellSlots.level2.used\n  || flags.level3 < 0 || flags.level3 > spellSlots.level3.used\n  || flags.level4 < 0 || flags.level4 > spellSlots.level4.used\n  || flags.level5 < 0 || flags.level5 > spellSlots.level5.used": {
-      "text": "flags.levels == 0 || flags.levels > ceil(self.level / 2) || flags.level1 < 0 || flags.level1 > spellSlots.level1.used || flags.level2 < 0 || flags.level2 > spellSlots.level2.used || flags.level3 < 0 || flags.level3 > spellSlots.level3.used || flags.level4 < 0 || flags.level4 > spellSlots.level4.used || flags.level5 < 0 || flags.level5 > spellSlots.level5.used",
-      "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": "binary",
-                      "op": "||",
-                      "left": {
-                        "type": "binary",
-                        "op": "||",
-                        "left": {
-                          "type": "binary",
-                          "op": "||",
-                          "left": {
-                            "type": "binary",
-                            "op": "||",
-                            "left": {
-                              "type": "binary",
-                              "op": "==",
-                              "left": {
-                                "type": "name",
-                                "path": [
-                                  "flags",
-                                  "levels"
-                                ]
-                              },
-                              "right": {
-                                "type": "int",
-                                "value": 0
-                              }
-                            },
-                            "right": {
-                              "type": "binary",
-                              "op": ">",
-                              "left": {
-                                "type": "name",
-                                "path": [
-                                  "flags",
-                                  "levels"
-                                ]
-                              },
-                              "right": {
-                                "type": "call",
-                                "fn": "ceil",
-                                "args": [
-                                  {
-                                    "type": "binary",
-                                    "op": "/",
-                                    "left": {
-                                      "type": "name",
-                                      "path": [
-                                        "self",
-                                        "level"
-                                      ]
-                                    },
-                                    "right": {
-                                      "type": "int",
-                                      "value": 2
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "binary",
-                            "op": "<",
-                            "left": {
-                              "type": "name",
-                              "path": [
-                                "flags",
-                                "level1"
-                              ]
-                            },
-                            "right": {
-                              "type": "int",
-                              "value": 0
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "binary",
-                          "op": ">",
-                          "left": {
-                            "type": "name",
-                            "path": [
-                              "flags",
-                              "level1"
-                            ]
-                          },
-                          "right": {
-                            "type": "name",
-                            "path": [
-                              "spellSlots",
-                              "level1",
-                              "used"
-                            ]
-                          }
-                        }
-                      },
-                      "right": {
-                        "type": "binary",
-                        "op": "<",
-                        "left": {
-                          "type": "name",
-                          "path": [
-                            "flags",
-                            "level2"
-                          ]
-                        },
-                        "right": {
-                          "type": "int",
-                          "value": 0
-                        }
-                      }
-                    },
-                    "right": {
-                      "type": "binary",
-                      "op": ">",
-                      "left": {
-                        "type": "name",
-                        "path": [
-                          "flags",
-                          "level2"
-                        ]
-                      },
-                      "right": {
-                        "type": "name",
-                        "path": [
-                          "spellSlots",
-                          "level2",
-                          "used"
-                        ]
-                      }
-                    }
-                  },
-                  "right": {
-                    "type": "binary",
-                    "op": "<",
-                    "left": {
-                      "type": "name",
-                      "path": [
-                        "flags",
-                        "level3"
-                      ]
-                    },
-                    "right": {
-                      "type": "int",
-                      "value": 0
-                    }
-                  }
-                },
-                "right": {
-                  "type": "binary",
-                  "op": ">",
-                  "left": {
-                    "type": "name",
-                    "path": [
-                      "flags",
-                      "level3"
-                    ]
-                  },
-                  "right": {
-                    "type": "name",
-                    "path": [
-                      "spellSlots",
-                      "level3",
-                      "used"
-                    ]
-                  }
-                }
-              },
-              "right": {
-                "type": "binary",
-                "op": "<",
-                "left": {
-                  "type": "name",
-                  "path": [
-                    "flags",
-                    "level4"
-                  ]
-                },
-                "right": {
-                  "type": "int",
-                  "value": 0
-                }
-              }
-            },
-            "right": {
-              "type": "binary",
-              "op": ">",
-              "left": {
-                "type": "name",
-                "path": [
-                  "flags",
-                  "level4"
-                ]
-              },
-              "right": {
-                "type": "name",
-                "path": [
-                  "spellSlots",
-                  "level4",
-                  "used"
-                ]
-              }
-            }
-          },
-          "right": {
-            "type": "binary",
-            "op": "<",
-            "left": {
-              "type": "name",
-              "path": [
-                "flags",
-                "level5"
-              ]
-            },
-            "right": {
-              "type": "int",
-              "value": 0
-            }
-          }
-        },
-        "right": {
-          "type": "binary",
-          "op": ">",
-          "left": {
-            "type": "name",
-            "path": [
-              "flags",
-              "level5"
-            ]
-          },
-          "right": {
-            "type": "name",
-            "path": [
-              "spellSlots",
-              "level5",
-              "used"
-            ]
-          }
-        }
-      }
-    },
     "flags.luckDie": {
       "text": "flags.luckDie",
       "tree": {
@@ -148484,156 +147627,6 @@
         }
       }
     },
-    "has(params.level1) ? params.level1 : 0": {
-      "text": "has(params.level1) ? params.level1 : 0",
-      "tree": {
-        "type": "conditional",
-        "test": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "params",
-                "level1"
-              ]
-            }
-          ]
-        },
-        "then": {
-          "type": "name",
-          "path": [
-            "params",
-            "level1"
-          ]
-        },
-        "else": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "has(params.level2) ? params.level2 : 0": {
-      "text": "has(params.level2) ? params.level2 : 0",
-      "tree": {
-        "type": "conditional",
-        "test": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "params",
-                "level2"
-              ]
-            }
-          ]
-        },
-        "then": {
-          "type": "name",
-          "path": [
-            "params",
-            "level2"
-          ]
-        },
-        "else": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "has(params.level3) ? params.level3 : 0": {
-      "text": "has(params.level3) ? params.level3 : 0",
-      "tree": {
-        "type": "conditional",
-        "test": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "params",
-                "level3"
-              ]
-            }
-          ]
-        },
-        "then": {
-          "type": "name",
-          "path": [
-            "params",
-            "level3"
-          ]
-        },
-        "else": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "has(params.level4) ? params.level4 : 0": {
-      "text": "has(params.level4) ? params.level4 : 0",
-      "tree": {
-        "type": "conditional",
-        "test": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "params",
-                "level4"
-              ]
-            }
-          ]
-        },
-        "then": {
-          "type": "name",
-          "path": [
-            "params",
-            "level4"
-          ]
-        },
-        "else": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
-    "has(params.level5) ? params.level5 : 0": {
-      "text": "has(params.level5) ? params.level5 : 0",
-      "tree": {
-        "type": "conditional",
-        "test": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "params",
-                "level5"
-              ]
-            }
-          ]
-        },
-        "then": {
-          "type": "name",
-          "path": [
-            "params",
-            "level5"
-          ]
-        },
-        "else": {
-          "type": "int",
-          "value": 0
-        }
-      }
-    },
     "has(params.magical) ? [params.magical ? 'magical' : 'nonmagical'] : []": {
       "text": "has(params.magical) ? [params.magical ? 'magical' : 'nonmagical'] : []",
       "tree": {
@@ -150642,33 +149635,6 @@
         }
       }
     },
-    "has(self.bewitchingWhispersUsed) && self.bewitchingWhispersUsed": {
-      "text": "has(self.bewitchingWhispersUsed) && self.bewitchingWhispersUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "bewitchingWhispersUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "bewitchingWhispersUsed"
-          ]
-        }
-      }
-    },
     "has(self.by) ? self.by : ''": {
       "text": "has(self.by) ? self.by : ''",
       "tree": {
@@ -150796,33 +149762,6 @@
         }
       }
     },
-    "has(self.darknessUsed) && self.darknessUsed": {
-      "text": "has(self.darknessUsed) && self.darknessUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "darknessUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "darknessUsed"
-          ]
-        }
-      }
-    },
     "has(self.divineIntervention) && self.divineIntervention == 'failed'": {
       "text": "has(self.divineIntervention) && self.divineIntervention == 'failed'",
       "tree": {
@@ -150893,33 +149832,6 @@
         }
       }
     },
-    "has(self.dreadfulWordUsed) && self.dreadfulWordUsed": {
-      "text": "has(self.dreadfulWordUsed) && self.dreadfulWordUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "dreadfulWordUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "dreadfulWordUsed"
-          ]
-        }
-      }
-    },
     "has(self.eldritchMasterUsed) && self.eldritchMasterUsed": {
       "text": "has(self.eldritchMasterUsed) && self.eldritchMasterUsed",
       "tree": {
@@ -150947,33 +149859,6 @@
         }
       }
     },
-    "has(self.hellishRebukeUsed) && self.hellishRebukeUsed": {
-      "text": "has(self.hellishRebukeUsed) && self.hellishRebukeUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "hellishRebukeUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "hellishRebukeUsed"
-          ]
-        }
-      }
-    },
     "has(self.holyNimbusUsed) && self.holyNimbusUsed": {
       "text": "has(self.holyNimbusUsed) && self.holyNimbusUsed",
       "tree": {
@@ -151168,60 +150053,6 @@
         }
       }
     },
-    "has(self.minionsOfChaosUsed) && self.minionsOfChaosUsed": {
-      "text": "has(self.minionsOfChaosUsed) && self.minionsOfChaosUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "minionsOfChaosUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "minionsOfChaosUsed"
-          ]
-        }
-      }
-    },
-    "has(self.mireTheMindUsed) && self.mireTheMindUsed": {
-      "text": "has(self.mireTheMindUsed) && self.mireTheMindUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "mireTheMindUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "mireTheMindUsed"
-          ]
-        }
-      }
-    },
     "has(self.naturalRecoveryUsed) && self.naturalRecoveryUsed": {
       "text": "has(self.naturalRecoveryUsed) && self.naturalRecoveryUsed",
       "tree": {
@@ -151319,49 +150150,6 @@
         }
       }
     },
-    "has(self.relentlessEnduranceUsed)": {
-      "text": "has(self.relentlessEnduranceUsed)",
-      "tree": {
-        "type": "call",
-        "fn": "has",
-        "args": [
-          {
-            "type": "name",
-            "path": [
-              "self",
-              "relentlessEnduranceUsed"
-            ]
-          }
-        ]
-      }
-    },
-    "has(self.relentlessEnduranceUsed) && self.relentlessEnduranceUsed": {
-      "text": "has(self.relentlessEnduranceUsed) && self.relentlessEnduranceUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "relentlessEnduranceUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "relentlessEnduranceUsed"
-          ]
-        }
-      }
-    },
     "has(self.relentlessRageSpent) && self.relentlessRageSpent > 0": {
       "text": "has(self.relentlessRageSpent) && self.relentlessRageSpent > 0",
       "tree": {
@@ -151397,33 +150185,6 @@
         }
       }
     },
-    "has(self.sculptorOfFleshUsed) && self.sculptorOfFleshUsed": {
-      "text": "has(self.sculptorOfFleshUsed) && self.sculptorOfFleshUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "sculptorOfFleshUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "sculptorOfFleshUsed"
-          ]
-        }
-      }
-    },
     "has(self.secondWindUsed) && self.secondWindUsed": {
       "text": "has(self.secondWindUsed) && self.secondWindUsed",
       "tree": {
@@ -151451,33 +150212,6 @@
         }
       }
     },
-    "has(self.signOfIllOmenUsed) && self.signOfIllOmenUsed": {
-      "text": "has(self.signOfIllOmenUsed) && self.signOfIllOmenUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "signOfIllOmenUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "signOfIllOmenUsed"
-          ]
-        }
-      }
-    },
     "has(self.signatureSpell1Used) && self.signatureSpell1Used": {
       "text": "has(self.signatureSpell1Used) && self.signatureSpell1Used",
       "tree": {
@@ -151594,33 +150328,6 @@
         }
       }
     },
-    "has(self.thiefOfFiveFatesUsed) && self.thiefOfFiveFatesUsed": {
-      "text": "has(self.thiefOfFiveFatesUsed) && self.thiefOfFiveFatesUsed",
-      "tree": {
-        "type": "binary",
-        "op": "&&",
-        "left": {
-          "type": "call",
-          "fn": "has",
-          "args": [
-            {
-              "type": "name",
-              "path": [
-                "self",
-                "thiefOfFiveFatesUsed"
-              ]
-            }
-          ]
-        },
-        "right": {
-          "type": "name",
-          "path": [
-            "self",
-            "thiefOfFiveFatesUsed"
-          ]
-        }
-      }
-    },
     "has(self.usedToday) && size(self.usedToday) > 0": {
       "text": "has(self.usedToday) && size(self.usedToday) > 0",
       "tree": {
@@ -153071,6 +151778,39 @@
         }
       }
     },
+    "hp.current == 0 && !self.used": {
+      "text": "hp.current == 0 && !self.used",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "==",
+          "left": {
+            "type": "name",
+            "path": [
+              "hp",
+              "current"
+            ]
+          },
+          "right": {
+            "type": "int",
+            "value": 0
+          }
+        },
+        "right": {
+          "type": "unary",
+          "op": "!",
+          "operand": {
+            "type": "name",
+            "path": [
+              "self",
+              "used"
+            ]
+          }
+        }
+      }
+    },
     "hp.current == 0 && !sheet.monster": {
       "text": "hp.current == 0 && !sheet.monster",
       "tree": {
@@ -153164,14 +151904,14 @@
         }
       }
     },
-    "hp.current == 0 && countCopies(has(copy.state.relentlessEnduranceUsed)\n  && !copy.state.relentlessEnduranceUsed) > 0": {
-      "text": "hp.current == 0 && countCopies(has(copy.state.relentlessEnduranceUsed) && !copy.state.relentlessEnduranceUsed) > 0",
+    "hp.current > 0 && hp.current + hp.temp + incoming.amount <= 0": {
+      "text": "hp.current > 0 && hp.current + hp.temp + incoming.amount <= 0",
       "tree": {
         "type": "binary",
         "op": "&&",
         "left": {
           "type": "binary",
-          "op": "==",
+          "op": ">",
           "left": {
             "type": "name",
             "path": [
@@ -153186,42 +151926,35 @@
         },
         "right": {
           "type": "binary",
-          "op": ">",
+          "op": "<=",
           "left": {
-            "type": "call",
-            "fn": "countCopies",
-            "args": [
-              {
-                "type": "binary",
-                "op": "&&",
-                "left": {
-                  "type": "call",
-                  "fn": "has",
-                  "args": [
-                    {
-                      "type": "name",
-                      "path": [
-                        "copy",
-                        "state",
-                        "relentlessEnduranceUsed"
-                      ]
-                    }
-                  ]
-                },
-                "right": {
-                  "type": "unary",
-                  "op": "!",
-                  "operand": {
-                    "type": "name",
-                    "path": [
-                      "copy",
-                      "state",
-                      "relentlessEnduranceUsed"
-                    ]
-                  }
-                }
+            "type": "binary",
+            "op": "+",
+            "left": {
+              "type": "binary",
+              "op": "+",
+              "left": {
+                "type": "name",
+                "path": [
+                  "hp",
+                  "current"
+                ]
+              },
+              "right": {
+                "type": "name",
+                "path": [
+                  "hp",
+                  "temp"
+                ]
               }
-            ]
+            },
+            "right": {
+              "type": "name",
+              "path": [
+                "incoming",
+                "amount"
+              ]
+            }
           },
           "right": {
             "type": "int",
@@ -154814,6 +153547,132 @@
         }
       }
     },
+    "item.id == @invocations.bewitching-whispers": {
+      "text": "item.id == @invocations.bewitching-whispers",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.bewitching-whispers"
+        }
+      }
+    },
+    "item.id == @invocations.dreadful-word": {
+      "text": "item.id == @invocations.dreadful-word",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.dreadful-word"
+        }
+      }
+    },
+    "item.id == @invocations.minions-of-chaos": {
+      "text": "item.id == @invocations.minions-of-chaos",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.minions-of-chaos"
+        }
+      }
+    },
+    "item.id == @invocations.mire-the-mind": {
+      "text": "item.id == @invocations.mire-the-mind",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.mire-the-mind"
+        }
+      }
+    },
+    "item.id == @invocations.sculptor-of-flesh": {
+      "text": "item.id == @invocations.sculptor-of-flesh",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.sculptor-of-flesh"
+        }
+      }
+    },
+    "item.id == @invocations.sign-of-ill-omen": {
+      "text": "item.id == @invocations.sign-of-ill-omen",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.sign-of-ill-omen"
+        }
+      }
+    },
+    "item.id == @invocations.thief-of-five-fates": {
+      "text": "item.id == @invocations.thief-of-five-fates",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "invocations.thief-of-five-fates"
+        }
+      }
+    },
     "item.id == @magic-items.ring-of-x-ray-vision && self.used": {
       "text": "item.id == @magic-items.ring-of-x-ray-vision && self.used",
       "tree": {
@@ -154843,6 +153702,129 @@
         }
       }
     },
+    "item.id == @spells.eldritch-blast": {
+      "text": "item.id == @spells.eldritch-blast",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "spells.eldritch-blast"
+        }
+      }
+    },
+    "item.id == @traits.infernal-legacy": {
+      "text": "item.id == @traits.infernal-legacy",
+      "tree": {
+        "type": "binary",
+        "op": "==",
+        "left": {
+          "type": "name",
+          "path": [
+            "item",
+            "id"
+          ]
+        },
+        "right": {
+          "type": "ref",
+          "id": "traits.infernal-legacy"
+        }
+      }
+    },
+    "item.id == @traits.infernal-legacy && self.darknessUsed": {
+      "text": "item.id == @traits.infernal-legacy && self.darknessUsed",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "==",
+          "left": {
+            "type": "name",
+            "path": [
+              "item",
+              "id"
+            ]
+          },
+          "right": {
+            "type": "ref",
+            "id": "traits.infernal-legacy"
+          }
+        },
+        "right": {
+          "type": "name",
+          "path": [
+            "self",
+            "darknessUsed"
+          ]
+        }
+      }
+    },
+    "item.id == @traits.infernal-legacy && self.hellishRebukeUsed": {
+      "text": "item.id == @traits.infernal-legacy && self.hellishRebukeUsed",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "==",
+          "left": {
+            "type": "name",
+            "path": [
+              "item",
+              "id"
+            ]
+          },
+          "right": {
+            "type": "ref",
+            "id": "traits.infernal-legacy"
+          }
+        },
+        "right": {
+          "type": "name",
+          "path": [
+            "self",
+            "hellishRebukeUsed"
+          ]
+        }
+      }
+    },
+    "item.id == @traits.relentless-endurance && self.used": {
+      "text": "item.id == @traits.relentless-endurance && self.used",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "==",
+          "left": {
+            "type": "name",
+            "path": [
+              "item",
+              "id"
+            ]
+          },
+          "right": {
+            "type": "ref",
+            "id": "traits.relentless-endurance"
+          }
+        },
+        "right": {
+          "type": "name",
+          "path": [
+            "self",
+            "used"
+          ]
+        }
+      }
+    },
     "item.id == @weapons.dagger": {
       "text": "item.id == @weapons.dagger",
       "tree": {
@@ -158226,6 +157208,64 @@
         ]
       }
     },
+    "item.type == 'draconicAncestry' && self.used": {
+      "text": "item.type == 'draconicAncestry' && self.used",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "==",
+          "left": {
+            "type": "name",
+            "path": [
+              "item",
+              "type"
+            ]
+          },
+          "right": {
+            "type": "string",
+            "value": "draconicAncestry"
+          }
+        },
+        "right": {
+          "type": "name",
+          "path": [
+            "self",
+            "used"
+          ]
+        }
+      }
+    },
+    "item.type == 'invocation' && self.used": {
+      "text": "item.type == 'invocation' && self.used",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "==",
+          "left": {
+            "type": "name",
+            "path": [
+              "item",
+              "type"
+            ]
+          },
+          "right": {
+            "type": "string",
+            "value": "invocation"
+          }
+        },
+        "right": {
+          "type": "name",
+          "path": [
+            "self",
+            "used"
+          ]
+        }
+      }
+    },
     "item.xp": {
       "text": "item.xp",
       "tree": {
@@ -160947,166 +159987,6 @@
         ]
       }
     },
-    "max(0, spellSlots.level1.used - flags.l1)": {
-      "text": "max(0, spellSlots.level1.used - flags.l1)",
-      "tree": {
-        "type": "call",
-        "fn": "max",
-        "args": [
-          {
-            "type": "int",
-            "value": 0
-          },
-          {
-            "type": "binary",
-            "op": "-",
-            "left": {
-              "type": "name",
-              "path": [
-                "spellSlots",
-                "level1",
-                "used"
-              ]
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "l1"
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "max(0, spellSlots.level2.used - flags.l2)": {
-      "text": "max(0, spellSlots.level2.used - flags.l2)",
-      "tree": {
-        "type": "call",
-        "fn": "max",
-        "args": [
-          {
-            "type": "int",
-            "value": 0
-          },
-          {
-            "type": "binary",
-            "op": "-",
-            "left": {
-              "type": "name",
-              "path": [
-                "spellSlots",
-                "level2",
-                "used"
-              ]
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "l2"
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "max(0, spellSlots.level3.used - flags.l3)": {
-      "text": "max(0, spellSlots.level3.used - flags.l3)",
-      "tree": {
-        "type": "call",
-        "fn": "max",
-        "args": [
-          {
-            "type": "int",
-            "value": 0
-          },
-          {
-            "type": "binary",
-            "op": "-",
-            "left": {
-              "type": "name",
-              "path": [
-                "spellSlots",
-                "level3",
-                "used"
-              ]
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "l3"
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "max(0, spellSlots.level4.used - flags.l4)": {
-      "text": "max(0, spellSlots.level4.used - flags.l4)",
-      "tree": {
-        "type": "call",
-        "fn": "max",
-        "args": [
-          {
-            "type": "int",
-            "value": 0
-          },
-          {
-            "type": "binary",
-            "op": "-",
-            "left": {
-              "type": "name",
-              "path": [
-                "spellSlots",
-                "level4",
-                "used"
-              ]
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "l4"
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "max(0, spellSlots.level5.used - flags.l5)": {
-      "text": "max(0, spellSlots.level5.used - flags.l5)",
-      "tree": {
-        "type": "call",
-        "fn": "max",
-        "args": [
-          {
-            "type": "int",
-            "value": 0
-          },
-          {
-            "type": "binary",
-            "op": "-",
-            "left": {
-              "type": "name",
-              "path": [
-                "spellSlots",
-                "level5",
-                "used"
-              ]
-            },
-            "right": {
-              "type": "name",
-              "path": [
-                "flags",
-                "l5"
-              ]
-            }
-          }
-        ]
-      }
-    },
     "max(0, steps.bleed.total)": {
       "text": "max(0, steps.bleed.total)",
       "tree": {
@@ -163887,6 +162767,133 @@
         ]
       }
     },
+    "picks < fieldOf('spellSlots.level{slot}.used', value)\n  && value + sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)\n    <= ceil(self.level / 2)": {
+      "text": "picks < fieldOf('spellSlots.level{slot}.used', value) && value + sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1) <= ceil(self.level / 2)",
+      "tree": {
+        "type": "binary",
+        "op": "&&",
+        "left": {
+          "type": "binary",
+          "op": "<",
+          "left": {
+            "type": "name",
+            "path": [
+              "picks"
+            ]
+          },
+          "right": {
+            "type": "call",
+            "fn": "fieldOf",
+            "args": [
+              {
+                "type": "string",
+                "value": "spellSlots.level{slot}.used"
+              },
+              {
+                "type": "name",
+                "path": [
+                  "value"
+                ]
+              }
+            ]
+          }
+        },
+        "right": {
+          "type": "binary",
+          "op": "<=",
+          "left": {
+            "type": "binary",
+            "op": "+",
+            "left": {
+              "type": "name",
+              "path": [
+                "value"
+              ]
+            },
+            "right": {
+              "type": "call",
+              "fn": "sumList",
+              "args": [
+                {
+                  "type": "name",
+                  "path": [
+                    "steps",
+                    "slots",
+                    "picked"
+                  ]
+                },
+                {
+                  "type": "binary",
+                  "op": "+",
+                  "left": {
+                    "type": "call",
+                    "fn": "indexOf",
+                    "args": [
+                      {
+                        "type": "list",
+                        "items": [
+                          {
+                            "type": "string",
+                            "value": "1"
+                          },
+                          {
+                            "type": "string",
+                            "value": "2"
+                          },
+                          {
+                            "type": "string",
+                            "value": "3"
+                          },
+                          {
+                            "type": "string",
+                            "value": "4"
+                          },
+                          {
+                            "type": "string",
+                            "value": "5"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "name",
+                        "path": [
+                          "x"
+                        ]
+                      }
+                    ]
+                  },
+                  "right": {
+                    "type": "int",
+                    "value": 1
+                  }
+                }
+              ]
+            }
+          },
+          "right": {
+            "type": "call",
+            "fn": "ceil",
+            "args": [
+              {
+                "type": "binary",
+                "op": "/",
+                "left": {
+                  "type": "name",
+                  "path": [
+                    "self",
+                    "level"
+                  ]
+                },
+                "right": {
+                  "type": "int",
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    },
     "proficiency.bonus": {
       "text": "proficiency.bonus",
       "tree": {
@@ -175913,6 +174920,24 @@
         }
       }
     },
+    "steps.monster.added[0]": {
+      "text": "steps.monster.added[0]",
+      "tree": {
+        "type": "index",
+        "object": {
+          "type": "name",
+          "path": [
+            "steps",
+            "monster",
+            "added"
+          ]
+        },
+        "index": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
     "steps.monster.item.alignment": {
       "text": "steps.monster.item.alignment",
       "tree": {
@@ -176321,6 +175346,24 @@
         ]
       }
     },
+    "steps.race.added[0]": {
+      "text": "steps.race.added[0]",
+      "tree": {
+        "type": "index",
+        "object": {
+          "type": "name",
+          "path": [
+            "steps",
+            "race",
+            "added"
+          ]
+        },
+        "index": {
+          "type": "int",
+          "value": 0
+        }
+      }
+    },
     "steps.rangerWeapons.picked == 'two-simple-melee'": {
       "text": "steps.rangerWeapons.picked == 'two-simple-melee'",
       "tree": {
@@ -178692,6 +177735,68 @@
         }
       }
     },
+    "sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)": {
+      "text": "sumList(steps.slots.picked, indexOf(['1', '2', '3', '4', '5'], x) + 1)",
+      "tree": {
+        "type": "call",
+        "fn": "sumList",
+        "args": [
+          {
+            "type": "name",
+            "path": [
+              "steps",
+              "slots",
+              "picked"
+            ]
+          },
+          {
+            "type": "binary",
+            "op": "+",
+            "left": {
+              "type": "call",
+              "fn": "indexOf",
+              "args": [
+                {
+                  "type": "list",
+                  "items": [
+                    {
+                      "type": "string",
+                      "value": "1"
+                    },
+                    {
+                      "type": "string",
+                      "value": "2"
+                    },
+                    {
+                      "type": "string",
+                      "value": "3"
+                    },
+                    {
+                      "type": "string",
+                      "value": "4"
+                    },
+                    {
+                      "type": "string",
+                      "value": "5"
+                    }
+                  ]
+                },
+                {
+                  "type": "name",
+                  "path": [
+                    "x"
+                  ]
+                }
+              ]
+            },
+            "right": {
+              "type": "int",
+              "value": 1
+            }
+          }
+        ]
+      }
+    },
     "tranquility.active": {
       "text": "tranquility.active",
       "tree": {
@@ -178712,6 +177817,15 @@
         ]
       }
     },
+    "value": {
+      "text": "value",
+      "tree": {
+        "type": "name",
+        "path": [
+          "value"
+        ]
+      }
+    },
     "value in proficiencies.skills": {
       "text": "value in proficiencies.skills",
       "tree": {