Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2021-07-28 15:14:43 +02:00
17 changed files with 1346 additions and 1250 deletions

View File

@@ -143,6 +143,14 @@
"ry2": 48,
"z1": 2,
"z2": 2
},
{
"rx1": 53,
"ry1": 44,
"rx2": 53,
"ry2": 47,
"z1": 0,
"z2": 0
}
],
"13151":[ // Prif NE
@@ -275,6 +283,38 @@
"ry2": 52,
"z1": 2,
"z2": 2
},
{
"rx1": 46,
"ry1": 52,
"rx2": 46,
"ry2": 52,
"z1": 0,
"z2": 0
},
{
"rx1": 40,
"ry1": 47,
"rx2": 40,
"ry2": 47,
"z1": 0,
"z2": 0
},
{
"rx1": 40,
"ry1": 26,
"rx2": 40,
"ry2": 26,
"z1": 0,
"z2": 0
},
{
"rx1": 53,
"ry1": 22,
"rx2": 53,
"ry2": 25,
"z1": 0,
"z2": 0
}
],
"13150": [ // Prif SE
@@ -419,6 +459,14 @@
"ry2": 11,
"z1": 0,
"z2": 0
},
{
"rx1": 20,
"ry1": 23,
"rx2": 26,
"ry2": 34,
"z1": 1,
"z2": 1
}
],
"12852": [ // South Varrock
@@ -1919,7 +1967,25 @@
"z1": 1,
"z2": 2
},
{ // Lighthouse clockwork
{
"rx1": 12,
"ry1": 51,
"rx2": 13,
"ry2": 52,
"z1": 0,
"z2": 1
}
],
"9799": [ // Lighthouse (During Horror from the Deep)
{
"rx1": 9,
"ry1": 53,
"rx2": 16,
"ry2": 60,
"z1": 1,
"z2": 2
},
{
"rx1": 12,
"ry1": 51,
"rx2": 13,
@@ -2413,5 +2479,97 @@
"z1": 0,
"z2": 1
}
],
"8008": [ // Temple of Light Dungeon
{
"rx1": 34,
"ry1": 45,
"rx2": 54,
"ry2": 60,
"z1": 0,
"z2": 0
}
],
"12349": [ // Mage Arena
{
"rx1": 31,
"ry1": 48,
"rx2": 36,
"ry2": 53,
"z1": 0,
"z2": 0
},
{
"rx1": 23,
"ry1": 8,
"rx2": 44,
"ry2": 50,
"z1": 0,
"z2": 0
},
{
"rx1": 10,
"ry1": 18,
"rx2": 56,
"ry2": 37,
"z1": 0,
"z2": 0
},
{
"rx1": 12,
"ry1": 16,
"rx2": 54,
"ry2": 40,
"z1": 0,
"z2": 0
},
{
"rx1": 14,
"ry1": 14,
"rx2": 52,
"ry2": 42,
"z1": 0,
"z2": 0
},
{
"rx1": 16,
"ry1": 12,
"rx2": 50,
"ry2": 44,
"z1": 0,
"z2": 0
},
{
"rx1": 18,
"ry1": 10,
"rx2": 48,
"ry2": 46,
"z1": 0,
"z2": 0
},
{
"rx1": 20,
"ry1": 8,
"rx2": 46,
"ry2": 48,
"z1": 0,
"z2": 0
},
{
"rx1": 55,
"ry1": 38,
"rx2": 55,
"ry2": 38,
"z1": 0,
"z2": 0
},
{
"rx1": 24,
"ry1": 51,
"rx2": 24,
"ry2": 51,
"z1": 0,
"z2": 0
}
]
}