diff --git a/mods/BaseGameContent.rairmod b/mods/BaseGameContent.rairmod
index 03cce62..c7f5dd2 100644
--- a/mods/BaseGameContent.rairmod
+++ b/mods/BaseGameContent.rairmod
@@ -3,7 +3,7 @@
     "name": "BaseGameContent",
     "author": "Seiyria",
     "version": 1,
-    "savedAt": 1724636679347
+    "savedAt": 1724702342849
   },
   "npcs": [
     {
@@ -59996,20 +59996,35 @@
       "_id": "01916bde-d3d3-7cc5-8135-6565b598f9ff"
     },
     {
+      "_id": "01916bde-d3d3-7cc5-8135-6c9f8f4b16fc",
+      "sprite": 148,
+      "quality": 0,
       "name": "Tower Trash Breastplate",
+      "itemClass": "Breastplate",
+      "maxUpgrades": 0,
+      "value": 1289,
+      "sellValue": 0,
+      "desc": "an iron breastplate with strange marks etched into it",
+      "damageClass": "physical",
       "stats": {
         "armorClass": 9,
         "mitigation": 25
       },
-      "sprite": 148,
-      "desc": "an iron breastplate with strange marks etched into it",
-      "value": 2500,
-      "itemClass": "Breastplate",
+      "randomStats": {},
       "type": "martial",
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "isBeltable": false,
       "isSackable": false,
-      "isHeavy": true,
-      "_id": "01916bde-d3d3-7cc5-8135-6c9f8f4b16fc"
+      "isHeavy": true
     },
     {
       "name": "Tower Breastplate",
@@ -60103,38 +60118,68 @@
       "_id": "01916bde-d3d3-7cc5-8135-8f18bf29187d"
     },
     {
+      "_id": "01916bde-d3d3-7cc5-8135-967e1ebd1427",
+      "sprite": 210,
+      "quality": 0,
       "name": "Mines Trash Breastplate",
+      "itemClass": "Breastplate",
+      "maxUpgrades": 0,
+      "value": 504,
+      "sellValue": 0,
+      "desc": "an iron breastplate used by the miners of Risan",
+      "damageClass": "physical",
       "stats": {
         "armorClass": 12,
         "fireResist": 150,
         "mitigation": 25
       },
-      "sprite": 210,
-      "desc": "an iron breastplate used by the miners of Risan",
-      "value": 2504,
-      "itemClass": "Breastplate",
+      "randomStats": {},
       "type": "martial",
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "isBeltable": false,
       "isSackable": false,
-      "isHeavy": true,
-      "_id": "01916bde-d3d3-7cc5-8135-967e1ebd1427"
+      "isHeavy": true
     },
     {
+      "_id": "01916bde-d3d3-7cc5-8135-99173bf59495",
+      "sprite": 210,
+      "quality": 0,
       "name": "Frostlands Trash Breastplate",
+      "itemClass": "Breastplate",
+      "maxUpgrades": 0,
+      "value": 709,
+      "sellValue": 0,
+      "desc": "an insulatory iron breastplate",
+      "damageClass": "physical",
       "stats": {
         "armorClass": 14,
         "iceResist": 150,
         "mitigation": 25
       },
-      "sprite": 210,
-      "desc": "an insulatory iron breastplate",
-      "value": 2509,
-      "itemClass": "Breastplate",
+      "randomStats": {},
       "type": "martial",
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "isBeltable": false,
       "isSackable": false,
-      "isHeavy": true,
-      "_id": "01916bde-d3d3-7cc5-8135-99173bf59495"
+      "isHeavy": true
     },
     {
       "name": "Antanian Cloak (Stitched)",
@@ -66150,32 +66195,11 @@
       "_id": "01916bde-d3d4-7cc5-813d-b4ea613c3700"
     },
     {
-      "_id": "01916bde-d3d4-7cc5-813d-ba63d43dc8ae",
-      "sprite": 341,
-      "quality": 0,
       "name": "Risan Necrotic Prot Crystal",
-      "itemClass": "Gem",
-      "maxUpgrades": 0,
-      "value": 1,
-      "sellValue": 5000,
       "desc": "a small crystal encasing a chunk of earth",
-      "damageClass": "physical",
-      "stats": {},
-      "randomStats": {},
-      "type": "martial",
-      "trait": {
-        "level": 0
-      },
-      "randomTrait": {
-        "name": [],
-        "level": {
-          "min": 0,
-          "max": 0
-        }
-      },
-      "requirements": {
-        "level": 15
-      },
+      "sellValue": 5000,
+      "value": 1,
+      "sprite": 341,
       "encrustGive": {
         "slots": [
           "robe",
@@ -66186,7 +66210,11 @@
           "necroticResist": 50
         }
       },
-      "isSackable": true
+      "itemClass": "Gem",
+      "type": "martial",
+      "stats": {},
+      "isSackable": true,
+      "_id": "01916bde-d3d4-7cc5-813d-ba63d43dc8ae"
     },
     {
       "name": "Risan Energy Prot Crystal",
@@ -68324,31 +68352,49 @@
       "_id": "01916bde-d3d4-7cc5-8140-99ae472e1e66"
     },
     {
+      "_id": "01916bde-d3d4-7cc5-8140-a1e24d29aaa5",
+      "sprite": 45,
+      "quality": 0,
       "name": "Mines Trash Hammer",
+      "itemClass": "Hammer",
+      "maxUpgrades": 0,
+      "value": 501,
+      "sellValue": 0,
+      "desc": "an excavating hammer forged in the mines of Risan that emanates heat",
+      "damageClass": "physical",
       "stats": {
         "accuracy": -3,
         "offense": 6,
         "fireResist": 50
       },
+      "randomStats": {},
+      "type": "mace",
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "strikeEffect": {
         "name": "Combust",
         "potency": 75,
+        "duration": 0,
         "chance": 10,
         "range": 0
       },
-      "desc": "an excavating hammer forged in the mines of Risan that emanates heat",
-      "tier": 4,
-      "type": "mace",
-      "value": 1501,
-      "sprite": 45,
-      "binds": true,
       "requirements": {
         "level": 15
       },
-      "itemClass": "Hammer",
+      "tier": 1,
+      "binds": true,
       "isBeltable": true,
       "isSackable": true,
-      "_id": "01916bde-d3d4-7cc5-8140-a1e24d29aaa5"
+      "proneChance": 0,
+      "attackRange": 0
     },
     {
       "name": "Catacombs HolyFire Hammer",
@@ -74539,26 +74585,42 @@
       "_id": "01916bde-d3d5-7cc5-814b-11c6a34111ff"
     },
     {
+      "_id": "01916bde-d3d5-7cc5-814b-1f22c514107f",
+      "sprite": 305,
+      "quality": 0,
       "name": "Risan Mines Trash Spirit Shortsword",
+      "itemClass": "Shortsword",
+      "maxUpgrades": 0,
+      "value": 1411,
+      "sellValue": 0,
       "desc": "a dull silver shortsword",
+      "damageClass": "physical",
       "stats": {
         "offense": 3,
         "defense": 3,
         "accuracy": 3,
         "weaponArmorClass": 3
       },
-      "offhand": true,
-      "tier": 5,
+      "randomStats": {},
       "type": "shortsword",
-      "value": 3411,
-      "sprite": 305,
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "requirements": {
         "level": 15
       },
-      "itemClass": "Shortsword",
+      "tier": 1,
       "isBeltable": true,
       "isSackable": false,
-      "_id": "01916bde-d3d5-7cc5-814b-1f22c514107f"
+      "proneChance": 0,
+      "attackRange": 0
     },
     {
       "name": "Risan Mines Rare Spirit Shortsword",
@@ -76515,19 +76577,34 @@
       "_id": "01916bde-d3d5-7cc5-814d-e85205e21861"
     },
     {
+      "_id": "01916bde-d3d5-7cc5-814d-f0ad4858fe6d",
+      "sprite": 206,
+      "quality": 0,
       "name": "Tower Trash Tunic",
+      "itemClass": "Tunic",
+      "maxUpgrades": 0,
+      "value": 20,
+      "sellValue": 0,
+      "desc": "a leather tunic",
+      "damageClass": "physical",
       "stats": {
         "armorClass": 7,
         "mitigation": 10
       },
-      "desc": "a leather tunic",
-      "value": 200,
-      "sprite": 206,
-      "itemClass": "Tunic",
+      "randomStats": {},
       "type": "martial",
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "isBeltable": false,
-      "isSackable": true,
-      "_id": "01916bde-d3d5-7cc5-814d-f0ad4858fe6d"
+      "isSackable": true
     },
     {
       "name": "Tower Bone Tunic",
@@ -76727,19 +76804,34 @@
       "_id": "01916bde-d3d5-7cc5-814e-4593c9a3125a"
     },
     {
+      "_id": "01916bde-d3d5-7cc5-814e-4f66e97d9452",
+      "sprite": 206,
+      "quality": 0,
       "name": "Risan Trash Tunic",
+      "itemClass": "Tunic",
+      "maxUpgrades": 0,
+      "value": 100,
+      "sellValue": 0,
+      "desc": "a leather tunic",
+      "damageClass": "physical",
       "stats": {
         "armorClass": 12,
         "mitigation": 10
       },
-      "desc": "a leather tunic",
-      "value": 300,
-      "sprite": 206,
-      "itemClass": "Tunic",
+      "randomStats": {},
       "type": "martial",
+      "trait": {
+        "level": 0
+      },
+      "randomTrait": {
+        "name": [],
+        "level": {
+          "min": 0,
+          "max": 0
+        }
+      },
       "isBeltable": false,
-      "isSackable": true,
-      "_id": "01916bde-d3d5-7cc5-814e-4f66e97d9452"
+      "isSackable": true
     },
     {
       "name": "Remorhaz Scales Tunic",