diff --git a/src/5e-SRD-Spells.json b/src/5e-SRD-Spells.json
index 10c75cef..5cabd3ba 100644
--- a/src/5e-SRD-Spells.json
+++ b/src/5e-SRD-Spells.json
@@ -8,13 +8,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the damage (both initial and later) increases by 1d4 for each slot level above 2nd."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "Powdered rhubarb leaf and an adder's stomach.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "attack_type": "ranged",
     "damage": {
@@ -67,12 +67,12 @@
       "You hurl a bubble of acid. Choose one creature within range, or choose two creatures within range that are within 5 feet of each other. A target must succeed on a dexterity saving throw or take 1d6 acid damage.",
       "This spell's damage increases by 1d6 when you reach 5th level (2d6), 11th level (3d6), and 17th level (4d6)."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "damage": {
       "damage_type": {
@@ -130,13 +130,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, a target's hit points increase by an additional 5 for each slot level above 2nd."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A tiny strip of white cloth.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "heal_at_slot_level": {
       "2": "5",
@@ -182,13 +182,13 @@
       "A mental alarm alerts you with a ping in your mind if you are within 1 mile of the warded area. This ping awakens you if you are sleeping.",
       "An audible alarm produces the sound of a hand bell for 10 seconds within 60 feet."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A tiny bell and a piece of fine silver wire.",
     "ritual": true,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "cube",
@@ -229,12 +229,12 @@
       "***Change Appearance.*** You transform your appearance. You decide what you look like, including your height, weight, facial features, sound of your voice, hair length, coloration, and distinguishing characteristics, if any. You can make yourself appear as a member of another race, though none of your statistics change. You also can't appear as a creature of a different size than you, and your basic shape stays the same; if you're bipedal, you can't use this spell to become quadrupedal, for instance. At any time for the duration of the spell, you can use your action to change your appearance in this way again.",
       "***Natural Weapons.*** You grow claws, fangs, spines, horns, or a different natural weapon of your choice. Your unarmed strikes deal 1d6 bludgeoning, piercing, or slashing damage, as appropriate to the natural weapon you chose, and you are proficient with your unarmed strikes. Finally, the natural weapon is magic and you have a +1 bonus to the attack and damage rolls you make using it."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -268,13 +268,13 @@
     "desc": [
       "This spell lets you convince a beast that you mean it no harm. Choose a beast that you can see within range. It must see and hear you. If the beast's Intelligence is 4 or higher, the spell fails. Otherwise, the beast must succeed on a wisdom saving throw or be charmed by you for the spell's duration. If you or one of your companions harms the target, the spells ends."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A morsel of food.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -324,13 +324,13 @@
     "higher_level": [
       "If you cast this spell using a spell slot of 3nd level or higher, the duration of the spell increases by 48 hours for each slot level above 2nd."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A morsel of food.",
     "ritual": true,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "enchantment",
@@ -371,12 +371,12 @@
       "The transformation lasts for the duration for each target, or until the target drops to 0 hit points or dies. You can choose a different form for each target. A target's game statistics are replaced by the statistics of the chosen beast, though the target retains its alignment and Intelligence, Wisdom, and Charisma scores. The target assumes the hit points of its new form, and when it reverts to its normal form, it returns to the number of hit points it had before it transformed. If it reverts as a result of dropping to 0 hit points, any excess damage carries over to its normal form. As long as the excess damage doesn't reduce the creature's normal form to 0 hit points, it isn't knocked unconscious. The creature is limited in the actions it can perform by the nature of its new form, and it can't speak or cast spells.",
       "The target's gear melds into the new form. The target can't activate, wield, or otherwise benefit from any of its equipment."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 24, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "school": {
       "index": "transmutation",
@@ -404,13 +404,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, you animate or reassert control over two additional undead creatures for each slot level above 3rd. Each of the creatures must come from a different corpse or pile of bones."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S", "M"],
     "material": "A drop of blood, a piece of flesh, and a pinch of bone dust.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 3,
     "school": {
       "index": "necromancy",
@@ -458,12 +458,12 @@
     "higher_level": [
       "If you cast this spell using a spell slot of 6th level or higher, you can animate two additional objects for each slot level above 5th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "transmutation",
@@ -498,12 +498,12 @@
       "The barrier prevents an affected creature from passing or reaching through. An affected creature can cast spells or make attacks with ranged or reach weapons through the barrier.",
       "If you move so that an affected creature is forced to pass through the barrier, the spell ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "area_of_effect": {
       "type": "sphere",
@@ -539,13 +539,13 @@
       "***Creatures and Objects.*** A creature or object summoned or created by magic temporarily winks out of existence in the sphere. Such a creature instantly reappears once the space the creature occupied is no longer within the sphere.",
       "***Dispel Magic.*** Spells and magical effects such as dispel magic have no effect on the sphere. Likewise, the spheres created by different antimagic field spells don't nullify each other."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pinch of powdered iron or iron filings.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "area_of_effect": {
       "type": "sphere",
@@ -582,13 +582,13 @@
       "***Ending the Effect.*** If an affected creature ends its turn while not within 60 feet of the target or able to see it, the creature makes a wisdom saving throw. On a successful save, the creature is no longer affected by the target and recognizes the feeling of repugnance or attraction as magical. In addition, a creature affected by the spell is allowed another wisdom saving throw every 24 hours while the spell persists.",
       "A creature that successfully saves against this effect is immune to it for 1 minute, after which time it can be affected again."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "Either a lump of alum soaked in vinegar for the antipathy effect or a drop of honey for the sympathy effect.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "day"},
+    "duration": {"type": "day", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 8,
     "area_of_effect": {
       "type": "cube",
@@ -622,13 +622,13 @@
       "You mentally receive visual information from the eye, which has normal vision and darkvision out to 30 feet. The eye can look in every direction.",
       "As an action, you can move the eye up to 30 feet in any direction. There is no limit to how far away from you the eye can move, but it can't enter another plane of existence. A solid barrier blocks the eye's movement, but the eye can pass through an opening as small as 1 inch in diameter."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A bit of bat fur.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "area_of_effect": {
       "type": "sphere",
@@ -669,13 +669,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the damage from the clenched fist option increases by 2d8 and the damage from the grasping hand increases by 2d6 for each slot level above 5th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "An eggshell and a snakeskin glove.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "evocation",
@@ -699,13 +699,13 @@
       "You touch a closed door, window, gate, chest, or other entryway, and it becomes locked for the duration. You and the creatures you designate when you cast this spell can open the object normally. You can also set a password that, when spoken within 5 feet of the object, suppresses this spell for 1 minute. Otherwise, it is impassable until it is broken or the spell is dispelled or suppressed. Casting knock on the object suppresses arcane lock for 10 minutes.",
       "While affected by this spell, the object is more difficult to break or force open; the DC to break it or pick any locks on it increases by 10."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Gold dust worth at least 25gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "abjuration",
@@ -735,13 +735,13 @@
       "You create a sword-shaped plane of force that hovers within range. It lasts for the duration.",
       "When the sword appears, you make a melee spell attack against a target of your choice within 5 feet of the sword. On a hit, the target takes 3d10 force damage. Until the spell ends, you can use a bonus action on each of your turns to move the sword up to 20 feet to a spot you can see and repeat this attack against the same target or a different one."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A miniature platinum sword with a grip and pommel of copper and zinc, worth 250 gp.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "attack_type": "melee",
     "damage": {
@@ -783,13 +783,13 @@
       "***False Aura.*** You change the way the target appears to spells and magical effects, such as detect magic, that detect magical auras. You can make a nonmagical object appear magical, a magical object appear nonmagical, or change the object's magical aura so that it appears to belong to a specific school of magic that you choose. When you use this effect on an object, you can make the false magic apparent to any creature that handles the item.",
       "***Mask.*** You change the way the target appears to spells and magical effects that detect creature types, such as a paladin's Divine Sense or the trigger of a symbol spell. You choose a creature type and other spells and magical effects treat the target as if it were a creature of that type or of that alignment."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A small square of silk.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "illusion",
@@ -823,13 +823,13 @@
       "The spell might also end early for you or one of your companions. A successful dispel magic spell used against an astral or physical body ends the spell for that creature. If a creature's original body or its astral form drops to 0 hit points, the spell ends for that creature. If the spell ends and the silver cord is intact, the cord pulls the creature's astral form back to its body, ending its state of suspended animation.",
       "If you are returned to your body prematurely, your companions remain in their astral forms and must find their own way back to their bodies, usually by dropping to 0 hit points."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S", "M"],
     "material": "For each creature you affect with this spell, you must provide one jacinth worth at least 1,000gp and one ornately carved bar of silver worth at least 100gp, all of which the spell consumes.",
     "ritual": false,
     "duration": {"type": "special"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 9,
     "school": {
       "index": "necromancy",
@@ -868,13 +868,13 @@
       "The spell doesn't take into account any possible circumstances that might change the outcome, such as the casting of additional spells or the loss or gain of a companion.",
       "If you cast the spell two or more times before completing your next long rest, there is a cumulative 25 percent chance for each casting after the first that you get a random reading. The GM makes this roll in secret."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Specially marked sticks, bones, or similar tokens worth at least 25gp.",
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 2,
     "school": {
       "index": "divination",
@@ -904,13 +904,13 @@
       "After spending the casting time tracing magical pathways within a precious gemstone, you touch a Huge or smaller beast or plant. The target must have either no Intelligence score or an Intelligence of 3 or less. The target gains an Intelligence of 10. The target also gains the ability to speak one language you know. If the target is a plant, it gains the ability to move its limbs, roots, vines, creepers, and so forth, and it gains senses similar to a human's. Your GM chooses statistics appropriate for the awakened plant, such as the statistics for the awakened shrub or the awakened tree.",
       "The awakened beast or plant is charmed by you for 30 days or until you or your companions do anything harmful to it. When the charmed condition ends, the awakened creature chooses whether to remain friendly to you, based on how you treated it while it was charmed."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "An agate worth at least 1,000 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 8, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 8},
     "level": 5,
     "school": {
       "index": "transmutation",
@@ -941,13 +941,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you can target one additional creature for each slot level above 1st."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A drop of blood.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -994,13 +994,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level or higher, you can target one additional creature for each slot level above 4th."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "An item distasteful to the target.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "dc": {
       "dc_type": {
@@ -1051,13 +1051,13 @@
     "desc": [
       "You touch a willing creature. Until the spell ends, the target's skin has a rough, bark-like appearance, and the target's AC can't be less than 16, regardless of what kind of armor it is wearing."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A handful of oak bark.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -1096,12 +1096,12 @@
     "desc": [
       "This spell bestows hope and vitality. Choose any number of creatures within range. For the duration, each target has advantage on wisdom saving throws and death saving throws, and regains the maximum number of hit points possible from any healing."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -1148,12 +1148,12 @@
     "higher_level": [
       "If you cast this spell using a spell slot of 4th level or higher, the duration is concentration, up to 10 minutes. If you use a spell slot of 5th level or higher, the duration is 8 hours. If you use a spell slot of 7th level or higher, the duration is 24 hours. If you use a 9th level spell slot, the spell lasts until it is dispelled. Using a spell slot of 5th level or higher grants a duration that doesn't require concentration."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "dc": {
       "dc_type": {
@@ -1203,13 +1203,13 @@
       "When a creature enters the affected area for the first time on a turn or starts its turn there, the creature must succeed on a Dexterity saving throw or take 3d6 bludgeoning damage and be restrained by the tentacles until the spell ends. A creature that starts its turn in the area and is already restrained by the tentacles takes 3d6 bludgeoning damage.",
       "A creature restrained by the tentacles can use its action to make a Strength or Dexterity check (its choice) against your spell save DC. On a success, it frees itself."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "A piece of tentacle from a giant octopus or a giant squid",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -1256,12 +1256,12 @@
       "You create a vertical wall of whirling, razor-sharp blades made of magical energy. The wall appears within range and lasts for the duration. You can make a straight wall up to 100 feet long, 20 feet high, and 5 feet thick, or a ringed wall up to 60 feet in diameter, 20 feet high, and 5 feet thick. The wall provides three-quarters cover to creatures behind it, and its space is difficult terrain.",
       "When a creature enters the wall's area for the first time on a turn or starts its turn there, the creature must make a dexterity saving throw. On a failed save, the creature takes 6d10 slashing damage. On a successful save, the creature takes half as much damage."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -1309,13 +1309,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you can target one additional creature for each slot level above 1st."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A sprinkling of holy water.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "enchantment",
@@ -1359,12 +1359,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level of higher, the damage increases by 1d8 for each slot level above 4th."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -1434,12 +1434,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, you can target one additional creature for each slot level above 2nd."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -1497,12 +1497,12 @@
       "Roll a d20 at the end of each of your turns for the duration of the spell. On a roll of 11 or higher, you vanish from your current plane of existence and appear in the Ethereal Plane (the spell fails and the casting is wasted if you were already on that plane). At the start of your next turn, and when the spell ends if you are on the Ethereal Plane, you return to an unoccupied space of your choice that you can see within 10 feet of the space you vanished from. If no unoccupied space is available within that range, you appear in the nearest unoccupied space (chosen at random if more than one space is equally near). You can dismiss this spell as an action.",
       "While on the Ethereal Plane, you can see and hear the plane you originated from, which is cast in shades of gray, and you can't see anything there more than 60 feet away. You can only affect and be affected by other creatures on the Ethereal Plane. Creatures that aren't there can't perceive you or interact with you, unless they have the ability to do so."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -1536,12 +1536,12 @@
     "desc": [
       "Your body becomes blurred, shifting and wavering to all who can see you. For the duration, any creature has disadvantage on attack rolls against you. An attacker is immune to this effect if it doesn't rely on sight, as with blindsight, or can see through illusions, as with truesight."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "illusion",
@@ -1583,12 +1583,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the extra damage increases by 1d6 for each slot level above 2nd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -1632,12 +1632,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the damage increases by 1d6 for each slot level above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "damage": {
       "damage_type": {
@@ -1711,12 +1711,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th or higher level, the damage increases by 1d10 for each slot level above 3rd."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "damage": {
       "damage_type": {
@@ -1771,12 +1771,12 @@
       "You attempt to suppress strong emotions in a group of people. Each humanoid in a 20-foot-radius sphere centered on a point you choose within range must make a charisma saving throw; a creature can choose to fail this saving throw if it wishes. If a creature fails its saving throw, choose one of the following two effects. You can suppress any effect causing a target to be charmed or frightened. When this spell ends, any suppressed effect resumes, provided that its duration has not expired in the meantime.",
       "Alternatively, you can make a target indifferent about creatures of your choice that it is hostile toward. This indifference ends if the target is attacked or harmed by a spell or if it witnesses any of its friends being harmed. When the spell ends, the creature becomes hostile again, unless the GM rules otherwise."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -1826,13 +1826,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, one additional bolt leaps from the first target to another target for each slot level above 6th."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "A bit of fur; a piece of amber, glass, or a crystal rod; and three silver pins.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -1881,12 +1881,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you can target one additional creature for each slot level above 1st. The creatures must be within 30 feet of each other when you target them."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -1945,12 +1945,12 @@
       "If you hit an undead target, it also has disadvantage on attack rolls against you until the end of your next turn.",
       "This spell's damage increases by 1d8 when you reach 5th level (2d8), 11th level (3d8), and 17th level (4d8)."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "attack_type": "ranged",
     "damage": {
@@ -2006,13 +2006,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the damage increases by 2d6 for each slot level above 6th."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "The powder of a crushed black pearl worth at least 500 gp.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -2072,13 +2072,13 @@
       "When you cast the spell, you choose seeing or hearing. You can use the chosen sense through the sensor as if you were in its space. As your action, you can switch between seeing and hearing.",
       "A creature that can see the sensor (such as a creature benefiting from see invisibility or truesight) sees a luminous, intangible orb about the size of your fist."
     ],
-    "range": {"value": 1, "unit": "mile"},
+    "range": {"type": "mile", "amount": 1},
     "components": ["V", "S", "M"],
     "material": "A focus worth at least 100gp, either a jeweled horn for hearing or a glass eye for seeing.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 3,
     "school": {
       "index": "divination",
@@ -2123,13 +2123,13 @@
       "This spell grows an inert duplicate of a living creature as a safeguard against death. This clone forms inside a sealed vessel and grows to full size and maturity after 120 days; you can also choose to have the clone be a younger version of the same creature. It remains inert and endures indefinitely, as long as its vessel remains undisturbed.",
       "At any time after the clone matures, if the original creature dies, its soul transfers to the clone, provided that the soul is free and willing to return. The clone is physically identical to the original and has the same personality, memories, and abilities, but none of the original's equipment. The original creature's physical remains, if they still exist, become inert and can't thereafter be restored to life, since the creature's soul is elsewhere."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A diamond worth at least 1,000 gp and at least 1 cubic inch of flesh of the creature that is to be cloned, which the spell consumes, and a vessel worth at least 2,000 gp that has a sealable lid and is large enough to hold a Medium creature, such as a huge urn, coffin, mud-filled cyst in the ground, or crystal container filled with salt water.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 8,
     "school": {
       "index": "necromancy",
@@ -2157,12 +2157,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the damage increases by 1d8 for each slot level above 5th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "damage": {
       "damage_type": {
@@ -2227,13 +2227,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, roll an additional 2d10 for each slot level above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pinch of powder or sand that is colored red, yellow, and blue.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "cone",
@@ -2280,12 +2280,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you can affect one additional creature for each slot level above 1st. The creatures must be within 30 feet of each other when you target them."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -2334,13 +2334,13 @@
       "Divine beings aren't necessarily omniscient, so you might receive \"unclear\" as an answer if a question pertains to information that lies beyond the deity's knowledge. In a case where a one-word answer could be misleading or contrary to the deity's interests, the GM might offer a short phrase as an answer instead.",
       "If you cast the spell two or more times before finishing your next long rest, there is a cumulative 25 percent chance for each casting after the first that you get no answer. The GM makes this roll in secret."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Incense and a vial of holy or unholy water.",
     "ritual": true,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "school": {
       "index": "divination",
@@ -2376,12 +2376,12 @@
       "- buildings",
       "For example, you could determine the location of powerful undead in the area, the location of major sources of safe drinking water, and the location of any nearby towns."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "school": {
       "index": "divination",
@@ -2416,13 +2416,13 @@
       "For the duration, you understand the literal meaning of any spoken language that you hear. You also understand any written language that you see, but you must be touching the surface on which the words are written. It takes about 1 minute to read one page of text.",
       "This spell doesn't decode secret messages in a text or a glyph, such as an arcane sigil, that isn't part of a written language."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pinch of soot and salt.",
     "ritual": true,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "divination",
@@ -2467,12 +2467,12 @@
       "Creatures of your choice that you can see within range and that can hear you must make a wisdom saving throw. A target automatically succeeds on this saving throw if it can't be charmed. On a failed save, a target is affected by this spell. Until the spell ends, you can use a bonus action on each of your turns to designate a direction that is horizontal to you. Each affected target must use as much of its movement as possible to move in that direction on its next turn. It can take any action before it moves. After moving in this way, it can make another Wisdom save to try to end the effect.",
       "A target isn't compelled to move into an obviously deadly hazard, such as a fire or a pit, but it will provoke opportunity attacks to move in the designated direction."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "dc": {
       "dc_type": {
@@ -2507,13 +2507,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the damage increases by 1d8 for each slot level above 5th."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A small crystal or glass cone.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "damage": {
       "damage_type": {
@@ -2585,13 +2585,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level or higher, the radius of the sphere increases by 5 feet for each slot level above 4th."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "Three walnut shells.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "dc": {
       "dc_type": {
@@ -2651,12 +2651,12 @@
     "higher_level": [
       "When you cast this spell using certain higher-level spell slots, you choose one of the summoning options above, and more creatures appear: twice as many with a 5th-level slot, three times as many with a 7th-level."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "conjuration",
@@ -2695,12 +2695,12 @@
     "higher_level": [
       "When you cast this spell using a 9th-level spell slot, you summon a celestial of challenge rating 5 or lower."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 7,
     "school": {
       "index": "conjuration",
@@ -2729,13 +2729,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the challenge rating increases by 1 for each slot level above 5th."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "Burning incense for air, soft clay for earth, sulfur and phosphorus for fire, or water and sand for water.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "area_of_effect": {
       "type": "cube",
@@ -2779,12 +2779,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the challenge rating increases by 1 for each slot level above 6th."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 6,
     "school": {
       "index": "conjuration",
@@ -2822,12 +2822,12 @@
     "higher_level": [
       "When you cast this spell using certain higher-level spell slots, you choose one of the summoning options above, and more creatures appear: twice as many with a 6th-level slot and three times as many with an 8th-level slot."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 4,
     "school": {
       "index": "conjuration",
@@ -2865,13 +2865,13 @@
     "higher_level": [
       "When you cast this spell using certain higher-level spell slots, you choose one of the summoning options above, and more creatures appear: twice as many with a 6th-level slot and three times as many with an 8th-level slot."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "One holly berry per creature summoned.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "conjuration",
@@ -2900,12 +2900,12 @@
       "You mentally contact a demigod, the spirit of a long-dead sage, or some other mysterious entity from another plane. Contacting this extraplanar intelligence can strain or even break your mind. When you cast this spell, make a DC 15 intelligence saving throw. On a failure, you take 6d6 psychic damage and are insane until you finish a long rest. While insane, you can't take actions, can't understand what other creatures say, can't read, and speak only in gibberish. A greater restoration spell cast on you ends this effect.",
       "On a successful save, you can ask the entity up to five questions. You must ask your questions before the spell ends. The GM answers each question with one word, such as \"yes,\" \"no,\" \"maybe,\" \"never,\" \"irrelevant,\" or \"unclear\" (if the entity doesn't know the answer to the question). If a one-word answer would be misleading, the GM might instead offer a short phrase as an answer."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": true,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -2950,12 +2950,12 @@
       "***Seizure.*** The creature is overcome with shaking. The creature has disadvantage on dexterity checks, dexterity saving throws, and attack rolls that use Dexterity.",
       "***Slimy Doom.*** The creature begins to bleed uncontrollably. The creature has disadvantage on constitution checks and constitution saving throws. In addition, whenever the creature takes damage, it is stunned until the end of its next turn."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 7, "unit": "day"},
+    "duration": {"type": "day", "amount": 7},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "attack_type": "melee",
     "dc": {
@@ -2995,13 +2995,13 @@
       "The contingent spell takes effect immediately after the circumstance is met for the first time, whether or not you want it to. and then contingency ends.",
       "The contingent spell takes effect only on you, even if it can normally target others. You can use only one contingency spell at a time. If you cast this spell again, the effect of another contingency spell on you ends. Also, contingency ends on you if its material component is ever not on your person."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A statuette of yourself carved from ivory and decorated with gems worth at least 1,500 gp.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "day"},
+    "duration": {"type": "day", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 6,
     "school": {
       "index": "evocation",
@@ -3024,13 +3024,13 @@
     "desc": [
       "A flame, equivalent in brightness to a torch, springs forth from an object that you touch. The effect looks like a regular flame, but it creates no heat and doesn't use oxygen. A continual flame can be covered or hidden but not smothered or quenched."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Ruby dust worth 50 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "evocation",
@@ -3072,13 +3072,13 @@
       "When a creature enters the vortex for the first time on a turn or starts its turn there, it must make a strength saving throw. On a failed save, the creature takes 2d8 bludgeoning damage and is caught in the vortex until the spell ends. On a successful save, the creature takes half damage, and isn't caught in the vortex. A creature caught in the vortex can use its action to try to swim away from the vortex as described above, but has disadvantage on the Strength (Athletics) check to do so.",
       "The first time each turn that an object enters the vortex, the object takes 2d8 bludgeoning damage; this damage occurs each round it remains in the vortex."
     ],
-    "range": {"value": 300, "unit": "foot"},
+    "range": {"type": "foot", "amount": 300},
     "components": ["V", "S", "M"],
     "material": "A drop of water and a pinch of dust.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -3160,13 +3160,13 @@
       "| 4 | Gale |",
       "| 5 | Storm |"
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Burning incense and bits of earth and wood mixed in water.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 8, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 8,
     "school": {
       "index": "transmutation",
@@ -3208,12 +3208,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the interrupted spell has no effect if its level is less than or equal to the level of the spell slot you used."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "reaction"},
+    "casting_time": {"type": "reaction", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -3246,12 +3246,12 @@
     "desc": [
       "You create 45 pounds of food and 30 gallons of water on the ground or in containers within range, enough to sustain up to fifteen humanoids or five steeds for 24 hours. The food is bland but nourishing, and spoils if uneaten after 24 hours. The water is clean and doesn't go bad."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "conjuration",
@@ -3300,13 +3300,13 @@
     "higher_level": [
       "When you cast this spell using a 7th-level spell slot, you can animate or reassert control over four ghouls. When you cast this spell using an 8th-level spell slot, you can animate or reassert control over five ghouls or two ghasts or wights. When you cast this spell using a 9th-level spell slot, you can animate or reassert control over six ghouls, three ghasts or wights, or two mummies."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S", "M"],
     "material": "One clay pot filled with grave dirt, one clay pot filled with brackish water, and one 150 gp black onyx stone for each corpse.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 6,
     "school": {
       "index": "necromancy",
@@ -3344,13 +3344,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you create or destroy 10 additional gallons of water, or the size of the cube increases by 5 feet, for each slot level above 1st."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A drop of water if creating water, or a few grains of sand if destroying it.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "cube",
@@ -3400,13 +3400,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the cube increases by 5 feet for each slot level above 5th."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A tiny piece of matter of the same type of the item you plan to create.",
     "ritual": false,
     "duration": {"type": "special"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "area_of_effect": {
       "type": "cube",
@@ -3441,12 +3441,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the healing increases by 1d8 for each slot level above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "heal_at_slot_level": {
       "1": "1d8 + MOD",
@@ -3512,13 +3512,13 @@
       "You create up to four torch-sized lights within range, making them appear as torches, lanterns, or glowing orbs that hover in the air for the duration. You can also combine the four lights into one glowing vaguely humanoid form of Medium size. Whichever form you choose, each light sheds dim light in a 10-foot radius.",
       "As a bonus action on your turn, you can move the lights up to 60 feet to a new spot within range. A light must be within 20 feet of another light created by this spell, and a light winks out if it exceeds the spell's range."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A bit of phosphorus or wychwood, or a glowworm.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "evocation",
@@ -3559,13 +3559,13 @@
       "If the point you choose is on an object you are holding or one that isn't being worn or carried, the darkness emanates from the object and moves with it. Completely covering the source of the darkness with an opaque object, such as a bowl or a helm, blocks the darkness.",
       "If any of this spell's area overlaps with an area of light created by a spell of 2nd level or lower, the spell that created the light is dispelled."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "M"],
     "material": "Bat fur and a drop of pitch or piece of coal.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "area_of_effect": {
       "type": "sphere",
@@ -3613,13 +3613,13 @@
     "desc": [
       "You touch a willing creature to grant it the ability to see in the dark. For the duration, that creature has darkvision out to a range of 60 feet."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Either a pinch of dried carrot or an agate.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -3665,12 +3665,12 @@
       "If you chose a point on an object you are holding or one that isn't being worn or carried, the light shines from the object and moves with it. Completely covering the affected object with an opaque object, such as a bowl or a helm, blocks the light.",
       "If any of this spell's area overlaps with an area of darkness created by a spell of 3rd level or lower, the spell that created the darkness is dispelled."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "area_of_effect": {
       "type": "sphere",
@@ -3730,12 +3730,12 @@
       "The first time the target would drop to 0 hit points as a result of taking damage, the target instead drops to 1 hit point, and the spell ends.",
       "If the spell is still in effect when the target is subjected to an effect that would kill it instantaneously without dealing damage, that effect is instead negated against the target, and the spell ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "abjuration",
@@ -3775,13 +3775,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 8th level or higher, the base damage increases by 1d6 for each slot level above 7th."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "A tiny ball of bat guano and sulfur.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "damage": {
       "damage_type": {
@@ -3834,12 +3834,12 @@
       "You create a shadowy door on a flat solid surface that you can see within range. The door is large enough to allow Medium creatures to pass through unhindered. When opened, the door leads to a demiplane that appears to be an empty room 30 feet in each dimension, made of wood or stone. When the spell ends, the door disappears, and any creatures or objects inside the demiplane remain trapped there, as the door also disappears from the other side.",
       "Each time you cast this spell, you can create a new demiplane, or have the shadowy door connect to a demiplane you created with a previous casting of this spell. Additionally, if you know the nature and contents of a demiplane created by a casting of this spell by another creature, you can have the shadowy door connect to its demiplane instead."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "school": {
       "index": "conjuration",
@@ -3868,12 +3868,12 @@
       "For the duration, you know if there is an aberration, celestial, elemental, fey, fiend, or undead within 30 feet of you, as well as where the creature is located. Similarly, you know if there is a place or object within 30 feet of you that has been magically consecrated or desecrated.",
       "The spell can penetrate most barriers, but it is blocked by 1 foot of stone, 1 inch of common metal, a thin sheet of lead, or 3 feet of wood or dirt."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "sphere",
@@ -3912,12 +3912,12 @@
       "For the duration, you sense the presence of magic within 30 feet of you. If you sense magic in this way, you can use your action to see a faint aura around any visible creature or object in the area that bears magic, and you learn its school of magic, if any.",
       "The spell can penetrate most barriers, but it is blocked by 1 foot of stone, 1 inch of common metal, a thin sheet of lead, or 3 feet of wood or dirt."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": true,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "sphere",
@@ -3981,13 +3981,13 @@
       "For the duration, you can sense the presence and location of poisons, poisonous creatures, and diseases within 30 feet of you. You also identify the kind of poison, poisonous creature, or disease in each case.",
       "The spell can penetrate most barriers, but it is blocked by 1 foot of stone, 1 inch of common metal, a thin sheet of lead, or 3 feet of wood or dirt."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A yew leaf.",
     "ritual": true,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "sphere",
@@ -4039,13 +4039,13 @@
       "You can also use this spell to detect the presence of thinking creatures you can't see. When you cast the spell or as your action during the duration, you can search for thoughts within 30 feet of you. The spell can penetrate barriers, but 2 feet of rock, 2 inches of any metal other than lead, or a thin sheet of lead blocks you. You can't detect a creature with an Intelligence of 3 or lower or one that doesn't speak any language.",
       "Once you detect the presence of a creature in this way, you can read its thoughts for the rest of the duration as described above, even if you can't see it, but it must still be within range."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A copper coin.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "divination",
@@ -4086,12 +4086,12 @@
       "You can bring along objects as long as their weight doesn't exceed what you can carry. You can also bring one willing creature of your size or smaller who is carrying gear up to its carrying capacity. The creature must be within 5 feet of you when you cast this spell.",
       "If you would arrive in a place already occupied by an object or a creature, you and any creature traveling with you each take 4d6 force damage, and the spell fails to teleport you."
     ],
-    "range": {"value": 500, "unit": "foot"},
+    "range": {"type": "foot", "amount": 500},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -4141,12 +4141,12 @@
       "The changes wrought by this spell fail to hold up to physical inspection. For example, if you use this spell to add a hat to your outfit, objects pass through the hat, and anyone who touches it would feel nothing or would feel your head and hair. If you use this spell to appear thinner than you are, the hand of someone who reaches out to touch you would bump into you while it was seemingly still in midair.",
       "To discern that you are disguised, a creature can use its action to inspect your appearance and must succeed on an Intelligence (Investigation) check against your spell save DC."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "illusion",
@@ -4191,13 +4191,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the damage increases by 3d6 for each slot level above 6th."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A lodestone and a pinch of dust.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -4250,13 +4250,13 @@
       "***Break Enchantment.*** As your action, you touch a creature you can reach that is charmed, frightened, or possessed by a celestial, an elemental, a fey, a fiend, or an undead. The creature you touch is no longer charmed, frightened, or possessed by such creatures.",
       "***Dismissal.*** As your action, make a melee spell attack against a celestial, an elemental, a fey, a fiend, or an undead you can reach. On a hit, you attempt to drive the creature back to its home plane. The creature must succeed on a charisma saving throw or be sent back to its home plane (if it isn't there already). If they aren't on their home plane, undead are sent to the Shadowfell, and fey are sent to the Feywild."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Holy water or powdered silver and iron.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -4296,12 +4296,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, you automatically end the effects of a spell on the target if the spell's level is equal to or less than the level of the spell slot you used."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -4367,13 +4367,13 @@
       "The spell doesn't take into account any possible circumstances that might change the outcome, such as the casting of additional spells or the loss or gain of a companion.",
       "If you cast the spell two or more times before finishing your next long rest, there is a cumulative 25 percent chance for each casting after the first that you get a random reading. The GM makes this roll in secret."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Incense and a sacrificial offering appropriate to your religion, together worth at least 25gp, which the spell consumes.",
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "divination",
@@ -4402,12 +4402,12 @@
     "desc": [
       "Your prayer empowers you with divine radiance. Until the spell ends, your weapon attacks deal an extra 1d4 radiant damage on a hit."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 1,
     "damage": {
       "damage_type": {
@@ -4451,12 +4451,12 @@
       "- 20 hit points or fewer: killed instantly",
       "Regardless of its current hit points, a celestial, an elemental, a fey, or a fiend that fails its save is forced back to its plane of origin (if it isn't there already) and can't return to your current plane for 24 hours by any means short of a wish spell."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 7,
     "dc": {
       "dc_type": {
@@ -4493,12 +4493,12 @@
     "higher_level": [
       "When you cast this spell with a 9th level spell slot, the duration is concentration, up to 8 hours."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "dc": {
       "dc_type": {
@@ -4540,12 +4540,12 @@
     "higher_level": [
       "When you cast this spell with a 9th-level spell slot, the duration is concentration, up to 8 hours."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "dc": {
       "dc_type": {
@@ -4598,12 +4598,12 @@
     "higher_level": [
       "When you cast this spell using a 6th-level spell slot, the duration is concentration, up to 10 minutes. When you use a 7th-level spell slot, the duration is concentration, up to 1 hour. When you use a spell slot of 8th level or higher, the duration is concentration, up to 8 hours."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -4653,9 +4653,9 @@
     "components": ["V", "S", "M"],
     "material": "A handful of sand, a dab of ink, and a writing quill plucked from a sleeping bird.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "damage": {
       "damage_type": {
@@ -4717,12 +4717,12 @@
       "- You create an instantaneous, harmless sensory effect, such as falling leaves, a puff of wind, the sound of a small animal, or the faint order of skunk. The effect must fit in a 5-foot cube.",
       "- You instantly light or snuff out a candle, a torch, or a small campfire."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "transmutation",
@@ -4751,13 +4751,13 @@
       "A fissure that opens beneath a structure causes it to automatically collapse (see below).",
       "Structures. The tremor deals 50 bludgeoning damage to any structure in contact with the ground in the area when you cast the spell and at the start of each of your turns until the spell ends. If a structure drops to 0 hit points, it collapses and potentially damages nearby creatures. A creature within half the distance of a structure's height must make a dexterity saving throw. On a failed save, the creature takes 5d6 bludgeoning damage, is knocked prone, and is buried in the rubble, requiring a DC 20 Strength (Athletics) check as an action to escape. The GM can adjust the DC higher or lower, depending on the nature of the rubble. On a successful save, the creature takes half as much damage and doesn't fall prone or become buried."
     ],
-    "range": {"value": 500, "unit": "foot"},
+    "range": {"type": "foot", "amount": 500},
     "components": ["V", "S", "M"],
     "material": "A pinch of dirt, a piece of rock, and a lump of clay.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "area_of_effect": {
       "type": "sphere",
@@ -4794,12 +4794,12 @@
     "desc": [
       "A beam of crackling energy streaks toward a creature within range. Make a ranged spell attack against the target. On a hit, the target takes 1d10 force damage. The spell creates more than one beam when you reach higher levels: two beams at 5th level, three beams at 11th level, and four beams at 17th level. You can direct the beams at the same target or at different ones. Make a separate attack roll for each beam."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "attack_type": "ranged",
     "damage": {
@@ -4851,13 +4851,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, you can target one additional creature for each slot level above 2nd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Fur or a feather from a beast.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -4904,13 +4904,13 @@
       "***Enlarge.*** The target's size doubles in all dimensions, and its weight is multiplied by eight. This growth increases its size by one category-from Medium to Large, for example. If there isn't enough room for the target to double its size, the creature or object attains the maximum possible size in the space available. Until the spell ends, the target also has advantage on Strength checks and Strength saving throws. The target's weapons also grow to match its new size. While these weapons are enlarged, the target's attacks with them deal 1d4 extra damage.",
       "***Reduce.*** The target's size is halved in all dimensions, and its weight is reduced to one-eighth of normal. This reduction decreases its size by one category-from Medium to Small, for example. Until the spell ends, the target also has disadvantage on Strength checks and Strength saving throws. The target's weapons also shrink to match its new size. While these weapons are reduced, the target's attacks with them deal 1d4 less damage (this can't reduce the damage below 1)."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A pinch iron powder.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -4954,12 +4954,12 @@
       "A creature in the area when you cast the spell must succeed on a strength saving throw or be restrained by the entangling plants until the spell ends. A creature restrained by the plants can use its action to make a Strength check against your spell save DC. On a success, it frees itself.",
       "When the spell ends, the conjured plants wilt away."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -5000,12 +5000,12 @@
     "desc": [
       "You weave a distracting string of words, causing creatures of your choice that you can see within range and that can hear you to make a wisdom saving throw. Any creature that can't be charmed succeeds on this saving throw automatically, and if you or your companions are fighting a creature, it has advantage on the save. On a failed save, the target has disadvantage on Wisdom (Perception) checks made to perceive any creature other than you until the spell ends or until the target can no longer hear you. The spell ends if you are incapacitated or can no longer speak."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -5054,12 +5054,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 8th level or higher, you can target up to three willing creatures (including you) for each slot level above 7th. The creatures must be within 10 feet of you when you cast the spell."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "school": {
       "index": "transmutation",
@@ -5102,12 +5102,12 @@
     "desc": [
       "This spell allows you to move at an incredible pace. When you cast this spell, and then as a bonus action on each of your turns until the spell ends, you can take the Dash action."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 1,
     "school": {
       "index": "transmutation",
@@ -5149,12 +5149,12 @@
       "***Panicked.*** The target is frightened of you. On each of its turns, the frightened creature must take the Dash action and move away from you by the safest and shortest available route, unless there is nowhere to move. If the target moves to a place at least 60 feet away from you where it can no longer see you, this effect ends.",
       "***Sickened.*** The target has disadvantage on attack rolls and ability checks. At the end of each of its turns, it can make another wisdom saving throw. If it succeeds, the effect ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "dc": {
       "dc_type": {
@@ -5203,12 +5203,12 @@
       "Choose raw materials that you can see within range. You can fabricate a Large or smaller object (contained within a 10-foot cube, or eight connected 5-foot cubes), given a sufficient quantity of raw material. If you are working with metal, stone, or another mineral substance, however, the fabricated object can be no larger than Medium (contained within a single 5-foot cube). The quality of objects made by the spell is commensurate with the quality of the raw materials.",
       "Creatures or magic items can't be created or transmuted by this spell. You also can't use it to create items that ordinarily require a high degree of craftsmanship, such as jewelry, weapons, glass, or armor, unless you have proficiency with the type of artisan's tools used to craft such objects."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 4,
     "school": {
       "index": "transmutation",
@@ -5232,12 +5232,12 @@
       "Each object in a 20-foot cube within range is outlined in blue, green, or violet light (your choice). Any creature in the area when the spell is cast is also outlined in light if it fails a dexterity saving throw. For the duration, objects and affected creatures shed dim light in a 10-foot radius.",
       "Any attack roll against an affected creature or object has advantage if the attacker can see it, and the affected creature or object can't benefit from being invisible."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -5280,13 +5280,13 @@
       "The hound is invisible to all creatures except you and can't be harmed. When a Small or larger creature comes within 30 feet of it without first speaking the password that you specify when you cast this spell, the hound starts barking loudly. The hound sees invisible creatures and can see into the Ethereal Plane. It ignores illusions.",
       "At the start of each of your turns, the hound attempts to bite one creature within 5 feet of it that is hostile to you. The hound's attack bonus is equal to your spellcasting ability modifier + your proficiency bonus. On a hit, it deals 4d8 piercing damage."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A tiny silver whistle, a piece of bone, and a thread",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "attack_type": "melee",
     "damage": {
@@ -5323,13 +5323,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you gain 5 additional temporary hit points for each slot level above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A small amount of alcohol or distilled spirits.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "heal_at_slot_level": {
       "1": "1d4 + 4",
@@ -5375,13 +5375,13 @@
       "You project a phantasmal image of a creature's worst fears. Each creature in a 30-foot cone must succeed on a wisdom saving throw or drop whatever it is holding and become frightened for the duration.",
       "While frightened by this spell, a creature must take the Dash action and move away from you by the safest available route on each of its turns, unless there is nowhere to move. If the creature ends its turn in a location where it doesn't have line of sight to you, the creature can make a wisdom saving throw. On a successful save, the spell ends for that creature."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A white feather or the heart of a hen.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "dc": {
       "dc_type": {
@@ -5438,13 +5438,13 @@
     "desc": [
       "Choose up to five falling creatures within range. A falling creature's rate of descent slows to 60 feet per round until the spell ends. If the creature lands before the spell ends, it takes no falling damage and can land on its feet, and the spell ends for that creature."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "M"],
     "material": "A small feather or a piece of down.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "reaction"},
+    "casting_time": {"type": "reaction", "amount": 1},
     "level": 1,
     "school": {
       "index": "transmutation",
@@ -5486,13 +5486,13 @@
       "At the end of every 30 days, the creature can repeat its saving throw against this spell. If it succeeds on its saving throw, the spell ends.",
       "The spell can also be ended by greater restoration, heal, or wish."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "A handful of clay, crystal, glass, or mineral spheres.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "damage": {
       "damage_type": {
@@ -5555,13 +5555,13 @@
       "You can't have more than one familiar at a time. If you cast this spell while you already have a familiar, you instead cause it to adopt a new form. Choose one of the forms from the above list. Your familiar transforms into the chosen creature.",
       "Finally, when you cast a spell with a range of touch, your familiar can deliver the spell as if it had cast the spell. Your familiar must be within 100 feet of you, and it must use its reaction to deliver the spell when you cast it. If the spell requires an attack roll, you use your action modifier for the roll."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S", "M"],
     "material": "10gp worth of charcoal, incense, and herbs that must be consumed by fire in a brass brazier.",
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 1,
     "school": {
       "index": "conjuration",
@@ -5588,12 +5588,12 @@
       "While your steed is within 1 mile of you, you can communicate with it telepathically.",
       "You can't have more than one steed bonded by this spell at a time. As an action, you can release the steed from its bond at any time, causing it to disappear."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 2,
     "school": {
       "index": "conjuration",
@@ -5623,12 +5623,12 @@
       "You sense the presence of any trap within range that is within line of sight. A trap, for the purpose of this spell, includes anything that would inflict a sudden or unexpected effect you consider harmful or undesirable, which was specifically intended as such by its creator. Thus, the spell would sense an area affected by the alarm spell, a glyph of warding, or a mechanical pit trap, but it would not reveal a natural weakness in the floor, an unstable ceiling, or a hidden sinkhole.",
       "This spell merely reveals that a trap is present. You don't learn the location of each trap, but you do learn the general nature of the danger posed by a trap you sense."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "divination",
@@ -5668,13 +5668,13 @@
       "This spell allows you to find the shortest, most direct physical route to a specific fixed location that you are familiar with on the same plane of existence. If you name a destination on another plane of existence, a destination that moves (such as a mobile fortress), or a destination that isn't specific (such as \"a green dragon's lair\"), the spell fails.",
       "For the duration, as long as you are on the same plane of existence as the destination, you know how far it is and in what direction it lies. While you are traveling there, whenever you are presented with a choice of paths along the way, you automatically determine which path is the shortest and most direct route (but not necessarily the safest route) to the destination."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A set of divinatory tools--such as bones, ivory sticks, cards, teeth, or carved runes--worth 100gp and an object from the location you wish to find.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 24, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 6,
     "school": {
       "index": "divination",
@@ -5703,12 +5703,12 @@
       "You send negative energy coursing through a creature that you can see within range, causing it searing pain. The target must make a constitution saving throw. It takes 7d8 + 30 necrotic damage on a failed save, or half as much damage on a successful one.",
       "A humanoid killed by this spell rises at the start of your next turn as a zombie that is permanently under your command, following your verbal orders to the best of its ability."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "damage": {
       "damage_type": {
@@ -5760,12 +5760,12 @@
       "You hurl a mote of fire at a creature or object within range. Make a ranged spell attack against the target. On a hit, the target takes 1d10 fire damage. A flammable object hit by this spell ignites if it isn't being worn or carried.",
       "This spell's damage increases by 1d10 when you reach 5th level (2d10), 11th level (3d10), and 17th level (4d10)."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "attack_type": "ranged",
     "damage": {
@@ -5809,13 +5809,13 @@
       "The flames are around you a heat shield or cold, your choice. The heat shield gives you cold damage resistance and the cold resistance to fire damage.",
       "In addition, whenever a creature within 5 feet of you hits you with a melee attack, flames spring from the shield. The attacker then suffers 2d8 points of fire damage or cold, depending on the model."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A little phosphorus or a firefly.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -5859,12 +5859,12 @@
       "A storm made up of sheets of roaring flame appears in a location you choose within range. The area of the storm consists of up to ten 10-foot cubes, which you can arrange as you wish. Each cube must have at least one face adjacent to the face of another cube. Each creature in the area must make a dexterity saving throw. It takes 7d10 fire damage on a failed save, or half as much damage on a successful one.",
       "The fire damages objects in the area and ignites flammable objects that aren't being worn or carried. If you choose, plant life in the area is unaffected by this spell."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "damage": {
       "damage_type": {
@@ -5923,13 +5923,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the damage increases by 1d6 for each slot level above 3rd."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "A tiny ball of bat guano and sulfur.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "damage": {
       "damage_type": {
@@ -6001,13 +6001,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the damage increases by 1d6 for every two slot levels above 2nd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Leaf of sumac.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -6052,13 +6052,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the fire damage or the radiant damage (your choice) increases by 1d6 for each slot level above 5th."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "Pinch of sulfur.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "damage": {
       "damage_type": {
@@ -6123,13 +6123,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the damage increases by 1d6 for each slot level above 2nd."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A bit of tallow, a pinch of brimstone, and a dusting of powdered iron.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -6183,13 +6183,13 @@
       "If the creature is physically broken while petrified, it suffers from similar deformities if it reverts to its original state.",
       "If you maintain your concentration on this spell for the entire possible duration, the creature is turned to stone until the effect is removed."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A pinch of lime, water, and earth.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "dc": {
       "dc_type": {
@@ -6228,13 +6228,13 @@
       "The disk is immobile while you are within 20 feet of it. If you move more than 20 feet away from it, the disk follows you so that it remains within 20 feet of you. If can move across uneven terrain, up or down stairs, slopes and the like, but it can't cross an elevation change of 10 feet or more. For example, the disk can't move across a 10-foot-deep pit, nor could it leave such a pit if it was created at the bottom.",
       "If you move more than 100 feet away from the disk (typically because it can't move around an obstacle to follow you), the spell ends."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A drop of mercury.",
     "ritual": true,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "conjuration",
@@ -6266,13 +6266,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, you can target one additional creature for each slot level above 3rd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A wing feather from any bird.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -6314,12 +6314,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the radius of the fog increases by 20 feet for each slot level above 1st."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "sphere",
@@ -6370,13 +6370,13 @@
       "When you cast this spell, you can designate a password. A creature that speaks the password as it enters the area takes no damage from the spell.",
       "The spell's area can't overlap with the area of another forbiddance spell. If you cast forbiddance every day for 30 days in the same location, the spell lasts until it is dispelled, and the material components are consumed on the last casting."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A sprinkling of holy water, rare incense, and powdered ruby worth at least 1,000 gp.",
     "ritual": true,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 6,
     "area_of_effect": {
       "type": "cube",
@@ -6408,13 +6408,13 @@
       "A creature inside the cage can't leave it by nonmagical means. If the creature tries to use teleportation or interplanar travel to leave the cage, it must first make a charisma saving throw. On a success, the creature can use that magic to exit the cage. On a failure, the creature can't exit the cage and wastes the use of the spell or effect. The cage also extends into the Ethereal Plane, blocking ethereal travel.",
       "This spell can't be dispelled by dispel magic."
     ],
-    "range": {"value": 100, "unit": "foot"},
+    "range": {"type": "foot", "amount": 100},
     "components": ["V", "S", "M"],
     "material": "Ruby dust worth 1,500 gp.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "area_of_effect": {
       "type": "cube",
@@ -6452,13 +6452,13 @@
       "You touch a willing creature and bestow a limited ability to see into the immediate future. For the duration, the target can't be surprised and has advantage on attack rolls, ability checks, and saving throws. Additionally, other creatures have disadvantage on attack rolls against the target for the duration.",
       "This spell immediately ends if you cast it again before its duration ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A hummingbird feather.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 9,
     "school": {
       "index": "divination",
@@ -6497,13 +6497,13 @@
       "You touch a willing creature. For the duration, the target's movement is unaffected by difficult terrain, and spells and other magical effects can neither reduce the target's speed nor cause the target to be paralyzed or restrained.",
       "The target can also spend 5 feet of movement to automatically escape from nonmagical restraints, such as manacles or a creature that has it grappled. Finally, being underwater imposes no penalties on the target's movement or attacks."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A leather strap, bound around the arm or a similar appendage.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "abjuration",
@@ -6557,13 +6557,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the damage increases by 1d6 for each slot level above 6th."
     ],
-    "range": {"value": 300, "unit": "foot"},
+    "range": {"type": "foot", "amount": 300},
     "components": ["V", "S", "M"],
     "material": "A small crystal sphere.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -6610,13 +6610,13 @@
       "While in this form, the target's only method of movement is a flying speed of 10 feet. The target can enter and occupy the space of another creature. The target has resistance to nonmagical damage, and it has advantage on Strength, Dexterity, and constitution saving throws. The target can pass through small holes, narrow openings, and even mere cracks, though it treats liquids as though they were solid surfaces. The target can't fall and remains hovering in the air even when stunned or otherwise incapacitated.",
       "While in the form of a misty cloud, the target can't talk or manipulate objects, and any objects it was carrying or holding can't be dropped, used, or otherwise interacted with. The target can't attack or cast spells."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A bit of gauze and a wisp of smoke.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -6663,13 +6663,13 @@
       "Deities and other planar rulers can prevent portals created by this spell from opening in their presence or anywhere within their domains.",
       "When you cast this spell, you can speak the name of a specific creature (a pseudonym, title, or nickname doesn't work). If that creature is on a plane other than the one you are on, the portal opens in the named creature's immediate vicinity and draws the creature through it to the nearest unoccupied space on your side of the portal. You gain no special power over the creature, and it is free to act as the GM deems appropriate. It might leave, attack you, or help you."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A diamond worth at least 5,000gp.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "school": {
       "index": "conjuration",
@@ -6707,12 +6707,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th or 8th level, the duration is 1 year. When you cast this spell using a spell slot of 9th level, the spell lasts until it is ended by one of the spells mentioned above."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 30, "unit": "day"},
+    "duration": {"type": "day", "amount": 30},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -6764,13 +6764,13 @@
       "You touch a corpse or other remains. For the duration, the target is protected from decay and can't become undead.",
       "The spell also effectively extends the time limit on raising the target from the dead, since days spent under the influence of this spell don't count against the time limit of spells such as raise dead."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pinch of salt and one copper piece placed on each of the corpse's eyes, which must remain there for the duration.",
     "ritual": true,
-    "duration": {"value": 10, "unit": "day"},
+    "duration": {"type": "day", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "necromancy",
@@ -6807,12 +6807,12 @@
       "A creature remains in its giant size for the duration, until it drops to 0 hit points, or until you use an action to dismiss the effect on it.",
       "The GM might allow you to choose different targets. For example, if you transform a bee, its giant version might have the same statistics as a giant wasp."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "transmutation",
@@ -6835,12 +6835,12 @@
     "desc": [
       "Until the spell ends, when you make a Charisma check, you can replace the number you roll with a 15. Additionally, no matter what you say, magic that would determine if you are telling the truth indicates that you are being truthful."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "school": {
       "index": "transmutation",
@@ -6872,13 +6872,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the barrier blocks spells of one level higher for each slot level above 6th."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A glass or crystal bead that shatters when the spell ends.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "area_of_effect": {
       "type": "sphere",
@@ -6919,13 +6919,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the damage of an explosive runes glyph increases by 1d8 for each slot level above 3rd. If you create a spell glyph, you can store any spell of up to the same level as the slot you use for the glyph of warding."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Incense and powdered diamond worth at least 200 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -6965,13 +6965,13 @@
       "Up to ten berries appear in your hand and are infused with magic for the duration. A creature can use its action to eat one berry. Eating a berry restores 1 hit point, and the berry provides enough nourishment to sustain a creature for a day.",
       "The berries lose their potency if they have not been consumed within 24 hours of the casting of this spell."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A sprig of mistletoe.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "transmutation",
@@ -7000,13 +7000,13 @@
       "Slick grease covers the ground in a 10-foot square centered on a point within range and turns it into difficult terrain for the duration.",
       "When the grease appears, each creature standing in its area must succeed on a dexterity saving throw or fall prone. A creature that enters the area or ends its turn there must also succeed on a dexterity saving throw or fall prone."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A bit of pork rind or butter.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -7047,12 +7047,12 @@
     "desc": [
       "You or a creature you touch becomes invisible until the spell ends. Anything the target is wearing or carrying is invisible as long as it is on the target's person."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "illusion",
@@ -7095,13 +7095,13 @@
       "- Any reduction to one of the target's ability scores",
       "- One effect reducing the target's hit point maximum"
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Diamond dust worth at least 100gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "abjuration",
@@ -7135,12 +7135,12 @@
       "A Large spectral guardian appears and hovers for the duration in an unoccupied space of your choice that you can see within range. The guardian occupies that space and is indistinct except for a gleaming sword and shield emblazoned with the symbol of your deity.",
       "Any creature hostile to you that moves to a space within 10 feet of the guardian for the first time on a turn must succeed on a dexterity saving throw. The creature takes 20 radiant damage on a failed save, or half as much damage on a successful one. The guardian vanishes when it has dealt a total of 60 damage."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -7203,13 +7203,13 @@
       "The whole warded area radiates magic. A dispel magic cast on a specific effect, if successful, removes only that effect.",
       "You can create a permanently guarded and warded structure by casting this spell there every day for one year."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Burning incense, a small measure of brimstone and oil, a knotted string, a small amount of umber hulk blood, and a small silver rod worth at least 10 gp.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 6,
     "area_of_effect": {
       "type": "cube",
@@ -7241,12 +7241,12 @@
     "desc": [
       "You touch one willing creature. Once before the spell ends, the target can roll a d4 and add the number rolled to one ability check of its choice. It can roll the die before or after making the ability check. The spell then ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "divination",
@@ -7283,12 +7283,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the damage increases by 1d6 for each slot level above 1st."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "attack_type": "ranged",
     "damage": {
@@ -7339,13 +7339,13 @@
       "The gust disperses gas or vapor, and it extinguishes candles, torches, and similar unprotected flames in the area. It causes protected flames, such as those of lanterns, to dance wildly and has a 50 percent chance to extinguish them.",
       "As a bonus action on each of your turns before the spell ends, you can change the direction in which the line blasts from you."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A legume seed.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -7408,13 +7408,13 @@
       "***Silence.*** No sound can emanate from within the area, and no sound can reach into it.",
       "***Tongues.*** Affected creatures can communicate with any other creature in the area, even if they don't share a common language."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Herbs, oils, and incense worth at least 1,000 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 24, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 24},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -7456,13 +7456,13 @@
       "You make natural terrain in a 150-foot cube in range look, sound, and smell like some other sort of natural terrain. Thus, open fields or a road can be made to resemble a swamp, hill, crevasse, or some other difficult or impassable terrain. A pond can be made to seem like a grassy meadow, a precipice like a gentle slope, or a rock-strewn gully like a wide and smooth road. Manufactured structures, equipment, and creatures within the area aren't changed in appearance.",
       "The tactile characteristics of the terrain are unchanged, so creatures entering the area are likely to see through the illusion. If the difference isn't obvious by touch, a creature carefully examining the illusion can attempt an Intelligence (Investigation) check against your spell save DC to disbelieve it. A creature who discerns the illusion for what it is, sees it as a vague image superimposed on the terrain."
     ],
-    "range": {"value": 300, "unit": "foot"},
+    "range": {"type": "foot", "amount": 300},
     "components": ["V", "S", "M"],
     "material": "A stone, a twig, and a bit of green plant.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 4,
     "area_of_effect": {
       "type": "cube",
@@ -7510,12 +7510,12 @@
     "desc": [
       "You unleash a virulent disease on a creature that you can see within range. The target must make a constitution saving throw. On a failed save, it takes 14d6 necrotic damage, or half as much damage on a successful save. The damage can't reduce the target's hit points below 1. If the target fails the saving throw, its hit point maximum is reduced for 1 hour by an amount equal to the necrotic damage it took. Any effect that removes a disease allows a creature's hit point maximum to return to normal before that time passes."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -7557,13 +7557,13 @@
       "Choose a willing creature that you can see within range. Until the spell ends, the target's speed is doubled, it gains a +2 bonus to AC, it has advantage on dexterity saving throws, and it gains an additional action on each of its turns. That action can be used only to take the Attack (one weapon attack only), Dash, Disengage, Hide, or Use an Object action.",
       "When the spell ends, the target can't move or take actions until after its next turn, as a wave of lethargy sweeps over it."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A shaving of licorice root.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -7605,12 +7605,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the amount of healing increases by 10 for each slot level above 6th."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "heal_at_slot_level": {
       "6": "70",
@@ -7647,12 +7647,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the healing increases by 1d4 for each slot level above 1st."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 1,
     "heal_at_slot_level": {
       "1": "1d4 + MOD",
@@ -7706,13 +7706,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the damage increases by 1d8 for each slot level above 2nd."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A piece of iron and a flame.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -7772,12 +7772,12 @@
     "desc": [
       "You point your finger, and the creature that damaged you is momentarily surrounded by hellish flames. The creature must make a dexterity saving throw. It takes 2d10 fire damage on a failed save, or half as much damage on a successful one."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "reaction"},
+    "casting_time": {"type": "reaction", "amount": 1},
     "level": 1,
     "damage": {
       "damage_type": {
@@ -7819,13 +7819,13 @@
       "You bring forth a great feast, including magnificent food and drink. The feast takes 1 hour to consume and disappears at the end of that time, and the beneficial effects don't set in until this hour is over. Up to twelve other creatures can partake of the feast.",
       "A creature that partakes of the feast gains several benefits. The creature is cured of all diseases and poison, becomes immune to poison and being frightened, and makes all wisdom saving throws with advantage. Its hit point maximum also increases by 2d10, and it gains the same number of hit points. These benefits last for 24 hours."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A gem-encrusted bowl worth at least 1,000gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 6,
     "school": {
       "index": "conjuration",
@@ -7853,12 +7853,12 @@
     "desc": [
       "A willing creature you touch is imbued with bravery. Until the spell ends, the creature is immune to being frightened and gains temporary hit points equal to your spellcasting ability modifier at the start of each of its turns. When the spell ends, the target loses any remaining temporary hit points from this spell."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "enchantment",
@@ -7893,13 +7893,13 @@
       "A creature of your choice that you can see within range perceives everything as hilariously funny and falls into fits of laughter if this spell affects it. The target must succeed on a wisdom saving throw or fall prone, becoming incapacitated and unable to stand up for the duration. A creature with an Intelligence score of 4 or less isn't affected.",
       "At the end of each of its turns, and each time it takes damage, the target can make another wisdom saving throw. The target had advantage on the saving throw if it's triggered by damage. On a success, the spell ends."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "Tiny tarts and a feather that is waved in the air.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "dc": {
       "dc_type": {
@@ -7944,13 +7944,13 @@
     "higher_level": [
       "When you cast this spell using a level 6 or higher location, you can target an additional creature for each level of location beyond the fifth. The creatures must be within 30 feet o f each other when you target them."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "A small piece of iron.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -7999,13 +7999,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, you can target one additional humanoid for each slot level above 2nd. The humanoids must be within 30 feet of each other when you target them."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A small, straight piece of iron.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -8072,13 +8072,13 @@
     "desc": [
       "Divine light washes out from you and coalesces in a soft radiance in a 30-foot radius around you. Creatures of your choice in that radius when you cast this spell shed dim light in a 5-foot radius and have advantage on all saving throws, and other creatures have disadvantage on attack rolls against them until the spell ends. In addition, when a fiend or an undead hits an affected creature with a melee attack, the aura flashes with brilliant light. The attacker must succeed on a constitution saving throw or be blinded until the spell ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A tiny reliquary worth at least 1,000gp containing a sacred relic, such as a scrap of cloth from a saint's robe or a piece of parchment from a religious text.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "area_of_effect": {
       "type": "sphere",
@@ -8108,12 +8108,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd or 4th level, you can maintain your concentration on the spell for up to 8 hours. When you use a spell slot of 5th level or higher, you can maintain your concentration on the spell for up to 24 hours."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 1,
     "school": {
       "index": "divination",
@@ -8142,13 +8142,13 @@
       "You create a twisting pattern of colors that weaves through the air inside a 30-foot cube within range. The pattern appears for a moment and vanishes. Each creature in the area who sees the pattern must make a wisdom saving throw. On a failed save, the creature becomes charmed for the duration. While charmed by this spell, the creature is incapacitated and has a speed of 0.",
       "The spell ends for an affected creature if it takes any damage or if someone else uses an action to shake the creature out of its stupor."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["S", "M"],
     "material": "A glowing stick of incense or a crystal vial filled with phosphorescent material.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "dc": {
       "dc_type": {
@@ -8205,13 +8205,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level or higher, the bludgeoning damage increases by 1d8 for each slot level above 4th."
     ],
-    "range": {"value": 300, "unit": "foot"},
+    "range": {"type": "foot", "amount": 300},
     "components": ["V", "S", "M"],
     "material": "A pinch of dust and a few drops of water.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -8278,13 +8278,13 @@
       "You choose one object that you must touch throughout the casting of the spell. If it is a magic item or some other magic-imbued object, you learn its properties and how to use them, whether it requires attunement to use, and how many charges it has, if any. You learn whether any spells are affecting the item and what they are. If the item was created by a spell, you learn which spell created it.",
       "If you instead touch a creature throughout the casting, you learn what spells, if any, are currently affecting it."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pearl worth at least 100gp and an owl feather.",
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 1,
     "school": {
       "index": "divination",
@@ -8321,13 +8321,13 @@
       "Should the spell be dispelled, the original script and the illusion both disappear.",
       "A creature with truesight can read the hidden message."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["S", "M"],
     "material": "A lead-based ink worth at least 10gp, which this spell consumes.",
     "ritual": true,
-    "duration": {"value": 10, "unit": "day"},
+    "duration": {"type": "day", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 1,
     "school": {
       "index": "illusion",
@@ -8380,13 +8380,13 @@
       "A dispel magic spell can end the spell only if it is cast as a 9th-level spell, targeting either the prison or the special component used to create it.",
       "You can use a particular special component to create only one prison at a time. If you cast the spell again using the same component, the target of the first casting is immediately freed from its binding."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A vellum depiction or a carved statuette in the likeness of the target, and a special component that varies according to the version of the spell you choose, worth at least 500gp per Hit Die of the target.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 9,
     "dc": {
       "dc_type": {
@@ -8425,12 +8425,12 @@
       "When the cloud appears, each creature in it must make a dexterity saving throw. A creature takes 10d8 fire damage on a failed save, or half as much damage on a successful one. A creature must also make this saving throw when it enters the spell's area for the first time on a turn or ends its turn there.",
       "The cloud moves 10 feet directly away from you in a direction that you choose at the start of each of your turns."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "damage": {
       "damage_type": {
@@ -8483,12 +8483,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the damage increases by 1d10 for each slot level above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "attack_type": "melee",
     "damage": {
@@ -8540,13 +8540,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the damage increases by 1d10 for each slot level above 5th."
     ],
-    "range": {"value": 300, "unit": "foot"},
+    "range": {"type": "foot", "amount": 300},
     "components": ["V", "S", "M"],
     "material": "A few grains of sugar, some kernels of grain, and a smear of fat.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "damage": {
       "damage_type": {
@@ -8614,13 +8614,13 @@
       "If another creature is holding or carrying the item, crushing the sapphire doesn't transport the item to you, but instead you learn who the creature possessing the object is and roughly where that creature is located at that moment.",
       "Dispel magic or a similar effect successfully applied to the sapphire ends this spell's effect."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A sapphire worth 1,000 gp.",
     "ritual": true,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 6,
     "school": {
       "index": "conjuration",
@@ -8646,13 +8646,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, you can target one additional creature for each slot level above 2nd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "An eyelash encased in gum arabic.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "illusion",
@@ -8702,12 +8702,12 @@
       "Choose one creature that you can see within range. The target begins a comic dance in place: shuffling, tapping its feet, and capering for the duration. Creatures that can't be charmed are immune to this spell.",
       "A dancing creature must use all its movement to dance without leaving its space and has disadvantage on dexterity saving throws and attack rolls. While the target is affected by this spell, other creatures have advantage on attack rolls against it. As an action, a dancing creature makes a wisdom saving throw to regain control of itself. On a successful save, the spell ends."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "school": {
       "index": "enchantment",
@@ -8735,13 +8735,13 @@
     "desc": [
       "You touch a creature. The creature's jump distance is tripled until the spell ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A grasshopper's hind leg.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "transmutation",
@@ -8788,12 +8788,12 @@
       "If you choose a target that is held shut with arcane lock, that spell is suppressed for 10 minutes, during which time the target can be opened and shut normally.",
       "When you cast the spell, a loud knock, audible from as far away as 300 feet, emanates from the target object."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -8833,13 +8833,13 @@
       "Name or describe a person, place, or object. The spell brings to your mind a brief summary of the significant lore about the thing you named. The lore might consist of current tales, forgotten stories, or even secret lore that has never been widely known. If the thing you named isn't of legendary importance, you gain no information. The more information you already have about the thing, the more precise and detailed the information you receive is.",
       "The information you learn is accurate but might be couched in figurative language. For example, if you have a mysterious magic axe on hand the spell might yield this information: \"Woe to the evildoer whose hand touches the axe, for even the haft slices the hand of the evil ones. Only a true Child of Stone, lover and beloved of Moradin, may awaken the true powers of the axe, and only with the sacred word *Rudnogg* on the lips.\""
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Incense worth at least 250 gp, which the spell consumes, and four ivory strips worth at least 50 gp each.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 5,
     "school": {
       "index": "divination",
@@ -8872,12 +8872,12 @@
     "desc": [
       "You touch a creature and can end either one disease or one condition afflicting it. The condition can be blinded, deafened, paralyzed, or poisoned."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "abjuration",
@@ -8938,13 +8938,13 @@
       "The target can move only by pushing or pulling against a fixed object or surface within reach (such as a wall or a ceiling), which allows it to move as if it were climbing. You can change the target's altitude by up to 20 feet in either direction on your turn. If you are the target, you can move up or down as part of your move. Otherwise, you can use your action to move the target, which must remain within the spell's range.",
       "When the spell ends, the target floats gently to the ground if it is still aloft."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "Either a small leather loop or a piece of golden wire bent into a cup shape with a long shank on one end.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -8979,13 +8979,13 @@
       "You touch one object that is no larger than 10 feet in any dimension. Until the spell ends, the object sheds bright light in a 20-foot radius and dim light for an additional 20 feet. The light can be colored as you like. Completely covering the object with something opaque blocks the light. The spell ends if you cast it again or dismiss it as an action.",
       "If you target an object held or worn by a hostile creature, that creature must succeed on a dexterity saving throw to avoid the spell."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "M"],
     "material": "A firefly or phosphorescent moss.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "dc": {
       "dc_type": {
@@ -9041,13 +9041,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the damage increases by 1d6 for each slot level above 3rd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A bit of fur and a rod of amber, crystal, or glass.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "damage": {
       "damage_type": {
@@ -9114,13 +9114,13 @@
     "desc": [
       "Describe or name a specific kind of beast or plant. Concentrating on the voice of nature in your surroundings, you learn the direction and distance to the closest creature or plant of that kind within 5 miles, if any are present."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A bit of fur from a bloodhound.",
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "divination",
@@ -9161,13 +9161,13 @@
       "The spell can locate a specific creature known to you, or the nearest creature of a specific kind (such as a human or a unicorn), so long as you have seen such a creature up close--within 30 feet--at least once. If the creature you described or named is in a different form, such as being under the effects of a polymorph spell, this spell doesn't locate the creature.",
       "This spell can't locate a creature if running water at least 10 feet wide blocks a direct path between you and the creature."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A bit of fur from a bloodhound.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "divination",
@@ -9223,13 +9223,13 @@
       "The spell can locate a specific object known to you, as long as you have seen it up close--within 30 feet--at least once. Alternatively, the spell can locate the nearest object of a particular kind, such as a certain kind of apparel, jewelry, furniture, tool, or weapon.",
       "This spell can't locate an object if any thickness of lead, even a thin sheet, blocks a direct path between you and the object."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A forked twig.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "divination",
@@ -9286,13 +9286,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, you can target one additional creature for each spell slot above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pinch of dirt.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "transmutation",
@@ -9336,13 +9336,13 @@
     "desc": [
       "You touch a willing creature who isn't wearing armor, and a protective magical force surrounds it until the spell ends. The target's base AC becomes 13 + its Dexterity modifier. The spell ends if the target dons armor or if you dismiss the spell as an action."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A piece of cured leather.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "abjuration",
@@ -9378,12 +9378,12 @@
       "You can use your action to control the hand. You can use the hand to manipulate an object, open an unlocked door or container, stow or retrieve an item from an open container, or pour the contents out of a vial. You can move the hand up to 30 feet each time you use it.",
       "The hand can't attack, activate magic items, or carry more than 10 pounds."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "conjuration",
@@ -9435,13 +9435,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the duration increases by 1 hour for each slot level above 3rd."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S", "M"],
     "material": "Holy water or powdered silver and iron worth at least 100 gp, which the spell consumes.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 3,
     "area_of_effect": {
       "type": "cylinder",
@@ -9504,13 +9504,13 @@
       "If the container is destroyed or the spell ends, your soul immediately returns to your body. If your body is more than 100 feet away from you or if your body is dead when you attempt to return to it, you die. If another creature's soul is in the container when it is destroyed, the creature's soul returns to its body if the body is alive and within 100 feet. Otherwise, that creature dies.",
       "When the spell ends, the container is destroyed."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A gem, crystal, reliquary, or some other ornamental container worth at least 500 gp.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 6,
     "dc": {
       "dc_type": {
@@ -9545,12 +9545,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the spell creates one more dart for each slot level above 1st."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "damage": {
       "damage_type": {
@@ -9605,13 +9605,13 @@
       "When you cast this spell, you may decide that the spell ends when the message is delivered or it can persist and repeat the message whenever circumstances occur.",
       "The triggering circumstance can be as general or as detailed as you like, though it must be based on visual or audible conditions that occur within 30 feet of the object. For example, you could instruct the mouth to speak when any creature moves within 30 feet of the object or when a silver bell rings within 30 feet of it."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A honeycomb and jade dust of at least 10 inches, the spell consumes.",
     "ritual": true,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 2,
     "school": {
       "index": "illusion",
@@ -9648,12 +9648,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the bonus increases to +2. When you use a spell slot of 6th level or higher, the bonus increases to +3."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -9689,13 +9689,13 @@
       "Beyond the portal is a magnificent foyer with numerous chambers beyond. The atmosphere is clean, fresh, and warm.",
       "You can create any floor plan you like, but the space can't exceed 50 cubes, each cube being 10 feet on each side. The place is furnished and decorated as you choose. It contains sufficient food to serve a nine course banquet for up to 100 people. A staff of 100 near-transparent servants attends all who enter. You decide the visual appearance of these servants and their attire. They are completely obedient to your orders. Each servant can perform any task a normal human servant could perform, but they can't attack or take any action that would directly harm another creature. Thus the servants can fetch things, clean, mend, fold clothes, light fires, serve food, pour wine, and so on. The servants can go anywhere in the mansion but can't leave it. Furnishings and other objects created by this spell dissipate into smoke if removed from the mansion. When the spell ends, any creatures inside the extradimensional space are expelled into the open spaces nearest to the entrance."
     ],
-    "range": {"value": 300, "unit": "foot"},
+    "range": {"type": "foot", "amount": 300},
     "components": ["V", "S", "M"],
     "material": "A miniature portal carved from ivory, a small piece of polished marble, and a tiny silver spoon, each item worth at least 5 gp.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 7,
     "area_of_effect": {
       "type": "cube",
@@ -9732,13 +9732,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the spell lasts until dispelled, without requiring your concentration."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A bit of fleece.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "illusion",
@@ -9785,12 +9785,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 6th level or higher, the healing increases by 1d8 for each slot level above 5th."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "heal_at_slot_level": {
       "5": "3d8 + MOD",
@@ -9840,12 +9840,12 @@
     "desc": [
       "A flood of healing energy flows from you into injured creatures around you. You restore up to 700 hit points, divided as you choose among any number of creatures that you can see within range. Creatures healed by this spell are also cured of all diseases and any effect making them blinded or deafened. This spell has no effect on undead or constructs."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "heal_at_slot_level": {
       "9": "700"
@@ -9874,12 +9874,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the healing increases by 1d4 for each slot level above 3rd."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 3,
     "heal_at_slot_level": {
       "3": "1d4 + MOD",
@@ -9923,13 +9923,13 @@
     "higher_level": [
       "When you cast this spell using a 7th-level spell slot, the duration is 10 days. When you use an 8th-level spell slot, the duration is 30 days. When you use a 9th-level spell slot, the duration is a year and a day."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "M"],
     "material": "A snake's tongue and either a bit of honeycomb or a drop of sweet oil.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "dc": {
       "dc_type": {
@@ -9977,12 +9977,12 @@
       "The target can use its action to attempt to escape. When it does so, it makes a DC 20 Intelligence check. If it succeeds, it escapes, and the spell ends (a minotaur or goristro demon automatically succeeds).",
       "When the spell ends, the target reappears in the space it left or, if that space is occupied, in the nearest unoccupied space."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "school": {
       "index": "conjuration",
@@ -10007,12 +10007,12 @@
       "While merged with the stone, you can't see what occurs outside it, and any Wisdom (Perception) checks you make to hear sounds outside it are made with disadvantage. You remain aware of the passage of time and can cast spells on yourself while merged in the stone. You can use your movement to leave the stone where you entered it, which ends the spell. You otherwise can't move.",
       "Minor physical damage to the stone doesn't harm you, but its partial destruction or a change in its shape (to the extent that you no longer fit within it) expels you and deals 6d6 bludgeoning damage to you. The stone's complete destruction (or transmutation into a different substance) expels you and deals 50 bludgeoning damage to you. If expelled, you fall prone in an unoccupied space closest to where you first entered."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": true,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -10047,13 +10047,13 @@
       "This spell repairs a single break or tear in an object you touch, such as a broken key, a torn cloak, or a leaking wineskin. As long as the break or tear is no longer than 1 foot in any dimension, you mend it, leaving no trace of the former damage.",
       "This spell can physically repair a magic item or construct, but the spell can't restore magic to such an object."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Two lodestones.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 0,
     "school": {
       "index": "transmutation",
@@ -10103,13 +10103,13 @@
       "You point your finger toward a creature within range and whisper a message. The target (and only the target) hears the message and can reply in a whisper that only you can hear.",
       "You can cast this spell through solid objects if you are familiar with the target and know it is beyond the barrier. Magical silence, 1 foot of stone, 1 inch of common metal, a thin sheet of lead, or 3 feet of wood blocks the spell. The spell doesn't have to follow a straight line and can travel freely around corners or through openings."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A short piece of copper wire.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "transmutation",
@@ -10149,12 +10149,12 @@
       "Blazing orbs of fire plummet to the ground at four different points you can see within range. Each creature in a 40-foot-radius sphere centered on each point you choose must make a dexterity saving throw. The sphere spreads around corners. A creature takes 20d6 fire damage and 20d6 bludgeoning damage on a failed save, or half as much damage on a successful one. A creature in the area of more than one fiery burst is affected only once.",
       "The spell damages objects in the area and ignites flammable objects that aren't being worn or carried."
     ],
-    "range": {"value": 1, "unit": "mile"},
+    "range": {"type": "mile", "amount": 1},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "damage": {
       "damage_type": {
@@ -10204,12 +10204,12 @@
     "desc": [
       "Until the spell ends, one willing creature you touch is immune to psychic damage, any effect that would sense its emotions or read its thoughts, divination spells, and the charmed condition. The spell even foils wish spells and spells or effects of similar power used to affect the target's mind or to gain information about the target."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "school": {
       "index": "abjuration",
@@ -10240,13 +10240,13 @@
       "If you create an image of an object--such as a chair, muddy footprints, or a small chest--it must be no larger than a 5-foot cube. The image can't create sound, light, smell, or any other sensory effect. Physical interaction with the image reveals it to be an illusion, because things can pass through it.",
       "If a creature uses its action to examine the sound or image, the creature can determine that it is an illusion with a successful Intelligence (Investigation) check against your spell save DC. If a creature discerns the illusion for what it is, the illusion becomes faint to the creature."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["S", "M"],
     "material": "A bit of fleece.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "illusion",
@@ -10296,9 +10296,9 @@
     "range": {"type": "sight"},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "day"},
+    "duration": {"type": "day", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 7,
     "area_of_effect": {
       "type": "cube",
@@ -10339,12 +10339,12 @@
       "A duplicate's AC equals 10 + your Dexterity modifier. If an attack hits a duplicate, the duplicate is destroyed. A duplicate can be destroyed only by an attack that hits it. It ignores all other damage and effects. The spell ends when all three duplicates are destroyed.",
       "A creature is unaffected by this spell if it can't see, if it relies on senses other than sight, such as blindsight, or if it can perceive illusions as false, as with truesight."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "illusion",
@@ -10390,12 +10390,12 @@
       "You can use your action to move your illusory double up to twice your speed and make it gesture, speak, and behave in whatever way you choose.",
       "You can see through its eyes and hear through its ears as if you were located where it is. On each of your turns as a bonus action, you can switch from using its senses to using your own, or back again. While you are using its senses, you are blinded and deafened in regard to your own surroundings."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "illusion",
@@ -10423,12 +10423,12 @@
     "desc": [
       "Briefly surrounded by silvery mist, you teleport up to 30 feet to an unoccupied space that you can see."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 2,
     "school": {
       "index": "conjuration",
@@ -10479,12 +10479,12 @@
     "higher_level": [
       "If you cast this spell using a spell slot of 6th level or higher, you can alter the target's memories of an event that took place up to 7 days ago (6th level), 30 days ago (7th level), 1 year ago (8th level), or any time in the creature's past (9th level)."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -10526,13 +10526,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the damage increases by 1dl0 for each slot level above 2nd."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "Several seeds of any moonseed plant and a piece of opalescent feldspar.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -10594,13 +10594,13 @@
       "This spell can't manipulate natural stone or stone construction. Rocks and structures shift to accommodate the new terrain. If the way you shape the terrain would make a structure unstable, it might collapse.",
       "Similarly, this spell doesn't directly affect plant growth. The moved earth carries any plants along with it."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "An iron blade and a small bag containing a mixture of soils--clay, loam, and sand.",
     "ritual": false,
-    "duration": {"value": 2, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 2, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "area_of_effect": {
       "type": "cone",
@@ -10637,13 +10637,13 @@
     "desc": [
       "For the duration, you hide a target that you touch from divination magic. The target can be a willing creature or a place or an object no larger than 10 feet in any dimension. The target can't be targeted by any divination magic or perceived through magical scrying sensors."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pinch of diamond dust worth 25 gp sprinkled over the target, which the spell consumes.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -10682,13 +10682,13 @@
     "desc": [
       "A veil of shadows and silence radiates from you, masking you and your companions from detection. For the duration, each creature you choose within 30 feet of you (including you) has a +10 bonus to Dexterity (Stealth) checks and can't be tracked except by magical means. A creature that receives this bonus leaves behind no tracks or other traces of its passage."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Ashes from a burned leaf of mistletoe and a sprig of spruce.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "abjuration",
@@ -10728,13 +10728,13 @@
       "A passage appears at a point of your choice that you can see on a wooden, plaster, or stone surface (such as a wall, a ceiling, or a floor) within range, and lasts for the duration. You choose the opening's dimensions: up to 5 feet wide, 8 feet tall, and 20 feet deep. The passage creates no instability in a structure surrounding it.",
       "When the opening disappears, any creatures or objects still in the passage created by the spell are safely ejected to an unoccupied space nearest to the surface on which you cast the spell."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A pinch of sesame seeds.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "transmutation",
@@ -10766,12 +10766,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level or higher, the damage increases by 1d10 for each slot level above 4th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -10813,12 +10813,12 @@
       "A Large quasi-real, horselike creature appears on the ground in an unoccupied space of your choice within range. You decide the creature's appearance, but it is equipped with a saddle, bit, and bridle. Any of the equipment created by the spell vanishes in a puff of smoke if it is carried more than 10 feet away from the steed.",
       "For the duration, you or a creature you choose can ride the steed. The creature uses the statistics for a riding horse, except it has a speed of 100 feet and can travel 10 miles in an hour, or 13 miles at a fast pace. When the spell ends, the steed gradually fades, giving the rider 1 minute to dismount. The spell ends if you use an action to dismiss it or if the steed takes any damage."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": true,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 3,
     "school": {
       "index": "illusion",
@@ -10852,12 +10852,12 @@
       "After the creature completes the task, or when the agreed-upon duration of service expires, the creature returns to its home plane after reporting back to you, if appropriate to the task and if possible. If you are unable to agree on a price for the creature's service, the creature immediately returns to its home plane.",
       "A creature enlisted to join your group counts as a member of it, receiving a full share of experience points awarded."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 6,
     "school": {
       "index": "conjuration",
@@ -10884,13 +10884,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of a higher level, the duration increases to 10 days with a 6th-level slot, to 30 days with a 7th-level slot, to 180 days with an 8th-level slot, and to a year and a day with a 9th-level spell slot."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A jewel worth at least 1,000 gp, which the spell consumes.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -10938,13 +10938,13 @@
       "Alternatively, if you know the sigil sequence of a teleportation circle on another plane of existence, this spell can take you to that circle. If the teleportation circle is too small to hold all the creatures you transported, they appear in the closest unoccupied spaces next to the circle.",
       "You can use this spell to banish an unwilling creature to another plane. Choose a creature within your reach and make a melee spell attack against it. On a hit, the creature must make a charisma saving throw. If the creature fails this save, it is transported to a random location on the plane of existence you specify. A creature so transported must find its own way back to your current plane of existence."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A forked, metal rod worth at least 250 gp, attuned to a particular plane of existence.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "attack_type": "melee",
     "dc": {
@@ -11000,12 +11000,12 @@
       "You can exclude one or more areas of any size within the spell's area from being affected.",
       "If you cast this spell over 8 hours, you enrich the land. All plants in a half-mile radius centered on a point within range become enriched for 1 year. The plants yield twice the normal amount of food when harvested."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -11050,12 +11050,12 @@
       "You extend your hand toward a creature you can see within range and project a puff of noxious gas from your palm. The creature must succeed on a constitution saving throw or take 1d12 poison damage.",
       "This spell's damage increases by 1d12 when you reach 5th level (2d12), 11th level (3d12), and 17th level (4d12)."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "damage": {
       "damage_type": {
@@ -11113,13 +11113,13 @@
       "The creature is limited in the actions it can perform by the nature of its new form, and it can't speak, cast spells, or take any other action that requires hands or speech.",
       "The target's gear melds into the new form. The creature can't activate, use, wield, or otherwise benefit from any of its equipment."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A caterpillar cocoon.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "dc": {
       "dc_type": {
@@ -11165,12 +11165,12 @@
     "desc": [
       "You utter a word of power that can compel one creature you can see within range to die instantly. If the creature you choose has 100 hit points or fewer, it dies. Otherwise, the spell has no effect."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "school": {
       "index": "enchantment",
@@ -11209,12 +11209,12 @@
       "You speak a word of power that can overwhelm the mind of one creature you can see within range, leaving it dumbfounded. If the target has 150 hit points or fewer, it is stunned. Otherwise, the spell has no effect.",
       "The stunned target must make a constitution saving throw at the end of each of its turns. On a successful save, this stunning effect ends."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "school": {
       "index": "enchantment",
@@ -11255,12 +11255,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the healing increases by 1d8 for each slot level above 2nd."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 2,
     "heal_at_slot_level": {
       "2": "2d8 + MOD",
@@ -11306,12 +11306,12 @@
       "You create a nonmagical trinket or an illusory image that can fit in your hand and that lasts until the end of your next turn.",
       "If you cast this spell multiple times, you can have up to three of its non-instantaneous effects active at a time, and you can dismiss such an effect as an action."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "transmutation",
@@ -11363,12 +11363,12 @@
       "***7. Violet.*** On a failed save, the target is blinded. It must then make a wisdom saving throw at the start of your next turn. A successful save ends the blindness. If it fails that save, the creature is transported to another plane of existence of the GM's choosing and is no longer blinded. (Typically, a creature that is on a plane that isn't its home plane is banished home, while other creatures are usually cast into the Astral or Ethereal planes.)",
       "***8. Special.*** The target is struck by two rays. Roll twice more, rerolling any 8."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "damage": {
       "damage_at_slot_level": {
@@ -11425,12 +11425,12 @@
       "While this layer is in place, spells can't be cast through the wall. The layer is destroyed by bright light shed by a daylight spell or a similar spell of equal or higher level.",
       "***7. Violet.*** On a failed save, the creature is blinded. It must then make a wisdom saving throw at the start of your next turn. A successful save ends the blindness. If it fails that save, the creature is transported to another plane of the GM's choosing and is no longer blinded. (Typically, a creature that is on a plane that isn't its home plane is banished home, while other creatures are usually cast into the Astral or Ethereal planes.) This layer is destroyed by a dispel magic spell or a similar spell of equal or higher level that can end spells and magical effects."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "area_of_effect": {
       "type": "line",
@@ -11468,13 +11468,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level or higher, you can increase the size of the cube by 100 feet for each slot level beyond 4th. Thus you could protect a cube that can be up to 200 feet on one side by using a spell slot of 5th level."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A thin sheet of lead, a piece of opaque glass, a wad of cotton or cloth, and powdered chrysolite.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 4,
     "area_of_effect": {
       "type": "cube",
@@ -11503,12 +11503,12 @@
       "You can also attack with the flame, although doing so ends the spell. When you cast this spell, or as an action on a later turn, you can hurl the flame at a creature within 30 feet of you. Make a ranged spell attack. On a hit, the target takes 1d8 fire damage.",
       "This spell's damage increases by 1d8 when you reach 5th level (2d8), 11th level (3d8), and 17th level (4d8)."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "attack_type": "ranged",
     "damage": {
@@ -11554,13 +11554,13 @@
       "The triggering condition can be as general or as detailed as you like, though it must be based on visual or audible conditions that occur within 30 feet of the area. For example, you could create an illusion of yourself to appear and warn off others who attempt to open a trapped door, or you could set the illusion to trigger only when a creature says the correct word or phrase.",
       "Physical interaction with the image reveals it to be an illusion, because things can pass through it. A creature that uses its action to examine the image can determine that it is an illusion with a successful Intelligence (Investigation) check against your spell save DC. If a creature discerns the illusion for what it is, the creature can see through the image, and any noise it makes sounds hollow to the creature."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A bit of fleece and jade dust worth at least 25 gp.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "area_of_effect": {
       "type": "cube",
@@ -11595,13 +11595,13 @@
       "You can see through its eyes and hear through its ears as if you were in its space. On your turn as a bonus action, you can switch from using its senses to using your own, or back again. While you are using its senses, you are blinded and deafened in regard to your own surroundings.",
       "Physical interaction with the image reveals it to be an illusion, because things can pass through it. A creature that uses its action to examine the image can determine that it is an illusion with a successful Intelligence (Investigation) check against your spell save DC. If a creature discerns the illusion for what it is, the creature can see through the image, and any noise it makes sounds hollow to the creature."
     ],
-    "range": {"value": 500, "unit": "mile"},
+    "range": {"type": "mile", "amount": 500},
     "components": ["V", "S", "M"],
     "material": "A small replica of you made from materials worth at least 5 gp.",
     "ritual": false,
-    "duration": {"value": 24, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 24, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "school": {
       "index": "illusion",
@@ -11629,12 +11629,12 @@
     "desc": [
       "For the duration, the willing creature you touch has resistance to one damage type of your choice: acid, cold, fire, lightning, or thunder."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -11689,13 +11689,13 @@
       "Until the spell ends, one willing creature you touch is protected against certain types of creatures: aberrations, celestials, elementals, fey, fiends, and undead.",
       "The protection grants several benefits. Creatures of those types have disadvantage on attack rolls against the target. The target also can't be charmed, frightened, or possessed by them. If the target is already charmed, frightened, or possessed by such a creature, the target has advantage on any new saving throw against the relevant effect."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Holy water or powdered silver and iron, which the spell consumes.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "abjuration",
@@ -11745,12 +11745,12 @@
       "You touch a creature. If it is poisoned, you neutralize the poison. If more than one poison afflicts the target, you neutralize one poison that you know is present, or you neutralize one at random.",
       "For the duration, the target has advantage on saving throws against being poisoned, and it has resistance to poison damage."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "abjuration",
@@ -11794,12 +11794,12 @@
     "desc": [
       "All nonmagical food and drink within a 5-foot radius sphere centered on a point of your choice within range is purified and rendered free of poison and disease."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S"],
     "ritual": true,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "transmutation",
@@ -11841,13 +11841,13 @@
       "This spell closes all mortal wounds, but it doesn't restore missing body parts. If the creature is lacking body parts or organs integral for its survival--its head, for instance--the spell automatically fails.",
       "Coming back from the dead is an ordeal. The target takes a -4 penalty to all attack rolls, saving throws, and ability checks. Every time the target finishes a long rest, the penalty is reduced by 1 until it disappears."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A diamond worth at least 500gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 5,
     "school": {
       "index": "necromancy",
@@ -11887,12 +11887,12 @@
       "A black beam of enervating energy springs from your finger toward a creature within range. Make a ranged spell attack against the target. On a hit, the target deals only half damage with weapon attacks that use Strength until the spell ends.",
       "At the end of each of the target's turns, it can make a constitution saving throw against the spell. On a success, the spell ends."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -11936,12 +11936,12 @@
       "A frigid beam of blue-white light streaks toward a creature within range. Make a ranged spell attack against the target. On a hit, it takes 1d8 cold damage, and its speed is reduced by 10 feet until the start of your next turn.",
       "The spell's damage increases by 1d8 when you reach 5th level (2d8), 11th level (3d8), and 17th level (4d8)."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "attack_type": "ranged",
     "damage": {
@@ -11990,13 +11990,13 @@
       "You touch a creature and stimulate its natural healing ability. The target regains 4d8 + 15 hit points. For the duration of the spell, the target regains 1 hit point at the start of each of its turns (10 hit points each minute).",
       "The target's severed body members (fingers, legs, tails, and so on), if any, are restored after 2 minutes. If you have the severed part and hold it to the stump, the spell instantaneously causes the limb to knit to the stump."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A prayer wheel and holy water.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 7,
     "heal_at_slot_level": {
       "7": "4d8 + 15"
@@ -12050,13 +12050,13 @@
       "| 97-00 | Tiefling |",
       "The reincarnated creature recalls its former life and experiences. It retains the capabilities it had in its original form, except it exchanges its original race for the new one and changes its racial traits accordingly."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Rare oils and unguents worth at least 1,000 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 5,
     "school": {
       "index": "transmutation",
@@ -12079,12 +12079,12 @@
     "desc": [
       "At your touch, all curses affecting one creature or object end. If the object is a cursed magic item, its curse remains, but the spell breaks its owner's attunement to the object so it can be removed or discarded."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "abjuration",
@@ -12131,13 +12131,13 @@
       "The sphere is weightless and just large enough to contain the creature or object inside. An enclosed creature can use its action to push against the sphere's walls and thus roll the sphere at up to half the creature's speed. Similarly, the globe can be picked up and moved by other creatures.",
       "A disintegrate spell targeting the globe destroys it without harming anything inside it."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A hemispherical piece of clear crystal and a matching hemispherical piece of gum arabic.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "dc": {
       "dc_type": {
@@ -12168,13 +12168,13 @@
     "desc": [
       "You touch one willing creature. Once before the spell ends, the target can roll a d4 and add the number rolled to one saving throw of its choice. It can roll the die before or after making the saving throw. The spell then ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A miniature cloak.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "abjuration",
@@ -12212,13 +12212,13 @@
       "Coming back from the dead is an ordeal. The target takes a -4 penalty to all attack rolls, saving throws, and ability checks. Every time the target finishes a long rest, the penalty is reduced by 1 until it disappears.",
       "Casting this spell to restore life to a creature that has been dead for one year or longer taxes you greatly. Until you finish a long rest, you can't cast spells again, and you have disadvantage on all attack rolls, ability checks, and saving throws."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A diamond worth at least 1,000gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 7,
     "school": {
       "index": "necromancy",
@@ -12248,13 +12248,13 @@
       "If some solid object (such as a ceiling) is encountered in this fall, falling objects and creatures strike it just as they would during a normal downward fall. If an object or creature reaches the top of the area without striking anything, it remains there, oscillating slightly, for the duration.",
       "At the end of the duration, affected objects and creatures fall back down."
     ],
-    "range": {"value": 100, "unit": "foot"},
+    "range": {"type": "foot", "amount": 100},
     "components": ["V", "S", "M"],
     "material": "A lodestone and iron filings.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "dc": {
       "dc_type": {
@@ -12300,13 +12300,13 @@
     "desc": [
       "You touch a creature that has died within the last minute. That creature returns to life with 1 hit point. This spell can't return to life a creature that has died of old age, nor can it restore any missing body parts."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Diamonds worth 300gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "conjuration",
@@ -12348,13 +12348,13 @@
       "Attacks and spells can't cross through the entrance into or out of the extradimensional space, but those inside can see out of it as if through a 3-foot-by-5-foot window centered on the rope.",
       "Anything inside the extradimensional space drops out when the spell ends."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Powdered corn extract and a twisted loop of parchment.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -12384,12 +12384,12 @@
       "Flame-like radiance descends on a creature that you can see within range. The target must succeed on a dexterity saving throw or take 1d8 radiant damage. The target gains no benefit from cover for this saving throw.",
       "The spell's damage increases by 1d8 when you reach 5th level (2d8), 11th level (3d8), and 17th level (4d8)."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "damage": {
       "damage_type": {
@@ -12440,13 +12440,13 @@
       "You ward a creature within range against attack. Until the spell ends, any creature who targets the warded creature with an attack or a harmful spell must first make a wisdom saving throw. On a failed save, the creature must choose a new target or lose the attack or spell. This spell doesn't protect the warded creature from area effects, such as the explosion of a fireball.",
       "If the warded creature makes an attack or casts a spell that affects an enemy creature, this spell ends."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A small silver mirror.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 1,
     "school": {
       "index": "abjuration",
@@ -12484,12 +12484,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, you create one additional ray for each slot level above 2nd."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -12552,13 +12552,13 @@
       "On a failed save, the spell creates an invisible sensor within 10 feet of the target. You can see and hear through the sensor as if you were there. The sensor moves with the target, remaining within 10 feet of it for the duration. A creature that can see invisible objects sees the sensor as a luminous orb about the size of your fist.",
       "Instead of targeting a creature, you can choose a location you have seen before as the target of this spell. When you do, the sensor appears at that location and doesn't move."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A focus worth at least 1,000 gp, such as a crystal ball, a silver mirror, or a font filled with holy water.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 10, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 10},
     "level": 5,
     "dc": {
       "dc_type": {
@@ -12617,13 +12617,13 @@
       "While the chest remains on the Ethereal Plane, you can use an action and touch the replica to recall the chest. It appears in an unoccupied space on the ground within 5 feet of you. You can send the chest back to the Ethereal Plane by using an action and touching both the chest and the replica.",
       "After 60 days, there is a cumulative 5 percent chance per day that the spell's effect ends. This effect ends if you cast this spell again, if the smaller replica chest is destroyed, or if you choose to end the spell as an action. If the spell ends and the larger chest is on the Ethereal Plane, it is irretrievably lost."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "An exquisite chest, 3 feet by 2 feet by 2 feet, constructed from rare materials worth at least 5,000 gp, and a Tiny replica made from the same materials worth at least 50 gp.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "conjuration",
@@ -12646,13 +12646,13 @@
     "desc": [
       "For the duration of the spell, you see invisible creatures and objects as if they were visible, and you can see through Ethereal. The ethereal objects and creatures appear ghostly translucent."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A dash of talc and a small amount of silver powder.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "divination",
@@ -12694,12 +12694,12 @@
       "The changes wrought by this spell fail to hold up to physical inspection. For example, if you use this spell to add a hat to a creature's outfit, objects pass through the hat, and anyone who touches it would feel nothing or would feel the creature's head and hair. If you use this spell to appear thinner than you are, the hand of someone who reaches out to touch you would bump into you while it was seemingly still in midair.",
       "A creature can use its action to inspect a target and make an Intelligence (Investigation) check against your spell save DC. If it succeeds, it becomes aware that the target is disguised."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "illusion",
@@ -12737,9 +12737,9 @@
     "components": ["V", "S", "M"],
     "material": "A short piece of fine copper wire.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "evocation",
@@ -12780,13 +12780,13 @@
       "If the target is a creature, it falls into a state of suspended animation. Time ceases to flow for it, and it doesn't grow older.",
       "You can set a condition for the spell to end early. The condition can be anything you choose, but it must occur or be visible within 1 mile of the target. Examples include \"after 1,000 years\" or \"when the tarrasque awakens.\" This spell also ends if the target takes any damage."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A powder composed of diamond, emerald, ruby, and sapphire dust worth at least 5,000 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "school": {
       "index": "transmutation",
@@ -12814,13 +12814,13 @@
       "When you transform, you choose whether your equipment falls to the ground, merges into the new form, or is worn by it. Worn equipment functions as normal. The GM determines whether it is practical for the new form to wear a piece of equipment, based on the creature's shape and size. Your equipment doesn't change shape or size to match the new form, and any equipment that the new form can't wear must either fall to the ground or merge into your new form. Equipment that merges has no effect in that state.",
       "During this spell's duration, you can use your action to assume a different form following the same restrictions and rules for the original form, with one exception: if your new form has more hit points than your current one, your hit points remain at their current value."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A jade circlet worth at least 1,500 gp, which you must place on your head before you cast the spell.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "school": {
       "index": "transmutation",
@@ -12852,13 +12852,13 @@
     "higher_level": [
       "When you cast this spell using a 3 or higher level spell slot, the damage of the spell increases by 1d8 for each level of higher spell slot 2."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A burst of mica.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "damage": {
       "damage_type": {
@@ -12931,12 +12931,12 @@
     "desc": [
       "An invisible barrier of magical force appears and protects you. Until the start of your next turn, you have a +5 bonus to AC, including against the triggering attack, and you take no damage from magic missile."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "reaction"},
+    "casting_time": {"type": "reaction", "amount": 1},
     "level": 1,
     "school": {
       "index": "abjuration",
@@ -12970,13 +12970,13 @@
     "desc": [
       "A shimmering field appears and surrounds a creature of your choice within range, granting it a +2 bonus to AC for the duration."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A small parchment with a bit of holy text written on it.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 1,
     "school": {
       "index": "abjuration",
@@ -13010,13 +13010,13 @@
     "desc": [
       "The wood of a club or a quarterstaff you are holding is imbued with nature's power. For the duration, you can use your spellcasting ability instead of Strength for the attack and damage rolls of melee attacks using that weapon, and the weapon's damage die becomes a d8. The weapon also becomes magical, if it isn't already. The spell ends if you cast it again or if you let go of the weapon."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Mistletoe, a shamrock leaf, and a club or quarterstaff.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 0,
     "school": {
       "index": "transmutation",
@@ -13046,12 +13046,12 @@
       "Lightning springs from your hand to deliver a shock to a creature you try to touch. Make a melee spell attack against the target. You have advantage on the attack roll if the target is wearing armor made of metal. On a hit, the target takes 1d8 lightning damage, and it can't take reactions until the start of its next turn.",
       "The spell's damage increases by 1d8 when you reach 5th level (2d8), 11th level (3d8), and 17th level (4d8)."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "attack_type": "melee",
     "damage": {
@@ -13100,12 +13100,12 @@
       "For the duration, no sound can be created within or pass through a 20-foot-radius sphere centered on a point you choose within range. Any creature or object entirely inside the sphere is immune to thunder damage, and creatures are deafened while entirely inside it.",
       "Casting a spell that includes a verbal component is impossible there."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": true,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "area_of_effect": {
       "type": "sphere",
@@ -13155,13 +13155,13 @@
       "You can use your action to cause the image to move to any spot within range. As the image changes location, you can alter its appearance so that its movements appear natural for the image. For example, if you create an image of a creature and move it, you can alter the image so that it appears to be walking.",
       "Physical interaction with the image reveals it to be an illusion, because things can pass through it. A creature that uses its action to examine the image can determine that it is an illusion with a successful Intelligence (Investigation) check against your spell save DC. If a creature discerns the illusion for what it is, the creature can see through the image."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A bit of fleece.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "area_of_effect": {
       "type": "cube",
@@ -13207,13 +13207,13 @@
       "If the simulacrum is damaged, you can repair it in an alchemical laboratory, using rare herbs and minerals worth 100 gp per hit point it regains. The simulacrum lasts until it drops to 0 hit points, at which point it reverts to snow and melts instantly.",
       "If you cast this spell again, any currently active duplicates you created with this spell are instantly destroyed."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Snow or ice in quantities sufficient to made a life-size copy of the duplicated creature; some hair, fingernail clippings, or other piece of that creature's body placed inside the snow or ice; and powdered ruby worth 1,500 gp, sprinkled over the duplicate and consumed by the spell.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 12, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 12},
     "level": 7,
     "school": {
       "index": "illusion",
@@ -13241,13 +13241,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, roll an additional 2d8 for each slot level above 1st."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "A pinch of fine sand, rose petals, or a cricket.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "damage": {
       "damage_at_slot_level": {
@@ -13297,13 +13297,13 @@
       "The ground in the area is covered with slick ice, making it difficult terrain. When a creature enters the spell's area for the first time on a turn or starts its turn there, it must make a dexterity saving throw. On a failed save, it falls prone.",
       "If a creature is concentrating in the spell's area, the creature must make a successful constitution saving throw against your spell save DC or lose concentration."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "A pinch of dust and a few drops of water.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "area_of_effect": {
       "type": "cylinder",
@@ -13354,13 +13354,13 @@
       "If the creature attempts to cast a spell with a casting time of 1 action, roll a d20. On an 11 or higher, the spell doesn't take effect until the creature's next turn, and the creature must use its action on that turn to complete the spell. If it can't, the spell is wasted.",
       "A creature affected by this spell makes another wisdom saving throw at the end of its turn. On a successful save, the effect ends for it."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A drop of molasses.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "dc": {
       "dc_type": {
@@ -13412,12 +13412,12 @@
     "desc": [
       "You touch a living creature that has 0 hit points. The creature becomes stable. This spell has no effect on undead or constructs."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "necromancy",
@@ -13440,12 +13440,12 @@
     "desc": [
       "You gain the ability to comprehend and verbally communicate with beasts for the duration. The knowledge and awareness of many beasts is limited by their intelligence, but at a minimum, beasts can give you information about nearby locations and monsters, including whatever they can perceive or have perceived within the past day. You might be able to persuade a beast to perform a small favor for you, at the GM's discretion."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": true,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "divination",
@@ -13485,13 +13485,13 @@
       "You grant the semblance of life and intelligence to a corpse of your choice within range, allowing it to answer the questions you pose. The corpse must still have a mouth and can't be undead. The spell fails if the corpse was the target of this spell within the last 10 days.",
       "Until the spell ends, you can ask the corpse up to five questions. The corpse knows only what it knew in life, including the languages it knew. Answers are usually brief, cryptic, or repetitive, and the corpse is under no compulsion to offer a truthful answer if you are hostile to it or it recognizes you as an enemy. This spell doesn't return the creature's soul to its body, only its animating spirit. Thus, the corpse can't learn new information, doesn't comprehend anything that has happened since it died, and can't speculate about future events."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S", "M"],
     "material": "Burning incense.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "necromancy",
@@ -13529,12 +13529,12 @@
       "If a plant creature is in the area, you can communicate with it as if you shared a common language, but you gain no magical ability to influence it.",
       "This spell can cause the plants created by the entangle spell to release a restrained creature."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "area_of_effect": {
       "type": "sphere",
@@ -13577,13 +13577,13 @@
     "desc": [
       "Until the spell ends, one willing creature you touch gains the ability to move up, down, and across vertical surfaces and upside down along ceilings, while leaving its hands free. The target also gains a climbing speed equal to its walking speed."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A drop of bitumen and a spider.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "transmutation",
@@ -13628,13 +13628,13 @@
       "The ground in a 20-foot radius centered on a point within range twists and sprouts hard spikes and thorns. The area becomes difficult terrain for the duration. When a creature moves into or within the area, it takes 2d4 piercing damage for every 5 feet it travels.",
       "The transformation of the ground is camouflaged to look natural. Any creature that can't see the area at the time the spell is cast can make a Wisdom (Perception) check against your spell save DC to recognize the terrain as hazardous before entering it."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "Seven sharp thorns or seven small twigs, each sharpened to a point.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "area_of_effect": {
       "type": "cylinder",
@@ -13681,13 +13681,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the damage increases by 1d8 for each slot level above 3rd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A holy symbol.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "conjuration",
@@ -13721,12 +13721,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 3rd level or higher, the damage increases by 1d8 for every two slot levels above the 2nd."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "bonus action"},
+    "casting_time": {"type": "bonus action", "amount": 1},
     "level": 2,
     "attack_type": "melee",
     "damage": {
@@ -13780,13 +13780,13 @@
       "Each creature that is completely within the cloud at the start of its turn must make a constitution saving throw against poison. On a failed save, the creature spends its action that turn retching and reeling. Creatures that don't need to breathe or are immune to poison automatically succeed on this saving throw.",
       "A moderate wind (at least 10 miles per hour) disperses the cloud after 4 rounds. A strong wind (at least 20 miles per hour) disperses it after 1 round."
     ],
-    "range": {"value": 90, "unit": "foot"},
+    "range": {"type": "foot", "amount": 90},
     "components": ["V", "S", "M"],
     "material": "A rotten egg or several skunk cabbage leaves.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "dc": {
       "dc_type": {
@@ -13848,13 +13848,13 @@
     "desc": [
       "You touch a stone object of Medium size or smaller or a section of stone no more than 5 feet in any dimension and form it into any shape that suits your purpose. So, for example, you could shape a large rock into a weapon, idol, or coffer, or make a small passage through a wall, as long as the wall is less than 5 feet thick. You could also shape a stone door or its frame to seal the door shut. The object you create can have up to two hinges and a latch, but finer mechanical detail isn't possible."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Soft clay, to be crudely worked into the desired shape for the stone object.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "transmutation",
@@ -13893,13 +13893,13 @@
     "desc": [
       "This spell turns the flesh of a willing creature you touch as hard as stone. Until the spell ends, the target has resistance to nonmagical bludgeoning, piercing, and slashing damage."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Diamond dust worth 100 gp, which the spell consumes.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "school": {
       "index": "abjuration",
@@ -13951,9 +13951,9 @@
     "range": {"type": "sight"},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "damage": {
       "damage_type": {
@@ -14002,13 +14002,13 @@
       "You can also specify conditions that will trigger a special activity during the duration. For example, you might suggest that a knight give her warhorse to the first beggar she meets. If the condition isn't met before the spell expires, the activity isn't performed.",
       "If you or any of your companions damage the target, the spell ends."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "M"],
     "material": "A snake's tongue and either a bit of honeycomb or a drop of sweet oil.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 8, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "dc": {
       "dc_type": {
@@ -14062,13 +14062,13 @@
       "You can create a new line of radiance as your action on any turn until the spell ends.",
       "For the duration, a mote of brilliant radiance shines in your hand. It sheds bright light in a 30-foot radius and dim light for an additional 30 feet. This light is sunlight."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A magnifying glass.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -14126,13 +14126,13 @@
       "A creature blinded by this spell makes another constitution saving throw at the end of each of its turns. On a successful save, it is no longer blinded.",
       "This spell dispels any darkness in its area that was created by a spell."
     ],
-    "range": {"value": 150, "unit": "foot"},
+    "range": {"type": "foot", "amount": 150},
     "components": ["V", "S", "M"],
     "material": "Fire and a piece of sunstone.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 8,
     "damage": {
       "damage_type": {
@@ -14200,13 +14200,13 @@
       "***Sleep.*** Each target must make a wisdom saving throw and falls unconscious for 10 minutes on a failed save. A creature awakens if it takes damage or if someone uses an action to shake or slap it awake.",
       "***Stunning.*** Each target must make a wisdom saving throw and becomes stunned for 1 minute on a failed save."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "Mercury, phosphorus, and powdered diamond and opal with a total value of at least 1,000 gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "until-dispelled"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 7,
     "area_of_effect": {
       "type": "cube",
@@ -14248,12 +14248,12 @@
       "If the object is worn or carried by a creature, you must make an ability check with your spellcasting ability contested by that creature's Strength check. If you succeed, you pull the object away from that creature and can move it up to 30 feet in any direction but not beyond the range of this spell.",
       "You can exert fine control on objects with your telekinetic grip, such as manipulating a simple tool, opening a door or a container, stowing or retrieving an item from an open container, or pouring the contents from a vial."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "area_of_effect": {
       "type": "sphere",
@@ -14286,13 +14286,13 @@
       "You forge a telepathic link among up to eight willing creatures of your choice within range, psychically linking each creature to all the others for the duration. Creatures with Intelligence scores of 2 or less aren't affected by this spell.",
       "Until the spell ends, the targets can communicate telepathically through the bond whether or not they have a common language. The communication is possible over any distance, though it can't extend to other planes of existence."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "Pieces of eggshell from two different kinds of creatures",
     "ritual": true,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "divination",
@@ -14336,12 +14336,12 @@
       "***Similar Area.*** You and your group (or the target object) wind up in a different area that's visually or thematically similar to the target area. If you are heading for your home laboratory, for example, you might wind up in another wizard's laboratory or in an alchemical supply shop that has many of the same tools and implements as your laboratory. Generally, you appear in the closest similar place, but since the spell has no range limit, you could conceivably wind up anywhere on the plane.",
       "***Mishap.*** The spell's unpredictable magic results in a difficult journey. Each teleporting creature (or the target object) takes 3d10 force damage, and the GM rerolls on the table to see where you wind up (multiple mishaps can occur, dealing damage each time)."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 7,
     "area_of_effect": {
       "type": "cube",
@@ -14380,13 +14380,13 @@
       "Many major temples, guilds, and other important places have permanent teleportation circles inscribed somewhere within their confines. Each such circle includes a unique sigil sequence--a string of magical runes arranged in a particular pattern. When you first gain the ability to cast this spell, you learn the sigil sequences for two destinations on the Material Plane, determined by the GM. You can learn additional sigil sequences during your adventures. You can commit a new sigil sequence to memory after studying it for 1 minute.",
       "You can create a permanent teleportation circle by casting this spell in the same location every day for one year. You need not use the circle to teleport when you cast the spell in this way."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "M"],
     "material": "Rare chalks and inks infused with precious gems with 50 gp, which the spell consumes.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 5,
     "area_of_effect": {
       "type": "sphere",
@@ -14430,12 +14430,12 @@
       "- You alter the appearance of your eyes for 1 minute.",
       "If you cast this spell multiple times, you can have up to three of its 1-minute effects active at a time, and you can dismiss such an effect as an action."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "transmutation",
@@ -14468,12 +14468,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 2nd level or higher, the damage increases by 1d8 for each slot level above 1st."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "damage": {
       "damage_type": {
@@ -14548,12 +14548,12 @@
       "You briefly stop the flow of time for everyone but yourself. No time passes for other creatures, while you take 1d4 + 1 turns in a row, during which you can use actions and move as normal.",
       "This spell ends if one of the actions you use during this period, or any effects that you create during this period, affects a creature other than you or an object being worn or carried by someone other than you. In addition, the spell ends if you move to a place more than 1,000 feet from the location where you cast it."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "school": {
       "index": "transmutation",
@@ -14583,13 +14583,13 @@
       "Nine creatures of Medium size or smaller can fit inside the dome with you. The spell fails if its area includes a larger creature or more than nine creatures. Creatures and objects within the dome when you cast this spell can move through it freely. All other creatures and objects are barred from passing through it. Spells and other magical effects can't extend through the dome or be cast through it. The atmosphere inside the space is comfortable and dry, regardless of the weather outside.",
       "Until the spell ends, you can command the interior to become dimly lit or dark. The dome is opaque from the outside, of any color you choose, but it is transparent from the inside."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A small crystal bead.",
     "ritual": true,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 3,
     "area_of_effect": {
       "type": "sphere",
@@ -14627,13 +14627,13 @@
     "desc": [
       "This spell grants the creature you touch the ability to understand any spoken language it hears. Moreover, when the target speaks, any creature that knows at least one language and can hear the target understands what it says."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "M"],
     "material": "A small clay model of a ziggurat.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "divination",
@@ -14682,12 +14682,12 @@
     "desc": [
       "This spell creates a magical link between a Large or larger inanimate plant within range and another plant, at any distance, on the same plane of existence. You must have seen or touched the destination plant at least once before. For the duration, any creature can step into the target plant and exit from the destination plant by using 5 feet of movement."
     ],
-    "range": {"value": 10, "unit": "foot"},
+    "range": {"type": "foot", "amount": 10},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "round"},
+    "duration": {"type": "round", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "school": {
       "index": "conjuration",
@@ -14711,12 +14711,12 @@
       "You gain the ability to enter a tree and move from inside it to inside another tree of the same kind within 500 feet. Both trees must be living and at least the same size as you. You must use 5 feet of movement to enter a tree. You instantly know the location of all other trees of the same kind within 500 feet and, as part of the move used to enter the tree, can either pass into one of those trees or step out of the tree you're in. You appear in a spot of your choice within 5 feet of the destination tree, using another 5 feet of movement. If you have no movement left, you appear within 5 feet of the tree you entered.",
       "You can use this transportation ability once per round for the duration. You must end each turn outside a tree."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "conjuration",
@@ -14758,13 +14758,13 @@
       "If the spell becomes permanent, you no longer control the creature. It might remain friendly to you, depending on how you have treated it.",
       "***Creature into Object.*** If you turn a creature into an object, it transforms along with whatever it is wearing and carrying into that form. The creature's statistics become those of the object, and the creature has no memory of time spent in this form, after the spell ends and it returns to its normal form."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A drop of mercury, a dollop of gum arabic, and a wisp of smoke.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "school": {
       "index": "transmutation",
@@ -14799,13 +14799,13 @@
       "This spell closes all wounds, neutralizes any poison, cures all diseases, and lifts any curses affecting the creature when it died. The spell replaces damaged or missing organs and limbs.",
       "The spell can even provide a new body if the original no longer exists, in which case you must speak the creature's name. The creature then appears in an unoccupied space you choose within 10 feet of you."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A sprinkle of holy water and diamonds worth at least 25,000gp, which the spell consumes.",
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "hour"},
+    "casting_time": {"type": "hour", "amount": 1},
     "level": 9,
     "school": {
       "index": "necromancy",
@@ -14833,13 +14833,13 @@
     "desc": [
       "This spell gives the willing creature you touch the ability to see things as they actually are. For the duration, the creature has truesight, notices secret doors hidden by magic, and can see into the Ethereal Plane, all out to a range of 120 feet."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "An ointment for the eyes that costs 25gp; is made from mushroom powder, saffron, and fat; and is consumed by the spell.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "school": {
       "index": "divination",
@@ -14882,12 +14882,12 @@
     "desc": [
       "You extend your hand and point a finger at a target in range. Your magic grants you a brief insight into the target's defenses. On your next turn, you gain advantage on your first attack roll against the target, provided that this spell hasn't ended."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "round", "up_to": true},
+    "duration": {"type": "round", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "school": {
       "index": "divination",
@@ -14933,13 +14933,13 @@
       "Once on each of your turns as a bonus action, you can mentally command the servant to move up to 15 feet and interact with an object. The servant can perform simple tasks that a human servant could do, such as fetching things, cleaning, mending, folding clothes, lighting fires, serving food, and pouring wine. Once you give the command, the servant performs the task to the best of its ability until it completes the task, then waits for your next command.",
       "If you command the servant to perform a task that would move it more than 60 feet away from you, the spell ends."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A piece of string and a bit of wood.",
     "ritual": true,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 1,
     "school": {
       "index": "conjuration",
@@ -14981,12 +14981,12 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 4th level or higher, the damage increases by 1d6 for each slot level above 3rd."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "attack_type": "melee",
     "damage": {
@@ -15038,12 +15038,12 @@
       "You unleash a string of insults laced with subtle enchantments at a creature you can see within range. If the target can hear you (though it need not understand you), it must succeed on a wisdom saving throw or take 1d4 psychic damage and have disadvantage on the next attack roll it makes before the end of its next turn.",
       "This spell's damage increases by 1d4 when you reach 5th level (2d4), 11th level (3d4), and 17th level (4d4)."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 0,
     "damage": {
       "damage_type": {
@@ -15093,13 +15093,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 5th level or higher, the damage increases by 1d8 for each slot level above 4th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A small piece of phosphorus.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 4,
     "damage": {
       "damage_type": {
@@ -15161,13 +15161,13 @@
       "An invisible wall of force springs into existence at a point you choose within range. The wall appears in any orientation you choose, as a horizontal or vertical barrier or at an angle. It can be free floating or resting on a solid surface. You can form it into a hemispherical dome or a sphere with a radius of up to 10 feet, or you can shape a flat surface made up of ten 10-foot-by-10-foot panels. Each panel must be contiguous with another panel. In any form, the wall is 1/4 inch thick. It lasts for the duration. If the wall cuts through a creature's space when it appears, the creature is pushed to one side of the wall (your choice which side).",
       "Nothing can physically pass through the wall. It is immune to all damage and can't be dispelled by dispel magic. A disintegrate spell destroys the wall instantly, however. The wall also extends into the Ethereal Plane, blocking ethereal travel through the wall."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A pinch of powder made by crushing a clear gemstone.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "evocation",
@@ -15195,13 +15195,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, the damage the wall deals when it appears increases by 2d6, and the damage from passing through the sheet of frigid air increases by 1d6, for each slot level above 6th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A small piece of quartz.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -15254,13 +15254,13 @@
       "The wall is an object made of stone that can be damaged and thus breached. Each panel has AC 15 and 30 hit points per inch of thickness. Reducing a panel to 0 hit points destroys it and might cause connected panels to collapse at the GM's discretion.",
       "If you maintain your concentration on this spell for its whole duration, the wall becomes permanent and can't be dispelled. Otherwise, the wall disappears when the spell ends."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A small block of granite.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 5,
     "school": {
       "index": "evocation",
@@ -15304,13 +15304,13 @@
     "higher_level": [
       "When you cast this spell using a spell slot of 7th level or higher, both types of damage increase by 1d8 for each slot level above 6th."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A handful of thorns.",
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 10, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "damage": {
       "damage_type": {
@@ -15360,13 +15360,13 @@
       "The spell ends if you drop to 0 hit points or if you and the target become separated by more than 60 feet.",
       "It also ends if the spell is cast again on either of the connected creatures. You can also dismiss the spell as an action."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "touch"},
+    "range": {"type": "foot", "type": "touch", "amount": 0},
     "components": ["V", "S", "M"],
     "material": "A pair of platinum rings worth at least 50gp each, which you and the target must wear for the duration.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "school": {
       "index": "abjuration",
@@ -15395,13 +15395,13 @@
     "desc": [
       "This spell gives a maximum of ten willing creatures within range and you can see, the ability to breathe underwater until the end of its term. Affected creatures also retain their normal breathing pattern."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A short piece of reed or straw.",
     "ritual": true,
-    "duration": {"value": 24, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 24},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -15451,13 +15451,13 @@
       "This spell grants the ability to move across any liquid surface--such as water, acid, mud, snow, quicksand, or lava--as if it were harmless solid ground (creatures crossing molten lava can still take damage from the heat). Up to ten willing creatures you can see within range gain this ability for the duration.",
       "If you target a creature submerged in a liquid, the spell carries the target to the surface of the liquid at a rate of 60 feet per round."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "A piece of cork.",
     "ritual": true,
-    "duration": {"value": 1, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 1},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "school": {
       "index": "transmutation",
@@ -15510,13 +15510,13 @@
       "A creature restrained by the webs can use its action to make a Strength check against your spell save DC. If it succeeds, it is no longer restrained.",
       "The webs are flammable. Any 5-foot cube of webs exposed to fire burns away in 1 round, dealing 2d4 fire damage to any creature that starts its turn in the fire."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S", "M"],
     "material": "A bit of spiderweb.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "hour", "up_to": true},
+    "duration": {"type": "hour", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "area_of_effect": {
       "type": "cube",
@@ -15559,12 +15559,12 @@
     "desc": [
       "Drawing on the deepest fears of a group of creatures, you create illusory creatures in their minds, visible only to them. Each creature in a 30-foot-radius sphere centered on a point of your choice within range must make a wisdom saving throw. On a failed save, a creature becomes frightened for the duration. The illusion calls on the creature's deepest fears, manifesting its worst nightmares as an implacable threat. At the start of each of the frightened creature's turns, it must succeed on a wisdom saving throw or take 4d10 psychic damage. On a successful save, the spell ends for that creature."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "dc": {
       "dc_type": {
@@ -15600,13 +15600,13 @@
       "You and up to ten willing creatures you can see within range assume a gaseous form for the duration, appearing as wisps of cloud. While in this cloud form, a creature has a flying speed of 300 feet and has resistance to damage from nonmagical weapons. The only actions a creature can take in this form are the Dash action or to revert to its normal form. Reverting takes 1 minute, during which time a creature is incapacitated and can't move. Until the spell ends, a creature can revert to cloud form, which also requires the 1-minute transformation.",
       "If a creature is in cloud form and flying when the effect ends, the creature descends 60 feet per round for 1 minute until it lands, which it does safely. If it can't land after 1 minute, the creature falls the remaining distance."
     ],
-    "range": {"value": 30, "unit": "foot"},
+    "range": {"type": "foot", "amount": 30},
     "components": ["V", "S", "M"],
     "material": "Fire and holy water.",
     "ritual": false,
-    "duration": {"value": 8, "unit": "hour"},
+    "duration": {"type": "hour", "amount": 8},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "minute"},
+    "casting_time": {"type": "minute", "amount": 1},
     "level": 6,
     "school": {
       "index": "transmutation",
@@ -15631,13 +15631,13 @@
       "When the wall appears, each creature within its area must make a strength saving throw. A creature takes 3d8 bludgeoning damage on a failed save, or half as much damage on a successful one.",
       "The strong wind keeps fog, smoke, and other gases at bay. Small or smaller flying creatures or objects can't pass through the wall. Loose, lightweight materials brought into the wall fly upward. Arrows, bolts, and other ordinary projectiles launched at targets behind the wall are deflected upward and automatically miss. (Boulders hurled by giants or siege engines, and similar projectiles, are unaffected.) Creatures in gaseous form can't pass through it."
     ],
-    "range": {"value": 120, "unit": "foot"},
+    "range": {"type": "foot", "amount": 120},
     "components": ["V", "S", "M"],
     "material": "A tiny fan and a feather of exotic origin.",
     "ritual": false,
-    "duration": {"value": 1, "unit": "minute", "up_to": true},
+    "duration": {"type": "minute", "amount": 1, "qualifier": "up to"},
     "concentration": true,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 3,
     "damage": {
       "damage_type": {
@@ -15702,12 +15702,12 @@
       "You might be able to achieve something beyond the scope of the above examples. State your wish to the GM as precisely as possible. The GM has great latitude in ruling what occurs in such an instance; the greater the wish, the greater the likelihood that something goes wrong. This spell might simply fail, the effect you desire might only be partly achieved, or you might suffer some unforeseen consequence as a result of how you worded the wish. For example, wishing that a villain were dead might propel you forward in time to a period when that villain is no longer alive, effectively removing you from the game. Similarly, wishing for a legendary magic item or artifact might instantly transport you to the presence of the item's current owner.",
       "The stress of casting this spell to produce any effect other than duplicating another spell weakens you. After enduring that stress, each time you cast a spell until you finish a long rest, you take 1d10 necrotic damage per level of that spell. This damage can't be reduced or prevented in any way. In addition, your Strength drops to 3, if it isn't 3 or lower already, for 2d4 days. For each of those days that you spend resting and doing nothing more than light activity, your remaining recovery time decreases by 2 days. Finally, there is a 33 percent chance that you are unable to cast wish ever again if you suffer this stress."
     ],
-    "range": {"value": 0, "unit": "foot", "type": "self"},
+    "range": {"type": "foot", "type": "self", "amount": 0},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 9,
     "school": {
       "index": "conjuration",
@@ -15736,12 +15736,12 @@
       "You and up to five willing creatures within 5 feet of you instantly teleport to a previously designated sanctuary. You and any creatures that teleport with you appear in the nearest unoccupied space to the spot you designated when you prepared your sanctuary (see below). If you cast this spell without first preparing a sanctuary, the spell has no effect.",
       "You must designate a sanctuary by casting this spell within a location, such as a temple, dedicated to or strongly linked to your deity. If you attempt to cast the spell in this manner in an area that isn't dedicated to your deity, the spell has no effect."
     ],
-    "range": {"value": 5, "unit": "foot"},
+    "range": {"type": "foot", "amount": 5},
     "components": ["V"],
     "ritual": false,
     "duration": {"type": "instantaneous"},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 6,
     "area_of_effect": {
       "type": "sphere",
@@ -15769,12 +15769,12 @@
       "You create a magical zone that guards against deception in a 15-foot-radius sphere centered on a point of your choice within range. Until the spell ends, a creature that enters the spell's area for the first time on a turn or starts its turn there must make a Charisma saving throw. On a failed save, a creature can't speak a deliberate lie while in the radius. You know whether each creature succeeds or fails on its saving throw.",
       "An affected creature is aware of the spell and can thus avoid answering questions to which it would normally respond with a lie. Such a creature can remain evasive in its answers as long as it remains within the boundaries of the truth."
     ],
-    "range": {"value": 60, "unit": "foot"},
+    "range": {"type": "foot", "amount": 60},
     "components": ["V", "S"],
     "ritual": false,
-    "duration": {"value": 10, "unit": "minute"},
+    "duration": {"type": "minute", "amount": 10},
     "concentration": false,
-    "casting_time": {"value": 1, "unit": "action"},
+    "casting_time": {"type": "action", "amount": 1},
     "level": 2,
     "area_of_effect": {
       "type": "sphere",