diff --git a/game/data/configs/door_configs.json b/game/data/configs/door_configs.json
index 7a4fc7a..b01e865 100644
--- a/game/data/configs/door_configs.json
+++ b/game/data/configs/door_configs.json
@@ -319,7 +319,7 @@
   },
   {
     "id": "2039",
-    "replaceId": "1561",
+    "replaceId": "1560",
     "fence": "false",
     "metal": "true"
   },
@@ -2154,13 +2154,13 @@
   {
     "id": "24369",
     "replaceId": "24373",
-    "fence": "true",
+    "fence": "false",
     "metal": "false"
   },
   {
     "id": "24370",
     "replaceId": "24374",
-    "fence": "true",
+    "fence": "false",
     "metal": "false"
   },
   {
@@ -2190,13 +2190,13 @@
   {
     "id": "24560",
     "replaceId": "15515",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
     "id": "24561",
     "replaceId": "15517",
-    "fence": "false",
+    "fence": "true",
     "metal": "false"
   },
   {
diff --git a/game/data/configs/drop_tables.json b/game/data/configs/drop_tables.json
index 85ef7ee..a31615a 100644
--- a/game/data/configs/drop_tables.json
+++ b/game/data/configs/drop_tables.json
@@ -16,7 +16,7 @@
       }
     ],
     "charm": [],
-    "ids": "1,2,3,16,24,170,351,359,663,726,727,728,729,730,1081,1084,1085,1086,1087,1088,1089,2675,3223,3224,3225,3915,5923",
+    "ids": "1,2,3,16,24,170,351,359,663,726,727,728,729,730,1081,1084,1085,1086,1087,1088,1089,2675,2683,3223,3224,3225,3915,5923",
     "description": "",
     "main": [
       {
@@ -145,7 +145,7 @@
       }
     ],
     "charm": [],
-    "ids": "4,5,6,25,352,353,354,360,361,362,363,2776,3226,3227,5924",
+    "ids": "4,5,6,25,352,353,354,360,361,362,363,2776,2684,3226,3227,5924",
     "description": "",
     "main": [
       {
@@ -2744,7 +2744,7 @@
         "maxAmount": "1"
       }
     ],
-    "ids": "59,60,4400",
+    "ids": "59,60",
     "description": "",
     "main": [
       {
@@ -2897,7 +2897,7 @@
         "maxAmount": "1"
       }
     ],
-    "ids": "61,1004,1221,1473,1474,4401,7207",
+    "ids": "61,1004,1221,1473,1474,4400,4401,7207",
     "description": "",
     "main": [
       {
@@ -6816,298 +6816,184 @@
         "weight": "1.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "489.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "117,4689,4690,4691,4692,4693",
     "description": "",
     "main": [
       {
-        "minAmount": "3",
-        "weight": "50.0",
-        "id": "884",
-        "maxAmount": "3"
+        "minAmount": "1",
+        "weight": "5.0",
+        "id": "1153",
+        "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "4.0",
         "id": "1203",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "1153",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "10",
-        "weight": "12.5",
-        "id": "886",
-        "maxAmount": "10"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
         "id": "1191",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "2.0",
         "id": "1295",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "1309",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "3",
-        "weight": "8.0",
-        "id": "888",
+        "weight": "6.0",
+        "id": "884",
         "maxAmount": "3"
       },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "1207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "1119",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "7",
-        "weight": "25.0",
-        "id": "555",
-        "maxAmount": "7"
-      },
       {
         "minAmount": "15",
-        "weight": "8.0",
+        "weight": "3.0",
         "id": "554",
         "maxAmount": "15"
       },
+      {
+        "minAmount": "7",
+        "weight": "3.0",
+        "id": "555",
+        "maxAmount": "7"
+      },
       {
         "minAmount": "2",
-        "weight": "8.0",
-        "id": "564",
+        "weight": "3.0",
+        "id": "563",
         "maxAmount": "2"
       },
       {
-        "minAmount": "2",
-        "weight": "8.0",
-        "id": "563",
-        "maxAmount": "3"
-      },
-      {
-        "minAmount": "6",
-        "weight": "8.0",
-        "id": "561",
-        "maxAmount": "6"
+        "minAmount": "10",
+        "weight": "2.0",
+        "id": "886",
+        "maxAmount": "10"
       },
       {
         "minAmount": "3",
-        "weight": "8.0",
+        "weight": "2.0",
         "id": "558",
         "maxAmount": "3"
       },
       {
         "minAmount": "2",
-        "weight": "8.0",
-        "id": "560",
+        "weight": "2.0",
+        "id": "564",
         "maxAmount": "2"
       },
       {
         "minAmount": "2",
-        "weight": "8.0",
+        "weight": "1.0",
         "id": "562",
         "maxAmount": "2"
       },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "199",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "201",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5322",
-        "maxAmount": "3"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5318",
-        "maxAmount": "4"
-      },
-      {
-        "minAmount": "4",
-        "weight": "25.0",
-        "id": "5319",
-        "maxAmount": "4"
-      },
-      {
-        "minAmount": "8",
-        "weight": "25.0",
-        "id": "5319",
-        "maxAmount": "8"
-      },
       {
         "minAmount": "2",
-        "weight": "25.0",
-        "id": "5323",
+        "weight": "1.0",
+        "id": "560",
         "maxAmount": "2"
       },
-      {
-        "minAmount": "4",
-        "weight": "25.0",
-        "id": "5324",
-        "maxAmount": "4"
-      },
       {
         "minAmount": "1",
-        "weight": "8.0",
-        "id": "5100",
+        "weight": "7.0",
+        "id": "14424",
         "maxAmount": "1"
       },
       {
-        "minAmount": "3",
-        "weight": "8.0",
-        "id": "5320",
-        "maxAmount": "3"
+        "minAmount": "1",
+        "weight": "18.0",
+        "id": "14430",
+        "maxAmount": "1"
       },
       {
-        "minAmount": "1",
+        "minAmount": "38",
+        "weight": "14.0",
+        "id": "995",
+        "maxAmount": "38"
+      },
+      {
+        "minAmount": "52",
+        "weight": "10.0",
+        "id": "995",
+        "maxAmount": "52"
+      },
+      {
+        "minAmount": "15",
         "weight": "8.0",
-        "id": "5321",
-        "maxAmount": "4"
+        "id": "995",
+        "maxAmount": "15"
       },
       {
         "minAmount": "8",
-        "weight": "50.0",
+        "weight": "6.0",
         "id": "995",
-        "maxAmount": "80"
+        "maxAmount": "8"
       },
       {
-        "minAmount": "80",
-        "weight": "8.0",
+        "minAmount": "88",
+        "weight": "2.0",
         "id": "995",
-        "maxAmount": "300"
+        "maxAmount": "88"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "11.0",
         "id": "225",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "6.0",
         "id": "1917",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "8.0",
+        "weight": "2.0",
         "id": "1446",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "1.6544",
+        "id": "0",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "3.0",
+        "id": "14426",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "0.32",
         "id": "10976",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "0.0256",
         "id": "10977",
         "maxAmount": "1"
       },
       {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "31",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "15",
-        "weight": "12.5",
-        "id": "886",
-        "maxAmount": "15"
-      },
-      {
-        "minAmount": "1",
-        "weight": "1400.0",
-        "id": "0",
-        "maxAmount": "1"
+        "minAmount": "6",
+        "weight": "2.0",
+        "id": "561",
+        "maxAmount": "6"
       }
     ]
   },
