From e8c422619a6555529e317f0810fd2b2fbcbf35b0 Mon Sep 17 00:00:00 2001
From: ceikry <ironceikry@gmail.com>
Date: Mon, 1 Nov 2021 20:33:29 -0500
Subject: [PATCH] Applied embargoed patches - Marks Nov 1, 2021 Release.

---
 CHANGELOG                                     |    4 +
 Server/data/configs/drop_tables.json          | 1548 ++++++++---------
 Server/data/configs/npc_spawns.json           |    8 -
 .../data/configs/ranged_weapon_configs.json   |    2 +-
 .../consumable/effects/PercentHeal.java       |    8 +-
 .../npc/familiar/ElementalTitanNPC.java       |    7 +-
 .../core/game/node/entity/player/Player.java  |    2 +-
 .../holiday/halloween/SimpleHalloweenEvent.kt |    2 +-
 .../combat/handlers/RangeSwingHandler.kt      |    2 +-
 9 files changed, 791 insertions(+), 792 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9df609c1d..64bcd1564 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,3 +40,7 @@
 - Removed ridiculous noted Manta ray drop across all Revenants
 - Reverted the absurd 50-100 noted Sharks drop to a more believable number of 4 across all Revenants
 - Reverted the noted tuna potato drop to a maximum of 5 across all Revenants
+- Fixed a potential exploit with defensive brews and titan effects
+- Fixed a potential exploit with chinchompas
+- Addressed a potentially serious issue with charm droprates
+< ---- ABOVE Released NOVEMBER 1, 2021 ---- >
diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json
index d635bfd17..aae355ed9 100644
--- a/Server/data/configs/drop_tables.json
+++ b/Server/data/configs/drop_tables.json
@@ -1015,6 +1015,12 @@
         "weight": "0.2667",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "94.08",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "12,3246,3247,3248,3249,3250,3251,3252,3253,3255,3256,3257,3258,3259,3260,3261,3262,3263,5909",
@@ -1199,12 +1205,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "94.08",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -1234,6 +1234,12 @@
         "weight": "0.2546",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "77.9122",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "13,652,1263,5195,5196,5197",
@@ -1388,12 +1394,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "77.9122",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -2223,6 +2223,12 @@
         "weight": "1.0079",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "20.1053",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "49,3586,6210",
@@ -2239,12 +2245,6 @@
         "weight": "88.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "20.1053",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -2497,6 +2497,12 @@
         "weight": "3.7095",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "18.0057",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "53,4669,4670,4671,4672",
@@ -2676,12 +2682,6 @@
         "id": "0",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "18.0057",
-        "id": "0",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "1",
         "weight": "10.0",
@@ -2729,6 +2729,12 @@
         "weight": "1.3469",
         "id": "12163",
         "maxAmount": "3"
+      },
+      {
+        "minAmount": "3",
+        "weight": "56.6693",
+        "id": "0",
+        "maxAmount": "3"
       }
     ],
     "ids": "54,4673,4674,4675,4676",
@@ -2883,12 +2889,6 @@
         "weight": "4.0",
         "id": "563",
         "maxAmount": "3"
-      },
-      {
-        "minAmount": "3",
-        "weight": "56.6693",
-        "id": "0",
-        "maxAmount": "3"
       }
     ]
   },
@@ -2931,6 +2931,12 @@
         "weight": "2.21",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "48.5393",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "55,4681,4682,4683,4684,5178",
@@ -3116,12 +3122,6 @@
         "id": "0",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "48.5393",
-        "id": "0",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "1",
         "weight": "10.0",
@@ -3156,6 +3156,12 @@
         "weight": "0.6551",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "87.586",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "59,60,4400",
@@ -3280,12 +3286,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "87.586",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -3315,6 +3315,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "61,1004,1221,1473,1474,4401,7207",
@@ -3325,12 +3331,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -3482,6 +3482,12 @@
         "weight": "0.1488",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "72.2513",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "63",
@@ -3492,12 +3498,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "72.2513",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -3527,6 +3527,12 @@
         "weight": "1.4478",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "62.4612",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "64",
@@ -3537,12 +3543,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "62.4612",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -4067,6 +4067,12 @@
         "weight": "0.2779",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "78.7445",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "78,1005,2482,3711",
