From d15b47fc656cfb4287a669454c1c9cf5411d24d2 Mon Sep 17 00:00:00 2001 From: Player Name Date: Sat, 3 Aug 2024 08:00:35 +0000 Subject: [PATCH] Rewrote the music system to use regions --- Server/data/configs/music_configs.json | 1640 ----------- Server/data/configs/music_regions.json | 2530 +++++++++++++++++ Server/data/configs/music_tiles.json | 62 + .../game/system/config/MusicConfigLoader.kt | 33 +- .../src/main/core/game/world/map/Region.java | 50 +- .../core/game/world/map/zone/ZoneMonitor.java | 26 +- 6 files changed, 2664 insertions(+), 1677 deletions(-) delete mode 100644 Server/data/configs/music_configs.json create mode 100644 Server/data/configs/music_regions.json create mode 100644 Server/data/configs/music_tiles.json diff --git a/Server/data/configs/music_configs.json b/Server/data/configs/music_configs.json deleted file mode 100644 index ba4a924e6..000000000 --- a/Server/data/configs/music_configs.json +++ /dev/null @@ -1,1640 +0,0 @@ -[ - { - "id": "1", - "borders": "{2112,4544,2175,4607}" - }, - { - "id": "2", - "borders": "{3200,3264,3263,3327}" - }, - { - "id": "3", - "borders": "{3072,3200,3135,3263}" - }, - { - "id": "4", - "borders": "{2752,3712,2815,3775}" - }, - { - "id": "5", - "borders": "{2496,3264,2559,3327}-{2752,4672,2815,4735}" - }, - { - "id": "6", - "borders": "{2752,3200,2815,3263}" - }, - { - "id": "7", - "borders": "{2688,3456,2751,3519}" - }, - { - "id": "8", - "borders": "{3072,3584,3135,3647}" - }, - { - "id": "9", - "borders": "{2816,3520,2879,3583}" - }, - { - "id": "10", - "borders": "{3136,3584,3199,3647}-{2368,3264,2431,3327}" - }, - { - "id": "11", - "borders": "{3392,9600,3455,9663}" - }, - { - "id": "12", - "borders": "{2944,3200,3007,3263}" - }, - { - "id": "13", - "borders": "{3072,3904,3135,3967}-{2496,4672,2559,4735}" - }, - { - "id": "14", - "borders": "{3264,3648,3327,3711}" - }, - { - "id": "15", - "borders": "{3008,3328,3071,3391}" - }, - { - "id": "17", - "borders": "{2688,9664,2751,9727}" - }, - { - "id": "18", - "borders": "{2880,3392,2943,3455}" - }, - { - "id": "19", - "borders": "{2816,9792,2879,9855}" - }, - { - "id": "20", - "borders": "{3328,3392,3391,3455}-{2624,3520,2687,3583}" - }, - { - "id": "21", - "borders": "{2688,3520,2751,3583}" - }, - { - "id": "22", - "borders": "{2432,3456,2495,3519}" - }, - { - "id": "24", - "borders": "{2496,3200,2559,3263}" - }, - { - "id": "25", - "borders": "{2816,9600,2879,9663}" - }, - { - "id": "26", - "borders": "{3008,10240,3071,10303}" - }, - { - "id": "27", - "borders": "{2560,3136,2623,3199}-{2560,9536,2623,9599}" - }, - { - "id": "28", - "borders": "{2240,4672,2303,4735}" - }, - { - "id": "29", - "borders": "{2560,9408,2623,9471}" - }, - { - "id": "30", - "borders": "{2368,4672,2431,4735}-{2880,9280,2943,9343}" - }, - { - "id": "32", - "borders": "{2496,3456,2559,3519}" - }, - { - "id": "33", - "borders": "{2432,3392,2495,3455}" - }, - { - "id": "34", - "borders": "{2944,3520,3007,3583}" - }, - { - "id": "35", - "borders": "{3008,3200,3071,3263}" - }, - { - "id": "36", - "borders": "{3264,3200,3327,3263}-{3392,3136,3455,3199}" - }, - { - "id": "37", - "borders": "{2944,3776,3007,3839}" - }, - { - "id": "38", - "borders": "{1856,4800,1919,4863}" - }, - { - "id": "41", - "borders": "{2432,3200,2495,3263}-{2432,9600,2495,9663}" - }, - { - "id": "42", - "borders": "{3008,3776,3071,3839}" - }, - { - "id": "43", - "borders": "{2944,3712,3007,3775}" - }, - { - "id": "45", - "borders": "{3328,9728,3391,9855}" - }, - { - "id": "46", - "borders": "{3200,9600,3263,9663}" - }, - { - "id": "47", - "borders": "{3328,3200,3391,3263}" - }, - { - "id": "48", - "borders": "{3392,3456,3455,3519}" - }, - { - "id": "49", - "borders": "{3008,3264,3071,3327}" - }, - { - "id": "50", - "borders": "{3264,3136,3327,3199}-{3328,3136,3391,3199}" - }, - { - "id": "51", - "borders": "{1920,4800,1983,4863}" - }, - { - "id": "52", - "borders": "{2944,3904,3007,3967}-{2944,10240,3007,10303}-{2816,4800,2879,4863}" - }, - { - "id": "53", - "borders": "{2880,9664,2943,9727}" - }, - { - "id": "54", - "borders": "{2944,3392,3007,3455}" - }, - { - "id": "55", - "borders": "{2752,3136,2815,3199}" - }, - { - "id": "56", - "borders": "{3136,3520,3199,3583}" - }, - { - "id": "57", - "borders": "{2880,4800,2943,4863}" - }, - { - "id": "58", - "borders": "{2752,3072,2815,3135}" - }, - { - "id": "59", - "borders": "{2368,9664,2431,9727}" - }, - { - "id": "60", - "borders": "{2624,3392,2687,3455}" - }, - { - "id": "61", - "borders": "{3456,3456,3519,3519}" - }, - { - "id": "62", - "borders": "{3052,3055,3155,3135}" - }, - { - "id": "63", - "borders": "{2624,9728,2687,9914}-{2688,9792,2751,9855}" - }, - { - "id": "64", - "borders": "{3136,3136,3199,3199}" - }, - { - "id": "65", - "borders": "{2752,4800,2815,4863}" - }, - { - "id": "66", - "borders": "{3008,3648,3071,3711}-{2496,3520,2559,3583}" - }, - { - "id": "67", - "borders": "{3136,3712,3199,3775}-{1536,5760,1599,5823}" - }, - { - "id": "68", - "borders": "{3008,10304,3071,10367}-{2560,9472,2623,9535}" - }, - { - "id": "69", - "borders": "{3264,3072,3327,3135}" - }, - { - "id": "70", - "borders": "{2624,3200,2687,3263}" - }, - { - "id": "71", - "borders": "{2624,2944,2687,3007}-{2624,9344,2687,9407}" - }, - { - "id": "72", - "borders": "{2944,3328,3007,3391}" - }, - { - "id": "73", - "borders": "" - }, - { - "id": "74", - "borders": "{2752,3392,2815,3455}" - }, - { - "id": "75", - "borders": "{3328,3328,3391,3391}" - }, - { - "id": "76", - "borders": "{3200,3200,3263,3263}" - }, - { - "id": "77", - "borders": "{2880,3456,2943,3519}" - }, - { - "id": "78", - "borders": "{2880,2880,2943,2943}" - }, - { - "id": "79", - "borders": "{3136,3008,3199,3071}" - }, - { - "id": "80", - "borders": "{2432,2944,2495,3007}" - }, - { - "id": "81", - "borders": "{2624,3328,2687,3391}" - }, - { - "id": "82", - "borders": "{2496,3392,2559,3455}-{2496,9792,2559,9855}" - }, - { - "id": "83", - "borders": "{2496,3072,2559,3135}" - }, - { - "id": "84", - "borders": "{3392,3392,3455,3455}-{2304,4992,2367,5055}" - }, - { - "id": "85", - "borders": "{3072,3136,3135,3199}-{3072,9472,3135,9535}" - }, - { - "id": "87", - "borders": "{2816,3456,2879,3519}" - }, - { - "id": "88", - "borders": "{2688,9856,2751,9919}" - }, - { - "id": "89", - "borders": "{2880,3008,2943,3071}" - }, - { - "id": "90", - "borders": "{2816,2944,2879,3007}" - }, - { - "id": "91", - "borders": "{2688,3264,2751,3327}-{2112,3072,2175,3135}" - }, - { - "id": "92", - "borders": "{2880,3136,2943,3199}" - }, - { - "id": "93", - "borders": "{3264,3456,3327,3519}" - }, - { - "id": "94", - "borders": "{2880,2944,2943,3007}" - }, - { - "id": "95", - "borders": "{2304,9792,2367,9855}" - }, - { - "id": "96", - "borders": "{3008,3520,3071,3583}" - }, - { - "id": "97", - "borders": "{2240,4736,2303,4799}" - }, - { - "id": "98", - "borders": "{3072,3456,3135,3519}-{3072,9856,3135,9919}" - }, - { - "id": "99", - "borders": "{2624,3264,2687,3327}" - }, - { - "id": "100", - "borders": "{2816,9856,2879,9919}-{2816,9920,2879,9983}" - }, - { - "id": "101", - "borders": "{2304,3392,2367,3455}" - }, - { - "id": "102", - "borders": "{3008,3456,3071,3519}-{2496,9600,2559,9663}" - }, - { - "id": "103", - "borders": "{2880,9344,2943,9407}" - }, - { - "id": "104", - "borders": "{2752,3456,2815,3519}" - }, - { - "id": "105", - "borders": "{3008,3136,3071,3199}" - }, - { - "id": "106", - "borders": "{3136,3904,3199,3967}-{3200,3328,3263,3391}-{3200,9728,3263,9791}" - }, - { - "id": "107", - "borders": "{2880,3264,2943,3327}-{2624,4672,2687,4735}" - }, - { - "id": "108", - "borders": "{2944,9536,3007,9599}-{3200,9536,3263,9599}" - }, - { - "id": "109", - "borders": "{2560,3456,2623,3519}-{2496,9856,2559,9919}" - }, - { - "id": "110", - "borders": "{2368,3136,2431,3199}" - }, - { - "id": "111", - "borders": "{3264,3328,3327,3391}" - }, - { - "id": "112", - "borders": "{2304,3456,2367,3519}" - }, - { - "id": "113", - "borders": "{3072,3520,3135,3583}" - }, - { - "id": "114", - "borders": "{2752,2944,2815,3007}-{2752,9344,2815,9407}" - }, - { - "id": "115", - "borders": "{2688,3200,2751,3263}" - }, - { - "id": "116", - "borders": "{3136,3328,3199,3391}" - }, - { - "id": "117", - "borders": "{2752,3008,2815,3071}" - }, - { - "id": "118", - "borders": "{2370,2397,2431,4479}" - }, - { - "id": "119", - "borders": "{2816,3392,2879,3455}" - }, - { - "id": "120", - "borders": "{3200,3712,3263,3775}" - }, - { - "id": "121", - "borders": "{3264,3520,3327,3583}" - }, - { - "id": "122", - "borders": "{3328,3264,3391,3327}" - }, - { - "id": "123", - "borders": "{3264,3264,3327,3327}" - }, - { - "id": "124", - "borders": "{3200,3072,3263,3135}" - }, - { - "id": "125", - "borders": "{3200,3392,3263,3455}" - }, - { - "id": "127", - "borders": "{3200,3904,3263,3967}-{2944,3264,3007,3327}" - }, - { - "id": "128", - "borders": "{2560,2944,2623,3007}" - }, - { - "id": "129", - "borders": "{2752,2880,2815,2943}-{2880,9472,2943,9535}" - }, - { - "id": "130", - "borders": "{2304,3328,2367,3391}" - }, - { - "id": "131", - "borders": "{2368,4800,2431,4863}" - }, - { - "id": "132", - "borders": "{2240,3200,2303,3263}" - }, - { - "id": "133", - "borders": "{2560,3328,2623,3391}-{2496,9728,2559,9791}" - }, - { - "id": "134", - "borders": "{2176,4800,2239,4863}" - }, - { - "id": "138", - "borders": "{2880,3200,2943,3263}-{2880,9600,2943,9663}" - }, - { - "id": "140", - "borders": "{2624,3456,2687,3519}" - }, - { - "id": "141", - "borders": "{3072,3392,3135,3455}-{3072,9792,3135,9855}" - }, - { - "id": "142", - "borders": "{2240,4800,2303,4863}" - }, - { - "id": "143", - "borders": "{2624,4800,2687,4863}" - }, - { - "id": "144", - "borders": "{3136,9856,3199,9919}-{3072,9536,3135,9599}" - }, - { - "id": "145", - "borders": "{3200,3136,3263,3199}" - }, - { - "id": "146", - "borders": "{3459,4808,5919,4863}" - }, - { - "id": "148", - "borders": "{2496,3136,2559,3199}-{2560,4416,2623,4479}-{2496,9536,2559,9599}" - }, - { - "id": "149", - "borders": "{2880,3520,2943,3583}" - }, - { - "id": "151", - "borders": "{3072,3264,3135,3327}" - }, - { - "id": "152", - "borders": "{2560,3200,2623,3263}" - }, - { - "id": "153", - "borders": "{2880,9984,2943,10047}" - }, - { - "id": "154", - "borders": "{3392,3264,3455,3327}" - }, - { - "id": "155", - "borders": "{2432,3328,2495,3391}" - }, - { - "id": "156", - "borders": "{3392,9856,3455,9919}" - }, - { - "id": "157", - "borders": "{3264,3392,3327,3455}" - }, - { - "id": "158", - "borders": "{2560,4800,2623,4863}" - }, - { - "id": "159", - "borders": "{3008,3712,3071,3775}-{2496,3008,2559,3071}-{2496,9408,2559,9471}" - }, - { - "id": "160", - "borders": "{3008,3584,3071,3647}" - }, - { - "id": "161", - "borders": "{2624,3072,2687,3135}" - }, - { - "id": "162", - "borders": "{2816,3072,2879,3135}-{2816,9472,2879,9535}" - }, - { - "id": "163", - "borders": "{3136,3264,3199,3327}" - }, - { - "id": "164", - "borders": "{2688,3136,2751,3199}" - }, - { - "id": "165", - "borders": "{2816,3008,2879,3071}" - }, - { - "id": "166", - "borders": "{2944,3008,3007,3071}" - }, - { - "id": "167", - "borders": "{2624,3136,2687,3199}" - }, - { - "id": "168", - "borders": "{3264,9408,3327,9471}" - }, - { - "id": "169", - "borders": "{3200,3520,3263,3583}-{2624,9664,2687,9727}" - }, - { - "id": "170", - "borders": "{2816,3200,2879,3263}" - }, - { - "id": "172", - "borders": "{2816,3136,2879,3199}-{2816,2880,2879,2943}" - }, - { - "id": "173", - "borders": "{2880,9728,2943,9791}" - }, - { - "id": "174", - "borders": "{3264,2944,3327,3007}-{3328,3008,3391,3071}" - }, - { - "id": "175", - "borders": "{3136,3392,3199,3455}" - }, - { - "id": "176", - "borders": "{3072,3648,3135,3711}" - }, - { - "id": "177", - "borders": "{3200,3456,3263,3519}" - }, - { - "id": "178", - "borders": "{2880,9792,2943,9855}" - }, - { - "id": "179", - "borders": "{3328,3584,3391,3647}-{2816,9728,2879,9791}" - }, - { - "id": "180", - "borders": "{2944,3136,3007,3199}" - }, - { - "id": "181", - "borders": "{2432,2397,2495,4479}" - }, - { - "id": "182", - "borders": "{3264,3776,3327,3839}-{3264,3712,3327,3775}" - }, - { - "id": "183", - "borders": "{2944,3648,3007,3711}" - }, - { - "id": "184", - "borders": "{2688,3392,2751,3455}" - }, - { - "id": "185", - "borders": "{2560,3072,2623,3135}" - }, - { - "id": "186", - "borders": "{2880,3328,2943,3391}" - }, - { - "id": "187", - "borders": "{2816,3584,2879,3647}" - }, - { - "id": "188", - "borders": "{2560,3008,2623,3071}" - }, - { - "id": "190", - "borders": "{2496,4800,2559,4863}" - }, - { - "id": "191", - "borders": "{2560,3264,2623,3327}" - }, - { - "id": "192", - "borders": "{2688,3328,2751,3391}-{2688,9728,2751,9791}" - }, - { - "id": "193", - "borders": "{2560,3392,2623,3455}" - }, - { - "id": "198", - "borders": "{1792,4352,1855,4415}-{1920,4352,1983,4415}" - }, - { - "id": "220", - "borders": "{2304,3842,2428,3901}" - }, - { - "id": "241", - "borders": "{3456,3328,3519,3391}-{2176,4992,2239,5055}" - }, - { - "id": "242", - "borders": "{2880,4544,2943,4607}" - }, - { - "id": "243", - "borders": "{2112,4800,2175,4863}" - }, - { - "id": "244", - "borders": "{3456,3392,3519,3455}-{1984,4992,2047,5055}" - }, - { - "id": "245", - "borders": "{3392,3328,3455,3391}-{2240,4992,2303,5055}" - }, - { - "id": "246", - "borders": "{3392,9728,3455,9791}" - }, - { - "id": "247", - "borders": "{1984,4736,2047,4799}" - }, - { - "id": "248", - "borders": "{2752,9536,2815,9599}" - }, - { - "id": "251", - "borders": "{2240,3136,2303,3199}" - }, - { - "id": "252", - "borders": "{2304,3200,2367,3263}" - }, - { - "id": "253", - "borders": "{2240,3072,2303,3135}" - }, - { - "id": "254", - "borders": "{2112,3136,2175,3199}" - }, - { - "id": "255", - "borders": "{2112,3200,2175,3263}" - }, - { - "id": "256", - "borders": "{2304,3264,2367,3327}" - }, - { - "id": "257", - "borders": "{2816,3648,2879,3711}" - }, - { - "id": "258", - "borders": "{2880,3584,2943,3647}" - }, - { - "id": "259", - "borders": "{2240,3264,2303,3327}" - }, - { - "id": "260", - "borders": "{3456,9472,3519,9535}" - }, - { - "id": "261", - "borders": "{2752,10112,2815,10175}-{2816,10048,2879,10111}" - }, - { - "id": "262", - "borders": "{2432,4800,2495,4863}" - }, - { - "id": "263", - "borders": "{3136,2944,3199,3007}" - }, - { - "id": "264", - "borders": "{2880,10048,2943,10111}" - }, - { - "id": "265", - "borders": "{2752,9280,2815,9343}" - }, - { - "id": "266", - "borders": "{3200,9344,3263,9407}" - }, - { - "id": "267", - "borders": "{3200,2944,3263,3007}-{3328,2880,3391,2943}" - }, - { - "id": "268", - "borders": "{2112,3264,2175,3327}" - }, - { - "id": "269", - "borders": "{2176,4928,2239,4991}" - }, - { - "id": "270", - "borders": "{2176,3072,2239,3135}" - }, - { - "id": "271", - "borders": "{2304,9600,2367,9663}" - }, - { - "id": "272", - "borders": "{3145,5189,3187,5240}" - }, - { - "id": "273", - "borders": "" - }, - { - "id": "277", - "borders": "{2752,4416,2815,4479}" - }, - { - "id": "278", - "borders": "{2688,4544,2751,4607}-{2688,4480,2751,4543}" - }, - { - "id": "282", - "borders": "{2688,4416,2751,4479}-{2752,4480,2815,4543}" - }, - { - "id": "284", - "borders": "{2496,3840,2559,3903}" - }, - { - "id": "285", - "borders": "{2560,3840,2623,3903}" - }, - { - "id": "286", - "borders": "{3392,3200,3455,3263}-{3456,3264,3519,3327}-{2112,4992,2175,5055}" - }, - { - "id": "287", - "borders": "{3456,9664,3519,9727}" - }, - { - "id": "288", - "borders": "{3520,3456,3583,3519}" - }, - { - "id": "289", - "borders": "{2563,3647,2687,3776}" - }, - { - "id": "290", - "borders": "{2560,3584,2689,3647}" - }, - { - "id": "291", - "borders": "{2688,3648,2751,3776}" - }, - { - "id": "292", - "borders": "{2816,3712,2879,3775}-{2880,3712,2943,3775}" - }, - { - "id": "293", - "borders": "{2688,3584,2751,3647}" - }, - { - "id": "294", - "borders": "{2816,3776,2879,3839}" - }, - { - "id": "295", - "borders": "{2624,10048,2687,10111}" - }, - { - "id": "296", - "borders": "{2560,4480,2623,4543}" - }, - { - "id": "303", - "borders": "{2752,2752,2815,2815}" - }, - { - "id": "304", - "borders": "{2880,2688,2943,2751}-{3008,5440,3071,5503}" - }, - { - "id": "305", - "borders": "{2688,2752,2751,2815}" - }, - { - "id": "306", - "borders": "{2688,2688,2751,2751}" - }, - { - "id": "307", - "borders": "{2752,9152,2815,9215}" - }, - { - "id": "311", - "borders": "{2688,9152,2751,9215}" - }, - { - "id": "312", - "borders": "{2688,9088,2751,9151}" - }, - { - "id": "314", - "borders": "{2368,3072,2431,3135}" - }, - { - "id": "316", - "borders": "{2624,9984,2687,10047}" - }, - { - "id": "317", - "borders": "{2432,3072,2495,3135}" - }, - { - "id": "318", - "borders": "{2368,9472,2431,9535}" - }, - { - "id": "319", - "borders": "{3456,9792,3519,9855}" - }, - { - "id": "320", - "borders": "{2496,3584,2559,3647}" - }, - { - "id": "322", - "borders": "{2496,9984,2559,10047}" - }, - { - "id": "323", - "borders": "{2368,9536,2431,9599}" - }, - { - "id": "324", - "borders": "{2752,3328,2815,3391}-{1920,4992,1983,5055}" - }, - { - "id": "325", - "borders": "{3008,9728,3071,9791}-{2944,9792,3007,9855}" - }, - { - "id": "326", - "borders": "{3328,3648,3391,3711}" - }, - { - "id": "327", - "borders": "{3136,3200,3199,3263}" - }, - { - "id": "328", - "borders": "{2496,3328,2559,3391}" - }, - { - "id": "329", - "borders": "{3264,3904,3327,3967}" - }, - { - "id": "330", - "borders": "{3136,9792,3199,9855}" - }, - { - "id": "331", - "borders": "{3264,3840,3327,3903}" - }, - { - "id": "332", - "borders": "{3200,3648,3263,3711}-{3136,3840,3199,3903}" - }, - { - "id": "333", - "borders": "{3072,3328,3135,3391}" - }, - { - "id": "334", - "borders": "{3008,3904,3071,3967}" - }, - { - "id": "335", - "borders": "{2752,3840,2815,3903}" - }, - { - "id": "336", - "borders": "{2816,9536,2879,9599}" - }, - { - "id": "337", - "borders": "{3200,3584,3263,3647}" - }, - { - "id": "338", - "borders": "{3072,9728,3135,9791}" - }, - { - "id": "339", - "borders": "{3392,3520,3455,3583}" - }, - { - "id": "340", - "borders": "{2688,9984,2751,10047}" - }, - { - "id": "341", - "borders": "{2752,9984,2815,10047}" - }, - { - "id": "342", - "borders": "{3456,9920,3519,9983}" - }, - { - "id": "343", - "borders": "{3136,9600,3199,9663}" - }, - { - "id": "344", - "borders": "{3456,3520,3519,3583}" - }, - { - "id": "345", - "borders": "{3520,9856,3583,9919}" - }, - { - "id": "346", - "borders": "{2560,9792,2623,9855}" - }, - { - "id": "347", - "borders": "{2752,3264,2815,3327}" - }, - { - "id": "348", - "borders": "{2432,9856,2495,9919}" - }, - { - "id": "351", - "borders": "{3328,2944,3391,3007}" - }, - { - "id": "352", - "borders": "{3136,2880,3199,2943}" - }, - { - "id": "353", - "borders": "{3584,3520,3647,3583}" - }, - { - "id": "354", - "borders": "{3648,9856,3711,9919}" - }, - { - "id": "355", - "borders": "{3648,3456,3711,3519}" - }, - { - "id": "356", - "borders": "{2752,3648,2815,3711}" - }, - { - "id": "357", - "borders": "{2752,10048,2815,10111}" - }, - { - "id": "358", - "borders": "{3776,3520,3839,3583}" - }, - { - "id": "359", - "borders": "{3200,9280,3263,9343}" - }, - { - "id": "361", - "borders": "{3072,9600,3135,9663}" - }, - { - "id": "362", - "borders": "{2688,9472,2751,9535}-{2688,9408,2751,9471}" - }, - { - "id": "363", - "name": "7th Realm", - "indexId": "285", - "borders": "{2624,9536,2687,9599}-{2624,9472,2687,9535}" - }, - { - "id": "364", - "borders": "{2688,9536,2751,9599}" - }, - { - "id": "369", - "borders": "{2816,10112,2879,10175}" - }, - { - "id": "370", - "borders": "{2496,4928,2559,4991}" - }, - { - "id": "372", - "borders": "{2304,3136,2367,3199}" - }, - { - "id": "373", - "borders": "{2304,4928,2367,4991}" - }, - { - "id": "375", - "borders": "{1920,4608,1983,4671}" - }, - { - "id": "376", - "borders": "{1856,4608,1919,4671}" - }, - { - "id": "377", - "borders": "{3392,3072,3455,3135}-{3456,3072,3519,3135}" - }, - { - "id": "380", - "borders": "{3520,3264,3583,3327}" - }, - { - "id": "381", - "borders": "{3520,9664,3583,9727}" - }, - { - "id": "383", - "borders": "{3200,2752,3263,2815}-{3264,2752,3327,2815}" - }, - { - "id": "386", - "borders": "{2820,5312,2849,5369}-{2849,5349,2880,5374}" - }, - { - "id": "387", - "borders": "{3264,2816,3327,2879}" - }, - { - "id": "388", - "borders": "{3264,9152,3327,9215}" - }, - { - "id": "389", - "borders": "{3136,9536,3199,9599}" - }, - { - "id": "390", - "borders": "{2304,3008,2367,3071}" - }, - { - "id": "391", - "borders": "{2879,5340,2944,5366}-{2909,5316,2944,5340}" - }, - { - "id": "392", - "borders": "{2432,3008,2495,3071}" - }, - { - "id": "393", - "borders": "{2624,5056,2687,5119}" - }, - { - "id": "394", - "borders": "{2432,9408,2495,9471}" - }, - { - "id": "395", - "borders": "{2880,10112,2943,10175}" - }, - { - "id": "396", - "borders": "{2816,10176,2879,10239}" - }, - { - "id": "397", - "borders": "{3200,9472,3263,9535}" - }, - { - "id": "399", - "borders": "{2816,5248,2943,5375,[2823,5250,2844,5310]~,[2844,5250,2878,5280]~,[2879,5340,2944,5366]~,[2909,5316,2944,5340]~,[2820,5312,2849,5369]~,[2849,5349,2880,5374]~,[2885,5253,2934,5278]~,[2913,5278,2937,5306]}" - }, - { - "id": "401", - "borders": "" - }, - { - "id": "402", - "borders": "{2944,4928,3071,4991}" - }, - { - "id": "403", - "borders": "{3008,5056,3071,5119}" - }, - { - "id": "404", - "borders": "{2823,5250,2844,5310}-{2844,5250,2878,5276}" - }, - { - "id": "407", - "borders": "{3264,9600,3327,9663}" - }, - { - "id": "408", - "borders": "{2885,5253,2934,5278}-{2913,5278,2937,5306}" - }, - { - "id": "409", - "borders": "{2432,4736,2495,4799}" - }, - { - "id": "411", - "borders": "{3403,4761,3442,4792}" - }, - { - "id": "412", - "borders": "{3008,4800,3071,4863}--{3011,4866,3066,4925}" - }, - { - "id": "413", - "borders": "{1920,4736,1983,4799}" - }, - { - "id": "418", - "borders": "{3136,4800,3199,4863}" - }, - { - "id": "419", - "borders": "{2560,4736,2623,4799}" - }, - { - "id": "425", - "borders": "{2432,4928,2495,4991}" - }, - { - "id": "428", - "borders": "{3264,4800,3327,4863}" - }, - { - "id": "432", - "borders": "{1600,4800,1663,4863}-{1664,4800,1727,4863}" - }, - { - "id": "434", - "borders": "{1920,4928,1983,4991}" - }, - { - "id": "435", - "borders": "{2944,3584,3007,3647}-{3072,3712,3135,3775}" - }, - { - "id": "442", - "borders": "" - }, - { - "id": "443", - "borders": "{2944,5632,3135,5823}" - }, - { - "id": "444", - "borders": "{2688,5632,2879,5823}" - }, - { - "id": "445", - "borders": "{3200,5632,3391,5823}" - }, - { - "id": "447", - "borders": "{3392,2880,3455,2943}" - }, - { - "id": "448", - "borders": "{2432,10112,2495,10175}" - }, - { - "id": "454", - "borders": "" - }, - { - "id": "456", - "borders": "{2202,5339,2212,5351}-{2328,10006,2338,10017}-{3436,9743,3446,9752}" - }, - { - "id": "461", - "borders": "{2496,3712,2559,3775}" - }, - { - "id": "462", - "borders": "{3328,9536,3391,9599}" - }, - { - "id": "463", - "borders": "{2368,5120,2431,5183}" - }, - { - "id": "464", - "borders": "{3328,9280,3391,9343}" - }, - { - "id": "465", - "borders": "{3392,2944,3455,3007}" - }, - { - "id": "469", - "borders": "{2432,5120,2495,5183}" - }, - { - "id": "471", - "borders": "{3648,9920,3711,9983}" - }, - { - "id": "473", - "borders": "{2368,5056,2431,5119}" - }, - { - "id": "475", - "borders": "{3008,3840,3071,3903}" - }, - { - "id": "476", - "borders": "{3136,3648,3199,3711}" - }, - { - "id": "478", - "borders": "{2496,9664,2559,9727}" - }, - { - "id": "479", - "borders": "{2880,3072,2943,3135}" - }, - { - "id": "481", - "borders": "{2624,9600,2687,9663}" - }, - { - "id": "482", - "borders": "{2880,5056,2943,5119}" - }, - { - "id": "489", - "borders": "{1920,4672,1983,4735}" - }, - { - "id": "490", - "borders": "{2944,9600,3007,9663}" - }, - { - "id": "491", - "borders": "{2816,5056,2879,5119}" - }, - { - "id": "496", - "borders": "{3136,3456,3199,3519}" - }, - { - "id": "497", - "borders": "{2112,5056,2175,5119}" - }, - { - "id": "498", - "borders": "{2112,5120,2175,5183}" - }, - { - "id": "500", - "borders": "" - }, - { - "id": "501", - "borders": "{3456,3136,3519,3199}" - }, - { - "id": "505", - "borders": "{3328,2816,3391,2879}-{3008,4672,3071,4735}" - }, - { - "id": "511", - "borders": "{2048,4416,2111,4479}" - }, - { - "id": "515", - "borders": "{2944,3072,3007,3135}" - }, - { - "id": "517", - "borders": "{2496,10112,2559,10175}" - }, - { - "id": "526", - "borders": "" - }, - { - "id": "524", - "borders": "{1856,4352,1919,4415}-{2880,4416,2943,4479}" - }, - { - "id": "528", - "borders": "{3136,9728,3199,9791}" - }, - { - "id": "529", - "borders": "{3008,9536,3071,9599}" - }, - { - "id": "530", - "borders": "{3648,2944,3711,3007}" - }, - { - "id": "532", - "borders": "{1984,4416,2047,4479}" - }, - { - "id": "537", - "borders": "{1856,5185,1917,5246}" - }, - { - "id": "542", - "borders": "{3072,9280,3135,9343}" - }, - { - "id": "544", - "borders": "{2304,3648,2367,3711}-{2304,3584,2367,3647}" - }, - { - "id": "555", - "borders": "" - }, - { - "id": "558", - "borders": "{1985,5185,2047,5247}" - }, - { - "id": "559", - "borders": "{2116,5247,2172,5308}" - }, - { - "id": "560", - "borders": "{2305,5186,2366,5247}" - }, - { - "id": "569", - "borders": "{3200,9984,3263,10047}" - }, - { - "id": "571", - "borders": "" - }, - { - "id": "573", - "borders": "{1728,5120,1791,5247}" - }, - { - "id": "575", - "borders": "{2432,4352,2495,4415}" - }, - { - "id": "576", - "borders": "{2944,9472,3007,9535}" - }, - { - "id": "583", - "borders": "{1856,5312,1919,5375}" - }, - { - "id": "586", - "borders": "{3328,3904,3391,3967}" - }, - { - "id": "587", - "borders": "{2624,2624,2687,2687}" - }, - { - "id": "588", - "borders": "{2624,2560,2687,2623}" - }, - { - "id": "594", - "borders": "{3264,9792,3297,9824}" - }, - { - "id": "603", - "borders": "{2432,5248,2495,5311}" - }, - { - "id": "604", - "borders": "" - }, - { - "id": "612", - "borders": "{1856,5120,1919,5183}" - }, - { - "id": "616", - "borders": "" - }, - { - "id": "634", - "borders": "" - }, - { - "id": "964", - "borders": "{2944,9856,3007,9919}" - }, - { - "id": "222", - "borders": "{2403,10186,2409,10192}" - }, - { - "id": "223", - "borders": "{2404,3797,2421,3820}" - }, - { - "id": "225", - "borders": "{2304,3785,2635,3818}" - }, - { - "id": "584", - "borders": "{2580,5763,2620,5700}" - }, - { - "id": "589", - "borders": "{2500,5766,2620,5810}" - }, - { - "id": "487", - "borders": "{1600,4672,1663,4735}" - }, - { - "id": "578", - "borders": "" - }, - { - "id": "378", - "borders": "{2688,4864,2752,4928}" - }, - { - "id": "379", - "borders": "{3520,4928,3584,4992}" - }, - { - "id": "512", - "borders": "{2436,4876,2485,4918}" - }, - { - "id": "564", - "borders": "{2879,4371,3001,4397}" - }, - { - "id": "488", - "borders": "{3263,5441,3327,5564}--{141,22,171,43}" - }, - { - "id": "467", - "borders": "{3199,5441,3262,5564}--{3193,5482,3198,5497}" - }, - { - "id": "459", - "borders": "{3137,5442,3192,5564}--{3193,5442,3198,5472}--{3193,5507,3198,5564}" - }, - { - "id": "565", - "borders": "{3266,9825,3297,9854}" - }, - { - "id": "602", - "borders": "{3298,9826,3325,9853}" - }, - { - "id": "600", - "borders": "{3298,9793,3325,9825}" - }, - { - "id": "232", - "borders": "{2903,5463,2920,5480}" - }, - { - "id": "230", - "borders": "{2904,5481,2927,5497}" - }, - { - "id": "229", - "borders": "{2921,5456,2937,5479}" - }, - { - "id": "231", - "borders": "{2886,5464,2901,5487}" - }, - { - "id": "228", - "borders": "{2896,5446,2919,5462}" - }, - { - "id": "632", - "borders": "{3716,9349,3837,9469}" - }, - { - "id": "349", - "borders": "{2562,4290,2621,4349}" - }, - { - "id": "625", - "borders": "{2056,3844,2110,3960}" - }, - { - "id": "627", - "borders": "{2111,3844,2171,3960}" - }, - { - "id": "274", - "borders": "{2688,10117,2751,10175}" - } -] diff --git a/Server/data/configs/music_regions.json b/Server/data/configs/music_regions.json new file mode 100644 index 000000000..80dfcc0cb --- /dev/null +++ b/Server/data/configs/music_regions.json @@ -0,0 +1,2530 @@ +[ + { + "region": "6234", + "id": "67" + }, + { + "region": "6473", + "id": "487" + }, + { + "region": "6475", + "id": "432" + }, + { + "region": "6486", + "id": "588" + }, + { + "region": "6487", + "id": "503" + }, + { + "region": "6488", + "id": "507" + }, + { + "region": "6489", + "id": "507" + }, + { + "region": "6722", + "id": "74" + }, + { + "region": "6726", + "id": "205" + }, + { + "region": "6741", + "id": "561" + }, + { + "region": "6744", + "id": "507" + }, + { + "region": "6745", + "id": "507" + }, + { + "region": "6989", + "id": "309" + }, + { + "region": "6992", + "id": "573" + }, + { + "region": "6993", + "id": "573" + }, + { + "region": "6994", + "id": "367" + }, + { + "region": "7236", + "id": "198" + }, + { + "region": "7490", + "id": "374" + }, + { + "region": "7492", + "id": "524" + }, + { + "region": "7494", + "id": "470" + }, + { + "region": "7496", + "id": "376" + }, + { + "region": "7499", + "id": "38" + }, + { + "region": "7500", + "id": "203" + }, + { + "region": "7502", + "id": "371" + }, + { + "region": "7504", + "id": "612" + }, + { + "region": "7505", + "id": "537" + }, + { + "region": "7507", + "id": "583" + }, + { + "region": "7508", + "id": "211" + }, + { + "region": "7509", + "id": "604" + }, + { + "region": "7748", + "id": "198" + }, + { + "region": "7749", + "id": "591" + }, + { + "region": "7752", + "id": "375" + }, + { + "region": "7753", + "id": "489" + }, + { + "region": "7754", + "id": "413" + }, + { + "region": "7755", + "id": "51" + }, + { + "region": "7756", + "id": "620" + }, + { + "region": "7757", + "id": "434" + }, + { + "region": "7758", + "id": "324" + }, + { + "region": "7760", + "id": "202" + }, + { + "region": "7769", + "id": "578" + }, + { + "region": "8001", + "id": "426" + }, + { + "region": "8002", + "id": "426" + }, + { + "region": "8004", + "id": "579" + }, + { + "region": "8005", + "id": "532" + }, + { + "region": "8009", + "id": "271" + }, + { + "region": "8010", + "id": "247" + }, + { + "region": "8013", + "id": "620" + }, + { + "region": "8014", + "id": "244" + }, + { + "region": "8015", + "id": "640" + }, + { + "region": "8017", + "id": "558" + }, + { + "region": "8022", + "id": "421" + }, + { + "region": "8025", + "id": "595" + }, + { + "region": "8252", + "id": "625" + }, + { + "region": "8253", + "id": "625" + }, + { + "region": "8261", + "id": "511" + }, + { + "region": "8267", + "id": "126" + }, + { + "region": "8276", + "id": "303" + }, + { + "region": "8280", + "id": "527" + }, + { + "region": "8282", + "id": "592" + }, + { + "region": "8496", + "id": "91" + }, + { + "region": "8497", + "id": "254" + }, + { + "region": "8498", + "id": "255" + }, + { + "region": "8499", + "id": "268" + }, + { + "region": "8508", + "id": "627" + }, + { + "region": "8509", + "id": "627" + }, + { + "region": "8519", + "id": "1" + }, + { + "region": "8523", + "id": "243" + }, + { + "region": "8526", + "id": "286" + }, + { + "region": "8527", + "id": "497" + }, + { + "region": "8528", + "id": "498" + }, + { + "region": "8529", + "id": "559" + }, + { + "region": "8530", + "id": "559" + }, + { + "region": "8534", + "id": "23" + }, + { + "region": "8752", + "id": "270" + }, + { + "region": "8763", + "id": "630" + }, + { + "region": "8770", + "id": "433" + }, + { + "region": "8779", + "id": "134" + }, + { + "region": "8781", + "id": "269" + }, + { + "region": "8782", + "id": "241" + }, + { + "region": "8787", + "id": "456" + }, + { + "region": "9008", + "id": "253" + }, + { + "region": "9009", + "id": "251" + }, + { + "region": "9010", + "id": "132" + }, + { + "region": "9011", + "id": "259" + }, + { + "region": "9014", + "id": "366" + }, + { + "region": "9015", + "id": "460" + }, + { + "region": "9033", + "id": "28" + }, + { + "region": "9034", + "id": "97" + }, + { + "region": "9035", + "id": "142" + }, + { + "region": "9038", + "id": "245" + }, + { + "region": "9046", + "id": "150" + }, + { + "region": "9263", + "id": "390" + }, + { + "region": "9265", + "id": "372" + }, + { + "region": "9266", + "id": "252" + }, + { + "region": "9267", + "id": "256" + }, + { + "region": "9268", + "id": "130" + }, + { + "region": "9269", + "id": "101" + }, + { + "region": "9270", + "id": "112" + }, + { + "region": "9272", + "id": "544" + }, + { + "region": "9273", + "id": "544" + }, + { + "region": "9275", + "id": "225" + }, + { + "region": "9276", + "id": "220" + }, + { + "region": "9285", + "id": "73" + }, + { + "region": "9293", + "id": "373" + }, + { + "region": "9294", + "id": "84" + }, + { + "region": "9295", + "id": "201" + }, + { + "region": "9297", + "id": "560" + }, + { + "region": "9362", + "id": "153" + }, + { + "region": "9365", + "id": "271" + }, + { + "region": "9366", + "id": "271" + }, + { + "region": "9369", + "id": "95" + }, + { + "region": "9372", + "id": "456" + }, + { + "region": "9520", + "id": "314" + }, + { + "region": "9521", + "id": "110" + }, + { + "region": "9522", + "id": "41" + }, + { + "region": "9523", + "id": "10" + }, + { + "region": "9526", + "id": "112" + }, + { + "region": "9531", + "id": "223" + }, + { + "region": "9532", + "id": "220" + }, + { + "region": "9540", + "id": "118" + }, + { + "region": "9541", + "id": "118" + }, + { + "region": "9544", + "id": "197" + }, + { + "region": "9545", + "id": "30" + }, + { + "region": "9547", + "id": "131" + }, + { + "region": "9550", + "id": "84" + }, + { + "region": "9551", + "id": "473" + }, + { + "region": "9552", + "id": "463" + }, + { + "region": "9553", + "id": "531" + }, + { + "region": "9558", + "id": "276" + }, + { + "region": "9620", + "id": "318" + }, + { + "region": "9621", + "id": "323" + }, + { + "region": "9623", + "id": "59" + }, + { + "region": "9625", + "id": "194" + }, + { + "region": "9626", + "id": "296" + }, + { + "region": "9631", + "id": "222" + }, + { + "region": "9632", + "id": "224" + }, + { + "region": "9774", + "id": "80" + }, + { + "region": "9775", + "id": "392" + }, + { + "region": "9776", + "id": "317" + }, + { + "region": "9778", + "id": "41" + }, + { + "region": "9780", + "id": "155" + }, + { + "region": "9781", + "id": "33" + }, + { + "region": "9782", + "id": "22" + }, + { + "region": "9787", + "id": "225" + }, + { + "region": "9794", + "id": "439" + }, + { + "region": "9796", + "id": "575" + }, + { + "region": "9797", + "id": "181" + }, + { + "region": "9802", + "id": "409" + }, + { + "region": "9803", + "id": "262" + }, + { + "region": "9804", + "id": "512" + }, + { + "region": "9805", + "id": "425" + }, + { + "region": "9808", + "id": "469" + }, + { + "region": "9810", + "id": "603" + }, + { + "region": "9812", + "id": "279" + }, + { + "region": "9814", + "id": "275" + }, + { + "region": "9874", + "id": "394" + }, + { + "region": "9875", + "id": "394" + }, + { + "region": "9878", + "id": "41" + }, + { + "region": "9879", + "id": "59" + }, + { + "region": "9882", + "id": "348" + }, + { + "region": "9886", + "id": "448" + }, + { + "region": "10031", + "id": "159" + }, + { + "region": "10032", + "id": "83" + }, + { + "region": "10033", + "id": "148" + }, + { + "region": "10034", + "id": "24" + }, + { + "region": "10035", + "id": "5" + }, + { + "region": "10036", + "id": "328" + }, + { + "region": "10037", + "id": "82" + }, + { + "region": "10038", + "id": "32" + }, + { + "region": "10039", + "id": "66" + }, + { + "region": "10040", + "id": "320" + }, + { + "region": "10042", + "id": "461" + }, + { + "region": "10043", + "id": "225" + }, + { + "region": "10044", + "id": "284" + }, + { + "region": "10055", + "id": "129" + }, + { + "region": "10056", + "id": "322" + }, + { + "region": "10057", + "id": "13" + }, + { + "region": "10058", + "id": "411" + }, + { + "region": "10059", + "id": "190" + }, + { + "region": "10061", + "id": "370" + }, + { + "region": "10074", + "id": "589" + }, + { + "region": "10075", + "id": "589" + }, + { + "region": "10129", + "id": "453" + }, + { + "region": "10131", + "id": "159" + }, + { + "region": "10133", + "id": "148" + }, + { + "region": "10134", + "id": "102" + }, + { + "region": "10135", + "id": "478" + }, + { + "region": "10136", + "id": "133" + }, + { + "region": "10137", + "id": "82" + }, + { + "region": "10138", + "id": "109" + }, + { + "region": "10139", + "id": "66" + }, + { + "region": "10140", + "id": "322" + }, + { + "region": "10142", + "id": "517" + }, + { + "region": "10144", + "id": "506" + }, + { + "region": "10284", + "id": "474" + }, + { + "region": "10286", + "id": "128" + }, + { + "region": "10287", + "id": "188" + }, + { + "region": "10288", + "id": "185" + }, + { + "region": "10289", + "id": "27" + }, + { + "region": "10290", + "id": "152" + }, + { + "region": "10291", + "id": "191" + }, + { + "region": "10292", + "id": "133" + }, + { + "region": "10293", + "id": "193" + }, + { + "region": "10294", + "id": "109" + }, + { + "region": "10296", + "id": "290" + }, + { + "region": "10297", + "id": "289" + }, + { + "region": "10298", + "id": "289" + }, + { + "region": "10299", + "id": "225" + }, + { + "region": "10300", + "id": "285" + }, + { + "region": "10307", + "id": "349" + }, + { + "region": "10309", + "id": "148" + }, + { + "region": "10310", + "id": "296" + }, + { + "region": "10311", + "id": "308" + }, + { + "region": "10314", + "id": "419" + }, + { + "region": "10315", + "id": "158" + }, + { + "region": "10321", + "id": "638" + }, + { + "region": "10322", + "id": "66" + }, + { + "region": "10330", + "id": "589" + }, + { + "region": "10387", + "id": "29" + }, + { + "region": "10388", + "id": "68" + }, + { + "region": "10389", + "id": "27" + }, + { + "region": "10390", + "id": "102" + }, + { + "region": "10393", + "id": "346" + }, + { + "region": "10394", + "id": "109" + }, + { + "region": "10536", + "id": "588" + }, + { + "region": "10537", + "id": "587" + }, + { + "region": "10542", + "id": "71" + }, + { + "region": "10544", + "id": "161" + }, + { + "region": "10545", + "id": "167" + }, + { + "region": "10546", + "id": "70" + }, + { + "region": "10547", + "id": "99" + }, + { + "region": "10548", + "id": "81" + }, + { + "region": "10549", + "id": "60" + }, + { + "region": "10550", + "id": "140" + }, + { + "region": "10551", + "id": "20" + }, + { + "region": "10552", + "id": "290" + }, + { + "region": "10553", + "id": "289" + }, + { + "region": "10554", + "id": "289" + }, + { + "region": "10555", + "id": "225" + }, + { + "region": "10558", + "id": "217" + }, + { + "region": "10569", + "id": "107" + }, + { + "region": "10571", + "id": "143" + }, + { + "region": "10575", + "id": "393" + }, + { + "region": "10577", + "id": "568" + }, + { + "region": "10642", + "id": "71" + }, + { + "region": "10644", + "id": "363" + }, + { + "region": "10645", + "id": "363" + }, + { + "region": "10646", + "id": "481" + }, + { + "region": "10647", + "id": "169" + }, + { + "region": "10648", + "id": "63" + }, + { + "region": "10649", + "id": "63" + }, + { + "region": "10650", + "id": "63" + }, + { + "region": "10652", + "id": "316" + }, + { + "region": "10653", + "id": "295" + }, + { + "region": "10794", + "id": "306" + }, + { + "region": "10795", + "id": "305" + }, + { + "region": "10801", + "id": "164" + }, + { + "region": "10802", + "id": "115" + }, + { + "region": "10803", + "id": "91" + }, + { + "region": "10804", + "id": "192" + }, + { + "region": "10805", + "id": "184" + }, + { + "region": "10806", + "id": "7" + }, + { + "region": "10807", + "id": "21" + }, + { + "region": "10808", + "id": "293" + }, + { + "region": "10809", + "id": "291" + }, + { + "region": "10810", + "id": "291" + }, + { + "region": "10811", + "id": "291" + }, + { + "region": "10820", + "id": "563" + }, + { + "region": "10821", + "id": "282" + }, + { + "region": "10822", + "id": "278" + }, + { + "region": "10823", + "id": "278" + }, + { + "region": "10827", + "id": "146" + }, + { + "region": "10828", + "id": "378" + }, + { + "region": "10829", + "id": "378" + }, + { + "region": "10833", + "id": "249" + }, + { + "region": "10834", + "id": "240" + }, + { + "region": "10838", + "id": "442" + }, + { + "region": "10839", + "id": "442" + }, + { + "region": "10840", + "id": "444" + }, + { + "region": "10841", + "id": "444" + }, + { + "region": "10842", + "id": "444" + }, + { + "region": "10894", + "id": "312" + }, + { + "region": "10895", + "id": "311" + }, + { + "region": "10899", + "id": "362" + }, + { + "region": "10900", + "id": "362" + }, + { + "region": "10901", + "id": "364" + }, + { + "region": "10903", + "id": "17" + }, + { + "region": "10904", + "id": "192" + }, + { + "region": "10905", + "id": "63" + }, + { + "region": "10906", + "id": "88" + }, + { + "region": "10907", + "id": "340" + }, + { + "region": "10908", + "id": "340" + }, + { + "region": "10910", + "id": "274" + }, + { + "region": "10911", + "id": "548" + }, + { + "region": "11051", + "id": "303" + }, + { + "region": "11053", + "id": "129" + }, + { + "region": "11054", + "id": "114" + }, + { + "region": "11055", + "id": "117" + }, + { + "region": "11056", + "id": "58" + }, + { + "region": "11057", + "id": "55" + }, + { + "region": "11058", + "id": "6" + }, + { + "region": "11059", + "id": "347" + }, + { + "region": "11060", + "id": "324" + }, + { + "region": "11061", + "id": "74" + }, + { + "region": "11062", + "id": "104" + }, + { + "region": "11065", + "id": "356" + }, + { + "region": "11066", + "id": "4" + }, + { + "region": "11068", + "id": "335" + }, + { + "region": "11077", + "id": "277" + }, + { + "region": "11078", + "id": "282" + }, + { + "region": "11081", + "id": "5" + }, + { + "region": "11083", + "id": "65" + }, + { + "region": "11084", + "id": "378" + }, + { + "region": "11085", + "id": "378" + }, + { + "region": "11096", + "id": "444" + }, + { + "region": "11097", + "id": "444" + }, + { + "region": "11098", + "id": "444" + }, + { + "region": "11151", + "id": "307" + }, + { + "region": "11153", + "id": "265" + }, + { + "region": "11154", + "id": "114" + }, + { + "region": "11157", + "id": "248" + }, + { + "region": "11161", + "id": "19" + }, + { + "region": "11164", + "id": "341" + }, + { + "region": "11165", + "id": "357" + }, + { + "region": "11166", + "id": "261" + }, + { + "region": "11309", + "id": "172" + }, + { + "region": "11310", + "id": "90" + }, + { + "region": "11311", + "id": "165" + }, + { + "region": "11312", + "id": "162" + }, + { + "region": "11313", + "id": "172" + }, + { + "region": "11314", + "id": "170" + }, + { + "region": "11317", + "id": "119" + }, + { + "region": "11318", + "id": "87" + }, + { + "region": "11319", + "id": "9" + }, + { + "region": "11320", + "id": "187" + }, + { + "region": "11321", + "id": "257" + }, + { + "region": "11322", + "id": "292" + }, + { + "region": "11323", + "id": "294" + }, + { + "region": "11324", + "id": "569" + }, + { + "region": "11331", + "id": "553" + }, + { + "region": "11332", + "id": "564" + }, + { + "region": "11335", + "id": "504" + }, + { + "region": "11339", + "id": "52" + }, + { + "region": "11343", + "id": "491" + }, + { + "region": "11352", + "id": "444" + }, + { + "region": "11353", + "id": "444" + }, + { + "region": "11354", + "id": "444" + }, + { + "region": "11356", + "id": "442" + }, + { + "region": "11408", + "id": "365" + }, + { + "region": "11410", + "id": "90" + }, + { + "region": "11412", + "id": "162" + }, + { + "region": "11413", + "id": "336" + }, + { + "region": "11414", + "id": "25" + }, + { + "region": "11416", + "id": "179" + }, + { + "region": "11417", + "id": "19" + }, + { + "region": "11418", + "id": "100" + }, + { + "region": "11419", + "id": "100" + }, + { + "region": "11421", + "id": "261" + }, + { + "region": "11422", + "id": "369" + }, + { + "region": "11423", + "id": "396" + }, + { + "region": "11562", + "id": "304" + }, + { + "region": "11565", + "id": "78" + }, + { + "region": "11566", + "id": "94" + }, + { + "region": "11567", + "id": "89" + }, + { + "region": "11568", + "id": "479" + }, + { + "region": "11569", + "id": "92" + }, + { + "region": "11570", + "id": "138" + }, + { + "region": "11571", + "id": "107" + }, + { + "region": "11572", + "id": "186" + }, + { + "region": "11573", + "id": "18" + }, + { + "region": "11574", + "id": "77" + }, + { + "region": "11575", + "id": "149" + }, + { + "region": "11576", + "id": "258" + }, + { + "region": "11578", + "id": "292" + }, + { + "region": "11587", + "id": "564" + }, + { + "region": "11588", + "id": "564" + }, + { + "region": "11589", + "id": "524" + }, + { + "region": "11591", + "id": "242" + }, + { + "region": "11595", + "id": "57" + }, + { + "region": "11599", + "id": "482" + }, + { + "region": "11605", + "id": "232" + }, + { + "region": "11606", + "id": "442" + }, + { + "region": "11608", + "id": "442" + }, + { + "region": "11612", + "id": "442" + }, + { + "region": "11665", + "id": "30" + }, + { + "region": "11666", + "id": "103" + }, + { + "region": "11668", + "id": "129" + }, + { + "region": "11670", + "id": "138" + }, + { + "region": "11671", + "id": "53" + }, + { + "region": "11672", + "id": "173" + }, + { + "region": "11673", + "id": "178" + }, + { + "region": "11676", + "id": "153" + }, + { + "region": "11677", + "id": "264" + }, + { + "region": "11678", + "id": "395" + }, + { + "region": "11821", + "id": "162" + }, + { + "region": "11823", + "id": "166" + }, + { + "region": "11824", + "id": "515" + }, + { + "region": "11825", + "id": "180" + }, + { + "region": "11826", + "id": "12" + }, + { + "region": "11827", + "id": "127" + }, + { + "region": "11828", + "id": "72" + }, + { + "region": "11829", + "id": "54" + }, + { + "region": "11831", + "id": "34" + }, + { + "region": "11832", + "id": "435" + }, + { + "region": "11833", + "id": "183" + }, + { + "region": "11834", + "id": "43" + }, + { + "region": "11835", + "id": "37" + }, + { + "region": "11837", + "id": "52" + }, + { + "region": "11853", + "id": "402" + }, + { + "region": "11864", + "id": "443" + }, + { + "region": "11865", + "id": "443" + }, + { + "region": "11866", + "id": "443" + }, + { + "region": "11924", + "id": "576" + }, + { + "region": "11925", + "id": "108" + }, + { + "region": "11926", + "id": "490" + }, + { + "region": "11929", + "id": "325" + }, + { + "region": "11930", + "id": "582" + }, + { + "region": "11936", + "id": "52" + }, + { + "region": "11937", + "id": "52" + }, + { + "region": "12078", + "id": "549" + }, + { + "region": "12079", + "id": "62" + }, + { + "region": "12080", + "id": "62" + }, + { + "region": "12081", + "id": "105" + }, + { + "region": "12082", + "id": "35" + }, + { + "region": "12083", + "id": "49" + }, + { + "region": "12084", + "id": "15" + }, + { + "region": "12085", + "id": "310" + }, + { + "region": "12086", + "id": "102" + }, + { + "region": "12087", + "id": "96" + }, + { + "region": "12088", + "id": "160" + }, + { + "region": "12089", + "id": "66" + }, + { + "region": "12090", + "id": "159" + }, + { + "region": "12091", + "id": "42" + }, + { + "region": "12092", + "id": "475" + }, + { + "region": "12093", + "id": "334" + }, + { + "region": "12100", + "id": "236" + }, + { + "region": "12102", + "id": "633" + }, + { + "region": "12105", + "id": "505" + }, + { + "region": "12107", + "id": "412" + }, + { + "region": "12108", + "id": "412" + }, + { + "region": "12109", + "id": "402" + }, + { + "region": "12111", + "id": "403" + }, + { + "region": "12115", + "id": "86" + }, + { + "region": "12117", + "id": "304" + }, + { + "region": "12120", + "id": "443" + }, + { + "region": "12121", + "id": "443" + }, + { + "region": "12122", + "id": "443" + }, + { + "region": "12181", + "id": "529" + }, + { + "region": "12184", + "id": "325" + }, + { + "region": "12186", + "id": "570" + }, + { + "region": "12187", + "id": "585" + }, + { + "region": "12192", + "id": "26" + }, + { + "region": "12193", + "id": "68" + }, + { + "region": "12335", + "id": "62" + }, + { + "region": "12336", + "id": "62" + }, + { + "region": "12337", + "id": "85" + }, + { + "region": "12338", + "id": "3" + }, + { + "region": "12339", + "id": "151" + }, + { + "region": "12340", + "id": "333" + }, + { + "region": "12341", + "id": "141" + }, + { + "region": "12342", + "id": "98" + }, + { + "region": "12343", + "id": "113" + }, + { + "region": "12344", + "id": "8" + }, + { + "region": "12345", + "id": "176" + }, + { + "region": "12346", + "id": "435" + }, + { + "region": "12349", + "id": "13" + }, + { + "region": "12354", + "id": "494" + }, + { + "region": "12367", + "id": "441" + }, + { + "region": "12376", + "id": "443" + }, + { + "region": "12377", + "id": "443" + }, + { + "region": "12378", + "id": "443" + }, + { + "region": "12436", + "id": "85" + }, + { + "region": "12437", + "id": "144" + }, + { + "region": "12438", + "id": "361" + }, + { + "region": "12440", + "id": "338" + }, + { + "region": "12441", + "id": "141" + }, + { + "region": "12442", + "id": "98" + }, + { + "region": "12589", + "id": "352" + }, + { + "region": "12590", + "id": "263" + }, + { + "region": "12591", + "id": "79" + }, + { + "region": "12593", + "id": "64" + }, + { + "region": "12594", + "id": "327" + }, + { + "region": "12595", + "id": "163" + }, + { + "region": "12596", + "id": "116" + }, + { + "region": "12597", + "id": "175" + }, + { + "region": "12598", + "id": "496" + }, + { + "region": "12599", + "id": "56" + }, + { + "region": "12600", + "id": "10" + }, + { + "region": "12601", + "id": "476" + }, + { + "region": "12602", + "id": "67" + }, + { + "region": "12603", + "id": "449" + }, + { + "region": "12604", + "id": "332" + }, + { + "region": "12605", + "id": "106" + }, + { + "region": "12610", + "id": "493" + }, + { + "region": "12610", + "id": "493" + }, + { + "region": "12614", + "id": "572" + }, + { + "region": "12615", + "id": "214" + }, + { + "region": "12619", + "id": "418" + }, + { + "region": "12623", + "id": "441" + }, + { + "region": "12625", + "id": "272" + }, + { + "region": "12693", + "id": "389" + }, + { + "region": "12694", + "id": "343" + }, + { + "region": "12696", + "id": "528" + }, + { + "region": "12697", + "id": "330" + }, + { + "region": "12698", + "id": "144" + }, + { + "region": "12843", + "id": "383" + }, + { + "region": "12846", + "id": "267" + }, + { + "region": "12848", + "id": "124" + }, + { + "region": "12849", + "id": "145" + }, + { + "region": "12850", + "id": "76" + }, + { + "region": "12851", + "id": "2" + }, + { + "region": "12852", + "id": "106" + }, + { + "region": "12853", + "id": "125" + }, + { + "region": "12854", + "id": "177" + }, + { + "region": "12855", + "id": "169" + }, + { + "region": "12856", + "id": "337" + }, + { + "region": "12857", + "id": "332" + }, + { + "region": "12858", + "id": "120" + }, + { + "region": "12861", + "id": "127" + }, + { + "region": "12880", + "id": "441" + }, + { + "region": "12944", + "id": "606" + }, + { + "region": "12945", + "id": "359" + }, + { + "region": "12946", + "id": "266" + }, + { + "region": "12948", + "id": "397" + }, + { + "region": "12949", + "id": "108" + }, + { + "region": "12950", + "id": "46" + }, + { + "region": "12952", + "id": "106" + }, + { + "region": "12953", + "id": "125" + }, + { + "region": "12956", + "id": "569" + }, + { + "region": "13099", + "id": "383" + }, + { + "region": "13100", + "id": "387" + }, + { + "region": "13102", + "id": "174" + }, + { + "region": "13104", + "id": "69" + }, + { + "region": "13105", + "id": "50" + }, + { + "region": "13106", + "id": "36" + }, + { + "region": "13107", + "id": "123" + }, + { + "region": "13108", + "id": "111" + }, + { + "region": "13109", + "id": "157" + }, + { + "region": "13110", + "id": "93" + }, + { + "region": "13111", + "id": "121" + }, + { + "region": "13113", + "id": "14" + }, + { + "region": "13114", + "id": "182" + }, + { + "region": "13115", + "id": "182" + }, + { + "region": "13116", + "id": "331" + }, + { + "region": "13117", + "id": "329" + }, + { + "region": "13131", + "id": "428" + }, + { + "region": "13133", + "id": "552" + }, + { + "region": "13135", + "id": "441" + }, + { + "region": "13141", + "id": "272" + }, + { + "region": "13142", + "id": "459" + }, + { + "region": "13199", + "id": "388" + }, + { + "region": "13200", + "id": "213" + }, + { + "region": "13203", + "id": "168" + }, + { + "region": "13206", + "id": "407" + }, + { + "region": "13209", + "id": "594" + }, + { + "region": "13356", + "id": "505" + }, + { + "region": "13357", + "id": "267" + }, + { + "region": "13358", + "id": "351" + }, + { + "region": "13359", + "id": "174" + }, + { + "region": "13361", + "id": "50" + }, + { + "region": "13362", + "id": "47" + }, + { + "region": "13363", + "id": "122" + }, + { + "region": "13364", + "id": "75" + }, + { + "region": "13365", + "id": "20" + }, + { + "region": "13366", + "id": "93" + }, + { + "region": "13368", + "id": "179" + }, + { + "region": "13369", + "id": "326" + }, + { + "region": "13373", + "id": "586" + }, + { + "region": "13456", + "id": "452" + }, + { + "region": "13457", + "id": "464" + }, + { + "region": "13458", + "id": "540" + }, + { + "region": "13459", + "id": "540" + }, + { + "region": "13461", + "id": "462" + }, + { + "region": "13463", + "id": "534" + }, + { + "region": "13464", + "id": "45" + }, + { + "region": "13465", + "id": "45" + }, + { + "region": "13611", + "id": "451" + }, + { + "region": "13613", + "id": "447" + }, + { + "region": "13614", + "id": "465" + }, + { + "region": "13616", + "id": "377" + }, + { + "region": "13617", + "id": "36" + }, + { + "region": "13618", + "id": "286" + }, + { + "region": "13619", + "id": "154" + }, + { + "region": "13620", + "id": "245" + }, + { + "region": "13621", + "id": "84" + }, + { + "region": "13622", + "id": "48" + }, + { + "region": "13623", + "id": "339" + }, + { + "region": "13642", + "id": "411" + }, + { + "region": "13712", + "id": "452" + }, + { + "region": "13718", + "id": "11" + }, + { + "region": "13720", + "id": "246" + }, + { + "region": "13722", + "id": "156" + }, + { + "region": "13723", + "id": "514" + }, + { + "region": "13872", + "id": "377" + }, + { + "region": "13873", + "id": "501" + }, + { + "region": "13875", + "id": "286" + }, + { + "region": "13876", + "id": "241" + }, + { + "region": "13877", + "id": "244" + }, + { + "region": "13878", + "id": "61" + }, + { + "region": "13879", + "id": "344" + }, + { + "region": "13899", + "id": "146" + }, + { + "region": "13968", + "id": "539" + }, + { + "region": "13972", + "id": "260" + }, + { + "region": "13975", + "id": "287" + }, + { + "region": "13977", + "id": "319" + }, + { + "region": "13979", + "id": "342" + }, + { + "region": "14131", + "id": "380" + }, + { + "region": "14134", + "id": "288" + }, + { + "region": "14155", + "id": "146" + }, + { + "region": "14157", + "id": "379" + }, + { + "region": "14158", + "id": "379" + }, + { + "region": "14167", + "id": "562" + }, + { + "region": "14231", + "id": "381" + }, + { + "region": "14234", + "id": "345" + }, + { + "region": "14391", + "id": "353" + }, + { + "region": "14413", + "id": "379" + }, + { + "region": "14414", + "id": "379" + }, + { + "region": "14486", + "id": "197" + }, + { + "region": "14488", + "id": "521" + }, + { + "region": "14638", + "id": "530" + }, + { + "region": "14646", + "id": "355" + }, + { + "region": "14746", + "id": "354" + }, + { + "region": "14747", + "id": "471" + }, + { + "region": "14894", + "id": "631" + }, + { + "region": "14994", + "id": "632" + }, + { + "region": "14995", + "id": "632" + }, + { + "region": "15148", + "id": "238" + }, + { + "region": "15150", + "id": "611" + }, + { + "region": "15151", + "id": "610" + }, + { + "region": "15159", + "id": "358" + }, + { + "region": "15248", + "id": "238" + }, + { + "region": "15251", + "id": "632" + } +] \ No newline at end of file diff --git a/Server/data/configs/music_tiles.json b/Server/data/configs/music_tiles.json new file mode 100644 index 000000000..7b901f974 --- /dev/null +++ b/Server/data/configs/music_tiles.json @@ -0,0 +1,62 @@ +[ + { + "id": "98", + "borders": "{3072,3456,3135,3519,[3076,3456,3085,3458]~,[3082,3459,3085,3460]}" + }, + { + "id": "141", + "borders": "{3072,3392,3135,3455,[3076,3452,3085,3455]}" + }, + { + "id": "228", + "borders": "{2896,5446,2919,5462}" + }, + { + "id": "229", + "borders": "{2921,5456,2937,5479}" + }, + { + "id": "230", + "borders": "{2904,5481,2927,5497}" + }, + { + "id": "231", + "borders": "{2886,5464,2902,5487}" + }, + { + "id": "386", + "borders": "{2820,5312,2849,5369}-{2849,5349,2880,5374}" + }, + { + "id": "391", + "borders": "{2879,5340,2944,5366}-{2909,5316,2944,5340}" + }, + { + "id": "399", + "borders": "{2816,5248,2943,5375,[2823,5250,2844,5310]~,[2844,5250,2878,5280]~,[2879,5340,2944,5366]~,[2909,5316,2944,5340]~,[2820,5312,2849,5369]~,[2849,5349,2880,5374]~,[2885,5253,2934,5278]~,[2913,5278,2937,5306]}" + }, + { + "id": "404", + "borders": "{2823,5250,2844,5310}-{2844,5250,2878,5276}" + }, + { + "id": "408", + "borders": "{2885,5253,2934,5278}-{2913,5278,2937,5306}" + }, + { + "id": "459", + "borders": "{3137,5442,3192,5564}-{3193,5442,3198,5472}-{3193,5507,3198,5564}" + }, + { + "id": "467", + "borders": "{3199,5441,3262,5564}-{3193,5482,3198,5497}" + }, + { + "id": "488", + "borders": "{3263,5441,3327,5566}" + }, + { + "id": "492", + "borders": "{3076,3452,3085,3460,[3076,3459,3081,3460]}" + } +] \ No newline at end of file diff --git a/Server/src/main/core/game/system/config/MusicConfigLoader.kt b/Server/src/main/core/game/system/config/MusicConfigLoader.kt index 2b11d4fff..4b0a82354 100644 --- a/Server/src/main/core/game/system/config/MusicConfigLoader.kt +++ b/Server/src/main/core/game/system/config/MusicConfigLoader.kt @@ -22,10 +22,7 @@ class MusicConfigLoader { val parser = JSONParser() var reader: FileReader? = null fun load(){ - var count = 0 - reader = FileReader(ServerConstants.CONFIG_PATH + "music_configs.json") - var configs = parser.parse(reader) as JSONArray - + // Populate the server data map val songs = DataMap.get(1351) val names = DataMap.get(1345) @@ -35,7 +32,24 @@ class MusicConfigLoader { MusicEntry.getSongs().putIfAbsent(songId, entry) } - for(config in configs){ + // Parse the region-wide music config file + var count = 0 + reader = FileReader(ServerConstants.CONFIG_PATH + "music_regions.json") + var configs = parser.parse(reader) as JSONArray + for(config in configs) { + val e = config as JSONObject + val region = Integer.parseInt(e["region"].toString()) + val id = Integer.parseInt(e["id"].toString()) + RegionManager.forId(region).music = MusicEntry.forId(id) + count++ + log(this::class.java, Log.FINE, "Parsed $count region music configs.") + } + + // Parse the file with tile-specific music locations + count = 0 + reader = FileReader(ServerConstants.CONFIG_PATH + "music_tiles.json") + configs = parser.parse(reader) as JSONArray + for(config in configs) { val e = config as JSONObject val musicId = Integer.parseInt(e["id"].toString()) val string = e["borders"].toString() @@ -43,9 +57,6 @@ class MusicConfigLoader { var tokens: Array? = null var borders: ZoneBorders? = null for (border in borderArray) { - if(border.isEmpty()){ - continue - } tokens = border.replace("{", "").replace("}", "").split(",").toTypedArray() borders = ZoneBorders(tokens[0].toInt(), tokens[1].toInt(), tokens[2].toInt(), tokens[3].toInt()) if (border.contains("[")) { //no exception borders @@ -59,8 +70,6 @@ class MusicConfigLoader { e = exception.replace("[", "").replace("]", "").split(",".toRegex()).toTypedArray() borders.addException(ZoneBorders(e[0].toInt(), e[1].toInt(), e[2].toInt(), e[3].toInt())) } - e = null - exceptions = null } val zone = MusicZone(musicId, borders) for (id in borders.getRegionIds()) { @@ -69,6 +78,6 @@ class MusicConfigLoader { } count++ } - log(this::class.java, Log.FINE, "Parsed $count music configs.") + log(this::class.java, Log.FINE, "Parsed $count tile music configs.") } -} \ No newline at end of file +} diff --git a/Server/src/main/core/game/world/map/Region.java b/Server/src/main/core/game/world/map/Region.java index c615df34a..93303b658 100644 --- a/Server/src/main/core/game/world/map/Region.java +++ b/Server/src/main/core/game/world/map/Region.java @@ -3,6 +3,7 @@ package core.game.world.map; import core.cache.Cache; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; +import core.game.node.entity.player.link.music.MusicEntry; import core.game.node.entity.player.link.music.MusicZone; import core.game.system.communication.CommunicationInfo; import core.game.system.task.Pulse; @@ -11,7 +12,6 @@ import core.game.world.map.build.LandscapeParser; import core.game.world.map.build.MapscapeParser; import core.game.world.map.zone.RegionZone; import core.tools.Log; -import core.tools.SystemLogger; import core.game.system.config.XteaParser; import core.game.world.GameWorld; import core.game.world.repository.Repository; @@ -62,7 +62,12 @@ public class Region { private final List regionZones = new ArrayList<>(20); /** - * The music zones lying in this region. + * The region-wide music track for this region. + */ + private MusicEntry music = null; + + /** + * Any tile-specific music zones lying in this region. */ private final List musicZones = new ArrayList<>(20); @@ -268,14 +273,14 @@ public class Region { } } - public boolean flagInactive(boolean force) { - if (unload(this, force)) { - active = false; - return true; - } else { - return false; - } - } + public boolean flagInactive(boolean force) { + if (unload(this, force)) { + active = false; + return true; + } else { + return false; + } + } /** * Flags the region as inactive. @@ -345,7 +350,7 @@ public class Region { } } - public static boolean unload(Region r) { + public static boolean unload(Region r) { return unload(r, false); } @@ -374,10 +379,10 @@ public class Region { } } } - if (r.isBuild()) - r.setLoaded(false); - r.activityPulse.stop(); - return true; + if (r.isBuild()) + r.setLoaded(false); + r.activityPulse.stop(); + return true; } /** @@ -473,6 +478,21 @@ public class Region { return planes; } + /** + * Sets the region-wide music track. + */ + public void setMusic(MusicEntry music) { + this.music = music; + } + + /** + * Gets the region-wide music track + * @return The music entry + */ + public MusicEntry getMusic() { + return this.music; + } + /** * Gets the regionZones. * @return The regionZones. diff --git a/Server/src/main/core/game/world/map/zone/ZoneMonitor.java b/Server/src/main/core/game/world/map/zone/ZoneMonitor.java index 472bbd8f0..a992ed0ef 100644 --- a/Server/src/main/core/game/world/map/zone/ZoneMonitor.java +++ b/Server/src/main/core/game/world/map/zone/ZoneMonitor.java @@ -5,6 +5,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.player.Player; +import core.game.node.entity.player.link.music.MusicEntry; import core.game.node.entity.player.link.music.MusicZone; import core.game.node.entity.player.link.request.RequestType; import core.game.node.item.Item; @@ -15,6 +16,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import core.game.world.map.Region; import org.rs09.consts.Items; /** @@ -396,21 +398,25 @@ public final class ZoneMonitor { for (Iterator it = musicZones.iterator(); it.hasNext();) { MusicZone zone = it.next(); if (!zone.getBorders().insideBorder(l.getX(), l.getY())) { - zone.leave(player, false); - it.remove(); + if (zone.leave(player, false)) { + it.remove(); + } } } - for (MusicZone zone : player.getViewport().getRegion().getMusicZones()) { - if (!zone.getBorders().insideBorder(l.getX(), l.getY())) { - continue; - } - if (!musicZones.contains(zone)) { + Region r = player.getViewport().getRegion(); + for (MusicZone zone : r.getMusicZones()) { + if (zone.getBorders().insideBorder(l.getX(), l.getY())) { zone.enter(player); - musicZones.add(zone); + return; } } - if (musicZones.isEmpty() && !player.getMusicPlayer().isPlaying()) { - player.getMusicPlayer().playDefault(); + MusicEntry music = r.getMusic(); + if (music == null) { + if (!player.getMusicPlayer().isPlaying()) { + player.getMusicPlayer().playDefault(); + } + } else { + player.getMusicPlayer().play(music); } }