From 2b04c568fc92dca4b47ba4874cffa50e58bce74e Mon Sep 17 00:00:00 2001 From: RickD004 Date: Fri, 8 May 2026 20:13:09 -0600 Subject: [PATCH] Format the map lists in Main and MapPlaylist (#3889) ## Description: Format the map lists in Main and MapPlaylist by alphabetical order. Many maps were already standarized like this, but many recent ones werent. Ideally, future maps should be added this way too. Also ran npm run format in these 2 files, as they were not formatted correctly before. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: tri.star1011 --- map-generator/main.go | 60 ++++++++++++++++----------------- src/server/MapPlaylist.ts | 70 +++++++++++++++++++-------------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/map-generator/main.go b/map-generator/main.go index b267fff9d..1f06f920d 100644 --- a/map-generator/main.go +++ b/map-generator/main.go @@ -21,20 +21,32 @@ var maps = []struct { Name string IsTest bool }{ + {Name: "achiran"}, + {Name: "aegean"}, {Name: "africa"}, + {Name: "alps"}, + {Name: "amazonriver"}, + {Name: "antarctica"}, + {Name: "archipelagosea"}, + {Name: "arctic"}, {Name: "asia"}, {Name: "australia"}, - {Name: "achiran"}, - {Name: "alps"}, {Name: "baikal"}, {Name: "baikalnukewars"}, - {Name: "betweentwoseas"}, + {Name: "bajacalifornia"}, + {Name: "beringsea"}, {Name: "beringstrait"}, + {Name: "betweentwoseas"}, {Name: "blacksea"}, {Name: "bosphorusstraits"}, {Name: "britannia"}, {Name: "britanniaclassic"}, + {Name: "caucasus"}, + {Name: "conakry"}, {Name: "deglaciatedantarctica"}, + {Name: "didier"}, + {Name: "didierfrance"}, + {Name: "dyslexdria"}, {Name: "eastasia"}, {Name: "europe"}, {Name: "europeclassic"}, @@ -43,61 +55,49 @@ var maps = []struct { {Name: "fourislands"}, {Name: "gatewaytotheatlantic"}, {Name: "giantworldmap"}, + {Name: "greatlakes"}, {Name: "gulfofstlawrence"}, {Name: "halkidiki"}, + {Name: "hawaii"}, {Name: "iceland"}, {Name: "italia"}, {Name: "japan"}, + {Name: "lemnos"}, {Name: "lisbon"}, + {Name: "losangeles"}, + {Name: "luna"}, {Name: "manicouagan"}, - {Name: "straitofmalacca"}, + {Name: "marenostrum"}, {Name: "mars"}, {Name: "mena"}, {Name: "middleeast"}, + {Name: "milkyway"}, {Name: "montreal"}, {Name: "newyorkcity"}, + {Name: "niledelta"}, {Name: "northamerica"}, {Name: "oceania"}, {Name: "pangaea"}, {Name: "passage"}, {Name: "pluto"}, + {Name: "sanfrancisco"}, {Name: "sierpinski"}, {Name: "southamerica"}, {Name: "straitofgibraltar"}, {Name: "straitofhormuz"}, + {Name: "straitofmalacca"}, {Name: "surrounded"}, {Name: "svalmel"}, - {Name: "world"}, - {Name: "lemnos"}, - {Name: "twolakes"}, + {Name: "taiwanstrait"}, + {Name: "thebox"}, {Name: "tourney1"}, {Name: "tourney2"}, {Name: "tourney3"}, {Name: "tourney4"}, - {Name: "thebox"}, - {Name: "didier"}, - {Name: "didierfrance"}, - {Name: "amazonriver"}, - {Name: "yenisei"}, {Name: "tradersdream"}, - {Name: "hawaii"}, - {Name: "niledelta"}, - {Name: "arctic"}, - {Name: "sanfrancisco"}, - {Name: "aegean"}, - {Name: "milkyway"}, - {Name: "marenostrum"}, - {Name: "greatlakes"}, - {Name: "dyslexdria"}, - {Name: "luna"}, - {Name: "conakry"}, - {Name: "caucasus"}, - {Name: "losangeles"}, - {Name: "beringsea"}, - {Name: "antarctica"}, - {Name: "archipelagosea"}, - {Name: "bajacalifornia"}, - {Name: "taiwanstrait"}, + {Name: "twolakes"}, + {Name: "world"}, + {Name: "yenisei"}, {Name: "big_plains", IsTest: true}, {Name: "half_land_half_ocean", IsTest: true}, {Name: "ocean_and_land", IsTest: true}, diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts index ef62b83e4..3c05e38c3 100644 --- a/src/server/MapPlaylist.ts +++ b/src/server/MapPlaylist.ts @@ -30,74 +30,74 @@ const MAX_PLAYER_COUNT = 125; // How many times each map should appear in the playlist. // Note: The Partial should eventually be removed for better type safety. const frequency: Partial> = { + Achiran: 5, + Aegean: 6, Africa: 7, + Alps: 4, + AmazonRiver: 3, + Antarctica: 1, + ArchipelagoSea: 3, + Arctic: 6, Asia: 6, Australia: 4, - Achiran: 5, Baikal: 5, + BajaCalifornia: 4, + BeringSea: 5, + BeringStrait: 2, BetweenTwoSeas: 5, BlackSea: 6, + BosphorusStraits: 3, Britannia: 5, + Caucasus: 5, + Conakry: 3, DeglaciatedAntarctica: 4, + Didier: 1, + DidierFrance: 1, + Dyslexdria: 8, EastAsia: 5, Europe: 7, FalklandIslands: 4, FaroeIslands: 4, FourIslands: 4, GatewayToTheAtlantic: 5, + GreatLakes: 6, GulfOfStLawrence: 4, Halkidiki: 4, + Hawaii: 4, Iceland: 4, Italia: 6, Japan: 6, + Lemnos: 3, Lisbon: 4, + LosAngeles: 8, + Luna: 6, Manicouagan: 4, + MareNostrum: 6, Mars: 3, Mena: 6, + MiddleEast: 8, + MilkyWay: 8, Montreal: 6, NewYorkCity: 3, + NileDelta: 4, NorthAmerica: 5, Pangaea: 5, + Passage: 4, Pluto: 6, + SanFrancisco: 3, + Sierpinski: 10, SouthAmerica: 5, StraitOfGibraltar: 5, - Svalmel: 8, - World: 20, - Lemnos: 3, - Passage: 4, - TwoLakes: 6, StraitOfHormuz: 4, - Surrounded: 4, - DidierFrance: 1, - Didier: 1, - AmazonRiver: 3, - BosphorusStraits: 3, - BeringStrait: 2, - Sierpinski: 10, - TheBox: 3, - Yenisei: 6, - TradersDream: 4, - Hawaii: 4, - Alps: 4, - NileDelta: 4, - Arctic: 6, - SanFrancisco: 3, - Aegean: 6, - MilkyWay: 8, - MareNostrum: 6, - Dyslexdria: 8, - GreatLakes: 6, StraitOfMalacca: 4, - Luna: 6, - Conakry: 3, - Caucasus: 5, - LosAngeles: 8, - BeringSea: 5, - Antarctica: 1, - ArchipelagoSea: 3, - BajaCalifornia: 4, - MiddleEast: 8, + Surrounded: 4, + Svalmel: 8, TaiwanStrait: 5, + TheBox: 3, + TradersDream: 4, + TwoLakes: 6, + World: 20, + Yenisei: 6, }; const TEAM_WEIGHTS: { config: TeamCountConfig; weight: number }[] = [