diff --git a/map-generator/README.md b/map-generator/README.md index d0d254cb1..4d3d8a12b 100644 --- a/map-generator/README.md +++ b/map-generator/README.md @@ -135,7 +135,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`, `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. +`categories` groups the map in the map picker. Each entry must be one of: `new`, `featured`, `continental`, `world`, `europe`, `asia`, `north_america`, `africa`, `south_america`, `oceania`, `antarctica`, `countries`, `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/unitedstates/image.png b/map-generator/assets/maps/unitedstates/image.png new file mode 100644 index 000000000..d2d09a163 Binary files /dev/null and b/map-generator/assets/maps/unitedstates/image.png differ diff --git a/map-generator/assets/maps/unitedstates/info.json b/map-generator/assets/maps/unitedstates/info.json new file mode 100644 index 000000000..49c612e0e --- /dev/null +++ b/map-generator/assets/maps/unitedstates/info.json @@ -0,0 +1,321 @@ +{ + "id": "UnitedStates", + "name": "United States", + "translation_key": "map.unitedstates", + "categories": ["north_america", "new", "countries"], + "multiplayer_frequency": 9, + "nations": [ + { + "coordinates": [320, 692], + "name": "California", + "flag": "California" + }, + { + "coordinates": [439, 344], + "name": "Oregon", + "flag": "Oregon" + }, + { + "coordinates": [490, 174], + "name": "Washington", + "flag": "Washington" + }, + { + "coordinates": [677, 375], + "name": "Idaho", + "flag": "Idaho" + }, + { + "coordinates": [558, 658], + "name": "Nevada", + "flag": "Nevada" + }, + { + "coordinates": [660, 941], + "name": "Arizona", + "flag": "Arizona" + }, + { + "coordinates": [716, 681], + "name": "Utah", + "flag": "Utah" + }, + { + "coordinates": [943, 279], + "name": "Montana", + "flag": "Montana" + }, + { + "coordinates": [1005, 500], + "name": "Wyoming", + "flag": "Wyoming" + }, + { + "coordinates": [971, 735], + "name": "Colorado", + "flag": "Colorado" + }, + { + "coordinates": [940, 922], + "name": "New Mexico", + "flag": "New_Mexico" + }, + { + "coordinates": [1254, 1191], + "name": "Texas", + "flag": "Texas" + }, + { + "coordinates": [1597, 1201], + "name": "Louisiana", + "flag": "Louisiana" + }, + { + "coordinates": [1322, 961], + "name": "Oklahoma", + "flag": "Oklahoma" + }, + { + "coordinates": [1277, 262], + "name": "North Dakota", + "flag": "North_Dakota" + }, + { + "coordinates": [1274, 437], + "name": "South Dakota", + "flag": "South_Dakota" + }, + { + "coordinates": [1285, 621], + "name": "Nebraska", + "flag": "Nebraska" + }, + { + "coordinates": [1308, 817], + "name": "Kansas", + "flag": "Kansas" + }, + { + "coordinates": [1513, 383], + "name": "Minnesota", + "flag": "Minnesota" + }, + { + "coordinates": [1566, 593], + "name": "Iowa", + "flag": "Iowa" + }, + { + "coordinates": [1605, 767], + "name": "Missouri", + "flag": "Missouri" + }, + { + "coordinates": [1598, 972], + "name": "Arkansas", + "flag": "Arkansas" + }, + { + "coordinates": [1671, 475], + "name": "Wisconsin", + "flag": "Wisconsin" + }, + { + "coordinates": [1875, 457], + "name": "Michigan", + "flag": "Michigan" + }, + { + "coordinates": [1706, 670], + "name": "Illinois", + "flag": "Illinois" + }, + { + "coordinates": [1835, 664], + "name": "Indiana", + "flag": "Indiana" + }, + { + "coordinates": [1891, 799], + "name": "Kentucky", + "flag": "Kentucky" + }, + { + "coordinates": [1872, 921], + "name": "Tennessee", + "flag": "Tennessee" + }, + { + "coordinates": [1688, 1127], + "name": "Mississippi", + "flag": "Mississippi" + }, + { + "coordinates": [1843, 1085], + "name": "Alabama", + "flag": "Alabama" + }, + { + "coordinates": [2123, 1300], + "name": "Florida", + "flag": "Florida" + }, + { + "coordinates": [2020, 1092], + "name": "Georgia (US State)", + "flag": "Georgia_US" + }, + { + "coordinates": [1970, 646], + "name": "Ohio", + "flag": "Ohio" + }, + { + "coordinates": [2472, 245], + "name": "Maine", + "flag": "Maine" + }, + { + "coordinates": [2112, 996], + "name": "South Carolina", + "flag": "South_Carolina" + }, + { + "coordinates": [2154, 829], + "name": "North Carolina", + "flag": "North_Carolina" + }, + { + "coordinates": [2163, 727], + "name": "Virginia", + "flag": "Virginia" + }, + { + "coordinates": [2061, 703], + "name": "West Virginia", + "flag": "West_Virginia" + }, + { + "coordinates": [2241, 649], + "name": "Maryland", + "flag": "Maryland" + }, + { + "coordinates": [2294, 667], + "name": "Delaware", + "flag": "Delaware" + }, + { + "coordinates": [2201, 519], + "name": "Pennsylvania", + "flag": "Pennsylvania" + }, + { + "coordinates": [2318, 588], + "name": "New Jersey", + "flag": "New_Jersey" + }, + { + "coordinates": [2315, 481], + "name": "New York", + "flag": "New_York" + }, + { + "coordinates": [2402, 497], + "name": "Connecticut", + "flag": "Connecticut" + }, + { + "coordinates": [2415, 446], + "name": "Massachusetts", + "flag": "Massachusetts" + }, + { + "coordinates": [2430, 473], + "name": "Rhode Island", + "flag": "Rhode_Island" + }, + { + "coordinates": [2339, 358], + "name": "Vermont", + "flag": "Vermont" + }, + { + "coordinates": [2200, 660], + "name": "Washington D.C", + "flag": "District_of_Columbia" + }, + { + "coordinates": [2409, 334], + "name": "New Hampshire", + "flag": "New_Hampshire" + } + ], + "additionalNations": [ + { + "coordinates": [661, 237], + "name": "Lincoln", + "flag": "Lincoln" + }, + { + "coordinates": [304, 605], + "name": "Jefferson", + "flag": "Jefferson" + }, + { + "coordinates": [958, 442], + "name": "Arapaho", + "flag": "Arapaho" + }, + { + "coordinates": [1464, 909], + "name": "Cherokee", + "flag": "Cherokee Nation" + }, + { + "coordinates": [1378, 1010], + "name": "Chickasaw", + "flag": "Chickasaw" + }, + { + "coordinates": [1494, 1019], + "name": "Choctaw", + "flag": "Choctaw" + }, + { + "coordinates": [613, 620], + "name": "Deseret", + "flag": "Deseret" + }, + { + "coordinates": [1158, 516], + "name": "Lakotah", + "flag": "Lakotah" + }, + { + "coordinates": [381, 257], + "name": "Chinook", + "flag": "Chinook" + }, + { + "coordinates": [819, 814], + "name": "Navajo", + "flag": "Navajo" + }, + { + "coordinates": [2488, 263], + "name": "New England", + "flag": "New England" + }, + { + "coordinates": [2062, 570], + "name": "Iroquois Confederacy", + "flag": "Haudenosaunee" + }, + { + "coordinates": [1991, 1201], + "name": "Miccosukee", + "flag": "Miccosukee" + } + ] +} diff --git a/map-generator/codegen.go b/map-generator/codegen.go index 0df0434b6..b30535081 100644 --- a/map-generator/codegen.go +++ b/map-generator/codegen.go @@ -23,6 +23,7 @@ var categoryOrder = []string{ "south_america", "oceania", "antarctica", + "countries", "cosmic", "fictional", "arcade", diff --git a/resources/countries.json b/resources/countries.json index 5c2ea3477..4549a5e57 100644 --- a/resources/countries.json +++ b/resources/countries.json @@ -146,6 +146,11 @@ "continent": "Asia", "name": "Arabia" }, + { + "code": "Arapaho", + "continent": "North America", + "name": "Arapaho" + }, { "code": "Arizona", "continent": "North America", @@ -463,6 +468,16 @@ "continent": "Asia", "name": "Chaldea" }, + { + "code": "Cherokee Nation", + "continent": "North America", + "name": "Cherokee" + }, + { + "code": "Chickasaw", + "continent": "North America", + "name": "Chickasaw" + }, { "code": "cl", "continent": "South America", @@ -488,6 +503,11 @@ "continent": "Asia", "name": "Christmas Island" }, + { + "code": "Choctaw", + "continent": "North America", + "name": "Choctaw" + }, { "code": "Chuvashia", "continent": "Europe", @@ -542,6 +562,11 @@ "continent": "Europe", "name": "Connacht" }, + { + "code": "Connecticut", + "continent": "North America", + "name": "Connecticut" + }, { "code": "ck", "continent": "Oceania", @@ -611,6 +636,11 @@ "continent": "Europe", "name": "Dál Riata" }, + { + "code": "Delaware", + "continent": "North America", + "name": "Delaware" + }, { "code": "dk", "continent": "Europe", @@ -621,6 +651,11 @@ "continent": "Africa", "name": "Democratic Republic of the Congo" }, + { + "code": "Deseret", + "continent": "North America", + "name": "Deseret" + }, { "code": "dg", "continent": "Asia", @@ -631,6 +666,11 @@ "continent": "Asia", "name": "Dilmun" }, + { + "code": "District_of_Columbia", + "continent": "North America", + "name": "Washington D.C." + }, { "code": "dj", "continent": "Africa", @@ -1030,6 +1070,11 @@ "continent": "North America", "name": "Idaho" }, + { + "code": "Illinois (Centennial)", + "continent": "North America", + "name": "Illinois (Centennial)" + }, { "code": "Illinois", "continent": "North America", @@ -1075,6 +1120,11 @@ "continent": "Europe", "name": "Ireland" }, + { + "code": "Haudenosaunee", + "continent": "North America", + "name": "Iroquois Confederacy" + }, { "code": "im", "continent": "Europe", @@ -1105,6 +1155,11 @@ "continent": "Asia", "name": "Japan" }, + { + "code": "Jefferson", + "continent": "North America", + "name": "Jefferson" + }, { "code": "je", "continent": "Europe", @@ -1125,6 +1180,11 @@ "continent": "Asia", "name": "Kachin" }, + { + "code": "Kansas (Banner)", + "continent": "North America", + "name": "Kansas (Banner)" + }, { "code": "Kansas", "continent": "North America", @@ -1284,6 +1344,11 @@ "continent": "Europe", "name": "Laigin" }, + { + "code": "Lakotah", + "continent": "North America", + "name": "Lakotah" + }, { "code": "la", "continent": "Asia", @@ -1347,6 +1412,11 @@ "continent": "Europe", "name": "Liechtenstein" }, + { + "code": "Lincoln", + "continent": "North America", + "name": "Lincoln" + }, { "code": "Listenbourg", "name": "Listenbourg" @@ -1401,6 +1471,11 @@ "continent": "Africa", "name": "Madagascar" }, + { + "code": "Maine (1901)", + "continent": "North America", + "name": "Maine (1901)" + }, { "code": "Maine", "continent": "North America", @@ -1411,6 +1486,11 @@ "continent": "Asia", "name": "Majapahit" }, + { + "code": "Massachusetts (Naval)", + "continent": "North America", + "name": "Massachusetts (Naval)" + }, { "code": "Massachusetts", "continent": "North America", @@ -1496,6 +1576,11 @@ "continent": "North America", "name": "Mexico" }, + { + "code": "Miccosukee", + "continent": "North America", + "name": "Miccosukee" + }, { "code": "Michigan", "continent": "North America", @@ -1610,6 +1695,11 @@ "continent": "Oceania", "name": "Nauru" }, + { + "code": "Navajo", + "continent": "North America", + "name": "Navajo" + }, { "code": "Nebraska", "continent": "North America", @@ -1654,6 +1744,11 @@ "continent": "Oceania", "name": "New Caledonia" }, + { + "code": "New England", + "continent": "North America", + "name": "New England" + }, { "code": "newfoundlandandlabrador", "continent": "North America", @@ -1804,6 +1899,11 @@ "continent": "North America", "name": "Ontario" }, + { + "code": "Oregon (Reverse)", + "continent": "North America", + "name": "Oregon (Reverse)" + }, { "code": "Oregon", "continent": "North America", @@ -1909,6 +2009,11 @@ "continent": "Asia", "name": "Phrygia" }, + { + "code": "Pine Tree Flag", + "continent": "North America", + "name": "Pine Tree Flag" + }, { "code": "pn", "continent": "Oceania", @@ -2632,6 +2737,11 @@ "continent": "North America", "name": "Vermont" }, + { + "code": "Vermont Republic", + "continent": "North America", + "name": "Vermont Republic" + }, { "code": "vn", "continent": "Asia", diff --git a/resources/flags/Arapaho.svg b/resources/flags/Arapaho.svg new file mode 100644 index 000000000..b1474fc93 --- /dev/null +++ b/resources/flags/Arapaho.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Cherokee Nation.svg b/resources/flags/Cherokee Nation.svg new file mode 100644 index 000000000..a0d9a5672 --- /dev/null +++ b/resources/flags/Cherokee Nation.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Chickasaw.svg b/resources/flags/Chickasaw.svg new file mode 100644 index 000000000..eca7dad63 --- /dev/null +++ b/resources/flags/Chickasaw.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Choctaw.svg b/resources/flags/Choctaw.svg new file mode 100644 index 000000000..36f27a4a5 --- /dev/null +++ b/resources/flags/Choctaw.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Connecticut.svg b/resources/flags/Connecticut.svg index d89a1d537..7509e4625 100644 --- a/resources/flags/Connecticut.svg +++ b/resources/flags/Connecticut.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Delaware.svg b/resources/flags/Delaware.svg index 7e8b05b6a..aeb7d5de2 100644 --- a/resources/flags/Delaware.svg +++ b/resources/flags/Delaware.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Deseret.svg b/resources/flags/Deseret.svg new file mode 100644 index 000000000..b48ba8916 --- /dev/null +++ b/resources/flags/Deseret.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Florida.svg b/resources/flags/Florida.svg index d8f4ea56b..6b90a9419 100644 --- a/resources/flags/Florida.svg +++ b/resources/flags/Florida.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Georgia_US.svg b/resources/flags/Georgia_US.svg index 3f1607975..e9e4d7395 100644 --- a/resources/flags/Georgia_US.svg +++ b/resources/flags/Georgia_US.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Haudenosaunee.svg b/resources/flags/Haudenosaunee.svg new file mode 100644 index 000000000..e2eae4511 --- /dev/null +++ b/resources/flags/Haudenosaunee.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Idaho.svg b/resources/flags/Idaho.svg index 84332262e..129d9a445 100644 --- a/resources/flags/Idaho.svg +++ b/resources/flags/Idaho.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Illinois (Centennial).svg b/resources/flags/Illinois (Centennial).svg new file mode 100644 index 000000000..24ea3f377 --- /dev/null +++ b/resources/flags/Illinois (Centennial).svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Illinois.svg b/resources/flags/Illinois.svg index eb36a1d8a..7ddb6c456 100644 --- a/resources/flags/Illinois.svg +++ b/resources/flags/Illinois.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Iowa.svg b/resources/flags/Iowa.svg index 08cf2c123..98e573b66 100644 --- a/resources/flags/Iowa.svg +++ b/resources/flags/Iowa.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Jefferson.svg b/resources/flags/Jefferson.svg new file mode 100644 index 000000000..104255709 --- /dev/null +++ b/resources/flags/Jefferson.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Kansas (Banner).svg b/resources/flags/Kansas (Banner).svg new file mode 100644 index 000000000..5d9be56ae --- /dev/null +++ b/resources/flags/Kansas (Banner).svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Kansas.svg b/resources/flags/Kansas.svg index 468241db8..cf62c04a2 100644 --- a/resources/flags/Kansas.svg +++ b/resources/flags/Kansas.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Kentucky.svg b/resources/flags/Kentucky.svg index d0bb8ee0b..7bdcc46ab 100644 --- a/resources/flags/Kentucky.svg +++ b/resources/flags/Kentucky.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Lakotah.svg b/resources/flags/Lakotah.svg new file mode 100644 index 000000000..7f9971aa5 --- /dev/null +++ b/resources/flags/Lakotah.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Lincoln.svg b/resources/flags/Lincoln.svg new file mode 100644 index 000000000..8152e3105 --- /dev/null +++ b/resources/flags/Lincoln.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Louisiana.svg b/resources/flags/Louisiana.svg index 11d1ed9f1..e673a7c55 100644 --- a/resources/flags/Louisiana.svg +++ b/resources/flags/Louisiana.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Maine (1901).svg b/resources/flags/Maine (1901).svg new file mode 100644 index 000000000..337b0c716 --- /dev/null +++ b/resources/flags/Maine (1901).svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Maine.svg b/resources/flags/Maine.svg index 5bcb96c78..89d3f89f5 100644 --- a/resources/flags/Maine.svg +++ b/resources/flags/Maine.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Maryland.svg b/resources/flags/Maryland.svg index fdec0cc58..2bd2a484b 100644 --- a/resources/flags/Maryland.svg +++ b/resources/flags/Maryland.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Massachusetts (Naval).svg b/resources/flags/Massachusetts (Naval).svg new file mode 100644 index 000000000..3c2f77bae --- /dev/null +++ b/resources/flags/Massachusetts (Naval).svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Massachusetts.svg b/resources/flags/Massachusetts.svg index 129a7aa23..44f573cfc 100644 --- a/resources/flags/Massachusetts.svg +++ b/resources/flags/Massachusetts.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Miccosukee.svg b/resources/flags/Miccosukee.svg new file mode 100644 index 000000000..d039a51fb --- /dev/null +++ b/resources/flags/Miccosukee.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Michigan.svg b/resources/flags/Michigan.svg index d84c13d80..4b7fef20f 100644 --- a/resources/flags/Michigan.svg +++ b/resources/flags/Michigan.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Mississippi.svg b/resources/flags/Mississippi.svg index 9847cadfa..a8f22d15d 100644 --- a/resources/flags/Mississippi.svg +++ b/resources/flags/Mississippi.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Missouri.svg b/resources/flags/Missouri.svg index 87dfd13bc..b655bd0a0 100644 --- a/resources/flags/Missouri.svg +++ b/resources/flags/Missouri.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Montana.svg b/resources/flags/Montana.svg index fe3043c18..4eab6aa10 100644 --- a/resources/flags/Montana.svg +++ b/resources/flags/Montana.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Navajo.svg b/resources/flags/Navajo.svg new file mode 100644 index 000000000..a14559091 --- /dev/null +++ b/resources/flags/Navajo.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Nebraska.svg b/resources/flags/Nebraska.svg index a02978e79..22c7ddf48 100644 --- a/resources/flags/Nebraska.svg +++ b/resources/flags/Nebraska.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Nevada.svg b/resources/flags/Nevada.svg index c2d4095eb..b17dc340d 100644 --- a/resources/flags/Nevada.svg +++ b/resources/flags/Nevada.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/New England.svg b/resources/flags/New England.svg new file mode 100644 index 000000000..5e6461ddd --- /dev/null +++ b/resources/flags/New England.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/New_Hampshire.svg b/resources/flags/New_Hampshire.svg index 42a5f828a..ba082a781 100644 --- a/resources/flags/New_Hampshire.svg +++ b/resources/flags/New_Hampshire.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/New_Jersey.svg b/resources/flags/New_Jersey.svg index 1756bf87e..4e44b95b7 100644 --- a/resources/flags/New_Jersey.svg +++ b/resources/flags/New_Jersey.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/New_York.svg b/resources/flags/New_York.svg index d72ef6a81..68d2480a8 100644 --- a/resources/flags/New_York.svg +++ b/resources/flags/New_York.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/North_Carolina.svg b/resources/flags/North_Carolina.svg index 2b8ad4104..18e1550d1 100644 --- a/resources/flags/North_Carolina.svg +++ b/resources/flags/North_Carolina.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/North_Dakota.svg b/resources/flags/North_Dakota.svg index 0a20b07e5..6ae8dbbd6 100644 --- a/resources/flags/North_Dakota.svg +++ b/resources/flags/North_Dakota.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Ohio.svg b/resources/flags/Ohio.svg index 05f765840..e3a7edbc9 100644 --- a/resources/flags/Ohio.svg +++ b/resources/flags/Ohio.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Oklahoma.svg b/resources/flags/Oklahoma.svg index 7c94ecd48..edb3c6314 100644 --- a/resources/flags/Oklahoma.svg +++ b/resources/flags/Oklahoma.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Oregon (Reverse).svg b/resources/flags/Oregon (Reverse).svg new file mode 100644 index 000000000..4bc95623b --- /dev/null +++ b/resources/flags/Oregon (Reverse).svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Oregon.svg b/resources/flags/Oregon.svg index ce845093a..bfd9c6b37 100644 --- a/resources/flags/Oregon.svg +++ b/resources/flags/Oregon.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Pennsylvania.svg b/resources/flags/Pennsylvania.svg index 5ccf55fdb..fa0b549e8 100644 --- a/resources/flags/Pennsylvania.svg +++ b/resources/flags/Pennsylvania.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Pine Tree Flag.svg b/resources/flags/Pine Tree Flag.svg new file mode 100644 index 000000000..765615262 --- /dev/null +++ b/resources/flags/Pine Tree Flag.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Rhode_Island.svg b/resources/flags/Rhode_Island.svg index a4a17f463..c1e5d9900 100644 --- a/resources/flags/Rhode_Island.svg +++ b/resources/flags/Rhode_Island.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/South_Carolina.svg b/resources/flags/South_Carolina.svg index aebda4ad0..b12fcb0ac 100644 --- a/resources/flags/South_Carolina.svg +++ b/resources/flags/South_Carolina.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/South_Dakota.svg b/resources/flags/South_Dakota.svg index 0820eb27b..90d443343 100644 --- a/resources/flags/South_Dakota.svg +++ b/resources/flags/South_Dakota.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Vermont Republic.svg b/resources/flags/Vermont Republic.svg new file mode 100644 index 000000000..84b5ab7c7 --- /dev/null +++ b/resources/flags/Vermont Republic.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Vermont.svg b/resources/flags/Vermont.svg index 3e09e97cb..b2dbe8bdf 100644 --- a/resources/flags/Vermont.svg +++ b/resources/flags/Vermont.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Virginia.svg b/resources/flags/Virginia.svg index 5989843ce..41039a190 100644 --- a/resources/flags/Virginia.svg +++ b/resources/flags/Virginia.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Washington.svg b/resources/flags/Washington.svg index 24e77a4f8..2911df39d 100644 --- a/resources/flags/Washington.svg +++ b/resources/flags/Washington.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/West_Virginia.svg b/resources/flags/West_Virginia.svg index d2ea3e9f7..16a78bcb1 100644 --- a/resources/flags/West_Virginia.svg +++ b/resources/flags/West_Virginia.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/flags/Wisconsin.svg b/resources/flags/Wisconsin.svg index 1e5141561..c55c7304a 100644 --- a/resources/flags/Wisconsin.svg +++ b/resources/flags/Wisconsin.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/resources/lang/en.json b/resources/lang/en.json index c0b646dde..0e541efa7 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -944,6 +944,7 @@ "tourney4": "Tourney 8 Teams", "tradersdream": "Traders Dream", "twolakes": "Two Lakes", + "unitedstates": "United States", "venice": "Venice", "warshipwarship": "Warship Warship", "world": "World", @@ -958,6 +959,7 @@ "asia": "Asia", "continental": "Continental", "cosmic": "Cosmic", + "countries": "Countries", "europe": "Europe", "favorites": "Favourites", "featured": "Featured", diff --git a/resources/maps/unitedstates/manifest.json b/resources/maps/unitedstates/manifest.json new file mode 100644 index 000000000..67ef7f1f7 --- /dev/null +++ b/resources/maps/unitedstates/manifest.json @@ -0,0 +1,336 @@ +{ + "additionalNations": [ + { + "coordinates": [661, 237], + "flag": "Lincoln", + "name": "Lincoln" + }, + { + "coordinates": [304, 605], + "flag": "Jefferson", + "name": "Jefferson" + }, + { + "coordinates": [958, 442], + "flag": "Arapaho", + "name": "Arapaho" + }, + { + "coordinates": [1464, 909], + "flag": "Cherokee Nation", + "name": "Cherokee" + }, + { + "coordinates": [1378, 1010], + "flag": "Chickasaw", + "name": "Chickasaw" + }, + { + "coordinates": [1494, 1019], + "flag": "Choctaw", + "name": "Choctaw" + }, + { + "coordinates": [613, 620], + "flag": "Deseret", + "name": "Deseret" + }, + { + "coordinates": [1158, 516], + "flag": "Lakotah", + "name": "Lakotah" + }, + { + "coordinates": [381, 257], + "flag": "Chinook", + "name": "Chinook" + }, + { + "coordinates": [819, 814], + "flag": "Navajo", + "name": "Navajo" + }, + { + "coordinates": [2488, 263], + "flag": "New England", + "name": "New England" + }, + { + "coordinates": [2062, 570], + "flag": "Haudenosaunee", + "name": "Iroquois Confederacy" + }, + { + "coordinates": [1991, 1201], + "flag": "Miccosukee", + "name": "Miccosukee" + } + ], + "categories": ["north_america", "new", "countries"], + "id": "UnitedStates", + "map": { + "height": 1548, + "num_land_tiles": 1868914, + "width": 2800 + }, + "map16x": { + "height": 387, + "num_land_tiles": 110663, + "width": 700 + }, + "map4x": { + "height": 774, + "num_land_tiles": 458417, + "width": 1400 + }, + "multiplayer_frequency": 9, + "name": "United States", + "nations": [ + { + "coordinates": [320, 692], + "flag": "California", + "name": "California" + }, + { + "coordinates": [439, 344], + "flag": "Oregon", + "name": "Oregon" + }, + { + "coordinates": [490, 174], + "flag": "Washington", + "name": "Washington" + }, + { + "coordinates": [677, 375], + "flag": "Idaho", + "name": "Idaho" + }, + { + "coordinates": [558, 658], + "flag": "Nevada", + "name": "Nevada" + }, + { + "coordinates": [660, 941], + "flag": "Arizona", + "name": "Arizona" + }, + { + "coordinates": [716, 681], + "flag": "Utah", + "name": "Utah" + }, + { + "coordinates": [943, 279], + "flag": "Montana", + "name": "Montana" + }, + { + "coordinates": [1005, 500], + "flag": "Wyoming", + "name": "Wyoming" + }, + { + "coordinates": [971, 735], + "flag": "Colorado", + "name": "Colorado" + }, + { + "coordinates": [940, 922], + "flag": "New_Mexico", + "name": "New Mexico" + }, + { + "coordinates": [1254, 1191], + "flag": "Texas", + "name": "Texas" + }, + { + "coordinates": [1597, 1201], + "flag": "Louisiana", + "name": "Louisiana" + }, + { + "coordinates": [1322, 961], + "flag": "Oklahoma", + "name": "Oklahoma" + }, + { + "coordinates": [1277, 262], + "flag": "North_Dakota", + "name": "North Dakota" + }, + { + "coordinates": [1274, 437], + "flag": "South_Dakota", + "name": "South Dakota" + }, + { + "coordinates": [1285, 621], + "flag": "Nebraska", + "name": "Nebraska" + }, + { + "coordinates": [1308, 817], + "flag": "Kansas", + "name": "Kansas" + }, + { + "coordinates": [1513, 383], + "flag": "Minnesota", + "name": "Minnesota" + }, + { + "coordinates": [1566, 593], + "flag": "Iowa", + "name": "Iowa" + }, + { + "coordinates": [1605, 767], + "flag": "Missouri", + "name": "Missouri" + }, + { + "coordinates": [1598, 972], + "flag": "Arkansas", + "name": "Arkansas" + }, + { + "coordinates": [1671, 475], + "flag": "Wisconsin", + "name": "Wisconsin" + }, + { + "coordinates": [1875, 457], + "flag": "Michigan", + "name": "Michigan" + }, + { + "coordinates": [1706, 670], + "flag": "Illinois", + "name": "Illinois" + }, + { + "coordinates": [1835, 664], + "flag": "Indiana", + "name": "Indiana" + }, + { + "coordinates": [1891, 799], + "flag": "Kentucky", + "name": "Kentucky" + }, + { + "coordinates": [1872, 921], + "flag": "Tennessee", + "name": "Tennessee" + }, + { + "coordinates": [1688, 1127], + "flag": "Mississippi", + "name": "Mississippi" + }, + { + "coordinates": [1843, 1085], + "flag": "Alabama", + "name": "Alabama" + }, + { + "coordinates": [2123, 1300], + "flag": "Florida", + "name": "Florida" + }, + { + "coordinates": [2020, 1092], + "flag": "Georgia_US", + "name": "Georgia (US State)" + }, + { + "coordinates": [1970, 646], + "flag": "Ohio", + "name": "Ohio" + }, + { + "coordinates": [2472, 245], + "flag": "Maine", + "name": "Maine" + }, + { + "coordinates": [2112, 996], + "flag": "South_Carolina", + "name": "South Carolina" + }, + { + "coordinates": [2154, 829], + "flag": "North_Carolina", + "name": "North Carolina" + }, + { + "coordinates": [2163, 727], + "flag": "Virginia", + "name": "Virginia" + }, + { + "coordinates": [2061, 703], + "flag": "West_Virginia", + "name": "West Virginia" + }, + { + "coordinates": [2241, 649], + "flag": "Maryland", + "name": "Maryland" + }, + { + "coordinates": [2294, 667], + "flag": "Delaware", + "name": "Delaware" + }, + { + "coordinates": [2201, 519], + "flag": "Pennsylvania", + "name": "Pennsylvania" + }, + { + "coordinates": [2318, 588], + "flag": "New_Jersey", + "name": "New Jersey" + }, + { + "coordinates": [2315, 481], + "flag": "New_York", + "name": "New York" + }, + { + "coordinates": [2402, 497], + "flag": "Connecticut", + "name": "Connecticut" + }, + { + "coordinates": [2415, 446], + "flag": "Massachusetts", + "name": "Massachusetts" + }, + { + "coordinates": [2430, 473], + "flag": "Rhode_Island", + "name": "Rhode Island" + }, + { + "coordinates": [2339, 358], + "flag": "Vermont", + "name": "Vermont" + }, + { + "coordinates": [2200, 660], + "flag": "District_of_Columbia", + "name": "Washington D.C" + }, + { + "coordinates": [2409, 334], + "flag": "New_Hampshire", + "name": "New Hampshire" + } + ], + "translation_key": "map.unitedstates" +} diff --git a/resources/maps/unitedstates/map.bin b/resources/maps/unitedstates/map.bin new file mode 100644 index 000000000..491f49ae4 Binary files /dev/null and b/resources/maps/unitedstates/map.bin differ diff --git a/resources/maps/unitedstates/map16x.bin b/resources/maps/unitedstates/map16x.bin new file mode 100644 index 000000000..bb6d86fdc Binary files /dev/null and b/resources/maps/unitedstates/map16x.bin differ diff --git a/resources/maps/unitedstates/map4x.bin b/resources/maps/unitedstates/map4x.bin new file mode 100644 index 000000000..538824f2b Binary files /dev/null and b/resources/maps/unitedstates/map4x.bin differ diff --git a/resources/maps/unitedstates/thumbnail.webp b/resources/maps/unitedstates/thumbnail.webp new file mode 100644 index 000000000..0971b36b4 Binary files /dev/null and b/resources/maps/unitedstates/thumbnail.webp differ diff --git a/src/core/game/Maps.gen.ts b/src/core/game/Maps.gen.ts index df8784d9f..a5e0b002f 100644 --- a/src/core/game/Maps.gen.ts +++ b/src/core/game/Maps.gen.ts @@ -92,6 +92,7 @@ export enum GameMapType { Tourney4 = "Tourney 8 Teams", // map-generator/assets/maps/tourney4/info.json TradersDream = "Traders Dream", // map-generator/assets/maps/tradersdream/info.json TwoLakes = "Two Lakes", // map-generator/assets/maps/twolakes/info.json + UnitedStates = "United States", // map-generator/assets/maps/unitedstates/info.json Venice = "Venice", // map-generator/assets/maps/venice/info.json WarshipWarship = "Warship Warship", // map-generator/assets/maps/warshipwarship/info.json World = "World", // map-generator/assets/maps/world/info.json @@ -114,6 +115,7 @@ export type MapCategory = | "south_america" | "oceania" | "antarctica" + | "countries" | "cosmic" | "fictional" | "arcade" @@ -132,6 +134,7 @@ export const mapCategoryOrder: readonly MapCategory[] = [ "south_america", "oceania", "antarctica", + "countries", "cosmic", "fictional", "arcade", @@ -802,6 +805,13 @@ export const maps: readonly MapInfo[] = [ categories: ["europe"], multiplayerFrequency: 6, }, + { + id: "UnitedStates", + type: GameMapType.UnitedStates, + translationKey: "map.unitedstates", + categories: ["north_america", "new", "countries"], + multiplayerFrequency: 9, + }, { id: "Venice", type: GameMapType.Venice,