Merge branch 'master' into 'master'

Updated Nechryael Drop Table

See merge request 2009scape/2009scape!199

Server/data/configs/drop_tables.json

@@ -7863,7 +7863,32 @@
         "maxAmount": "1"
       }
     ],
-    "charm": [],
+    "charm": [
+      {
+        "minAmount": "1",
+        "weight": "85.0",
+        "id": "12158",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "7.0",
+        "id": "12159",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "7.0",
+        "id": "12160",
+        "maxAmount": "1"
+      },
+      {
+        "minAmount": "1",
+        "weight": "1.0",
+        "id": "12163",
+        "maxAmount": "1"
+      }
+    ],
     "ids": "117,4689,4690,4691,4692,4693",
     "description": "",
     "main": [
@@ -26219,16 +26244,10 @@
       },
       {
         "minAmount": "1",
-        "weight": "25.0",
+        "weight": "8.0",
         "id": "4131",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1185",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "1",
         "weight": "50.0",
@@ -26247,63 +26266,45 @@
         "id": "1353",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1303",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1373",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1319",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "5",
-        "weight": "50.0",
+        "weight": "25.0",
         "id": "560",
         "maxAmount": "5"
       },
       {
         "minAmount": "10",
-        "weight": "50.0",
+        "weight": "25.0",
         "id": "560",
         "maxAmount": "10"
       },
       {
         "minAmount": "3",
-        "weight": "25.0",
+        "weight": "12.5",
         "id": "562",
         "maxAmount": "3"
       },
       {
         "minAmount": "37",
-        "weight": "25.0",
+        "weight": "12.5",
         "id": "562",
         "maxAmount": "37"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "25.0",
         "id": "5281",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "25.0",
         "id": "5297",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "50.0",
+        "weight": "25.0",
         "id": "5280",
         "maxAmount": "1"
       },
@@ -26339,27 +26340,21 @@
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "8.0",
         "id": "5303",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "8.0",
         "id": "5302",
         "maxAmount": "1"
       },
       {
-        "minAmount": "1144",
+        "minAmount": "10",
         "weight": "50.0",
         "id": "995",
-        "maxAmount": "1144"
+        "maxAmount": "460"
-      },
-      {
-        "minAmount": "132",
-        "weight": "50.0",
-        "id": "995",
-        "maxAmount": "132"
       },
       {
         "minAmount": "1",
@@ -26381,19 +26376,13 @@
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "8.0",
-        "id": "2363",
+        "id": "12070",
         "maxAmount": "1"
       },
       {
         "minAmount": "1",
-        "weight": "5.0",
+        "weight": "16.0",
-        "id": "2723",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
         "id": "31",
         "maxAmount": "1"
       },
@@ -26402,6 +26391,24 @@
         "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"
       }
     ]
   },

Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpockets.kt