@@ -4083,12 +4089,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "78.7445",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -4137,6 +4137,12 @@
         "weight": "0.0486",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "94.9773",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "81,397,955,1767,3309",
@@ -4147,12 +4153,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "94.9773",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -4397,6 +4397,12 @@
         "weight": "0.9267",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "62.1649",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "83,4698,4699,4700,4701",
@@ -4509,12 +4515,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "62.1649",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -4551,6 +4551,12 @@
         "weight": "1.6236",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "22.5725",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "84,677,4702,4703,4704,4705",
@@ -4753,12 +4759,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "22.5725",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -5362,6 +5362,12 @@
         "weight": "0.1992",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "88.6454",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "95,142,1330,4413,4414,6047,6048,6049",
@@ -5378,12 +5384,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "88.6454",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -5420,6 +5420,12 @@
         "weight": "0.3701",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.057",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "96,97",
@@ -5430,12 +5436,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.057",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -5849,6 +5849,12 @@
         "weight": "0.2821",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "85.6976",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "105,1195",
@@ -5865,12 +5871,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "85.6976",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -5919,6 +5919,12 @@
         "weight": "0.3537",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "82.1397",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "106",
@@ -5935,12 +5941,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "82.1397",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -5977,6 +5977,12 @@
         "weight": "1.5185",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "30.6289",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "110,1582,1583,1584,1585,1586,7003,7004",
@@ -6185,12 +6191,6 @@
         "weight": "25.0",
         "id": "554",
         "maxAmount": "150"
