diff --git a/map-generator/assets/maps/caspiansea/info.json b/map-generator/assets/maps/caspiansea/info.json index a65dfb21b..0aa069a02 100644 --- a/map-generator/assets/maps/caspiansea/info.json +++ b/map-generator/assets/maps/caspiansea/info.json @@ -2,7 +2,7 @@ "name": "Caspian Sea", "id": "CaspianSea", "translation_key": "map.caspiansea", - "categories": ["asia"], + "categories": ["asia", "new"], "multiplayer_frequency": 5, "nations": [ { diff --git a/map-generator/assets/maps/china/image.png b/map-generator/assets/maps/china/image.png new file mode 100644 index 000000000..9139cf72d Binary files /dev/null and b/map-generator/assets/maps/china/image.png differ diff --git a/map-generator/assets/maps/china/info.json b/map-generator/assets/maps/china/info.json new file mode 100644 index 000000000..16f942a11 --- /dev/null +++ b/map-generator/assets/maps/china/info.json @@ -0,0 +1,321 @@ +{ + "id": "China", + "name": "China", + "translation_key": "map.china", + "categories": ["asia", "countries", "new"], + "multiplayer_frequency": 8, + "nations": [ + { + "coordinates": [1678, 1584], + "name": "British Hong Kong", + "flag": "Flag_of_Hong_Kong_(1959-1997)" + }, + { + "coordinates": [1562, 1530], + "name": "Guangdong", + "flag": "Qing Dynasty" + }, + { + "coordinates": [721, 411], + "name": "Tannu Tuva", + "flag": "tannutuva" + }, + { + "coordinates": [1729, 886], + "name": "Boxer Rebellion", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1824, 1159], + "name": "Taiping Heavenly Kingdom", + "flag": "Flag_of_Taiping_Heavenly_Kingdom" + }, + { + "coordinates": [1197, 1299], + "name": "Sichuan", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1743, 1324], + "name": "Jiangxi Soviet", + "flag": "cn" + }, + { + "coordinates": [1310, 959], + "name": "Communist China", + "flag": "cn" + }, + { + "coordinates": [1589, 775], + "name": "Peking", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1690, 260], + "name": "Heilongjiang", + "flag": "Flag_of_Manchukuo" + }, + { + "coordinates": [1705, 439], + "name": "Manchukuo", + "flag": "Flag_of_Manchukuo" + }, + { + "coordinates": [1338, 626], + "name": "Inner Mongolia", + "flag": "mn" + }, + { + "coordinates": [1128, 520], + "name": "Outer Mongolia", + "flag": "mn" + }, + { + "coordinates": [521, 820], + "name": "Xinjiang", + "flag": "Eastern_Turkistan_Flag" + }, + { + "coordinates": [542, 1281], + "name": "Tibet", + "flag": "tibet" + }, + { + "coordinates": [845, 833], + "name": "Gansu", + "flag": "Qing Dynasty" + }, + { + "coordinates": [195, 936], + "name": "Yaqub Beg Regime", + "flag": "Eastern_Turkistan_Flag" + }, + { + "coordinates": [1025, 1499], + "name": "Yunnan", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1563, 1120], + "name": "Republic of China", + "flag": "Republic of China" + }, + { + "coordinates": [1504, 1773], + "name": "Hainan", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1775, 994], + "name": "Jiangsu", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1632, 1025], + "name": "Anhui Clique", + "flag": "Republic of China" + }, + { + "coordinates": [1558, 943], + "name": "Zhili Clique", + "flag": "Republic of China" + }, + { + "coordinates": [1625, 1602], + "name": "Portuguese Macao", + "flag": "pt" + }, + { + "coordinates": [1945, 1447], + "name": "Taiwan", + "flag": "Empire of Japan" + }, + { + "coordinates": [1832, 1395], + "name": "Fujian", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1519, 1364], + "name": "Hunan", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1366, 1554], + "name": "Kuomintang", + "flag": "Kuomintang_Emblem" + }, + { + "coordinates": [1319, 1400], + "name": "Guizhou", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1808, 605], + "name": "Fengtian Clique", + "flag": "Republic of China" + }, + { + "coordinates": [1940, 427], + "name": "Jilin", + "flag": "Qing Dynasty" + }, + { + "coordinates": [953, 1052], + "name": "Ma Clique", + "flag": "Ma_Clique_Flag" + } + ], + "additionalNations": [ + { + "coordinates": [1639, 850], + "name": "Zhili", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1778, 830], + "name": "Shandong", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1456, 845], + "name": "Shanxi", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1426, 1010], + "name": "Henan", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1870, 1237], + "name": "Zhejiang", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1503, 1212], + "name": "Hubei", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1445, 1626], + "name": "Guangxi", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1239, 1074], + "name": "Shaanxi", + "flag": "Qing Dynasty" + }, + { + "coordinates": [814, 1019], + "name": "Qinghai", + "flag": "Qing Dynasty" + }, + { + "coordinates": [991, 587], + "name": "Bogd Khanate", + "flag": "mn" + }, + { + "coordinates": [281, 840], + "name": "First East Turkestan Republic", + "flag": "Eastern_Turkistan_Flag" + }, + { + "coordinates": [728, 669], + "name": "Kumul Khanate", + "flag": "Mongol Empire" + }, + { + "coordinates": [1041, 885], + "name": "Ningxia", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1478, 447], + "name": "Barga", + "flag": "mn" + }, + { + "coordinates": [1657, 977], + "name": "Anhui", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1703, 1414], + "name": "Jiangxi", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1791, 690], + "name": "Fengtian", + "flag": "Qing Dynasty" + }, + { + "coordinates": [231, 1104], + "name": "Kashmir", + "flag": "Jammu and Kashmir" + }, + { + "coordinates": [1879, 1104], + "name": "Shanghai", + "flag": "cn" + }, + { + "coordinates": [1530, 591], + "name": "Mengjiang", + "flag": "Empire of Japan" + }, + { + "coordinates": [445, 608], + "name": "Second East Turkestan Republic", + "flag": "Eastern_Turkistan_Flag" + }, + { + "coordinates": [1422, 788], + "name": "Shanxi Clique", + "flag": "Republic of China" + }, + { + "coordinates": [1622, 1521], + "name": "Guangdong Clique", + "flag": "Kuomintang_Emblem" + }, + { + "coordinates": [1270, 912], + "name": "Yan'an Soviet", + "flag": "cn" + }, + { + "coordinates": [1751, 767], + "name": "Port Arthur", + "flag": "gb" + }, + { + "coordinates": [1526, 1671], + "name": "Guangzhouwan", + "flag": "fr" + }, + { + "coordinates": [1438, 1483], + "name": "Guangxi Clique", + "flag": "Kuomintang_Emblem" + }, + { + "coordinates": [1033, 1577], + "name": "Yunnan Clique", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1220, 769], + "name": "Guominjun", + "flag": "Qing Dynasty" + }, + { + "coordinates": [1314, 1220], + "name": "Sichuan Clique", + "flag": "Qing Dynasty" + } + ] +} diff --git a/resources/countries.json b/resources/countries.json index 074c3e8f3..8b283babc 100644 --- a/resources/countries.json +++ b/resources/countries.json @@ -359,6 +359,11 @@ "continent": "North America", "name": "British Columbia" }, + { + "code": "Flag_of_Hong_Kong_(1959-1997)", + "continent": "Asia", + "name": "British Hong Kong" + }, { "code": "io", "continent": "Asia", @@ -770,6 +775,11 @@ "continent": "Europe", "name": "East Germany" }, + { + "code": "Eastern_Turkistan_Flag", + "continent": "Asia", + "name": "East Turkestan" + }, { "code": "ec", "continent": "South America", @@ -1586,6 +1596,11 @@ "continent": "Asia", "name": "Macau" }, + { + "code": "Ma_Clique_Flag", + "continent": "Asia", + "name": "Ma Clique" + }, { "code": "mg", "continent": "Africa", @@ -1646,6 +1661,11 @@ "continent": "Europe", "name": "Malta" }, + { + "code": "Flag_of_Manchukuo", + "continent": "Asia", + "name": "Manchukuo" + }, { "code": "Maori flag", "continent": "Oceania", @@ -2693,6 +2713,11 @@ "continent": "Asia", "name": "Syria" }, + { + "code": "Flag_of_Taiping_Heavenly_Kingdom", + "continent": "Asia", + "name": "Taiping Heavenly Kingdom" + }, { "code": "tw", "continent": "Asia", diff --git a/resources/flags/Eastern_Turkistan_Flag.svg b/resources/flags/Eastern_Turkistan_Flag.svg new file mode 100644 index 000000000..58158bb3c --- /dev/null +++ b/resources/flags/Eastern_Turkistan_Flag.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Flag_of_Hong_Kong_(1959-1997).svg b/resources/flags/Flag_of_Hong_Kong_(1959-1997).svg new file mode 100644 index 000000000..1f9d01c54 --- /dev/null +++ b/resources/flags/Flag_of_Hong_Kong_(1959-1997).svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Flag_of_Manchukuo.svg b/resources/flags/Flag_of_Manchukuo.svg new file mode 100644 index 000000000..99482247d --- /dev/null +++ b/resources/flags/Flag_of_Manchukuo.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/flags/Flag_of_Taiping_Heavenly_Kingdom.svg b/resources/flags/Flag_of_Taiping_Heavenly_Kingdom.svg new file mode 100644 index 000000000..8b37df36d --- /dev/null +++ b/resources/flags/Flag_of_Taiping_Heavenly_Kingdom.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/resources/flags/Kuomintang_Emblem.svg b/resources/flags/Kuomintang_Emblem.svg new file mode 100644 index 000000000..ac3465972 --- /dev/null +++ b/resources/flags/Kuomintang_Emblem.svg @@ -0,0 +1,23 @@ + + + + + + + diff --git a/resources/flags/Ma_Clique_Flag.svg b/resources/flags/Ma_Clique_Flag.svg new file mode 100644 index 000000000..9d13ad0e2 --- /dev/null +++ b/resources/flags/Ma_Clique_Flag.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/lang/en.json b/resources/lang/en.json index 9b569972b..2d91fe793 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -898,6 +898,7 @@ "caribbean": "Caribbean", "caspiansea": "Caspian Sea", "caucasus": "Caucasus", + "china": "China", "choppingblock": "Chopping Block", "conakry": "Conakry", "danishstraits": "Danish Straits", diff --git a/resources/maps/caspiansea/manifest.json b/resources/maps/caspiansea/manifest.json index a56a76e81..0c20acb08 100644 --- a/resources/maps/caspiansea/manifest.json +++ b/resources/maps/caspiansea/manifest.json @@ -1,5 +1,5 @@ { - "categories": ["asia"], + "categories": ["asia", "new"], "id": "CaspianSea", "map": { "height": 1728, diff --git a/resources/maps/china/manifest.json b/resources/maps/china/manifest.json new file mode 100644 index 000000000..5ab22dd4e --- /dev/null +++ b/resources/maps/china/manifest.json @@ -0,0 +1,336 @@ +{ + "additionalNations": [ + { + "coordinates": [1639, 850], + "flag": "Qing Dynasty", + "name": "Zhili" + }, + { + "coordinates": [1778, 830], + "flag": "Qing Dynasty", + "name": "Shandong" + }, + { + "coordinates": [1456, 845], + "flag": "Qing Dynasty", + "name": "Shanxi" + }, + { + "coordinates": [1426, 1010], + "flag": "Qing Dynasty", + "name": "Henan" + }, + { + "coordinates": [1870, 1237], + "flag": "Qing Dynasty", + "name": "Zhejiang" + }, + { + "coordinates": [1503, 1212], + "flag": "Qing Dynasty", + "name": "Hubei" + }, + { + "coordinates": [1445, 1626], + "flag": "Qing Dynasty", + "name": "Guangxi" + }, + { + "coordinates": [1239, 1074], + "flag": "Qing Dynasty", + "name": "Shaanxi" + }, + { + "coordinates": [814, 1019], + "flag": "Qing Dynasty", + "name": "Qinghai" + }, + { + "coordinates": [991, 587], + "flag": "mn", + "name": "Bogd Khanate" + }, + { + "coordinates": [281, 840], + "flag": "Eastern_Turkistan_Flag", + "name": "First East Turkestan Republic" + }, + { + "coordinates": [728, 669], + "flag": "Mongol Empire", + "name": "Kumul Khanate" + }, + { + "coordinates": [1041, 885], + "flag": "Qing Dynasty", + "name": "Ningxia" + }, + { + "coordinates": [1478, 447], + "flag": "mn", + "name": "Barga" + }, + { + "coordinates": [1657, 977], + "flag": "Qing Dynasty", + "name": "Anhui" + }, + { + "coordinates": [1703, 1414], + "flag": "Qing Dynasty", + "name": "Jiangxi" + }, + { + "coordinates": [1791, 690], + "flag": "Qing Dynasty", + "name": "Fengtian" + }, + { + "coordinates": [231, 1104], + "flag": "Jammu and Kashmir", + "name": "Kashmir" + }, + { + "coordinates": [1879, 1104], + "flag": "cn", + "name": "Shanghai" + }, + { + "coordinates": [1530, 591], + "flag": "Empire of Japan", + "name": "Mengjiang" + }, + { + "coordinates": [445, 608], + "flag": "Eastern_Turkistan_Flag", + "name": "Second East Turkestan Republic" + }, + { + "coordinates": [1422, 788], + "flag": "Republic of China", + "name": "Shanxi Clique" + }, + { + "coordinates": [1622, 1521], + "flag": "Kuomintang_Emblem", + "name": "Guangdong Clique" + }, + { + "coordinates": [1270, 912], + "flag": "cn", + "name": "Yan'an Soviet" + }, + { + "coordinates": [1751, 767], + "flag": "gb", + "name": "Port Arthur" + }, + { + "coordinates": [1526, 1671], + "flag": "fr", + "name": "Guangzhouwan" + }, + { + "coordinates": [1438, 1483], + "flag": "Kuomintang_Emblem", + "name": "Guangxi Clique" + }, + { + "coordinates": [1033, 1577], + "flag": "Qing Dynasty", + "name": "Yunnan Clique" + }, + { + "coordinates": [1220, 769], + "flag": "Qing Dynasty", + "name": "Guominjun" + }, + { + "coordinates": [1314, 1220], + "flag": "Qing Dynasty", + "name": "Sichuan Clique" + } + ], + "categories": ["asia", "countries", "new"], + "id": "China", + "map": { + "height": 1892, + "num_land_tiles": 1867569, + "width": 2080 + }, + "map16x": { + "height": 473, + "num_land_tiles": 112651, + "width": 520 + }, + "map4x": { + "height": 946, + "num_land_tiles": 461246, + "width": 1040 + }, + "multiplayer_frequency": 8, + "name": "China", + "nations": [ + { + "coordinates": [1678, 1584], + "flag": "Flag_of_Hong_Kong_(1959-1997)", + "name": "British Hong Kong" + }, + { + "coordinates": [1562, 1530], + "flag": "Qing Dynasty", + "name": "Guangdong" + }, + { + "coordinates": [721, 411], + "flag": "tannutuva", + "name": "Tannu Tuva" + }, + { + "coordinates": [1729, 886], + "flag": "Qing Dynasty", + "name": "Boxer Rebellion" + }, + { + "coordinates": [1824, 1159], + "flag": "Flag_of_Taiping_Heavenly_Kingdom", + "name": "Taiping Heavenly Kingdom" + }, + { + "coordinates": [1197, 1299], + "flag": "Qing Dynasty", + "name": "Sichuan" + }, + { + "coordinates": [1743, 1324], + "flag": "cn", + "name": "Jiangxi Soviet" + }, + { + "coordinates": [1310, 959], + "flag": "cn", + "name": "Communist China" + }, + { + "coordinates": [1589, 775], + "flag": "Qing Dynasty", + "name": "Peking" + }, + { + "coordinates": [1690, 260], + "flag": "Flag_of_Manchukuo", + "name": "Heilongjiang" + }, + { + "coordinates": [1705, 439], + "flag": "Flag_of_Manchukuo", + "name": "Manchukuo" + }, + { + "coordinates": [1338, 626], + "flag": "mn", + "name": "Inner Mongolia" + }, + { + "coordinates": [1128, 520], + "flag": "mn", + "name": "Outer Mongolia" + }, + { + "coordinates": [521, 820], + "flag": "Eastern_Turkistan_Flag", + "name": "Xinjiang" + }, + { + "coordinates": [542, 1281], + "flag": "tibet", + "name": "Tibet" + }, + { + "coordinates": [845, 833], + "flag": "Qing Dynasty", + "name": "Gansu" + }, + { + "coordinates": [195, 936], + "flag": "Eastern_Turkistan_Flag", + "name": "Yaqub Beg Regime" + }, + { + "coordinates": [1025, 1499], + "flag": "Qing Dynasty", + "name": "Yunnan" + }, + { + "coordinates": [1563, 1120], + "flag": "Republic of China", + "name": "Republic of China" + }, + { + "coordinates": [1504, 1773], + "flag": "Qing Dynasty", + "name": "Hainan" + }, + { + "coordinates": [1775, 994], + "flag": "Qing Dynasty", + "name": "Jiangsu" + }, + { + "coordinates": [1632, 1025], + "flag": "Republic of China", + "name": "Anhui Clique" + }, + { + "coordinates": [1558, 943], + "flag": "Republic of China", + "name": "Zhili Clique" + }, + { + "coordinates": [1625, 1602], + "flag": "pt", + "name": "Portuguese Macao" + }, + { + "coordinates": [1945, 1447], + "flag": "Empire of Japan", + "name": "Taiwan" + }, + { + "coordinates": [1832, 1395], + "flag": "Qing Dynasty", + "name": "Fujian" + }, + { + "coordinates": [1519, 1364], + "flag": "Qing Dynasty", + "name": "Hunan" + }, + { + "coordinates": [1366, 1554], + "flag": "Kuomintang_Emblem", + "name": "Kuomintang" + }, + { + "coordinates": [1319, 1400], + "flag": "Qing Dynasty", + "name": "Guizhou" + }, + { + "coordinates": [1808, 605], + "flag": "Republic of China", + "name": "Fengtian Clique" + }, + { + "coordinates": [1940, 427], + "flag": "Qing Dynasty", + "name": "Jilin" + }, + { + "coordinates": [953, 1052], + "flag": "Ma_Clique_Flag", + "name": "Ma Clique" + } + ], + "translation_key": "map.china" +} diff --git a/resources/maps/china/map.bin b/resources/maps/china/map.bin new file mode 100644 index 000000000..d4c349721 Binary files /dev/null and b/resources/maps/china/map.bin differ diff --git a/resources/maps/china/map16x.bin b/resources/maps/china/map16x.bin new file mode 100644 index 000000000..942899da4 Binary files /dev/null and b/resources/maps/china/map16x.bin differ diff --git a/resources/maps/china/map4x.bin b/resources/maps/china/map4x.bin new file mode 100644 index 000000000..02b150aa2 Binary files /dev/null and b/resources/maps/china/map4x.bin differ diff --git a/resources/maps/china/thumbnail.webp b/resources/maps/china/thumbnail.webp new file mode 100644 index 000000000..c6c51eb99 Binary files /dev/null and b/resources/maps/china/thumbnail.webp differ diff --git a/src/core/game/Maps.gen.ts b/src/core/game/Maps.gen.ts index 82da598fc..3451d1f28 100644 --- a/src/core/game/Maps.gen.ts +++ b/src/core/game/Maps.gen.ts @@ -27,6 +27,7 @@ export enum GameMapType { Caribbean = "Caribbean", // map-generator/assets/maps/caribbean/info.json CaspianSea = "Caspian Sea", // map-generator/assets/maps/caspiansea/info.json Caucasus = "Caucasus", // map-generator/assets/maps/caucasus/info.json + China = "China", // map-generator/assets/maps/china/info.json ChoppingBlock = "Chopping Block", // map-generator/assets/maps/choppingblock/info.json Conakry = "Conakry", // map-generator/assets/maps/conakry/info.json DanishStraits = "Danish Straits", // map-generator/assets/maps/danishstraits/info.json @@ -327,7 +328,7 @@ export const maps: readonly MapInfo[] = [ id: "CaspianSea", type: GameMapType.CaspianSea, translationKey: "map.caspiansea", - categories: ["asia"], + categories: ["asia", "new"], multiplayerFrequency: 5, }, { @@ -337,6 +338,13 @@ export const maps: readonly MapInfo[] = [ categories: ["europe", "asia"], multiplayerFrequency: 5, }, + { + id: "China", + type: GameMapType.China, + translationKey: "map.china", + categories: ["asia", "countries", "new"], + multiplayerFrequency: 8, + }, { id: "ChoppingBlock", type: GameMapType.ChoppingBlock,