diff --git a/GenOnlineService/MatchmakingManager.cs b/GenOnlineService/MatchmakingManager.cs index dc06db7..d311dd9 100644 --- a/GenOnlineService/MatchmakingManager.cs +++ b/GenOnlineService/MatchmakingManager.cs @@ -1139,55 +1139,47 @@ await SendMatchmakingMessage(memberSession, { { 0, new Playlist(0, "1v1 (Random Armies)", 2, 2, 8, false, -1, false, 0, new List() { -// new PlaylistMap("[RANK] Snowy Drought ZH v5 (2)", "[RANK] Snowy Drought ZH v5", true, 2), - new PlaylistMap("[RANK] Natural Threats ZH v4 (2)", "[RANK] Natural Threats ZH v4", true, 2), -// new PlaylistMap("[RANK] Arctic Lagoon ZH v2 (2)", "[RANK] Arctic Lagoon ZH v2", true, 2), -// new PlaylistMap("[RANK] ZH Carrier is Over v2 (2)", "[RANK] ZH Carrier is Over v2", true, 2), - new PlaylistMap("[RANK] Vendetta ZH v1 (2)", "[RANK] Vendetta ZH v1", true, 2), - new PlaylistMap("[RANK] TD NoBugsCars ZH v1 (2)", "[RANK] TD NoBugsCars ZH v1", true, 2), -// new PlaylistMap("[RANK] Sand Scorpion (2)", "[RANK] Sand Scorpion", true, 2), - new PlaylistMap("[RANK] Mountain Mayhem v2 (2)", "[RANK] Mountain Mayhem v2", true, 2), -// new PlaylistMap("[RANK] Liquid Gold ZH v2 (2)", "[RANK] Liquid Gold ZH v2", true, 2), -// new PlaylistMap("[RANK] Imminent Victory ZH v2 (2)", "[RANK] Imminent Victory ZH v2", true, 2), -// new PlaylistMap("[RANK] Egyptian Oasis ZH v1 (2)", "[RANK] Egyptian Oasis ZH v1", true, 2), -// new PlaylistMap("[RANK] Desolated District ZH v1 (2)", "[RANK] Desolated District ZH v1", true, 2), - new PlaylistMap("[RANK] Canyon of the Dead ZH v2 (2)", "[RANK] Canyon of the Dead ZH v2", true, 2), -// new PlaylistMap("[RANK] Blossoming Valley ZH v1 (2)", "[RANK] Blossoming Valley ZH v1", true, 2), -// //new PlaylistMap("[RANK] Battle Plan ZH v1 (2)", "[RANK] Battle Plan ZH v1", true, 2), // NOTE: Disabled. OldA say it is bugged according to map creator. -// new PlaylistMap("[RANK] Barren Badlands Balanced ZH v2 (2)", "[RANK] Barren Badlands Balanced ZH v2", true, 2), -// -// // new maps added in 12_05_25 update -// new PlaylistMap("Battle Plan ZH v3", "Battle Plan ZH v3", true, 2), -// new PlaylistMap("Canyon Frost ZH v1", "Canyon Frost ZH v1", true, 2), - new PlaylistMap("Koujou Okawa v3", "Koujou Okawa v3", true, 2), - new PlaylistMap("Oxygen 1", "Oxygen 1", true, 2), -// new PlaylistMap("Shivas Paradise v4", "Shivas Paradise v4", true, 2), -// new PlaylistMap("Thermopylae v5", "Thermopylae v5", true, 2), -// new PlaylistMap("Tiny Tactics ZH v2", "Tiny Tactics ZH v2", true, 2), -// new PlaylistMap("yota nation arena v3", "yota nation arena v3", true, 2), - new PlaylistMap("[RANK] AKAs Magic ZH v1", "[RANK] AKAs Magic ZH v1", true, 2), - new PlaylistMap("[RANK] Arctic Arena ZH v1", "[RANK] Arctic Arena ZH v1", true, 2), -// new PlaylistMap("[RANK] Black Hell ZH v1", "[RANK] Black Hell ZH v1", true, 2), -// new PlaylistMap("[RANK] Blue Hole ZH v1", "[RANK] Blue Hole ZH v1", true, 2), -// new PlaylistMap("[RANK] Dammed Scorpion ZH v1", "[RANK] Dammed Scorpion ZH v1", true, 2), - new PlaylistMap("[RANK] Drallim Desert ZH v2", "[RANK] Drallim Desert ZH v2", true, 2), -// new PlaylistMap("[RANK] Farmlands of the Fallen ZH v1", "[RANK] Farmlands of the Fallen ZH v1", true, 2), -// new PlaylistMap("[RANK] Sakura Forest II ZH v1", "[RANK] Sakura Forest II ZH v1", true, 2), -// new PlaylistMap("[RANK] Sovereignty ZH v1", "[RANK] Sovereignty ZH v1", true, 2), -// -// // new maps added in 4_28_26 EAC update (for WS / from GR) - new PlaylistMap("Arabia v2 (2)", "Arabia v2", true, 2), -// new PlaylistMap("SandForest Domination v5 (2)", "SandForest Domination v5", true, 2), -// new PlaylistMap("Toxic Lake v4 (2)", "Toxic Lake v4", true, 2), - new PlaylistMap("Tremble v2 (2)", "Tremble v2", true, 2), -// new PlaylistMap("[RANK] Hanamura Temple ZH v1 (2)", "[RANK] Hanamura Temple ZH v1", true, 2), - - // new maps added in 8_13_26 for WS + new PlaylistMap("[RANK] AKAs Magic ZH v1", "[RANK] AKAs Magic ZH v1", true, 2), + new PlaylistMap("[RANK] Arctic Arena ZH v1", "[RANK] Arctic Arena ZH v1", true, 2), +// new PlaylistMap("[RANK] Arctic Lagoon ZH v2 (2)", "[RANK] Arctic Lagoon ZH v2", true, 2), +// new PlaylistMap("[RANK] Barren Badlands Balanced ZH v2 (2)", "[RANK] Barren Badlands Balanced ZH v2", true, 2), +// new PlaylistMap("[RANK] Black Hell ZH v1", "[RANK] Black Hell ZH v1", true, 2), +// new PlaylistMap("[RANK] Blossoming Valley ZH v1 (2)", "[RANK] Blossoming Valley ZH v1", true, 2), +// new PlaylistMap("[RANK] Blue Hole ZH v1", "[RANK] Blue Hole ZH v1", true, 2), + new PlaylistMap("[RANK] Canyon of the Dead ZH v2 (2)", "[RANK] Canyon of the Dead ZH v2", true, 2), +// new PlaylistMap("[RANK] Dammed Scorpion ZH v1", "[RANK] Dammed Scorpion ZH v1", true, 2), +// new PlaylistMap("[RANK] Desolated District ZH v1 (2)", "[RANK] Desolated District ZH v1", true, 2), + new PlaylistMap("[RANK] Drallim Desert ZH v2", "[RANK] Drallim Desert ZH v2", true, 2), +// new PlaylistMap("[RANK] Egyptian Oasis ZH v1 (2)", "[RANK] Egyptian Oasis ZH v1", true, 2), +// new PlaylistMap("[RANK] Farmlands of the Fallen ZH v1", "[RANK] Farmlands of the Fallen ZH v1", true, 2), +// new PlaylistMap("[RANK] Hanamura Temple ZH v1 (2)", "[RANK] Hanamura Temple ZH v1", true, 2), +// new PlaylistMap("[RANK] Imminent Victory ZH v2 (2)", "[RANK] Imminent Victory ZH v2", true, 2), +// new PlaylistMap("[RANK] Liquid Gold ZH v2 (2)", "[RANK] Liquid Gold ZH v2", true, 2), + new PlaylistMap("[RANK] Mountain Mayhem v2 (2)", "[RANK] Mountain Mayhem v2", true, 2), + new PlaylistMap("[RANK] Natural Threats ZH v4 (2)", "[RANK] Natural Threats ZH v4", true, 2), +// new PlaylistMap("[RANK] Sakura Forest II ZH v1", "[RANK] Sakura Forest II ZH v1", true, 2), +// new PlaylistMap("[RANK] Sand Scorpion (2)", "[RANK] Sand Scorpion", true, 2), +// new PlaylistMap("[RANK] Snowy Drought ZH v5 (2)", "[RANK] Snowy Drought ZH v5", true, 2), +// new PlaylistMap("[RANK] Sovereignty ZH v1", "[RANK] Sovereignty ZH v1", true, 2), + new PlaylistMap("[RANK] TD NoBugsCars ZH v1 (2)", "[RANK] TD NoBugsCars ZH v1", true, 2), + new PlaylistMap("[RANK] Vendetta ZH v1 (2)", "[RANK] Vendetta ZH v1", true, 2), +// new PlaylistMap("[RANK] ZH Carrier is Over v2 (2)", "[RANK] ZH Carrier is Over v2", true, 2), + new PlaylistMap("Arabia v2 (2)", "Arabia v2", true, 2), +// new PlaylistMap("Battle Plan ZH v3", "Battle Plan ZH v3", true, 2), +// new PlaylistMap("Canyon Frost ZH v1", "Canyon Frost ZH v1", true, 2), new PlaylistMap("Forest of Camelot ZH v4 (2)", "Forest of Camelot ZH v4", true, 2), + new PlaylistMap("Koujou Okawa v3", "Koujou Okawa v3", true, 2), new PlaylistMap("Mirmulnir v4 (2)", "Mirmulnir v4", true, 2), - //new PlaylistMap("Seasonal Conflict Summer V2 (2)", "Seasonal Conflict Summer V2", true, 2), + new PlaylistMap("Oxygen 1", "Oxygen 1", true, 2), +// new PlaylistMap("SandForest Domination v5 (2)", "SandForest Domination v5", true, 2), +// new PlaylistMap("Seasonal Conflict Summer V2 (2)", "Seasonal Conflict Summer V2", true, 2), +// new PlaylistMap("Shivas Paradise v4", "Shivas Paradise v4", true, 2), new PlaylistMap("Terraform v2 (2)", "Terraform v2", true, 2), +// new PlaylistMap("Thermopylae v5", "Thermopylae v5", true, 2), +// new PlaylistMap("Tiny Tactics ZH v2", "Tiny Tactics ZH v2", true, 2), new PlaylistMap("Toxic Lake v5 (2)", "Toxic Lake v5", true, 2), + new PlaylistMap("Tremble v2 (2)", "Tremble v2", true, 2), +// new PlaylistMap("yota nation arena v3", "yota nation arena v3", true, 2), } ) }, @@ -1242,8 +1234,8 @@ await SendMatchmakingMessage(memberSession, { 1, new Playlist(1, "6-8P FFA (Random Armies)", 6, 8, 1, false, -1, false, 30000, new List() { - new PlaylistMap("Defcon6 (6)", "Defcon6", false, 6), new PlaylistMap("Beijing Uprise v4 (6)", "Beijing Uprise v4", true, 6), + new PlaylistMap("Defcon6 (6)", "Defcon6", false, 6), new PlaylistMap("Taiga Terror (6)", "Taiga Terror", true, 6), new PlaylistMap("Swamp Assault v3 [WBC2021] (7)", "Swamp Assault v3 [WBC2021]", true, 7), new PlaylistMap("[RANK] Muddy Madness ZH v1 (8)", "[RANK] Muddy Madness ZH v1", true, 8),