-      },
-      {
-        "minAmount": "1",
-        "weight": "30.6289",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -6967,6 +6967,12 @@
         "weight": "0.4168",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "58.3163",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "113,6268",
@@ -7259,12 +7265,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "58.3163",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -7301,6 +7301,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "114",
@@ -7473,12 +7479,6 @@
         "weight": "3.0",
         "id": "6665",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -7515,6 +7515,12 @@
         "weight": "0.3806",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "82.5938",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "115,374,2801,3419",
@@ -7675,12 +7681,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "82.5938",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -8540,6 +8540,12 @@
         "weight": "0.5864",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "90.789",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "118,120,121,382,582,3219,3220,3221,3268,3269,3270,3271,3272,3273,3274,3275,3294,3295,4316,5880,5881,5882,5883,5884,5885",
@@ -8670,12 +8676,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "90.789",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -8712,6 +8712,12 @@
         "weight": "2.6896",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "81.6299",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "119,2423",
@@ -8884,12 +8890,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "81.6299",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -9331,6 +9331,12 @@
         "weight": "0.6814",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "74.8304",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "124",
@@ -9635,12 +9641,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "74.8304",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -10281,6 +10281,12 @@
         "weight": "6.2937",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "54.5455",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "130",
@@ -10453,12 +10459,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "54.5455",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -10501,6 +10501,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "132,1463,1464,1487,2301,4344,4363,5852,6943,7211,7213,7215,7217,7219,7221,7223,7225,7227",
@@ -10517,12 +10523,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -10565,6 +10565,12 @@
         "weight": "0.2979",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "84.4867",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "133",
@@ -10581,12 +10587,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "84.4867",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -11000,6 +11000,12 @@
         "weight": "0.6011",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "70.7701",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "158",
@@ -11148,12 +11154,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "70.7701",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -12326,6 +12326,12 @@
         "weight": "0.3375",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "86.7406",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "186,7106,7107,7108,7109,7110,7111,7112,7113,7114",
@@ -12516,12 +12522,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "86.7406",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -12551,6 +12551,12 @@
         "weight": "2.9197",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "85.3493",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "187",
@@ -12705,12 +12711,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "85.3493",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -12929,6 +12929,12 @@
         "weight": "1.1795",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "74.1154",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "192",
@@ -13083,12 +13089,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "74.1154",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -14041,6 +14041,12 @@
         "weight": "15.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "37.5",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "221",
@@ -14177,12 +14183,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "37.5",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -14262,6 +14262,12 @@
         "weight": "0.6347",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "81.6118",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "412",
@@ -14278,12 +14284,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "81.6118",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -14473,6 +14473,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "490,1958,1959,1961,1962,1963,1964,1965,1966,1967,1968,2015,2016,2017,2018,2019,6753,6754,6755,6756,6757,6758,6759,6760",
@@ -14699,12 +14705,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -16173,6 +16173,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "870",
@@ -16243,12 +16249,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -16470,6 +16470,12 @@
         "weight": "1.5411",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "66.2159",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "941,4677,4678,4679,4680",
@@ -16661,12 +16667,6 @@
         "id": "0",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "66.2159",
-        "id": "0",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "1",
         "weight": "10.0",
@@ -17203,6 +17203,12 @@
         "weight": "0.5939",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "86.2037",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1019",
@@ -17333,12 +17339,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "86.2037",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -17613,6 +17613,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1023,1220,1223,1225,6214",
@@ -17869,12 +17875,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -19100,6 +19100,12 @@
         "weight": "0.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "53.7736",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1097",
@@ -19188,12 +19194,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "53.7736",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -19230,6 +19230,12 @@
         "weight": "2.0134",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "67.1141",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1098",
@@ -19306,12 +19312,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "67.1141",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -19912,6 +19912,12 @@
         "weight": "2.0934",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "50.0805",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1115,1116,1117",
@@ -20108,12 +20114,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "50.0805",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -20713,6 +20713,12 @@
         "weight": "1.764",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "87.6923",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1153,1156",
@@ -20987,12 +20993,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "87.6923",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -21022,6 +21022,12 @@
         "weight": "6.4403",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.4384",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1154",
@@ -21188,12 +21194,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.4384",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -21223,6 +21223,12 @@
         "weight": "8.7477",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "64.8768",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1155,1157",
@@ -21503,12 +21509,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "64.8768",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -21733,6 +21733,12 @@
         "weight": "1.6345",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "59.5722",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1183,1184,1201,2359,2360,2361,2362,7438,7439,7440,7441",
@@ -22013,12 +22019,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "59.5722",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -22067,6 +22067,12 @@
         "weight": "0.7519",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "85.3383",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1196,1197",
@@ -22083,12 +22089,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "85.3383",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -22125,6 +22125,12 @@
         "weight": "1.7045",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "60.5114",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1198",
@@ -22135,12 +22141,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "60.5114",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -22360,6 +22360,12 @@
         "weight": "0.1553",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "79.478",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1218",
@@ -22382,12 +22388,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "79.478",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -22417,6 +22417,12 @@
         "weight": "1.364",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "82.6794",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1219",
@@ -22433,12 +22439,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "82.6794",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -23067,6 +23067,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1265,1267",
@@ -23263,12 +23269,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -24463,6 +24463,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1558,1559,1951,1952,1953,1954,1955,1956,6052",
@@ -24473,12 +24479,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -24736,6 +24736,12 @@
         "weight": "3.4391",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "39.7302",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1590",
@@ -24944,12 +24950,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "39.7302",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -24992,6 +24992,12 @@
         "weight": "2.782",
         "id": "12163",
         "maxAmount": "2"
+      },
+      {
+        "minAmount": "2",
+        "weight": "39.7985",
+        "id": "0",
+        "maxAmount": "2"
       }
     ],
     "ids": "1591",
@@ -25176,12 +25182,6 @@
         "weight": "50.0",
         "id": "830",
         "maxAmount": "4"
-      },
-      {
-        "minAmount": "2",
-        "weight": "39.7985",
-        "id": "0",
-        "maxAmount": "2"
       }
     ]
   },
@@ -25224,6 +25224,12 @@
         "weight": "3.0751",
         "id": "12163",
         "maxAmount": "3"
+      },
+      {
+        "minAmount": "3",
+        "weight": "33.614",
+        "id": "0",
+        "maxAmount": "3"
       }
     ],
     "ids": "1592,3590",
@@ -25402,12 +25408,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "3",
-        "weight": "33.614",
-        "id": "0",
-        "maxAmount": "3"
       }
     ]
   },
@@ -25444,6 +25444,12 @@
         "weight": "1.2796",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "70.4846",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1593,1594",
@@ -25454,12 +25460,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "70.4846",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -25489,6 +25489,12 @@
         "weight": "0.4212",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "87.3121",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1600,1601,1602,1603",
@@ -25703,12 +25709,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "87.3121",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -25738,6 +25738,12 @@
         "weight": "4.7859",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.48",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1604,1605,1606,1607",