@@ -14764,104 +14650,80 @@
     "main": [
       {
         "minAmount": "15",
-        "weight": "50.0",
+        "weight": "13.0",
         "id": "556",
-        "maxAmount": "20"
+        "maxAmount": "15"
       },
       {
         "minAmount": "2",
-        "weight": "50.0",
-        "id": "562",
-        "maxAmount": "2"
-      },
-      {
-        "minAmount": "2",
-        "weight": "50.0",
+        "weight": "9.0",
         "id": "561",
         "maxAmount": "2"
       },
+      {
+        "minAmount": "2",
+        "weight": "7.0",
+        "id": "562",
+        "maxAmount": "2"
+      },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "6.0",
         "id": "563",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "4.0",
         "id": "560",
         "maxAmount": "1"
       },
+      {
+        "minAmount": "20",
+        "weight": "3.0",
+        "id": "556",
+        "maxAmount": "20"
+      },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "565",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "199",
+        "weight": "14.0",
+        "id": "14424",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "12",
+        "weight": "36.0",
+        "id": "995",
+        "maxAmount": "12"
+      },
+      {
+        "minAmount": "42",
+        "weight": "3.0",
+        "id": "995",
+        "maxAmount": "42"
+      },
+      {
+        "minAmount": "1",
+        "weight": "2.0",
+        "id": "1381",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "201",
+        "weight": "2.0",
+        "id": "14426",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "31",
+        "weight": "28.0",
+        "id": "0",
         "maxAmount": "1"
       }
     ]
@@ -14879,124 +14741,82 @@
     "ids": "1022",
     "description": "",
     "main": [
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "199",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "201",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "15",
-        "weight": "50.0",
+        "weight": "13.0",
         "id": "555",
-        "maxAmount": "20"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "563",
-        "maxAmount": "1"
+        "maxAmount": "15"
       },
       {
         "minAmount": "2",
-        "weight": "50.0",
+        "weight": "9.0",
         "id": "561",
         "maxAmount": "2"
       },
       {
         "minAmount": "2",
-        "weight": "50.0",
+        "weight": "7.0",
         "id": "562",
         "maxAmount": "2"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "6.0",
+        "id": "563",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "4.0",
         "id": "560",
         "maxAmount": "1"
       },
+      {
+        "minAmount": "20",
+        "weight": "3.0",
+        "id": "555",
+        "maxAmount": "20"
+      },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "565",
         "maxAmount": "1"
       },
       {
-        "minAmount": "10",
-        "weight": "50.0",
+        "minAmount": "1",
+        "weight": "14.0",
+        "id": "14424",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "12",
+        "weight": "36.0",
         "id": "995",
-        "maxAmount": "40"
+        "maxAmount": "12"
+      },
+      {
+        "minAmount": "42",
+        "weight": "3.0",
+        "id": "995",
+        "maxAmount": "42"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "2.0",
         "id": "1383",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
-        "id": "31",
+        "weight": "2.0",
+        "id": "14426",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "28.0",
+        "id": "0",
         "maxAmount": "1"
       }
     ]
@@ -16182,178 +16002,136 @@
     "ids": "1096",
     "description": "",
     "main": [
-      {
-        "minAmount": "16",
-        "weight": "25.0",
-        "id": "561",
-        "maxAmount": "16"
-      },
-      {
-        "minAmount": "25",
-        "weight": "25.0",
-        "id": "557",
-        "maxAmount": "25"
-      },
-      {
-        "minAmount": "65",
-        "weight": "25.0",
-        "id": "557",
-        "maxAmount": "65"
-      },
-      {
-        "minAmount": "4",
-        "weight": "25.0",
-        "id": "563",
-        "maxAmount": "4"
-      },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "4.0",
         "id": "1119",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "1339",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1357",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1183",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
         "id": "1341",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
-        "id": "1347",
+        "weight": "3.0",
+        "id": "1339",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "1.0",
+        "id": "1183",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
         "id": "3122",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "199",
+        "weight": "1.0",
+        "id": "1121",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "201",
+        "weight": "1.0",
+        "id": "1347",
         "maxAmount": "1"
       },
       {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "203",
-        "maxAmount": "1"
+        "minAmount": "80",
+        "weight": "8.0",
+        "id": "557",
+        "maxAmount": "80"
       },
       {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "995",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "10976",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "10977",
-        "maxAmount": "1"
+        "minAmount": "16",
+        "weight": "5.0",
+        "id": "561",
+        "maxAmount": "16"
       },
       {
         "minAmount": "4",
-        "weight": "25.0",
-        "id": "362",
+        "weight": "3.0",
+        "id": "563",
         "maxAmount": "4"
       },
       {
-        "minAmount": "6",
+        "minAmount": "65",
+        "weight": "1.0",
+        "id": "557",
+        "maxAmount": "65"
+      },
+      {
+        "minAmount": "25",
+        "weight": "1.0",
+        "id": "557",
+        "maxAmount": "25"
+      },
+      {
+        "minAmount": "1",
+        "weight": "15.0",
+        "id": "14424",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "40",
+        "weight": "29.0",
+        "id": "995",
+        "maxAmount": "40"
+      },
+      {
+        "minAmount": "135",
         "weight": "25.0",
+        "id": "995",
+        "maxAmount": "135"
+      },
+      {
+        "minAmount": "190",
+        "weight": "10.0",
+        "id": "995",
+        "maxAmount": "190"
+      },
+      {
+        "minAmount": "20",
+        "weight": "4.0",
+        "id": "995",
+        "maxAmount": "20"
+      },
+      {
+        "minAmount": "420",
+        "weight": "1.0",
+        "id": "995",
+        "maxAmount": "420"
+      },
+      {
+        "minAmount": "6",
+        "weight": "3.0",
         "id": "454",
         "maxAmount": "6"
       },
