From 6c28a82ebb06b3404972fb5f3fbea99883b2c810 Mon Sep 17 00:00:00 2001 From: Oven Bread Date: Wed, 13 Dec 2023 12:06:14 +0000 Subject: [PATCH] NPC fixes at: Mountain Camp (next to Troll Stronghold) Jiggig Gu'Tanoth Oo'glog --- Server/data/configs/npc_spawns.json | 366 ++++++++++++++---- .../desert/ullek/handlers/UllekListeners.kt | 27 ++ 2 files changed, 318 insertions(+), 75 deletions(-) create mode 100644 Server/src/main/content/region/desert/ullek/handlers/UllekListeners.kt diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json index 78c2b1400..7916efb60 100644 --- a/Server/data/configs/npc_spawns.json +++ b/Server/data/configs/npc_spawns.json @@ -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}-{2585,9608,0,1,0}-{2586,9614,0,1,0}-{2588,9606,0,1,0}" + "loc_data": "{2502,3114,0,1,0}-{2505,3111,0,1,0}-{2507,3108,0,1,0}-{2508,3119,0,1,0}-{2509,3087,0,1,0}-{2510,3084,0,1,0}-{2513,3087,0,1,0}-{2514,3081,0,1,0}-{2571,3027,0,1,0}-{2572,3031,0,1,0}-{2575,3024,0,1,0}-{2578,3031,0,1,0}-{2510,3044,0,1,0}-{2520,3046,0,1,0}-{2526,3039,0,1,0}" }, { "npc_id": "116", @@ -2295,6 +2295,10 @@ "npc_id": "851", "loc_data": "{2449,3503,1,1,4}" }, + { + "npc_id": "852", + "loc_data": "{2568,9432,0,1,0}-{2573,9447,0,1,0}-{2579,9441,0,1,0}-{2580,9431,0,1,0}-{2611,9454,0,1,0}-{2616,9447,0,1,0}-{2505,3032,0,1,0}-{2512,3022,0,1,0}-{2518,3041,0,1,0}-{2528,3044,0,1,0}-{2615,2987,0,1,0}" + }, { "npc_id": "853", "loc_data": "{2506,3115,0,1,3}" @@ -2303,18 +2307,58 @@ "npc_id": "854", "loc_data": "{2511,3085,0,1,4}" }, + { + "npc_id": "855", + "loc_data": "{2576,3027,0,1,3}" + }, + { + "npc_id": "856", + "loc_data": "{2577,3021,0,1,1}" + }, { "npc_id": "858", - "loc_data": "{2550,3032,0,0,0}-{2552,3033,0,0,0}-{2550,3030,0,0,0}-{2550,3032,0,0,0}" + "loc_data": "{2549,3029,0,1,0}-{2551,3031,0,1,0}" + }, + { + "npc_id": "859", + "loc_data": "{2505,3062,0,1,0}-{2507,3062,0,1,0}" }, { "npc_id": "860", - "loc_data": "{2503,3013,0,0,0}" + "loc_data": "{2501,3012,0,1,0}-{2503,3011,0,1,0}" + }, + { + "npc_id": "861", + "loc_data": "{2526,3018,0,1,0}-{2529,3019,0,1,0}" + }, + { + "npc_id": "862", + "loc_data": "{2541,3034,0,1,3}-{2541,3029,0,1,3}-{2543,3031,0,1,3}" + }, + { + "npc_id": "870", + "loc_data": "{2507,3040,0,1,0}-{2507,3036,0,1,0}" }, { "npc_id": "872", "loc_data": "{2547,3117,2,1,3}-{2547,3112,2,1,6}-{2544,3114,2,1,3}-{2547,3118,2,1,3}" }, + { + "npc_id": "873", + "loc_data": "{2518,3035,0,1,1}" + }, + { + "npc_id": "874", + "loc_data": "{2528,3048,0,1,6}" + }, + { + "npc_id": "875", + "loc_data": "{2513,3034,0,1,1}" + }, + { + "npc_id": "876", + "loc_data": "{2525,3043,0,1,3}" + }, { "npc_id": "877", "loc_data": "{2536,3092,0,1,1}-{2534,3091,0,1,1}-{2550,3118,0,1,4}-{2543,3117,0,1,3}-{2546,3113,0,1,4}" @@ -3361,7 +3405,19 @@ }, { "npc_id": "1334", - "loc_data": "{2510,3644,1,1,3}" + "loc_data": "{2509,3639,1,1,3}" + }, + { + "npc_id": "1335", + "loc_data": "{2518,4633,0,1,1}" + }, + { + "npc_id": "1336", + "loc_data": "{2508,3635,0,1,3}" + }, + { + "npc_id": "1337", + "loc_data": "{2445,4599,1,1,3}" }, { "npc_id": "1338", @@ -4089,7 +4145,55 @@ }, { "npc_id": "1805", - "loc_data": "{2765,3652,0,1,0}" + "loc_data": "{2760,3660,0,1,6}" + }, + { + "npc_id": "1806", + "loc_data": "{2798,3667,0,1,3}" + }, + { + "npc_id": "1807", + "loc_data": "{2811,3673,0,1,3}" + }, + { + "npc_id": "1808", + "loc_data": "{2765,3676,0,1,3}" + }, + { + "npc_id": "1810", + "loc_data": "{2811,3681,0,1,3}" + }, + { + "npc_id": "1814", + "loc_data": "{2794,3668,0,1,0}" + }, + { + "npc_id": "1815", + "loc_data": "{2801,3669,0,1,0}" + }, + { + "npc_id": "1816", + "loc_data": "{2803,3668,0,1,0}" + }, + { + "npc_id": "1817", + "loc_data": "{2797,3672,0,1,0}" + }, + { + "npc_id": "1818", + "loc_data": "{2802,3674,0,1,0}" + }, + { + "npc_id": "1819", + "loc_data": "{2813,3687,0,1,0}" + }, + { + "npc_id": "1820", + "loc_data": "{2812,3685,0,1,0}" + }, + { + "npc_id": "1821", + "loc_data": "{2757,3674,0,1,0}-{2762,3671,0,1,0}-{2785,3658,0,1,0}" }, { "npc_id": "1828", @@ -4369,11 +4473,11 @@ }, { "npc_id": "2038", - "loc_data": "{2392,2984,0,0,0}" + "loc_data": "{2443,3051,0,0,1}" }, { "npc_id": "2039", - "loc_data": "{2392,2984,0,0,0}" + "loc_data": "{2442,3049,0,0,3}" }, { "npc_id": "2040", @@ -4385,35 +4489,47 @@ }, { "npc_id": "2042", - "loc_data": "{2455,3048,0,0,0}" + "loc_data": "{2454,3047,0,0,2}" }, { "npc_id": "2043", - "loc_data": "{2451,3030,0,0,0}-{2446,3040,0,0,0}" + "loc_data": "{2443,3038,0,1,1}-{2452,3030,0,1,1}" + }, + { + "npc_id": "2044", + "loc_data": "{2486,3048,0,1,3}" + }, + { + "npc_id": "2045", + "loc_data": "{2482,3046,0,1,3}" + }, + { + "npc_id": "2047", + "loc_data": "{2480,3046,0,1,3}" }, { "npc_id": "2050", - "loc_data": "{2460,3046,0,0,0}-{2465,3052,0,0,0}" + "loc_data": "{2461,3047,0,1,3}-{2466,3052,0,1,6}" }, { "npc_id": "2051", - "loc_data": "{2463,3053,0,0,0}" + "loc_data": "{2464,3049,0,1,2}" }, { "npc_id": "2052", - "loc_data": "{2468,3045,0,0,0}" + "loc_data": "{2464,3045,0,1,2}" }, { "npc_id": "2053", - "loc_data": "{2467,3051,0,0,0}" + "loc_data": "{2467,3049,0,1,2}" }, { "npc_id": "2054", - "loc_data": "{2466,3046,0,0,0}" + "loc_data": "{2468,3046,0,1,2}" }, { "npc_id": "2055", - "loc_data": "{2471,3056,0,0,0}" + "loc_data": "{2470,3055,0,0,5}" }, { "npc_id": "2056", @@ -4933,7 +5049,7 @@ }, { "npc_id": "2439", - "loc_data": "{2659,3657,0,1,3}" + "loc_data": "{2539,3739,0,1,3}" }, { "npc_id": "2440", @@ -6253,7 +6369,7 @@ }, { "npc_id": "3402", - "loc_data": "{2560,2842,0,0,0}" + "loc_data": "{2560,2842,0,0,1}" }, { "npc_id": "3407", @@ -6265,7 +6381,7 @@ }, { "npc_id": "3419", - "loc_data": "" + "loc_data": "{2496,3092,0,1,0}-{2497,3089,0,1,0}-{2500,3092,0,1,0}-{2500,3097,0,1,0}-{2503,3095,0,1,0}-{2504,3133,0,1,0}-{2585,9608,0,1,0}-{2586,9614,0,1,0}-{2588,9606,0,1,0}-{2561,3020,0,1,0}-{2567,3046,0,1,0}-{2387,9685,0,1,0}-{2389,9683,0,1,0}-{2513,3026,0,1,0}-{2522,3055,0,1,0}-{2523,3057,0,1,0}-{2529,3032,0,1,0}-{2539,3018,0,1,0}-{2541,3016,0,1,0}-{2550,3043,0,1,0}-{2550,3046,0,1,0}-{2553,3047,0,1,0}-{2719,9668,0,1,0}-{2719,9715,0,1,0}-{2720,9702,0,1,0}-{2722,9669,0,1,0}-{2723,9707,0,1,0}-{2724,9713,0,1,0}-{2504,2965,0,1,0}-{2504,2984,0,1,0}-{2520,2973,0,1,0}-{2525,2986,0,1,0}-{2533,2977,0,1,0}-{2536,2975,0,1,0}-{2539,2990,0,1,0}-{2549,2979,0,1,0}-{2551,2955,0,1,0}-{2552,2961,0,1,0}-{2581,9738,0,1,0}-{2581,9742,0,1,0}-{2584,9734,0,1,0}-{2585,9738,0,1,0}-{2587,9733,0,1,0}-{2587,9740,0,1,0}-{2590,9737,0,1,0}-{2568,2991,0,1,0}-{2574,2988,0,1,0}-{2584,2967,0,1,0}-{2585,2977,0,1,0}-{2592,2965,0,1,0}-{2608,2980,0,1,0}-{2609,2990,0,1,0}-{2614,2998,0,1,0}-{2554,3192,0,1,0}" }, { "npc_id": "3450", @@ -6439,9 +6555,13 @@ "npc_id": "3804", "loc_data": "{3349,3793,0,0,0}" }, + { + "npc_id": "3805", + "loc_data": "{2445,3097,0,1,5}" + }, { "npc_id": "3806", - "loc_data": "{3166, 3304, 0, 1, 0}" + "loc_data": "{3166,3304,0,1,0}" }, { "npc_id": "3807", @@ -7374,7 +7494,7 @@ }, { "npc_id": "4706", - "loc_data": "{3242,5555,0,1,3}-{3206,5493,0,1,5}" + "loc_data": "{3237,5559,0,1,3}-{3244,5554,0,1,3}-{3239,5553,0,1,5}-{3249,5559,0,1,5}-{2195,3808,0,1,0}-{2196,3822,0,1,0}-{2197,3805,0,1,0}-{2197,3813,0,1,0}-{2201,3812,0,1,0}-{2202,3824,0,1,0}-{2203,3804,0,1,0}-{2207,3813,0,1,0}-{2211,3818,0,1,0}-{2214,3819,0,1,0}" }, { "npc_id": "4707", @@ -7616,6 +7736,10 @@ "npc_id": "5062", "loc_data": "{2927,3410,0,0,0}" }, + { + "npc_id": "5063", + "loc_data": "{2460,3108,0,1,3}" + }, { "npc_id": "5065", "loc_data": "{2925,3303,0,0,0}" @@ -7808,6 +7932,14 @@ "npc_id": "5164", "loc_data": "{2410,4456,0,1,1}-{2415,4429,0,1,2}" }, + { + "npc_id": "5166", + "loc_data": "{2811,3687,0,1,0}" + }, + { + "npc_id": "5167", + "loc_data": "{2810,3684,0,1,0}" + }, { "npc_id": "5168", "loc_data": "{3260,3349,0,1,0}-{3199,3270,0,1,1}-{2658,4713,0,1,0}-{3209,3259,0,1,3}" @@ -9952,30 +10084,90 @@ "npc_id": "6750", "loc_data": "{2577,3078,0,1,3}" }, + { + "npc_id": "6753", + "loc_data": "{3381,2816,1,1,0}-{3061,4672,1,1,0}" + }, + { + "npc_id": "6754", + "loc_data": "{3386,2824,1,1,0}-{3066,4680,1,1,0}" + }, + { + "npc_id": "6755", + "loc_data": "{3382,2820,1,1,0}-{3062,4676,1,1,0}" + }, + { + "npc_id": "6756", + "loc_data": "{3384,2822,1,1,0}-{3064,4678,1,1,0}" + }, + { + "npc_id": "6761", + "loc_data": "{3424,2828,1,1,3}-{3430,2835,1,1,3}-{3436,2830,1,1,3}" + }, + { + "npc_id": "6762", + "loc_data": "{3420,2829,1,1,3}-{3429,2827,1,1,3}-{3432,2832,1,1,3}" + }, + { + "npc_id": "6763", + "loc_data": "{3427,2832,1,1,3}-{3432,2828,1,1,3}-{3435,2835,1,1,3}" + }, + { + "npc_id": "6764", + "loc_data": "{3415,2840,1,1,0}-{3426,2852,1,1,0}-{3439,2857,1,1,0}" + }, + { + "npc_id": "6765", + "loc_data": "{3418,2851,1,1,0}-{3432,2854,1,1,0}" + }, + { + "npc_id": "6766", + "loc_data": "{3406,2837,1,1,0}-{3434,2848,1,1,0}" + }, + { + "npc_id": "6767", + "loc_data": "{3409,2844,1,1,0}-{3421,2855,1,1,0}" + }, + { + "npc_id": "6768", + "loc_data": "{3414,2844,1,1,0}-{3439,2851,1,1,0}" + }, { "npc_id": "6773", - "loc_data": "{3439,2808,0,0,0}" + "loc_data": "{3358,9233,1,1,0}-{3363,9246,1,1,0}-{3369,9233,1,1,0}-{3373,9246,1,1,0}-{3377,9244,1,1,0}-{3381,9225,1,1,0}-{3389,9241,1,1,0}-{3391,9237,1,1,0}-{3391,9230,1,1,0}-{3439,2808,0,1,0}" }, { "npc_id": "6774", - "loc_data": "{3435,2808,0,0,0}" + "loc_data": "{3361,9238,1,1,0}-{3363,9241,1,1,0}-{3373,9241,1,1,0}-{3374,9225,1,1,0}-{3379,9230,1,1,0}-{3383,9232,1,1,0}-{3387,9229,1,1,0}-{3389,9236,1,1,0}-{3435,2808,0,1,2}" }, { "npc_id": "6776", - "loc_data": "{3441,2810,0,0,0}-{3445,2813,0,0,0}" + "loc_data": "{3441,2810,0,1,0}-{3445,2813,0,1,0}" }, { "npc_id": "6777", - "loc_data": "{3432,2810,0,0,0}" + "loc_data": "{3432,2810,0,1,4}" }, { "npc_id": "6778", - "loc_data": "{3440,2806,0,0,0}" + "loc_data": "{3440,2806,0,1,0}" }, { "npc_id": "6779", "loc_data": "{3392,2759,0,1,2}-{3408,2763,0,1,7}-{3410,2786,0,1,2}-{3420,2778,0,1,6}-{3427,2792,0,1,6}-{3429,2802,0,1,4}" }, + { + "npc_id": "6780", + "loc_data": "{3366,9254,1,1,6}-{3398,9232,1,1,0}-{3409,9230,1,1,0}" + }, + { + "npc_id": "6781", + "loc_data": "{3363,9231,1,1,0}-{3369,9254,1,1,6}-{3370,9226,1,1,0}-{3397,9225,1,1,0}-{3408,9226,1,1,0}" + }, + { + "npc_id": "6785", + "loc_data": "{3442,9245,1,0,1}" + }, { "npc_id": "6786", "loc_data": "{3409,2812,1,0,0}" @@ -9984,6 +10176,10 @@ "npc_id": "6787", "loc_data": "{3408,2813,1,0,0}" }, + { + "npc_id": "6788", + "loc_data": "{3368,9263,1,0,6}" + }, { "npc_id": "6891", "loc_data": "{2598,3272,0,0,0}" @@ -10122,19 +10318,35 @@ }, { "npc_id": "7023", - "loc_data": "{2552,2821,0,1,4}-{2555,2826,0,1,5}-{2550,2821,0,1,1}" + "loc_data": "{2552,2821,0,1,4}" }, { "npc_id": "7024", - "loc_data": "{2523,2823,0,0,0}-{2525,2821,0,0,0}-{2525,2820,0,0,0}" + "loc_data": "{2523,2823,0,1,1}" }, { "npc_id": "7025", - "loc_data": "{2537,2820,0,0,0}-{2539,2819,0,0,0}-{2543,2817,0,0,0}" + "loc_data": "{2537,2820,0,1,1}" }, { "npc_id": "7026", - "loc_data": "{2543,2822,0,0,0}-{2542,2818,0,0,0}-{2549,2822,0,0,0}" + "loc_data": "{2543,2822,0,1,1}" + }, + { + "npc_id": "7027", + "loc_data": "{2609,2863,0,1,0}" + }, + { + "npc_id": "7028", + "loc_data": "{2610,2865,0,1,0}" + }, + { + "npc_id": "7029", + "loc_data": "{2611,2862,0,1,0}" + }, + { + "npc_id": "7030", + "loc_data": "{2611,2864,0,1,0}" }, { "npc_id": "7031", @@ -10142,43 +10354,43 @@ }, { "npc_id": "7032", - "loc_data": "{2539,2838,0,0,0}-{2542,2832,0,0,0}-{2532,2836,0,0,0}" + "loc_data": "{2539,2838,0,1,1}" }, { "npc_id": "7033", - "loc_data": "{2541,2837,0,0,0}-{2535,2832,0,0,0}-{2543,2832,0,0,0}" + "loc_data": "{2541,2837,0,1,1}" }, { "npc_id": "7034", - "loc_data": "{2536,2839,0,0,0}-{2537,2840,0,0,0}-{2533,2836,0,0,0}" + "loc_data": "{2536,2839,0,1,1}" }, { "npc_id": "7035", - "loc_data": "{2542,2839,0,0,0}-{2549,2835,0,0,0}-{2541,2839,0,0,0}" + "loc_data": "{2542,2839,0,1,1}" }, { "npc_id": "7036", - "loc_data": "{2538,2841,0,0,0}-{2537,2836,0,0,0}-{2531,2836,0,0,0}" + "loc_data": "{2538,2841,0,1,1}" }, { "npc_id": "7039", - "loc_data": "{2503,2824,0,1,4}-{2518,2824,0,1,4}-{2534,2821,0,1,1}-{2548,2823,0,1,4}-{2560,2822,0,1,1}-{2570,2823,0,1,1}-{2582,2824,0,1,6}-{2588,2828,0,1,4}-{2503,2825,0,1,4}-{2493,2828,0,1,3}-{2515,2823,0,1,6}-{2525,2827,0,1,4}-{2589,2808,0,1,2}-{2562,2825,0,1,7}-{2568,2820,0,1,4}-{2577,2821,0,1,4}-{2582,2832,0,1,6}-{2500,2818,0,1,1}-{2525,2827,0,1,7}-{2536,2826,0,1,2}-{2541,2819,0,1,4}-{2503,2822,0,1,3}" + "loc_data": "{2503,2824,0,1,4}-{2518,2824,0,1,4}-{2534,2821,0,1,1}-{2548,2823,0,1,4}-{2560,2822,0,1,1}-{2570,2823,0,1,1}-{2582,2824,0,1,6}-{2588,2828,0,1,4}" }, { "npc_id": "7040", - "loc_data": "{2563,2862,0,0,0}-{2563,2856,0,0,0}" + "loc_data": "{2562,2863,0,1,4}-{2617,5539,0,1,4}" }, { "npc_id": "7041", - "loc_data": "{2562,2863,0,0,0}-{2553,2861,0,0,0}" + "loc_data": "{2562,2863,0,1,4}-{2616,5540,0,1,4}" }, { "npc_id": "7042", - "loc_data": "{2551,2863,0,0,0}-{2552,2859,0,0,0}" + "loc_data": "{2551,2863,0,1,6}-{2605,5540,0,1,6}" }, { "npc_id": "7043", - "loc_data": "{2553,2862,0,0,0}-{2561,2861,0,0,0}" + "loc_data": "{2553,2862,0,1,6}-{2607,5539,0,1,6}" }, { "npc_id": "7044", @@ -10194,131 +10406,135 @@ }, { "npc_id": "7047", - "loc_data": "{2557,2836,0,0,0}-{2559,2838,0,0,0}" + "loc_data": "{2557,2836,0,1,1}-{2611,5513,0,0,1}" }, { "npc_id": "7048", - "loc_data": "{2545,2836,0,0,0}" + "loc_data": "{2545,2836,0,0,0}-{2599,5513,0,0,0}" }, { "npc_id": "7049", - "loc_data": "{2553,2839,0,0,4}-{2553,2836,0,0,4}" + "loc_data": "{2553,2839,0,0,4}" + }, + { + "npc_id": "7049", + "loc_data": "{2553,2836,0,0,4}" }, { "npc_id": "7051", - "loc_data": "{2547,2852,0,0,0}-{2549,2854,0,0,0}" + "loc_data": "{2547,2852,0,1,0}" }, { "npc_id": "7052", - "loc_data": "{2571,2855,0,0,0}" + "loc_data": "{2571,2855,0,1,3}" }, { "npc_id": "7054", - "loc_data": "{2561,2850,0,0,0}" + "loc_data": "{2560,2851,0,0,1}" }, { "npc_id": "7055", - "loc_data": "{2559,2851,0,0,0}-{2560,2852,0,0,0}" + "loc_data": "{2559,2851,0,0,1}" }, { "npc_id": "7056", - "loc_data": "{2560,2851,0,0,0}-{2561,2852,0,0,0}" + "loc_data": "{2560,2851,0,1,6}-{2613,5528,0,0,6}" }, { "npc_id": "7057", - "loc_data": "{2596,2845,0,0,0}" + "loc_data": "{2596,2845,0,1,0}" }, { "npc_id": "7062", - "loc_data": "{2571,2840,0,0,0}-{2572,2840,0,0,0}" + "loc_data": "{2571,2840,0,1,4}" }, { "npc_id": "7065", - "loc_data": "{2621,2857,1,0,0}-{2622,2857,0,0,0}" + "loc_data": "{2621,2857,0,1,3}" }, { "npc_id": "7066", - "loc_data": "{2619,2856,1,0,0}-{2620,2857,0,0,0}" + "loc_data": "{2619,2856,0,1,3}" }, { "npc_id": "7067", - "loc_data": "{2518,2842,0,0,0}" + "loc_data": "{2518,2842,0,1,0}-{2572,5519,0,0,6}" }, { "npc_id": "7068", - "loc_data": "{2531,2850,0,0,0}" + "loc_data": "{2531,2850,0,1,6}-{2585,5527,0,0,6}" }, { "npc_id": "7069", - "loc_data": "{2559,2858,0,0,0}" + "loc_data": "{2559,2858,0,1,0}-{2613,5535,0,0,6}" }, { "npc_id": "7070", - "loc_data": "{2581,2866,0,0,0}" + "loc_data": "{2581,2866,0,1,6}" }, { "npc_id": "7071", - "loc_data": "{2598,2864,0,0,0}" + "loc_data": "{2598,2864,0,1,6}" }, { "npc_id": "7072", - "loc_data": "{2517,2840,0,0,0}" + "loc_data": "{2517,2840,0,1,6}" }, { "npc_id": "7073", - "loc_data": "{2533,2848,0,0,0}" + "loc_data": "{2533,2848,0,1,6}" }, { "npc_id": "7074", - "loc_data": "{2556,2858,0,0,0}" + "loc_data": "{2556,2858,0,1,6}" }, { "npc_id": "7075", - "loc_data": "{2583,2865,0,0,0}" + "loc_data": "{2583,2865,0,1,6}" }, { "npc_id": "7076", - "loc_data": "{2596,2865,0,0,0}" + "loc_data": "{2596,2865,0,1,6}" }, { "npc_id": "7077", - "loc_data": "{2617,2856,1,0,0}-{2618,2857,0,0,0}" + "loc_data": "{2617,2856,0,1,3}" }, { "npc_id": "7078", - "loc_data": "{2502,2838,0,0,0}-{2478,2884,0,0,0}-{2476,2895,0,0,0}-{2472,2870,0,0,0}-{2455,2873,0,0,0}-{2455,2857,0,0,0}-{2474,2833,0,0,0}-{2505,2842,0,0,0}-{2507,2843,0,0,0}-{2481,2833,0,0,0}-{2476,2865,0,0,0}-{2456,2856,0,0,0}-{2454,2879,0,0,0}-{2472,2884,0,0,0}-{2475,2894,0,0,0}" + "loc_data": "{2451,2857,0,1,0}-{2453,2874,0,1,0}-{2475,2868,0,1,0}-{2475,2896,0,1,0}-{2476,2883,0,1,0}- {2477,2832,0,1,0}-{2502,2838,0,1,0}" }, { "npc_id": "7079", - "loc_data": "{2501,2851,0,0,0}-{2466,2878,0,0,0}-{2454,2847,0,0,0}-{2471,2857,0,0,0}-{2483,2840,0,0,0}-{2498,2854,0,0,0}-{2504,2851,0,0,0}-{2491,2838,0,0,0}-{2475,2852,0,0,0}-{2464,2873,0,0,0}-{2474,2903,0,0,0}-{2479,2906,0,0,0}" + "loc_data": "{2451,2849,0,1,0}-{2463,2872,0,1,0}-{2470,2853,0,1,0}-{2477,2903,0,1,0}-{2478,2907,0,1,0}-{2487,2837,0,1,0}-{2501,2851,0,1,0}" }, { "npc_id": "7080", - "loc_data": "{2508,2853,0,0,0}-{2492,2893,0,0,0}-{2483,2876,0,0,0}-{2456,2868,0,0,0}-{2459,2836,0,0,0}-{2514,2851,0,0,0}-{2506,2852,0,0,0}-{2487,2877,0,0,0}-{2486,2860,0,0,0}-{2458,2866,0,0,0}-{2416,2856,0,0,0}-{2495,2884,0,0,0}" + "loc_data": "{2456,2867,0,1,0}-{2457,2836,0,1,0}-{2480,2916,0,1,0}-{2484,2873,0,1,0}-{2487,2856,0,1,0}-{2492,2888,0,1,0}-{2508,2853,0,1,0}-{2562,5530,0,0,6}" }, { "npc_id": "7081", - "loc_data": "{2499,2860,0,0,0}-{2485,2892,0,0,0}-{2451,2870,0,0,0}-{2466,2864,0,0,0}-{2449,2826,0,0,0}-{2487,2842,0,0,0}-{2497,2863,0,0,0}-{2489,2843,0,0,0}-{2471,2860,0,0,0}-{2448,2870,0,0,0}-{2478,2888,0,0,0}-{2485,2922,0,0,0}" + "loc_data": "{2446,2869,0,1,0}-{2451,2828,0,1,0}-{2467,2860,0,1,0}-{2480,2892,0,1,0}-{2484,2917,0,1,0}-{2487,2844,0,1,0}-{2499,2860,0,1,0}" }, { "npc_id": "7082", - "loc_data": "{2516,2858,0,0,0}-{2493,2903,0,0,0}-{2485,2869,0,0,0}-{2484,2888,0,0,0}-{2444,2861,0,0,0}-{2457,2863,0,0,0}-{2474,2837,0,0,0}-{2521,2862,0,0,0}-{2483,2865,0,0,0}-{2474,2844,0,0,0}-{2460,2859,0,0,0}-{2492,2901,0,0,0}-{2486,2889,0,0,0}" + "loc_data": "{2440,2858,0,1,0}-{2459,2859,0,1,0}-{2471,2839,0,1,0}-{2482,2863,0,1,0}-{2483,2883,0,1,0}-{2491,2901,0,1,0}-{2516,2858,0,1,0}-{2569,5541,0,0,6}" }, { "npc_id": "7091", - "loc_data": "{2525,2852,0,0,0}-{2529,2844,0,0,0}" + "loc_data": "{2609,2863,0,0,0}" }, { "npc_id": "7092", - "loc_data": "{2526,2854,0,0,0}-{2528,2850,0,0,0}" + "loc_data": "{2610,2865,0,0,0}" }, { "npc_id": "7093", - "loc_data": "{2527,2853,0,0,0}-{2528,2849,0,0,0}" + "loc_data": "{2611,2862,0,0,0}" }, { "npc_id": "7094", - "loc_data": "{2527,2851,0,0,0}-{2523,2850,0,0,0}" + "loc_data": "{2611,2864,0,0,0}" }, { "npc_id": "7095", @@ -10338,15 +10554,15 @@ }, { "npc_id": "7099", - "loc_data": "{2585,2844,0,0,0}-{2581,2845,0,0,0}" + "loc_data": "{2585,2844,0,1,3}" }, { "npc_id": "7100", - "loc_data": "{2586,2840,0,0,0}-{2587,2841,0,0,0}" + "loc_data": "{2586,2840,0,0,4}" }, { "npc_id": "7101", - "loc_data": "{2585,2842,0,0,0}" + "loc_data": "{2585,2842,0,1,1}" }, { "npc_id": "7102", @@ -10358,7 +10574,7 @@ }, { "npc_id": "7104", - "loc_data": "{2549,2852,0,0,0}-{2547,2856,0,0,0}" + "loc_data": "{2549,2852,0,1,4}-{2603,5529,0,0,4}" }, { "npc_id": "7105", diff --git a/Server/src/main/content/region/desert/ullek/handlers/UllekListeners.kt b/Server/src/main/content/region/desert/ullek/handlers/UllekListeners.kt new file mode 100644 index 000000000..b654b8b27 --- /dev/null +++ b/Server/src/main/content/region/desert/ullek/handlers/UllekListeners.kt @@ -0,0 +1,27 @@ +package content.region.desert.ullek.handlers + +import core.game.interaction.IntType +import core.game.interaction.InteractionListener +import core.game.world.map.Location +import org.rs09.consts.Scenery + +class UllekListeners : InteractionListener { + override fun defineListeners() { + on(Scenery.STAIRS_DOWN_28481, IntType.SCENERY, "enter") { player, _ -> + player.properties.teleportLocation = Location.create(3448, 9252, 1) + return@on true + } + on(Scenery.EXIT_28401, IntType.SCENERY, "leave through") { player, _ -> + player.properties.teleportLocation = Location.create(3412, 2848, 1) + return@on true + } + on(Scenery.FALLEN_PILLAR_28516, IntType.SCENERY, "climb") { player, _ -> + player.properties.teleportLocation = Location.create(3419, 2801, 0) + return@on true + } + on(Scenery.FALLEN_PILLAR_28515, IntType.SCENERY, "climb") { player, _ -> + player.properties.teleportLocation = Location.create(3419, 2803, 1) + return@on true + } + } +} \ No newline at end of file