diff --git a/mods/BaseGameContent.rairmod b/mods/BaseGameContent.rairmod
index 0bd03dd..0e5ab4c 100644
--- a/mods/BaseGameContent.rairmod
+++ b/mods/BaseGameContent.rairmod
@@ -3,7 +3,7 @@
     "name": "BaseGameContent",
     "author": "Seiyria",
     "version": 1,
-    "savedAt": 1726158702812
+    "savedAt": 1726318255087
   },
   "npcs": [
     {
@@ -2163490,21 +2163490,66 @@
       "_id": "01917b2f-12c2-7bbd-a9b8-2ea69a340c37"
     },
     {
+      "_id": "01917b2f-1431-7bbd-a9b8-305ab2bd9ec7",
       "_hasSpell": true,
       "_hasTrait": true,
       "_hasEffect": false,
       "_hasMacro": true,
+      "_isNPCOnly": false,
       "name": "Succor",
       "_gameId": "Succor",
       "all": {
         "desc": "Create a consumable that will let you return to your current location. Cost: 25 MP",
         "icon": "blackball",
-        "color": "#080"
+        "color": "#080",
+        "bgColor": ""
+      },
+      "effect": {
+        "tooltip": {
+          "name": "",
+          "color": "",
+          "bgColor": "",
+          "desc": ""
+        },
+        "effect": {
+          "duration": 0,
+          "durationScaleStat": "int",
+          "durationScaleValue": 100,
+          "extra": {
+            "potency": 0,
+            "canRemove": false,
+            "unique": true,
+            "doesTick": false,
+            "persistThroughDeath": false,
+            "canOverlapUniqueIfEquipped": false,
+            "charges": 0,
+            "statChanges": {},
+            "spriteChange": -1
+          }
+        },
+        "effectMeta": {}
+      },
+      "macro": {
+        "name": "",
+        "macro": "",
+        "color": "",
+        "bgColor": "",
+        "mode": "autoActivate",
+        "key": "",
+        "tooltipDesc": "",
+        "isDefault": false
       },
       "spell": {
-        "damageClass": "heal",
-        "mpCost": 25,
+        "spellName": "",
         "maxSkillForGain": 7,
+        "mpCost": 25,
+        "castTime": 0,
+        "cooldown": 0,
+        "potencyMultiplier": 1,
+        "bonusRollsMin": 0,
+        "bonusRollsMax": 0,
+        "willSaveThreshold": 0,
+        "willSavePercent": 0,
         "skillMultiplierChanges": [
           [
             0,
@@ -2163524,18 +2163569,27 @@
           ]
         ],
         "spellMeta": {
-          "casterMessage": "You begin to identify the item in your right hand...",
-          "casterSfx": "spell-conjure"
-        }
+          "bonusAgro": 0,
+          "creatureSummoned": [],
+          "fizzledBy": [],
+          "casterMessage": "A wispy presence surrounds you...",
+          "casterSfx": "spell-conjure",
+          "noHostileTarget": true,
+          "targetsCaster": true
+        },
+        "damageClass": "heal"
       },
       "trait": {
-        "borderColor": "#aa0"
-      },
-      "effect": {},
-      "macro": {
-        "mode": "autoActivate"
-      },
-      "_id": "01917b2f-1431-7bbd-a9b8-305ab2bd9ec7"
+        "name": "",
+        "desc": "",
+        "borderColor": "#aa0",
+        "iconBgColor": "",
+        "iconColor": "",
+        "spellGiven": "",
+        "isAncient": false,
+        "valuePerTier": 0,
+        "statsGiven": {}
+      }
     },
     {
       "_hasSpell": true,
@@ -2163638,21 +2163692,66 @@
       "_id": "01917b2f-174d-7bbd-a9b8-4061af67832e"
     },
     {
+      "_id": "01917b2f-18ad-7bbd-a9b8-4a0b0b668af9",
       "_hasSpell": true,
       "_hasTrait": true,
       "_hasEffect": false,
       "_hasMacro": true,
+      "_isNPCOnly": false,
       "name": "Augury",
       "_gameId": "Augury",
       "all": {
         "desc": "Use the birds to divine the location of your target. Cost: 25 MP",
         "icon": "dove",
-        "color": "#000"
+        "color": "#000",
+        "bgColor": ""
+      },
+      "effect": {
+        "tooltip": {
+          "name": "",
+          "color": "",
+          "bgColor": "",
+          "desc": ""
+        },
+        "effect": {
+          "duration": 0,
+          "durationScaleStat": "int",
+          "durationScaleValue": 100,
+          "extra": {
+            "potency": 0,
+            "canRemove": false,
+            "unique": true,
+            "doesTick": false,
+            "persistThroughDeath": false,
+            "canOverlapUniqueIfEquipped": false,
+            "charges": 0,
+            "statChanges": {},
+            "spriteChange": -1
+          }
+        },
+        "effectMeta": {}
+      },
+      "macro": {
+        "name": "",
+        "macro": "",
+        "color": "",
+        "bgColor": "",
+        "mode": "clickToTarget",
+        "key": "",
+        "tooltipDesc": "",
+        "isDefault": false
       },
       "spell": {
-        "damageClass": "heal",
-        "mpCost": 25,
+        "spellName": "",
         "maxSkillForGain": 15,
+        "mpCost": 25,
+        "castTime": 0,
+        "cooldown": 0,
+        "potencyMultiplier": 1,
+        "bonusRollsMin": 0,
+        "bonusRollsMax": 0,
+        "willSaveThreshold": 0,
+        "willSavePercent": 0,
         "skillMultiplierChanges": [
           [
             0,
@@ -2163660,17 +2163759,25 @@
           ]
         ],
         "spellMeta": {
-          "casterSfx": "spell-conjure"
-        }
+          "bonusAgro": 0,
+          "creatureSummoned": [],
+          "fizzledBy": [],
+          "casterSfx": "spell-conjure",
+          "targetsCaster": true
+        },
+        "damageClass": "heal"
       },
       "trait": {
-        "borderColor": "#ccc"
-      },
-      "effect": {},
-      "macro": {
-        "mode": "clickToTarget"
-      },
-      "_id": "01917b2f-18ad-7bbd-a9b8-4a0b0b668af9"
+        "name": "",
+        "desc": "",
+        "borderColor": "#ccc",
+        "iconBgColor": "",
+        "iconColor": "",
+        "spellGiven": "",
+        "isAncient": false,
+        "valuePerTier": 0,
+        "statsGiven": {}
+      }
     },
     {
       "_hasSpell": true,
@@ -2163955,72 +2164062,178 @@
       "_id": "01917b2f-2299-7bbd-a9b8-834a0cb9109f"
     },
     {
+      "_id": "01917b2f-2442-7bbd-a9b8-89a8a65fa46c",
       "_hasSpell": true,
       "_hasTrait": true,
       "_hasEffect": false,
       "_hasMacro": true,
+      "_isNPCOnly": false,
       "name": "Teleport",
       "_gameId": "Teleport",
       "all": {
         "desc": "Teleport to a previously-memorized location. Memorize new locations with the memorize command and forget them with the forget command. Cost: 100 MP",
         "icon": "teleport",
-        "color": "#a0a"
+        "color": "#a0a",
+        "bgColor": ""
+      },
+      "effect": {
+        "tooltip": {
+          "name": "",
+          "color": "",
+          "bgColor": "",
+          "desc": ""
+        },
+        "effect": {
+          "duration": 0,
+          "durationScaleStat": "int",
+          "durationScaleValue": 100,
+          "extra": {
+            "potency": 0,
+            "canRemove": false,
+            "unique": true,
+            "doesTick": false,
+            "persistThroughDeath": false,
+            "canOverlapUniqueIfEquipped": false,
+            "charges": 0,
+            "statChanges": {},
+            "spriteChange": -1
+          }
+        },
+        "effectMeta": {}
+      },
+      "macro": {
+        "name": "",
+        "macro": "",
+        "color": "",
+        "bgColor": "",
+        "mode": "autoActivate",
+        "key": "",
+        "tooltipDesc": "",
+        "isDefault": false
       },
       "spell": {
-        "damageClass": "physical",
+        "spellName": "",
+        "maxSkillForGain": 15,
         "mpCost": 100,
+        "castTime": 0,
         "cooldown": 5,
-        "maxSkillForGain": 15,
+        "potencyMultiplier": 1,
+        "bonusRollsMin": 0,
+        "bonusRollsMax": 0,
+        "willSaveThreshold": 0,
+        "willSavePercent": 0,
         "skillMultiplierChanges": [
           [
             0,
             1
           ]
-        ]
+        ],
+        "spellMeta": {
+          "bonusAgro": 0,
+          "creatureSummoned": [],
+          "fizzledBy": [],
+          "targetsCaster": true
+        },
+        "damageClass": "physical"
       },
       "trait": {
-        "borderColor": "#a0a"
-      },
-      "effect": {},
-      "macro": {
-        "mode": "autoActivate"
-      },
-      "_id": "01917b2f-2442-7bbd-a9b8-89a8a65fa46c"
+        "name": "",
+        "desc": "",
+        "borderColor": "#a0a",
+        "iconBgColor": "",
+        "iconColor": "",
+        "spellGiven": "",
+        "isAncient": false,
+        "valuePerTier": 0,
+        "statsGiven": {}
+      }
     },
     {
+      "_id": "01917b2f-25a6-7bbd-a9b8-93aeb7282802",
       "_hasSpell": true,
       "_hasTrait": true,
       "_hasEffect": false,
       "_hasMacro": true,
+      "_isNPCOnly": false,
       "name": "MassTeleport",
       "_gameId": "MassTeleport",
       "all": {
         "desc": "Teleport all players on your tile to a previously-memorized location. Memorize new locations with the memorize command and forget them with the forget command. Cost: 100 MP",
         "icon": "vortex",
-        "color": "#a0a"
+        "color": "#a0a",
+        "bgColor": ""
+      },
+      "effect": {
+        "tooltip": {
+          "name": "",
+          "color": "",
+          "bgColor": "",
+          "desc": ""
+        },
+        "effect": {
+          "duration": 0,
+          "durationScaleStat": "int",
+          "durationScaleValue": 100,
+          "extra": {
+            "potency": 0,
+            "canRemove": false,
+            "unique": true,
+            "doesTick": false,
+            "persistThroughDeath": false,
+            "canOverlapUniqueIfEquipped": false,
+            "charges": 0,
+            "statChanges": {},
+            "spriteChange": -1
+          }
+        },
+        "effectMeta": {}
+      },
+      "macro": {
+        "name": "Mass Teleport",
+        "macro": "",
+        "color": "",
+        "bgColor": "",
+        "mode": "autoActivate",
+        "key": "",
+        "tooltipDesc": "",
+        "isDefault": false
       },
       "spell": {
-        "damageClass": "physical",
+        "spellName": "",
+        "maxSkillForGain": 15,
         "mpCost": 100,
+        "castTime": 0,
         "cooldown": 5,
-        "maxSkillForGain": 15,
+        "potencyMultiplier": 1,
+        "bonusRollsMin": 0,
+        "bonusRollsMax": 0,
+        "willSaveThreshold": 0,
+        "willSavePercent": 0,
         "skillMultiplierChanges": [
           [
             0,
             1
           ]
-        ]
+        ],
+        "spellMeta": {
+          "bonusAgro": 0,
+          "creatureSummoned": [],
+          "fizzledBy": [],
+          "targetsCaster": true
+        },
+        "damageClass": "physical"
       },
       "trait": {
         "name": "Mass Teleport",
-        "borderColor": "#a0a"
-      },
-      "effect": {},
-      "macro": {
-        "name": "Mass Teleport",
-        "mode": "autoActivate"
-      },
-      "_id": "01917b2f-25a6-7bbd-a9b8-93aeb7282802"
+        "desc": "",
+        "borderColor": "#a0a",
+        "iconBgColor": "",
+        "iconColor": "",
+        "spellGiven": "",
+        "isAncient": false,
+        "valuePerTier": 0,
+        "statsGiven": {}
+      }
     },
     {
       "_id": "01917b2f-270a-7bbd-a9b8-98142e2932f3",
@@ -2164028,6 +2164241,7 @@
       "_hasTrait": true,
       "_hasEffect": false,
       "_hasMacro": true,
+      "_isNPCOnly": false,
       "name": "Vortex",
       "_gameId": "Vortex",
       "all": {
@@ -2164045,6 +2164259,8 @@
         },
         "effect": {
           "duration": 0,
+          "durationScaleStat": "int",
+          "durationScaleValue": 100,
           "extra": {
             "potency": 0,
             "canRemove": false,
@@ -2164053,7 +2164269,8 @@
             "persistThroughDeath": false,
             "canOverlapUniqueIfEquipped": false,
             "charges": 0,
-            "statChanges": {}
+            "statChanges": {},
+            "spriteChange": -1
           }
         },
         "effectMeta": {}
@@ -2164089,7 +2164306,9 @@
           "bonusAgro": 0,
           "creatureSummoned": [],
           "fizzledBy": [],
-          "range": 1
+          "range": 1,
+          "targetsCaster": true,
+          "casterMessage": "You coalesce the ether around you!"
         },
         "damageClass": "physical"
       },