+      {
+        "minAmount": "4",
+        "weight": "2.0",
+        "id": "360",
+        "maxAmount": "4"
+      },
       {
         "minAmount": "1",
         "weight": "5.0",
-        "id": "31",
+        "id": "14426",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "69.0",
-        "id": "0",
+        "weight": "2.0",
+        "id": "1357",
         "maxAmount": "1"
       }
     ]
@@ -16404,86 +16182,134 @@
     "main": [
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1183",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1341",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "3122",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1121",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1347",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
+        "weight": "4.0",
         "id": "1119",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
+        "id": "1341",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "3.0",
         "id": "1339",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1357",
+        "weight": "1.0",
+        "id": "1183",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "995",
+        "weight": "1.0",
+        "id": "3122",
         "maxAmount": "1"
       },
       {
-        "minAmount": "4",
-        "weight": "25.0",
-        "id": "563",
-        "maxAmount": "4"
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1121",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1347",
+        "maxAmount": "1"
       },
       {
         "minAmount": "80",
-        "weight": "25.0",
+        "weight": "8.0",
         "id": "557",
         "maxAmount": "80"
       },
+      {
+        "minAmount": "16",
+        "weight": "5.0",
+        "id": "561",
+        "maxAmount": "16"
+      },
+      {
+        "minAmount": "4",
+        "weight": "3.0",
+        "id": "563",
+        "maxAmount": "4"
+      },
+      {
+        "minAmount": "65",
+        "weight": "1.0",
+        "id": "557",
+        "maxAmount": "65"
+      },
+      {
+        "minAmount": "25",
+        "weight": "1.0",
+        "id": "557",
+        "maxAmount": "25"
+      },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "10976",
+        "weight": "15.0",
+        "id": "14424",
         "maxAmount": "1"
       },
+      {
+        "minAmount": "40",
+        "weight": "29.0",
+        "id": "995",
+        "maxAmount": "40"
+      },
+      {
+        "minAmount": "135",
+        "weight": "25.0",
+        "id": "995",
+        "maxAmount": "135"
+      },
+      {
+        "minAmount": "190",
+        "weight": "10.0",
+        "id": "995",
+        "maxAmount": "190"
+      },
+      {
+        "minAmount": "20",
+        "weight": "4.0",
+        "id": "995",
+        "maxAmount": "20"
+      },
+      {
+        "minAmount": "420",
+        "weight": "1.0",
+        "id": "995",
+        "maxAmount": "420"
+      },
+      {
+        "minAmount": "6",
+        "weight": "3.0",
+        "id": "454",
+        "maxAmount": "6"
+      },
+      {
+        "minAmount": "4",
+        "weight": "2.0",
+        "id": "360",
+        "maxAmount": "4"
+      },
       {
         "minAmount": "1",
         "weight": "5.0",
-        "id": "31",
+        "id": "14426",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "100.0",
-        "id": "0",
+        "weight": "2.0",
+        "id": "1357",
         "maxAmount": "1"
       }
     ]
@@ -16534,74 +16360,134 @@
     "main": [
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1357",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1341",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "3122",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1347",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
+        "weight": "4.0",
         "id": "1119",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
+        "id": "1341",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "3.0",
         "id": "1339",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "995",
+        "weight": "1.0",
+        "id": "1183",
         "maxAmount": "1"
       },
       {
-        "minAmount": "2",
-        "weight": "25.0",
-        "id": "563",
-        "maxAmount": "2"
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "3122",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1121",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1347",
+        "maxAmount": "1"
       },
       {
         "minAmount": "80",
-        "weight": "25.0",
+        "weight": "8.0",
         "id": "557",
         "maxAmount": "80"
       },
+      {
+        "minAmount": "16",
+        "weight": "5.0",
+        "id": "561",
+        "maxAmount": "16"
+      },
+      {
+        "minAmount": "4",
+        "weight": "3.0",
+        "id": "563",
+        "maxAmount": "4"
+      },
+      {
+        "minAmount": "65",
+        "weight": "1.0",
+        "id": "557",
+        "maxAmount": "65"
+      },
+      {
+        "minAmount": "25",
+        "weight": "1.0",
+        "id": "557",
+        "maxAmount": "25"
+      },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "5323",
+        "weight": "15.0",
+        "id": "14424",
         "maxAmount": "1"
       },
+      {
+        "minAmount": "40",
+        "weight": "29.0",
+        "id": "995",
+        "maxAmount": "40"
+      },
+      {
+        "minAmount": "135",
+        "weight": "25.0",
+        "id": "995",
+        "maxAmount": "135"
+      },
+      {
+        "minAmount": "190",
+        "weight": "10.0",
+        "id": "995",
+        "maxAmount": "190"
+      },
+      {
+        "minAmount": "20",
+        "weight": "4.0",
+        "id": "995",
+        "maxAmount": "20"
+      },
+      {
+        "minAmount": "420",
+        "weight": "1.0",
+        "id": "995",
+        "maxAmount": "420"
+      },
+      {
+        "minAmount": "6",
+        "weight": "3.0",
+        "id": "454",
+        "maxAmount": "6"
+      },
+      {
+        "minAmount": "4",
+        "weight": "2.0",
+        "id": "360",
+        "maxAmount": "4"
+      },
       {
         "minAmount": "1",
         "weight": "5.0",
-        "id": "31",
+        "id": "14426",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "100.0",
-        "id": "0",
+        "weight": "2.0",
+        "id": "1357",
         "maxAmount": "1"
       }
     ]
