Update SP to tag Aug-20-2023

This commit is contained in:
ceikry 2023-08-21 13:12:22 -05:00
parent 98138a0643
commit 9f6a5e4af9
14 changed files with 904 additions and 579 deletions

View file

@ -22,7 +22,6 @@
<ObjectAction mode="add" id="39242" x="2955" y="3273" z="0" direction="w"/>
<ObjectAction mode="add" id="39241" x="2955" y="3274" z="0" />
<ObjectAction mode="add" id="20987" x="2821" y="2996" z="0" direction="s"/>
<ObjectAction mode="add" id="9472" x="3353" y="3951" z="0" direction="s"/>
<ObjectAction mode="add" id="21301" x="2662" y="3162" z="0" direction="e"/>
<ObjectAction mode="add" id="4176" x="2629" y="3661" z="2" type="4" direction="e"/>

View file

@ -193,7 +193,7 @@
},
{
"id": "1553",
"replaceId": "1552",
"replaceId": "1556",
"fence": "true",
"metal": "false"
},
@ -332,13 +332,13 @@
{
"id": "2050",
"replaceId": "15511",
"fence": "false",
"fence": "true",
"metal": "false"
},
{
"id": "2051",
"replaceId": "15513",
"fence": "false",
"fence": "true",
"metal": "false"
},
{
@ -896,12 +896,12 @@
{
"id": "3725",
"replaceId": "3727",
"fence": "false",
"fence": "true",
"metal": "false"
},
{
"id": "3726",
"replaceId": "3727",
"replaceId": "3728",
"fence": "true",
"metal": "false"
},
@ -1238,12 +1238,12 @@
{
"id": "7049",
"replaceId": "7051",
"fence": "false",
"fence": "true",
"metal": "false"
},
{
"id": "7050",
"replaceId": "23919",
"replaceId": "7052",
"fence": "true",
"metal": "false"
},
@ -1340,7 +1340,7 @@
{
"id": "8810",
"replaceId": "8812",
"fence": "false",
"fence": "true",
"metal": "false"
},
{
@ -1987,6 +1987,14 @@
"autowalk": "true",
"questRequirement": "Icthlarin's Little Helper"
},
{
"id": "28514",
"replaceId": "28518",
"fence": "false",
"metal": "true",
"autowalk": "true",
"questRequirement": "Icthlarin's Little Helper"
},
{
"id": "21065",
"replaceId": "21161",
@ -2359,11 +2367,25 @@
"fence": "false",
"metal": "true"
},
{
"id": "26081",
"replaceId": "26083",
"fence": "false",
"metal": "true",
"autowalk": "true"
},
{
"id": "26082",
"replaceId": "26084",
"fence": "false",
"metal": "true",
"autowalk": "true"
},
{
"id": "26130",
"replaceId": "26132",
"fence": "false",
"metal": "false"
"metal": "true"
},
{
"id": "26131",
@ -2509,12 +2531,6 @@
"fence": "false",
"metal": "false"
},
{
"id": "28514",
"replaceId": "28518",
"fence": "true",
"metal": "true"
},
{
"id": "28589",
"replaceId": "28588",
@ -2800,7 +2816,7 @@
{
"id": "34780",
"replaceId": "34778",
"fence": "false",
"fence": "true",
"metal": "false"
},
{

View file

@ -16,7 +16,7 @@
}
],
"charm": [],
"ids": "1,2,3,16,24,170,351,359,663,726,727,728,729,730,1086,2675,3223,3224,3225,3915,5923",
"ids": "1,2,3,16,24,170,351,359,663,726,727,728,729,730,1081,1084,1085,1086,1087,1088,1089,2675,3223,3224,3225,3915,5923",
"description": "",
"main": [
{
@ -1757,7 +1757,7 @@
}
],
"charm": [],
"ids": "21",
"ids": "21,1072",
"description": "",
"main": []
},
@ -2438,7 +2438,7 @@
"minAmount": "75",
"weight": "1.0",
"id": "556",
"maxAmount": "5"
"maxAmount": "75"
},
{
"minAmount": "10",
@ -4380,12 +4380,6 @@
"ids": "94,3844,3850,3851",
"description": "",
"main": [
{
"minAmount": "1",
"weight": "50.0",
"id": "1391",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "50.0",
@ -12180,12 +12174,6 @@
"id": "12070",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "6808",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
@ -16156,135 +16144,6 @@
}
]
},
{
"default": [
{
"minAmount": "1",
"weight": "100.0",
"id": "526",
"maxAmount": "1"
}
],
"charm": [],
"ids": "1087",
"description": "",
"main": [
{
"minAmount": "2",
"weight": "25.0",
"id": "562",
"maxAmount": "9"
},
{
"minAmount": "6",
"weight": "25.0",
"id": "554",
"maxAmount": "6"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "199",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "201",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "205",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "203",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "207",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "209",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "211",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "215",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "217",
"maxAmount": "1"
},
{
"minAmount": "3",
"weight": "25.0",
"id": "877",
"maxAmount": "12"
},
{
"minAmount": "7",
"weight": "25.0",
"id": "882",
"maxAmount": "7"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "1203",
"maxAmount": "1"
},
{
"minAmount": "3",
"weight": "50.0",
"id": "995",
"maxAmount": "25"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "1965",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "436",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "313",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "25.0",
"id": "7767",
"maxAmount": "1"
}
]
},
{
"default": [
{
@ -19687,10 +19546,10 @@
"maxAmount": "1"
},
{
"minAmount": "110",
"minAmount": "30",
"weight": "5.0",
"id": "313",
"maxAmount": "30"
"maxAmount": "110"
},
{
"minAmount": "1",
@ -19852,10 +19711,10 @@
"maxAmount": "1"
},
{
"minAmount": "110",
"minAmount": "30",
"weight": "5.0",
"id": "313",
"maxAmount": "30"
"maxAmount": "110"
},
{
"minAmount": "1",
@ -28629,12 +28488,6 @@
"id": "5733",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "6808",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "5.0",
@ -46734,7 +46587,7 @@
{
"minAmount": "1",
"weight": "5.0",
"id": "5733",
"id": "12070",
"maxAmount": "1"
},
{
@ -46850,7 +46703,7 @@
{
"minAmount": "1",
"weight": "5.0",
"id": "1",
"id": "12070",
"maxAmount": "1"
}
]
@ -48495,10 +48348,10 @@
"maxAmount": "2"
},
{
"minAmount": "3",
"minAmount": "1",
"weight": "500.0",
"id": "7054",
"maxAmount": "1"
"maxAmount": "3"
},
{
"minAmount": "1",
@ -59066,7 +58919,7 @@
}
],
"charm": [],
"ids": "1904,6368,6367,912,913,914,255,256,27,34,35,689,690,691,3814,3816,4402,4403",
"ids": "1904,6368,6367,912,913,914,253,254,255,256,258,27,34,35,689,690,691,3814,3816,4402,4403",
"description": "",
"main": [
{
@ -60209,5 +60062,33 @@
"maxAmount": "1"
}
]
},
{
"default": [
{
"minAmount": "1",
"weight": "1.0",
"id": "526",
"maxAmount": "1"
}
],
"charm": [],
"ids": "3057,3059,3058,3060,3061,3062,3063,3064,3065,3066",
"description": "Champion's Challenge NPC - activity",
"main": []
},
{
"default": [],
"charm": [],
"ids": "2459,2460,2461,2462",
"description": "Pheasant NPC (level 4) - Freaky Forester - Random event",
"main": [
{
"minAmount": "1",
"weight": "1.0",
"id": "6178",
"maxAmount": "1"
}
]
}
]

View file

