Merge branch 'master' into 'master'

Dragon Drop Tables

See merge request 2009scape/2009scape!306
This commit is contained in:
Ceikry 2021-10-18 00:35:13 +00:00
commit 322ceb1dc2

View file

@ -2306,13 +2306,13 @@
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "50.0",
"id": "1357",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "50.0",
"id": "1317",
"maxAmount": "1"
},
@ -2330,31 +2330,31 @@
},
{
"minAmount": "105",
"weight": "25.0",
"weight": "50.0",
"id": "556",
"maxAmount": "105"
},
{
"minAmount": "105",
"weight": "25.0",
"weight": "50.0",
"id": "554",
"maxAmount": "105"
},
{
"minAmount": "7",
"weight": "8.0",
"weight": "25.0",
"id": "560",
"maxAmount": "7"
},
{
"minAmount": "15",
"weight": "8.0",
"weight": "25.0",
"id": "565",
"maxAmount": "15"
},
{
"minAmount": "15",
"weight": "8.0",
"weight": "25.0",
"id": "563",
"maxAmount": "15"
},
@ -2366,7 +2366,7 @@
},
{
"minAmount": "1",
"weight": "8.0",
"weight": "50.0",
"id": "9144",
"maxAmount": "12"
},
@ -2382,12 +2382,6 @@
"id": "441",
"maxAmount": "100"
},
{
"minAmount": "100",
"weight": "25.0",
"id": "454",
"maxAmount": "100"
},
{
"minAmount": "100",
"weight": "25.0",
@ -2396,7 +2390,7 @@
},
{
"minAmount": "1",
"weight": "50.0",
"weight": "25.0",
"id": "9431",
"maxAmount": "1"
},
@ -2414,13 +2408,13 @@
},
{
"minAmount": "1",
"weight": "8.0",
"weight": "25.0",
"id": "407",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "8.0",
"weight": "10.0",
"id": "12070",
"maxAmount": "1"
},
@ -2432,25 +2426,19 @@
},
{
"minAmount": "1",
"weight": "0.18",
"weight": "0.154",
"id": "11286",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "0",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "23.15",
"weight": "10.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5600.0",
"weight": "200.0",
"id": "0",
"maxAmount": "1"
}
@ -2880,7 +2868,7 @@
},
{
"minAmount": "1",
"weight": "0.12",
"weight": "0.0562",
"id": "11286",
"maxAmount": "1"
},
@ -25185,13 +25173,13 @@
},
{
"minAmount": "1",
"weight": "19.35",
"weight": "5.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.145",
"weight": "0.07994",
"id": "11286",
"maxAmount": "1"
},
@ -25417,13 +25405,13 @@
},
{
"minAmount": "1",
"weight": "21.3",
"weight": "6.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.14",
"weight": "0.0728",
"id": "11286",
"maxAmount": "1"
},
@ -43295,7 +43283,7 @@
},
{
"minAmount": "1",
"weight": "2.8",
"weight": "2.5",
"id": "8901",
"maxAmount": "1"
},
@ -46690,19 +46678,19 @@
},
{
"minAmount": "1",
"weight": "25.0",
"weight": "8.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.15",
"weight": "0.0768",
"id": "11286",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "0.03",
"weight": "0.025",
"id": "11335",
"maxAmount": "1"
},
@ -63408,25 +63396,25 @@
"main": [
{
"minAmount": "1",
"weight": "1.5",
"weight": "1.0",
"id": "13746",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.5",
"weight": "1.0",
"id": "13748",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.5",
"weight": "1.0",
"id": "13750",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "2.95",
"weight": "2.0",
"id": "13752",
"maxAmount": "1"
},
@ -63474,7 +63462,19 @@
},
{
"minAmount": "1",
"weight": "60.0",
"weight": "5.0",
"id": "2366",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1250",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "13734",
"maxAmount": "1"
},
@ -63504,7 +63504,7 @@
},
{
"minAmount": "2500",
"weight": "175.0",
"weight": "100.0",
"id": "7937",
"maxAmount": "2500"
},
@ -63521,20 +63521,20 @@
"maxAmount": "500"
},
{
"minAmount": "300",
"weight": "175.0",
"minAmount": "209",
"weight": "125.0",
"id": "560",
"maxAmount": "300"
},
{
"minAmount": "250",
"weight": "175.0",
"weight": "80.0",
"id": "566",
"maxAmount": "250"
},
{
"minAmount": "70",
"weight": "175.0",
"weight": "80.0",
"id": "384",
"maxAmount": "70"
},
@ -63552,31 +63552,31 @@
},
{
"minAmount": "24",
"weight": "100.0",
"weight": "25.0",
"id": "5321",
"maxAmount": "24"
},
{
"minAmount": "10",
"weight": "24.0",
"weight": "100.0",
"id": "5295",
"maxAmount": "10"
},
{
"minAmount": "30",
"weight": "75.0",
"id": "7060",
"id": "7061",
"maxAmount": "30"
},
{
"minAmount": "40",
"weight": "75.0",
"id": "5953",
"id": "2449",
"maxAmount": "40"
},
{
"minAmount": "1",
"weight": "6.6",
"weight": "3.0",
"id": "13754",
"maxAmount": "1"
},
@ -63585,108 +63585,6 @@
"weight": "3.1496",
"id": "0",
"maxAmount": "13"
},
{
"minAmount": "1",
"weight": "40.0",
"id": "11133",
"maxAmount": "1"
},
{
"minAmount": "20",
"weight": "80.0",
"id": "226",
"maxAmount": "20"
},
{
"minAmount": "1",
"weight": "24.0",
"id": "12070",
"maxAmount": "1"
},
{
"minAmount": "100",
"weight": "80.0",
"id": "1754",
"maxAmount": "100"
},
{
"minAmount": "125",
"weight": "80.0",
"id": "450",
"maxAmount": "125"
},
{
"minAmount": "20",
"weight": "80.0",
"id": "452",
"maxAmount": "20"
},
{
"minAmount": "35",
"weight": "80.0",
"id": "2362",
"maxAmount": "35"
},
{
"minAmount": "100",
"weight": "80.0",
"id": "8781",
"maxAmount": "100"
},
{
"minAmount": "150",
"weight": "80.0",
"id": "8836",
"maxAmount": "150"
},
{
"minAmount": "75",
"weight": "80.0",
"id": "1514",
"maxAmount": "75"
},
{
"minAmount": "1",
"weight": "20.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "4091",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "4093",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "1403",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "1401",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "1407",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "100.0",
"id": "1405",
"maxAmount": "1"
}
]
},