@@ -18143,189 +18029,135 @@
     "main": [
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1197",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1147",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1113",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "10.0",
-        "id": "1127",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "10.0",
-        "id": "1185",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1353",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1365",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1299",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
+        "weight": "4.0",
         "id": "1285",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
+        "id": "1365",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "2.0",
+        "id": "1355",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "2.0",
         "id": "1211",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "1355",
+        "weight": "1.0",
+        "id": "1197",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1147",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1113",
         "maxAmount": "1"
       },
       {
         "minAmount": "50",
-        "weight": "25.0",
+        "weight": "8.0",
         "id": "556",
         "maxAmount": "50"
       },
+      {
+        "minAmount": "10",
+        "weight": "7.0",
+        "id": "562",
+        "maxAmount": "10"
+      },
       {
         "minAmount": "7",
-        "weight": "25.0",
+        "weight": "4.0",
         "id": "565",
         "maxAmount": "7"
       },
       {
         "minAmount": "37",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "554",
         "maxAmount": "37"
       },
       {
         "minAmount": "3",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "563",
         "maxAmount": "3"
       },
-      {
-        "minAmount": "10",
-        "weight": "25.0",
-        "id": "562",
-        "maxAmount": "10"
-      },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "199",
+        "weight": "23.0",
+        "id": "14424",
         "maxAmount": "1"
       },
       {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "201",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "217",
-        "maxAmount": "1"
+        "minAmount": "132",
+        "weight": "40.0",
+        "id": "995",
+        "maxAmount": "132"
       },
       {
         "minAmount": "30",
-        "weight": "50.0",
+        "weight": "7.0",
         "id": "995",
         "maxAmount": "30"
       },
+      {
+        "minAmount": "44",
+        "weight": "6.0",
+        "id": "995",
+        "maxAmount": "44"
+      },
+      {
+        "minAmount": "220",
+        "weight": "6.0",
+        "id": "995",
+        "maxAmount": "220"
+      },
+      {
+        "minAmount": "460",
+        "weight": "1.0",
+        "id": "995",
+        "maxAmount": "460"
+      },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
         "id": "379",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "133",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "31",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5.0",
+        "id": "14426",
+        "maxAmount": "1"
       }
     ]
   },
@@ -18977,170 +18809,116 @@
     "main": [
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "4.0",
         "id": "1311",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1365",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
+        "weight": "3.0",
         "id": "1353",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "3.0",
+        "id": "1365",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
         "id": "1197",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1163",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "1073",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1135",
+        "weight": "1.0",
+        "id": "1163",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1065",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1099",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "199",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "201",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "995",
-        "maxAmount": "220"
-      },
       {
         "minAmount": "75",
-        "weight": "25.0",
+        "weight": "8.0",
         "id": "554",
         "maxAmount": "75"
       },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "2357",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "361",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "15",
-        "weight": "25.0",
+        "weight": "5.0",
         "id": "562",
         "maxAmount": "15"
       },
+      {
+        "minAmount": "5",
+        "weight": "3.0",
+        "id": "560",
+        "maxAmount": "5"
+      },
+      {
+        "minAmount": "37",
+        "weight": "1.0",
+        "id": "554",
+        "maxAmount": "37"
+      },
+      {
+        "minAmount": "132",
+        "weight": "40.0",
+        "id": "995",
+        "maxAmount": "132"
+      },
+      {
+        "minAmount": "44",
+        "weight": "29.0",
+        "id": "995",
+        "maxAmount": "44"
+      },
+      {
+        "minAmount": "220",
+        "weight": "10.0",
+        "id": "995",
+        "maxAmount": "220"
+      },
+      {
+        "minAmount": "11",
+        "weight": "7.0",
+        "id": "995",
+        "maxAmount": "11"
+      },
+      {
+        "minAmount": "460",
+        "weight": "1.0",
+        "id": "995",
+        "maxAmount": "460"
+      },
+      {
+        "minAmount": "1",
+        "weight": "3.0",
+        "id": "361",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "2.0",
+        "id": "2357",
+        "maxAmount": "1"
+      },
       {
         "minAmount": "10",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "1734",
         "maxAmount": "10"
       },
       {
         "minAmount": "1",
         "weight": "5.0",
-        "id": "1",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "31",
+        "id": "14426",
         "maxAmount": "1"
       }
     ]
@@ -22467,79 +22245,85 @@
     "main": [
       {
         "minAmount": "1",
-        "weight": "3.0",
+        "weight": "12.0",
         "id": "1353",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "1.0",
+        "weight": "4.0",
         "id": "1197",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "1.0",
+        "weight": "4.0",
         "id": "3053",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "1.0",
+        "weight": "4.0",
         "id": "1073",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "1.0",
+        "weight": "4.0",
         "id": "1163",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "0.25",
+        "weight": "1.0",
         "id": "4103",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "33.0",
+        "weight": "130.0",
         "id": "14424",
         "maxAmount": "1"
       },
       {
         "minAmount": "2",
-        "weight": "33.0",
+        "weight": "130.0",
         "id": "14424",
         "maxAmount": "2"
       },
       {
         "minAmount": "3",
-        "weight": "12.0",
+        "weight": "47.0",
         "id": "14424",
         "maxAmount": "3"
       },
       {
         "minAmount": "1",
-        "weight": "19.0",
+        "weight": "76.0",
         "id": "14428",
         "maxAmount": "1"
       },
       {
         "minAmount": "460",
-        "weight": "1.0",
+        "weight": "4.0",
         "id": "995",
         "maxAmount": "460"
       },
       {
         "minAmount": "1",
-        "weight": "18.0",
+        "weight": "72.0",
         "id": "0",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "4.0",
+        "id": "12070",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "20.0",
         "id": "14426",
         "maxAmount": "1"
       }
@@ -23330,189 +23114,135 @@
     "main": [
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "1163",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1073",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1197",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "4131",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
+        "weight": "4.0",
         "id": "1311",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "3.0",
+        "id": "1353",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "3.0",
         "id": "1365",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "1353",
+        "weight": "1.0",
+        "id": "1197",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1073",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "1163",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "4131",
         "maxAmount": "1"
       },
       {
         "minAmount": "5",
-        "weight": "25.0",
+        "weight": "3.0",
         "id": "560",
         "maxAmount": "5"
       },
       {
         "minAmount": "10",
-        "weight": "25.0",
+        "weight": "3.0",
         "id": "560",
         "maxAmount": "10"
       },
-      {
-        "minAmount": "3",
-        "weight": "12.5",
-        "id": "562",
-        "maxAmount": "3"
-      },
       {
         "minAmount": "37",
-        "weight": "12.5",
+        "weight": "1.0",
         "id": "562",
         "maxAmount": "37"
       },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5281",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5297",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5280",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5298",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5299",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5106",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5296",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5301",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "1",
         "weight": "8.0",
-        "id": "5303",
+        "id": "14428",
         "maxAmount": "1"
       },
       {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "5302",
-        "maxAmount": "1"
+        "minAmount": "132",
+        "weight": "40.0",
+        "id": "995",
+        "maxAmount": "132"
       },
       {
-        "minAmount": "10",
-        "weight": "50.0",
+        "minAmount": "44",
+        "weight": "29.0",
+        "id": "995",
+        "maxAmount": "44"
+      },
+      {
+        "minAmount": "220",
+        "weight": "10.0",
+        "id": "995",
+        "maxAmount": "220"
+      },
+      {
+        "minAmount": "11",
+        "weight": "7.0",
+        "id": "995",
+        "maxAmount": "11"
+      },
+      {
+        "minAmount": "460",
+        "weight": "1.0",
         "id": "995",
         "maxAmount": "460"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "3.0",
         "id": "361",
         "maxAmount": "1"
       },