@@ -93,37 +93,44 @@ enum class Pickpockets(val ids: IntArray, val requiredLevel: Int, val low: Doubl
         WeightedItem(Items.IRON_ORE_441,1,4,0.25)
     )),
     MASTER_FARMER(intArrayOf(2234, 2235, NPCs.MARTIN_THE_MASTER_GARDENER_3299), 38, 90.0, 240.0, 43.0, 3, 3, 5, WeightBasedTable.create(
-        WeightedItem(Items.POTATO_SEED_5318,1,4,100.0),
+        WeightedItem(Items.POTATO_SEED_5318,1,3,50.0),
-        WeightedItem(Items.HAMMERSTONE_SEED_5307,1,9,100.0),
+        WeightedItem(Items.ONION_SEED_5319,1,3,50.0),
-        WeightedItem(Items.ASGARNIAN_SEED_5308,1,6,95.0),
+        WeightedItem(Items.CABBAGE_SEED_5324,1,3,50.0),
-        WeightedItem(Items.JUTE_SEED_5306,1,9,93.0),
+        WeightedItem(Items.TOMATO_SEED_5322,1,2,50.0),
-        WeightedItem(Items.YANILLIAN_SEED_5309,1,6,86.0),
+        WeightedItem(Items.SWEETCORN_SEED_5320,1,2,50.0),
-        WeightedItem(Items.KRANDORIAN_SEED_5310,1,6,80.0),
+        WeightedItem(Items.STRAWBERRY_SEED_5323,1,1,25.0),
-        WeightedItem(Items.WILDBLOOD_SEED_5311,1,3,76.0),
+        WeightedItem(Items.WATERMELON_SEED_5321,1,1,8.0),
-        WeightedItem(Items.MARIGOLD_SEED_5096,1,1,93.0),
+        WeightedItem(Items.BARLEY_SEED_5305,1,4,50.0),
-        WeightedItem(Items.NASTURTIUM_SEED_5098,1,1,90.0),
+        WeightedItem(Items.HAMMERSTONE_SEED_5307,1,3,50.0),
-        WeightedItem(Items.ROSEMARY_SEED_5097,1,1,78.0),
+        WeightedItem(Items.ASGARNIAN_SEED_5308,1,3,50.0),
-        WeightedItem(Items.WOAD_SEED_5099,1,1,75.0),
+        WeightedItem(Items.JUTE_SEED_5306,1,3,50.0),
-        WeightedItem(Items.LIMPWURT_SEED_5100,1,1,70.0),
+        WeightedItem(Items.YANILLIAN_SEED_5309,1,2,25.0),
+        WeightedItem(Items.KRANDORIAN_SEED_5310,1,2,25.0),
+        WeightedItem(Items.WILDBLOOD_SEED_5311,1,1,8.0),
+        WeightedItem(Items.MARIGOLD_SEED_5096,1,1,50.0),
+        WeightedItem(Items.NASTURTIUM_SEED_5098,1,1,50.0),
+        WeightedItem(Items.ROSEMARY_SEED_5097,1,1,50.0),
+        WeightedItem(Items.WOAD_SEED_5099,1,1,50.0),
+        WeightedItem(Items.LIMPWURT_SEED_5100,1,1,25.0),
         WeightedItem(Items.REDBERRY_SEED_5101,1,1,50.0),
         WeightedItem(Items.CADAVABERRY_SEED_5102,1,1,50.0),
-        WeightedItem(Items.DWELLBERRY_SEED_5103,1,1,50.0),
+        WeightedItem(Items.DWELLBERRY_SEED_5103,1,1,25.0),
-        WeightedItem(Items.JANGERBERRY_SEED_5104,1,1,50.0),
+        WeightedItem(Items.JANGERBERRY_SEED_5104,1,1,25.0),
-        WeightedItem(Items.WHITEBERRY_SEED_5105,1,1,50.0),
+        WeightedItem(Items.WHITEBERRY_SEED_5105,1,1,25.0),
-        WeightedItem(Items.GUAM_SEED_5291,1,1,30.0),
+        WeightedItem(Items.GUAM_SEED_5291,1,1,50.0),
-        WeightedItem(Items.MARRENTILL_SEED_5292,1,1,30.0),
+        WeightedItem(Items.MARRENTILL_SEED_5292,1,1,50.0),
-        WeightedItem(Items.TARROMIN_SEED_5293,1,1,30.0),
+        WeightedItem(Items.TARROMIN_SEED_5293,1,1,50.0),
-        WeightedItem(Items.HARRALANDER_SEED_5294,1,1,30.0),
+        WeightedItem(Items.HARRALANDER_SEED_5294,1,1,25.0),
-        WeightedItem(Items.RANARR_SEED_5295,1,1,10.0),
+        WeightedItem(Items.RANARR_SEED_5295,1,1,8.0),
-        WeightedItem(Items.TOADFLAX_SEED_5296,1,1,10.0),
+        WeightedItem(Items.TOADFLAX_SEED_5296,1,1,8.0),
-        WeightedItem(Items.IRIT_SEED_5297,1,1,10.0),
+        WeightedItem(Items.IRIT_SEED_5297,1,1,8.0),
-        WeightedItem(Items.AVANTOE_SEED_5298,1,1,5.0),
+        WeightedItem(Items.AVANTOE_SEED_5298,1,1,8.0),
-        WeightedItem(Items.KWUARM_SEED_5299,1,1,5.0),
+        WeightedItem(Items.KWUARM_SEED_5299,1,1,8.0),
-        WeightedItem(Items.SNAPDRAGON_SEED_5300,1,1,3.0),
+        WeightedItem(Items.SNAPDRAGON_SEED_5300,1,1,5.0),
-        WeightedItem(Items.CADANTINE_SEED_5301,1,1,3.0),
+        WeightedItem(Items.CADANTINE_SEED_5301,1,1,8.0),
-        WeightedItem(Items.LANTADYME_SEED_5302,1,1,3.0),
+        WeightedItem(Items.LANTADYME_SEED_5302,1,1,5.0),
-        WeightedItem(Items.DWARF_WEED_SEED_5303,1,1,3.0),
+        WeightedItem(Items.DWARF_WEED_SEED_5303,1,1,5.0),
-        WeightedItem(Items.TORSTOL_SEED_5304,1,1,3.0)
+        WeightedItem(Items.TORSTOL_SEED_5304,1,1,5.0)
     )),
     GUARD(intArrayOf(9, 32, 206, 296, 297, 298, 299, 344, 345, 346, 368, 678, 812, 9, 32, 296, 297, 298, 299, 2699, 2700, 2701, 2702, 2703, 3228, 3229, 3230, 3231, 3232, 3233, 3241, 3407, 3408, 4307, 4308, 4309, 4310, 4311, 5919, 5920), 40, 50.0, 240.0, 46.5, 2,2,5, WeightBasedTable.create(
        WeightedItem(Items.COINS_995,30,30,1.0,true)