From e494f83e8e58aecbc92fa515a06a6be1f57dd668 Mon Sep 17 00:00:00 2001 From: RickD004 Date: Sat, 13 Jun 2026 14:42:24 -0600 Subject: [PATCH] New and updated categories for maps (#4254) Resolves #4250 ## Description: Huge update for the map categories: https://github.com/user-attachments/assets/b7dc6344-efdc-4073-b15a-92b6dccdcc19 **New Categories** - Re-adds Continental category, with the 7 traditional continents - Re-adds the category of Arcade along all its maps. - Renames "Other" to "Fictional", so that tag is more specific and feels more in-theme with the others. The info.json's of the maps that had the Other category got changed to Fictional **Map Category changes** - **achiran**: adds Europe (while the map is fictional, it is made up of real islands from ireland. (Since world includes Dyslexdria and Antarctica has Deglaciated Antarctica, both fictional , i figured for consistency we could include these mash-up maps too) - **aegean**: adds Asia category (Turkey is in Asia) - **arctic**: adds Asia category - **choppingblock**: updated "other" to "fictional", added to "new" - **deglaciatedantarctica**: updated "other" to "fictional" - **didier**: re-added to Arcade - **didierfrance**: re-added to Arcade - **dyslexdria**: updated "other" to "fictional" - **fourislands**: updated "other" to "fictional" - **hawaii**: remove north_america tag (while part of the US, hawaii is geographically only in Oceania) - **labyrinth**: added to new, re-added to Arcade - **marenostrum**: added africa and asia tags, the continents which the mediterranean borders - **onion**: re-added to Arcade - **pangaea**: updated "other" to "fictional" - **passage**: updated "other" to "fictional" - **sierpinski** re-added to Arcade - **surrounded**: updated "other" to "fictional" - **svalmel**: updated "other" to "fictional", added to europe and north_america (same logic as achiran) - **thebox**: re-added to Arcade - **tradersdream**: updated "other" to "fictional" - **worldinverted**: updated "other" to "fictional", added to "new" - **africa**: added to Continental - **antarctica**: added to Continental - **asia**: added to Continental - **europe**: added to Continental - **northamerica**: added to Continental - **southamerica**: added to Continental - **oceania**: added to Continental - **mississippiriver**: added to "new" - **korea**: added to "new" - **middleeast**: added to "new" - **balkans**: added to "new" - **indiansubcontinent**: added to "new" - **taiwanstrait**: added to "new" - **northwestpassage**: added to "new" - **southeastasia**: added to "new" - **venice**: added to "new" - **yellowsea**: added to "new" - **hongkong**: added to "new" - **titan**: added to "new" - **caribbean**: added to "new" - **juandefucastrait**: added to "new" - **danishstraits**: added to "new" ## 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 ## Please put your Discord username so you can be contacted if a bug or regression is found: tri.star1011 --- map-generator/README.md | 2 +- map-generator/assets/maps/achiran/info.json | 2 +- map-generator/assets/maps/aegean/info.json | 2 +- map-generator/assets/maps/africa/info.json | 2 +- .../assets/maps/antarctica/info.json | 2 +- map-generator/assets/maps/arctic/info.json | 2 +- map-generator/assets/maps/asia/info.json | 2 +- .../assets/maps/baikalnukewars/info.json | 2 +- map-generator/assets/maps/balkans/info.json | 2 +- map-generator/assets/maps/caribbean/info.json | 2 +- .../assets/maps/choppingblock/info.json | 2 +- .../assets/maps/danishstraits/info.json | 2 +- .../maps/deglaciatedantarctica/info.json | 2 +- map-generator/assets/maps/didier/info.json | 2 +- .../assets/maps/didierfrance/info.json | 2 +- .../assets/maps/dyslexdria/info.json | 2 +- map-generator/assets/maps/europe/info.json | 2 +- .../assets/maps/europeclassic/info.json | 2 +- .../assets/maps/fourislands/info.json | 2 +- map-generator/assets/maps/hawaii/info.json | 2 +- map-generator/assets/maps/hongkong/info.json | 2 +- .../assets/maps/indiansubcontinent/info.json | 2 +- .../assets/maps/juandefucastrait/info.json | 2 +- map-generator/assets/maps/korea/info.json | 2 +- map-generator/assets/maps/labyrinth/info.json | 2 +- .../assets/maps/marenostrum/info.json | 2 +- .../assets/maps/middleeast/info.json | 2 +- .../assets/maps/mississippiriver/info.json | 2 +- .../assets/maps/northamerica/info.json | 2 +- .../assets/maps/northwestpassage/info.json | 2 +- map-generator/assets/maps/oceania/info.json | 2 +- map-generator/assets/maps/onion/info.json | 2 +- map-generator/assets/maps/pangaea/info.json | 2 +- map-generator/assets/maps/passage/info.json | 2 +- .../assets/maps/sierpinski/info.json | 2 +- .../assets/maps/southamerica/info.json | 2 +- .../assets/maps/southeastasia/info.json | 2 +- .../assets/maps/surrounded/info.json | 2 +- map-generator/assets/maps/svalmel/info.json | 2 +- .../assets/maps/taiwanstrait/info.json | 2 +- map-generator/assets/maps/thebox/info.json | 2 +- map-generator/assets/maps/titan/info.json | 2 +- .../assets/maps/tradersdream/info.json | 2 +- map-generator/assets/maps/venice/info.json | 2 +- .../assets/maps/warshipwarship/info.json | 2 +- .../assets/maps/worldinverted/info.json | 2 +- map-generator/assets/maps/yellowsea/info.json | 2 +- map-generator/codegen.go | 5 +- resources/lang/en.json | 5 +- resources/maps/achiran/manifest.json | 2 +- resources/maps/aegean/manifest.json | 2 +- resources/maps/africa/manifest.json | 2 +- resources/maps/antarctica/manifest.json | 2 +- resources/maps/arctic/manifest.json | 2 +- resources/maps/asia/manifest.json | 2 +- resources/maps/baikalnukewars/manifest.json | 2 +- resources/maps/balkans/manifest.json | 2 +- resources/maps/caribbean/manifest.json | 2 +- resources/maps/choppingblock/manifest.json | 2 +- resources/maps/danishstraits/manifest.json | 2 +- .../maps/deglaciatedantarctica/manifest.json | 2 +- resources/maps/didier/manifest.json | 2 +- resources/maps/didierfrance/manifest.json | 2 +- resources/maps/dyslexdria/manifest.json | 2 +- resources/maps/europe/manifest.json | 2 +- resources/maps/europeclassic/manifest.json | 2 +- resources/maps/fourislands/manifest.json | 2 +- resources/maps/hawaii/manifest.json | 2 +- resources/maps/hongkong/manifest.json | 2 +- .../maps/indiansubcontinent/manifest.json | 2 +- resources/maps/juandefucastrait/manifest.json | 2 +- resources/maps/korea/manifest.json | 2 +- resources/maps/labyrinth/manifest.json | 2 +- resources/maps/marenostrum/manifest.json | 2 +- resources/maps/middleeast/manifest.json | 2 +- resources/maps/mississippiriver/manifest.json | 2 +- resources/maps/northamerica/manifest.json | 2 +- resources/maps/northwestpassage/manifest.json | 2 +- resources/maps/oceania/manifest.json | 2 +- resources/maps/onion/manifest.json | 2 +- resources/maps/pangaea/manifest.json | 2 +- resources/maps/passage/manifest.json | 2 +- resources/maps/sierpinski/manifest.json | 2 +- resources/maps/southamerica/manifest.json | 2 +- resources/maps/southeastasia/manifest.json | 2 +- resources/maps/surrounded/manifest.json | 2 +- resources/maps/svalmel/manifest.json | 2 +- resources/maps/taiwanstrait/manifest.json | 2 +- resources/maps/thebox/manifest.json | 2 +- resources/maps/titan/manifest.json | 2 +- resources/maps/tradersdream/manifest.json | 2 +- resources/maps/venice/manifest.json | 2 +- resources/maps/warshipwarship/manifest.json | 2 +- resources/maps/worldinverted/manifest.json | 2 +- resources/maps/yellowsea/manifest.json | 2 +- src/core/game/Maps.gen.ts | 104 +++++++++--------- 96 files changed, 156 insertions(+), 144 deletions(-) diff --git a/map-generator/README.md b/map-generator/README.md index 77a4674de..af089f8f3 100644 --- a/map-generator/README.md +++ b/map-generator/README.md @@ -126,7 +126,7 @@ Example: `translation_key` is the key of the map's display name in `../resources/lang/en.json`. It must be `map.`. -`categories` groups the map in the map picker. Each entry must be one of: `featured`, `world`, `europe`, `asia`, `north_america`, `africa`, `south_america`, `oceania`, `antarctica`, `cosmic`, `tournament`, `other`. Maps that straddle regions (e.g. Black Sea, Bering Strait) can list more than one. Add `featured` to show the map in the featured section of the map picker. +`categories` groups the map in the map picker. Each entry must be one of: `featured`, `continental`, `world`, `europe`, `asia`, `north_america`, `africa`, `south_america`, `oceania`, `antarctica`, `cosmic`, `tournament`, `fictional`, `arcade`. Maps that straddle regions (e.g. Black Sea, Bering Strait) can list more than one. Add `featured` to show the map in the featured section of the map picker. `multiplayer_frequency` is how many times the map appears in the public multiplayer playlist. Use 0 (or omit) to keep the map out of the regular rotation. diff --git a/map-generator/assets/maps/achiran/info.json b/map-generator/assets/maps/achiran/info.json index d5ca0e56d..efb8e133b 100644 --- a/map-generator/assets/maps/achiran/info.json +++ b/map-generator/assets/maps/achiran/info.json @@ -2,7 +2,7 @@ "id": "Achiran", "name": "Achiran", "translation_key": "map.achiran", - "categories": ["other"], + "categories": ["fictional", "europe"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/aegean/info.json b/map-generator/assets/maps/aegean/info.json index 30bb39946..9fc0d1ea9 100644 --- a/map-generator/assets/maps/aegean/info.json +++ b/map-generator/assets/maps/aegean/info.json @@ -2,7 +2,7 @@ "id": "Aegean", "name": "Aegean", "translation_key": "map.aegean", - "categories": ["europe"], + "categories": ["europe", "asia"], "multiplayer_frequency": 6, "special_team_count": 2, "nations": [ diff --git a/map-generator/assets/maps/africa/info.json b/map-generator/assets/maps/africa/info.json index ec716faa2..ae1cf1acc 100644 --- a/map-generator/assets/maps/africa/info.json +++ b/map-generator/assets/maps/africa/info.json @@ -2,7 +2,7 @@ "id": "Africa", "name": "Africa", "translation_key": "map.africa", - "categories": ["featured", "africa"], + "categories": ["featured", "continental", "africa"], "multiplayer_frequency": 7, "featured_rank": 6, "nations": [ diff --git a/map-generator/assets/maps/antarctica/info.json b/map-generator/assets/maps/antarctica/info.json index 877bda1de..616950ddc 100644 --- a/map-generator/assets/maps/antarctica/info.json +++ b/map-generator/assets/maps/antarctica/info.json @@ -2,7 +2,7 @@ "id": "Antarctica", "name": "Antarctica", "translation_key": "map.antarctica", - "categories": ["antarctica"], + "categories": ["antarctica", "continental"], "multiplayer_frequency": 1, "nations": [ { diff --git a/map-generator/assets/maps/arctic/info.json b/map-generator/assets/maps/arctic/info.json index c9d122020..fe942493c 100644 --- a/map-generator/assets/maps/arctic/info.json +++ b/map-generator/assets/maps/arctic/info.json @@ -2,7 +2,7 @@ "id": "Arctic", "name": "Arctic", "translation_key": "map.arctic", - "categories": ["europe", "north_america"], + "categories": ["europe", "north_america", "asia"], "multiplayer_frequency": 6, "nations": [ { diff --git a/map-generator/assets/maps/asia/info.json b/map-generator/assets/maps/asia/info.json index 307cc1ffa..ac6ab6a7c 100644 --- a/map-generator/assets/maps/asia/info.json +++ b/map-generator/assets/maps/asia/info.json @@ -2,7 +2,7 @@ "id": "Asia", "name": "Asia", "translation_key": "map.asia", - "categories": ["featured", "asia"], + "categories": ["featured", "continental", "asia"], "multiplayer_frequency": 6, "featured_rank": 5, "nations": [ diff --git a/map-generator/assets/maps/baikalnukewars/info.json b/map-generator/assets/maps/baikalnukewars/info.json index a5656c2b4..d0db34784 100644 --- a/map-generator/assets/maps/baikalnukewars/info.json +++ b/map-generator/assets/maps/baikalnukewars/info.json @@ -3,7 +3,7 @@ "name": "Baikal Nuke Wars", "display_name": "Baikal (Nuke Wars)", "translation_key": "map.baikalnukewars", - "categories": ["other"], + "categories": ["fictional"], "multiplayer_frequency": 0, "nations": [], "teamGameSpawnAreas": { diff --git a/map-generator/assets/maps/balkans/info.json b/map-generator/assets/maps/balkans/info.json index e04d6ac0f..f20a49e80 100644 --- a/map-generator/assets/maps/balkans/info.json +++ b/map-generator/assets/maps/balkans/info.json @@ -2,7 +2,7 @@ "id": "Balkans", "name": "Balkans", "translation_key": "map.balkans", - "categories": ["europe"], + "categories": ["new", "europe"], "multiplayer_frequency": 6, "nations": [ { diff --git a/map-generator/assets/maps/caribbean/info.json b/map-generator/assets/maps/caribbean/info.json index b7589a2d1..0267bb3f0 100644 --- a/map-generator/assets/maps/caribbean/info.json +++ b/map-generator/assets/maps/caribbean/info.json @@ -2,7 +2,7 @@ "id": "Caribbean", "name": "Caribbean", "translation_key": "map.caribbean", - "categories": ["north_america"], + "categories": ["new", "north_america"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/choppingblock/info.json b/map-generator/assets/maps/choppingblock/info.json index df13cfd4f..1b61e756f 100644 --- a/map-generator/assets/maps/choppingblock/info.json +++ b/map-generator/assets/maps/choppingblock/info.json @@ -2,7 +2,7 @@ "id": "ChoppingBlock", "name": "Chopping Block", "translation_key": "map.choppingblock", - "categories": ["other"], + "categories": ["new", "arcade"], "multiplayer_frequency": 5, "special_team_count": 4, "nations": [ diff --git a/map-generator/assets/maps/danishstraits/info.json b/map-generator/assets/maps/danishstraits/info.json index d92adabea..61c40fcf4 100644 --- a/map-generator/assets/maps/danishstraits/info.json +++ b/map-generator/assets/maps/danishstraits/info.json @@ -2,7 +2,7 @@ "id": "DanishStraits", "name": "Danish Straits", "translation_key": "map.danishstraits", - "categories": ["europe"], + "categories": ["new", "europe"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/deglaciatedantarctica/info.json b/map-generator/assets/maps/deglaciatedantarctica/info.json index 9c1dbc0d6..9d9637a88 100644 --- a/map-generator/assets/maps/deglaciatedantarctica/info.json +++ b/map-generator/assets/maps/deglaciatedantarctica/info.json @@ -2,7 +2,7 @@ "id": "DeglaciatedAntarctica", "name": "Deglaciated Antarctica", "translation_key": "map.deglaciatedantarctica", - "categories": ["antarctica"], + "categories": ["antarctica", "fictional"], "multiplayer_frequency": 4, "nations": [ { diff --git a/map-generator/assets/maps/didier/info.json b/map-generator/assets/maps/didier/info.json index 92c5ff2b3..75395ce56 100644 --- a/map-generator/assets/maps/didier/info.json +++ b/map-generator/assets/maps/didier/info.json @@ -2,7 +2,7 @@ "id": "Didier", "name": "Didier", "translation_key": "map.didier", - "categories": ["other"], + "categories": ["arcade"], "multiplayer_frequency": 1, "nations": [ { diff --git a/map-generator/assets/maps/didierfrance/info.json b/map-generator/assets/maps/didierfrance/info.json index a6ba4bf20..39830a45b 100644 --- a/map-generator/assets/maps/didierfrance/info.json +++ b/map-generator/assets/maps/didierfrance/info.json @@ -3,7 +3,7 @@ "name": "Didier France", "display_name": "Didier (France)", "translation_key": "map.didierfrance", - "categories": ["other"], + "categories": ["arcade"], "multiplayer_frequency": 1, "nations": [ { diff --git a/map-generator/assets/maps/dyslexdria/info.json b/map-generator/assets/maps/dyslexdria/info.json index 7d709b08e..08cc96d1f 100644 --- a/map-generator/assets/maps/dyslexdria/info.json +++ b/map-generator/assets/maps/dyslexdria/info.json @@ -2,7 +2,7 @@ "id": "Dyslexdria", "name": "Dyslexdria", "translation_key": "map.dyslexdria", - "categories": ["world"], + "categories": ["world", "fictional"], "multiplayer_frequency": 8, "nations": [ { diff --git a/map-generator/assets/maps/europe/info.json b/map-generator/assets/maps/europe/info.json index aacbb1661..801b74a95 100644 --- a/map-generator/assets/maps/europe/info.json +++ b/map-generator/assets/maps/europe/info.json @@ -2,7 +2,7 @@ "id": "Europe", "name": "Europe", "translation_key": "map.europe", - "categories": ["featured", "europe"], + "categories": ["featured", "continental", "europe"], "multiplayer_frequency": 7, "featured_rank": 2, "nations": [ diff --git a/map-generator/assets/maps/europeclassic/info.json b/map-generator/assets/maps/europeclassic/info.json index f1a2aa6d6..74032a876 100644 --- a/map-generator/assets/maps/europeclassic/info.json +++ b/map-generator/assets/maps/europeclassic/info.json @@ -3,7 +3,7 @@ "name": "Europe Classic", "display_name": "Europe (Classic)", "translation_key": "map.europeclassic", - "categories": ["europe"], + "categories": ["europe", "continental"], "multiplayer_frequency": 0, "nations": [ { diff --git a/map-generator/assets/maps/fourislands/info.json b/map-generator/assets/maps/fourislands/info.json index 95e0ecf39..e2da39b7c 100644 --- a/map-generator/assets/maps/fourislands/info.json +++ b/map-generator/assets/maps/fourislands/info.json @@ -2,7 +2,7 @@ "id": "FourIslands", "name": "Four Islands", "translation_key": "map.fourislands", - "categories": ["other"], + "categories": ["fictional"], "multiplayer_frequency": 4, "special_team_count": 4, "nations": [ diff --git a/map-generator/assets/maps/hawaii/info.json b/map-generator/assets/maps/hawaii/info.json index f19bd8743..5260bc136 100644 --- a/map-generator/assets/maps/hawaii/info.json +++ b/map-generator/assets/maps/hawaii/info.json @@ -2,7 +2,7 @@ "id": "Hawaii", "name": "Hawaii", "translation_key": "map.hawaii", - "categories": ["north_america", "oceania"], + "categories": ["oceania"], "multiplayer_frequency": 4, "nations": [ { diff --git a/map-generator/assets/maps/hongkong/info.json b/map-generator/assets/maps/hongkong/info.json index 2e84027b4..482e62134 100644 --- a/map-generator/assets/maps/hongkong/info.json +++ b/map-generator/assets/maps/hongkong/info.json @@ -2,7 +2,7 @@ "id": "HongKong", "name": "Hong Kong", "translation_key": "map.hongkong", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 6, "nations": [ { diff --git a/map-generator/assets/maps/indiansubcontinent/info.json b/map-generator/assets/maps/indiansubcontinent/info.json index 6cd946cb8..f93905b03 100644 --- a/map-generator/assets/maps/indiansubcontinent/info.json +++ b/map-generator/assets/maps/indiansubcontinent/info.json @@ -2,7 +2,7 @@ "id": "IndianSubcontinent", "name": "Indian Subcontinent", "translation_key": "map.indiansubcontinent", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 8, "nations": [ { diff --git a/map-generator/assets/maps/juandefucastrait/info.json b/map-generator/assets/maps/juandefucastrait/info.json index 026787db8..7c15908ba 100644 --- a/map-generator/assets/maps/juandefucastrait/info.json +++ b/map-generator/assets/maps/juandefucastrait/info.json @@ -2,7 +2,7 @@ "id": "JuanDeFucaStrait", "name": "Juan De Fuca Strait", "translation_key": "map.juandefucastrait", - "categories": ["north_america"], + "categories": ["new", "north_america"], "multiplayer_frequency": 4, "special_team_count": 3, "nations": [ diff --git a/map-generator/assets/maps/korea/info.json b/map-generator/assets/maps/korea/info.json index a08a441e9..b62783a4a 100644 --- a/map-generator/assets/maps/korea/info.json +++ b/map-generator/assets/maps/korea/info.json @@ -2,7 +2,7 @@ "id": "Korea", "name": "Korea", "translation_key": "map.korea", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/labyrinth/info.json b/map-generator/assets/maps/labyrinth/info.json index 0c6793bba..beac85109 100644 --- a/map-generator/assets/maps/labyrinth/info.json +++ b/map-generator/assets/maps/labyrinth/info.json @@ -2,7 +2,7 @@ "id": "Labyrinth", "name": "Labyrinth", "translation_key": "map.labyrinth", - "categories": ["other"], + "categories": ["new", "arcade"], "multiplayer_frequency": 6, "nations": [ { diff --git a/map-generator/assets/maps/marenostrum/info.json b/map-generator/assets/maps/marenostrum/info.json index af51dc323..fc0635bb2 100644 --- a/map-generator/assets/maps/marenostrum/info.json +++ b/map-generator/assets/maps/marenostrum/info.json @@ -2,7 +2,7 @@ "id": "MareNostrum", "name": "Mare Nostrum", "translation_key": "map.marenostrum", - "categories": ["europe"], + "categories": ["europe", "asia", "africa"], "multiplayer_frequency": 6, "nations": [ { diff --git a/map-generator/assets/maps/middleeast/info.json b/map-generator/assets/maps/middleeast/info.json index 309b98f53..be03f62bc 100644 --- a/map-generator/assets/maps/middleeast/info.json +++ b/map-generator/assets/maps/middleeast/info.json @@ -2,7 +2,7 @@ "id": "MiddleEast", "name": "Middle East", "translation_key": "map.middleeast", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 8, "nations": [ { diff --git a/map-generator/assets/maps/mississippiriver/info.json b/map-generator/assets/maps/mississippiriver/info.json index 02d042626..a558fa538 100644 --- a/map-generator/assets/maps/mississippiriver/info.json +++ b/map-generator/assets/maps/mississippiriver/info.json @@ -2,7 +2,7 @@ "id": "MississippiRiver", "name": "Mississippi River", "translation_key": "map.mississippiriver", - "categories": ["north_america"], + "categories": ["new", "north_america"], "multiplayer_frequency": 3, "nations": [ { diff --git a/map-generator/assets/maps/northamerica/info.json b/map-generator/assets/maps/northamerica/info.json index 10d429072..6f63bd2ac 100644 --- a/map-generator/assets/maps/northamerica/info.json +++ b/map-generator/assets/maps/northamerica/info.json @@ -2,7 +2,7 @@ "id": "NorthAmerica", "name": "North America", "translation_key": "map.northamerica", - "categories": ["featured", "north_america"], + "categories": ["featured", "continental", "north_america"], "multiplayer_frequency": 5, "featured_rank": 3, "nations": [ diff --git a/map-generator/assets/maps/northwestpassage/info.json b/map-generator/assets/maps/northwestpassage/info.json index e55a84575..7aaade4c6 100644 --- a/map-generator/assets/maps/northwestpassage/info.json +++ b/map-generator/assets/maps/northwestpassage/info.json @@ -2,7 +2,7 @@ "id": "NorthwestPassage", "name": "Northwest Passage", "translation_key": "map.northwestpassage", - "categories": ["north_america"], + "categories": ["new", "north_america"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/oceania/info.json b/map-generator/assets/maps/oceania/info.json index ad1cce7ab..7a1196f82 100644 --- a/map-generator/assets/maps/oceania/info.json +++ b/map-generator/assets/maps/oceania/info.json @@ -2,7 +2,7 @@ "id": "Oceania", "name": "Oceania", "translation_key": "map.oceania", - "categories": ["oceania"], + "categories": ["oceania", "continental"], "multiplayer_frequency": 0, "nations": [ { diff --git a/map-generator/assets/maps/onion/info.json b/map-generator/assets/maps/onion/info.json index 8c1dcc759..44d184eb7 100644 --- a/map-generator/assets/maps/onion/info.json +++ b/map-generator/assets/maps/onion/info.json @@ -2,7 +2,7 @@ "id": "Onion", "name": "Onion", "translation_key": "map.onion", - "categories": ["other"], + "categories": ["new", "arcade"], "multiplayer_frequency": 2, "nations": [ { diff --git a/map-generator/assets/maps/pangaea/info.json b/map-generator/assets/maps/pangaea/info.json index dba676b2e..de27a0df7 100644 --- a/map-generator/assets/maps/pangaea/info.json +++ b/map-generator/assets/maps/pangaea/info.json @@ -2,7 +2,7 @@ "id": "Pangaea", "name": "Pangaea", "translation_key": "map.pangaea", - "categories": ["other"], + "categories": ["fictional"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/passage/info.json b/map-generator/assets/maps/passage/info.json index dd35950cb..db67a7202 100644 --- a/map-generator/assets/maps/passage/info.json +++ b/map-generator/assets/maps/passage/info.json @@ -2,7 +2,7 @@ "id": "Passage", "name": "Passage", "translation_key": "map.passage", - "categories": ["other"], + "categories": ["fictional"], "multiplayer_frequency": 4, "nations": [ { diff --git a/map-generator/assets/maps/sierpinski/info.json b/map-generator/assets/maps/sierpinski/info.json index a6d1fcb57..3ad7848ff 100644 --- a/map-generator/assets/maps/sierpinski/info.json +++ b/map-generator/assets/maps/sierpinski/info.json @@ -2,7 +2,7 @@ "id": "Sierpinski", "name": "Sierpinski", "translation_key": "map.sierpinski", - "categories": ["other"], + "categories": ["arcade"], "multiplayer_frequency": 10, "nations": [ { diff --git a/map-generator/assets/maps/southamerica/info.json b/map-generator/assets/maps/southamerica/info.json index 0ce0f2b36..d2b3bfa4e 100644 --- a/map-generator/assets/maps/southamerica/info.json +++ b/map-generator/assets/maps/southamerica/info.json @@ -2,7 +2,7 @@ "id": "SouthAmerica", "name": "South America", "translation_key": "map.southamerica", - "categories": ["featured", "south_america"], + "categories": ["featured", "continental", "south_america"], "multiplayer_frequency": 5, "featured_rank": 4, "nations": [ diff --git a/map-generator/assets/maps/southeastasia/info.json b/map-generator/assets/maps/southeastasia/info.json index a62129da0..455da3b46 100644 --- a/map-generator/assets/maps/southeastasia/info.json +++ b/map-generator/assets/maps/southeastasia/info.json @@ -3,7 +3,7 @@ "name": "SoutheastAsia", "display_name": "Southeast Asia", "translation_key": "map.southeastasia", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/surrounded/info.json b/map-generator/assets/maps/surrounded/info.json index 158c8563e..ecdbd96e9 100644 --- a/map-generator/assets/maps/surrounded/info.json +++ b/map-generator/assets/maps/surrounded/info.json @@ -2,7 +2,7 @@ "id": "Surrounded", "name": "Surrounded", "translation_key": "map.surrounded", - "categories": ["other"], + "categories": ["fictional"], "multiplayer_frequency": 4, "special_team_count": 4, "nations": [ diff --git a/map-generator/assets/maps/svalmel/info.json b/map-generator/assets/maps/svalmel/info.json index 36b7ecaea..3b23af2c9 100644 --- a/map-generator/assets/maps/svalmel/info.json +++ b/map-generator/assets/maps/svalmel/info.json @@ -2,7 +2,7 @@ "id": "Svalmel", "name": "Svalmel", "translation_key": "map.svalmel", - "categories": ["other"], + "categories": ["fictional", "europe", "north_america"], "multiplayer_frequency": 8, "nations": [ { diff --git a/map-generator/assets/maps/taiwanstrait/info.json b/map-generator/assets/maps/taiwanstrait/info.json index 99e832689..96915e005 100644 --- a/map-generator/assets/maps/taiwanstrait/info.json +++ b/map-generator/assets/maps/taiwanstrait/info.json @@ -2,7 +2,7 @@ "id": "TaiwanStrait", "name": "Taiwan Strait", "translation_key": "map.taiwanstrait", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/thebox/info.json b/map-generator/assets/maps/thebox/info.json index 71e59da00..b5f3c42a8 100644 --- a/map-generator/assets/maps/thebox/info.json +++ b/map-generator/assets/maps/thebox/info.json @@ -2,7 +2,7 @@ "id": "TheBox", "name": "The Box", "translation_key": "map.thebox", - "categories": ["other"], + "categories": ["arcade"], "multiplayer_frequency": 3, "nations": [ { diff --git a/map-generator/assets/maps/titan/info.json b/map-generator/assets/maps/titan/info.json index 3fa2deae1..d23ccaa6e 100644 --- a/map-generator/assets/maps/titan/info.json +++ b/map-generator/assets/maps/titan/info.json @@ -2,7 +2,7 @@ "id": "Titan", "name": "Titan", "translation_key": "map.titan", - "categories": ["cosmic"], + "categories": ["new", "cosmic"], "multiplayer_frequency": 3, "nations": [ { diff --git a/map-generator/assets/maps/tradersdream/info.json b/map-generator/assets/maps/tradersdream/info.json index ee8dba415..e0cc4351c 100644 --- a/map-generator/assets/maps/tradersdream/info.json +++ b/map-generator/assets/maps/tradersdream/info.json @@ -2,7 +2,7 @@ "id": "TradersDream", "name": "Traders Dream", "translation_key": "map.tradersdream", - "categories": ["other"], + "categories": ["fictional"], "multiplayer_frequency": 4, "special_team_count": 2, "nations": [ diff --git a/map-generator/assets/maps/venice/info.json b/map-generator/assets/maps/venice/info.json index 9854b75d6..0ddfdcf79 100644 --- a/map-generator/assets/maps/venice/info.json +++ b/map-generator/assets/maps/venice/info.json @@ -2,7 +2,7 @@ "id": "Venice", "name": "Venice", "translation_key": "map.venice", - "categories": ["europe"], + "categories": ["new", "europe"], "multiplayer_frequency": 6, "nations": [ { diff --git a/map-generator/assets/maps/warshipwarship/info.json b/map-generator/assets/maps/warshipwarship/info.json index 6fc914b44..746a04c7e 100644 --- a/map-generator/assets/maps/warshipwarship/info.json +++ b/map-generator/assets/maps/warshipwarship/info.json @@ -3,7 +3,7 @@ "id": "WarshipWarship", "translation_key": "map.warshipwarship", "multiplayer_frequency": 3, - "categories": ["other"], + "categories": ["arcade", "new"], "nations": [ { "coordinates": [750, 680], diff --git a/map-generator/assets/maps/worldinverted/info.json b/map-generator/assets/maps/worldinverted/info.json index 9b68550be..15431da8d 100644 --- a/map-generator/assets/maps/worldinverted/info.json +++ b/map-generator/assets/maps/worldinverted/info.json @@ -2,7 +2,7 @@ "id": "WorldInverted", "name": "World Inverted", "translation_key": "map.worldinverted", - "categories": ["world"], + "categories": ["new", "world", "fictional"], "multiplayer_frequency": 8, "nations": [ { diff --git a/map-generator/assets/maps/yellowsea/info.json b/map-generator/assets/maps/yellowsea/info.json index cb2a49830..e13f0b570 100644 --- a/map-generator/assets/maps/yellowsea/info.json +++ b/map-generator/assets/maps/yellowsea/info.json @@ -2,7 +2,7 @@ "id": "YellowSea", "name": "Yellow Sea", "translation_key": "map.yellowsea", - "categories": ["asia"], + "categories": ["new", "asia"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/codegen.go b/map-generator/codegen.go index d37f829b9..0df0434b6 100644 --- a/map-generator/codegen.go +++ b/map-generator/codegen.go @@ -13,7 +13,9 @@ import ( // the display order of map categories in the generated TypeScript. var categoryOrder = []string{ "featured", + "new", "world", + "continental", "europe", "asia", "north_america", @@ -22,8 +24,9 @@ var categoryOrder = []string{ "oceania", "antarctica", "cosmic", + "fictional", + "arcade", "tournament", - "other", } // mapInfo is the subset of info.json fields used for code generation. diff --git a/resources/lang/en.json b/resources/lang/en.json index 8667686a3..f4b489432 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -911,14 +911,17 @@ "map_categories": { "africa": "Africa", "antarctica": "Antarctica", + "arcade": "Arcade", "asia": "Asia", + "continental": "Continental", "cosmic": "Cosmic", "europe": "Europe", "favorites": "Favourites", "featured": "Featured", + "fictional": "Fictional", + "new": "New", "north_america": "North America", "oceania": "Oceania", - "other": "Other", "south_america": "South America", "special": "Special", "tournament": "Tournament", diff --git a/resources/maps/achiran/manifest.json b/resources/maps/achiran/manifest.json index 3640e2849..0ddbbbb38 100644 --- a/resources/maps/achiran/manifest.json +++ b/resources/maps/achiran/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional", "europe"], "id": "Achiran", "map": { "height": 1700, diff --git a/resources/maps/aegean/manifest.json b/resources/maps/aegean/manifest.json index e46e5dc3a..7b76b3bcb 100644 --- a/resources/maps/aegean/manifest.json +++ b/resources/maps/aegean/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["europe"], + "categories": ["europe", "asia"], "id": "Aegean", "map": { "height": 2000, diff --git a/resources/maps/africa/manifest.json b/resources/maps/africa/manifest.json index 71dbf924a..9f8598fe0 100644 --- a/resources/maps/africa/manifest.json +++ b/resources/maps/africa/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["featured", "africa"], + "categories": ["featured", "continental", "africa"], "featured_rank": 6, "id": "Africa", "map": { diff --git a/resources/maps/antarctica/manifest.json b/resources/maps/antarctica/manifest.json index d8f44352d..f6b8dd777 100644 --- a/resources/maps/antarctica/manifest.json +++ b/resources/maps/antarctica/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["antarctica"], + "categories": ["antarctica", "continental"], "id": "Antarctica", "map": { "height": 2000, diff --git a/resources/maps/arctic/manifest.json b/resources/maps/arctic/manifest.json index 196672e10..2032fc710 100644 --- a/resources/maps/arctic/manifest.json +++ b/resources/maps/arctic/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["europe", "north_america"], + "categories": ["europe", "north_america", "asia"], "id": "Arctic", "map": { "height": 1828, diff --git a/resources/maps/asia/manifest.json b/resources/maps/asia/manifest.json index 7943b4b14..95b6cb2f9 100644 --- a/resources/maps/asia/manifest.json +++ b/resources/maps/asia/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["featured", "asia"], + "categories": ["featured", "continental", "asia"], "featured_rank": 5, "id": "Asia", "map": { diff --git a/resources/maps/baikalnukewars/manifest.json b/resources/maps/baikalnukewars/manifest.json index fffa4f904..d8cae74c3 100644 --- a/resources/maps/baikalnukewars/manifest.json +++ b/resources/maps/baikalnukewars/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional"], "display_name": "Baikal (Nuke Wars)", "id": "BaikalNukeWars", "map": { diff --git a/resources/maps/balkans/manifest.json b/resources/maps/balkans/manifest.json index 767b17acb..e86de6d14 100644 --- a/resources/maps/balkans/manifest.json +++ b/resources/maps/balkans/manifest.json @@ -196,7 +196,7 @@ "name": "Western Macedonia" } ], - "categories": ["europe"], + "categories": ["new", "europe"], "id": "Balkans", "map": { "height": 2048, diff --git a/resources/maps/caribbean/manifest.json b/resources/maps/caribbean/manifest.json index af708fe5e..ff7521239 100644 --- a/resources/maps/caribbean/manifest.json +++ b/resources/maps/caribbean/manifest.json @@ -141,7 +141,7 @@ "name": "Tobago" } ], - "categories": ["north_america"], + "categories": ["new", "north_america"], "id": "Caribbean", "map": { "height": 1808, diff --git a/resources/maps/choppingblock/manifest.json b/resources/maps/choppingblock/manifest.json index 70df869c4..aa4ede50c 100644 --- a/resources/maps/choppingblock/manifest.json +++ b/resources/maps/choppingblock/manifest.json @@ -142,7 +142,7 @@ "name": "Honeycomb" } ], - "categories": ["other"], + "categories": ["new", "arcade"], "id": "ChoppingBlock", "map": { "height": 1616, diff --git a/resources/maps/danishstraits/manifest.json b/resources/maps/danishstraits/manifest.json index 4e5b25503..35a4dc84a 100644 --- a/resources/maps/danishstraits/manifest.json +++ b/resources/maps/danishstraits/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["europe"], + "categories": ["new", "europe"], "id": "DanishStraits", "map": { "height": 1224, diff --git a/resources/maps/deglaciatedantarctica/manifest.json b/resources/maps/deglaciatedantarctica/manifest.json index f9b3ab350..4b46ab0bc 100644 --- a/resources/maps/deglaciatedantarctica/manifest.json +++ b/resources/maps/deglaciatedantarctica/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["antarctica"], + "categories": ["antarctica", "fictional"], "id": "DeglaciatedAntarctica", "map": { "height": 1840, diff --git a/resources/maps/didier/manifest.json b/resources/maps/didier/manifest.json index eb3f7f53b..c5cfa0e19 100644 --- a/resources/maps/didier/manifest.json +++ b/resources/maps/didier/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["arcade"], "id": "Didier", "map": { "height": 1348, diff --git a/resources/maps/didierfrance/manifest.json b/resources/maps/didierfrance/manifest.json index 1166890b1..42a0b9a7b 100644 --- a/resources/maps/didierfrance/manifest.json +++ b/resources/maps/didierfrance/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["arcade"], "display_name": "Didier (France)", "id": "DidierFrance", "map": { diff --git a/resources/maps/dyslexdria/manifest.json b/resources/maps/dyslexdria/manifest.json index bdde9d0af..a79bd9437 100644 --- a/resources/maps/dyslexdria/manifest.json +++ b/resources/maps/dyslexdria/manifest.json @@ -569,7 +569,7 @@ "name": "Patrick Plays Badly" } ], - "categories": ["world"], + "categories": ["world", "fictional"], "id": "Dyslexdria", "map": { "height": 1344, diff --git a/resources/maps/europe/manifest.json b/resources/maps/europe/manifest.json index ce9f7077d..4a92b6e05 100644 --- a/resources/maps/europe/manifest.json +++ b/resources/maps/europe/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["featured", "europe"], + "categories": ["featured", "continental", "europe"], "featured_rank": 2, "id": "Europe", "map": { diff --git a/resources/maps/europeclassic/manifest.json b/resources/maps/europeclassic/manifest.json index b215d8b85..9e192d3f4 100644 --- a/resources/maps/europeclassic/manifest.json +++ b/resources/maps/europeclassic/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["europe"], + "categories": ["europe", "continental"], "display_name": "Europe (Classic)", "id": "EuropeClassic", "map": { diff --git a/resources/maps/fourislands/manifest.json b/resources/maps/fourislands/manifest.json index 87f639e07..4e94688d4 100644 --- a/resources/maps/fourislands/manifest.json +++ b/resources/maps/fourislands/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional"], "id": "FourIslands", "map": { "height": 1500, diff --git a/resources/maps/hawaii/manifest.json b/resources/maps/hawaii/manifest.json index fc059491a..42e7ca7c3 100644 --- a/resources/maps/hawaii/manifest.json +++ b/resources/maps/hawaii/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["north_america", "oceania"], + "categories": ["oceania"], "id": "Hawaii", "map": { "height": 2076, diff --git a/resources/maps/hongkong/manifest.json b/resources/maps/hongkong/manifest.json index 56a1b7c34..5a8153351 100644 --- a/resources/maps/hongkong/manifest.json +++ b/resources/maps/hongkong/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["new", "asia"], "id": "HongKong", "map": { "height": 1996, diff --git a/resources/maps/indiansubcontinent/manifest.json b/resources/maps/indiansubcontinent/manifest.json index 16cce6d3c..94303eaf7 100644 --- a/resources/maps/indiansubcontinent/manifest.json +++ b/resources/maps/indiansubcontinent/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["new", "asia"], "id": "IndianSubcontinent", "map": { "height": 2220, diff --git a/resources/maps/juandefucastrait/manifest.json b/resources/maps/juandefucastrait/manifest.json index 9fdcd2307..7e1d76f5c 100644 --- a/resources/maps/juandefucastrait/manifest.json +++ b/resources/maps/juandefucastrait/manifest.json @@ -221,7 +221,7 @@ "name": "Sudden Valley" } ], - "categories": ["north_america"], + "categories": ["new", "north_america"], "id": "JuanDeFucaStrait", "map": { "height": 1100, diff --git a/resources/maps/korea/manifest.json b/resources/maps/korea/manifest.json index 007bd5a50..1dd78ee7e 100644 --- a/resources/maps/korea/manifest.json +++ b/resources/maps/korea/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["new", "asia"], "id": "Korea", "map": { "height": 2148, diff --git a/resources/maps/labyrinth/manifest.json b/resources/maps/labyrinth/manifest.json index c624eb6a9..44a9c5e7d 100644 --- a/resources/maps/labyrinth/manifest.json +++ b/resources/maps/labyrinth/manifest.json @@ -226,7 +226,7 @@ "name": "Zapopan" } ], - "categories": ["other"], + "categories": ["new", "arcade"], "id": "Labyrinth", "map": { "height": 1360, diff --git a/resources/maps/marenostrum/manifest.json b/resources/maps/marenostrum/manifest.json index 60d7aaafb..729c0e61c 100644 --- a/resources/maps/marenostrum/manifest.json +++ b/resources/maps/marenostrum/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["europe"], + "categories": ["europe", "asia", "africa"], "id": "MareNostrum", "map": { "height": 1448, diff --git a/resources/maps/middleeast/manifest.json b/resources/maps/middleeast/manifest.json index f75cd71f2..d63a27f90 100644 --- a/resources/maps/middleeast/manifest.json +++ b/resources/maps/middleeast/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["new", "asia"], "id": "MiddleEast", "map": { "height": 2060, diff --git a/resources/maps/mississippiriver/manifest.json b/resources/maps/mississippiriver/manifest.json index 7cf9b41ef..e6258ee41 100644 --- a/resources/maps/mississippiriver/manifest.json +++ b/resources/maps/mississippiriver/manifest.json @@ -256,7 +256,7 @@ "name": "Round Lake" } ], - "categories": ["north_america"], + "categories": ["new", "north_america"], "id": "MississippiRiver", "map": { "height": 4200, diff --git a/resources/maps/northamerica/manifest.json b/resources/maps/northamerica/manifest.json index 7404a4dcd..3a9450657 100644 --- a/resources/maps/northamerica/manifest.json +++ b/resources/maps/northamerica/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["featured", "north_america"], + "categories": ["featured", "continental", "north_america"], "featured_rank": 3, "id": "NorthAmerica", "map": { diff --git a/resources/maps/northwestpassage/manifest.json b/resources/maps/northwestpassage/manifest.json index 84a034256..8bd14a409 100644 --- a/resources/maps/northwestpassage/manifest.json +++ b/resources/maps/northwestpassage/manifest.json @@ -196,7 +196,7 @@ "name": "Zackenberg" } ], - "categories": ["north_america"], + "categories": ["new", "north_america"], "id": "NorthwestPassage", "map": { "height": 1664, diff --git a/resources/maps/oceania/manifest.json b/resources/maps/oceania/manifest.json index 0159d53ba..bb3f5232e 100644 --- a/resources/maps/oceania/manifest.json +++ b/resources/maps/oceania/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["oceania"], + "categories": ["oceania", "continental"], "id": "Oceania", "map": { "height": 1000, diff --git a/resources/maps/onion/manifest.json b/resources/maps/onion/manifest.json index d25d1e56a..17bd5816e 100644 --- a/resources/maps/onion/manifest.json +++ b/resources/maps/onion/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["new", "arcade"], "id": "Onion", "map": { "height": 512, diff --git a/resources/maps/pangaea/manifest.json b/resources/maps/pangaea/manifest.json index f642ed4e7..2d2104957 100644 --- a/resources/maps/pangaea/manifest.json +++ b/resources/maps/pangaea/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional"], "id": "Pangaea", "map": { "height": 1000, diff --git a/resources/maps/passage/manifest.json b/resources/maps/passage/manifest.json index 21ecc5983..50058c80b 100644 --- a/resources/maps/passage/manifest.json +++ b/resources/maps/passage/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional"], "id": "Passage", "map": { "height": 400, diff --git a/resources/maps/sierpinski/manifest.json b/resources/maps/sierpinski/manifest.json index de1bb903e..0941f3310 100644 --- a/resources/maps/sierpinski/manifest.json +++ b/resources/maps/sierpinski/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["arcade"], "id": "Sierpinski", "map": { "height": 1400, diff --git a/resources/maps/southamerica/manifest.json b/resources/maps/southamerica/manifest.json index be082731f..fb3993f1d 100644 --- a/resources/maps/southamerica/manifest.json +++ b/resources/maps/southamerica/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["featured", "south_america"], + "categories": ["featured", "continental", "south_america"], "featured_rank": 4, "id": "SouthAmerica", "map": { diff --git a/resources/maps/southeastasia/manifest.json b/resources/maps/southeastasia/manifest.json index 996677d2e..3e46eca49 100644 --- a/resources/maps/southeastasia/manifest.json +++ b/resources/maps/southeastasia/manifest.json @@ -156,7 +156,7 @@ "name": "Paracel Islands" } ], - "categories": ["asia"], + "categories": ["new", "asia"], "display_name": "Southeast Asia", "id": "SoutheastAsia", "map": { diff --git a/resources/maps/surrounded/manifest.json b/resources/maps/surrounded/manifest.json index f29200a0c..36488b01c 100644 --- a/resources/maps/surrounded/manifest.json +++ b/resources/maps/surrounded/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional"], "id": "Surrounded", "map": { "height": 1976, diff --git a/resources/maps/svalmel/manifest.json b/resources/maps/svalmel/manifest.json index 1acccb55b..fbb49b386 100644 --- a/resources/maps/svalmel/manifest.json +++ b/resources/maps/svalmel/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional", "europe", "north_america"], "id": "Svalmel", "map": { "height": 1580, diff --git a/resources/maps/taiwanstrait/manifest.json b/resources/maps/taiwanstrait/manifest.json index b4f4d2569..1d5cbc453 100644 --- a/resources/maps/taiwanstrait/manifest.json +++ b/resources/maps/taiwanstrait/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["new", "asia"], "id": "TaiwanStrait", "map": { "height": 1600, diff --git a/resources/maps/thebox/manifest.json b/resources/maps/thebox/manifest.json index 2f56ac911..d296ae1ea 100644 --- a/resources/maps/thebox/manifest.json +++ b/resources/maps/thebox/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["arcade"], "id": "TheBox", "map": { "height": 2048, diff --git a/resources/maps/titan/manifest.json b/resources/maps/titan/manifest.json index 07a67af5c..e0fd6e5f8 100644 --- a/resources/maps/titan/manifest.json +++ b/resources/maps/titan/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["cosmic"], + "categories": ["new", "cosmic"], "id": "Titan", "map": { "height": 2160, diff --git a/resources/maps/tradersdream/manifest.json b/resources/maps/tradersdream/manifest.json index 1b45836ef..db307d0f7 100644 --- a/resources/maps/tradersdream/manifest.json +++ b/resources/maps/tradersdream/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["other"], + "categories": ["fictional"], "id": "TradersDream", "map": { "height": 1920, diff --git a/resources/maps/venice/manifest.json b/resources/maps/venice/manifest.json index 7a9151965..4a3e656a0 100644 --- a/resources/maps/venice/manifest.json +++ b/resources/maps/venice/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["europe"], + "categories": ["new", "europe"], "id": "Venice", "map": { "height": 1500, diff --git a/resources/maps/warshipwarship/manifest.json b/resources/maps/warshipwarship/manifest.json index 711a77bad..be24280b7 100644 --- a/resources/maps/warshipwarship/manifest.json +++ b/resources/maps/warshipwarship/manifest.json @@ -91,7 +91,7 @@ "name": "Redoubt Ridge" } ], - "categories": ["other"], + "categories": ["arcade", "new"], "id": "WarshipWarship", "map": { "height": 1396, diff --git a/resources/maps/worldinverted/manifest.json b/resources/maps/worldinverted/manifest.json index 8f9706e30..addc3ed3f 100644 --- a/resources/maps/worldinverted/manifest.json +++ b/resources/maps/worldinverted/manifest.json @@ -951,7 +951,7 @@ "name": "Reykjanes Delta" } ], - "categories": ["world"], + "categories": ["new", "world", "fictional"], "id": "WorldInverted", "map": { "height": 1248, diff --git a/resources/maps/yellowsea/manifest.json b/resources/maps/yellowsea/manifest.json index 2adb15451..078af507f 100644 --- a/resources/maps/yellowsea/manifest.json +++ b/resources/maps/yellowsea/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["new", "asia"], "id": "YellowSea", "map": { "height": 1152, diff --git a/src/core/game/Maps.gen.ts b/src/core/game/Maps.gen.ts index 38c9e1670..a1d91a97a 100644 --- a/src/core/game/Maps.gen.ts +++ b/src/core/game/Maps.gen.ts @@ -104,7 +104,9 @@ export type GameMapName = keyof typeof GameMapType; export type MapCategory = | "featured" + | "new" | "world" + | "continental" | "europe" | "asia" | "north_america" @@ -113,13 +115,16 @@ export type MapCategory = | "oceania" | "antarctica" | "cosmic" - | "tournament" - | "other"; + | "fictional" + | "arcade" + | "tournament"; // Category display order in the map picker. export const mapCategoryOrder: readonly MapCategory[] = [ "featured", + "new", "world", + "continental", "europe", "asia", "north_america", @@ -128,8 +133,9 @@ export const mapCategoryOrder: readonly MapCategory[] = [ "oceania", "antarctica", "cosmic", + "fictional", + "arcade", "tournament", - "other", ]; export interface MapInfo { @@ -154,14 +160,14 @@ export const maps: readonly MapInfo[] = [ id: "Achiran", type: GameMapType.Achiran, translationKey: "map.achiran", - categories: ["other"], + categories: ["fictional", "europe"], multiplayerFrequency: 5, }, { id: "Aegean", type: GameMapType.Aegean, translationKey: "map.aegean", - categories: ["europe"], + categories: ["europe", "asia"], multiplayerFrequency: 6, specialTeamCount: 2, }, @@ -169,7 +175,7 @@ export const maps: readonly MapInfo[] = [ id: "Africa", type: GameMapType.Africa, translationKey: "map.africa", - categories: ["featured", "africa"], + categories: ["featured", "continental", "africa"], multiplayerFrequency: 7, featuredRank: 6, }, @@ -191,7 +197,7 @@ export const maps: readonly MapInfo[] = [ id: "Antarctica", type: GameMapType.Antarctica, translationKey: "map.antarctica", - categories: ["antarctica"], + categories: ["antarctica", "continental"], multiplayerFrequency: 1, }, { @@ -205,14 +211,14 @@ export const maps: readonly MapInfo[] = [ id: "Arctic", type: GameMapType.Arctic, translationKey: "map.arctic", - categories: ["europe", "north_america"], + categories: ["europe", "north_america", "asia"], multiplayerFrequency: 6, }, { id: "Asia", type: GameMapType.Asia, translationKey: "map.asia", - categories: ["featured", "asia"], + categories: ["featured", "continental", "asia"], multiplayerFrequency: 6, featuredRank: 5, }, @@ -235,7 +241,7 @@ export const maps: readonly MapInfo[] = [ id: "BaikalNukeWars", type: GameMapType.BaikalNukeWars, translationKey: "map.baikalnukewars", - categories: ["other"], + categories: ["fictional"], multiplayerFrequency: 0, }, { @@ -249,7 +255,7 @@ export const maps: readonly MapInfo[] = [ id: "Balkans", type: GameMapType.Balkans, translationKey: "map.balkans", - categories: ["europe"], + categories: ["new", "europe"], multiplayerFrequency: 6, }, { @@ -308,7 +314,7 @@ export const maps: readonly MapInfo[] = [ id: "Caribbean", type: GameMapType.Caribbean, translationKey: "map.caribbean", - categories: ["north_america"], + categories: ["new", "north_america"], multiplayerFrequency: 5, }, { @@ -322,7 +328,7 @@ export const maps: readonly MapInfo[] = [ id: "ChoppingBlock", type: GameMapType.ChoppingBlock, translationKey: "map.choppingblock", - categories: ["other"], + categories: ["new", "arcade"], multiplayerFrequency: 5, specialTeamCount: 4, }, @@ -338,35 +344,35 @@ export const maps: readonly MapInfo[] = [ id: "DanishStraits", type: GameMapType.DanishStraits, translationKey: "map.danishstraits", - categories: ["europe"], + categories: ["new", "europe"], multiplayerFrequency: 5, }, { id: "DeglaciatedAntarctica", type: GameMapType.DeglaciatedAntarctica, translationKey: "map.deglaciatedantarctica", - categories: ["antarctica"], + categories: ["antarctica", "fictional"], multiplayerFrequency: 4, }, { id: "Didier", type: GameMapType.Didier, translationKey: "map.didier", - categories: ["other"], + categories: ["arcade"], multiplayerFrequency: 1, }, { id: "DidierFrance", type: GameMapType.DidierFrance, translationKey: "map.didierfrance", - categories: ["other"], + categories: ["arcade"], multiplayerFrequency: 1, }, { id: "Dyslexdria", type: GameMapType.Dyslexdria, translationKey: "map.dyslexdria", - categories: ["world"], + categories: ["world", "fictional"], multiplayerFrequency: 8, }, { @@ -380,7 +386,7 @@ export const maps: readonly MapInfo[] = [ id: "Europe", type: GameMapType.Europe, translationKey: "map.europe", - categories: ["featured", "europe"], + categories: ["featured", "continental", "europe"], multiplayerFrequency: 7, featuredRank: 2, }, @@ -388,7 +394,7 @@ export const maps: readonly MapInfo[] = [ id: "EuropeClassic", type: GameMapType.EuropeClassic, translationKey: "map.europeclassic", - categories: ["europe"], + categories: ["europe", "continental"], multiplayerFrequency: 0, }, { @@ -410,7 +416,7 @@ export const maps: readonly MapInfo[] = [ id: "FourIslands", type: GameMapType.FourIslands, translationKey: "map.fourislands", - categories: ["other"], + categories: ["fictional"], multiplayerFrequency: 4, specialTeamCount: 4, }, @@ -454,14 +460,14 @@ export const maps: readonly MapInfo[] = [ id: "Hawaii", type: GameMapType.Hawaii, translationKey: "map.hawaii", - categories: ["north_america", "oceania"], + categories: ["oceania"], multiplayerFrequency: 4, }, { id: "HongKong", type: GameMapType.HongKong, translationKey: "map.hongkong", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 6, }, { @@ -475,7 +481,7 @@ export const maps: readonly MapInfo[] = [ id: "IndianSubcontinent", type: GameMapType.IndianSubcontinent, translationKey: "map.indiansubcontinent", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 8, }, { @@ -497,7 +503,7 @@ export const maps: readonly MapInfo[] = [ id: "JuanDeFucaStrait", type: GameMapType.JuanDeFucaStrait, translationKey: "map.juandefucastrait", - categories: ["north_america"], + categories: ["new", "north_america"], multiplayerFrequency: 4, specialTeamCount: 3, }, @@ -505,14 +511,14 @@ export const maps: readonly MapInfo[] = [ id: "Korea", type: GameMapType.Korea, translationKey: "map.korea", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 5, }, { id: "Labyrinth", type: GameMapType.Labyrinth, translationKey: "map.labyrinth", - categories: ["other"], + categories: ["new", "arcade"], multiplayerFrequency: 6, }, { @@ -555,7 +561,7 @@ export const maps: readonly MapInfo[] = [ id: "MareNostrum", type: GameMapType.MareNostrum, translationKey: "map.marenostrum", - categories: ["europe"], + categories: ["europe", "asia", "africa"], multiplayerFrequency: 6, }, { @@ -576,7 +582,7 @@ export const maps: readonly MapInfo[] = [ id: "MiddleEast", type: GameMapType.MiddleEast, translationKey: "map.middleeast", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 8, }, { @@ -590,7 +596,7 @@ export const maps: readonly MapInfo[] = [ id: "MississippiRiver", type: GameMapType.MississippiRiver, translationKey: "map.mississippiriver", - categories: ["north_america"], + categories: ["new", "north_america"], multiplayerFrequency: 3, }, { @@ -618,7 +624,7 @@ export const maps: readonly MapInfo[] = [ id: "NorthAmerica", type: GameMapType.NorthAmerica, translationKey: "map.northamerica", - categories: ["featured", "north_america"], + categories: ["featured", "continental", "north_america"], multiplayerFrequency: 5, featuredRank: 3, }, @@ -626,35 +632,35 @@ export const maps: readonly MapInfo[] = [ id: "NorthwestPassage", type: GameMapType.NorthwestPassage, translationKey: "map.northwestpassage", - categories: ["north_america"], + categories: ["new", "north_america"], multiplayerFrequency: 5, }, { id: "Oceania", type: GameMapType.Oceania, translationKey: "map.oceania", - categories: ["oceania"], + categories: ["oceania", "continental"], multiplayerFrequency: 0, }, { id: "Onion", type: GameMapType.Onion, translationKey: "map.onion", - categories: ["other"], + categories: ["new", "arcade"], multiplayerFrequency: 2, }, { id: "Pangaea", type: GameMapType.Pangaea, translationKey: "map.pangaea", - categories: ["other"], + categories: ["fictional"], multiplayerFrequency: 5, }, { id: "Passage", type: GameMapType.Passage, translationKey: "map.passage", - categories: ["other"], + categories: ["fictional"], multiplayerFrequency: 4, }, { @@ -676,14 +682,14 @@ export const maps: readonly MapInfo[] = [ id: "Sierpinski", type: GameMapType.Sierpinski, translationKey: "map.sierpinski", - categories: ["other"], + categories: ["arcade"], multiplayerFrequency: 10, }, { id: "SouthAmerica", type: GameMapType.SouthAmerica, translationKey: "map.southamerica", - categories: ["featured", "south_america"], + categories: ["featured", "continental", "south_america"], multiplayerFrequency: 5, featuredRank: 4, }, @@ -691,7 +697,7 @@ export const maps: readonly MapInfo[] = [ id: "SoutheastAsia", type: GameMapType.SoutheastAsia, translationKey: "map.southeastasia", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 5, }, { @@ -721,7 +727,7 @@ export const maps: readonly MapInfo[] = [ id: "Surrounded", type: GameMapType.Surrounded, translationKey: "map.surrounded", - categories: ["other"], + categories: ["fictional"], multiplayerFrequency: 4, specialTeamCount: 4, }, @@ -729,28 +735,28 @@ export const maps: readonly MapInfo[] = [ id: "Svalmel", type: GameMapType.Svalmel, translationKey: "map.svalmel", - categories: ["other"], + categories: ["fictional", "europe", "north_america"], multiplayerFrequency: 8, }, { id: "TaiwanStrait", type: GameMapType.TaiwanStrait, translationKey: "map.taiwanstrait", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 5, }, { id: "TheBox", type: GameMapType.TheBox, translationKey: "map.thebox", - categories: ["other"], + categories: ["arcade"], multiplayerFrequency: 3, }, { id: "Titan", type: GameMapType.Titan, translationKey: "map.titan", - categories: ["cosmic"], + categories: ["new", "cosmic"], multiplayerFrequency: 3, }, { @@ -785,7 +791,7 @@ export const maps: readonly MapInfo[] = [ id: "TradersDream", type: GameMapType.TradersDream, translationKey: "map.tradersdream", - categories: ["other"], + categories: ["fictional"], multiplayerFrequency: 4, specialTeamCount: 2, }, @@ -800,14 +806,14 @@ export const maps: readonly MapInfo[] = [ id: "Venice", type: GameMapType.Venice, translationKey: "map.venice", - categories: ["europe"], + categories: ["new", "europe"], multiplayerFrequency: 6, }, { id: "WarshipWarship", type: GameMapType.WarshipWarship, translationKey: "map.warshipwarship", - categories: ["other"], + categories: ["arcade", "new"], multiplayerFrequency: 3, }, { @@ -822,14 +828,14 @@ export const maps: readonly MapInfo[] = [ id: "WorldInverted", type: GameMapType.WorldInverted, translationKey: "map.worldinverted", - categories: ["world"], + categories: ["new", "world", "fictional"], multiplayerFrequency: 8, }, { id: "YellowSea", type: GameMapType.YellowSea, translationKey: "map.yellowsea", - categories: ["asia"], + categories: ["new", "asia"], multiplayerFrequency: 5, }, {