+      {
+        "minAmount": "1",
+        "weight": "2.0",
+        "id": "2357",
+        "maxAmount": "1"
+      },
       {
         "minAmount": "10",
-        "weight": "25.0",
+        "weight": "1.0",
         "id": "1734",
         "maxAmount": "10"
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
-        "id": "2357",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
+        "weight": "1.0",
         "id": "12070",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "16.0",
+        "weight": "4.0",
+        "id": "14426",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
         "id": "31",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "100.0",
-        "id": "0",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "5300",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "8.0",
-        "id": "5304",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "5295",
-        "maxAmount": "1"
       }
     ]
   },
@@ -31444,330 +31174,6 @@
       }
     ]
   },
-  {
-    "default": [
-      {
-        "minAmount": "1",
-        "weight": "100.0",
-        "id": "526",
-        "maxAmount": "1"
-      }
-    ],
-    "charm": [],
-    "ids": "2683",
-    "description": "",
-    "main": [
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "882",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "877",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "199",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "201",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "995",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1965",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "562",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "558",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "436",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "554",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "313",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1440",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "4",
-        "weight": "25.0",
-        "id": "557",
-        "maxAmount": "4"
-      },
-      {
-        "minAmount": "1",
-        "weight": "9.52",
-        "id": "12070",
-        "maxAmount": "1"
-      }
-    ]
-  },
-  {
-    "default": [
-      {
-        "minAmount": "1",
-        "weight": "100.0",
-        "id": "526",
-        "maxAmount": "1"
-      }
-    ],
-    "charm": [],
-    "ids": "2684",
-    "description": "",
-    "main": [
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "882",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "877",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1139",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "199",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "201",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "203",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "205",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "207",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "209",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "211",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "213",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "215",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "2485",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "217",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "995",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1965",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "436",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "313",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1440",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "562",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "558",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "557",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1381",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1",
-        "maxAmount": "1"
-      }
-    ]
-  },
   {
     "default": [
       {
@@ -36601,14 +36007,7 @@
     ]
   },
   {
-    "default": [
-      {
-        "minAmount": "1",
-        "weight": "100.0",
-        "id": "592",
-        "maxAmount": "1"
-      }
-    ],
+    "default": [],
     "charm": [
       {
         "minAmount": "1",
@@ -36644,238 +36043,46 @@
     "ids": "3406,6217,7714,7715",
     "description": "",
     "main": [
-      {
-        "minAmount": "2",
-        "weight": "50.0",
-        "id": "882",
-        "maxAmount": "9"
-      },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "877",
-        "maxAmount": "10"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1155",
+        "weight": "111.0",
+        "id": "0",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "1351",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1139",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1277",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1265",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "884",
+        "weight": "4.0",
+        "id": "555",
         "maxAmount": "5"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "1101",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1349",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "1267",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
-        "id": "886",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1141",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1353",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1269",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1381",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1383",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "288",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1993",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1913",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1891",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1917",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "6794",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
+        "weight": "1.0",
         "id": "556",
-        "maxAmount": "10"
+        "maxAmount": "5"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "555",
-        "maxAmount": "11"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "562",
-        "maxAmount": "6"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "560",
-        "maxAmount": "2"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0",
+        "weight": "4.0",
         "id": "995",
-        "maxAmount": "40"
+        "maxAmount": "30"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "2355",
+        "weight": "4.0",
+        "id": "995",
+        "maxAmount": "20"
+      },
+      {
+        "minAmount": "1",
+        "weight": "3.0",
+        "id": "14426",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
-        "id": "442",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1718",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "25.0",
-        "id": "1444",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "5733",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "6691",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "193",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1716",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "10",
-        "weight": "5.0",
-        "id": "2",
-        "maxAmount": "40"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "31",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "100.0",
-        "id": "0",
+        "weight": "1.0",
+        "id": "1",
         "maxAmount": "1"
       }
     ]
diff --git a/game/data/configs/music_configs.json b/game/data/configs/music_configs.json
index 96fb000..f56393a 100644
--- a/game/data/configs/music_configs.json
+++ b/game/data/configs/music_configs.json
@@ -533,7 +533,7 @@
   },
   {
     "id": "146",
-    "borders": "{2688,4800,2751,4863}"
+    "borders": "{3459,4808,5919,4863}"
   },
   {
     "id": "148",
@@ -1215,7 +1215,7 @@
   },
   {
     "id": "402",
-    "borders": "{2944,4928,3007,4991}-{3008,4928,3071,4991}"
+    "borders": "{2944,4928,3071,4991}"
   },
   {
     "id": "403",
@@ -1223,7 +1223,7 @@
   },
   {
     "id": "404",
-    "borders": "{2823,5250,2844,5310}-{2844,5250,2878,5280}"
+    "borders": "{2823,5250,2844,5310}-{2844,5250,2878,5276}"
   },
   {
     "id": "407",
@@ -1243,7 +1243,7 @@
   },
   {
     "id": "412",
-    "borders": "{3008,4800,3071,4863}"
+    "borders": "{3008,4800,3071,4863}--{3011,4866,3066,4925}"
   },
   {
     "id": "413",
@@ -1564,5 +1564,13 @@
   {
     "id": "379",
     "borders": "{3520,4928,3584,4992}"
+  },
+  {
+    "id": "512",
+    "borders": "{2436,4876,2485,4918}"
+  },
+  {
+    "id": "564",
+    "borders": "{2879,4371,3001,4397}"
   }
 ]
diff --git a/game/data/configs/npc_configs.json b/game/data/configs/npc_configs.json
index 018c8d1..3b0b9b6 100644
--- a/game/data/configs/npc_configs.json
+++ b/game/data/configs/npc_configs.json
@@ -6733,13 +6733,13 @@
     "attack_level": "1"
   },
   {
-    "examine": "Like a grave keeper",
+    "examine": "He clearly takes pride in his appearance.",
     "range_animation": "0",
     "magic_level": "60",
     "defence_animation": "0",
     "weakness": "10",
     "magic_animation": "0",
-    "name": "Shopkeeper",
+    "name": "Shopkeeper Kofi",
     "defence_level": "60",
     "safespot": null,
     "lifepoints": "285",
@@ -6749,6 +6749,23 @@
     "range_level": "60",
     "attack_level": "60"
   },
+  {
+    "examine": "Needs a haircut.",
+    "range_animation": "0",
+    "magic_level": "60",
+    "defence_animation": "0",
+    "weakness": "10",
+    "magic_animation": "0",
+    "name": "Shop assistant",
+    "defence_level": "60",
+    "safespot": null,
+    "lifepoints": "285",
+    "strength_level": "60",
+    "id": "533",
+    "aggressive": "true",
+    "range_level": "60",
+    "attack_level": "60"
+  },
   {
     "examine": "Sells stuff.",
     "melee_animation": "0",
@@ -19432,7 +19449,8 @@
     "slayer_task": "15",
     "melee_animation": "6079",
     "range_animation": "0",
-    "attack_speed": "5",
+    "attack_speed": "4",
+    "magic_level": "1",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "2",
@@ -19442,11 +19460,12 @@
     "name": "Cave bug",
     "defence_level": "6",
     "safespot": null,
-    "lifepoints": "8",
-    "strength_level": "1",
+    "lifepoints": "5",
+    "strength_level": "5",
     "id": "1832",
-    "range_level": "6",
-    "attack_level": "1"
+    "bonuses": "0,0,0,0,0,10,10,5,5,10,0,0,0,0,0",
+    "range_level": "1",
+    "attack_level": "6"
   },
   {
     "examine": "A little",
@@ -19957,6 +19976,7 @@
     "melee_animation": "0",
     "range_animation": "0",
     "combat_audio": "703,705,704",
+    "attack_speed": "4",
     "defence_animation": "0",
     "magic_animation": "0",
     "death_animation": "0",
@@ -19966,8 +19986,9 @@
     "lifepoints": "10",
     "strength_level": "1",
     "id": "1902",
+    "bonuses": "0,0,0,0,0,10,10,5,5,10,0,0,0,0,0",
     "range_level": "1",
-    "attack_level": "1"
+    "attack_level": "6"
   },
   {
     "examine": "Menaphite thug.",
@@ -28438,6 +28459,7 @@
     "examine": "A not-so friendly, not-so little cat.",
     "melee_animation": "0",
     "range_animation": "0",
+    "attack_speed": "4",
     "defence_animation": "0",
     "magic_animation": "0",
     "death_animation": "0",
@@ -28449,7 +28471,7 @@
     "id": "2986",
     "aggressive": "true",
     "range_level": "1",
-    "attack_level": "1"
+    "attack_level": "10"
   },
   {
     "examine": "A fully grown feline.",
@@ -49136,21 +49158,23 @@
     "slayer_task": "15",
     "melee_animation": "6079",
     "range_animation": "0",
-    "attack_speed": "5",
-    "respawn_delay": "60",
+    "attack_speed": "4",
+    "magic_level": "1",
+    "respawn_degitlay": "60",
     "defence_animation": "0",
     "weakness": "2",
     "slayer_exp": "93",
     "magic_animation": "0",
     "death_animation": "6081",
     "name": "Cave bug",
-    "defence_level": "9",
+    "defence_level": "84",
     "safespot": null,
     "lifepoints": "93",
-    "strength_level": "1",
+    "strength_level": "80",
     "id": "5750",
-    "range_level": "9",
-    "attack_level": "1"
+    "bonuses": "0,0,0,0,0,72,59,35,25,95,0,0,0,0,0",
+    "range_level": "1",
+    "attack_level": "82"
   },
   {
     "examine": "A strange mole-like being.",
@@ -71333,6 +71357,21 @@
     "name": "Dreven",
     "id": "2335"
   },
+  {
+    "examine": "Founder and Director of the Piscatoris Fishing Colony.",
+    "name": "Herman Caranos",
+    "id": "3822"
+  },
+  {
+    "examine": "Engineer for the Piscatoris Fishing Colony.",
+    "name": "Franklin Caranos",
+    "id": "3823"
+  },
+  {
+    "examine": "Secretary and Storemaster for the Piscatoris Fishing Colony.",
+    "name": "Arnold Lydspor",
+    "id": "3824"
+  },
   {
     "examine": "Perhaps this gardener might look after your crops for you.",
     "name": "Frizzy Skernip",
@@ -72276,5 +72315,24 @@
     "examine": "He looks dangerous!",
     "name": "Turael",
     "id": "8273"
+  },
+  {
+    "examine": "Doesn't seem to want to go away.",
+    "combat_style": "2",
+    "melee_animation": "811",
+    "range_animation": "811",
+    "attack_speed": "4",
+    "magic_level": "100",
+    "defence_animation": "0",
+    "magic_animation": "811",
+    "death_animation": "836",
+    "name": "Skeleton Mage",
+    "defence_level": "60",
+    "lifepoints": "80",
+    "strength_level": "10",
+    "id": "3851",
+    "bonuses": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+    "range_level": "1",
+    "attack_level": "10"
   }
 ]
