From a18b5e418bee448b482ee06d79946f949dba8e06 Mon Sep 17 00:00:00 2001 From: Andrew Niziolek Date: Wed, 4 Jun 2025 12:27:04 -0400 Subject: [PATCH] Rev: Update "Japan and Neighbors" map to "East Asia" (#1007) **Closes Issue #1001.** _Will require updates to translations for each language but English is in place as are pointers to relevant map files and thumbnails._ ## Description: All assets and references to the Japan and Neighbors map have been updated to reflect East Asia. **New Behavior** ![East Asia Map](https://github.com/user-attachments/assets/64192590-bbb7-4408-a99b-7455de295d2b) **Old Behavior** ![Japan and Neighbors named map](https://github.com/user-attachments/assets/ba44dd56-1470-4c74-a70d-bd7fd8f3c795) Game test is functioning. Other languages will need to be updated for their displayed text to align. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: ajaxburger _My git name is included in my nickname on the server._ --------- Co-authored-by: evanpelle --- resources/lang/ar.json | 1 - resources/lang/bg.json | 1 - resources/lang/bn.json | 1 - resources/lang/cs.json | 1 - resources/lang/de.json | 1 - resources/lang/en.json | 2 +- resources/lang/eo.json | 1 - resources/lang/es.json | 1 - resources/lang/fr.json | 1 - resources/lang/he.json | 1 - resources/lang/hi.json | 1 - resources/lang/it.json | 1 - resources/lang/ja.json | 1 - resources/lang/nl.json | 1 - resources/lang/pl.json | 1 - resources/lang/pt_br.json | 1 - resources/lang/ru.json | 1 - resources/lang/sh.json | 1 - resources/lang/tp.json | 1 - resources/lang/tr.json | 1 - resources/lang/uk.json | 1 - resources/maps/{Japan.bin => EastAsia.bin} | 0 resources/maps/{Japan.json => EastAsia.json} | 2 +- resources/maps/{Japan.png => EastAsia.png} | Bin resources/maps/{JapanMini.bin => EastAsiaMini.bin} | 0 .../maps/{JapanThumb.webp => EastAsiaThumb.webp} | Bin src/client/components/Maps.ts | 2 +- src/client/utilities/Maps.ts | 6 +++--- src/core/configuration/DefaultConfig.ts | 2 +- src/core/game/Game.ts | 4 ++-- src/core/game/TerrainMapFileLoader.ts | 2 +- src/scripts/generateTerrainMaps.ts | 2 +- src/server/MapPlaylist.ts | 2 +- 33 files changed, 12 insertions(+), 32 deletions(-) rename resources/maps/{Japan.bin => EastAsia.bin} (100%) rename resources/maps/{Japan.json => EastAsia.json} (99%) rename resources/maps/{Japan.png => EastAsia.png} (100%) rename resources/maps/{JapanMini.bin => EastAsiaMini.bin} (100%) rename resources/maps/{JapanThumb.webp => EastAsiaThumb.webp} (100%) diff --git a/resources/lang/ar.json b/resources/lang/ar.json index 958265b4b..68492030d 100644 --- a/resources/lang/ar.json +++ b/resources/lang/ar.json @@ -122,7 +122,6 @@ "random": "عشوائي", "iceland": "آيسلندا", "pangaea": "بانجيا", - "japan": "اليابان والجيران", "betweentwoseas": "بين بحرين", "knownworld": "العالم المعروف", "faroeislands": "جزر فارو", diff --git a/resources/lang/bg.json b/resources/lang/bg.json index e6e174ca7..5889cbf2e 100644 --- a/resources/lang/bg.json +++ b/resources/lang/bg.json @@ -135,7 +135,6 @@ "random": "Произволна", "iceland": "Исландия", "pangaea": "Пангея", - "japan": "Япония и съседи", "betweentwoseas": "Между Две Морета", "knownworld": "Познат Свят", "faroeislands": "Фарьорски острови", diff --git a/resources/lang/bn.json b/resources/lang/bn.json index 047a5ec1e..4dca36559 100644 --- a/resources/lang/bn.json +++ b/resources/lang/bn.json @@ -118,7 +118,6 @@ "random": "যেকোনো", "iceland": "আইসল্যান্ড", "pangaea": "পাঞ্জিয়া", - "japan": "জাপান ও তার পার্শ্ববর্তী অঞ্চল", "betweentwoseas": "দুই সমুদ্রের মধ্যবর্তী অঞ্চল", "knownworld": "পরিচিত পৃথিবী", "faroeislands": "ফ্যারো দ্বীপপুঞ্জ" diff --git a/resources/lang/cs.json b/resources/lang/cs.json index b9a1f3a9d..bc3e827ef 100644 --- a/resources/lang/cs.json +++ b/resources/lang/cs.json @@ -135,7 +135,6 @@ "random": "Náhodná", "iceland": "Island", "pangaea": "Pangea", - "japan": "Japonsko a okolí", "betweentwoseas": "Mezi dvěma moři", "knownworld": "Známý svět", "faroeislands": "Faerské ostrovy", diff --git a/resources/lang/de.json b/resources/lang/de.json index 887b23dbd..b37ae2291 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -112,7 +112,6 @@ "pangaea": "Pangaea", "map": "Karte", "betweentwoseas": "Zwischen zwei Meeren", - "japan": "Japan und Nachbarländer", "knownworld": "Bekannte Welt" }, "private_lobby": { diff --git a/resources/lang/en.json b/resources/lang/en.json index 58cf977c3..275953b10 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -144,7 +144,7 @@ "random": "Random", "iceland": "Iceland", "pangaea": "Pangaea", - "japan": "Japan and Neighbors", + "eastasia": "East Asia", "betweentwoseas": "Between Two Seas", "faroeislands": "Faroe Islands", "deglaciatedantarctica": "Deglaciated Antarctica", diff --git a/resources/lang/eo.json b/resources/lang/eo.json index 04b4b8781..937c035e7 100644 --- a/resources/lang/eo.json +++ b/resources/lang/eo.json @@ -135,7 +135,6 @@ "random": "Hazarda", "iceland": "Islando", "pangaea": "Pangeo", - "japan": "Japanio kaj najbaroj", "betweentwoseas": "Inter du maroj", "knownworld": "Konata Mondo", "faroeislands": "Ferooj", diff --git a/resources/lang/es.json b/resources/lang/es.json index 8f8b85917..5ff191327 100644 --- a/resources/lang/es.json +++ b/resources/lang/es.json @@ -135,7 +135,6 @@ "random": "Aleatorio", "iceland": "Islandia", "pangaea": "Pangea", - "japan": "Japón y alrededores", "betweentwoseas": "Entre dos mares", "knownworld": "El Mundo Conocido", "faroeislands": "Islas Feroe", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index 8308e5d28..4514eaf13 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -135,7 +135,6 @@ "random": "Aléatoire", "iceland": "Islande", "pangaea": "Pangée", - "japan": "Japon et pays voisins", "betweentwoseas": "Entre deux mers", "knownworld": "Monde connu", "faroeislands": "Îles Féroé", diff --git a/resources/lang/he.json b/resources/lang/he.json index 1740952e4..87f1c4845 100644 --- a/resources/lang/he.json +++ b/resources/lang/he.json @@ -135,7 +135,6 @@ "random": "רנדומלי", "iceland": "איסלנד", "pangaea": "פנגיאה", - "japan": "יפן ושכנותיה", "betweentwoseas": "בין שני ימים", "knownworld": "העולם הידוע", "faroeislands": "איי פארו", diff --git a/resources/lang/hi.json b/resources/lang/hi.json index b029cf89c..d1741d7e2 100644 --- a/resources/lang/hi.json +++ b/resources/lang/hi.json @@ -118,7 +118,6 @@ "random": "यादृच्छिक", "iceland": "आइसलैंड", "pangaea": "पांजिया", - "japan": "जापान और सीमावर्ती देश", "betweentwoseas": "समुद्रों के मध्य भूमि", "knownworld": "ज्ञात दुनिया", "faroeislands": "फ़रो द्वीपसमूह" diff --git a/resources/lang/it.json b/resources/lang/it.json index 5fa707f54..65d2e181b 100644 --- a/resources/lang/it.json +++ b/resources/lang/it.json @@ -135,7 +135,6 @@ "random": "Casuale", "iceland": "Islanda", "pangaea": "Pangea", - "japan": "Giappone e paesi confinanti", "betweentwoseas": "Tra I Due Mari", "knownworld": "Mondo Conosciuto", "faroeislands": "Isole Faroe", diff --git a/resources/lang/ja.json b/resources/lang/ja.json index 07f880222..1dbd03125 100644 --- a/resources/lang/ja.json +++ b/resources/lang/ja.json @@ -135,7 +135,6 @@ "random": "ランダム", "iceland": "アイスランド", "pangaea": "パンゲア", - "japan": "日本とその隣国", "betweentwoseas": "2つの海の間", "knownworld": "知られてる世界", "faroeislands": "フェロー諸島", diff --git a/resources/lang/nl.json b/resources/lang/nl.json index 4d4dd7e3b..270537185 100644 --- a/resources/lang/nl.json +++ b/resources/lang/nl.json @@ -135,7 +135,6 @@ "random": "Willekeurig", "iceland": "IJsland", "pangaea": "Pangea", - "japan": "Japan en buren", "betweentwoseas": "Tussen twee zeeën", "knownworld": "Bekende Wereld", "faroeislands": "Faeröer eilanden", diff --git a/resources/lang/pl.json b/resources/lang/pl.json index 9b45f7937..f5bf6b993 100644 --- a/resources/lang/pl.json +++ b/resources/lang/pl.json @@ -122,7 +122,6 @@ "random": "Losowe", "iceland": "Islandia", "pangaea": "Pangea", - "japan": "Japonia i sąsiedzi", "betweentwoseas": "Między dwoma morzami", "knownworld": "Znany Świat", "faroeislands": "Wyspy Owcze", diff --git a/resources/lang/pt_br.json b/resources/lang/pt_br.json index ba24a59ac..27d79f2a6 100644 --- a/resources/lang/pt_br.json +++ b/resources/lang/pt_br.json @@ -112,7 +112,6 @@ "pangaea": "Pangeia", "map": "Mapa", "betweentwoseas": "Entre Dois Mares", - "japan": "Japão e Vizinhos", "knownworld": "Mundo Conhecido" }, "private_lobby": { diff --git a/resources/lang/ru.json b/resources/lang/ru.json index 0d30d7478..3bb5995b9 100644 --- a/resources/lang/ru.json +++ b/resources/lang/ru.json @@ -135,7 +135,6 @@ "random": "Случайно", "iceland": "Исландия", "pangaea": "Пангея", - "japan": "Япония и соседи", "betweentwoseas": "Между двух морей", "knownworld": "Известный мир", "faroeislands": "Фарерские острова", diff --git a/resources/lang/sh.json b/resources/lang/sh.json index 520ff46f0..d0bbc546c 100644 --- a/resources/lang/sh.json +++ b/resources/lang/sh.json @@ -118,7 +118,6 @@ "random": "Nasumična", "iceland": "Island", "pangaea": "Pangea", - "japan": "Japan i susjedi", "betweentwoseas": "Između dva mora", "knownworld": "Poznati svijet", "faroeislands": "Farska ostrva", diff --git a/resources/lang/tp.json b/resources/lang/tp.json index a8de7c97b..c27219372 100644 --- a/resources/lang/tp.json +++ b/resources/lang/tp.json @@ -122,7 +122,6 @@ "random": "ma nasa", "iceland": "ma Isilan", "pangaea": "ma Pansija", - "japan": "ma Nijon en ma poka", "betweentwoseas": "insa pi telo tu", "knownworld": "ma ale", "faroeislands": "ma telo Paja", diff --git a/resources/lang/tr.json b/resources/lang/tr.json index eee305558..6b221eb20 100644 --- a/resources/lang/tr.json +++ b/resources/lang/tr.json @@ -112,7 +112,6 @@ "pangaea": "Pangea", "map": "Harita", "betweentwoseas": "İki Deniz Arası", - "japan": "Japonya ve Komşuları", "knownworld": "Bilinen Dünya" }, "private_lobby": { diff --git a/resources/lang/uk.json b/resources/lang/uk.json index c7436be3b..5f2f95a63 100644 --- a/resources/lang/uk.json +++ b/resources/lang/uk.json @@ -135,7 +135,6 @@ "random": "Випадково", "iceland": "Ісландія", "pangaea": "Пангея", - "japan": "Японія та сусіди", "betweentwoseas": "Поміж двох морів", "knownworld": "Відомий світ", "faroeislands": "Фарерські острови", diff --git a/resources/maps/Japan.bin b/resources/maps/EastAsia.bin similarity index 100% rename from resources/maps/Japan.bin rename to resources/maps/EastAsia.bin diff --git a/resources/maps/Japan.json b/resources/maps/EastAsia.json similarity index 99% rename from resources/maps/Japan.json rename to resources/maps/EastAsia.json index 9f3c53bd9..d47fad0c3 100644 --- a/resources/maps/Japan.json +++ b/resources/maps/EastAsia.json @@ -1,5 +1,5 @@ { - "name": "Japan", + "name": "East Asia", "width": 1562, "height": 1646, "nations": [ diff --git a/resources/maps/Japan.png b/resources/maps/EastAsia.png similarity index 100% rename from resources/maps/Japan.png rename to resources/maps/EastAsia.png diff --git a/resources/maps/JapanMini.bin b/resources/maps/EastAsiaMini.bin similarity index 100% rename from resources/maps/JapanMini.bin rename to resources/maps/EastAsiaMini.bin diff --git a/resources/maps/JapanThumb.webp b/resources/maps/EastAsiaThumb.webp similarity index 100% rename from resources/maps/JapanThumb.webp rename to resources/maps/EastAsiaThumb.webp diff --git a/src/client/components/Maps.ts b/src/client/components/Maps.ts index cdd952df9..feaa13c2e 100644 --- a/src/client/components/Maps.ts +++ b/src/client/components/Maps.ts @@ -22,7 +22,7 @@ export const MapDescription: Record = { GatewayToTheAtlantic: "Gateway to the Atlantic", Australia: "Australia", Iceland: "Iceland", - Japan: "Japan", + EastAsia: "East Asia", BetweenTwoSeas: "Between Two Seas", FaroeIslands: "Faroe Islands", DeglaciatedAntarctica: "Deglaciated Antarctica", diff --git a/src/client/utilities/Maps.ts b/src/client/utilities/Maps.ts index f583594e6..97aaac9f8 100644 --- a/src/client/utilities/Maps.ts +++ b/src/client/utilities/Maps.ts @@ -6,6 +6,7 @@ import betweenTwoSeas from "../../../resources/maps/BetweenTwoSeasThumb.webp"; import blackSea from "../../../resources/maps/BlackSeaThumb.webp"; import britannia from "../../../resources/maps/BritanniaThumb.webp"; import deglaciatedAntarctica from "../../../resources/maps/DeglaciatedAntarcticaThumb.webp"; +import eastasia from "../../../resources/maps/EastAsiaThumb.webp"; import europeClassic from "../../../resources/maps/EuropeClassicThumb.webp"; import europe from "../../../resources/maps/EuropeThumb.webp"; import falklandislands from "../../../resources/maps/FalklandIslandsThumb.webp"; @@ -13,7 +14,6 @@ import faroeislands from "../../../resources/maps/FaroeIslandsThumb.webp"; import gatewayToTheAtlantic from "../../../resources/maps/GatewayToTheAtlanticThumb.webp"; import halkidiki from "../../../resources/maps/HalkidikiThumb.webp"; import iceland from "../../../resources/maps/IcelandThumb.webp"; -import japan from "../../../resources/maps/JapanThumb.webp"; import mars from "../../../resources/maps/MarsThumb.webp"; import mena from "../../../resources/maps/MenaThumb.webp"; import northAmerica from "../../../resources/maps/NorthAmericaThumb.webp"; @@ -61,8 +61,8 @@ export function getMapsImage(map: GameMapType): string { return australia; case GameMapType.Iceland: return iceland; - case GameMapType.Japan: - return japan; + case GameMapType.EastAsia: + return eastasia; case GameMapType.BetweenTwoSeas: return betweenTwoSeas; case GameMapType.FaroeIslands: diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts index 738e0987b..49c3b5730 100644 --- a/src/core/configuration/DefaultConfig.ts +++ b/src/core/configuration/DefaultConfig.ts @@ -53,7 +53,7 @@ const numPlayersConfig = { [GameMapType.Mena]: [60, 50, 30], [GameMapType.Mars]: [50, 40, 30], [GameMapType.Oceania]: [30, 20, 10], - [GameMapType.Japan]: [50, 40, 30], + [GameMapType.EastAsia]: [50, 40, 30], [GameMapType.FaroeIslands]: [50, 40, 30], [GameMapType.DeglaciatedAntarctica]: [50, 40, 30], [GameMapType.EuropeClassic]: [80, 30, 50], diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index d054a6b04..ec2851747 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -70,7 +70,7 @@ export enum GameMapType { GatewayToTheAtlantic = "Gateway to the Atlantic", Australia = "Australia", Iceland = "Iceland", - Japan = "Japan", + EastAsia = "East Asia", BetweenTwoSeas = "Between Two Seas", FaroeIslands = "Faroe Islands", DeglaciatedAntarctica = "Deglaciated Antarctica", @@ -97,7 +97,7 @@ export const mapCategories: Record = { GameMapType.GatewayToTheAtlantic, GameMapType.BetweenTwoSeas, GameMapType.Iceland, - GameMapType.Japan, + GameMapType.EastAsia, GameMapType.Mena, GameMapType.Australia, GameMapType.FaroeIslands, diff --git a/src/core/game/TerrainMapFileLoader.ts b/src/core/game/TerrainMapFileLoader.ts index 821209f93..5edbe9b67 100644 --- a/src/core/game/TerrainMapFileLoader.ts +++ b/src/core/game/TerrainMapFileLoader.ts @@ -39,7 +39,7 @@ const MAP_FILE_NAMES: Record = { [GameMapType.GatewayToTheAtlantic]: "GatewayToTheAtlantic", [GameMapType.Australia]: "Australia", [GameMapType.Iceland]: "Iceland", - [GameMapType.Japan]: "Japan", + [GameMapType.EastAsia]: "EastAsia", [GameMapType.BetweenTwoSeas]: "BetweenTwoSeas", [GameMapType.FaroeIslands]: "FaroeIslands", [GameMapType.DeglaciatedAntarctica]: "DeglaciatedAntarctica", diff --git a/src/scripts/generateTerrainMaps.ts b/src/scripts/generateTerrainMaps.ts index 92c61062a..2a9fd37a3 100644 --- a/src/scripts/generateTerrainMaps.ts +++ b/src/scripts/generateTerrainMaps.ts @@ -22,7 +22,7 @@ const maps = [ "Pangaea", "Iceland", "BetweenTwoSeas", - "Japan", + "EastAsia", "KnownWorld", "FaroeIslands", "DeglaciatedAntarctica", diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts index f03bf3232..c6c07c0ce 100644 --- a/src/server/MapPlaylist.ts +++ b/src/server/MapPlaylist.ts @@ -26,7 +26,7 @@ const frequency = { Asia: 1, Mars: 1, BetweenTwoSeas: 1, - Japan: 1, + EastAsia: 1, BlackSea: 1, FaroeIslands: 1, FalklandIslands: 1,