@@ -25946,12 +25952,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.48",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -25988,6 +25988,12 @@
         "weight": "1.3687",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "56.3725",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1608,1609,4229",
@@ -26280,12 +26286,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "56.3725",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -26315,6 +26315,12 @@
         "weight": "6.9849",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.7631",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1610,1827,6389",
@@ -26445,12 +26451,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.7631",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -26480,6 +26480,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1611",
@@ -26604,12 +26610,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -26639,6 +26639,12 @@
         "weight": "0.3217",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "88.902",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1612",
@@ -26847,12 +26853,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "88.902",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -26889,6 +26889,12 @@
         "weight": "1.0327",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "55.2891",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1613",
@@ -27079,12 +27085,6 @@
         "weight": "25.0",
         "id": "5295",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "55.2891",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -27121,6 +27121,12 @@
         "weight": "1.0538",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "52.8956",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1615,4230",
@@ -27311,12 +27317,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "52.8956",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -27353,6 +27353,12 @@
         "weight": "1.2214",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "67.2875",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1616,1617,4228",
@@ -27555,12 +27561,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "67.2875",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -27597,6 +27597,12 @@
         "weight": "1.0855",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "53.9118",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1618,1619,6215",
@@ -27799,12 +27805,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "53.9118",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -28443,6 +28443,12 @@
         "weight": "0.9525",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "55.1863",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1624",
@@ -28639,12 +28645,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "55.1863",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -28853,6 +28853,12 @@
         "weight": "0.4923",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "86.6357",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1633,1634,1635,1636,6216",
@@ -28977,12 +28983,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "86.6357",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -29012,6 +29012,12 @@
         "weight": "0.9453",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "65.9946",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1637,1638,1639,1640,1641,1642",
@@ -29124,12 +29130,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "65.9946",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -29166,6 +29166,12 @@
         "weight": "0.6082",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "61.2459",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1643,1644,1645,1646,1647",
@@ -29308,12 +29314,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "61.2459",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -29350,6 +29350,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1648,1649,1650,1651,1652,1653,1654,1655,1656,1657",
@@ -29444,12 +29450,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -29486,6 +29486,12 @@
         "weight": "1.0564",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "46.664",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1665,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,6212,6213",
@@ -29736,12 +29742,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "46.664",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -29790,6 +29790,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1691,5211",
@@ -29800,12 +29806,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -30519,6 +30519,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1752,1753,6109,6110,6111",
@@ -30583,12 +30589,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -30711,6 +30711,12 @@
         "weight": "1.1981",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "86.9276",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1822,1823,1824,1825,5752,5753,5754,5755,5756,5757,5758,5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,5769,5783,5785,5873,5874,5875,5876,5877,5878",
@@ -30865,12 +30871,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "86.9276",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -31326,6 +31326,12 @@
         "weight": "0.8071",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "52.5489",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1832,5750",
@@ -31582,12 +31588,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "52.5489",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -31846,6 +31846,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1960,5360",
@@ -32072,12 +32078,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -32114,6 +32114,12 @@
         "weight": "1.2436",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "86.2564",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1976",
@@ -32124,12 +32130,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "86.2564",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -32266,6 +32266,12 @@
         "weight": "0.6983",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "79.2519",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2031",
@@ -32276,12 +32282,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "79.2519",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -32332,6 +32332,12 @@
         "weight": "0.256",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "91.6382",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2033,4920,4921",
@@ -32348,12 +32354,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "91.6382",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -32383,6 +32383,12 @@
         "weight": "1.5873",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "90.4762",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2035",
@@ -32393,12 +32399,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "90.4762",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -32918,6 +32918,12 @@
         "weight": "10.7629",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.5695",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2130,2131,2132,2133,3276,3277,3278,3279",
@@ -33048,12 +33054,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.5695",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -33287,6 +33287,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2239,2240,2316,2317",
@@ -33297,12 +33303,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -33837,6 +33837,12 @@
         "weight": "1.9617",
         "id": "12163",
         "maxAmount": "3"
+      },
+      {
+        "minAmount": "3",
+        "weight": "2.8249",
+        "id": "0",
+        "maxAmount": "3"
       }
     ],
     "ids": "2452,2885",
@@ -34183,12 +34189,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "3",
-        "weight": "2.8249",
-        "id": "0",
-        "maxAmount": "3"
       }
     ]
   },