\ No newline at end of file
diff --git a/game/data/configs/npc_spawns.json b/game/data/configs/npc_spawns.json
index 8613771..4357966 100644
--- a/game/data/configs/npc_spawns.json
+++ b/game/data/configs/npc_spawns.json
@@ -6391,9 +6391,14 @@
     "npc_id": "3820",
     "loc_data": "{3088,3255,0,0,6}"
   },
+
+  {
+    "npc_id": "3822",
+    "loc_data": "{2353,3680,0,1,3}"
+  },
   {
     "npc_id": "3823",
-    "loc_data": "{2343,3668,0,0,0}"
+    "loc_data": "{2343,3668,0,1,3}"
   },
   {
     "npc_id": "3824",
@@ -9193,11 +9198,11 @@
   },
   {
     "npc_id": "6213",
-    "loc_data": "{2894,5353,2,1,0}-{2838,5347,2,1,6}-{2872,5318,2,1,4}-{2875,5313,2,1,4}-{2865,5327,2,1,4}-{2886,5293,2,1,5}-{2909,5297,2,1,0}-{2919,5293,3,1,4}-{2843,5352,2,1,4}-{2908,5346,2,1,6}-{2913,5355,2,1,3}-{2916,5345,2,1,1}-{2919,5349,2,1,2}-{2922,5356,2,1,1}-{2927,5354,2,1,6}-{2928,5350,2,1,4}-{2931,5357,2,1,3}-{2911,5338,2,1,6}-{2925,5295,3,1,0}-{2862,5290,2,1,1}-{2919,5293,1,1,5}"
+    "loc_data": "{2894,5353,2,1,0}-{2838,5347,2,1,6}-{2872,5318,2,1,4}-{2875,5313,2,1,4}-{2865,5327,2,1,4}-{2886,5293,2,1,5}-{2909,5297,2,1,0}-{2919,5293,1,1,4}-{2843,5352,2,1,4}-{2908,5346,2,1,6}-{2913,5355,2,1,3}-{2916,5345,2,1,1}-{2919,5349,2,1,2}-{2922,5356,2,1,1}-{2927,5354,2,1,6}-{2928,5350,2,1,4}-{2931,5357,2,1,3}-{2911,5338,2,1,6}-{2922,5295,1,1,0}-{2862,5290,2,1,1}-{2919,5293,1,1,5}"
   },
   {
     "npc_id": "6214",
-    "loc_data": "{2919,5284,1,1,0}-{2862,5292,2,1,7}-{2864,5319,2,1,7}-{2828,5337,2,1,6}-{2878,5327,2,1,4}-{2884,5312,2,1,2}-{2883,5320,2,1,0}-{2895,5309,2,1,6}-{2853,5327,2,1,4}-{2854,5345,2,1,2}-{2861,5292,2,1,4}-{2881,5291,2,1,1}-{2892,5328,2,1,1}-{2828,5331,2,1,1}-{2924,5292,3,1,6}-{2918,5281,1,1,1}-{2918,5280,1,1,1}"
+    "loc_data": "{2919,5284,1,1,0}-{2862,5292,2,1,7}-{2864,5319,2,1,7}-{2828,5337,2,1,6}-{2878,5327,2,1,4}-{2884,5312,2,1,2}-{2883,5320,2,1,0}-{2895,5309,2,1,6}-{2853,5327,2,1,4}-{2854,5345,2,1,2}-{2861,5292,2,1,4}-{2881,5291,2,1,1}-{2892,5328,2,1,1}-{2828,5331,2,1,1}-{2924,5292,1,1,6}-{2918,5281,1,1,1}-{2918,5280,1,1,1}"
   },
   {
     "npc_id": "6215",
@@ -9309,27 +9314,27 @@
   },
   {
     "npc_id": "6254",
-    "loc_data": "{2917,5272,0,1,7}-{2898,5295,2,1,4}-{2881,5283,2,1,1}-{2883,5311,2,1,2}-{2894,5301,2,1,3}-{2882,5284,2,1,5}-{2890,5292,2,1,4}-{2896,5296,2,1,2}-{2905,5299,2,1,3}-{2905,5301,2,1,5}-{2921,5283,3,1,1}-{2925,5292,3,1,7}-{2906,5299,0,1,6}-{2910,5297,0,1,6}-{2915,5270,0,1,2}-{2910,5269,0,1,5}"
+    "loc_data": "{2917,5272,0,1,7}-{2898,5295,2,1,4}-{2881,5283,2,1,1}-{2883,5311,2,1,2}-{2894,5301,2,1,3}-{2882,5284,2,1,5}-{2890,5292,2,1,4}-{2896,5296,2,1,2}-{2905,5299,2,1,3}-{2905,5301,2,1,5}-{2921,5283,1,1,1}-{2923,5292,1,1,7}-{2906,5299,0,1,6}-{2910,5297,0,1,6}-{2915,5270,0,1,2}-{2910,5269,0,1,5}"
   },
   {
     "npc_id": "6255",
-    "loc_data": "{2922,5290,1,1,5}-{2880,5304,2,1,1}-{2884,5311,2,1,2}-{2885,5311,2,1,2}-{2887,5312,2,1,1}-{2886,5313,2,1,0}-{2895,5310,2,1,1}-{2884,5280,2,1,3}-{2885,5293,2,1,6}-{2886,5291,2,1,6}-{2894,5285,2,1,3}-{2893,5286,2,1,7}-{2905,5292,2,1,4}-{2908,5297,2,1,4}-{2910,5297,2,1,6}-{2897,5308,2,1,4}-{2919,5299,3,1,1}-{2921,5292,3,1,5}-{2924,5288,3,1,0}-{2925,5287,3,1,1}-{2908,5300,0,1,6}-{2907,5294,0,1,6}-{2923,5293,1,1,5}-{2919,5298,1,1,1}-{2922,5291,1,1,6}-{2917,5285,1,1,0}-{2905,5295,0,1,6}"
+    "loc_data": "{2922,5290,1,1,5}-{2880,5304,2,1,1}-{2884,5311,2,1,2}-{2885,5311,2,1,2}-{2887,5312,2,1,1}-{2886,5313,2,1,0}-{2895,5310,2,1,1}-{2884,5280,2,1,3}-{2885,5293,2,1,6}-{2886,5291,2,1,6}-{2894,5285,2,1,3}-{2893,5286,2,1,7}-{2905,5292,2,1,4}-{2908,5297,2,1,4}-{2910,5297,2,1,6}-{2897,5308,2,1,4}-{2919,5299,1,1,1}-{2921,5292,1,1,5}-{2924,5288,1,1,0}-{2923,5287,1,1,1}-{2908,5300,0,1,6}-{2907,5294,0,1,6}-{2923,5293,1,1,5}-{2919,5298,1,1,1}-{2922,5291,1,1,6}-{2917,5285,1,1,0}-{2905,5295,0,1,6}"
   },
   {
     "npc_id": "6256",
-    "loc_data": "{2922,5285,1,1,0}-{2886,5295,2,1,1}-{2891,5300,2,1,1}-{2889,5310,2,1,2}-{2887,5299,2,1,6}-{2891,5297,2,1,3}-{2884,5283,2,1,3}-{2885,5286,2,1,3}-{2886,5294,2,1,1}-{2896,5286,2,1,4}-{2908,5302,2,1,1}-{2919,5290,3,1,1}-{2923,5298,3,1,4}-{2924,5298,3,1,4}-{2911,5298,0,1,6}-{2919,5293,1,1,1}-{2917,5294,1,1,2}-{2923,5284,1,1,1}-{2916,5267,0,1,2}"
+    "loc_data": "{2922,5285,1,1,0}-{2886,5295,2,1,1}-{2891,5300,2,1,1}-{2889,5310,2,1,2}-{2887,5299,2,1,6}-{2891,5297,2,1,3}-{2884,5283,2,1,3}-{2885,5286,2,1,3}-{2886,5294,2,1,1}-{2896,5286,2,1,4}-{2908,5302,2,1,1}-{2919,5290,1,1,1}-{2919,5298,1,1,4}-{2918,5298,1,1,4}-{2911,5298,0,1,6}-{2919,5293,1,1,1}-{2917,5294,1,1,2}-{2923,5284,1,1,1}-{2916,5267,0,1,2}"
   },
   {
     "npc_id": "6257",
-    "loc_data": "{2913,5267,0,1,6}-{2892,5291,2,1,4}-{2895,5313,2,1,6}-{2879,5329,2,1,5}-{2886,5311,2,1,0}-{2888,5305,2,1,3}-{2877,5293,2,1,5}-{2894,5285,2,1,0}-{2900,5287,2,1,0}-{2905,5302,2,1,1}-{2898,5307,2,1,6}-{2918,5292,3,1,3}-{2924,5286,3,1,0}-{2924,5292,3,1,1}-{2924,5297,3,1,3}-{2926,5285,3,1,1}-{2921,5289,1,1,6}-{2923,5294,1,1,0}-{2922,5285,1,1,3}-{2915,5273,0,1,7}-{2915,5271,0,1,4}"
+    "loc_data": "{2913,5267,0,1,6}-{2892,5291,2,1,4}-{2895,5313,2,1,6}-{2879,5329,2,1,5}-{2886,5311,2,1,0}-{2888,5305,2,1,3}-{2877,5293,2,1,5}-{2894,5285,2,1,0}-{2900,5287,2,1,0}-{2905,5302,2,1,1}-{2898,5307,2,1,6}-{2918,5292,1,1,3}-{2924,5286,1,1,0}-{2924,5292,1,1,1}-{2920,5297,1,1,3}-{2924,5285,1,1,1}-{2921,5289,1,1,6}-{2923,5294,1,1,0}-{2922,5285,1,1,3}-{2915,5273,0,1,7}-{2915,5271,0,1,4}"
   },
   {
     "npc_id": "6258",
-    "loc_data": "{2918,5289,1,1,6}-{2884,5287,2,1,0}-{2895,5294,2,1,4}-{2897,5307,2,1,7}-{2918,5298,3,1,5}-{2917,5291,1,1,4}-{2916,5269,0,1,2}"
+    "loc_data": "{2918,5289,1,1,6}-{2884,5287,2,1,0}-{2895,5294,2,1,4}-{2897,5307,2,1,7}-{2918,5298,1,1,5}-{2917,5291,1,1,4}-{2916,5269,0,1,2}"
   },
   {
     "npc_id": "6259",
-    "loc_data": "{2890,5304,2,1,7}-{2886,5299,2,1,3}-{2891,5297,2,1,5}-{2890,5291,2,1,3}-{2900,5286,2,1,7}-{2905,5303,2,1,1}-{2918,5282,3,1,6}-{2924,5295,3,1,2}-{2905,5297,0,1,6}-{2920,5291,1,1,5}-{2930,5290,0,1,6}"
+    "loc_data": "{2890,5304,2,1,7}-{2886,5299,2,1,3}-{2891,5297,2,1,5}-{2890,5291,2,1,3}-{2900,5286,2,1,7}-{2905,5303,2,1,1}-{2918,5282,1,1,6}-{2922,5295,1,1,2}-{2905,5297,0,1,6}-{2920,5291,1,1,5}-{2920,5290,1,1,6}"
   },
   {
     "npc_id": "6260",
diff --git a/game/data/configs/shops.json b/game/data/configs/shops.json
index 1b70dd8..e73e137 100644
--- a/game/data/configs/shops.json
+++ b/game/data/configs/shops.json
@@ -1842,7 +1842,7 @@
     "general_store": "false",
     "id": "216",
     "title": "Ore Store",
-    "stock": "{436,20,100}-{438,10,100}-{440,10,100}-{442,5,100}-{453,10,100}-{444,5,100}-{447,0,100}-{449,0,100}"
+    "stock": "{436,10,100}-{438,10,100}-{440,0,100}-{442,0,100}-{453,0,100}-{444,0,100}-{447,0,100}-{449,0,100}"
   },
   {
     "npcs": "596",
diff --git a/game/server.jar b/game/server.jar
index c466314..c99d340 100644
Binary files a/game/server.jar and b/game/server.jar differ
diff --git a/game/worldprops/default.conf b/game/worldprops/default.conf
index 71a26a0..f764e58 100644
--- a/game/worldprops/default.conf
+++ b/game/worldprops/default.conf
@@ -93,6 +93,14 @@ revenant_population = 30
 i_want_to_cheat = false
 #better agility pyramid gp reward (gp reward = 1000 + ((agility level / 99) * 9000))
 better_agility_pyramid_gp = true
+#better dragonfire shield attack (30 second cooldown instead of 2 minutes)
+better_dfs = true
+#new player announcement
+new_player_announcement = true
+#enables holiday random events (no effect on normal random events)
+holiday_event_randoms = true
+#force holiday randoms (can only force one at a time)
+force_halloween_randoms = false
 
 [paths]
 #path to the data folder, which contains the cache subfolder and such