Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2021-07-21 19:16:23 +02:00
41 changed files with 1877 additions and 78 deletions

View File

@@ -3765,7 +3765,13 @@
23072,
23082,
25753,
25820
25820,
25920,
25921,
25922,
25923,
25924,
25925
],
"herb tea mix": [
4464,
@@ -7528,7 +7534,16 @@
25185,
25187,
25189,
25191
25191,
25898,
25900,
25902,
25904,
25906,
25908,
25910,
25912,
25914
],
"slayer ring": [
11866,
@@ -8641,6 +8656,11 @@
21009,
21206
],
"dragon hunter crossbow": [
21012,
25916,
25918
],
"ancestral hat": [
21018,
25518
@@ -9884,5 +9904,21 @@
25892,
25894,
25896
],
"ghommals hilt": [
25926,
25928,
25930,
25932,
25934,
25936
],
"anim offhand": [
25938,
25941,
25944,
25947,
25950,
25953
]
}

View File

@@ -552,7 +552,7 @@
"rx2": 50,
"ry2": 29,
"z1": 0,
"z2": 0
"z2": 2
},
{
"rx1": 13,
@@ -724,6 +724,14 @@
}
],
"10288": [ // Yanille East
{
"rx1": 27,
"ry1": 12,
"rx2": 33,
"ry2": 19,
"z1": 1,
"z2": 1
},
{
"rx1": 47,
"ry1": 19,
@@ -2167,5 +2175,243 @@
"z1": 0,
"z2": 2
}
],
"11310": [ // Shilo Village
{
"rx1": 26,
"ry1": 52,
"rx2": 28,
"ry2": 54,
"z1": 0,
"z2": 0
},
{
"rx1": 26,
"ry1": 58,
"rx2": 28,
"ry2": 60,
"z1": 0,
"z2": 0
},
{
"rx1": 27,
"ry1": 55,
"rx2": 27,
"ry2": 57,
"z1": 0,
"z2": 0
},
{
"rx1": 33,
"ry1": 52,
"rx2": 35,
"ry2": 54,
"z1": 0,
"z2": 0
},
{
"rx1": 29,
"ry1": 53,
"rx2": 32,
"ry2": 53,
"z1": 0,
"z2": 0
},
{
"rx1": 44,
"ry1": 49,
"rx2": 46,
"ry2": 57,
"z1": 0,
"z2": 0
},
{
"rx1": 43,
"ry1": 50,
"rx2": 47,
"ry2": 56,
"z1": 0,
"z2": 0
},
{
"rx1": 42,
"ry1": 51,
"rx2": 48,
"ry2": 55,
"z1": 0,
"z2": 0
},
{
"rx1": 41,
"ry1": 52,
"rx2": 49,
"ry2": 54,
"z1": 0,
"z2": 0
},
{
"rx1": 36,
"ry1": 53,
"rx2": 40,
"ry2": 53,
"z1": 0,
"z2": 0
},
{
"rx1": 43,
"ry1": 44,
"rx2": 47,
"ry2": 46,
"z1": 0,
"z2": 0
},
{
"rx1": 45,
"ry1": 43,
"rx2": 45,
"ry2": 48,
"z1": 0,
"z2": 0
},
{
"rx1": 53,
"ry1": 51,
"rx2": 55,
"ry2": 55,
"z1": 0,
"z2": 0
},
{
"rx1": 50,
"ry1": 53,
"rx2": 56,
"ry2": 53,
"z1": 0,
"z2": 0
},
{
"rx1": 52,
"ry1": 37,
"rx2": 54,
"ry2": 39,
"z1": 0,
"z2": 0
},
{
"rx1": 8,
"ry1": 18,
"rx2": 9,
"ry2": 19,
"z1": 0,
"z2": 0
},
{
"rx1": 53,
"ry1": 29,
"rx2": 53,
"ry2": 36,
"z1": 0,
"z2": 0
}
],
"12340": [ // Draynor Manor
{
"rx1": 30,
"ry1": 24,
"rx2": 43,
"ry2": 24,
"z1": 0,
"z2": 0
}
],
"9265": [ // Lletya
{
"rx1": 23,
"ry1": 34,
"rx2": 23,
"ry2": 37,
"z1": 0,
"z2": 0
}
],
"15148": [ // Harmony Island
{
"rx1": 30,
"ry1": 24,
"rx2": 40,
"ry2": 32,
"z1": 0,
"z2": 0
},
{
"rx1": 41,
"ry1": 18,
"rx2": 48,
"ry2": 36,
"z1": 0,
"z2": 0
},
{
"rx1": 41,
"ry1": 37,
"rx2": 45,
"ry2": 38,
"z1": 0,
"z2": 0
},
{
"rx1": 34,
"ry1": 57,
"rx2": 38,
"ry2": 57,
"z1": 0,
"z2": 0
}
],
"11423": [ // NW Keldagrim
{
"rx1": 60,
"ry1": 11,
"rx2": 63,
"ry2": 36,
"z1": 0,
"z2": 1
}
],
"11678": [ // SE Keldagrim
{
"rx1": 49,
"ry1": 46,
"rx2": 49,
"ry2": 51,
"z1": 0,
"z2": 0
},
{
"rx1": 50,
"ry1": 56,
"rx2": 51,
"ry2": 63,
"z1": 0,
"z2": 0
}
],
"11679": [ // NE Keldagrim
{
"rx1": 50,
"ry1": 0,
"rx2": 51,
"ry2": 1,
"z1": 0,
"z2": 0
},
{
"rx1": 0,
"ry1": 11,
"rx2": 3,
"ry2": 36,
"z1": 0,
"z2": 1
}
]
}