@@ -34294,6 +34294,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2457,2884",
@@ -34634,12 +34640,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -36030,6 +36030,12 @@
         "weight": "13.9158",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "64.7702",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "2783",
@@ -36238,12 +36244,6 @@
         "weight": "150.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "64.7702",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -38094,6 +38094,12 @@
         "weight": "3.1323",
         "id": "12163",
         "maxAmount": "2"
+      },
+      {
+        "minAmount": "2",
+        "weight": "47.6638",
+        "id": "0",
+        "maxAmount": "2"
       }
     ],
     "ids": "2889",
@@ -38332,12 +38338,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "2",
-        "weight": "47.6638",
-        "id": "0",
-        "maxAmount": "2"
       }
     ]
   },
@@ -38374,6 +38374,12 @@
         "weight": "1.4948",
         "id": "12163",
         "maxAmount": "2"
+      },
+      {
+        "minAmount": "2",
+        "weight": "33.9281",
+        "id": "0",
+        "maxAmount": "2"
       }
     ],
     "ids": "3068,3069,3070,3071",
@@ -38630,12 +38636,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "2",
-        "weight": "33.9281",
-        "id": "0",
-        "maxAmount": "2"
       }
     ]
   },
@@ -38665,6 +38665,12 @@
         "weight": "0.1886",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "91.5619",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "3153",
@@ -38777,12 +38783,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "91.5619",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -38977,6 +38977,12 @@
         "weight": "0.1567",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "83.9189",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "3201,3202",
@@ -39149,12 +39155,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "83.9189",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -40056,6 +40056,12 @@
         "weight": "2.6439",
         "id": "12163",
         "maxAmount": "2"
+      },
+      {
+        "minAmount": "2",
+        "weight": "71.1249",
+        "id": "0",
+        "maxAmount": "2"
       }
     ],
     "ids": "3340",
@@ -40264,12 +40270,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "2",
-        "weight": "71.1249",
-        "id": "0",
-        "maxAmount": "2"
       }
     ]
   },
@@ -40673,6 +40673,12 @@
         "weight": "0.289",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "91.209",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "3406,6217,7714,7715",
@@ -40911,12 +40917,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "91.209",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -40953,6 +40953,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "3587",
@@ -41113,12 +41119,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -41418,6 +41418,12 @@
         "weight": "0.4157",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.7201",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "3707",
@@ -41542,12 +41548,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.7201",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -42636,6 +42636,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "4226",
@@ -42730,12 +42736,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -42966,6 +42966,12 @@
         "weight": "0.4235",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "81.7721",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "4348,4349,4350,4351,4352",
@@ -43180,12 +43186,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "81.7721",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -43222,6 +43222,12 @@
         "weight": "0.5548",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "78.7882",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "4353,4354,4355,4356,4357",
@@ -43520,12 +43526,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "78.7882",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -44864,6 +44864,12 @@
         "weight": "7.3696",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "64.8102",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "4527,4528,4529,4530,4531,4532,4533",
@@ -44922,12 +44928,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "64.8102",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -45163,6 +45163,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "4805,4806,4807,4808,4813,4814,4815,4816,4817,4818,4819,4820,4821,4822,4823,4824,4825,4826,4827,4828,4829,4830,4831,4832,4833,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,4844,4849,4850,4851,4852,7606,7607,7608,7609,7614,7615,7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,7632,7633,7634,7635,7682,7683,7684,7685,7691,7692,7693,7694,7695,7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706",
@@ -45275,12 +45281,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -45543,6 +45543,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "5251,5252,5255,5256",
@@ -45715,12 +45721,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -45757,6 +45757,12 @@
         "weight": "2.0297",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "4.9106",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "5361",
@@ -46187,12 +46193,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "4.9106",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -46235,6 +46235,12 @@
         "weight": "1.3997",
         "id": "12163",
         "maxAmount": "2"
+      },
+      {
+        "minAmount": "2",
+        "weight": "63.6081",
+        "id": "0",
+        "maxAmount": "2"
       }
     ],
     "ids": "5362",
@@ -46473,12 +46479,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "2",
-        "weight": "63.6081",
-        "id": "0",
-        "maxAmount": "2"
       }
     ]
   },