@ -14,7 +14,11 @@
{
"item_id": "41",
"loc_data": "{1,3125,9997,0,7209050}"
},
},
{
"item_id": "53",
"loc_data": "{3,3240,3940,0,300}-{2,3237,3948,0,300}-{3,3235,3949,0,300}"
},
{
"item_id": "88",
"loc_data": "{1,2654,9767,0,4587583}"
@ -81,7 +85,7 @@
},
{
"item_id": "303",
"loc_data": "{1,3245,3155,0,10485900}-{1,3244,3159,0,10485900}"
"loc_data": "{1,3245,3155,0,10485900}-{1,3244,3159,0,10485900}-{1,3429,4784,0,75}-{1,3432,4783,0,75}-{1,3414,4768,0,75}-{1,3429,4769,0,75}-{1,3431,4772,0,75}-{1,3415,4786,0,75}-{1,3412,4784,0,75}"
},
{
"item_id": "305",
@ -117,7 +121,7 @@
},
{
"item_id": "526",
"loc_data": "{1,2917,9796,0,7864410}-{1,2914,9796,0,7864410}-{1,2910,9797,0,7864410}-{1,2908,9794,0,7864410}-{1,3103,9953,0,7864410}-{1,3104,9950,0,7864410}-{1,3110,9952,0,7864410}-{1,3111,9956,0,7864410}-{1,3110,9958,0,7864410}-{1,3111,9959,0,7864410}-{1,3116,9950,0,7864410}-{1,3127,9957,0,7864410}-{1,2926,9801,0,7864410}-{1,2924,9801,0,7864410}-{1,2924,9804,0,7864410}-{1,2927,9805,0,7864410}-{1,2929,9807,0,7864410}-{1,2938,9792,0,7864410}-{1,2938,9796,0,7864410}-{1,2935,9799,0,7864410}-{1,2930,9794,0,7864410}-{1,2932,9792,0,7864410}-{1,2966,9772,0,7864410}-{1,2968,9771,0,7864410}-{1,2903,9826,0,7864410}-{1,2906,9823,0,7864410}-{1,2906,9825,0,7864410}-{1,2907,9824,0,7864410}-{1,2910,9825,0,7864410}-{1,3101,9825,0,7864410}-{1,3107,9823,0,7864410}-{1,3109,9823,0,7864410}-{1,3110,9825,0,7864410}-{1,3138,9880,0,7864410}-{1,3141,9879,0,7864410}-{1,3142,9880,0,7864410}-{1,3143,9878,0,7864410}-{1,3097,9902,0,7864410}-{1,3094,9907,0,7864410}-{1,3093,9884,0,7864410}-{1,3098,9886,0,7864410}-{1,3093,9879,0,7864410}-{1,3122,9891,0,7864410}-{1,3116,9891,0,7864410}-{1,3119,9894,0,7864410}-{1,3120,9894,0,7864410}-{1,2831,9766,0,7864410}-{1,2829,9764,0,7864410}-{1,2510,3080,0,5898270}-{1,2516,3084,0,5898270}-{1,2509,3090,0,5898270}-{1,2512,3084,0,5898270}-{1,2510,3084,0,5898270}-{1,2505,3114,0,5898270}-{1,2507,3116,0,5898270}-{1,2503,3118,0,5898270}-{1,2510,3114,0,5898270}-{1,3238,3606,0,9830500}-{1,3236,3605,0,9830500}-{1,3238,3603,0,9830500}-{1,3240,3603,0,9830500}-{1,3242,3604,0,9830500}-{1,3244,3611,0,9830500}-{1,3247,3614,0,9830500}-{1,3238,3610,0,9830500}-{1,3238,3608,0,9830500}"
"loc_data": "{1,2917,9796,0,7864410}-{1,2914,9796,0,7864410}-{1,2910,9797,0,7864410}-{1,2908,9794,0,7864410}-{1,3103,9953,0,7864410}-{1,3104,9950,0,7864410}-{1,3110,9952,0,7864410}-{1,3111,9956,0,7864410}-{1,3110,9958,0,7864410}-{1,3111,9959,0,7864410}-{1,3116,9950,0,7864410}-{1,3127,9957,0,7864410}-{1,2926,9801,0,7864410}-{1,2924,9801,0,7864410}-{1,2924,9804,0,7864410}-{1,2927,9805,0,7864410}-{1,2929,9807,0,7864410}-{1,2938,9792,0,7864410}-{1,2938,9796,0,7864410}-{1,2935,9799,0,7864410}-{1,2930,9794,0,7864410}-{1,2932,9792,0,7864410}-{1,2966,9772,0,7864410}-{1,2968,9771,0,7864410}-{1,2903,9826,0,7864410}-{1,2906,9823,0,7864410}-{1,2906,9825,0,7864410}-{1,2907,9824,0,7864410}-{1,2910,9825,0,7864410}-{1,3101,9825,0,7864410}-{1,3107,9823,0,7864410}-{1,3109,9823,0,7864410}-{1,3110,9825,0,7864410}-{1,3138,9880,0,7864410}-{1,3141,9879,0,7864410}-{1,3142,9880,0,7864410}-{1,3143,9878,0,7864410}-{1,3097,9902,0,7864410}-{1,3094,9907,0,7864410}-{1,3093,9884,0,7864410}-{1,3098,9886,0,7864410}-{1,3093,9879,0,7864410}-{1,3122,9891,0,7864410}-{1,3116,9891,0,7864410}-{1,3119,9894,0,7864410}-{1,3120,9894,0,7864410}-{1,2831,9766,0,7864410}-{1,2829,9764,0,7864410}-{1,2510,3080,0,5898270}-{1,2516,3084,0,5898270}-{1,2509,3090,0,5898270}-{1,2512,3084,0,5898270}-{1,2510,3084,0,5898270}-{1,2505,3114,0,5898270}-{1,2507,3116,0,5898270}-{1,2503,3118,0,5898270}-{1,2510,3114,0,5898270}-{1,3238,3606,0,9830500}-{1,3236,3605,0,9830500}-{1,3238,3603,0,9830500}-{1,3240,3603,0,9830500}-{1,3242,3604,0,9830500}-{1,3244,3611,0,9830500}-{1,3247,3614,0,9830500}-{1,3238,3610,0,9830500}-{1,3238,3608,0,9830500}-{1,3232,3948,0,9830500}-{1,3237,3938,0,9830500}-{1,3250,3952,0,9830500}"
},
{
"item_id": "528",
@ -487,10 +491,6 @@
"item_id": "2347",
"loc_data": "{1,2934,3286,0,7209050}-{1,2579,3463,0,5242920}-{1,2975,3368,1,5898270}-{1,1953,4974,0,5898270}"
},
{
"item_id": "2351",
"loc_data": "{1,3062,3657,0,11141270}"
},
{
"item_id": "2357",
"loc_data": "{1,3192,9822,0,11141270}"

File diff suppressed because it is too large Load diff

View file

@ -873,15 +873,15 @@
},
{
"id": "289",
"borders": "{2560,3648,2623,3711}"
"borders": "{2563,3647,2687,3776}"
},
{
"id": "290",
"borders": "{2560,3584,2623,3647}"
"borders": "{2560,3584,2689,3647}"
},
{
"id": "291",
"borders": "{2688,3648,2751,3711}"
"borders": "{2688,3648,2751,3776}"
},
{
"id": "292",
@ -1239,7 +1239,7 @@
},
{
"id": "411",
"borders": "{2496,4736,2559,4799}"
"borders": "{3403,4761,3442,4792}"
},
{
"id": "412",
@ -1307,7 +1307,7 @@
},
{
"id": "456",
"borders": ""
"borders": "{2202,5339,2212,5351}-{2328,10006,2338,10017}-{3436,9743,3446,9752}"
},
{
"id": "461",

File diff suppressed because it is too large Load diff

View file

@ -89,7 +89,7 @@
},
{
"npc_id": "27",
"loc_data": "{2574,3285,2,0,0}-{2574,3308,2,0,0}-{2582,3284,2,0,0}-{2582,3309,2,0,0}-{2588,3290,2,0,0}-{2588,3303,2,0,0}-{2902,3568,1,1,3}-{2903,3559,1,1,3}-{2903,3557,1,1,3}-{2903,3569,1,1,3}-{2894,3559,1,1,3}-{2892,3557,1,0,3}-{2893,3569,1,1,3}"
"loc_data": "{2574,3285,2,0,0}-{2574,3308,2,0,0}-{2582,3284,2,0,0}-{2582,3309,2,0,0}-{2588,3290,2,0,0}-{2588,3303,2,0,0}"
},
{
"npc_id": "28",
@ -153,7 +153,7 @@
},
{
"npc_id": "47",
"loc_data": "{2521,3331,0,1,3}-{2531,3325,0,1,3}-{2526,3328,0,1,3}-{2523,3331,0,1,4}-{2523,3334,0,1,1}-{2530,3327,0,1,5}-{2531,3329,0,1,5}-{2532,3333,0,1,5}-{3108,9754,0,1,5}-{3110,9754,0,1,5}-{3108,9750,0,1,5}-{2930,9699,0,1,0}-{2933,9697,0,1,0}-{2932,9685,0,1,0}-{2930,9693,0,1,0}-{3097,3364,0,1,3}-{3102,3363,0,1,5}-{3341,3267,0,1,5}-{3235,3224,0,1,3}-{3229,3220,0,1,4}-{3211,3211,0,1,3}-{3225,3220,0,1,1}-{3237,3215,0,1,5}-{3211,3210,0,1,7}-{3227,3220,0,1,7}-{3233,3227,0,1,5}-{3227,3210,0,1,6}-{3228,3222,0,1,4}-{3229,3226,0,1,0}-{3127,3487,0,1,4}-{3125,3486,0,1,6}-{3127,3486,0,1,4}-{3019,3292,0,1,7}-{3018,3295,0,1,7}-{3001,3202,0,1,5}-{3021,3205,0,1,6}-{3026,3174,0,1,5}-{3019,3176,0,1,7}-{3076,3282,0,1,5}-{3089,3266,0,1,4}-{3091,3266,0,1,4}-{3243,3687,0,1,5}-{3249,3669,0,1,3}-{3252,3675,0,1,4}-{3252,3680,0,1,3}-{3259,3683,0,1,0}-{3276,9871,0,1,1}-{3277,9871,0,1,3}-{3225,9862,0,1,4}-{3222,9861,0,1,6}-{3220,9860,0,1,6}-{3219,9865,0,1,6}-{3237,9862,0,1,4}-{3236,3217,0,1,4}-{3259,3230,0,1,4}-{3158,3226,0,1,5}-{3160,3202,0,1,4}-{3233,3237,0,1,7}-{2821,3170,0,1,1}-{2801,3158,0,1,2}-{2852,9642,0,1,6}-{2858,9632,0,1,3}-{2536,2982,0,1,3}-{2531,2980,0,1,0}-{2522,2981,0,1,4}-{2545,2989,0,1,4}-{2523,2970,0,1,2}-{2603,9480,0,1,1}-{2600,9477,0,1,0}-{2579,9496,0,1,4}-{2580,9508,0,1,0}-{2571,9522,0,1,4}-{2654,9640,0,1,6}-{2655,9637,0,1,4}-{2656,9639,0,1,7}-{2651,9636,0,1,5}-{2648,9637,0,1,4}-{2651,9642,0,1,1}-{2654,9640,0,1,0}-{2654,9635,0,1,6}-{2655,9635,0,1,3}-{2664,9626,0,1,6}-{2664,9624,0,1,1}-{2661,9623,0,1,1}-{2663,9623,0,1,3}-{2664,9626,0,1,6}-{2592,9831,0,1,3}-{2588,9825,0,1,6}-{2583,9829,0,1,4}-{2581,9841,0,1,0}-{2597,9823,0,1,2}-{2579,9805,0,1,3}-{2576,9804,0,1,0}-{2573,9805,0,1,5}-{2571,9808,0,1,3}-{2576,9810,0,1,2}-{2587,9802,0,1,2}-{2592,9800,0,1,4}-{2596,9805,0,1,6}-{2601,9802,0,1,5}-{2585,9801,0,1,7}-{2594,9803,0,1,0}-{2590,9806,0,1,3}-{2612,9808,0,1,6}-{2604,9810,0,1,6}-{2579,9821,0,1,2}-{2576,9812,0,1,6}-{2580,9813,0,1,6}-{2600,9813,0,1,4}-{2599,9809,0,1,4}-{2514,3193,0,1,6}-{2518,3192,0,1,3}-{2507,3181,0,1,3}-{2508,3178,0,1,6}-{2511,3183,0,1,3}-{2515,3182,0,1,1}-{2565,9505,0,1,1}-{2566,9510,0,1,6}-{2594,9497,0,1,4}-{3475,9840,0,1,6}-{3481,9842,0,1,1}-{3486,9843,0,1,7}-{3483,9824,0,1,4}-{3496,9808,0,0,5}-{3490,9815,0,1,1}-{3478,9834,0,0,3}-{3490,9824,0,1,4}-{3192,3203,0,1,0}-{3194,3204,0,1,0}-{3196,3206,0,1,0}-{3197,3204,0,1,0}-{3205,3204,0,1,0}-{3206,3204,0,1,0}-{3205,3203,0,1,0}-{3206,3202,0,1,0}-{3207,3202,0,1,0}-{3208,3203,0,1,0}"
"loc_data": "{2521,3331,0,1,3}-{2531,3325,0,1,3}-{2526,3328,0,1,3}-{2523,3331,0,1,4}-{2523,3334,0,1,1}-{2530,3327,0,1,5}-{2531,3329,0,1,5}-{2532,3333,0,1,5}-{3108,9754,0,1,5}-{3110,9754,0,1,5}-{3108,9750,0,1,5}-{2930,9699,0,1,0}-{2933,9697,0,1,0}-{2932,9685,0,1,0}-{2930,9693,0,1,0}-{3097,3364,0,1,3}-{3102,3363,0,1,5}-{3341,3267,0,1,5}-{3235,3224,0,1,3}-{3229,3220,0,1,4}-{3211,3211,0,1,3}-{3225,3220,0,1,1}-{3237,3215,0,1,5}-{3211,3210,0,1,7}-{3227,3220,0,1,7}-{3233,3227,0,1,5}-{3227,3210,0,1,6}-{3228,3222,0,1,4}-{3229,3226,0,1,0}-{3127,3487,0,1,4}-{3125,3486,0,1,6}-{3127,3486,0,1,4}-{3019,3292,0,1,7}-{3018,3295,0,1,7}-{3001,3202,0,1,5}-{3021,3205,0,1,6}-{3026,3174,0,1,5}-{3019,3176,0,1,7}-{3076,3282,0,1,5}-{3089,3266,0,1,4}-{3091,3266,0,1,4}-{3243,3687,0,1,5}-{3249,3669,0,1,3}-{3252,3675,0,1,4}-{3252,3680,0,1,3}-{3259,3683,0,1,0}-{3276,9871,0,1,1}-{3277,9871,0,1,3}-{3225,9862,0,1,4}-{3222,9861,0,1,6}-{3220,9860,0,1,6}-{3219,9865,0,1,6}-{3237,9862,0,1,4}-{3236,3217,0,1,4}-{3259,3230,0,1,4}-{3158,3226,0,1,5}-{3160,3202,0,1,4}-{3233,3237,0,1,7}-{2821,3170,0,1,1}-{2801,3158,0,1,2}-{2852,9642,0,1,6}-{2858,9632,0,1,3}-{2536,2982,0,1,3}-{2531,2980,0,1,0}-{2522,2981,0,1,4}-{2545,2989,0,1,4}-{2523,2970,0,1,2}-{2603,9480,0,1,1}-{2600,9477,0,1,0}-{2579,9496,0,1,4}-{2580,9508,0,1,0}-{2571,9522,0,1,4}-{2654,9640,0,1,6}-{2655,9637,0,1,4}-{2656,9639,0,1,7}-{2651,9636,0,1,5}-{2648,9637,0,1,4}-{2651,9642,0,1,1}-{2654,9640,0,1,0}-{2654,9635,0,1,6}-{2655,9635,0,1,3}-{2664,9626,0,1,6}-{2664,9624,0,1,1}-{2661,9623,0,1,1}-{2663,9623,0,1,3}-{2664,9626,0,1,6}-{2592,9831,0,1,3}-{2588,9825,0,1,6}-{2583,9829,0,1,4}-{2581,9841,0,1,0}-{2597,9823,0,1,2}-{2579,9805,0,1,3}-{2576,9804,0,1,0}-{2573,9805,0,1,5}-{2571,9808,0,1,3}-{2576,9810,0,1,2}-{2587,9802,0,1,2}-{2592,9800,0,1,4}-{2596,9805,0,1,6}-{2601,9802,0,1,5}-{2585,9801,0,1,7}-{2594,9803,0,1,0}-{2590,9806,0,1,3}-{2612,9808,0,1,6}-{2604,9810,0,1,6}-{2579,9821,0,1,2}-{2576,9812,0,1,6}-{2580,9813,0,1,6}-{2600,9813,0,1,4}-{2599,9809,0,1,4}-{2514,3193,0,1,6}-{2518,3192,0,1,3}-{2507,3181,0,1,3}-{2508,3178,0,1,6}-{2511,3183,0,1,3}-{2515,3182,0,1,1}-{2565,9505,0,1,1}-{2566,9510,0,1,6}-{2594,9497,0,1,4}-{3475,9840,0,1,6}-{3481,9842,0,1,1}-{3486,9843,0,1,7}-{3483,9824,0,1,4}-{3496,9808,0,0,5}-{3490,9815,0,1,1}-{3478,9834,0,0,3}-{3490,9824,0,1,4}-{3192,3203,0,1,0}-{3194,3204,0,1,0}-{3196,3206,0,1,0}-{3197,3204,0,1,0}-{3205,3204,0,1,0}-{3206,3204,0,1,0}-{3205,3203,0,1,0}-{3206,3202,0,1,0}-{3207,3202,0,1,0}-{3208,3203,0,1,0}-{2568,9620,0,1,0}-{2573,9612,0,1,0}-{2579,9631,0,1,0}-{2580,9600,0,1,0}-{2580,9614,0,1,0}-{2580,9620,0,1,0}-{2580,9626,0,1,0}-{2583,9632,0,1,0}-{2584,9625,0,1,0}-{2584,9637,0,1,0}-{2589,9644,0,1,0}-{2590,9601,0,1,0}-{2590,9638,0,1,0}-{2591,9601,0,1,0}-{2591,9621,0,1,0}-{2594,9636,0,1,0}-{2594,9644,0,1,0}-{2597,9604,0,1,0}-{2607,9615,0,1,0}-{2608,9628,0,1,0}-{2614,9651,0,1,0}-{2614,9656,0,1,0}-{2615,9647,0,1,0}-{2615,9661,0,1,0}-{2616,9633,0,1,0}-{2618,9630,0,1,0}"
},
{
"npc_id": "48",
@ -189,7 +189,7 @@
},
{
"npc_id": "59",
"loc_data": "{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3162,3223,0,1,7}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}-{3164,3242,0,1,0}-{3169,3246,0,1,0}-{3170,3250,0,1,0}-{3166,3247,0,1,0}-{3164,3249,0,1,0}-{3157,3226,0,1,0}-{3163,3227,0,1,0}-{3165,3223,0,1,0}-{3194,3236,0,1,0}"
"loc_data": "{3182,3244,0,1,1}-{3250,3239,0,1,1}-{3241,3241,0,1,1}-{3082,3362,0,1,4}-{3146,3347,0,1,3}-{3249,3249,0,1,1}-{3102,9881,0,1,3}-{3095,9883,0,1,2}-{3218,9890,0,1,3}-{3220,9887,0,1,0}-{3218,9887,0,1,1}-{3218,9889,0,1,5}-{3213,9890,0,1,1}-{3162,3223,0,1,7}-{2461,2880,0,1,5}-{2489,2935,0,1,7}-{2492,2907,0,1,1}-{2496,2890,0,1,4}-{2487,2894,0,1,2}-{2487,2888,0,1,7}-{2483,2877,0,1,3}-{2481,2876,0,1,4}-{2457,2867,0,1,4}-{2481,2847,0,1,0}-{2475,2854,0,1,3}-{2482,2873,0,1,3}-{2485,2876,0,1,2}-{2449,2865,0,1,1}-{2478,2916,0,1,5}-{2485,2902,0,1,3}-{2487,2902,0,1,2}-{2489,2894,0,1,2}-{2490,2905,0,1,7}-{2490,2917,0,1,5}-{2484,2890,0,1,1}-{2503,2889,0,1,1}-{2491,2927,0,1,1}-{2497,2939,0,1,2}-{2648,9766,0,1,4}-{2653,9761,0,1,3}-{3164,3242,0,1,0}-{3169,3246,0,1,0}-{3170,3250,0,1,0}-{3166,3247,0,1,0}-{3164,3249,0,1,0}-{3157,3226,0,1,0}-{3163,3227,0,1,0}-{3165,3223,0,1,0}-{3194,3236,0,1,0}-{2602,9640,0,1,0}-{2603,9635,0,1,0}-{2603,9638,0,1,0}-{2605,9637,0,1,0}-{2605,9639,0,1,0}-{2606,9635,0,1,0}-2606,9646,0,1,0}-{2607,9637,0,1,0}-{2607,9641,0,1,0}-{2607,9644,0,1,0}-{2607,9648,0,1,0}-{2608,9635,0,1,0}-{2608,9642,0,1,0}-{2609,9639,0,1,0}-{2609,9643,0,1,0}"
},
{
"npc_id": "60",
@ -273,7 +273,7 @@
},
{
"npc_id": "88",
"loc_data": "{2601,9802,0,1,6}-{2594,9805,0,1,1}-{2587,9806,0,1,2}-{2585,9803,0,1,1}-{2584,9801,0,1,5}"
"loc_data": "{2601,9802,0,1,6}-{2594,9805,0,1,1}-{2587,9806,0,1,2}-{2585,9803,0,1,1}-{2584,9801,0,1,5}-{2573,9630,0,1,0}"
},
{
"npc_id": "89",
@ -321,15 +321,15 @@
},
{
"npc_id": "100",
"loc_data": "{2551,3408,0,1,6}-{2553,3405,0,1,3}-{2559,3452,0,1,3}-{2567,3440,0,1,3}"
"loc_data": "{2551,3408,0,1,6}-{2553,3405,0,1,3}-{2559,3452,0,1,3}-{2567,3440,0,1,3}-{2564,9653,0,1,0}-{2565,9655,0,1,0}-{2566,9626,0,1,0}-{2567,9653,0,1,0}-{2569,9633,0,1,0}-{2607,9621,0,1,0}"
},
{
"npc_id": "101",
"loc_data": "{2555,3407,0,1,3}-{2624,3391,0,1,1}-{2622,3389,0,1,4}-{2619,3390,0,1,4}-{2553,3457,0,1,3}-{2573,3437,0,1,3}"
"loc_data": "{2555,3407,0,1,3}-{2624,3391,0,1,1}-{2622,3389,0,1,4}-{2619,3390,0,1,4}-{2553,3457,0,1,3}-{2573,3437,0,1,3}-{2562,9659,0,1,0}-{2563,9661,0,1,0}-{2599,9626,0,1,0}-{2601,9627,0,1,0}-{2605,9621,0,1,0}-{2610,9620,0,1,0}"
},
{
"npc_id": "102",
"loc_data": "{2622,3390,0,1,7}-{2622,3390,0,1,7}"
"loc_data": "{2622,3390,0,1,7}-{2622,3390,0,1,7}-{2562,9657,0,1,0}-{2571,9653,0,1,0}"
},
{
"npc_id": "103",
@ -349,7 +349,7 @@
},
{
"npc_id": "107",
"loc_data": "{2602,3267,0,1,6}-{2603,3270,0,1,4}-{2607,3268,0,1,5}-{3275,3154,0,1,6}-{3038,9802,0,1,5}-{3041,9804,0,1,6}-{3040,9795,0,1,7}-{3055,9776,0,1,4}-{3039,9769,0,1,6}-{3049,9764,0,1,3}-{3050,9770,0,1,1}-{3039,9765,0,1,1}-{3048,9762,0,1,4}-{3044,9760,0,1,6}-{3048,9779,0,1,1}-{2870,3166,0,1,3}-{2868,3159,0,1,4}-{2867,3172,0,1,5}-{2813,3112,0,1,4}-{2858,3167,0,1,3}-{2846,3153,0,1,3}-{2851,3149,0,1,1}-{2789,2949,0,1,3}-{2787,2943,0,1,3}-{2781,2949,0,1,3}-{3253,9909,0,1,4}-{3300,3312,0,1,1}-{3300,3305,0,1,3}-{3298,3300,0,1,5}-{3298,3294,0,1,0}-{3299,3290,0,1,6}-{2645,9823,0,1,1}-{2641,9819,0,1,7}-{2641,9817,0,1,2}-{2642,9813,0,1,5}-{2639,9809,0,1,2}"
"loc_data": "{2602,3267,0,1,6}-{2603,3270,0,1,4}-{2607,3268,0,1,5}-{3275,3154,0,1,6}-{3038,9802,0,1,5}-{3041,9804,0,1,6}-{3040,9795,0,1,7}-{3055,9776,0,1,4}-{3039,9769,0,1,6}-{3049,9764,0,1,3}-{3050,9770,0,1,1}-{3039,9765,0,1,1}-{3048,9762,0,1,4}-{3044,9760,0,1,6}-{3048,9779,0,1,1}-{2870,3166,0,1,3}-{2868,3159,0,1,4}-{2867,3172,0,1,5}-{2813,3112,0,1,4}-{2858,3167,0,1,3}-{2846,3153,0,1,3}-{2851,3149,0,1,1}-{2789,2949,0,1,3}-{2787,2943,0,1,3}-{2781,2949,0,1,3}-{3253,9909,0,1,4}-{3300,3312,0,1,1}-{3300,3305,0,1,3}-{3298,3300,0,1,5}-{3298,3294,0,1,0}-{3299,3290,0,1,6}-{2645,9823,0,1,1}-{2641,9819,0,1,7}-{2641,9817,0,1,2}-{2642,9813,0,1,5}-{2639,9809,0,1,2}-{3256,3954,0,1,1}-{3249,3949,0,1,1}-{3246,3945,0,1,1}-{3239,3943,0,1,1}-{3231,3940,0,1,1}-{3225,3943,0,1,1}-{3234,3945,0,1,1}"
},
{
"npc_id": "108",
@ -377,7 +377,7 @@
},
{
"npc_id": "115",
"loc_data": "{2587,9741,0,1,4}-{2585,9739,0,1,7}-{2582,9736,0,1,3}-{2589,9734,0,1,4}-{2582,9743,0,1,3}-{2576,9746,0,1,7}-{2579,9741,0,1,6}-{2540,3020,0,0,0}-{2555,2953,0,0,0}-{2583,2967,0,1,0}-{2572,3028,0,1,2}-{2550,3046,0,1,4}-{2572,3034,0,1,3}-{2576,3026,0,1,4}-{2534,2975,0,1,1}-{2518,2974,0,1,1}-{2573,2987,0,1,1}-{2592,2967,0,1,3}-{2589,2961,0,0,2}-{2575,2989,0,1,0}-{2574,2992,0,1,4}-{2521,2974,0,1,4}-{2500,3092,0,1,6}-{2524,3375,0,1,3}-{2524,3374,0,1,3}-{2529,3374,0,1,3}-{2532,3375,0,1,1}-{2532,3373,0,1,1}-{2527,3376,0,1,6}-{2525,3373,0,1,7}-{2525,3373,0,1,5}-{2511,3086,0,1,1}-{2511,3084,0,1,3}-{2503,3114,0,1,6}-{2509,3120,0,1,4}-{2506,3107,0,1,4}-{2500,3112,0,1,4}-{2521,3045,0,1,6}-{2517,3043,0,1,5}-{2500,3095,0,1,3}-{2497,3090,0,1,4}-{2502,3099,0,1,4}-{2504,3097,0,1,4}-{2503,3134,0,1,3}-{2554,3196,0,1,7}-{2519,3039,0,1,4}-{2722,9701,0,1,1}-{2720,9715,0,1,1}-{2721,9669,0,1,1}-{2722,9707,0,1,1}-{2723,9716,0,1,1}-{2717,9669,0,1,1}"
"loc_data": "{2587,9741,0,1,4}-{2585,9739,0,1,7}-{2582,9736,0,1,3}-{2589,9734,0,1,4}-{2582,9743,0,1,3}-{2576,9746,0,1,7}-{2579,9741,0,1,6}-{2540,3020,0,0,0}-{2555,2953,0,0,0}-{2583,2967,0,1,0}-{2572,3028,0,1,2}-{2550,3046,0,1,4}-{2572,3034,0,1,3}-{2576,3026,0,1,4}-{2534,2975,0,1,1}-{2518,2974,0,1,1}-{2573,2987,0,1,1}-{2592,2967,0,1,3}-{2589,2961,0,0,2}-{2575,2989,0,1,0}-{2574,2992,0,1,4}-{2521,2974,0,1,4}-{2500,3092,0,1,6}-{2524,3375,0,1,3}-{2524,3374,0,1,3}-{2529,3374,0,1,3}-{2532,3375,0,1,1}-{2532,3373,0,1,1}-{2527,3376,0,1,6}-{2525,3373,0,1,7}-{2525,3373,0,1,5}-{2511,3086,0,1,1}-{2511,3084,0,1,3}-{2503,3114,0,1,6}-{2509,3120,0,1,4}-{2506,3107,0,1,4}-{2500,3112,0,1,4}-{2521,3045,0,1,6}-{2517,3043,0,1,5}-{2500,3095,0,1,3}-{2497,3090,0,1,4}-{2502,3099,0,1,4}-{2504,3097,0,1,4}-{2503,3134,0,1,3}-{2554,3196,0,1,7}-{2519,3039,0,1,4}-{2722,9701,0,1,1}-{2720,9715,0,1,1}-{2721,9669,0,1,1}-{2722,9707,0,1,1}-{2723,9716,0,1,1}-{2717,9669,0,1,1}-{2585,9608,0,1,0}-{2586,9614,0,1,0}-{2588,9606,0,1,0}"
},
{
"npc_id": "116",
@ -401,7 +401,7 @@
},
{
"npc_id": "122",
"loc_data": "{2996,9574,0,1,6}-{3007,9579,0,1,7}-{3001,9580,0,1,4}-{3018,9580,0,1,3}-{3021,9585,0,1,4}-{3024,9582,0,1,4}-{2507,3726,0,1,2}-{2523,3724,0,1,3}-{2535,9556,0,1,4}"
"loc_data": "{2996,9574,0,1,6}-{3007,9579,0,1,7}-{3001,9580,0,1,4}-{3018,9580,0,1,3}-{3021,9585,0,1,4}-{3024,9582,0,1,4}-{2507,3726,0,1,2}-{2523,3724,0,1,3}-{2535,9556,0,1,4}-{2566,9632,0,1,0}-{2573,9626,0,1,0}"
},
{
"npc_id": "123",
@ -421,11 +421,11 @@
},
{
"npc_id": "127",
"loc_data": "{2955,9795,0,1,0}-{2956,9791,0,1,0}-{2962,9792,0,1,0}-{2966,9788,0,1,0}-{2959,9783,0,1,0}-{2964,9775,0,1,0}-{2954,9776,0,1,0}-{3193,3959,0,0,0}-{3188,3960,0,0,0}-{3190,3962,0,0,0}-{3187,3959,0,0,0}-{3192,3961,0,0,0}-{3187,3960,0,0,0}-{3193,3959,0,0,0}-{3187,3961,0,0,0}"
"loc_data": "{2955,9795,0,1,0}-{2956,9791,0,1,0}-{2962,9792,0,1,0}-{2966,9788,0,1,0}-{2959,9783,0,1,0}-{2964,9775,0,1,0}-{2954,9776,0,1,0}-{3193,3959,0,1,0}-{3188,3960,0,1,0}-{3190,3962,0,1,0}-{3187,3959,0,1,0}-{3192,3961,0,1,0}-{3187,3960,0,1,0}-{3193,3959,0,1,0}-{3187,3961,0,1,0}-{3193,3958,0,1,0}"
},
{
"npc_id": "128",
"loc_data": "{2610,3274,0,1,0}-{2610,3275,0,1,0}-{2615,3276,0,1,0}-{2616,3275,0,1,0}-{2616,3276,0,1,0}-{3193,3958,0,1,0}-{2877,3154,0,1,0}-{2878,3153,0,1,0}-{2870,3161,0,1,0}-{2822,3192,0,1,5}-{2770,3213,0,0,0}-{2759,3179,0,0,0}-{2741,3173,0,0,0}-{2757,3170,0,0,0}-{2746,3167,0,0,0}-{2781,3173,0,1,0}-{2746,3147,0,1,0}-{2733,3162,0,1,0}-{2730,3146,0,1,0}-{2782,3104,0,1,0}-{2782,3103,0,1,0}-{2777,3090,0,1,0}-{2773,3089,0,1,0}-{2803,3115,0,1,0}-{2808,3112,0,1,0}-{2887,3145,0,1,0}-{2824,3084,0,1,0}-{2821,3078,0,1,0}-{2817,3078,0,1,0}-{2837,3076,0,1,0}-{2844,3040,0,1,0}-{2840,3049,0,1,0}-{2837,3043,0,1,0}-{2834,3042,0,1,0}-{2827,3026,0,1,0}-{2824,3018,0,1,0}-{2830,3021,0,1,0}-{2832,3018,0,1,0}-{2925,2969,0,1,0}-{2939,2977,0,1,0}-{2936,2980,0,1,0}-{2933,2976,0,1,0}-{2930,2971,0,1,0}-{2928,2984,0,1,0}-{2942,2983,0,1,0}-{2936,2989,0,1,0}"
"loc_data": "{2610,3274,0,1,0}-{2610,3275,0,1,0}-{2615,3276,0,1,0}-{2616,3275,0,1,0}-{2616,3276,0,1,0}-{2877,3154,0,1,0}-{2878,3153,0,1,0}-{2870,3161,0,1,0}-{2822,3192,0,1,5}-{2770,3213,0,0,0}-{2759,3179,0,0,0}-{2741,3173,0,0,0}-{2757,3170,0,0,0}-{2746,3167,0,0,0}-{2781,3173,0,1,0}-{2746,3147,0,1,0}-{2733,3162,0,1,0}-{2730,3146,0,1,0}-{2782,3104,0,1,0}-{2782,3103,0,1,0}-{2777,3090,0,1,0}-{2773,3089,0,1,0}-{2803,3115,0,1,0}-{2808,3112,0,1,0}-{2887,3145,0,1,0}-{2824,3084,0,1,0}-{2821,3078,0,1,0}-{2817,3078,0,1,0}-{2837,3076,0,1,0}-{2844,3040,0,1,0}-{2840,3049,0,1,0}-{2837,3043,0,1,0}-{2834,3042,0,1,0}-{2827,3026,0,1,0}-{2824,3018,0,1,0}-{2830,3021,0,1,0}-{2832,3018,0,1,0}-{2925,2969,0,1,0}-{2939,2977,0,1,0}-{2936,2980,0,1,0}-{2933,2976,0,1,0}-{2930,2971,0,1,0}-{2928,2984,0,1,0}-{2942,2983,0,1,0}-{2936,2989,0,1,0}"
},
{
"npc_id": "131",
@ -627,6 +627,14 @@
"npc_id": "222",
"loc_data": "{2851,3351,0,0,7}-{2849,3348,0,0,7}"
},
{
"npc_id": "223",
"loc_data": "{2569,3250,0,1,0}"
},
{
"npc_id": "224",
"loc_data": "{2579,9655,0,1,0}-{2581,9656,0,1,0}-{2581,9659,0,1,0}-{2583,9659,0,1,0}-{2584,9656,0,1,0}-{2586,9659,0,1,0}-{2587,9656,0,1,0}-{2589,9654,0,1,0}-{2589,9658,0,1,0}-{2591,9656,0,1,0}-{2591,9659,0,1,0}"
},
{
"npc_id": "225",
"loc_data": "{2641,3437,0,0,0}"
@ -757,7 +765,7 @@
},
{
"npc_id": "267",
"loc_data": "{2601,3168,0,0,3}"
"loc_data": "{2601,3168,0,1,3}"
},
{
"npc_id": "268",
@ -2653,11 +2661,11 @@
},
{
"npc_id": "1073",
"loc_data": "{2900,3549,0,0,3}"
"loc_data": "{2900,3549,0,0,3}-{2897,3549,0,0,4}-{2902,3568,1,1,3}-{2903,3559,1,1,3}-{2903,3557,1,1,3}-{2903,3569,1,1,3}-{2894,3559,1,1,3}-{2892,3557,1,0,3}"
},
{
"npc_id": "1074",
"loc_data": "{2897,3549,0,0,4}"
"loc_data": "{2893,3569,1,1,3}"
},
{
"npc_id": "1076",
@ -2685,11 +2693,11 @@
},
{
"npc_id": "1084",
"loc_data": "{2915,3549,0,0,0}"
"loc_data": "{2915,3549,0,1,0}"
},
{
"npc_id": "1085",
"loc_data": "{2921,3558,0,1,6}"
"loc_data": "{2927,3558,0,1,6}"
},
{
"npc_id": "1086",
@ -2697,15 +2705,15 @@
},
{
"npc_id": "1087",
"loc_data": "{2911,3540,0,0,7}"
"loc_data": "{2911,3540,0,1,7}"
},
{
"npc_id": "1088",
"loc_data": "{2918,3545,0,0,0}"
"loc_data": "{2918,3545,0,1,0}"
},
{
"npc_id": "1089",
"loc_data": "{2919,3529,0,0,0}"
"loc_data": "{2919,3529,0,1,0}"
},
{
"npc_id": "1090",
@ -2715,6 +2723,10 @@
"npc_id": "1093",
"loc_data": "{2817,3560,0,1,3}"
},
{
"npc_id": "1094",
"loc_data": "{2802,3841,0,1,0}-{2798,3842,0,1,0}-{2804,3843,0,1,0}-{2807,3843,0,1,0}"
},
{
"npc_id": "1096",
"loc_data": "{2852,3591,0,1,7}"
@ -2741,27 +2753,27 @@
},
{
"npc_id": "1106",
"loc_data": "{2864,3594,0,1,1}-{2881,3592,0,1,5}-{2857,3587,0,1,7}-{2855,3596,0,1,4}-{2827,10078,1,1,6}-{2925,3626,0,1,0}-{2843,3682,0,1,1}"
"loc_data": "{2864,3594,0,1,1}-{2881,3592,0,1,5}-{2857,3587,0,1,7}-{2855,3596,0,1,4}-{2827,10078,1,1,6}-{2925,3626,0,1,0}-{2843,3682,0,1,1}-{2769,10149,0,1,0}-{2777,10142,0,1,0}"
},
{
"npc_id": "1107",
"loc_data": "{2874,3595,0,1,3}-{2875,3596,0,1,1}-{2873,3598,0,1,1}-{2836,10088,1,1,5}-{2845,3674,0,1,4}"
"loc_data": "{2874,3595,0,1,3}-{2875,3596,0,1,1}-{2873,3598,0,1,1}-{2836,10088,1,1,5}-{2845,3674,0,1,4}-{2781,10143,0,1,0}"
},
{
"npc_id": "1108",
"loc_data": "{2878,3592,0,1,6}-{2861,3586,0,1,6}-{2855,10058,2,1,4}-{2852,3673,0,1,2}"
"loc_data": "{2878,3592,0,1,6}-{2861,3586,0,1,6}-{2855,10058,2,1,4}-{2852,3673,0,1,2}-{2783,10140,0,1,0}"
},
{
"npc_id": "1109",
"loc_data": "{2875,3588,0,1,1}-{2883,3586,0,1,6}-{2825,10087,1,1,3}-{2836,10080,1,1,6}-{2784,10040,2,1,3}-{2920,3627,0,1,0}-{2923,10029,0,1,7}-{2851,3667,0,1,3}"
"loc_data": "{2875,3588,0,1,1}-{2883,3586,0,1,6}-{2825,10087,1,1,3}-{2836,10080,1,1,6}-{2784,10040,2,1,3}-{2920,3627,0,1,0}-{2923,10029,0,1,7}-{2851,3667,0,1,3}-{2784,10134,0,1,0}"
},
{
"npc_id": "1110",
"loc_data": "{2883,3591,0,1,4}-{2869,3594,0,1,3}-{2861,3587,0,1,4}-{2872,3594,0,1,5}-{2829,10080,1,1,6}-{2836,10097,2,1,4}-{2852,10110,2,1,4}"
"loc_data": "{2883,3591,0,1,4}-{2869,3594,0,1,3}-{2861,3587,0,1,4}-{2872,3594,0,1,5}-{2829,10080,1,1,6}-{2836,10097,2,1,4}-{2852,10110,2,1,4}-{2771,10143,0,1,0}"
},
{
"npc_id": "1111",
"loc_data": "{2863,3588,0,1,6}-{2865,3591,0,1,0}-{2866,3598,0,1,1}-{2840,10101,1,1,4}-{2857,10055,2,1,3}-{2836,10090,2,1,1}-{2925,10033,0,1,6}-{2855,3685,0,1,1}"
"loc_data": "{2863,3588,0,1,6}-{2865,3591,0,1,0}-{2866,3598,0,1,1}-{2840,10101,1,1,4}-{2857,10055,2,1,3}-{2836,10090,2,1,1}-{2925,10033,0,1,6}-{2855,3685,0,1,1}-{2788,10131,0,1,0}"
},
{
"npc_id": "1112",
@ -3315,6 +3327,14 @@
"npc_id": "1343",
"loc_data": "{3145,5548,0,1,6}"
},
{
"npc_id": "1357",
"loc_data": "{2201,4942,0,1,4}"
},
{
"npc_id": "1358",
"loc_data": "{2208,4959,0,1,6}"
},
{
"npc_id": "1359",
"loc_data": "{2612,3875,1,1,6}"
@ -3507,21 +3527,37 @@
"npc_id": "1555",
"loc_data": "{2829,10096,1,0,0}"
},
{
"npc_id": "1558",
"loc_data": "{2800,3859,0,1,0}-{2803,3864,0,1,0}-{2805,3859,0,1,0}"
},
{
"npc_id": "1560",
"loc_data": "{3150,5454,0,1,4}-{3144,5446,0,1,7}-{3166,5446,0,1,3}-{3158,5451,0,1,7}"
"loc_data": "{3150,5454,0,1,4}-{3144,5446,0,1,7}-{3166,5446,0,1,3}-{3158,5451,0,1,7}-{2775,10224,0,1,0}-{2783,10199,0,1,0}-{2784,10233,0,1,0}"
},
{
"npc_id": "1561",
"loc_data": "{3144,5450,0,1,1}-{3153,5454,0,1,5}-{3160,5450,0,1,5}-{3167,5450,0,1,3}-{3161,5451,0,1,1}"
"loc_data": "{3144,5450,0,1,1}-{3153,5454,0,1,5}-{3160,5450,0,1,5}-{3167,5450,0,1,3}-{3161,5451,0,1,1}-{2777,10224,0,1,0}-{2784,10231,0,1,0}-{2792,10222,0,1,0}"
},
{
"npc_id": "1562",
"loc_data": "{3147,5448,0,1,4}"
"loc_data": "{3147,5448,0,1,4}-{2772,10221,0,1,0}-{2785,10201,0,1,0}-{2787,10232,0,1,0}"
},
{
"npc_id": "1563",
"loc_data": "{3152,5453,0,1,0}"
"loc_data": "{3152,5453,0,1,0}-{2773,10220,0,1,0}-{2788,10198,0,1,0}-{2790,10220,0,1,0}-{2800,10218,0,1,0}"
},
{
"npc_id": "1564",
"loc_data": "{2770,10219,0,1,0}-{2788,10230,0,1,0}-{2798,10216,0,1,0}"
},
{
"npc_id": "1565",
"loc_data": "{2788,10221,0,1,0}-{2801,10216,0,1,0}"
},
{
"npc_id": "1566",
"loc_data": "{2786,10199,0,1,0}-{2790,10222,0,1,0}-{2799,10214,0,1,0}"
},
{
"npc_id": "1582",
@ -4111,6 +4147,38 @@
"npc_id": "1930",
"loc_data": "{3161,2985,0,0,6}-{3161,2983,0,0,6}-{3161,2982,0,0,6}-{3161,2981,0,0,6}-{3161,2984,0,0,6}"
},
{
"npc_id": "1935",
"loc_data": "{2841,3738,0,0,3}"
},
{
"npc_id": "1936",
"loc_data": "{2852,3735,0,1,0}-{2855,3729,0,1,0}-{2861,3725,0,1,0}"
},
{
"npc_id": "1937",
"loc_data": "{2850,3732,0,1,0}-{2857,3726,0,1,0}-{2865,3729,0,1,0}"
},
{
"npc_id": "1938",
"loc_data": "{2849,3735,0,1,0}-{2853,3731,0,1,0}-{2859,3728,0,1,0}"
},
{
"npc_id": "1939",
"loc_data": "{2856,3728,0,1,0}-{2862,3722,0,1,0}-{2864,3723,0,1,0}"
},
{
"npc_id": "1940",
"loc_data": "{2853,3728,0,1,0}-{2856,3732,0,1,0}-{2863,3720,0,1,0}"
},
{
"npc_id": "1941",
"loc_data": "{2854,3725,0,1,0}-{2862,3728,0,1,0}-{2862,3731,0,1,0}"
},
{
"npc_id": "1942",
"loc_data": "{2855,3735,0,1,0}-{2858,3730,0,1,0}-{2865,3726,0,1,0}"
},
{
"npc_id": "1951",
"loc_data": "{2886,3723,0,1,3}-{2887,3720,0,1,4}-{2890,3721,0,1,7}-{2890,3724,0,1,1}-{2909,3736,0,1,5}-{2910,3736,0,1,2}-{2891,3724,0,1,7}"
@ -4727,6 +4795,14 @@
"npc_id": "2462",
"loc_data": "{2596,4773,0,1,2}-{2602,4771,0,1,6}-{2596,4780,0,1,4}"
},
{
"npc_id": "2479",
"loc_data": "{3420,4777,0,0,0}"
},
{
"npc_id": "2481",
"loc_data": "{3423,4777,0,0,5}"
},
{
"npc_id": "2482",
"loc_data": "{3057,3902,0,1,3}"
@ -4815,6 +4891,14 @@
"npc_id": "2549",
"loc_data": "{3364,3001,0,0,6}"
},
{
"npc_id": "2564",
"loc_data": "{1936,4966,0,0,4}"
},
{
"npc_id": "2565",
"loc_data": "{1939,4968,0,1,0}"
},
{
"npc_id": "2568",
"loc_data": "{2729,3495,0,0,6}-{2724,3495,0,0,6}-{2728,3495,0,0,6}-{2721,3495,0,0,6}"
@ -4967,6 +5051,10 @@
"npc_id": "2652",
"loc_data": "{2868,3579,0,0,0}-{2851,3582,0,0,0}"
},
{
"npc_id": "2655",
"loc_data": "{2921,3558,0,1,6}"
},
{
"npc_id": "2660",
"loc_data": "{3208,3496,0,1,3}"
@ -6292,8 +6380,8 @@
"loc_data": "{2880,3546,0,0,4}"
},
{
"npc_id": "4286",
"loc_data": "{2866,3543,0,1,1}"
"npc_id": "8267",
"loc_data": "{2866,3546,0,1,1}"
},
{
"npc_id": "4287",
@ -6469,7 +6557,7 @@
},
{
"npc_id": "4390",
"loc_data": "{1984,5160,0,1,2}-{2040,5190,0,1,3}-{2044,5187,0,1,2}-{2042,5191,0,1,1}-{2045,5190,0,1,7}-{2041,5187,0,1,2}-{2045,5186,0,1,2}-{2044,5188,0,1,2}-{2042,5192,0,1,2}"
"loc_data": "{2040,5190,0,1,3}-{2044,5187,0,1,2}-{2042,5191,0,1,1}-{2045,5190,0,1,7}-{2041,5187,0,1,2}-{2045,5186,0,1,2}-{2044,5188,0,1,2}-{2042,5192,0,1,2}"
},
{
"npc_id": "4391",
@ -6477,7 +6565,7 @@
},
{
"npc_id": "4392",
"loc_data": "{2033,5233,0,1,4}-{2033,5233,0,1,7}-{2026,5236,0,1,1}-{1984,5160,0,1,7}"
"loc_data": "{2033,5233,0,1,4}-{2033,5233,0,1,7}-{2026,5236,0,1,1}"
},
{
"npc_id": "4393",
@ -6803,6 +6891,10 @@
"npc_id": "4575",
"loc_data": "{2441,3503,1,1,4}"
},
{
"npc_id": "4576",
"loc_data": "{2786,3862,0,1,0}"
},
{
"npc_id": "4578",
"loc_data": "{2933,2972,0,0,0}"
@ -8711,6 +8803,10 @@
"npc_id": "6051",
"loc_data": "{3292,3069,0,1,1}-{3285,3071,0,1,1}-{3279,3078,0,1,4}-{3273,3065,0,1,3}-{3288,3066,0,1,6}-{3281,3057,0,1,5}-{3294,3056,0,1,5}-{3305,3064,0,1,3}-{3312,3075,0,1,6}-{3306,3086,0,1,4}-{3272,3082,0,1,4}"
},
{
"npc_id": "6052",
"loc_data": "{2761,3863,0,1,0}-{2764,3858,0,1,0}-{2769,3854,0,1,0}-{2769,3861,0,1,0}"
},
{
"npc_id": "6055",
"loc_data": "{2563,4348,0,1,0}-{2620,4348,0,1,0}-{2620,4291,0,1,0}-{2563,4291,0,1,0}-{2572,4339,0,1,0}-{2565,4327,0,1,0}-{2575,4315,0,1,0}-{2586,4306,0,1,0}-{2593,4304,0,1,0}-{2605,4312,0,1,0}-{2614,4330,0,1,0}-"
@ -10451,14 +10547,6 @@
"npc_id": "2159",
"loc_data": "{2885,10196,0,1,0}"
},
{
"npc_id": "2565",
"loc_data": "{1937,4972,0,1,0}"
},
{
"npc_id": "2564",
"loc_data": "{1935,4964,0,0,4}"
},
{
"npc_id": "2321",
"loc_data": "{2918,10194,0,0,3}"
@ -11123,14 +11211,6 @@
"npc_id": "3322",
"loc_data": "{2384,4439,0,1,0}"
},
{
"npc_id": "223",
"loc_data": "{2569,3250,0,1,0}"
},
{
"npc_id": "224",
"loc_data": "{2582,9656,0,1,0}-{2589,9657,0,1,0}-{2587,9658,0,1,0}-{2584,9657,0,1,0}-{2585,9656,0,1,0}-{2582,9658,0,1,0}-{2585,9653,0,1,0}-{2590,9658,0,1,0}-{2590,9655,0,1,0}"
},
{
"npc_id": "1080",
"loc_data": "{2900,3567,1,1,0}"

View file

@ -20630,5 +20630,9 @@
{
"examine": "There are some bandages on this table.",
"ids": "36579,36586"
},
{
"examine": "Rough but adequate.",
"ids": "14918"
}
]

