Merge branch 'master' into 'master'

Fix: Taverley Dungeon QA Pass 2

See merge request 2009scape/2009scape!237
This commit is contained in:
Ceikry 2021-08-27 21:37:07 +00:00
commit 9bb21e18ed
2 changed files with 226 additions and 6501 deletions

File diff suppressed because it is too large Load diff

View file

@ -249,7 +249,7 @@
}, },
{ {
"npc_id": "82", "npc_id": "82",
"loc_data": "{2936,9652,0,1,3}-{2932,9809,0,1,0}-{2929,9803,0,1,2}-{2934,9795,0,1,6}-{2933,9791,0,1,1}-{3052,3117,2,1,1}-{2841,9557,0,1,3}-{2831,9562,0,1,3}-{2838,9605,0,1,3}-{3058,10128,0,1,0}-{3046,10139,0,1,0}-{3110,3157,2,1,5}" "loc_data": "{2936,9652,0,1,3}-{2926,9803,0,1,0}-{2935,9794,0,1,0}-{3052,3117,2,1,1}-{2841,9557,0,1,3}-{2831,9562,0,1,3}-{2838,9605,0,1,3}-{3058,10128,0,1,0}-{3046,10139,0,1,0}-{3110,3157,2,1,5}"
}, },
{ {
"npc_id": "83", "npc_id": "83",
@ -389,7 +389,7 @@
}, },
{ {
"npc_id": "119", "npc_id": "119",
"loc_data": "{3248,3794,0,1,1}-{2925,9766,0,1,7}-{2921,9758,0,1,3}-{2935,9770,0,1,1}-{2935,9761,0,1,0}-{3029,10313,0,1,4}-{3028,10309,0,1,4}-{3033,10311,0,1,6}-{3035,10309,0,1,1}-{3035,10313,0,1,1}-{3244,3797,0,1,3}-{3245,3790,0,1,4}-{3239,3781,0,1,5}-{3253,3791,0,1,1}-{3245,3802,0,1,1}-{3250,3808,0,1,3}-{3246,3800,0,1,6}-{3246,3795,0,1,2}" "loc_data": "{3248,3794,0,1,1}-{2921,9757,0,1,0}-{2915,9759,0,1,0}-{2927,9761,0,1,0}-{2925,9769,0,1,0}-{2931,9784,0,1,0}-{2938,9788,0,1,0}-{3029,10313,0,1,4}-{3028,10309,0,1,4}-{3033,10311,0,1,6}-{3035,10309,0,1,1}-{3035,10313,0,1,1}-{3244,3797,0,1,3}-{3245,3790,0,1,4}-{3239,3781,0,1,5}-{3253,3791,0,1,1}-{3245,3802,0,1,1}-{3250,3808,0,1,3}-{3246,3800,0,1,6}-{3246,3795,0,1,2}"
}, },
{ {
"npc_id": "120", "npc_id": "120",
@ -6801,7 +6801,7 @@
}, },
{ {
"npc_id": "4696", "npc_id": "4696",
"loc_data": "{3118,3695,0,1,6}-{3010,3851,0,1,1}-{2839,9560,0,1,4}-{2846,9613,0,1,6}-{3062,10131,0,1,0}" "loc_data": "{3118,3695,0,1,6}-{2931,9808,0,1,0}-{2930,9799,0,1,0}-{3010,3851,0,1,1}-{2839,9560,0,1,4}-{2846,9613,0,1,6}-{3062,10131,0,1,0}"
}, },
{ {
"npc_id": "4697", "npc_id": "4697",
@ -8531,6 +8531,10 @@
"npc_id": "6090", "npc_id": "6090",
"loc_data": "{2932,3245,0,1,0}-{2934,3246,0,1,3}" "loc_data": "{2932,3245,0,1,0}-{2934,3246,0,1,3}"
}, },
{
"npc_id": "6101",
"loc_data": "{2932,9811,0,1,0}"
},
{ {
"npc_id": "6102", "npc_id": "6102",
"loc_data": "{1762,5329,0,1,1}" "loc_data": "{1762,5329,0,1,1}"