@@ -46521,6 +46521,12 @@
         "weight": "3.5993",
         "id": "12163",
         "maxAmount": "4"
+      },
+      {
+        "minAmount": "4",
+        "weight": "9.0422",
+        "id": "0",
+        "maxAmount": "4"
       }
     ],
     "ids": "5363",
@@ -46681,12 +46687,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "4",
-        "weight": "9.0422",
-        "id": "0",
-        "maxAmount": "4"
       }
     ]
   },
@@ -46723,6 +46723,12 @@
         "weight": "1.0494",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "85.7316",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "5414",
@@ -46733,12 +46739,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "85.7316",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -46781,6 +46781,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "5415,5416",
@@ -46977,12 +46983,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -47025,6 +47025,12 @@
         "weight": "3.2638",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "71.375",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "5417,5418",
@@ -47221,12 +47227,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "71.375",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -48706,6 +48706,12 @@
         "weight": "100.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "5600.0",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6028",
@@ -48938,12 +48944,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5600.0",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -50132,6 +50132,12 @@
         "weight": "4.5645",
         "id": "12163",
         "maxAmount": "4"
+      },
+      {
+        "minAmount": "4",
+        "weight": "91.1171",
+        "id": "0",
+        "maxAmount": "4"
       }
     ],
     "ids": "6203",
@@ -50274,12 +50280,6 @@
         "weight": "20.0",
         "id": "12070",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "4",
-        "weight": "91.1171",
-        "id": "0",
-        "maxAmount": "4"
       }
     ]
   },
@@ -51033,6 +51033,12 @@
         "weight": "8.2767",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "36.6834",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6222",
@@ -51205,12 +51211,6 @@
         "weight": "20.0",
         "id": "31",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "36.6834",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -51683,6 +51683,12 @@
         "weight": "2.4638",
         "id": "12163",
         "maxAmount": "4"
+      },
+      {
+        "minAmount": "4",
+        "weight": "82.502",
+        "id": "0",
+        "maxAmount": "4"
       }
     ],
     "ids": "6247",
@@ -51825,12 +51831,6 @@
         "weight": "11.8",
         "id": "12070",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "4",
-        "weight": "82.502",
-        "id": "0",
-        "maxAmount": "4"
       }
     ]
   },
@@ -52136,6 +52136,12 @@
         "weight": "6.25",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "67.5",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6258,6259",
@@ -52152,12 +52158,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "67.5",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -52194,6 +52194,12 @@
         "weight": "2.5055",
         "id": "12163",
         "maxAmount": "4"
+      },
+      {
+        "minAmount": "4",
+        "weight": "85.5895",
+        "id": "0",
+        "maxAmount": "4"
       }
     ],
     "ids": "6260",
@@ -52354,12 +52360,6 @@
         "weight": "75.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "4",
-        "weight": "85.5895",
-        "id": "0",
-        "maxAmount": "4"
       }
     ]
   },
@@ -53102,6 +53102,12 @@
         "weight": "0.6897",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "76.3636",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6363,6364",
@@ -53154,12 +53160,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "76.3636",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -53196,6 +53196,12 @@
         "weight": "13.3333",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "78.8",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6365,6366",
@@ -53248,12 +53254,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "78.8",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -53593,6 +53593,12 @@
         "weight": "0.4808",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "82.6923",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6380",
@@ -53885,12 +53891,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "82.6923",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -59008,6 +59008,12 @@
         "weight": "5.8217",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "80.1337",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6761,6762,6763",
@@ -59282,12 +59288,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "80.1337",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -59324,6 +59324,12 @@
         "weight": "1.836",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "90.2081",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "6773",
@@ -59442,12 +59448,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "90.2081",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -60477,6 +60477,12 @@
         "weight": "0.8264",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "13.1269",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7078",
@@ -60505,12 +60511,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "13.1269",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -60547,6 +60547,12 @@
         "weight": "1.6611",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "53.1561",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7079,7080",
@@ -60575,12 +60581,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "53.1561",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -60617,6 +60617,12 @@
         "weight": "0.5896",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "52.7123",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7081,7082",
@@ -60651,12 +60657,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "52.7123",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -61086,6 +61086,12 @@
         "weight": "1.094",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "71.9397",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7159",