View file

@ -1502,69 +1502,6 @@
"drop_ammo": "true",
"ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,78,4160"
},
{
"itemId": "14671",
"name": "Armadyl crossbow",
"ammo_slot": "13",
"weapon_type": "1",
"animation": "4230",
"drop_ammo": "true",
"ammunition": "877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243,9144,9291,9298,9305,9341,9244,9342,9245,9140,13280"
},
{
"itemId": "14684",
"name": "Odium ward",
"ammo_slot": "13",
"weapon_type": "1",
"animation": "4230",
"drop_ammo": "true",
"ammunition": "8882,877,878,6061,6062,879,9236,9141,9288,9295,9302,9336,9239,13083,13084,13085,13086,9142,9289,9296,9303,9337,9240,9338,9241,9143,9290,9297,9304,9339,9242,9340,9243"
},
{
"itemId": "14685",
"name": "Odium shard 1",
"ammo_slot": "13",
"weapon_type": "1",
"animation": "4230",
"drop_ammo": "true",
"ammunition": "877,878,6061,6062,879,9236"
},
{
"itemId": "14803",
"name": "Dark bow",
"ammo_slot": "13",
"weapon_type": "2",
"animation": "426",
"drop_ammo": "true",
"ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
},
{
"itemId": "14804",
"name": "Dark bow",
"ammo_slot": "13",
"weapon_type": "2",
"animation": "426",
"drop_ammo": "true",
"ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
},
{
"itemId": "14805",
"name": "Dark bow",
"ammo_slot": "13",
"weapon_type": "2",
"animation": "426",
"drop_ammo": "true",
"ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
},
{
"itemId": "14806",
"name": "Dark bow",
"ammo_slot": "13",
"weapon_type": "2",
"animation": "426",
"drop_ammo": "true",
"ammunition": "882,883,5616,5622,598,884,885,5617,5623,2532,886,887,5618,5624,2534,888,889,5619,5625,2536,890,891,5620,5626,2538,892,893,5621,5627,2540,11212,11227,11228,11229,11217,78,4160"
},
{
"itemId": "14192",
"name": "Bow (class 1)",

View file

@ -519,7 +519,7 @@
"general_store": "false",
"id": "59",
"title": "Fancy Clothes Store",
"stock": "{1949,10,100}-{958,10,100}-{948,10,100}-{1733,10,100}-{1734,1000,100}-{1059,30,100}-{1061,10,100}-{1757,10,100}-{1013,10,100}-{1025,10,100}-{10088,0,100}-{10090,0,100}-{10091,0,100}-{10089,0,100}-{10087,0,100}-{11525,0,100}"
"stock": "{1949,0,100}-{579,10,100}-{1023,10,100}-{958,10,100}-{948,10,100}-{1733,10,100}-{1734,1000,100}-{1059,30,100}-{1061,10,100}-{428,10,100}-{426,10,100}-{1757,10,100}-{1013,10,100}-{1015,10,100}-{1011,10,100}-{1007,10,100}-{1025,10,100}-{10088,0,100}-{10090,0,100}-{10091,0,100}-{10089,0,100}-{10087,0,100}-{11525,0,100}"
},
{
"npcs": "548",
@ -1476,7 +1476,7 @@
"stock": "{8794,10,100}-{8790,300,100}-{4819,300,100}-{4820,300,100}-{1539,300,100}"
},
{
"npcs": "1079",
"npcs": "1079,1357,1358",
"high_alch": "0",
"currency": "995",
"general_store": "false",

4
game/data/eco/.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

Binary file not shown.

View file

@ -1,4 +1,10 @@
[server]
#Log Level - the level of verbosity used for logs.
#"verbose" - ALL logs are shown
#"detailed" - FINE logs are hidden, which is generally bulk/debug info.
#"cautious" - FINE, INFO logs are hidden, meaning this level only shows warnings and errors.
#"silent" - FINE, INFO, WARN logs are hidden, meaning this level only shows errors.
log_level = "verbose"
#Secret key - this is sent by the client during login.
#Client/Server MUST match or connection is refused.
secret_key = "2009scape_development"
@ -13,10 +19,10 @@ use_auth = false #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION!
#NOTE: this does not affect actual save data, like stats, inventory, etc.
persist_accounts = false #NOTE: THIS MUST BE SET TO TRUE IN PRODUCTION!
noauth_default_admin = false #NOTE: If we are not using auth, this determines whether or not players are admins by default.
max_pathfind_dist = 50
#------------------------------------------------------------------------------------------------------
#The limit on how many different accounts a player can log into per day.
daily_accounts_per_ip = 3
watchdog_enabled = false
[database]
database_name = "global"
@ -25,6 +31,15 @@ database_password = ""
database_address = "127.0.0.1"
database_port = "3306"
[integrations]
grafana_logging = false
grafana_log_path = "@data/logs"
#how long grafana will keep old data for in days (anything older is pruned once on startup)
grafana_log_ttl_days = 7
#discord_ge_webhook = "webhook link"
#discord_moderation_webhook = "webhook link"
#openrsc_integration_webhook = "webhook link"
[world]
name = "2009scape"
@ -39,7 +54,7 @@ world_id = "1"
country_id = "0"
members = true
#activity as displayed on the world list
activity = "2009scape classic."
activity = "Singleplayer"
pvp = false
default_xp_rate = 5.0
allow_slayer_reroll = false
@ -60,19 +75,24 @@ skillcape_perks = true
increased_door_time = false
enable_botting = false
max_adv_bots = 100
wild_pvp_enabled = false
enable_doubling_money_scammers = true
wild_pvp_enabled = true
jad_practice_enabled = true
#minimum HA value for announcements of bots selling on ge
ge_announcement_limit = 500
enable_castle_wars = false
personalized_shops = true
bots_influence_ge_price = true
bots_influence_ge_price = false
#verbose cutscene logging (for cutscenes in the new system)
verbose_cutscene = false
#show the rules the first time a player logs in
show_rules = false
show_rules = true
#the number of revenants active at a time
revenant_population = 30
#enable auto-buy/auto-sell on the GE.
i_want_to_cheat = false
#better agility pyramid gp reward (gp reward = 1000 + ((agility level / 99) * 9000))
better_agility_pyramid_gp = true
[paths]
#path to the data folder, which contains the cache subfolder and such
@ -104,4 +124,3 @@ object_parser_path = "@data/ObjectParser.xml"
logs_path = "@data/logs"
bot_data = "@data/botdata"
eco_data = "@data/eco"