@@ -61240,12 +61246,6 @@
         "weight": "4.0",
         "id": "1",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "71.9397",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -61275,6 +61275,12 @@
         "weight": "1.0919",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "58.7492",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7160",
@@ -61513,12 +61519,6 @@
         "weight": "8.0",
         "id": "5304",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "58.7492",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -61555,6 +61555,12 @@
         "weight": "0.0",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "73.7931",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7640",
@@ -61799,12 +61805,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "73.7931",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -61834,6 +61834,12 @@
         "weight": "0.2028",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "75.6592",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7641",
@@ -62120,12 +62126,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "75.6592",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -62162,6 +62162,12 @@
         "weight": "1.1161",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "46.1418",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "7642,7643",
@@ -62418,12 +62424,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "46.1418",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -62685,6 +62685,12 @@
         "weight": "3.0617",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "82.1886",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "8149,8150,8151",
@@ -62863,12 +62869,6 @@
         "weight": "100.0",
         "id": "0",
         "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "82.1886",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -62905,6 +62905,12 @@
         "weight": "0.1632",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "91.6064",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1076,1077",
@@ -62969,12 +62975,6 @@
         "weight": "100.0",
         "id": "995",
         "maxAmount": "38"
-      },
-      {
-        "minAmount": "1",
-        "weight": "91.6064",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -63215,6 +63215,12 @@
         "weight": "0.5251",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "88.5971",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "1044,1045,1046",
@@ -63231,12 +63237,6 @@
         "weight": "400.0",
         "id": "995",
         "maxAmount": "30"
-      },
-      {
-        "minAmount": "1",
-        "weight": "88.5971",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
@@ -63273,6 +63273,12 @@
         "weight": "0.5251",
         "id": "12163",
         "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "88.5971",
+        "id": "0",
+        "maxAmount": "1"
       }
     ],
     "ids": "188,189,190",
@@ -63307,12 +63313,6 @@
         "weight": "50.0",
         "id": "995",
         "maxAmount": "94"
-      },
-      {
-        "minAmount": "1",
-        "weight": "88.5971",
-        "id": "0",
-        "maxAmount": "1"
       }
     ]
   },
diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json
index 914570ad4..f5432b40f 100644
--- a/Server/data/configs/npc_spawns.json
+++ b/Server/data/configs/npc_spawns.json
@@ -2015,10 +2015,6 @@
     "npc_id": "782",
     "loc_data": "{3150,3406,0,0,0}"
   },
-  {
-    "npc_id": "6390",
-    "loc_data": "{3094,3258,0,0,0}"
-  },
   {
     "npc_id": "783",
     "loc_data": "{3221,3435,0,1,0}"
@@ -4443,10 +4439,6 @@
     "npc_id": "2327",
     "loc_data": "{2814,3337,0,1,6}"
   },
-  {
-    "npc_id": "2329",
-    "loc_data": "{3093,3260,0,1,6}-{1702,4822,0,0,0}"
-  },
   {
     "npc_id": "2330",
     "loc_data": "{2766,3211,0,1,0}"
diff --git a/Server/data/configs/ranged_weapon_configs.json b/Server/data/configs/ranged_weapon_configs.json
index 505f85746..b04138c0b 100644
--- a/Server/data/configs/ranged_weapon_configs.json
+++ b/Server/data/configs/ranged_weapon_configs.json
@@ -1176,7 +1176,7 @@
     "weapon_type": "6",
     "animation": "2779",
     "drop_ammo": "0",
-    "ammunition": "10034"
+    "ammunition": "10033"
   },
   {
     "itemId": "10034",
diff --git a/Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java b/Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java
index 3f9c3509c..a62df2b72 100644
--- a/Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java
+++ b/Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java
@@ -12,10 +12,10 @@ public class PercentHeal extends ConsumableEffect {
 
     @Override
     public void activate(Player p) {
-        int amount = (int) Math.floor(p.getSkills().getMaximumLifepoints() * perc);
-        if(p.getSkills().getLifepoints() + amount > (p.getSkills().getMaximumLifepoints() + (p.getSkills().getMaximumLifepoints() * perc))){
-            amount = 0;
-        }
+        int maxHp = p.getSkills().getMaximumLifepoints();
+        int curHp = p.getSkills().getLifepoints();
+        int amount = (int) Math.floor(maxHp * perc);
+        amount = Math.min(amount, (int)((1.0 + perc) * (double)maxHp - (double)curHp));
         p.getSkills().healNoRestrictions(amount);
     }
 }
diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/ElementalTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ElementalTitanNPC.java
index 69b4f0e71..7d1b9558d 100644
--- a/Server/src/main/java/core/game/node/entity/npc/familiar/ElementalTitanNPC.java
+++ b/Server/src/main/java/core/game/node/entity/npc/familiar/ElementalTitanNPC.java
@@ -8,7 +8,7 @@ import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial;
 public abstract class ElementalTitanNPC extends Familiar {
 
     private static final int scrollHealAmount = 8;
-    private static final double  scrollDefenceBoostPercent = 12.5;
+    private static final double scrollDefenceBoostPercent = 0.125;
 
     public ElementalTitanNPC(Player owner, int id, int ticks, int pouchId, int specialCost, int attackStyle) {
         super(owner, id, ticks, pouchId, specialCost, attackStyle);
@@ -20,7 +20,10 @@ public abstract class ElementalTitanNPC extends Familiar {
     @Override
     protected boolean specialMove(FamiliarSpecial special) {
         int currentDefenceLevel = owner.getSkills().getLevel(Skills.DEFENCE);
-        owner.getSkills().updateLevel(Skills.DEFENCE, (int)(scrollDefenceBoostPercent * currentDefenceLevel));
+        int maximumDefenceLevel = owner.getSkills().getStaticLevel(Skills.DEFENCE);
+        owner.getSkills().updateLevel(Skills.DEFENCE,
+            (int)((1.0 + scrollDefenceBoostPercent) * currentDefenceLevel),
+            (int)((1.0 + scrollDefenceBoostPercent) * maximumDefenceLevel));
         int currentHp = owner.getSkills().getLifepoints();
         int maxHp = owner.getSkills().getMaximumLifepoints() + scrollHealAmount;
         int healAmount = Math.min(maxHp - currentHp, scrollHealAmount);
diff --git a/Server/src/main/java/core/game/node/entity/player/Player.java b/Server/src/main/java/core/game/node/entity/player/Player.java
index 8270a9efe..5893d7bf0 100644
--- a/Server/src/main/java/core/game/node/entity/player/Player.java
+++ b/Server/src/main/java/core/game/node/entity/player/Player.java
@@ -577,7 +577,7 @@ public class Player extends Entity {
 				packetDispatch.sendMessage("Unhandled special attack for item " + weaponId + "!");
 			}
 		}
-		if (style == CombatStyle.RANGE && equipment.getNew(3).getId() == 10034) {
+		if (style == CombatStyle.RANGE && equipment.getNew(3).getId() == 10033 || equipment.getNew(3).getId() == 10034) {
 			return ChinchompaSwingHandler.getInstance();
 		}
 		return style.getSwingHandler();
diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/halloween/SimpleHalloweenEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/halloween/SimpleHalloweenEvent.kt
index 03586de43..5cf7e1406 100644
--- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/halloween/SimpleHalloweenEvent.kt
+++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/halloween/SimpleHalloweenEvent.kt
@@ -9,7 +9,7 @@ import java.util.*
 
 class SimpleHalloweenEvent : WorldEvent("hween"){
     override fun checkActive(): Boolean {
-        return true
+        return false
     }
 
     override fun initialize() {
diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt
index 5e3bc381a..46c39f8ab 100644
--- a/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt
+++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt
@@ -367,6 +367,7 @@ open class RangeSwingHandler
             if (dropRate == -1.0) {
                 return
             }
+            e.equipment.replace(Item(ammo.id, ammo.amount - amount, ammo.charge), state.weapon.ammunitionSlot)
             if (dropLocation == null) {
                 return
             }
@@ -374,7 +375,6 @@ open class RangeSwingHandler
             if (flag and 0x200000 != 0) { //Water
                 dropLocation = null
             }
-            e.equipment.replace(Item(ammo.id, ammo.amount - amount, ammo.charge), state.weapon.ammunitionSlot)
             if (dropLocation != null && state.rangeWeapon.isDropAmmo) {
                 val rate = 5 * (1.0 + e.skills.getLevel(Skills.RANGE) * 0.01) * dropRate
                 if (RandomFunction.randomize(rate.toInt()) != 0) {